summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--writerfilter/source/dmapper/DomainMapper.hxx12
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx4
-rw-r--r--writerfilter/source/dmapper/PropertyMap.hxx4
-rw-r--r--writerfilter/source/dmapper/ThemeTable.hxx4
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.hxx6
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.hxx8
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx10
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.hxx4
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.hxx2
9 files changed, 27 insertions, 27 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 5225c3fb7904..37a7d9e2fde7 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -162,13 +162,13 @@ private:
// Table
virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
- void handleUnderlineType(const Id nId, const ::std::shared_ptr<PropertyMap>& rContext);
+ static void handleUnderlineType(const Id nId, const ::std::shared_ptr<PropertyMap>& rContext);
void handleParaJustification(const sal_Int32 nIntValue, const ::std::shared_ptr<PropertyMap>& rContext, const bool bExchangeLeftRight);
- bool getColorFromId(const Id, sal_Int32 &nColor);
- sal_Int16 getEmphasisValue(const sal_Int32 nIntValue);
- OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true);
- css::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue);
- sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
+ static bool getColorFromId(const Id, sal_Int32 &nColor);
+ static sal_Int16 getEmphasisValue(const sal_Int32 nIntValue);
+ static OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true);
+ static css::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue);
+ static sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
bool mbIsSplitPara;
boost::scoped_ptr< GraphicZOrderHelper > zOrderHelper;
};
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index a6fa2c0f186d..c7cca3dbef05 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -475,7 +475,7 @@ public:
}
void SetDocumentSettingsProperty( const OUString& rPropName, const css::uno::Any& rValue );
- void CreateRedline(css::uno::Reference<css::text::XTextRange> const& xRange, RedlineParamsPtr pRedline);
+ static void CreateRedline(css::uno::Reference<css::text::XTextRange> const& xRange, RedlineParamsPtr pRedline);
void CheckParaMarkerRedline(css::uno::Reference<css::text::XTextRange> const& xRange);
@@ -629,7 +629,7 @@ public:
PropertyNameSupplier& rPropNameSupplier,
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties);
- void handleAuthor
+ static void handleAuthor
(OUString const& rFirstParam,
PropertyNameSupplier& rPropNameSupplier,
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 4fdb821dbb09..1221bac3b3fe 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -241,13 +241,13 @@ class SectionPropertyMap : public PropertyMap
css::uno::Reference<css::text::XTextColumns> ApplyColumnProperties(css::uno::Reference<css::beans::XPropertySet> const& xFollowPageStyle,
DomainMapper_Impl& rDM_Impl);
void CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl );
- void CopyHeaderFooter(css::uno::Reference<css::beans::XPropertySet> xPrevStyle,
+ static void CopyHeaderFooter(css::uno::Reference<css::beans::XPropertySet> xPrevStyle,
css::uno::Reference<css::beans::XPropertySet> xStyle);
void PrepareHeaderFooterProperties( bool bFirstPage );
bool HasHeader( bool bFirstPage ) const;
bool HasFooter( bool bFirstPage ) const;
- void SetBorderDistance(css::uno::Reference<css::beans::XPropertySet> const& xStyle,
+ static void SetBorderDistance(css::uno::Reference<css::beans::XPropertySet> const& xStyle,
PropertyIds eMarginId,
PropertyIds eDistId,
sal_Int32 nDistance,
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index d222728deb23..34a4aa4a4385 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -53,8 +53,8 @@ public:
virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
// Helper methods
- OUString fromLocaleToScriptTag(const OUString& sLocale);
- OUString fromLCIDToScriptTag(LanguageType lang);
+ static OUString fromLocaleToScriptTag(const OUString& sLocale);
+ static OUString fromLCIDToScriptTag(LanguageType lang);
};
typedef std::shared_ptr< ThemeTable > ThemeTablePtr;
}}
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 507a3ad23b85..9049b787e90d 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -69,9 +69,9 @@ protected:
void resolveFastSubStream(Stream & rStream,
OOXMLStream::StreamType_t nType);
- void resolveFastSubStreamWithId(Stream & rStream,
- writerfilter::Reference<Stream>::Pointer_t pStream,
- sal_uInt32 nId);
+ static void resolveFastSubStreamWithId(Stream & rStream,
+ writerfilter::Reference<Stream>::Pointer_t pStream,
+ sal_uInt32 nId);
css::uno::Reference<css::xml::dom::XDocument> importSubStream(OOXMLStream::StreamType_t nType);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 832edb1c9d90..0eb22e8e5399 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -171,7 +171,7 @@ public:
void endOfParagraph();
void text(const OUString & sText);
void positionOffset(const OUString & sText);
- void ignore();
+ static void ignore();
void alignH(const OUString & sText);
void alignV(const OUString & sText);
void positivePercentage(const OUString& rText);
@@ -404,7 +404,7 @@ public:
virtual std::string getType() const SAL_OVERRIDE { return "TextTableCell"; }
- void startCell();
+ static void startCell();
void endCell();
};
@@ -416,11 +416,11 @@ public:
virtual std::string getType() const SAL_OVERRIDE { return "TextTableRow"; }
- void startRow();
+ static void startRow();
void endRow();
void handleGridBefore( OOXMLValue::Pointer_t val );
private:
- OOXMLProperty::Pointer_t fakeNoBorder( Id id );
+ static OOXMLProperty::Pointer_t fakeNoBorder( Id id );
};
class OOXMLFastContextHandlerTextTable : public OOXMLFastContextHandler
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index cfa7992e7d4f..2077d5dc6920 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -741,7 +741,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
if (ch != 0x0d && ch != 0x0a && ch != 0x20)
{
b = b << 4;
- sal_Int8 parsed = m_pTokenizer->asHex(ch);
+ sal_Int8 parsed = RTFTokenizer::asHex(ch);
if (parsed == -1)
return RTFError::HEX_INVALID;
b += parsed;
@@ -3367,7 +3367,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_DPTXBX:
{
m_aStates.top().aDrawingObject.xShape.set(getModelFactory()->createInstance("com.sun.star.text.TextFrame"), uno::UNO_QUERY);
- std::vector<beans::PropertyValue> aDefaults = m_pSdrImport->getTextFrameDefaults(false);
+ std::vector<beans::PropertyValue> aDefaults = RTFSdrImport::getTextFrameDefaults(false);
for (size_t i = 0; i < aDefaults.size(); ++i)
{
if (!lcl_findPropertyName(m_aStates.top().aDrawingObject.aPendingProperties, aDefaults[i].Name))
@@ -5235,7 +5235,7 @@ RTFError RTFDocumentImpl::popState()
if (ch != 0x0d && ch != 0x0a)
{
b = b << 4;
- sal_Int8 parsed = m_pTokenizer->asHex(ch);
+ sal_Int8 parsed = RTFTokenizer::asHex(ch);
if (parsed == -1)
return RTFError::HEX_INVALID;
b += parsed;
@@ -5487,7 +5487,7 @@ RTFError RTFDocumentImpl::popState()
// If there is no fill, the Word default is 100% transparency.
xPropertySet->setPropertyValue("FillTransparence", uno::makeAny(sal_Int32(100)));
- m_pSdrImport->resolveFLine(xPropertySet, rDrawing.nFLine);
+ RTFSdrImport::resolveFLine(xPropertySet, rDrawing.nFLine);
if (!m_aStates.top().aDrawingObject.bHadShapeText)
{
@@ -6033,7 +6033,7 @@ RTFError RTFDocumentImpl::handleEmbeddedObject()
if (ch != 0x0d && ch != 0x0a)
{
b = b << 4;
- sal_Int8 parsed = m_pTokenizer->asHex(ch);
+ sal_Int8 parsed = RTFTokenizer::asHex(ch);
if (parsed == -1)
return RTFError::HEX_INVALID;
b += parsed;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index f6a94e8deeb0..96058537ddfb 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -35,13 +35,13 @@ public:
/// Append property on the current parent.
void appendGroupProperty(const OUString& aKey, const OUString& aValue);
void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nZOrder, bool bOldStyle);
- void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine);
+ static void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine);
/**
* These are the default in Word, but not in Writer.
*
* @param bNew if the frame is new-style or old-style.
*/
- std::vector<css::beans::PropertyValue> getTextFrameDefaults(bool bNew);
+ static std::vector<css::beans::PropertyValue> getTextFrameDefaults(bool bNew);
/// Push a new group shape to the parent stack.
void pushParent(css::uno::Reference<css::drawing::XShapes> const& xParent);
/// Pop the current group shape from the parent stack.
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index 2fc8d0315687..8e831ecbd7ba 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -31,7 +31,7 @@ public:
virtual ~RTFTokenizer();
RTFError resolveParse();
- int asHex(char ch);
+ static int asHex(char ch);
/// Number of states on the stack.
int getGroup() const
{
generated by cgit (git 2.34.1) at 2025-05-19 03:25:04 +0000