diff options
72 files changed, 206 insertions, 207 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 6d3e247a1e55..26ad3495357a 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -420,7 +420,7 @@ private: @param aPosition The object for which to test whether it is a valid text object. */ - bool IsValidTextObject (const ::sd::outliner::IteratorPosition& rPosition); + static bool IsValidTextObject (const ::sd::outliner::IteratorPosition& rPosition); /** Put text of current text object into outliner so that the text can be searched/spell checked. diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 81f48c16e510..43c47b3a2ffb 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -241,7 +241,7 @@ private: @param aLocation This specifies at which object the iterator points initially. */ - Iterator CreateSelectionIterator ( + static Iterator CreateSelectionIterator ( const ::std::vector<SdrObjectWeakRef>& rObjectList, SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, @@ -259,7 +259,7 @@ private: @param aLocation This specifies at which object the iterator points initially. */ - Iterator CreateDocumentIterator ( + static Iterator CreateDocumentIterator ( SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, bool bDirectionIsForward=true, @@ -282,7 +282,7 @@ private: @param aLocation This specifies at which object the iterator points initially. */ - sal_Int32 GetPageIndex ( + static sal_Int32 GetPageIndex ( SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, PageKind ePageKind, diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index 0bd9a9d29cc7..15cf1a632b06 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -55,13 +55,13 @@ protected: bool mbIsDraw : 1; bool mbShowProgress : 1; #ifndef DISABLE_DYNLOADING - ::osl::Module* OpenLibrary( const OUString& rLibraryName ) const; + static ::osl::Module* OpenLibrary( const OUString& rLibraryName ); #endif void CreateStatusIndicator(); private: - OUString ImplGetFullLibraryName( const OUString& rLibraryName ) const; + static OUString ImplGetFullLibraryName( const OUString& rLibraryName ); }; diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 5dfaf5a96eb9..3d2b268e4517 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -171,7 +171,7 @@ private: The document which will contain the summary page and from which the information about the default transition is retrieved. */ - void AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocument); + static void AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocument); /** Take an outline from a text document and create a new impress document according to the structure of the outline. @@ -179,7 +179,7 @@ private: This typically is the unmodified request from a execute() function from where this function is called. */ - bool OutlineToImpress(SfxRequest& rRequest); + static bool OutlineToImpress(SfxRequest& rRequest); /** Add an eventlistener as soon as possible in sd, allows to use remote devices to start the slideshow elegantly, and respecting diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 5a22993fd36f..2578b0756a97 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -75,7 +75,7 @@ public: when styles are missing. */ SD_DLLPUBLIC void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false ); - void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const; + static void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList); void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets); void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets ); void CopyGraphicSheets(SdStyleSheetPool& rSourcePool); diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 41253670a83b..e57ef3900140 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -128,7 +128,7 @@ public: void notifyModifyListener(); protected: - const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) const throw (css::uno::RuntimeException); + static const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) throw (css::uno::RuntimeException); virtual void Load (SvStream& rIn, sal_uInt16 nVersion) SAL_OVERRIDE; virtual void Store(SvStream& rOut) SAL_OVERRIDE; diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 3c2a1265265d..944c77ebb2d3 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -801,7 +801,7 @@ void SdStyleSheetPool::CopyLayoutSheets(const OUString& rLayoutName, SdStyleShee |* \************************************************************************/ -void SdStyleSheetPool::CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const +void SdStyleSheetPool::CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) { OUString aPrefix(rLayoutName + SD_LT_SEPARATOR); OUString aName(SD_RESSTR(STR_LAYOUT_OUTLINE)); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 708147079ec6..223f4c39e41d 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -1301,7 +1301,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t } /** this is used because our property map is not sorted yet */ -const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( const OUString& rPropertyName ) const throw (css::uno::RuntimeException) +const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( const OUString& rPropertyName ) throw (css::uno::RuntimeException) { return GetStylePropertySet().getPropertyMapEntry(rPropertyName); } diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index e2b6f03bca56..6be4b515d5f8 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -209,8 +209,8 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider sal_uInt32 ImplProgBinaryTag( SvStream* pOutStrm = NULL ); sal_uInt32 ImplProgBinaryTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL ); sal_uInt32 ImplProgTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL ); - sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm = NULL ); - sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm = NULL ); + static sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm = NULL ); + static sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm = NULL ); sal_uInt32 ImplVBAInfoContainer( SvStream* pOutStrm = NULL ); sal_uInt32 ImplDocumentListContainer( SvStream* pOutStrm = NULL ); sal_uInt32 ImplMasterSlideListContainer( SvStream* pOutStrm = NULL ); @@ -222,7 +222,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider bool ImplCreateDocumentSummaryInformation(); bool ImplCreateCurrentUserStream(); - void ImplCreateHeaderFooterStrings( SvStream& rOut, + static void ImplCreateHeaderFooterStrings( SvStream& rOut, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); virtual bool ImplCreateDocument() SAL_OVERRIDE; @@ -240,7 +240,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider bool ImplGetText(); bool ImplCreatePresentationPlaceholder( const bool bMaster, const PageType PageType, const sal_uInt32 StyleInstance, const sal_uInt8 PlaceHolderId ); - bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + static bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, ::com::sun::star::presentation::AnimationEffect& eEffect, ::com::sun::star::presentation::AnimationEffect& eTextEffect, bool& bHasSound ); diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index e616a0524d38..873ab5cbe7ff 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -186,7 +186,7 @@ public : ~FontCollection(); - short GetScriptDirection( const OUString& rText ) const; + static short GetScriptDirection( const OUString& rText ); sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor ); @@ -404,10 +404,10 @@ public: bool GetPresObj() { return mbPresObj; } - PHLayout& GetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; - PHLayout& GetLayout( sal_Int32 nOffset ) const; - sal_Int32 GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; - sal_Int32 GetLayoutOffsetFixed( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; + static PHLayout& GetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ); + static PHLayout& GetLayout( sal_Int32 nOffset ); + static sal_Int32 GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ); + static sal_Int32 GetLayoutOffsetFixed( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ); bool CreateSlide( sal_uInt32 nPageNum ); bool CreateSlideMaster( sal_uInt32 nPageNum ); diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 2b20f9173bb4..6c84b8e85d58 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -100,19 +100,19 @@ protected: virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; bool WriteNotesMaster(); - void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const css::uno::Any& rValue, const OUString& rAttributeName ); - void WriteAnimateValues( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& rXAnimate ); - void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, bool bWriteEvent, bool bMainSeqChild ); - void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay ); + static void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const css::uno::Any& rValue, const OUString& rAttributeName ); + static void WriteAnimateValues( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& rXAnimate ); + static void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, bool bWriteEvent, bool bMainSeqChild ); + static void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay ); void WriteAnimations( ::sax_fastparser::FSHelperPtr pFS ); - void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const OUString& rAttributeName ); + static void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const OUString& rAttributeName ); void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bMainSeqChild ); void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bMainSeqChild, bool bSimple ); void WriteAnimationNodeSeq( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); void WriteAnimationNodeEffect( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); void WriteAnimationNodeCommonPropsStart( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild ); - void WriteAnimationProperty( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any& rAny ); + static void WriteAnimationProperty( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any& rAny ); void WriteAnimationTarget( ::sax_fastparser::FSHelperPtr pFS, const css::uno::Any& rTarget ); bool WriteComments( sal_uInt32 nPageNum ); void ImplWriteBackground( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ); diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index c3fd22a57d31..bac12b7f9bba 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -40,11 +40,11 @@ class PptEscherEx : public EscherEx sal_uInt32 ImplDggContainerSize(); void ImplWriteDggContainer( SvStream& rSt ); - sal_uInt32 ImplOptAtomSize(); - void ImplWriteOptAtom( SvStream& rSt ); + static sal_uInt32 ImplOptAtomSize(); + static void ImplWriteOptAtom( SvStream& rSt ); - sal_uInt32 ImplSplitMenuColorsAtomSize(); - void ImplWriteSplitMenuColorsAtom( SvStream& rSt ); + static sal_uInt32 ImplSplitMenuColorsAtomSize(); + static void ImplWriteSplitMenuColorsAtom( SvStream& rSt ); public: diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 3dbbe1039df6..b629df7a6d7c 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -747,7 +747,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > aTarget = Any(); } -Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const Reference< XAnimationNode >& xNode ) const +Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const Reference< XAnimationNode >& xNode ) { try { @@ -2045,7 +2045,7 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference } } -bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const +bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) { bool bIsColor = true; diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 6bb26b642a00..d79aedce4880 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -68,31 +68,31 @@ class AnimationExporter { ::com::sun::star::uno::Any aTarget; - void writeZString( SvStream& rStrm, const OUString& rVal ); - bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const; - bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); - void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ); - void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); - void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); - void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode eTranslateMode ); + static void writeZString( SvStream& rStrm, const OUString& rVal ); + static bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ); + static bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); + static void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ); + static void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); + static void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); + static void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode eTranslateMode ); /** if available exportAnimPropertySet @return the ::com::sun::star::presentation::EffectNodeType*/ - sal_Int16 exportAnimPropertySet( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); - void exportAnimNode( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, + static sal_Int16 exportAnimPropertySet( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); + static void exportAnimNode( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >* pParent, const sal_Int32 nGroupLevel, const sal_Int16 nFillDefault ); void exportAnimate( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimateTarget( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_uInt32 nForceAttributeName = 0, int nAfterEffectType = AFTEREFFECT_NONE ); void exportAnimateSet( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, int nAfterEffectType ); - void exportAnimAction( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); + static void exportAnimAction( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimEvent( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int32 nFlags = 0 ); void exportNode( SvStream& rStrm, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >* xParent, const sal_uInt16 nContainerRecType, const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const bool bTakeBackInteractiveSequenceTiming, const sal_Int16 nFillDefault ); void exportAnimateTargetElement( SvStream& rStrm, const ::com::sun::star::uno::Any& rAny, const bool bCreate2b01Atom ); - void exportAnimateKeyPoints( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xAnimate ); - void exportAnimValue( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const bool bExportAlways ); + static void exportAnimateKeyPoints( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xAnimate ); + static void exportAnimValue( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const bool bExportAlways ); void exportTransitionFilter( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimateMotion( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimateTransform( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); @@ -107,7 +107,7 @@ class AnimationExporter bool hasAfterEffectNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAfterEffectNode ) const; bool isEmptyNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNodeClone( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const; + static ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNodeClone( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); std::list< AfterEffectNodePtr > maAfterEffectNodes; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 7a2eb7fb41c3..45febb9bb83b 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -435,7 +435,7 @@ bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) return true; }; -sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const +sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) { ::com::sun::star::uno::Any aAny; sal_Int32 nLayout = 20; @@ -447,7 +447,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference return nLayout; } -sal_Int32 PPTWriterBase::GetLayoutOffsetFixed( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const +sal_Int32 PPTWriterBase::GetLayoutOffsetFixed( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) { sal_Int32 nLayout = GetLayoutOffset( rXPropSet ); @@ -461,12 +461,12 @@ sal_Int32 PPTWriterBase::GetLayoutOffsetFixed( const ::com::sun::star::uno::Refe return nLayout; } -PHLayout& PPTWriterBase::GetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const +PHLayout& PPTWriterBase::GetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) { return pPHLayout[ GetLayoutOffsetFixed( rXPropSet ) ]; } -PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const +PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) { if( nOffset >= 0 && nOffset < EPP_LAYOUT_SIZE ) return pPHLayout[ nOffset ]; diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index d5e15180799f..bcf2a3772391 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -141,7 +141,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: // Solution: add a Unicode Right-to-Left Mark, following the method described in i18024 if (bLast && !aString.isEmpty() && aString[aString.getLength() - 1] == ')' - && rFontCollection.GetScriptDirection(aString) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT) + && FontCollection::GetScriptDirection(aString) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT) { mnTextSize++; bRTL_endingParen = true; @@ -1408,7 +1408,7 @@ FontCollection::FontCollection() : xPPTBreakIter = com::sun::star::i18n::BreakIterator::create( xContext ); } -short FontCollection::GetScriptDirection( const OUString& rString ) const +short FontCollection::GetScriptDirection( const OUString& rString ) { short nRet = ScriptTypeDetector::getScriptDirection( rString, 0, com::sun::star::i18n::ScriptDirection::NEUTRAL ); return nRet; diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index eb586894a366..45d575bea7e0 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -123,7 +123,7 @@ class PortionObj : public PropStateValue void ImplClear(); void ImplConstruct( const PortionObj& rPortionObj ); - sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, + static sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, OUString& rURL ); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); void ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue = false ); diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index d761c2367f1d..1987b0589c11 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1051,7 +1051,7 @@ SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) } // create HTML text version of impress pages -OUString HtmlExport::CreateMetaCharset() const +OUString HtmlExport::CreateMetaCharset() { OUString aStr; const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); @@ -2707,7 +2707,7 @@ OUString HtmlExport::CreateBodyTag() const // creates a hyperlink OUString HtmlExport::CreateLink( const OUString& aLink, const OUString& aText, - const OUString& aTarget ) const + const OUString& aTarget ) { OUStringBuffer aStr( "<a href=\"" ); aStr.append(aLink); @@ -2726,7 +2726,7 @@ OUString HtmlExport::CreateLink( const OUString& aLink, // creates a image tag OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth, - sal_Int16 nHeight ) const + sal_Int16 nHeight ) { OUStringBuffer aStr( "<img src=\""); aStr.append(aImage); @@ -2778,7 +2778,7 @@ OUString HtmlExport::ColorToHTMLString( Color aColor ) OUString HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, sal_uLong nCenterY, - const OUString& rHRef ) const + const OUString& rHRef ) { OUString aStr( "<area shape=\"circle\" alt=\"\" coords=\"" + @@ -2792,7 +2792,7 @@ OUString HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, // create area for a polygon; we expect pixel coordinates OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPolygon, - Size aShift, double fFactor, const OUString& rHRef ) const + Size aShift, double fFactor, const OUString& rHRef ) { OUStringBuffer aStr; const sal_uInt32 nNoOfPolygons(rPolyPolygon.count()); @@ -2827,7 +2827,7 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo // create area for a rectangle; we expect pixel coordinates OUString HtmlExport::CreateHTMLRectArea( const Rectangle& rRect, - const OUString& rHRef ) const + const OUString& rHRef ) { OUString aStr( "<area shape=\"rect\" alt=\"\" coords=\"" + @@ -3135,7 +3135,7 @@ bool HtmlExport::checkForExistingFiles() return bFound; } -OUString HtmlExport::GetButtonName( int nButton ) const +OUString HtmlExport::GetButtonName( int nButton ) { return OUString::createFromAscii(pButtonNames[nButton]); } diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index eba3086029b8..d4a039989d39 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -144,7 +144,7 @@ class HtmlExport boost::scoped_ptr< ButtonSet > mpButtonSet; - SdrTextObj* GetLayoutTextObject(SdrPage* pPage); + static SdrTextObj* GetLayoutTextObject(SdrPage* pPage); void SetDocColors( SdPage* pPage = NULL ); @@ -170,9 +170,9 @@ class HtmlExport OUString getDocumentTitle(); bool SavePresentation(); - OUString CreateLink( const OUString& aLink, const OUString& aText, - const OUString& aTarget = OUString()) const; - OUString CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 ) const; + static OUString CreateLink( const OUString& aLink, const OUString& aText, + const OUString& aTarget = OUString()); + static OUString CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 ); OUString CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const; OUString CreateBodyTag() const; @@ -183,11 +183,11 @@ class HtmlExport OUString CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); OUString CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - OUString CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, - sal_uLong nCenterY, const OUString& rHRef ) const; - OUString CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const OUString& rHRef ) const; - OUString CreateHTMLRectArea( const Rectangle& rRect, - const OUString& rHRef ) const; + static OUString CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, + sal_uLong nCenterY, const OUString& rHRef ); + static OUString CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const OUString& rHRef ); + static OUString CreateHTMLRectArea( const Rectangle& rRect, + const OUString& rHRef ); OUString CreatePageURL( sal_uInt16 nPgNum ); @@ -199,7 +199,7 @@ class HtmlExport void ResetProgress(); /// Output only the charset metadata, title etc. will be handled separately. - OUString CreateMetaCharset() const; + static OUString CreateMetaCharset(); /// Output document metadata. OUString DocumentMetadata() const; @@ -211,7 +211,7 @@ class HtmlExport void ExportSingleDocument(); bool WriteHtml( const OUString& rFileName, bool bAddExtension, const OUString& rHtmlData ); - OUString GetButtonName( int nButton ) const; + static OUString GetButtonName( int nButton ); void WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutliner, OutlinerParaObject* pOutlinerParagraphObject, diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 2f19d6cd1621..3900b02f0da2 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -51,7 +51,7 @@ public: inline const Atom* findFirstChildAtom() const; /** @return the next child atom after pLast or NULL */ - inline const Atom* findNextChildAtom( const Atom* pLast ) const; + static inline const Atom* findNextChildAtom( const Atom* pLast ); /** @return true if this atom is a container */ inline bool isContainer() const; @@ -97,7 +97,7 @@ inline const Atom* Atom::findFirstChildAtom() const return mpFirstChild; } -inline const Atom* Atom::findNextChildAtom( const Atom* pLast ) const +inline const Atom* Atom::findNextChildAtom( const Atom* pLast ) { return pLast ? pLast->mpNextAtom : pLast; } diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index dc170bf23a1c..d5ed3721c012 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -1449,7 +1449,7 @@ int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } @@ -1523,7 +1523,7 @@ int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Re break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } @@ -1602,7 +1602,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -1733,7 +1733,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } @@ -1880,7 +1880,7 @@ void AnimationImporter::importAnimateColorContainer( const Atom* pAtom, const Re break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -1937,7 +1937,7 @@ void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Refe break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -2014,7 +2014,7 @@ void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Referen break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -2094,7 +2094,7 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -2158,7 +2158,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } if( nBits & 3 ) @@ -2281,7 +2281,7 @@ int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference< break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } // TODO: What to do with them? @@ -2386,7 +2386,7 @@ void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Re break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -2454,7 +2454,7 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -2601,13 +2601,13 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen double fTemp = (double)nTemp / 1000.0; aKeyTimes[nKeyTime] = fTemp; - const Atom* pValue = pAtom->findNextChildAtom(pIter); + const Atom* pValue = Atom::findNextChildAtom(pIter); if( pValue && pValue->getType() == DFF_msofbtAnimAttributeValue ) { Any aValue1, aValue2; if( importAttributeValue( pValue, aValue1 ) ) { - pValue = pAtom->findNextChildAtom(pValue); + pValue = Atom::findNextChildAtom(pValue); if( pValue && pValue->getType() == DFF_msofbtAnimAttributeValue ) (void)importAttributeValue( pValue, aValue2 ); @@ -2847,7 +2847,7 @@ void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Referenc } } - pChildAtom = pEventAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } *pEvents = addToSequence( *pEvents, (aEvent.Trigger == EventTrigger::NONE) ? aEvent.Offset : makeAny( aEvent ) ); @@ -3042,7 +3042,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An break; } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } @@ -3070,7 +3070,7 @@ void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertyS OSL_FAIL("unknown atom inside ppt::AnimationImporter::importPropertySetContainer()!"); } - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } } @@ -3214,7 +3214,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) dump_atom_header( pChildAtom, false, pChildAtom->getType() == DFF_msofbtAnimAttributeValue ); } - pChildAtom = pAtom->findNextChildAtom(pChildAtom); + pChildAtom = Atom::findNextChildAtom(pChildAtom); } } else if( pAtom->seekToContent() ) diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 1e9319c8219a..7f9f34ab10d1 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -75,19 +75,19 @@ private: bool importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ); sal_Int32 importTargetElementContainer( const Atom* pAtom, ::com::sun::star::uno::Any& rTarget, sal_Int16& nSubType ); - void fillNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTiming, const AnimationNode& rNode, const PropertySet& rSet ); - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createNode( const Atom* pAtom, const AnimationNode& rNode ); + static void fillNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTiming, const AnimationNode& rNode, const PropertySet& rSet ); + static ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createNode( const Atom* pAtom, const AnimationNode& rNode ); bool convertAnimationNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParent ); - bool convertAnimationValue( MS_AttributeNames eAttribute, com::sun::star::uno::Any& rValue ); + static bool convertAnimationValue( MS_AttributeNames eAttribute, com::sun::star::uno::Any& rValue ); - void fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); - void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); + static void fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); + static void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void processAfterEffectNodes(); ::com::sun::star::uno::Any implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); - sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); + static sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode; @@ -104,18 +104,18 @@ private: void dump( sal_uInt32 nLen, bool bNewLine = true ); #endif - void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); - void dump_atom( const Atom* pAtom, bool bNewLine = true ); - void dump_target( ::com::sun::star::uno::Any& rAny ); - void dump( ::com::sun::star::uno::Any& rAny ); - void dump( const PropertySet& rSet ); - void dump( const AnimationNode& rNode ); - void dump( const char * pText ); - void dump( const char * pText, sal_Int32 nInt ); + static void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); + static void dump_atom( const Atom* pAtom, bool bNewLine = true ); + static void dump_target( ::com::sun::star::uno::Any& rAny ); + static void dump( ::com::sun::star::uno::Any& rAny ); + static void dump( const PropertySet& rSet ); + static void dump( const AnimationNode& rNode ); + static void dump( const char * pText ); + static void dump( const char * pText, sal_Int32 nInt ); void dump( const char * pText, sal_Int64 nInt ); - void dump( const char * pText, double fDouble ); - void dump( const char * pText, const char * pText2 ); - void dump( const char * pText, const OUString& rString ); + static void dump( const char * pText, double fDouble ); + static void dump( const char * pText, const char * pText2 ); + static void dump( const char * pText, const OUString& rString ); }; } // namespace ppt diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 93678abf639d..39899ec38017 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -57,7 +57,7 @@ SdFilter::~SdFilter() { } -OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const +OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) { OUString aTemp(SVLIBRARY("?")); return aTemp.replaceFirst( "?", rLibraryName ); @@ -66,7 +66,7 @@ OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } -::osl::Module* SdFilter::OpenLibrary( const OUString& rLibraryName ) const +::osl::Module* SdFilter::OpenLibrary( const OUString& rLibraryName ) { std::unique_ptr< osl::Module > mod(new osl::Module); return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName), diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 3b3f1d036a43..fa6dd6c3a4cb 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -58,7 +58,7 @@ public: bool getBulletState( const SfxItemSet& rSet, SfxStyleSheetBase* pSheet, bool& rState ); bool getBulletState( const SfxItemSet& rSet, sal_uInt16 nWhich, bool& rState ); - bool transformItemSet( SfxItemSet& rSet, bool bNumbering ); + static bool transformItemSet( SfxItemSet& rSet, bool bNumbering ); bool removeAlienAttributes( SfxItemSet& rSet ); bool removeAlienAttributes( SfxItemSet& rSet, sal_uInt16 nWhich ); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 0fd6f19a6595..5073040ed95a 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -112,7 +112,7 @@ private: STLPropertySet* createSelectionSet(); void changeSelection( STLPropertySet* pResultSet, STLPropertySet* pOldSet ); - ::com::sun::star::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); + static ::com::sun::star::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue ); void UpdateLook(); diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 61f6705072fe..b01b431e09a4 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -80,9 +80,9 @@ public: void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); - Color GetColorDark(sal_uInt16 aAuthorIndex); - Color GetColorLight(sal_uInt16 aAuthorIndex); - Color GetColor(sal_uInt16 aAuthorIndex); + static Color GetColorDark(sal_uInt16 aAuthorIndex); + static Color GetColorLight(sal_uInt16 aAuthorIndex); + static Color GetColor(sal_uInt16 aAuthorIndex); // callbacks void onTagSelected( AnnotationTag& rTag ); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index c593325a9bd8..a783715df715 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -591,9 +591,9 @@ void AnnotationWindow::SetColor() } else { - maColor = mrManager.GetColor( nAuthorIdx ); - maColorDark = mrManager.GetColorDark( nAuthorIdx ); - maColorLight = mrManager.GetColorLight( nAuthorIdx ); + maColor = AnnotationManagerImpl::GetColor( nAuthorIdx ); + maColorDark = AnnotationManagerImpl::GetColorDark( nAuthorIdx ); + maColorLight = AnnotationManagerImpl::GetColorLight( nAuthorIdx ); } mpOutlinerView->SetBackgroundColor(maColor); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 44b1f5c97a1e..05748b3a673b 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -84,9 +84,9 @@ private: Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout, Reference< drawing::XDrawPages > xDrawPages); - awt::Size createASRSize(const awt::Size& aPicSize, const awt::Size& aMaxSize); + static awt::Size createASRSize(const awt::Size& aPicSize, const awt::Size& aMaxSize); void createCaption(const awt::Size& aPageSize); - Reference< graphic::XGraphic> createXGraphicFromUrl(const OUString& sUrl, + static Reference< graphic::XGraphic> createXGraphicFromUrl(const OUString& sUrl, Reference< graphic::XGraphicProvider> xProvider); void EnableDisableButtons(); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 759a26cc7542..4ff7fa99d96d 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -207,7 +207,7 @@ public: void UpdatePageList(); void UpdateUserData(); - bool IsOwnFormat( const OUString& rPath ); + static bool IsOwnFormat( const OUString& rPath ); // dlg status void EndDialog( long nResult = 0 ); @@ -222,8 +222,8 @@ public: void ChangePage(); void LeavePage(); - OUString GetUiTextForCommand (const OUString& aCommandURL); - Image GetUiIconForCommand (const OUString& aCommandURL); + static OUString GetUiTextForCommand (const OUString& aCommandURL); + static Image GetUiIconForCommand (const OUString& aCommandURL); DECL_LINK( SelectFileHdl, void * ); DECL_LINK( SelectRegionHdl, ListBox * ); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 5bcd8818f0d1..85c69e774373 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -614,9 +614,9 @@ void SdPageObjsTLB::AddShapeList ( if(pWindow) pSdNavigatorWin = static_cast<SdNavigatorWin*>(pWindow); if( pSdNavigatorWin ) - pSdDrawDocShell = pSdNavigatorWin->GetDrawDocShell(mpDoc); + pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if(pSdDrawDocShell) - bMarked=pSdDrawDocShell->IsMarked(pShape); + bMarked = pSdDrawDocShell->IsMarked(pShape); if(pEntry) { if(bMarked) @@ -657,9 +657,9 @@ void SdPageObjsTLB::AddShapeList ( if(pWindow) pSdNavigatorWin = static_cast<SdNavigatorWin*>(pWindow); if( pSdNavigatorWin ) - pSdDrawDocShell = pSdNavigatorWin->GetDrawDocShell(mpDoc); + pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if(pSdDrawDocShell) - bMarked=pSdDrawDocShell->IsMarked((SdrObject*)pObj); + bMarked = pSdDrawDocShell->IsMarked((SdrObject*)pObj); if(pNewEntry) { if(bMarked) @@ -691,9 +691,9 @@ void SdPageObjsTLB::AddShapeList ( if(pWindow) pSdNavigatorWin = static_cast<SdNavigatorWin*>(pWindow); if( pSdNavigatorWin ) - pSdDrawDocShell = pSdNavigatorWin->GetDrawDocShell(mpDoc); + pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if(pSdDrawDocShell) - bMarked=pSdDrawDocShell->IsMarked((SdrObject*)pObj); + bMarked = pSdDrawDocShell->IsMarked((SdrObject*)pObj); if(pNewEntry) { if(bMarked) @@ -740,9 +740,9 @@ void SdPageObjsTLB::AddShapeList ( if(pWindow) pSdNavigatorWin = static_cast<SdNavigatorWin*>(pWindow); if( pSdNavigatorWin ) - pSdDrawDocShell = pSdNavigatorWin->GetDrawDocShell(mpDoc); + pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if(pSdDrawDocShell) - bMarked=pSdDrawDocShell->IsMarked((SdrObject*)pObj); + bMarked = pSdDrawDocShell->IsMarked((SdrObject*)pObj); if(pNewEntry) { if(bMarked) @@ -1102,12 +1102,11 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt ) if (!pParentEntry) return; OUString aStr(GetSelectEntry()); - SdNavigatorWin* pSdNavigatorWin = reinterpret_cast<SdNavigatorWin*>(pParentEntry); - sd::DrawDocShell* pSdDrawDocShell = pSdNavigatorWin->GetDrawDocShell(mpDoc); + sd::DrawDocShell* pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if (pSdDrawDocShell) { pSdDrawDocShell->GotoTreeBookmark(aStr); - bMarked=pSdDrawDocShell->GetObjectIsmarked(aStr); + bMarked = pSdDrawDocShell->GetObjectIsmarked(aStr); } pNewEntry->SetMarked(bMarked); Invalidate(); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 36847a80638f..cf69318f7e6e 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -90,7 +90,7 @@ void SdVectorizeDlg::dispose() ModalDialog::dispose(); } -Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) const +Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) { Rectangle aRect; diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 50d99322068e..05d1c9589e85 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -164,7 +164,7 @@ void ConfigurationClassifier::CopyResources ( void ConfigurationClassifier::TraceResourceIdVector ( const sal_Char* pMessage, - const ResourceIdVector& rResources) const + const ResourceIdVector& rResources) { SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << pMessage); diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index da7038241e0b..27dde875fa56 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -85,9 +85,9 @@ public: */ const ResourceIdVector& GetC1andC2() const { return maC1andC2;} - void TraceResourceIdVector ( + static void TraceResourceIdVector ( const sal_Char* pMessage, - const ResourceIdVector& rResources) const; + const ResourceIdVector& rResources); private: ::com::sun::star::uno::Reference< @@ -138,7 +138,7 @@ private: @param rS2 Another sequence of XResourceId objects. */ - void ClassifyResources ( + static void ClassifyResources ( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId> >& rS1, @@ -162,7 +162,7 @@ private: This list is filled with resources from rSource and the ones bound to them. */ - void CopyResources ( + static void CopyResources ( const ResourceIdVector& rSource, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 7e5e839f647e..f2a963128a83 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -82,7 +82,7 @@ private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; VclPtr<WorkWindow> mpWorkWindow; - void ExtractArguments ( + static void ExtractArguments ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, sal_Int32& rnScreenNumberReturnValue); }; diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index 81b915dccb93..f49b3a8f56a6 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -320,7 +320,7 @@ sal_uLong SmartTagSet::GetMarkedPointCount() const return 0; } -bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const +bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) { const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl ); diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 8db4323178c3..6bdf397e5f7e 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -239,7 +239,7 @@ protected: */ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; - void FillPropertyTable ( + static void FillPropertyTable ( ::std::vector< ::com::sun::star::beans::Property>& rProperties); /** diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 3d15c4d5fd85..5b82479ebf28 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -229,7 +229,7 @@ protected: void Construct(bool bClipboard); virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE; private: - void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage); + static void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage); }; #ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 120fbeb5aa93..73f17fb8577e 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -270,7 +270,7 @@ public: void SetZoomOnPage( bool bZoom = true ) { mbZoomOnPage = bZoom; } bool IsZoomOnPage() { return mbZoomOnPage; } - void CheckLineTo (SfxRequest& rReq); + static void CheckLineTo (SfxRequest& rReq); void SetChildWindowState( SfxItemSet& rSet ); void UpdateIMapDlg( SdrObject* pObj ); @@ -412,7 +412,7 @@ protected: void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, bool bSize, bool bMargin, bool bScaleAll ); - sal_uInt16 GetIdBySubId( sal_uInt16 nSId ); + static sal_uInt16 GetIdBySubId( sal_uInt16 nSId ); void MapSlot( sal_uInt16 nSId ); void UpdateToolboxImages( SfxItemSet &rSet, bool bPermanent = true ); sal_uInt16 GetMappedSlot( sal_uInt16 nSId ); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 779b07669180..cf81a0a94966 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -71,11 +71,11 @@ public: TYPEINFO_OVERRIDE(); - SdrTextObj* GetTitleTextObject(SdrPage* pPage); - SdrTextObj* GetOutlineTextObject(SdrPage* pPage); + static SdrTextObj* GetTitleTextObject(SdrPage* pPage); + static SdrTextObj* GetOutlineTextObject(SdrPage* pPage); - SdrTextObj* CreateTitleTextObject(SdPage* pPage); - SdrTextObj* CreateOutlineTextObject(SdPage* pPage); + static SdrTextObj* CreateTitleTextObject(SdPage* pPage); + static SdrTextObj* CreateOutlineTextObject(SdPage* pPage); virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 3a25cc58ff1b..08bbf1b9b897 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -92,7 +92,7 @@ public: void GetAttrState(SfxItemSet &rSet); void GetState (SfxItemSet& rSet); - void ExecStatusBar(SfxRequest& rReq); + static void ExecStatusBar(SfxRequest& rReq); void GetStatusBarState(SfxItemSet& rSet); void FuTemporary(SfxRequest &rReq); diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 52fd77e283ad..fe039105d026 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -84,7 +84,7 @@ public: void GetStatusBarState (SfxItemSet& rSet); void FuPermanent (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); - void ExecStatusBar (SfxRequest& rRequest); + static void ExecStatusBar (SfxRequest& rRequest); virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow) SAL_OVERRIDE; void GetMenuState (SfxItemSet &rSet); void GetClipboardState (SfxItemSet &rSet); diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 6778d7dcf09d..0a33e16512b0 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -49,7 +49,7 @@ protected: bookmark list of the transferable contains at least one non-master page then NULL is returned. */ - SdPage* GetFirstMasterPage (const SdTransferable& rTransferable); + static SdPage* GetFirstMasterPage (const SdTransferable& rTransferable); /** Assign the (first) master page of the given transferable to the (...) slide. diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index c4db3e6536ae..c50ce4d8c1ba 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -177,7 +177,7 @@ private: ::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& rxController); - const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index ce591a3bb404..7b5f77318a86 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -59,30 +59,30 @@ private: const SdrObject* pObj2 ); - ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( + static ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolyStart, const ::basegfx::B2DPolyPolygon& rPolyPolyEnd, double fMorphingFactor ); - bool ImpMorphPolygons( + static bool ImpMorphPolygons( const ::basegfx::B2DPolyPolygon& rPolyPoly1, const ::basegfx::B2DPolyPolygon& rPolyPoly2, const sal_uInt16 nSteps, B2DPolyPolygonList_impl& rPolyPolyList3D ); - void ImpAddPolys( + static void ImpAddPolys( ::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx::B2DPolyPolygon& rBigger ); - void ImpEqualizePolyPointCount( + static void ImpEqualizePolyPointCount( ::basegfx::B2DPolygon& rSmall, const ::basegfx::B2DPolygon& rBig ); - sal_uInt32 ImpGetNearestIndex( + static sal_uInt32 ImpGetNearestIndex( const ::basegfx::B2DPolygon& rPoly, const ::basegfx::B2DPoint& rPos ); diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 3973b13acb22..e40c36cbd587 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -128,7 +128,7 @@ protected: DECL_LINK( DelayHdl, void * ); - void ImpForceQuadratic(Rectangle& rRect); + static void ImpForceQuadratic(Rectangle& rRect); /** Switch to another layer. The layer to switch to is specified by an offset relative to the active layer. With respect to the layer bar diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index e6dff433bc22..aae2ba0fa7a7 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -141,7 +141,7 @@ private: */ // bool mbShowAllShapes; - sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false ); + static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false ); NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); @@ -159,7 +159,7 @@ private: void ApplyImageList(); public: //when object is marked , fresh the corresponding entry tree . - sd::DrawDocShell* GetDrawDocShell(const SdDrawDocument*); + static sd::DrawDocShell* GetDrawDocShell(const SdDrawDocument*); void FreshTree ( const SdDrawDocument* pDoc ); void FreshEntry( ); }; diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 0051ce18a33f..9aafedffc6ca 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -135,7 +135,7 @@ public: sal_uLong GetMarkablePointCount() const; bool HasMarkedPoints() const; sal_uLong GetMarkedPointCount() const; - bool IsPointMarkable(const SdrHdl& rHdl) const; + static bool IsPointMarkable(const SdrHdl& rHdl); bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); bool MarkPoints(const Rectangle* pRect, bool bUnmark); diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index 9754107f4ee1..4f038c999df8 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -26,7 +26,7 @@ class SdTbxControl : public SfxToolBoxControl { private: - bool IsCheckable( sal_uInt16 nSId ); + static bool IsCheckable( sal_uInt16 nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 1837996cc4dd..37c78e703ec1 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -134,7 +134,7 @@ private: /** Transform the given string into a URL object. */ - ::com::sun::star::util::URL MakeURL (const OUString& rSlotName) const; + static ::com::sun::star::util::URL MakeURL (const OUString& rSlotName); /** Return an XDispatch object for the given URL. */ diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 8865c0579141..09ebf54a72e0 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -91,8 +91,8 @@ private: void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( OUString const & rStr ); OUString GetEditText( bool bURL = false ); - sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); - sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); + static sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); + sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index ffb600ea8f3e..ed8c5e2beea1 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -114,8 +114,8 @@ private: SfxMapUnit ePoolUnit; - OUString GetScale( sal_Int32 nX, sal_Int32 nY ); - bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ); + static OUString GetScale( sal_Int32 nX, sal_Int32 nY ); + static bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ); DECL_LINK( SelectMetricHdl_Impl, void * ); @@ -148,7 +148,7 @@ public: and arrange the visible controls. Do not call this method or the <member>SetDrawMode()</member> method more than once. */ - void SetImpressMode(); + static void SetImpressMode(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; using TabPage::ActivatePage; diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 6e644681577e..13b183ecd2d2 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -46,8 +46,8 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Search( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xText, SdUnoSearchReplaceDescriptor* pDescr ) throw(); bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); - ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); + static ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); + static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetNextShape( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xShapes, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xCurrentShape ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetCurrentShape() const throw(); diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index fefa8efe82ef..d76b66fa6588 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -66,7 +66,7 @@ class SdVectorizeDlg : public ModalDialog void InitPreviewBmp(); void UpdatePreviewMtf(); - Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ) const; + static Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ); Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ); void Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ); void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx index e013ee178c20..ad02ee424020 100644 --- a/sd/source/ui/remotecontrol/Receiver.hxx +++ b/sd/source/ui/remotecontrol/Receiver.hxx @@ -35,7 +35,7 @@ public: virtual ~Receiver(); virtual void Invoke() SAL_OVERRIDE; void pushCommand( const std::vector<OString> &rCommand ); - void executeCommand( const std::vector<OString> &aCommand ); + static void executeCommand( const std::vector<OString> &aCommand ); private: Transmitter *pTransmitter; diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index af7fe595b3e1..4d6b78204928 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -147,7 +147,7 @@ bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& } sal_Int32 MasterPageContainerQueue::CalculatePriority ( - const SharedMasterPageDescriptor& rpDescriptor) const + const SharedMasterPageDescriptor& rpDescriptor) { sal_Int32 nPriority; diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index 1aa6589c4547..150115b141bf 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -121,7 +121,7 @@ private: /** Calculate the priority that defines the order in which requests are processed. */ - sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor) const; + static sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor); DECL_LINK(DelayedPreviewCreation, Timer *); }; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 9afaf0a4b5ac..055c28e5f292 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -461,7 +461,7 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC MasterPagesSelector::UserData* MasterPagesSelector::CreateUserData ( int nIndex, - MasterPageContainer::Token aToken) const + MasterPageContainer::Token aToken) { return new UserData(nIndex,aToken); } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index e5121791277c..179f57a4089d 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -160,7 +160,7 @@ protected: virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent); typedef ::std::pair<int, MasterPageContainer::Token> UserData; - UserData* CreateUserData (int nIndex, MasterPageContainer::Token aToken) const; + static UserData* CreateUserData (int nIndex, MasterPageContainer::Token aToken); UserData* GetUserData (int nIndex) const; void SetUserData (int nIndex, UserData* pData); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index d7c2c6d178bd..075d16e2db1a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2381,7 +2381,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) return 0; } -Reference< XSlideShow > SlideshowImpl::createSlideShow() const +Reference< XSlideShow > SlideshowImpl::createSlideShow() { Reference< XSlideShow > xShow; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 61a9aaec1c0e..2840465d6ae1 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -306,9 +306,9 @@ private: void registerShapeEvents( sal_Int32 nSlideNumber ); void registerShapeEvents( css::uno::Reference< css::drawing::XShapes >& xShapes ) throw (css::uno::Exception); - css::uno::Reference< css::presentation::XSlideShow > createSlideShow() const; + static css::uno::Reference< css::presentation::XSlideShow > createSlideShow(); - void setAutoSaveState( bool bOn ); + static void setAutoSaveState( bool bOn ); void gotoPreviousSlide (const bool bSkipAllMainSequenceEffects); /** Called by PostYieldListener and updateHdl handlers this method is diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 1ee52e80f1d6..a163f2cb6e4d 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -57,7 +57,7 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) if (pTreeListBoxTransferable!=NULL && !TransferableData::GetFromTransferable(pTransferable)) { pTransferable->AddUserData( - rSlideSorter.GetController().GetClipboard().CreateTransferableUserData(pTransferable)); + sd::slidesorter::controller::Clipboard::CreateTransferableUserData(pTransferable)); } rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx index dfeb851664ba..2ac9ec9568b5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx @@ -51,7 +51,7 @@ private: const double mnX2; const double mnY2; - double EvaluateComponent ( + static double EvaluateComponent ( const double nT, const double nV1, const double nV2); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 76bc0ec9ace4..2805d874be8a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -66,7 +66,7 @@ public: transferable. The returned transferable is set up with all information necessary so that it can be dropped on a slide sorter. */ - ::boost::shared_ptr<SdTransferable::UserData> CreateTransferableUserData (SdTransferable* pTransferable); + static ::boost::shared_ptr<SdTransferable::UserData> CreateTransferableUserData (SdTransferable* pTransferable); void HandleSlotCall (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index ecda1a7bb951..c47a1eb88c33 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -97,14 +97,14 @@ private: PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) const; - void PaintTransitionEffect ( + static void PaintTransitionEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const; - void PaintCustomAnimationEffect ( + const model::SharedPageDescriptor& rpDescriptor); + static void PaintCustomAnimationEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const; + const model::SharedPageDescriptor& rpDescriptor); void PaintBorder ( OutputDevice& rDevice, const Theme::GradientColorType eColorType, @@ -114,11 +114,11 @@ private: OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) const; - Bitmap CreateMarkedPreview( + static Bitmap CreateMarkedPreview( const Size& rSize, const Bitmap& rPreview, const BitmapEx& rOverlay, - const OutputDevice* pReferenceDevice) const; + const OutputDevice* pReferenceDevice); /** Update the local pointer to the page object layouter to the one owned by the general layouter. diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 3d68dec61e4e..cb571c41dfcf 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -141,11 +141,11 @@ public: index of the lower row (nRow+1) or -1 to indicate that the position belongs to no row. */ - sal_Int32 ResolvePositionInGap ( + static sal_Int32 ResolvePositionInGap ( sal_Int32 nDistanceIntoGap, GapMembership eGapMembership, sal_Int32 nIndex, - sal_Int32 nGap) const; + sal_Int32 nGap); /** Calculate the logical part of the insert position, i.e. the page after whicht to insert. @@ -628,7 +628,7 @@ sal_Int32 Layouter::Implementation::ResolvePositionInGap ( sal_Int32 nDistanceIntoGap, GapMembership eGapMembership, sal_Int32 nIndex, - sal_Int32 nGap) const + sal_Int32 nGap) { switch (eGapMembership) { diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index d7f9393d467f..4aebbbef8a9a 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -158,7 +158,7 @@ Bitmap PageObjectPainter::CreateMarkedPreview ( const Size& rSize, const Bitmap& rPreview, const BitmapEx& rOverlay, - const OutputDevice* pReferenceDevice) const + const OutputDevice* pReferenceDevice) { ScopedVclPtr<VirtualDevice> pDevice; if (pReferenceDevice != NULL) @@ -270,7 +270,7 @@ void PageObjectPainter::PaintPageNumber ( void PageObjectPainter::PaintTransitionEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const + const model::SharedPageDescriptor& rpDescriptor) { const SdPage* pPage = rpDescriptor->GetPage(); if (pPage!=NULL && pPage->getTransitionType() > 0) @@ -289,7 +289,7 @@ void PageObjectPainter::PaintTransitionEffect ( void PageObjectPainter::PaintCustomAnimationEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const + const model::SharedPageDescriptor& rpDescriptor) { SdPage* pPage = rpDescriptor->GetPage(); boost::shared_ptr< MainSequence > aMainSequence = pPage->getMainSequence(); diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index b508abdd4ae3..2167e761f2f2 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -93,7 +93,7 @@ void SlotStateListener::disposing() maCallback = Link<>(); } -util::URL SlotStateListener::MakeURL (const OUString& rSlotName) const +util::URL SlotStateListener::MakeURL (const OUString& rSlotName) { util::URL aURL; aURL.Complete = rSlotName; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 14230cb9f43e..8f00559c515e 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -626,7 +626,7 @@ namespace { maProperties.push_back( aVal ); } - Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId) const + static Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId) { SdResId aResourceId (nResourceId); ResStringArray aChoiceStrings (aResourceId); diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 67cc9552500f..403230c7f1f6 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -321,7 +321,7 @@ private: ImplSVEvent * mnPendingSetValidCall; ToolBarRules maToolBarRules; - OUString GetToolBarResourceName (const OUString& rsBaseName) const; + static OUString GetToolBarResourceName (const OUString& rsBaseName); bool CheckPlugInMode (const OUString& rsName) const; DECL_LINK(UpdateCallback, void *); @@ -896,7 +896,7 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) } OUString ToolBarManager::Implementation::GetToolBarResourceName ( - const OUString& rsBaseName) const + const OUString& rsBaseName) { OUString sToolBarName (msToolBarResourcePrefix); sToolBarName += rsBaseName; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 4b38aa92506f..d5ebaf6c8a07 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -216,7 +216,7 @@ private: undo managers. Afterwards the Deactivate() of the shell is called. */ - void Deactivate (SfxShell* pShell); + static void Deactivate (SfxShell* pShell); ShellDescriptor CreateSubShell ( SfxShell* pShell, @@ -224,7 +224,7 @@ private: vcl::Window* pParentWindow, FrameView* pFrameView); void DestroyViewShell (ShellDescriptor& rDescriptor); - void DestroySubShell ( + static void DestroySubShell ( const SfxShell& rViewShell, const ShellDescriptor& rDescriptor); }; diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index a222d8a0a393..59ada2769de4 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1590,7 +1590,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) return false; ::Outliner& rOutliner = pOlView->GetOutliner(); - SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); + SdrTextObj* pTO = OutlineView::GetTitleTextObject( pPage ); OUString aTest = rOutliner.GetText(pPara); bool bText = !aTest.isEmpty(); @@ -1602,7 +1602,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) if( !pTO ) { DBG_ASSERT( pOlView->isRecordingUndo(), "sd::OutlineViewShell::UpdateTitleObject(), no undo for model change!?" ); - pTO = pOlView->CreateTitleTextObject(pPage); + pTO = OutlineView::CreateTitleTextObject(pPage); bNewObject = true; } @@ -1680,7 +1680,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( !pTO ) { eOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; - pTO = pOlView->GetOutlineTextObject( pPage ); + pTO = OutlineView::GetOutlineTextObject( pPage ); } // how many paragraphs in the outline? @@ -1706,7 +1706,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) // do we need an outline text object? if( !pTO ) { - pTO = pOlView->CreateOutlineTextObject( pPage ); + pTO = OutlineView::CreateOutlineTextObject( pPage ); bNewObject = true; } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 1eca9a1f3788..a9aac3f4412f 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1170,7 +1170,7 @@ sal_uLong View::GetMarkedPointCount() const bool View::IsPointMarkable(const SdrHdl& rHdl) const { - if( maSmartTags.IsPointMarkable( rHdl ) ) + if( SmartTagSet::IsPointMarkable( rHdl ) ) return true; else return FmFormView::IsPointMarkable( rHdl ); |