diff options
35 files changed, 141 insertions, 139 deletions
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index 2a68cae12279..e2874b2d9c84 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -171,6 +171,10 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) if (startsWith(fqn, "SbiRuntime::Step")) { return true; } + // have no idea why this can't be static, but 'make check' fails with it so... + if (fqn == "oox::drawingml::Shape::resolveRelationshipsOfTypeFromOfficeDoc") { + return true; + } bVisitedThis = false; TraverseStmt(pCXXMethodDecl->getBody()); @@ -186,7 +190,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) return true; } -loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false ); +loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false ); } diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 7319c34b0964..9a933c10b928 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1752,7 +1752,7 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer ) { // Scan token array for missing args and rewrite if present. MissingConventionOOXML aConv; - if (pArr->NeedsOoxmlRewrite( aConv)) + if (pArr->NeedsOoxmlRewrite()) pArr = pArr->RewriteMissing( aConv ); } @@ -1979,7 +1979,7 @@ void FormulaCompiler::AppendBoolean( OUStringBuffer& rBuffer, bool bVal ) const rBuffer.append( mxSymbols->getSymbol( static_cast<OpCode>(bVal ? ocTrue : ocFalse)) ); } -void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const OUString & rStr ) const +void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const OUString & rStr ) { rBuffer.append( '"'); if ( lcl_UnicodeStrChr( rStr.getStr(), '"' ) == NULL ) diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index a33ce70d4e25..c054db217d20 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1037,7 +1037,7 @@ To be implemented yet: ocMacro: ? ocIndex: INDEX() ? */ -inline bool MissingConventionOOXML::isRewriteNeeded( OpCode eOp ) const +inline bool MissingConventionOOXML::isRewriteNeeded( OpCode eOp ) { switch (eOp) { @@ -1332,11 +1332,11 @@ bool FormulaTokenArray::NeedsPodfRewrite( const MissingConventionODF & rConv ) return false; } -bool FormulaTokenArray::NeedsOoxmlRewrite( const MissingConventionOOXML & rConv ) +bool FormulaTokenArray::NeedsOoxmlRewrite() { for ( FormulaToken *pCur = First(); pCur; pCur = Next() ) { - if ( rConv.isRewriteNeeded( pCur->GetOpCode())) + if ( MissingConventionOOXML::isRewriteNeeded( pCur->GetOpCode())) return true; } return false; diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index e1ff8050c23c..36373af4d8ab 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -58,8 +58,8 @@ namespace svt // XControlInformation implementation ::com::sun::star::uno::Sequence< OUString > getSupportedControls( ); ::com::sun::star::uno::Sequence< OUString > getSupportedControlProperties( const OUString& _rControlName ); - bool isControlSupported( const OUString& _rControlName ); - bool isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty ); + static bool isControlSupported( const OUString& _rControlName ); + bool isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty ); // XFilePickerControlAccess void setValue( sal_Int16 _nId, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue ); @@ -105,7 +105,7 @@ namespace svt */ ::com::sun::star::uno::Any implGetControlProperty( Control* _pControl, sal_Int16 _nProperty ) const; - void implDoListboxAction( ListBox* _pListbox, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue ); + static void implDoListboxAction( ListBox* _pListbox, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue ); }; diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx index d9b18cb405c9..cf6b17b07c8f 100644 --- a/fpicker/source/office/asyncfilepicker.cxx +++ b/fpicker/source/office/asyncfilepicker.cxx @@ -147,7 +147,7 @@ namespace svt if ( eTimeout == eResult ) { - m_pDialog->displayIOException( m_sURL, ::com::sun::star::ucb::IOErrorCode_CANT_READ ); + SvtFileDialog::displayIOException( m_sURL, ::com::sun::star::ucb::IOErrorCode_CANT_READ ); return 0L; } diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index b3192d2c419d..170f12785ab2 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -298,8 +298,7 @@ namespace svt SolarMutexGuard aGuard; if ( createPicker() ) { - ::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() ); - return aAccess.isControlSupported( aControlName ); + return svt::OControlAccess::isControlSupported( aControlName ); } return sal_False; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 6c6dc7602734..c88e5269ecd0 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -921,7 +921,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) // if a path with wildcards is given, divide the string into path and wildcards OUString aFilter; - if ( !pThis->IsolateFilterFromPath_Impl( aFileName, aFilter ) ) + if ( !SvtFileDialog::IsolateFilterFromPath_Impl( aFileName, aFilter ) ) return 0; // if a filter was retrieved, there were wildcards ! diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 4f345799fcf0..5c67ad2c3164 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -155,7 +155,7 @@ private: // removes a filter with wildcards from the path and returns it - bool IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilter ); + static bool IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilter ); void implUpdateImages( ); @@ -250,7 +250,7 @@ public: void RemovablePlaceSelected(bool enable = true); - void displayIOException( const OUString& _rURL, ::com::sun::star::ucb::IOErrorCode _eCode ); + static void displayIOException( const OUString& _rURL, ::com::sun::star::ucb::IOErrorCode _eCode ); // inline inline void SetPath( const OUString& rNewURL ); diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 7d95ff156e23..6f6645b2dd50 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -207,7 +207,7 @@ public: @param bEnglish Use English number parser / formatter instead of native. */ - OpCodeMapPtr CreateOpCodeMap( + static OpCodeMapPtr CreateOpCodeMap( const ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::FormulaOpCodeMapEntry > & rMapping, bool bEnglish ); @@ -249,7 +249,7 @@ public: void AppendBoolean( OUStringBuffer& rBuffer, bool bVal ) const; void AppendDouble( OUStringBuffer& rBuffer, double fVal ) const; - void AppendString( OUStringBuffer& rBuffer, const OUString & rStr ) const; + static void AppendString( OUStringBuffer& rBuffer, const OUString & rStr ); /** Set symbol map corresponding to one of predefined formula::FormulaGrammar::Grammar, including an address reference convention. */ diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 52edc66299e2..8aebb4b1b45f 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -95,7 +95,7 @@ class FORMULA_DLLPUBLIC MissingConventionOOXML : public MissingConvention public: explicit MissingConventionOOXML() : MissingConvention( MissingConvention::FORMULA_MISSING_CONVENTION_OOXML) {} // Implementation and usage only in token.cxx - inline bool isRewriteNeeded( OpCode eOp ) const; + static inline bool isRewriteNeeded( OpCode eOp ); }; typedef std::unordered_set<OpCode, std::hash<o3tl::underlying_type<OpCode>::type> > unordered_opcode_set; @@ -281,7 +281,7 @@ public: bool NeedsPodfRewrite( const MissingConventionODF & rConv ); /** Determines if this formula needs any changes to convert it to OOXML. */ - bool NeedsOoxmlRewrite( const MissingConventionOOXML & rConv ); + bool NeedsOoxmlRewrite(); /** Rewrites to Plain Old Formula or OOXML, substituting missing parameters. The FormulaTokenArray* returned is new'ed. */ 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; diff --git a/include/test/htmltesttools.hxx b/include/test/htmltesttools.hxx index 8889a6eaeddf..767febad04b2 100644 --- a/include/test/htmltesttools.hxx +++ b/include/test/htmltesttools.hxx @@ -22,7 +22,7 @@ class OOO_DLLPUBLIC_TEST HtmlTestTools { protected: htmlDocPtr parseHtml(utl::TempFile& aTempFile); - htmlDocPtr parseHtmlStream(SvStream* pStream); + static htmlDocPtr parseHtmlStream(SvStream* pStream); }; #endif diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx index a3ac5d6ce5db..a4cf8cc1a6f8 100644 --- a/include/test/xmltesttools.hxx +++ b/include/test/xmltesttools.hxx @@ -35,7 +35,7 @@ protected: XmlTestTools(); virtual ~XmlTestTools(); - xmlDocPtr parseXml(utl::TempFile& aTempFile); + static xmlDocPtr parseXml(utl::TempFile& aTempFile); virtual void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx); diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx index 731b1501fcb8..1e8d7807095c 100644 --- a/oox/inc/drawingml/chart/objectformatter.hxx +++ b/oox/inc/drawingml/chart/objectformatter.hxx @@ -122,7 +122,7 @@ public: ObjectType eObjType ); /** Sets text rotation properties to the passed property set. */ - void convertTextRotation( + static void convertTextRotation( PropertySet& rPropSet, const ModelRef< TextBody >& rxTextProp, bool bSupportsStacked ); diff --git a/oox/inc/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx index 5c3eaa00ead2..d3e491b29eba 100644 --- a/oox/inc/drawingml/shape3dproperties.hxx +++ b/oox/inc/drawingml/shape3dproperties.hxx @@ -73,18 +73,18 @@ struct Shape3DProperties /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const Shape3DProperties& rSourceProps ); - OUString getCameraPrstName( sal_Int32 nElement ); - OUString getLightRigName( sal_Int32 nElement ); - OUString getLightRigDirName( sal_Int32 nElement ); - OUString getBevelPresetTypeString( sal_Int32 nType ); - OUString getPresetMaterialTypeString( sal_Int32 nType ); + static OUString getCameraPrstName( sal_Int32 nElement ); + static OUString getLightRigName( sal_Int32 nElement ); + static OUString getLightRigDirName( sal_Int32 nElement ); + static OUString getBevelPresetTypeString( sal_Int32 nType ); + static OUString getPresetMaterialTypeString( sal_Int32 nType ); css::uno::Sequence< css::beans::PropertyValue > getCameraAttributes(); css::uno::Sequence< css::beans::PropertyValue > getLightRigAttributes(); css::uno::Sequence< css::beans::PropertyValue > getShape3DAttributes( const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr = API_RGB_TRANSPARENT ); - css::uno::Sequence< css::beans::PropertyValue > getBevelAttributes( BevelProperties rProps ); - css::uno::Sequence< css::beans::PropertyValue > getColorAttributes( + static css::uno::Sequence< css::beans::PropertyValue > getBevelAttributes( BevelProperties rProps ); + static css::uno::Sequence< css::beans::PropertyValue > getColorAttributes( const Color& rColor, const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr ); }; diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 5c6dee2f29e3..d48d25c0f7aa 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -168,7 +168,7 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs ) } } -OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& rContentType ) const +OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& rContentType ) { if( rContentType == "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" || rContentType == "application/vnd.ms-word.document.macroEnabled.main+xml" ) diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index 2813dcbc9314..f0d8049bfe47 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -60,8 +60,8 @@ public: void InitNew(); void AddCustomProperty( const ::com::sun::star::uno::Any& aAny ); - ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const OUString& aChars ); - ::com::sun::star::uno::Sequence< OUString > GetKeywordsSet( const OUString& aChars ); + static ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const OUString& aChars ); + static ::com::sun::star::uno::Sequence< OUString > GetKeywordsSet( const OUString& aChars ); void UpdateDocStatistic( const OUString& aChars ); // com.sun.star.xml.sax.XFastDocumentHandler diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 0090caeb46ca..29a9ffd6c9e1 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -168,7 +168,7 @@ void AxisConverter::convertFromModel( // axis line and tick label formatting rFormatter.convertFormatting( aAxisProp, mrModel.mxShapeProp, mrModel.mxTextProp, OBJECTTYPE_AXIS ); // tick label rotation - rFormatter.convertTextRotation( aAxisProp, mrModel.mxTextProp, true ); + ObjectFormatter::convertTextRotation( aAxisProp, mrModel.mxTextProp, true ); // tick mark style aAxisProp.setProperty( PROP_MajorTickmarks, lclGetTickMark( mrModel.mnMajorTickMark ) ); diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 38c265aa42a7..08f8f474c9b8 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -140,7 +140,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt // data label text formatting (frame formatting not supported by Chart2) rFormatter.convertTextFormatting( rPropSet, rDataLabel.mxTextProp, OBJECTTYPE_DATALABEL ); - rFormatter.convertTextRotation( rPropSet, rDataLabel.mxTextProp, false ); + ObjectFormatter::convertTextRotation( rPropSet, rDataLabel.mxTextProp, false ); // data label separator (do not overwrite series separator, if no explicit point separator is present) if( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 6e6b44066a2c..34cc4d7e59f6 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -162,7 +162,7 @@ void TitleConverter::convertFromModel( const Reference< XTitled >& rxTitled, con // frame rotation OSL_ENSURE( !mrModel.mxTextProp || !rText.mxTextBody, "TitleConverter::convertFromModel - multiple text properties" ); ModelRef< TextBody > xTextProp = mrModel.mxTextProp.is() ? mrModel.mxTextProp : rText.mxTextBody; - getFormatter().convertTextRotation( aPropSet, xTextProp, true ); + ObjectFormatter::convertTextRotation( aPropSet, xTextProp, true ); // register the title and layout data for conversion of position registerTitleLayout( xTitle, mrModel.mxLayout, eObjType, nMainIdx, nSubIdx ); diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index f5bc9633a5e3..94d29f7ae87d 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -733,7 +733,7 @@ void CustomShapeProperties::initializePresetDataMap() if (bFirst) bFirst = false; else - maPresetDataMap[StaticTokenMap::get().getTokenFromUnicode(aName)] = aPropertyMap; + maPresetDataMap[TokenMap::getTokenFromUnicode(aName)] = aPropertyMap; aName = OUString::fromUtf8(aLine.copy(strlen(aCommentPrefix), aLine.getLength() - strlen(aCommentPrefix) - strlen(" */"))); } else @@ -837,7 +837,7 @@ void CustomShapeProperties::initializePresetDataMap() } bNotDone = aStream.ReadLine(aLine); } - maPresetDataMap[StaticTokenMap::get().getTokenFromUnicode(aName)] = aPropertyMap; + maPresetDataMap[TokenMap::getTokenFromUnicode(aName)] = aPropertyMap; } } diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx index fb336e42a6f5..7f608b3caa83 100644 --- a/oox/source/drawingml/effectpropertiescontext.hxx +++ b/oox/source/drawingml/effectpropertiescontext.hxx @@ -31,7 +31,7 @@ protected: EffectProperties& mrEffectProperties; private: - void saveUnsupportedAttribs( Effect& rEffect, const AttributeList& rAttribs ); + static void saveUnsupportedAttribs( Effect& rEffect, const AttributeList& rAttribs ); }; } } diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 8ff5972183b7..9b3cc6c58593 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -829,7 +829,7 @@ void ConfigItemBase::readConfigBlockContents( TextInputStream& rStrm ) } ConfigItemBase::LineType ConfigItemBase::readConfigLine( - TextInputStream& rStrm, OUString& orKey, OUString& orData ) const + TextInputStream& rStrm, OUString& orKey, OUString& orData ) { OUString aLine; while( !rStrm.isEof() && aLine.isEmpty() ) diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx index da8e2b3f1b32..34cd84020315 100644 --- a/oox/source/helper/attributelist.cxx +++ b/oox/source/helper/attributelist.cxx @@ -65,7 +65,7 @@ sal_Unicode lclGetXChar( const sal_Unicode*& rpcStr, const sal_Unicode* pcEnd ) sal_Int32 AttributeConversion::decodeToken( const OUString& rValue ) { - return StaticTokenMap::get().getTokenFromUnicode( rValue ); + return TokenMap::getTokenFromUnicode( rValue ); } OUString AttributeConversion::decodeXString( const OUString& rValue ) diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 89f612c1a4dd..3abbef228239 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -248,7 +248,7 @@ void ControlConverter::convertColor( PropertyMap& rPropMap, sal_Int32 nPropId, s rPropMap.setProperty( nPropId, OleHelper::decodeOleColor( mrGraphicHelper, nOleColor, mbDefaultColorBgr ) ); } -void ControlConverter::convertToMSColor( PropertySet& rPropSet, sal_Int32 nPropId, sal_uInt32& nOleColor, sal_uInt32 nDefault ) const +void ControlConverter::convertToMSColor( PropertySet& rPropSet, sal_Int32 nPropId, sal_uInt32& nOleColor, sal_uInt32 nDefault ) { sal_uInt32 nRGB = 0; if (rPropSet.getProperty( nRGB, nPropId )) @@ -266,20 +266,20 @@ void ControlConverter::convertPicture( PropertyMap& rPropMap, const StreamDataSe } } -void ControlConverter::convertOrientation( PropertyMap& rPropMap, bool bHorizontal ) const +void ControlConverter::convertOrientation( PropertyMap& rPropMap, bool bHorizontal ) { sal_Int32 nScrollOrient = bHorizontal ? ScrollBarOrientation::HORIZONTAL : ScrollBarOrientation::VERTICAL; rPropMap.setProperty( PROP_Orientation, nScrollOrient ); } -void ControlConverter::convertToMSOrientation( PropertySet& rPropSet, bool& bHorizontal ) const +void ControlConverter::convertToMSOrientation( PropertySet& rPropSet, bool& bHorizontal ) { sal_Int32 nScrollOrient = ScrollBarOrientation::HORIZONTAL; if ( rPropSet.getProperty( nScrollOrient, PROP_Orientation ) ) bHorizontal = ( nScrollOrient == ScrollBarOrientation::HORIZONTAL ); } -void ControlConverter::convertVerticalAlign( PropertyMap& rPropMap, sal_Int32 nVerticalAlign ) const +void ControlConverter::convertVerticalAlign( PropertyMap& rPropMap, sal_Int32 nVerticalAlign ) { VerticalAlignment eAlign = VerticalAlignment_TOP; switch( nVerticalAlign ) @@ -307,7 +307,7 @@ void ControlConverter::convertScrollabilitySettings( PropertyMap& rPropMap, void ControlConverter::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 ) { rPropMap.setProperty( PROP_ScrollValueMin, ::std::min( nMin, nMax ) ); rPropMap.setProperty( PROP_ScrollValueMax, ::std::max( nMin, nMax ) ); @@ -417,7 +417,7 @@ void ControlConverter::convertAxBorder( PropertyMap& rPropMap, } void ControlConverter::convertToAxBorder( PropertySet& rPropSet, - sal_uInt32& nBorderColor, sal_Int32& nBorderStyle, sal_Int32& nSpecialEffect ) const + sal_uInt32& nBorderColor, sal_Int32& nBorderStyle, sal_Int32& nSpecialEffect ) { sal_Int16 nBorder = API_BORDER_NONE; rPropSet.getProperty( nBorder, PROP_Border ); @@ -437,13 +437,13 @@ void ControlConverter::convertToAxBorder( PropertySet& rPropSet, convertToMSColor( rPropSet, PROP_BorderColor, nBorderColor ); } -void ControlConverter::convertAxVisualEffect( PropertyMap& rPropMap, sal_Int32 nSpecialEffect ) const +void ControlConverter::convertAxVisualEffect( PropertyMap& rPropMap, sal_Int32 nSpecialEffect ) { sal_Int16 nVisualEffect = (nSpecialEffect == AX_SPECIALEFFECT_FLAT) ? VisualEffect::FLAT : VisualEffect::LOOK3D; rPropMap.setProperty( PROP_VisualEffect, nVisualEffect ); } -void ControlConverter::convertToAxVisualEffect( PropertySet& rPropSet, sal_Int32& nSpecialEffect ) const +void ControlConverter::convertToAxVisualEffect( PropertySet& rPropSet, sal_Int32& nSpecialEffect ) { sal_Int16 nVisualEffect = AX_SPECIALEFFECT_FLAT; rPropSet.getProperty( nVisualEffect, PROP_VisualEffect ); @@ -498,7 +498,7 @@ void ControlConverter::convertAxPicture( PropertyMap& rPropMap, const StreamData } void ControlConverter::convertAxState( PropertyMap& rPropMap, - const OUString& rValue, sal_Int32 nMultiSelect, ApiDefaultStateMode eDefStateMode, bool bAwtModel ) const + const OUString& rValue, sal_Int32 nMultiSelect, ApiDefaultStateMode eDefStateMode, bool bAwtModel ) { bool bBooleanState = eDefStateMode == API_DEFAULTSTATE_BOOLEAN; bool bSupportsTriState = eDefStateMode == API_DEFAULTSTATE_TRISTATE; @@ -523,7 +523,7 @@ void ControlConverter::convertAxState( PropertyMap& rPropMap, } void ControlConverter::convertToAxState( PropertySet& rPropSet, - OUString& rValue, sal_Int32& nMultiSelect, ApiDefaultStateMode eDefStateMode, bool /*bAwtModel*/ ) const + OUString& rValue, sal_Int32& nMultiSelect, ApiDefaultStateMode eDefStateMode, bool /*bAwtModel*/ ) { bool bSupportsTriState = eDefStateMode == API_DEFAULTSTATE_TRISTATE; @@ -546,7 +546,7 @@ void ControlConverter::convertToAxState( PropertySet& rPropSet, } void ControlConverter::convertAxOrientation( PropertyMap& rPropMap, - const AxPairData& rSize, sal_Int32 nOrientation ) const + const AxPairData& rSize, sal_Int32 nOrientation ) { bool bHorizontal = true; switch( nOrientation ) @@ -560,7 +560,7 @@ void ControlConverter::convertAxOrientation( PropertyMap& rPropMap, } void ControlConverter::convertToAxOrientation( PropertySet& rPropSet, - const AxPairData& /*rSize*/, sal_Int32& nOrientation ) const + const AxPairData& /*rSize*/, sal_Int32& nOrientation ) { bool bHorizontal = true; convertToMSOrientation( rPropSet, bHorizontal ); @@ -766,8 +766,8 @@ ApiControlType ComCtlScrollBarModel::getControlType() const void ComCtlScrollBarModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const { rPropMap.setProperty( PROP_Border, API_BORDER_NONE ); - rConv.convertOrientation( rPropMap, getFlag( mnScrollBarFlags, COMCTL_SCROLLBAR_HOR ) ); - rConv.convertScrollBar( rPropMap, mnMin, mnMax, mnPosition, mnSmallChange, mnLargeChange, mbAwtModel ); + ControlConverter::convertOrientation( rPropMap, getFlag( mnScrollBarFlags, COMCTL_SCROLLBAR_HOR ) ); + ControlConverter::convertScrollBar( rPropMap, mnMin, mnMax, mnPosition, mnSmallChange, mnLargeChange, mbAwtModel ); ComCtlModelBase::convertProperties( rPropMap, rConv ); } @@ -1049,7 +1049,7 @@ void AxCommandButtonModel::convertProperties( PropertyMap& rPropMap, const Contr rPropMap.setProperty( PROP_MultiLine, getFlag( mnFlags, AX_FLAGS_WORDWRAP ) ); rPropMap.setProperty( PROP_FocusOnClick, mbFocusOnClick ); rConv.convertColor( rPropMap, PROP_TextColor, mnTextColor ); - rConv.convertVerticalAlign( rPropMap, mnVerticalAlign ); + ControlConverter::convertVerticalAlign( rPropMap, mnVerticalAlign ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_NOTSUPPORTED ); rConv.convertAxPicture( rPropMap, maPictureData, mnPicturePos ); AxFontDataModel::convertProperties( rPropMap, rConv ); @@ -1065,8 +1065,8 @@ void AxCommandButtonModel::convertFromProperties( PropertySet& rPropSet, const C setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes ); (void)rPropSet.getProperty(mbFocusOnClick, PROP_FocusOnClick); - rConv.convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); AxFontDataModel::convertFromProperties( rPropSet, rConv ); } @@ -1150,13 +1150,13 @@ void AxLabelModel::convertFromProperties( PropertySet& rPropSet, const ControlCo if ( rPropSet.getProperty( bRes, PROP_MultiLine ) ) setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes ); - rConv.convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); + ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); // VerticleAlign doesn't seem to be read from binary // not sure about background color, how do we decide when to set // AX_FLAGS_OPAQUE ? - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxFontDataModel::convertFromProperties( rPropSet, rConv ); } @@ -1195,7 +1195,7 @@ void AxLabelModel::convertProperties( PropertyMap& rPropMap, const ControlConver rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_FLAGS_ENABLED ) ); rPropMap.setProperty( PROP_MultiLine, getFlag( mnFlags, AX_FLAGS_WORDWRAP ) ); rConv.convertColor( rPropMap, PROP_TextColor, mnTextColor ); - rConv.convertVerticalAlign( rPropMap, mnVerticalAlign ); + ControlConverter::convertVerticalAlign( rPropMap, mnVerticalAlign ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_VOID ); rConv.convertAxBorder( rPropMap, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxFontDataModel::convertProperties( rPropMap, rConv ); @@ -1566,9 +1566,9 @@ void AxToggleButtonModel::convertFromProperties( PropertySet& rPropSet, const Co if ( rPropSet.getProperty( bRes, PROP_MultiLine ) ) setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes ); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); // need to process the image if one exists - rConv.convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); + ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1577,10 +1577,10 @@ void AxToggleButtonModel::convertProperties( PropertyMap& rPropMap, const Contro rPropMap.setProperty( PROP_Label, maCaption ); rPropMap.setProperty( PROP_MultiLine, getFlag( mnFlags, AX_FLAGS_WORDWRAP ) ); rPropMap.setProperty( PROP_Toggle, true ); - rConv.convertVerticalAlign( rPropMap, mnVerticalAlign ); + ControlConverter::convertVerticalAlign( rPropMap, mnVerticalAlign ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_NOTSUPPORTED ); rConv.convertAxPicture( rPropMap, maPictureData, mnPicturePos ); - rConv.convertAxState( rPropMap, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); + ControlConverter::convertAxState( rPropMap, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); AxMorphDataModelBase::convertProperties( rPropMap, rConv ); } @@ -1624,11 +1624,11 @@ void AxCheckBoxModel::convertProperties( PropertyMap& rPropMap, const ControlCon { rPropMap.setProperty( PROP_Label, maCaption ); rPropMap.setProperty( PROP_MultiLine, getFlag( mnFlags, AX_FLAGS_WORDWRAP ) ); - rConv.convertVerticalAlign( rPropMap, mnVerticalAlign ); + ControlConverter::convertVerticalAlign( rPropMap, mnVerticalAlign ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_VOID ); - rConv.convertAxVisualEffect( rPropMap, mnSpecialEffect ); + ControlConverter::convertAxVisualEffect( rPropMap, mnSpecialEffect ); rConv.convertAxPicture( rPropMap, maPictureData, mnPicturePos ); - rConv.convertAxState( rPropMap, maValue, mnMultiSelect, API_DEFAULTSTATE_TRISTATE, mbAwtModel ); + ControlConverter::convertAxState( rPropMap, maValue, mnMultiSelect, API_DEFAULTSTATE_TRISTATE, mbAwtModel ); AxMorphDataModelBase::convertProperties( rPropMap, rConv ); } @@ -1640,10 +1640,10 @@ void AxCheckBoxModel::convertFromProperties( PropertySet& rPropSet, const Contro if ( rPropSet.getProperty( bRes, PROP_MultiLine ) ) setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes ); - rConv.convertToAxVisualEffect( rPropSet, mnSpecialEffect ); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToAxVisualEffect( rPropSet, mnSpecialEffect ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); // need to process the image if one exists - rConv.convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); + ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1686,11 +1686,11 @@ void AxOptionButtonModel::convertProperties( PropertyMap& rPropMap, const Contro { rPropMap.setProperty( PROP_Label, maCaption ); rPropMap.setProperty( PROP_MultiLine, getFlag( mnFlags, AX_FLAGS_WORDWRAP ) ); - rConv.convertVerticalAlign( rPropMap, mnVerticalAlign ); + ControlConverter::convertVerticalAlign( rPropMap, mnVerticalAlign ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_VOID ); - rConv.convertAxVisualEffect( rPropMap, mnSpecialEffect ); + ControlConverter::convertAxVisualEffect( rPropMap, mnSpecialEffect ); rConv.convertAxPicture( rPropMap, maPictureData, mnPicturePos ); - rConv.convertAxState( rPropMap, maValue, mnMultiSelect, API_DEFAULTSTATE_SHORT, mbAwtModel ); + ControlConverter::convertAxState( rPropMap, maValue, mnMultiSelect, API_DEFAULTSTATE_SHORT, mbAwtModel ); AxMorphDataModelBase::convertProperties( rPropMap, rConv ); } @@ -1702,10 +1702,10 @@ void AxOptionButtonModel::convertFromProperties( PropertySet& rPropSet, const Co if ( rPropSet.getProperty( bRes, PROP_MultiLine ) ) setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes ); - rConv.convertToAxVisualEffect( rPropSet, mnSpecialEffect ); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToAxVisualEffect( rPropSet, mnSpecialEffect ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); // need to process the image if one exists - rConv.convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); + ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN, mbAwtModel ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1781,9 +1781,9 @@ void AxTextBoxModel::convertFromProperties( PropertySet& rPropSet, const Control if ( rPropSet.getProperty( bRes, PROP_VScroll ) ) setFlag( mnScrollBars, AX_SCROLLBAR_VERTICAL, bRes ); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor, 0x80000005L ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor, 0x80000005L ); - rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); + ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1843,9 +1843,9 @@ void AxNumericFieldModel::convertFromProperties( PropertySet& rPropSet, const Co if ( rPropSet.getProperty( bRes, PROP_Spin ) ) setFlag( mnScrollBars, AX_SCROLLBAR_VERTICAL, bRes ); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); + ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1898,10 +1898,9 @@ void AxListBoxModel::convertFromProperties( PropertySet& rPropSet, const Control { bool bRes = false; if ( rPropSet.getProperty( bRes, PROP_MultiSelection ) ) + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - - rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); + ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -1986,9 +1985,9 @@ void AxComboBoxModel::convertFromProperties( PropertySet& rPropSet, const Contro if ( !mnListRows ) mnListRows = 1; } - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); + ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -2111,11 +2110,11 @@ void AxSpinButtonModel::convertProperties( PropertyMap& rPropMap, const ControlC rPropMap.setProperty( PROP_Border, API_BORDER_NONE ); rConv.convertColor( rPropMap, PROP_SymbolColor, mnArrowColor ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_NOTSUPPORTED ); - rConv.convertAxOrientation( rPropMap, maSize, mnOrientation ); + ControlConverter::convertAxOrientation( rPropMap, maSize, mnOrientation ); AxControlModelBase::convertProperties( rPropMap, rConv ); } -void AxSpinButtonModel::convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) +void AxSpinButtonModel::convertFromProperties( PropertySet& rPropSet, const ControlConverter& ) { bool bRes = false; if ( rPropSet.getProperty( bRes, PROP_Enabled ) ) @@ -2125,10 +2124,10 @@ void AxSpinButtonModel::convertFromProperties( PropertySet& rPropSet, const Cont rPropSet.getProperty( mnSmallChange, PROP_SpinIncrement ); rPropSet.getProperty( mnPosition, ( mbAwtModel ? PROP_SpinValue : PROP_DefaultSpinValue ) ); rPropSet.getProperty( mnDelay, PROP_RepeatDelay ); - rConv.convertToMSColor( rPropSet, PROP_SymbolColor, mnArrowColor); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToMSColor( rPropSet, PROP_SymbolColor, mnArrowColor); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - rConv.convertToAxOrientation( rPropSet, maSize, mnOrientation ); + ControlConverter::convertToAxOrientation( rPropSet, maSize, mnOrientation ); } void AxSpinButtonModel::exportCompObj( BinaryOutputStream& rOutStream ) @@ -2285,21 +2284,21 @@ void AxScrollBarModel::convertProperties( PropertyMap& rPropMap, const ControlCo } rConv.convertColor( rPropMap, PROP_SymbolColor, mnArrowColor ); rConv.convertAxBackground( rPropMap, mnBackColor, mnFlags, API_TRANSPARENCY_NOTSUPPORTED ); - rConv.convertAxOrientation( rPropMap, maSize, mnOrientation ); - rConv.convertScrollBar( rPropMap, mnMin, mnMax, mnPosition, mnSmallChange, mnLargeChange, mbAwtModel ); + ControlConverter::convertAxOrientation( rPropMap, maSize, mnOrientation ); + ControlConverter::convertScrollBar( rPropMap, mnMin, mnMax, mnPosition, mnSmallChange, mnLargeChange, mbAwtModel ); AxControlModelBase::convertProperties( rPropMap, rConv ); } -void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) +void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const ControlConverter& ) { bool bRes = false; if ( rPropSet.getProperty( bRes, PROP_Enabled ) ) setFlag( mnFlags, AX_FLAGS_ENABLED, bRes ); rPropSet.getProperty( mnDelay, PROP_RepeatDelay ); mnPropThumb = AX_PROPTHUMB_ON; // default - rConv.convertToMSColor( rPropSet, PROP_SymbolColor, mnArrowColor); - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); - rConv.convertToAxOrientation( rPropSet, maSize, mnOrientation ); + ControlConverter::convertToMSColor( rPropSet, PROP_SymbolColor, mnArrowColor); + ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + ControlConverter::convertToAxOrientation( rPropSet, maSize, mnOrientation ); rPropSet.getProperty( mnMin, PROP_ScrollValueMin ); rPropSet.getProperty( mnMax, PROP_ScrollValueMax ); diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx index 318aee40538b..fb96c37fe3a3 100644 --- a/oox/source/token/tokenmap.cxx +++ b/oox/source/token/tokenmap.cxx @@ -73,14 +73,14 @@ TokenMap::~TokenMap() { } -sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName ) const +sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName ) { OString aUtf8Name = OUStringToOString( rUnicodeName, RTL_TEXTENCODING_UTF8 ); const struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() ); return pToken ? pToken->nToken : XML_TOKEN_INVALID; } -sal_Int32 TokenMap::getTokenPerfectHash( const char *pStr, sal_Int32 nLength ) const +sal_Int32 TokenMap::getTokenPerfectHash( const char *pStr, sal_Int32 nLength ) { const struct xmltoken* pToken = Perfect_Hash::in_word_set( pStr, nLength ); return pToken ? pToken->nToken : XML_TOKEN_INVALID; diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 876ed65e0185..8b323b021cbe 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -247,7 +247,7 @@ void XclExpRoot::InitializeGlobals() } ScCompiler aCompiler( &rDoc, ScAddress()); aCompiler.SetGrammar( rDoc.GetGrammar()); - mrExpData.mxOpCodeMap = aCompiler.CreateOpCodeMap( aOpCodeMapping, true); + mrExpData.mxOpCodeMap = formula::FormulaCompiler::CreateOpCodeMap( aOpCodeMapping, true); } while(false); } diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 5ac761019150..81cecbdaa3c2 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -209,7 +209,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( ScDocument& rDoc = mpDocShell->GetDocument(); ScCompiler aCompiler( &rDoc, ScAddress()); aCompiler.SetGrammar(rDoc.GetGrammar()); - mxOpCodeMap = aCompiler.CreateOpCodeMap( maOpCodeMapping, mbEnglish); + mxOpCodeMap = formula::FormulaCompiler::CreateOpCodeMap( maOpCodeMapping, mbEnglish); } } else @@ -230,7 +230,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( ScDocument& rDoc = mpDocShell->GetDocument(); ScCompiler aCompiler( &rDoc, ScAddress()); aCompiler.SetGrammar(rDoc.GetGrammar()); - mxOpCodeMap = aCompiler.CreateOpCodeMap( maOpCodeMapping, mbEnglish); + mxOpCodeMap = formula::FormulaCompiler::CreateOpCodeMap( maOpCodeMapping, mbEnglish); } else throw lang::IllegalArgumentException(); diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index cfaff62cdfdb..50a89061af9a 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -206,7 +206,7 @@ protected: bool useMipmap, uno::Sequence<sal_Int8>& data, const OGLFormat* pFormat ); - void prepareEnvironment (); + static void prepareEnvironment(); const OGLFormat* chooseFormats(); private: |