summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-30 10:47:56 +0200
committerNoel Grandin <noel@peralex.com>2015-05-05 09:30:39 +0200
commitf304a7a14a4af4d3f46eab18d5494194028e61ef (patch)
tree7f51b8efe4427d01fc688925c44e0a05e3c64c7b /include/oox
parentb2b85c2b3920fdd92b8d3bf32af1cac5679e116e (diff)
loplugin:staticmethods
Change-Id: I384a5e60f4b7b2f479c89ef97630519059ab720f
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/core/filterdetect.hxx2
-rw-r--r--include/oox/crypto/AgileEngine.hxx2
-rw-r--r--include/oox/dump/dumperbase.hxx6
-rw-r--r--include/oox/export/drawingml.hxx6
-rw-r--r--include/oox/ole/axcontrol.hxx50
-rw-r--r--include/oox/ppt/timenode.hxx2
-rw-r--r--include/oox/token/tokenmap.hxx4
7 files changed, 36 insertions, 36 deletions
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index 5fbcdaf94b24..23bd36ec677d 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -70,7 +70,7 @@ public:
private:
void parseRelationship( const AttributeList& rAttribs );
- OUString getFilterNameFromContentType( const OUString& rContentType ) const;
+ static OUString getFilterNameFromContentType( const OUString& rContentType );
void parseContentTypesDefault( const AttributeList& rAttribs );
void parseContentTypesOverride( const AttributeList& rAttribs );
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx
index cdd614063161..d1feb8619689 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -51,7 +51,7 @@ class AgileEngine : public CryptoEngine
std::vector<sal_uInt8>& rInput,
std::vector<sal_uInt8>& rOutput);
- Crypto::CryptoType cryptoType(const AgileEncryptionInfo& rInfo);
+ static Crypto::CryptoType cryptoType(const AgileEncryptionInfo& rInfo);
public:
AgileEngine();
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index b1e486ea2203..d637ddf754ff 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -540,10 +540,10 @@ protected:
private:
enum LineType { LINETYPE_DATA, LINETYPE_END };
- LineType readConfigLine(
+ static LineType readConfigLine(
TextInputStream& rStrm,
OUString& orKey,
- OUString& orData ) const;
+ OUString& orData );
void processConfigItem(
TextInputStream& rStrm,
@@ -1254,7 +1254,7 @@ protected:
void addPreferredStorage( const String& rStrgPath );
private:
- OUString getSysFileName(
+ static OUString getSysFileName(
const OUString& rStrmName,
const OUString& rSysOutPath );
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 77cfd3ccef56..24867c2eb39d 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -114,7 +114,7 @@ protected:
const char* GetComponentDir();
const char* GetRelationCompPrefix();
- bool EqualGradients( ::com::sun::star::awt::Gradient aGradient1, ::com::sun::star::awt::Gradient aGradient2 );
+ static bool EqualGradients( ::com::sun::star::awt::Gradient aGradient1, ::com::sun::star::awt::Gradient aGradient2 );
public:
DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 )
@@ -188,11 +188,11 @@ public:
static void ResetCounters();
- void GetUUID( OStringBuffer& rBuffer );
+ static void GetUUID( OStringBuffer& rBuffer );
static sal_Unicode SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star::awt::FontDescriptor& rFontDesc );
- sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32 nIntensity );
+ static sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32 nIntensity );
static const char* GetAlignment( sal_Int32 nAlignment );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index d7987e8a450a..1a5f24b97a31 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -216,11 +216,11 @@ public:
sal_Int32 nPropId,
sal_uInt32 nOleColor ) const;
- void convertToMSColor(
+ static void convertToMSColor(
PropertySet& rPropSet,
sal_Int32 nPropId,
sal_uInt32& nOleColor,
- sal_uInt32 nDefault = 0 ) const;
+ sal_uInt32 nDefault = 0 );
/** Converts the passed StdPic picture stream to UNO properties. */
@@ -229,24 +229,24 @@ public:
const StreamDataSequence& rPicData ) const;
/** Converts the control orientation to UNO properties. */
- void convertOrientation(
+ static void convertOrientation(
PropertyMap& rPropMap,
- bool bHorizontal ) const;
+ bool bHorizontal );
- void convertToMSOrientation(
+ static void convertToMSOrientation(
PropertySet& rPropMap,
- bool& bHorizontal ) const;
+ bool& bHorizontal );
/** Converts the vertical alignment to UNO properties. */
- void convertVerticalAlign(
+ static void convertVerticalAlign(
PropertyMap& rPropMap,
- sal_Int32 nVerticalAlign ) const;
+ sal_Int32 nVerticalAlign );
/** Converts common scrollbar settings to UNO properties. */
- void convertScrollBar(
+ static void convertScrollBar(
PropertyMap& rPropMap,
sal_Int32 nMin, sal_Int32 nMax, sal_Int32 nPosition,
- sal_Int32 nSmallChange, sal_Int32 nLargeChange, bool bAwtModel ) const;
+ sal_Int32 nSmallChange, sal_Int32 nLargeChange, bool bAwtModel );
/** Converts scrollability settings to UNO properties. */
void convertScrollabilitySettings(
@@ -278,20 +278,20 @@ public:
sal_Int32 nBorderStyle,
sal_Int32 nSpecialEffect ) const;
- void convertToAxBorder(
+ static void convertToAxBorder(
PropertySet& rPropSet,
sal_uInt32& nBorderColor,
sal_Int32& nBorderStyle,
- sal_Int32& nSpecialEffect ) const;
+ sal_Int32& nSpecialEffect );
/** Converts the Forms 2.0 special effect to UNO properties. */
- void convertAxVisualEffect(
+ static void convertAxVisualEffect(
PropertyMap& rPropMap,
- sal_Int32 nSpecialEffect ) const;
+ sal_Int32 nSpecialEffect );
- void convertToAxVisualEffect(
+ static void convertToAxVisualEffect(
PropertySet& rPropSet,
- sal_Int32& nSpecialEffect ) const;
+ sal_Int32& nSpecialEffect );
/** Converts the passed picture stream and Forms 2.0 position to UNO
properties. */
@@ -311,30 +311,30 @@ public:
/** Converts the Forms 2.0 value for checked/unchecked/dontknow to UNO
properties. */
- void convertAxState(
+ static void convertAxState(
PropertyMap& rPropMap,
const OUString& rValue,
sal_Int32 nMultiSelect,
ApiDefaultStateMode eDefStateMode,
- bool bAwtModel ) const;
+ bool bAwtModel );
- void convertToAxState(
+ static void convertToAxState(
PropertySet& rPropSet,
OUString& rValue,
sal_Int32& nMultiSelect,
ApiDefaultStateMode eDefStateMode,
- bool bAwtModel ) const;
+ bool bAwtModel );
/** Converts the Forms 2.0 control orientation to UNO properties. */
- void convertAxOrientation(
+ static void convertAxOrientation(
PropertyMap& rPropMap,
const AxPairData& rSize,
- sal_Int32 nOrientation ) const;
+ sal_Int32 nOrientation );
- void convertToAxOrientation(
+ static void convertToAxOrientation(
PropertySet& rPropSet,
const AxPairData& rSize,
- sal_Int32& nOrientation ) const;
+ sal_Int32& nOrientation );
private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
@@ -411,7 +411,7 @@ private:
/** Returns the data part identifier according to the model version. */
sal_uInt32 getDataPartId() const;
- bool readPartHeader( BinaryInputStream& rInStrm,
+ static bool readPartHeader( BinaryInputStream& rInStrm,
sal_uInt32 nExpPartId,
sal_uInt16 nExpMajor = SAL_MAX_UINT16,
sal_uInt16 nExpMinor = SAL_MAX_UINT16 );
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 9115ab77015b..1aa5b5afddb9 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -97,7 +97,7 @@ namespace oox { namespace ppt {
static OUString getServiceName( sal_Int16 nNodeType );
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+ static ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
createAndInsert(
const ::oox::core::XmlFilterBase& rFilter,
const OUString& rServiceName,
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index 9de4ece0702b..fc07093d3ccf 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -38,7 +38,7 @@ public:
~TokenMap();
/** Returns the token identifier for the passed Unicode token name. */
- sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName ) const;
+ static sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName );
/** Returns the UTF8 name of the passed token identifier as byte sequence. */
::com::sun::star::uno::Sequence< sal_Int8 >
@@ -73,7 +73,7 @@ public:
}
private:
- sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength ) const;
+ static sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength );
typedef ::std::vector< ::com::sun::star::uno::Sequence< sal_Int8 > > TokenNameVector;