diff options
80 files changed, 284 insertions, 209 deletions
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index a28d605b3af3..ebe91520a7d5 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -111,16 +111,6 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) if (cdc.Class("BitmapInfoAccess").GlobalNamespace()) { return true; } - // the unotools and svl config code stuff is doing weird stuff with a reference-counted statically allocated pImpl class - if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/unotools/")) { - return true; - } - if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/svl/")) { - return true; - } - if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/framework/") || loplugin::hasPathnamePrefix(aFilename, SRCDIR "/framework/")) { - return true; - } // there is some odd stuff happening here I don't fully understand, leave it for now if (loplugin::hasPathnamePrefix(aFilename, SRCDIR "/include/canvas/") || loplugin::hasPathnamePrefix(aFilename, SRCDIR "/canvas/")) { return true; @@ -145,7 +135,23 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) { return true; } + auto fdc = loplugin::DeclCheck(pCXXMethodDecl); + + // somebody has work-in-progress here + if ((fdc.Function("getCurrZeroChar") + .Class("LocaleDataWrapper").GlobalNamespace())) + return true; + + // the unotools and svl config code stuff is doing weird stuff with a reference-counted statically allocated pImpl class + if ((fdc.Function("getByName2") + .Class("GlobalEventConfig").GlobalNamespace())) + return true; + if ((cdc.Class("SvtLinguConfig").GlobalNamespace())) + return true; + if ((cdc.Class("SvtModuleOptions").GlobalNamespace())) + return true; + // only empty on Linux, not on windows if ((fdc.Function("GetVisualRepresentationInNativeFormat_Impl") .Class("OleEmbeddedObject").GlobalNamespace()) diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index e0ce4a3a6377..390621a0cdd9 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -231,8 +231,8 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet* ) } if( pImpl->xPrSet.is() ) pImpl->xPrSetInfo = pImpl->xPrSet->getPropertySetInfo(); - bool bKernWesternText = pImpl->aConfig.IsKerningWesternTextOnly(); - CharCompressType nCompress = pImpl->aConfig.GetCharDistanceCompression(); + bool bKernWesternText = SvxAsianConfig::IsKerningWesternTextOnly(); + CharCompressType nCompress = SvxAsianConfig::GetCharDistanceCompression(); if(pImpl->xPrSetInfo.is()) { OUString sForbidden("ForbiddenCharacters"); @@ -342,7 +342,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, weld::ComboBox&, void) } else { - bAvail = pImpl->aConfig.GetStartEndChars( aLocale, sStart, sEnd ); + bAvail = SvxAsianConfig::GetStartEndChars( aLocale, sStart, sEnd ); } if(!bAvail) { diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index da553fa9e137..9ac0170b072f 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -82,19 +82,19 @@ class ActionTriggerPropertySet final : private cppu::BaseMutex, // helper /// @throws css::lang::IllegalArgumentException - bool impl_tryToChangeProperty( const OUString& aCurrentValue , + static bool impl_tryToChangeProperty( const OUString& aCurrentValue , const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ); /// @throws css::lang::IllegalArgumentException - bool impl_tryToChangeProperty( const css::uno::Reference< css::awt::XBitmap >& xBitmap, + static bool impl_tryToChangeProperty( const css::uno::Reference< css::awt::XBitmap >& xBitmap, const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ); /// @throws css::lang::IllegalArgumentException - bool impl_tryToChangeProperty( const css::uno::Reference< css::uno::XInterface >& xInterface, + static bool impl_tryToChangeProperty( const css::uno::Reference< css::uno::XInterface >& xInterface, const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ); diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index 0d0b62b4907b..25d9084a1fb5 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -81,7 +81,7 @@ class ActionTriggerSeparatorPropertySet final : private cppu::BaseMutex, /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , + static bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ); diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 84035642ebf7..9ecb06abda13 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -105,10 +105,10 @@ class HandlerCache final HandlerCache(); ~HandlerCache(); - bool search( const OUString& sURL, ProtocolHandler* pReturn ) const; - bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const; + static bool search( const OUString& sURL, ProtocolHandler* pReturn ); + static bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ); - void takeOver(HandlerHash aHandler, PatternHash aPattern); + static void takeOver(HandlerHash aHandler, PatternHash aPattern); }; /** diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index c6656948ebee..456b1f0e2a59 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -99,7 +99,7 @@ class DispatchProvider final : public ::cppu::WeakImplHelper< css::frame::XDispa const css::uno::Reference< css::frame::XFrame >& xOwner , const OUString& sTarget = OUString() , sal_Int32 nSearchFlags = 0 ); - bool implts_isLoadableContent ( const css::util::URL& aURL ); + static bool implts_isLoadableContent ( const css::util::URL& aURL ); css::uno::Reference< css::frame::XDispatch > implts_queryDesktopDispatch ( const css::uno::Reference< css::frame::XFrame >& xDesktop , const css::util::URL& aURL , const OUString& sTargetFrameName , diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index 67a36b724624..8badbc1ca20c 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -89,7 +89,7 @@ class SystemExec final : public ::cppu::WeakImplHelper< /* internal */ private: - void impl_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, + static void impl_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, const sal_Int16 nState ); }; // class SystemExec diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 9c444953a042..4ca28b843463 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -135,7 +135,7 @@ class OComponentAccess final : public ::cppu::WeakImplHelper< css::container::XE and must collect all information. *//*-*****************************************************************************************************/ - void impl_collectAllChildComponents( const css::uno::Reference< css::frame::XFramesSupplier >& xNode , + static void impl_collectAllChildComponents( const css::uno::Reference< css::frame::XFramesSupplier >& xNode , std::vector< css::uno::Reference< css::lang::XComponent > >& seqComponents ); /*-**************************************************************************************************** @@ -150,7 +150,7 @@ class OComponentAccess final : public ::cppu::WeakImplHelper< css::container::XE @onerror A null reference is returned. *//*-*****************************************************************************************************/ - css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; + static css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ); css::uno::WeakReference< css::frame::XDesktop > m_xOwner; /// weak reference to the desktop object! diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index d29063407aa4..d626f07d1a52 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -175,7 +175,7 @@ class OFrames final : public ::cppu::WeakImplHelper< css::frame::XFrames > @param "seqSource" , reference to sequence for append. @return "seqDestination" is parameter AND return value at the same time. */ - void impl_appendSequence( css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqDestination , + static void impl_appendSequence( css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqDestination , const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqSource ); static bool impldbg_checkParameter_queryFrames ( sal_Int32 nSearchFlags ); diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 11aba17dc4a7..cad8d91f042c 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -129,7 +129,7 @@ class TitleBarUpdate final : public ::cppu::WeakImplHelper< the frame which contains the component and where the title must be set on the window title bar. */ - void impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame); + static void impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame); //Hook to set GNOME3/Windows 7 applicationID for toplevel frames //http://msdn.microsoft.com/en-us/library/dd378459(v=VS.85).aspx diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index 9152da515969..736c0630fb7b 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -115,7 +115,7 @@ class ShellJob final : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,cs @return sal_True if command was executed successfully; sal_False otherwise. */ - bool impl_execute(const OUString& sCommand , + static bool impl_execute(const OUString& sCommand , const css::uno::Sequence< OUString >& lArguments , bool bCheckExitCode); }; diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 2cec0b9a3017..ae820c29b10f 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -76,11 +76,11 @@ class ConstItemContainer final : public ::cppu::WeakImplHelper< virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override; private: - ::cppu::IPropertyArrayHelper& getInfoHelper(); - css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); + static ::cppu::IPropertyArrayHelper& getInfoHelper(); + static css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector ); - css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer ); + static css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer ); std::vector< css::uno::Sequence< css::beans::PropertyValue > > m_aItemVector; OUString m_aUIName; diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index 0e8ecbae6ca7..f6c07c206128 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -46,7 +46,7 @@ class ImageButtonToolbarController final : public ComplexToolbarController private: virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; - bool ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ); + static bool ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ); }; } diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index 927beea584af..b15514f66648 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -66,7 +66,7 @@ class ItemContainer final : public ::cppu::WeakImplHelper< css::container::XInde private: void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex ); - css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex ); + static css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex ); mutable ShareableMutex m_aShareMutex; std::vector< css::uno::Sequence< css::beans::PropertyValue > > m_aItemVector; diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 7036be08a21b..1beb2961e690 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -162,7 +162,7 @@ class MenuBarManager final : const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier ); void AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId); - sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; + static sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex); void SetHdl(); bool m_bDeleteMenu; diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 45b5e8f88696..abc10e03e678 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -57,7 +57,7 @@ namespace framework virtual void impl_setPopupMenu() override; void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu ); - void retrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg, + static void retrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg, const css::uno::Sequence< OUString >& rCommands, std::vector< vcl::KeyCode >& aMenuShortCuts ); void setAccelerators(); diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 609f4ec012e1..796a5e00b277 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -57,7 +57,7 @@ class SpinfieldToolbarController final : public ComplexToolbarController virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; - bool impl_getValue( const css::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat ); + static bool impl_getValue( const css::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat ); bool m_bFloat; double m_nMax; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index dc80fbcfa835..6af5e93aea65 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -205,7 +205,7 @@ class ToolBarManager final : public ToolbarManager_Base //end void AddFrameActionListener(); void RefreshImages(); - ToolBoxItemBits ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); + static ToolBoxItemBits ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); css::uno::Reference< css::frame::XModel > GetModelFromFrame() const; bool IsPluginMode() const; void HandleClick(ClickAction eAction); diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index cbb11437057c..23d07ef509d6 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -71,7 +71,7 @@ namespace framework virtual void initializeImpl( std::unique_lock<std::mutex>& rGuard, const css::uno::Sequence< css::uno::Any >& aArguments ) override; void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu ); - css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getLayoutManagerToolbars( const css::uno::Reference< css::frame::XLayoutManager >& rLayoutManager ); + static css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getLayoutManagerToolbars( const css::uno::Reference< css::frame::XLayoutManager >& rLayoutManager ); css::uno::Reference< css::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL ); void addCommand( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu, const OUString& rCommandURL, const OUString& aLabel ); diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index ae5580675b24..149a72f33632 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -68,7 +68,7 @@ class AcceleratorConfigurationWriter final private: /** @short TODO */ - void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , + static void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ); }; diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 0dff986fa91e..4f34dfc0141b 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -464,7 +464,8 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(bool bWriteAcces return m_aReadCache; } -OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const +// static +OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() { OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get(); @@ -1311,7 +1312,8 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(bool bPreferred, } } -OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const +// static +OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() { OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get(); diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 0572049ab785..f1879af97f70 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -619,6 +619,7 @@ void PresetHandler::removeStorageListener(XMLBasedAcceleratorConfiguration* pLis } } +// static css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , bool bShare) @@ -638,6 +639,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring return xPath; } +// static ::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue( const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag, @@ -662,6 +664,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring return pFound; } +// static css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors( OUString& sPath , sal_Int32 eMode , @@ -699,6 +702,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat return xLocalePath; } +// static ::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder) { if (!xFolder.is()) diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 8328e9c422b0..a1125016ce30 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -436,7 +436,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt ProtocolHandler aHandler; // This member is threadsafe by himself and lives if we live - we don't need any mutex here. - if (m_aProtocolHandlerCache.search(aURL,&aHandler)) + if (framework::HandlerCache::search(aURL,&aHandler)) { css::uno::Reference< css::frame::XDispatchProvider > xHandler; { @@ -574,6 +574,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat @threadsafe yes */ +// static bool DispatchProvider::implts_isLoadableContent( const css::util::URL& aURL ) { LoadEnv::EContentType eType = LoadEnv::classifyContent(aURL.Complete, css::uno::Sequence< css::beans::PropertyValue >()); diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 4592174df5ad..36790f9d7aa1 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -264,6 +264,7 @@ Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescriptor( }; } +// static bool ActionTriggerPropertySet::impl_tryToChangeProperty( const OUString& sCurrentValue , const Any& aNewValue , @@ -298,6 +299,7 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty( return bReturn; } +// static bool ActionTriggerPropertySet::impl_tryToChangeProperty( const Reference< XBitmap >& aCurrentValue , const Any& aNewValue , @@ -332,6 +334,7 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty( return bReturn; } +// static bool ActionTriggerPropertySet::impl_tryToChangeProperty( const Reference< XInterface >& aCurrentValue , const Any& aNewValue , diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index 104d765f5ca3..2f46ae5f0579 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -206,6 +206,7 @@ Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticPropertyDe }; } +// static bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty( sal_Int16 aCurrentValue , const Any& aNewValue , diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 160155ccf8bb..6f9dc8d87130 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -295,16 +295,16 @@ class AddonsOptions_Impl : public ConfigItem void ReadMergeStatusbarData( std::u16string_view aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbar ); bool ReadMenuItem( std::u16string_view aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu = false ); bool ReadPopupMenu( std::u16string_view aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ); - void AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ); + static void AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ); bool ReadToolBarItem( std::u16string_view aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ); bool ReadNotebookBarItem( std::u16string_view aNotebookBarItemNodeName, Sequence< PropertyValue >& aNotebookBarItem ); bool ReadStatusBarItem( std::u16string_view aStatusbarItemNodeName, Sequence< PropertyValue >& aStatusbarItem ); std::unique_ptr<ImageEntry> ReadImageData( std::u16string_view aImagesNodeName ); void ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId ); - BitmapEx ReadImageFromURL( const OUString& aURL ); + static BitmapEx ReadImageFromURL( const OUString& aURL ); bool HasAssociatedImages( const OUString& aURL ); - void SubstituteVariables( OUString& aURL ); + static void SubstituteVariables( OUString& aURL ); void ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu ); OUString GeneratePrefixURL(); @@ -319,7 +319,7 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesStatusbarItem( std::u16string_view aPropertyRootNode ) const; Sequence< OUString > GetPropertyNamesImages( std::u16string_view aPropertyRootNode ) const; - bool CreateImageFromSequence( BitmapEx& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; + static bool CreateImageFromSequence( BitmapEx& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ); DECL_LINK(NotifyEvent, void*, void); @@ -1381,6 +1381,7 @@ bool AddonsOptions_Impl::ReadPopupMenu( std::u16string_view aPopupMenuNodeName, return bResult; } +// static void AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ) { Sequence< Sequence< PropertyValue > > aTargetSubMenuSeq; @@ -1547,12 +1548,14 @@ bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL ) return ( pIter != m_aImageManager.end() ); } +// static void AddonsOptions_Impl::SubstituteVariables( OUString& aURL ) { aURL = comphelper::getExpandedUri( comphelper::getProcessComponentContext(), aURL); } +// static BitmapEx AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) { BitmapEx aImage; @@ -1651,7 +1654,8 @@ std::unique_ptr<AddonsOptions_Impl::ImageEntry> AddonsOptions_Impl::ReadImageDat return pEntry; } -bool AddonsOptions_Impl::CreateImageFromSequence( BitmapEx& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const +// static +bool AddonsOptions_Impl::CreateImageFromSequence( BitmapEx& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) { bool bResult = false; diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 004cd59383af..c5e0255a2a41 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -517,6 +517,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_sendTitleChangedEvent (); } +// static void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent) { @@ -527,6 +528,7 @@ void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle.append (xTitle->getTitle ()); } +// static void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) { OUString name(utl::ConfigManager::getProductName()); @@ -576,6 +578,7 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) } #ifdef DBG_UTIL +// static void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) { OUString version(utl::ConfigManager::getProductVersion()); @@ -592,6 +595,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer&) } #endif +// static void TitleHelper::impl_appendSafeMode (OUStringBuffer& sTitle) { if (Application::IsSafeModeEnabled()) @@ -653,6 +657,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl xNewBroadcaster->addTitleChangeListener (xThis); } +// static OUString TitleHelper::impl_convertURL2Title(std::u16string_view sURL) { INetURLObject aURL (sURL); diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 490e2c91075e..97831aca5e94 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -123,7 +123,8 @@ HandlerCache::~HandlerCache() @descr It frees all used memory. In further implementations (may if we support write access too) it's a good place to flush changes back to the configuration - but not needed yet. */ -bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) const +// static +bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) { bool bFound = false; @@ -145,11 +146,13 @@ bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) cons and call our other search method ... It's a helper for outside code. */ -bool HandlerCache::search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const +// static +bool HandlerCache::search( const css::util::URL& aURL, ProtocolHandler* pReturn ) { return search( aURL.Complete, pReturn ); } +// static void HandlerCache::takeOver(HandlerHash aHandler, PatternHash aPattern) { SolarMutexGuard aGuard; @@ -245,7 +248,7 @@ void HandlerCFGAccess::Notify(const css::uno::Sequence< OUString >& /*lPropertyN read(aHandler, aPattern); if (m_pCache) - m_pCache->takeOver(std::move(aHandler), std::move(aPattern)); + framework::HandlerCache::takeOver(std::move(aHandler), std::move(aPattern)); } void HandlerCFGAccess::ImplCommit() diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index ad7409990d25..08057509eab6 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -103,7 +103,7 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() return bReturn; } - +// static void OComponentAccess::impl_collectAllChildComponents( const css::uno::Reference< XFramesSupplier >& xNode , std::vector< css::uno::Reference< XComponent > >& seqComponents ) { @@ -131,7 +131,8 @@ void OComponentAccess::impl_collectAllChildComponents( const css::uno::Referenc // ... otherwise break a recursive path and go back at current stack! } -css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const +// static +css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) { // Set default return value, if method failed. css::uno::Reference< XComponent > xComponent; diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index add4ea9709b8..232243a83689 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -286,6 +286,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra // <- VCL SYNCHRONIZED } +// static void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame) { // no window ... no chance to set any title -> return diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index ddd4b3b25784..050c8d950475 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -149,7 +149,7 @@ class XMLBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper< @return OUString The current office locale as BCP47 string. */ - OUString impl_ts_getLocale() const; + static OUString impl_ts_getLocale(); // helper @@ -290,7 +290,7 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper< @return OUString The current office locale as BCP47 string. */ - OUString impl_ts_getLocale() const; + static OUString impl_ts_getLocale(); // helper diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 88429a0122f1..b387655f3db9 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -117,7 +117,7 @@ class KeyMapping @return [boolean] sal_True if conversion was successful. */ - bool impl_st_interpretIdentifierAsPureKeyCode(std::u16string_view sIdentifier, + static bool impl_st_interpretIdentifierAsPureKeyCode(std::u16string_view sIdentifier, sal_uInt16& rCode ); }; diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index b0fee38b4347..18a20a4b2016 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -299,7 +299,7 @@ class PresetHandler @return An opened storage in case method was successful - null otherwise. */ - css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const OUString& sPath , + static css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , bool bShare); @@ -325,7 +325,7 @@ class PresetHandler @return An iterator, which points directly into lLocalizedValue list. As a negative result the special iterator lLocalizedValues.end() will be returned. */ - ::std::vector< OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< OUString >& lLocalizedValues, + static ::std::vector< OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag , bool bAllowFallbacks ); @@ -356,7 +356,7 @@ class PresetHandler @return An opened storage in case method was successful - null otherwise. */ - css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(OUString& sPath , + static css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(OUString& sPath , sal_Int32 eMode , bool bShare , OUString& rLanguageTag , @@ -370,7 +370,7 @@ class PresetHandler @return [vector< string >] a list of folder names. */ - ::std::vector< OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder); + static ::std::vector< OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder); }; } // namespace framework diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index baad8fac9b7f..3fba486c8161 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -504,7 +504,7 @@ private: If it's set to sal_True... both actions has to be done: setVisible(), toFront()! This mode is needed by a) */ - void impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , + static void impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , bool bForceToFront); /** @short checks whether a frame is already used for another load request or not. @@ -518,7 +518,7 @@ private: sal_True if this frame is already used for loading, sal_False otherwise. */ - bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const; + static bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame); /** @short try to determine the used application module of this load request and apply right position and size diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index fe14de710ed7..46bbe90fc17d 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -1051,7 +1051,8 @@ void ToolbarLayoutManager::setDockingAreaOffsets( const ::tools::Rectangle& rOff m_bLayoutDirty = true; } -OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const +// static +OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) { OUString aAddonGenericTitle(FwkResId(STR_TOOLBAR_TITLE_ADDON)); const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); @@ -2556,6 +2557,7 @@ void ToolbarLayoutManager::implts_setLayoutInProgress( bool bInProgress ) m_bLayoutInProgress = bInProgress; } +// static ::tools::Rectangle ToolbarLayoutManager::implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset ) { ::tools::Rectangle aRect( rRect ); @@ -2947,6 +2949,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( } } +// static framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_determineDockingOperation( ui::DockingArea DockingArea, const ::tools::Rectangle& rRowColRect, @@ -3065,6 +3068,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d return aTrackingRect; } +// static void ToolbarLayoutManager::implts_setTrackingRect( ui::DockingArea eDockingArea, const ::Point& rMousePos, ::tools::Rectangle& rTrackingRect ) { ::Point aPoint( rTrackingRect.TopLeft()); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 5e21438c8cfc..629f50b2b4a2 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -184,7 +184,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW ::tools::Rectangle implts_calcDockingArea(); void implts_sortUIElements(); void implts_reparentToolbars(); - OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; + static OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ); void implts_setElementData( UIElement& rUIElement, const css::uno::Reference< css::awt::XDockableWindow >& rDockWindow ); void implts_destroyDockingAreaWindows(); @@ -214,9 +214,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW // internal docking methods - ::tools::Rectangle implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset ); + static ::tools::Rectangle implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset ); void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::tools::Rectangle& rTrackingRect, const Point& rMousePos ); - DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::tools::Rectangle& rRowColRect, const Point& rMousePos ); + static DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::tools::Rectangle& rRowColRect, const Point& rMousePos ); ::tools::Rectangle implts_getWindowRectFromRowColumn( css::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, std::u16string_view rExcludeElementName ); ::tools::Rectangle implts_determineFrontDockingRect( css::ui::DockingArea eDockingArea, sal_Int32 nRowCol, @@ -233,7 +233,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW void implts_getDockingAreaElementInfos( css::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData ); void implts_getDockingAreaElementInfoOnSingleRowCol( css::ui::DockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData ); void implts_findNextDockingPos( css::ui::DockingArea DockingArea, const ::Size& aUIElementSize, css::awt::Point& rVirtualPos, ::Point& rPixelPos ); - void implts_setTrackingRect( css::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::tools::Rectangle& rTrackingRect ); + static void implts_setTrackingRect( css::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::tools::Rectangle& rTrackingRect ); // creation methods diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 277e69fae8af..5871c56619ab 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1433,7 +1433,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() return xResult; } -bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const +// static +bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY); @@ -1703,6 +1704,7 @@ bool LoadEnv::shouldFocusAndToFront() const && officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(); } +// static void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , bool bForceToFront) { diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 6852be6dc954..d1341bee4dba 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -941,7 +941,7 @@ private: Note: This method can't fail. Flushing of config entries is an optional feature. Errors can be ignored. */ - void impl_flushALLConfigChanges(); + static void impl_flushALLConfigChanges(); // TODO document me AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource , @@ -1006,11 +1006,11 @@ private: @param rArgs is used to set the new created progress as parameter on these set. */ - void impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo , + static void impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); - void impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , + static void impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); @@ -4183,6 +4183,7 @@ void AutoRecovery::impl_showFullDiscError() xBox->run(); } +// static void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4248,6 +4249,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR, xInternalProgress); } +// static void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4282,6 +4284,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& } } +// static void AutoRecovery::impl_flushALLConfigChanges() { try diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 34024b45f5ad..0cbc1ca68f9d 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -354,7 +354,7 @@ private: // non threadsafe void impl_checkMenuCloser ( ); - void impl_setCloser ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , bool bState ); + static void impl_setCloser ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , bool bState ); void disableLayoutManager(const css::uno::Reference< css::frame::XLayoutManager2 >& xLayoutManager); @@ -3213,7 +3213,7 @@ void XFrameImpl::implts_checkSuicide() @param bState <TRUE/> enable; <FALSE/> disable this state */ - +// static void XFrameImpl::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame2 >& xFrame , /*IN*/ bool bState ) { diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 36237e824edc..90cbb3281e10 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -348,8 +348,7 @@ private: /** filter "real user defined paths" from the old configuration schema and set it as UserPaths on the new schema. Can be removed with new major release ... */ - - void impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, + static void impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, const std::vector<OUString>& lOld ); /** reload one path directly from the new configuration schema (because @@ -361,7 +360,7 @@ private: or check if the given path value uses paths, which can be replaced with predefined placeholder variables ... */ - void impl_subst(std::vector<OUString>& lVals , + static void impl_subst(std::vector<OUString>& lVals , const css::uno::Reference< css::util::XStringSubstitution >& xSubst , bool bReSubst); @@ -369,14 +368,14 @@ private: bool bReSubst); /** converts our new string list schema to the old ";" separated schema ... */ - OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const; - std::vector<OUString> impl_convertOldStyle2Path(std::u16string_view sOldStylePath) const; + static OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ); + static std::vector<OUString> impl_convertOldStyle2Path(std::u16string_view sOldStylePath); /** remove still known paths from the given lList argument. So real user defined paths can be extracted from the list of fix internal paths ! */ - void impl_purgeKnownPaths(PathSettings::PathInfo& rPath, + static void impl_purgeKnownPaths(PathSettings::PathInfo& rPath, std::vector<OUString>& lList); /** rebuild the member m_lPropDesc using the path list m_lPaths. */ @@ -395,8 +394,8 @@ private: const PathSettings::PathInfo* impl_getPathAccessConst(sal_Int32 nHandle) const; /** it checks, if the given path value seems to be a valid URL or system path. */ - bool impl_isValidPath(std::u16string_view sPath) const; - bool impl_isValidPath(const std::vector<OUString>& lPath) const; + static bool impl_isValidPath(std::u16string_view sPath); + static bool impl_isValidPath(const std::vector<OUString>& lPath); void impl_storePath(const PathSettings::PathInfo& aPath); @@ -662,6 +661,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) } } +// static void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, const std::vector<OUString>& lOld ) { @@ -911,6 +911,7 @@ void PathSettings::impl_notifyPropListener( std::u16string_view sPath, } } +// static void PathSettings::impl_subst(std::vector<OUString>& lVals , const css::uno::Reference< css::util::XStringSubstitution >& xSubst , bool bReSubst) @@ -940,7 +941,8 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , aPath.sWritePath = xSubst->substituteVariables(aPath.sWritePath, false); } -OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const +// static +OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) { OUStringBuffer sPathVal(256); @@ -966,7 +968,8 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r return sPathVal.makeStringAndClear(); } -std::vector<OUString> PathSettings::impl_convertOldStyle2Path(std::u16string_view sOldStylePath) const +// static +std::vector<OUString> PathSettings::impl_convertOldStyle2Path(std::u16string_view sOldStylePath) { std::vector<OUString> lList; sal_Int32 nToken = 0; @@ -981,6 +984,7 @@ std::vector<OUString> PathSettings::impl_convertOldStyle2Path(std::u16string_vie return lList; } +// static void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath, std::vector<OUString>& lList) { @@ -1211,7 +1215,8 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , *pOrgPath = std::move(aChangePath); } -bool PathSettings::impl_isValidPath(const std::vector<OUString>& lPath) const +// static +bool PathSettings::impl_isValidPath(const std::vector<OUString>& lPath) { for (auto const& path : lPath) { @@ -1222,7 +1227,8 @@ bool PathSettings::impl_isValidPath(const std::vector<OUString>& lPath) const return true; } -bool PathSettings::impl_isValidPath(std::u16string_view sPath) const +// static +bool PathSettings::impl_isValidPath(std::u16string_view sPath) { // allow empty path to reset a path. // idea by LLA to support empty paths diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index b575233065f8..2803dfed7058 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -162,11 +162,11 @@ protected: // Special case (transient) values can change during runtime! // Don't store them in the pre defined struct - OUString GetWorkPath() const; - OUString GetWorkVariableValue() const; - OUString GetPathVariableValue() const; + static OUString GetWorkPath(); + static OUString GetWorkVariableValue(); + static OUString GetPathVariableValue(); - OUString GetHomeVariableValue() const; + static OUString GetHomeVariableValue(); // XStringSubstitution implementation methods /// @throws css::container::NoSuchElementException @@ -238,7 +238,8 @@ OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUS return impl_getSubstituteVariableValue( aVariable ); } -OUString SubstitutePathVariables::GetWorkPath() const +// static +OUString SubstitutePathVariables::GetWorkPath() { OUString aWorkPath; css::uno::Reference< css::container::XHierarchicalNameAccess > xPaths(officecfg::Office::Paths::Paths::get(), css::uno::UNO_QUERY_THROW); @@ -249,7 +250,8 @@ OUString SubstitutePathVariables::GetWorkPath() const return aWorkPath; } -OUString SubstitutePathVariables::GetWorkVariableValue() const +// static +OUString SubstitutePathVariables::GetWorkVariableValue() { OUString aWorkPath; std::optional<OUString> x(officecfg::Office::Paths::Variables::Work::get()); @@ -265,7 +267,8 @@ OUString SubstitutePathVariables::GetWorkVariableValue() const return aWorkPath; } -OUString SubstitutePathVariables::GetHomeVariableValue() const +// static +OUString SubstitutePathVariables::GetHomeVariableValue() { osl::Security aSecurity; OUString aHomePath; @@ -274,7 +277,8 @@ OUString SubstitutePathVariables::GetHomeVariableValue() const return aHomePath; } -OUString SubstitutePathVariables::GetPathVariableValue() const +// static +OUString SubstitutePathVariables::GetPathVariableValue() { OUString aRetStr; const char* pEnv = getenv( "PATH" ); diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index a4db7856d30a..7a60b6275a64 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -90,7 +90,7 @@ private: const css::awt::Rectangle& aPosSize , bool bTopWindow ); - void implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const; + static void implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow); css::uno::Reference< css::frame::XFrame2 > implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow , @@ -99,9 +99,9 @@ private: void implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ); void implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame2 >& xFrame ); - void implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ); + static void implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ); - OUString impl_filterNames( const OUString& sName ); + static OUString impl_filterNames( const OUString& sName ); }; TaskCreatorService::TaskCreatorService(css::uno::Reference< css::uno::XComponentContext > xContext) @@ -203,7 +203,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI return css::uno::Reference< css::uno::XInterface >(xFrame, css::uno::UNO_QUERY_THROW); } -void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const +// static +void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { // SYNCHRONIZED -> SolarMutexGuard aSolarGuard; @@ -317,6 +318,7 @@ void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Re pPersistentStateHandler->initialize(lInitData); } +// static void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { // Special feature: It's allowed for frames using a top level window only! @@ -336,6 +338,7 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen pHelper->initialize(lInitData); } +// static OUString TaskCreatorService::impl_filterNames( const OUString& sName ) { OUString sFiltered; diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index a91b0123a597..453a3160566c 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -114,6 +114,7 @@ void ImageButtonToolbarController::executeControlCommand( const css::frame::Cont } } +// static bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ) { std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aImageURL, StreamMode::STD_READ )); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 0eb7705e66fd..8194cfc8e25f 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1544,7 +1544,8 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sI m_aMenuItemHandlerVector.push_back( std::move(pMenuItemHandler) ); } -sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const +// static +sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) { sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex ); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index fb133540c358..e4f7a661aa9c 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -242,6 +242,7 @@ void NewMenuController::setAccelerators() } } +// static void NewMenuController::retrieveShortcutsFromConfiguration( const Reference< XAcceleratorConfiguration >& rAccelCfg, const Sequence< OUString >& rCommands, diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 729bd717da21..e660eb04b0a1 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -386,6 +386,7 @@ void SpinfieldToolbarController::executeControlCommand( const css::frame::Contro } } +// static bool SpinfieldToolbarController::impl_getValue( const Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat ) { diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 85f6cc27682a..fb6e02918027 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1228,6 +1228,7 @@ void ToolBarManager::AddFrameActionListener() } } +// static ToolBoxItemBits ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle ) { ToolBoxItemBits nItemBits( ToolBoxItemBits::NONE ); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 3b7e76b25fd9..9bd0d72faa06 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -235,6 +235,7 @@ static void fillHashMap( const Sequence< Sequence< css::beans::PropertyValue > > } // private function +// static Sequence< Sequence< css::beans::PropertyValue > > ToolbarsMenuController::getLayoutManagerToolbars( const Reference< css::frame::XLayoutManager >& rLayoutManager ) { std::vector< ToolBarInfo > aToolBarArray; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 9e5e8a403783..0b8bad8ccdfa 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -120,7 +120,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa Any getSequenceFromCache( const OUString& aCommandURL ); Any getInfoFromCommand( const OUString& rCommandURL ); - void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel ); + static void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel ); Sequence< OUString > getAllCommands(); void fillCache(); void addGenericInfoToCache(); @@ -249,6 +249,7 @@ sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasElements() return true; } +// static void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel ) { OUString aStr(aLabel.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName())); diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 645fd479c329..6ef30fe4fe66 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -87,6 +87,7 @@ void AcceleratorConfigurationWriter::flush() xExtendedCFG->endDocument(); } +// static void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index b0afc7c77b75..064bfe8cc7b7 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -132,16 +132,16 @@ class UNLESS_MERGELIBS_MORE(FWK_DLLPUBLIC) TitleHelper final : private ::cppu::B void impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); void impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); - void impl_appendComponentTitle ( OUStringBuffer& sTitle , + static void impl_appendComponentTitle ( OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent); - void impl_appendProductName (OUStringBuffer& sTitle); + static void impl_appendProductName (OUStringBuffer& sTitle); void impl_appendModuleName (OUStringBuffer& sTitle); - void impl_appendDebugVersion (OUStringBuffer& sTitle); - void impl_appendSafeMode (OUStringBuffer& sTitle); + static void impl_appendDebugVersion (OUStringBuffer& sTitle); + static void impl_appendSafeMode (OUStringBuffer& sTitle); void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle); - OUString impl_convertURL2Title(std::u16string_view sURL); + static OUString impl_convertURL2Title(std::u16string_view sURL); // member diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx index 6ee88fe3575f..1385560bd062 100644 --- a/include/svl/asiancfg.hxx +++ b/include/svl/asiancfg.hxx @@ -49,19 +49,19 @@ public: void Commit(); - bool IsKerningWesternTextOnly() const; + static bool IsKerningWesternTextOnly(); void SetKerningWesternTextOnly(bool value); - CharCompressType GetCharDistanceCompression() const; + static CharCompressType GetCharDistanceCompression(); void SetCharDistanceCompression(CharCompressType value); - css::uno::Sequence< css::lang::Locale > GetStartEndCharLocales() const; + static css::uno::Sequence< css::lang::Locale > GetStartEndCharLocales(); - bool GetStartEndChars( + static bool GetStartEndChars( css::lang::Locale const & locale, OUString & startChars, - OUString & endChars) const; + OUString & endChars); void SetStartEndChars( css::lang::Locale const & locale, diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index 9f88fd84baa7..a04a907d4beb 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -56,7 +56,7 @@ public: /** QueryProtocol. */ - bool QueryProtocol (INetProtocol eProto) const + static bool QueryProtocol (INetProtocol eProto) { return ((eProto == INetProtocol::File ) || (eProto == INetProtocol::Ftp ) || diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 219b04e69a20..f3db2f2eb6d9 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -105,9 +105,9 @@ public: ~SfxItemPropertySet(); /// @throws css::uno::RuntimeException - void getPropertyValue( const SfxItemPropertyMapEntry& rEntry, + static void getPropertyValue( const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet, - css::uno::Any& rAny) const; + css::uno::Any& rAny); /// @throws css::uno::RuntimeException /// @throws css::beans::UnknownPropertyException void getPropertyValue( const OUString &rName, @@ -120,9 +120,9 @@ public: const SfxItemSet& rSet ) const; /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException - void setPropertyValue( const SfxItemPropertyMapEntry& rEntry, + static void setPropertyValue( const SfxItemPropertyMapEntry& rEntry, const css::uno::Any& aVal, - SfxItemSet& rSet ) const; + SfxItemSet& rSet ); /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException /// @throws css::beans::UnknownPropertyException @@ -133,8 +133,8 @@ public: /// @throws css::beans::UnknownPropertyException css::beans::PropertyState getPropertyState(const OUString& rName, const SfxItemSet& rSet)const; - css::beans::PropertyState - getPropertyState(const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet) const + static css::beans::PropertyState + getPropertyState(const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet) noexcept; css::uno::Reference<css::beans::XPropertySetInfo> const & diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx index 2ebed94959cc..47e85cd0fa5a 100644 --- a/include/svl/numformat.hxx +++ b/include/svl/numformat.hxx @@ -546,13 +546,13 @@ public: const NfKeywordTable& GetKeywords(sal_uInt32 nKey); /** Access for unit tests. */ - const NfKeywordTable& GetEnglishKeywords() const; + static const NfKeywordTable& GetEnglishKeywords(); /** Access for unit tests. */ - const std::vector<Color>& GetStandardColors() const; + static const std::vector<Color>& GetStandardColors(); /** Access for unit tests. */ - size_t GetMaxDefaultColors() const; + static size_t GetMaxDefaultColors(); struct InputScannerPrivateAccess { diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index 1f77d484531a..db7aa0f263d2 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -160,12 +160,12 @@ private: void fillSubstVector( const css::uno::Reference< css::container::XNameAccess >& rFont, const OUString& rType, std::vector< OUString >& rSubstVector ) const; - FontWeight getSubstWeight( const css::uno::Reference< css::container::XNameAccess >& rFont, - const OUString& rType ) const; - FontWidth getSubstWidth( const css::uno::Reference< css::container::XNameAccess >& rFont, - const OUString& rType ) const; - ImplFontAttrs getSubstType( const css::uno::Reference< css::container::XNameAccess >& rFont, - const OUString& rType ) const; + static FontWeight getSubstWeight( const css::uno::Reference< css::container::XNameAccess >& rFont, + const OUString& rType ); + static FontWidth getSubstWidth( const css::uno::Reference< css::container::XNameAccess >& rFont, + const OUString& rType ); + static ImplFontAttrs getSubstType( const css::uno::Reference< css::container::XNameAccess >& rFont, + const OUString& rType ); void readLocaleSubst( const OUString& rBcp47 ) const; public: FontSubstConfiguration(); diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index d6eeb174e735..5c5e170aed02 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -177,7 +177,7 @@ public: static const std::vector< LanguageType > & getInstalledLanguageTypes(); /// maps the LocaleData string to the International enum - MeasurementSystem mapMeasurementStringToEnum( std::u16string_view rMS ) const; + static MeasurementSystem mapMeasurementStringToEnum( std::u16string_view rMS ); /// Convenience method to obtain the default calendar. const std::shared_ptr< css::i18n::Calendar2 >& getDefaultCalendar() const; diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index b07d7d364801..753534166098 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -208,7 +208,7 @@ public: const css::lang::Locale& rLocale ); /* replace back references in the replace string by the sub expressions from the search result */ - void ReplaceBackReferences( OUString& rReplaceStr, std::u16string_view rStr, const css::util::SearchResult& rResult ) const; + static void ReplaceBackReferences( OUString& rReplaceStr, std::u16string_view rStr, const css::util::SearchResult& rResult ); }; } // namespace utl diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index a6b03f6b3d8d..243783c55d2e 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -185,7 +185,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, sc::Colum OUString sReplStr = rSearchItem.GetReplaceString(); if (rSearchItem.GetRegExp()) { - pSearchText->ReplaceBackReferences( sReplStr, aString, aSearchResult ); + utl::TextSearch::ReplaceBackReferences( sReplStr, aString, aSearchResult ); OUStringBuffer aStrBuffer(aString); aStrBuffer.remove(nStart, nEnd-nStart+1); aStrBuffer.insert(nStart, sReplStr); diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index c414bb34badd..cf5a1dfc770c 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -127,7 +127,7 @@ void ScDocShell::InitItems() if (!m_pDocument->GetForbiddenCharacters()) { // set forbidden characters if necessary - const uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); + const uno::Sequence<lang::Locale> aLocales = SvxAsianConfig::GetStartEndCharLocales(); if (aLocales.hasElements()) { std::shared_ptr<SvxForbiddenCharactersTable> xForbiddenTable( @@ -136,7 +136,7 @@ void ScDocShell::InitItems() for (const lang::Locale& rLocale : aLocales) { i18n::ForbiddenCharacters aForbidden; - aAsian.GetStartEndChars( rLocale, aForbidden.beginLine, aForbidden.endLine ); + SvxAsianConfig::GetStartEndChars( rLocale, aForbidden.beginLine, aForbidden.endLine ); LanguageType eLang = LanguageTag::convertToLanguageType(rLocale); xForbiddenTable->SetForbiddenCharacters( eLang, aForbidden ); @@ -149,13 +149,13 @@ void ScDocShell::InitItems() if ( !m_pDocument->IsValidAsianCompression() ) { // set compression mode from configuration if not already set (e.g. XML import) - m_pDocument->SetAsianCompression( aAsian.GetCharDistanceCompression() ); + m_pDocument->SetAsianCompression( SvxAsianConfig::GetCharDistanceCompression() ); } if ( !m_pDocument->IsValidAsianKerning() ) { // set asian punctuation kerning from configuration if not already set (e.g. XML import) - m_pDocument->SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed + m_pDocument->SetAsianKerning( !SvxAsianConfig::IsKerningWesternTextOnly() ); // reversed } } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index aaf1c566a403..38284c60950f 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2071,7 +2071,7 @@ static void lcl_SetCellProperty( const SfxItemPropertyMapEntry& rEntry, const un break; default: { - lcl_GetCellsPropertySet()->setPropertyValue(rEntry, rValue, rSet); + SfxItemPropertySet::setPropertyValue(rEntry, rValue, rSet); } } } @@ -2343,7 +2343,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntr } break; default: - pPropSet->getPropertyValue(*pEntry, *pDataSet, rAny); + SfxItemPropertySet::getPropertyValue(*pEntry, *pDataSet, rAny); } } } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index beef2e67f41b..b0335697e7f1 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -1335,7 +1335,7 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( std::u16string_view aPropertyName } break; default: - pPropSet->getPropertyValue( *pResultEntry, *pItemSet, aAny ); + SfxItemPropertySet::getPropertyValue( *pResultEntry, *pItemSet, aAny ); } } else if ( IsScUnoWid( nWhich ) ) @@ -1552,7 +1552,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const { SvxSetItem aNewHeader( rSet.Get(ATTR_PAGE_HEADERSET) ); if (pValue) - pPropSet->setPropertyValue( *pHeaderEntry, *pValue, aNewHeader.GetItemSet() ); + SfxItemPropertySet::setPropertyValue( *pHeaderEntry, *pValue, aNewHeader.GetItemSet() ); else aNewHeader.GetItemSet().ClearItem( pHeaderEntry->nWID ); rSet.Put( aNewHeader ); @@ -1566,7 +1566,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const { SvxSetItem aNewFooter( rSet.Get(ATTR_PAGE_FOOTERSET) ); if (pValue) - pPropSet->setPropertyValue( *pFooterEntry, *pValue, aNewFooter.GetItemSet() ); + SfxItemPropertySet::setPropertyValue( *pFooterEntry, *pValue, aNewFooter.GetItemSet() ); else aNewFooter.GetItemSet().ClearItem( pFooterEntry->nWID ); rSet.Put( aNewFooter ); @@ -1747,7 +1747,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const { rSet.Put(rSet.Get(pEntry->nWID)); } - pPropSet->setPropertyValue(*pEntry, *pValue, rSet); + SfxItemPropertySet::setPropertyValue(*pEntry, *pValue, rSet); } } else @@ -1970,10 +1970,10 @@ uno::Any ScStyleObj::getPropertyValue_Impl( std::u16string_view aPropertyName ) { SfxItemSet aNoEmptySet( *pItemSet ); aNoEmptySet.Put( aNoEmptySet.Get( nWhich ) ); - pPropSet->getPropertyValue( *pResultEntry, aNoEmptySet, aAny ); + SfxItemPropertySet::getPropertyValue( *pResultEntry, aNoEmptySet, aAny ); } else - pPropSet->getPropertyValue( *pResultEntry, *pItemSet, aAny ); + SfxItemPropertySet::getPropertyValue( *pResultEntry, *pItemSet, aAny ); } } else if ( IsScUnoWid( nWhich ) ) diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 118016de3b68..3f3f092a5d18 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -1827,7 +1827,7 @@ void Test::testUserDefinedNumberFormats() void Test::testNfEnglishKeywordsIntegrity() { SvNumberFormatter aFormatter(m_xContext, LANGUAGE_ENGLISH_US); - const NfKeywordTable& rEnglishKeywords = aFormatter.GetEnglishKeywords(); + const NfKeywordTable& rEnglishKeywords = SvNumberFormatter::GetEnglishKeywords(); const NfKeywordTable& sKeywords = aFormatter.GetKeywords(0); CPPUNIT_ASSERT_EQUAL( size_t(NF_KEYWORD_ENTRIES_COUNT), rEnglishKeywords.size() ); for (size_t i = 0; i < size_t(NF_KEYWORD_ENTRIES_COUNT); ++i) @@ -1892,8 +1892,8 @@ void Test::testNfEnglishKeywordsIntegrity() void Test::testStandardColorIntegrity() { SvNumberFormatter aFormatter(m_xContext, LANGUAGE_ENGLISH_US); - const ::std::vector<Color> & rStandardColors = aFormatter.GetStandardColors(); - const size_t nMaxDefaultColors = aFormatter.GetMaxDefaultColors(); + const ::std::vector<Color> & rStandardColors = SvNumberFormatter::GetStandardColors(); + const size_t nMaxDefaultColors = SvNumberFormatter::GetMaxDefaultColors(); CPPUNIT_ASSERT_EQUAL( size_t(NF_KEY_LASTCOLOR) - size_t(NF_KEY_FIRSTCOLOR) + 1, nMaxDefaultColors ); CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, rStandardColors.size() ); // Colors must follow same order as in sEnglishKeyword @@ -1912,7 +1912,7 @@ void Test::testStandardColorIntegrity() void Test::testColorNamesConversion() { SvNumberFormatter aFormatter(m_xContext, LANGUAGE_GERMAN); - const NfKeywordTable& rEnglishKeywords = aFormatter.GetEnglishKeywords(); + const NfKeywordTable& rEnglishKeywords = SvNumberFormatter::GetEnglishKeywords(); const NfKeywordTable& rKeywords = aFormatter.GetKeywords(0); // Holding a reference to the NfKeywordTable doesn't help if we switch diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index a8f4e08e519d..d1515f6e76f7 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.cxx @@ -71,7 +71,8 @@ void SvxAsianConfig::Commit() { impl_->batch->commit(); } -bool SvxAsianConfig::IsKerningWesternTextOnly() const { +// static +bool SvxAsianConfig::IsKerningWesternTextOnly() { return officecfg::Office::Common::AsianLayout::IsKerningWesternTextOnly::get(); } @@ -81,7 +82,8 @@ void SvxAsianConfig::SetKerningWesternTextOnly(bool value) { value, impl_->batch); } -CharCompressType SvxAsianConfig::GetCharDistanceCompression() const { +// static +CharCompressType SvxAsianConfig::GetCharDistanceCompression() { return static_cast<CharCompressType>(officecfg::Office::Common::AsianLayout::CompressCharacterDistance::get()); } @@ -90,8 +92,8 @@ void SvxAsianConfig::SetCharDistanceCompression(CharCompressType value) { static_cast<sal_uInt16>(value), impl_->batch); } +// static css::uno::Sequence< css::lang::Locale > SvxAsianConfig::GetStartEndCharLocales() - const { const css::uno::Sequence< OUString > ns( officecfg::Office::Common::AsianLayout::StartEndCharacters::get()-> @@ -103,9 +105,10 @@ css::uno::Sequence< css::lang::Locale > SvxAsianConfig::GetStartEndCharLocales() return ls; } +// static bool SvxAsianConfig::GetStartEndChars( css::lang::Locale const & locale, OUString & startChars, - OUString & endChars) const + OUString & endChars) { css::uno::Reference< css::container::XNameAccess > set( officecfg::Office::Common::AsianLayout::StartEndCharacters::get()); diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 8478eaadc98a..9595ce62ea55 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -113,8 +113,9 @@ SfxItemPropertySet::~SfxItemPropertySet() { } +// static void SfxItemPropertySet::getPropertyValue( const SfxItemPropertyMapEntry& rEntry, - const SfxItemSet& rSet, Any& rAny ) const + const SfxItemSet& rSet, Any& rAny ) { // get the SfxPoolItem const SfxPoolItem* pItem = nullptr; @@ -159,9 +160,10 @@ Any SfxItemPropertySet::getPropertyValue( const OUString &rName, return aVal; } +// static void SfxItemPropertySet::setPropertyValue( const SfxItemPropertyMapEntry& rEntry, const Any& aVal, - SfxItemSet& rSet ) const + SfxItemSet& rSet ) { // get the SfxPoolItem const SfxPoolItem* pItem = nullptr; @@ -196,7 +198,8 @@ void SfxItemPropertySet::setPropertyValue( const OUString &rName, setPropertyValue(*pEntry, aVal, rSet); } -PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet) const +// static +PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet) noexcept { PropertyState eRet = PropertyState_DIRECT_VALUE; diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index b4ef00d2a96c..ace560bad560 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -4917,17 +4917,20 @@ const NfKeywordTable & SvNumberFormatter::GetKeywords( sal_uInt32 nKey ) return pFormatScanner->GetKeywords(); } -const NfKeywordTable & SvNumberFormatter::GetEnglishKeywords() const +// static +const NfKeywordTable & SvNumberFormatter::GetEnglishKeywords() { return ImpSvNumberformatScan::GetEnglishKeywords(); } -const std::vector<Color> & SvNumberFormatter::GetStandardColors() const +// static +const std::vector<Color> & SvNumberFormatter::GetStandardColors() { return ImpSvNumberformatScan::GetStandardColors(); } -size_t SvNumberFormatter::GetMaxDefaultColors() const +// static +size_t SvNumberFormatter::GetMaxDefaultColors() { return ImpSvNumberformatScan::GetMaxDefaultColors(); } diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 34d16d2a91b9..07a19bde59b7 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -1155,7 +1155,7 @@ std::optional<OUString> ReplaceBackReferences(const i18nutil::SearchOptions2& rS aResult.subRegExpressions = 1; aResult.startOffset = { 0 }; aResult.endOffset = { aStr.getLength() }; - aSText.ReplaceBackReferences( aReplaceStr, aStr, aResult ); + utl::TextSearch::ReplaceBackReferences( aReplaceStr, aStr, aResult ); xRet = aReplaceStr; } else @@ -1177,7 +1177,7 @@ std::optional<OUString> ReplaceBackReferences(const i18nutil::SearchOptions2& rS nStart, nEnd, aFltArr, false, false); if (aSText.SearchForward(aStr, &nStart.GetAnyIndex(), &nEnd.GetAnyIndex(), &aResult)) { - aSText.ReplaceBackReferences( aReplaceStr, aStr, aResult ); + utl::TextSearch::ReplaceBackReferences( aReplaceStr, aStr, aResult ); xRet = aReplaceStr; } } diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 07f17a1cd0ae..5f3c88f3511b 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -306,10 +306,10 @@ static uno::Any GetParaListAutoFormat(SwTextNode const& rNode) // have to iterate the map, not the item set? for (auto const pEntry : rMap.getPropertyEntries()) { - if (rPropSet.getPropertyState(*pEntry, *pSet) == PropertyState_DIRECT_VALUE) + if (SfxItemPropertySet::getPropertyState(*pEntry, *pSet) == PropertyState_DIRECT_VALUE) { Any value; - rPropSet.getPropertyValue(*pEntry, *pSet, value); + SfxItemPropertySet::getPropertyValue(*pEntry, *pSet, value); props.emplace_back(pEntry->aName, value); } } @@ -1374,7 +1374,7 @@ void makeRedline( SwPaM const & rPaM, else { SfxItemPropertyMapEntry const*const pEntry = aEntries[i]; - rPropSet.setPropertyValue(*pEntry, rValue, aItemSet); + SfxItemPropertySet::setPropertyValue(*pEntry, rValue, aItemSet); if (i == nStyleId) rValue >>= sParaStyleName; } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index f753ba768284..82057c08625a 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1221,7 +1221,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a } else { - m_pPropSet->setPropertyValue(*pEntry, aValue, aSet); + SfxItemPropertySet::setPropertyValue(*pEntry, aValue, aSet); pFormat->SetFormatAttr(aSet); } } @@ -1266,12 +1266,12 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a SAL_WARN("sw.core", "SwXShape: fixing invalid horizontal RelOrientation for at-page anchor"); value <<= nRelOrient; } - m_pPropSet->setPropertyValue( *pEntry, value, aSet ); + SfxItemPropertySet::setPropertyValue( *pEntry, value, aSet ); pFormat->SetFormatAttr(aSet); } else { - m_pPropSet->setPropertyValue( *pEntry, aValue, aSet ); + SfxItemPropertySet::setPropertyValue( *pEntry, aValue, aSet ); if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORTYPE == pEntry->nMemberId) { @@ -1637,7 +1637,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) else { const SwAttrSet& rSet = pFormat->GetAttrSet(); - m_pPropSet->getPropertyValue(*pEntry, rSet, aRet); + SfxItemPropertySet::getPropertyValue(*pEntry, rSet, aRet); } } else diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 9eb773e7cd50..9be13f907fb0 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1537,7 +1537,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& else { SfxItemSet aSet(pNoText->GetSwAttrSet()); - m_pPropSet->setPropertyValue(*pEntry, aValue, aSet); + SfxItemPropertySet::setPropertyValue(*pEntry, aValue, aSet); pNoText->SetAttr(aSet); } } @@ -1874,7 +1874,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& if(!bDone) { - m_pPropSet->setPropertyValue(*pEntry, aValue, aSet); + SfxItemPropertySet::setPropertyValue(*pEntry, aValue, aSet); } if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORTYPE == nMemberId) @@ -2076,7 +2076,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) else { const SfxItemSet& aSet(pNoText->GetSwAttrSet()); - m_pPropSet->getPropertyValue(*pEntry, aSet, aAny); + SfxItemPropertySet::getPropertyValue(*pEntry, aSet, aAny); } } } @@ -2336,7 +2336,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) if(!bDone) { - m_pPropSet->getPropertyValue(*pEntry, rSet, aAny); + SfxItemPropertySet::getPropertyValue(*pEntry, rSet, aAny); } } } diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 69fa9d3be300..ee8645aab566 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -553,7 +553,7 @@ SwUnoCursorHelper::SetCursorPropertyValue( } else { - rPropSet.setPropertyValue(*pEntry, prop.Value, items); + SfxItemPropertySet::setPropertyValue(*pEntry, prop.Value, items); } } @@ -1886,7 +1886,7 @@ uno::Any SwUnoCursorHelper::GetPropertyValue( SwUnoCursorHelper::GetCursorAttr(rPaM, aSet); - rPropSet.getPropertyValue(*pEntry, aSet, aAny); + SfxItemPropertySet::getPropertyValue(*pEntry, aSet, aAny); } return aAny; @@ -1977,7 +1977,7 @@ void SwUnoCursorHelper::SetPropertyValues( SwUnoCursorHelper::GetCursorAttr(rPaM, aItemSet); // this can set some attributes in nodes' mpAttrSet if (!SwUnoCursorHelper::SetCursorPropertyValue(*pEntry, rValue, rPaM, aItemSet)) - rPropSet.setPropertyValue(*pEntry, rValue, aItemSet); + SfxItemPropertySet::setPropertyValue(*pEntry, rValue, aItemSet); SwUnoCursorHelper::SetCursorAttr(rPaM, aItemSet, nAttrMode, false /*bTableMode*/); } @@ -1992,7 +1992,7 @@ void SwUnoCursorHelper::SetPropertyValues( { // this can set some attributes in nodes' mpAttrSet if (!SwUnoCursorHelper::SetCursorPropertyValue(*pEntry, rValue, rPaM, aItemSet)) - rPropSet.setPropertyValue(*pEntry, rValue, aItemSet); + SfxItemPropertySet::setPropertyValue(*pEntry, rValue, aItemSet); } SwUnoCursorHelper::SetCursorAttr(rPaM, aItemSet, nAttrMode, false /*bTableMode*/); @@ -2094,7 +2094,7 @@ SwUnoCursorHelper::GetPropertyStates( } pStates[i] = ( oSet->Count() ) - ? rPropSet.getPropertyState( *pEntry, *oSet ) + ? SfxItemPropertySet::getPropertyState( *pEntry, *oSet ) : beans::PropertyState_DEFAULT_VALUE; //try again to find out if a value has been inherited @@ -2109,7 +2109,7 @@ SwUnoCursorHelper::GetPropertyStates( } pStates[i] = ( oSetParent->Count() ) - ? rPropSet.getPropertyState( *pEntry, *oSetParent ) + ? SfxItemPropertySet::getPropertyState( *pEntry, *oSetParent ) : beans::PropertyState_DEFAULT_VALUE; } } diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index d230dc84b997..7e4f0d1e51ca 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -173,10 +173,10 @@ public: const uno::Sequence< OUString >& rPropertyNames); /// @throws uno::RuntimeException - void GetSinglePropertyValue_Impl( + static void GetSinglePropertyValue_Impl( const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet, - uno::Any& rAny ) const; + uno::Any& rAny ); /// @throws uno::RuntimeException uno::Sequence< beans::GetDirectPropertyTolerantResult > @@ -428,10 +428,11 @@ void SAL_CALL SwXParagraph::setPropertyValues( } // Support for DrawingLayer FillStyles for GetPropertyValue() usages +// static void SwXParagraph::Impl::GetSinglePropertyValue_Impl( const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet, - uno::Any& rAny ) const + uno::Any& rAny ) { bool bDone(false); @@ -474,7 +475,7 @@ void SwXParagraph::Impl::GetSinglePropertyValue_Impl( return; // fallback to standard get value implementation used before this helper was created - m_rPropSet.getPropertyValue(rEntry, rSet, rAny); + SfxItemPropertySet::getPropertyValue(rEntry, rSet, rAny); if(rEntry.aType == cppu::UnoType<sal_Int16>::get() && rEntry.aType != rAny.getValueType()) { diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index bd0b9c929a75..fc3ce34f4156 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -385,7 +385,7 @@ void SwXTextPortion::GetPropertyValue( = pTextNode->GetAttr(RES_PARATR_LIST_AUTOFMT).GetStyleHandle(); if (pListSet) { - m_pPropSet->getPropertyValue(rEntry, *pListSet, rVal); + SfxItemPropertySet::getPropertyValue(rEntry, *pListSet, rVal); bDone = true; } } @@ -404,7 +404,7 @@ void SwXTextPortion::GetPropertyValue( RES_UNKNOWNATR_CONTAINER>>(pUnoCursor->GetDoc().GetAttrPool()); SwUnoCursorHelper::GetCursorAttr(*pUnoCursor, *pSet); } - m_pPropSet->getPropertyValue(rEntry, *pSet, rVal); + SfxItemPropertySet::getPropertyValue(rEntry, *pSet, rVal); } } } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 2f5ca7c142cf..b002a695ba58 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -818,7 +818,7 @@ void SwXTextSection::Impl::SetPropertyValues_Impl( const SfxItemSet& rOldAttrSet = pFormat->GetAttrSet(); oItemSet.emplace(*rOldAttrSet.GetPool(), pEntry->nWID, pEntry->nWID); oItemSet->Put(rOldAttrSet); - m_rPropSet.setPropertyValue(*pEntry, + SfxItemPropertySet::setPropertyValue(*pEntry, pValues[nProperty], *oItemSet); } else @@ -1156,7 +1156,7 @@ SwXTextSection::Impl::GetPropertyValues_Impl( { if (pFormat) { - m_rPropSet.getPropertyValue(*pEntry, + SfxItemPropertySet::getPropertyValue(*pEntry, pFormat->GetAttrSet(), pRet[nProperty]); } else diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 643707f437df..80fda01afe80 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1578,13 +1578,13 @@ static sal_uInt8 lcl_TranslateMetric(const SfxItemPropertyMapEntry& rEntry, SwDo return rEntry.nMemberId; } template<> -void SwXStyle::SetPropertyValue<HINT_BEGIN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<HINT_BEGIN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& /*rPropSet*/, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { // default ItemSet handling SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet(); SfxItemSet aSet(*rStyleSet.GetPool(), rEntry.nWID, rEntry.nWID); aSet.SetParent(&rStyleSet); - rPropSet.setPropertyValue(rEntry, rValue, aSet); + SfxItemPropertySet::setPropertyValue(rEntry, rValue, aSet); rStyleSet.Put(aSet); } template<> @@ -1667,7 +1667,7 @@ void SwXStyle::SetPropertyValue<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertyMapE rStyleSet.Put(XFillBmpTileItem(drawing::BitmapMode_REPEAT == eMode)); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& /*rPropSet*/, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if (!rValue.has<OUString>() && !rValue.has<sal_Int32>()) throw lang::IllegalArgumentException(); @@ -1703,7 +1703,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAPER_BIN)>(const SfxItemProperty SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet(); SfxItemSet aSet(*rStyleSet.GetPool(), rEntry.nWID, rEntry.nWID); aSet.SetParent(&rStyleSet); - rPropSet.setPropertyValue(rEntry, uno::Any(static_cast<sal_Int8>(nBin == std::numeric_limits<printeridx_t>::max()-1 ? -1 : nBin)), aSet); + SfxItemPropertySet::setPropertyValue(rEntry, uno::Any(static_cast<sal_Int8>(nBin == std::numeric_limits<printeridx_t>::max()-1 ? -1 : nBin)), aSet); rStyleSet.Put(aSet); } template<> @@ -2142,12 +2142,12 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItem return aRet; } template<> -uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& /*rPropSet*/, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); SfxItemSet& rSet = rBase.GetItemSet(); uno::Any aValue; - rPropSet.getPropertyValue(rEntry, rSet, aValue); + SfxItemPropertySet::getPropertyValue(rEntry, rSet, aValue); sal_Int8 nBin(aValue.get<sal_Int8>()); if(nBin == -1) return uno::Any(OUString("[From printer settings]")); @@ -2311,12 +2311,12 @@ uno::Any SwXStyle::GetStyleProperty<OWN_ATTR_FILLBMP_MODE>(const SfxItemProperty return uno::Any(drawing::BitmapMode_NO_REPEAT); } template<> -uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& /*rPropSet*/, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); SfxItemSet& rSet = rBase.GetItemSet(); uno::Any aResult; - rPropSet.getPropertyValue(rEntry, rSet, aResult); + SfxItemPropertySet::getPropertyValue(rEntry, rSet, aResult); // // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here if(rEntry.aType == cppu::UnoType<sal_Int16>::get() && aResult.getValueType() == cppu::UnoType<sal_Int32>::get()) @@ -2555,7 +2555,7 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque } else { - pStates[i] = pPropSet->getPropertyState(*pEntry, *pSourceSet); + pStates[i] = SfxItemPropertySet::getPropertyState(*pEntry, *pSourceSet); } } break; @@ -2577,7 +2577,7 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque break; default: { - pStates[i] = pPropSet->getPropertyState(*pEntry, *pSourceSet); + pStates[i] = SfxItemPropertySet::getPropertyState(*pEntry, *pSourceSet); if(SfxStyleFamily::Page == m_rEntry.family() && SID_ATTR_PAGE_SIZE == pEntry->nWID && beans::PropertyState_DIRECT_VALUE == pStates[i]) { @@ -4054,7 +4054,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( if(!bDone) { - pPropSet->getPropertyValue( *pEntry, *mpSet, aTarget ); + SfxItemPropertySet::getPropertyValue( *pEntry, *mpSet, aTarget ); } if(bTakeCareOfDrawingLayerFillStyle) @@ -4244,7 +4244,7 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( if(!bDone) { - pStates[i] = pPropSet->getPropertyState(*pEntry, *mpSet ); + pStates[i] = SfxItemPropertySet::getPropertyState(*pEntry, *mpSet ); } } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 70c1849df7e9..b25c5e2a2700 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1309,7 +1309,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno: { SwFrameFormat* pLnFormat = pLn->ClaimFrameFormat(); SwAttrSet aSet(pLnFormat->GetAttrSet()); - m_pPropSet->setPropertyValue(*pEntry, aValue, aSet); + SfxItemPropertySet::setPropertyValue(*pEntry, aValue, aSet); pDoc->SetAttr(aSet, *pLnFormat); } } @@ -1354,7 +1354,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) default: { const SwAttrSet& rSet = pLn->GetFrameFormat()->GetAttrSet(); - m_pPropSet->getPropertyValue(*pEntry, rSet, aRet); + SfxItemPropertySet::getPropertyValue(*pEntry, rSet, aRet); } } } @@ -1641,7 +1641,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u if (!SwUnoCursorHelper::SetCursorPropertyValue( *pEntry, aValue, rTableCursor.GetSelRing(), aItemSet)) { - m_pPropSet->setPropertyValue(*pEntry, aValue, aItemSet); + SfxItemPropertySet::setPropertyValue(*pEntry, aValue, aItemSet); } SwUnoCursorHelper::SetCursorAttr(rTableCursor.GetSelRing(), aItemSet, SetAttrMode::DEFAULT, true); @@ -1691,7 +1691,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER> aSet(rTableCursor.GetDoc().GetAttrPool()); SwUnoCursorHelper::GetCursorAttr(rTableCursor.GetSelRing(), aSet); - m_pPropSet->getPropertyValue(*pEntry, aSet, aResult); + SfxItemPropertySet::getPropertyValue(*pEntry, aSet, aResult); } } return aResult; @@ -2664,7 +2664,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An default: { SwAttrSet aSet(pFormat->GetAttrSet()); - m_pImpl->m_pPropSet->setPropertyValue(*pEntry, aValue, aSet); + SfxItemPropertySet::setPropertyValue(*pEntry, aValue, aSet); pFormat->GetDoc()->SetAttr(aSet, *pFormat); } } @@ -2906,7 +2906,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) default: { const SwAttrSet& rSet = pFormat->GetAttrSet(); - m_pImpl->m_pPropSet->getPropertyValue(*pEntry, rSet, aRet); + SfxItemPropertySet::getPropertyValue(*pEntry, rSet, aRet); } } } @@ -3396,7 +3396,7 @@ SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV if (!SwUnoCursorHelper::SetCursorPropertyValue( *pEntry, aValue, rCursor.GetSelRing(), aItemSet)) { - m_pImpl->m_pPropSet->setPropertyValue(*pEntry, aValue, aItemSet); + SfxItemPropertySet::setPropertyValue(*pEntry, aValue, aItemSet); } SwUnoCursorHelper::SetCursorAttr(rCursor.GetSelRing(), aItemSet, SetAttrMode::DEFAULT, true); @@ -3478,7 +3478,7 @@ uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName) SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*m_pImpl->m_pTableCursor); SwUnoCursorHelper::GetCursorAttr(rCursor.GetSelRing(), aSet); - m_pImpl->m_pPropSet->getPropertyValue(*pEntry, aSet, aRet); + SfxItemPropertySet::getPropertyValue(*pEntry, aSet, aRet); } } diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 757be8006dbc..f872417e8333 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -109,18 +109,17 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) const bool bFuzzing = comphelper::IsFuzzing(); if (!bFuzzing) { - SvxAsianConfig aAsian; - const Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); + const Sequence<lang::Locale> aLocales = SvxAsianConfig::GetStartEndCharLocales(); for(const lang::Locale& rLocale : aLocales) { ForbiddenCharacters aForbidden; - aAsian.GetStartEndChars( rLocale, aForbidden.beginLine, aForbidden.endLine); + SvxAsianConfig::GetStartEndChars( rLocale, aForbidden.beginLine, aForbidden.endLine); LanguageType eLang = LanguageTag::convertToLanguageType(rLocale); m_xDoc->getIDocumentSettingAccess().setForbiddenCharacters( eLang, aForbidden); } m_xDoc->getIDocumentSettingAccess().set(DocumentSettingId::KERN_ASIAN_PUNCTUATION, - !aAsian.IsKerningWesternTextOnly()); - m_xDoc->getIDocumentSettingAccess().setCharacterCompressionType(aAsian.GetCharDistanceCompression()); + !SvxAsianConfig::IsKerningWesternTextOnly()); + m_xDoc->getIDocumentSettingAccess().setCharacterCompressionType(SvxAsianConfig::GetCharDistanceCompression()); m_xDoc->getIDocumentDeviceAccess().setPrintData(*SW_MOD()->GetPrtOptions(bWeb)); } diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index aad44c9ef0c9..295a8742ffbb 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -875,8 +875,9 @@ void FontSubstConfiguration::fillSubstVector( const css::uno::Reference< XNameAc } } +// static FontWeight FontSubstConfiguration::getSubstWeight( const css::uno::Reference< XNameAccess >& rFont, - const OUString& rType ) const + const OUString& rType ) { int weight = -1; try @@ -902,8 +903,9 @@ FontWeight FontSubstConfiguration::getSubstWeight( const css::uno::Reference< XN return static_cast<FontWeight>( weight >= 0 ? pWeightNames[weight].nEnum : WEIGHT_DONTKNOW ); } +// static FontWidth FontSubstConfiguration::getSubstWidth( const css::uno::Reference< XNameAccess >& rFont, - const OUString& rType ) const + const OUString& rType ) { int width = -1; try @@ -929,8 +931,9 @@ FontWidth FontSubstConfiguration::getSubstWidth( const css::uno::Reference< XNam return static_cast<FontWidth>( width >= 0 ? pWidthNames[width].nEnum : WIDTH_DONTKNOW ); } +// static ImplFontAttrs FontSubstConfiguration::getSubstType( const css::uno::Reference< XNameAccess >& rFont, - const OUString& rType ) const + const OUString& rType ) { sal_uInt32 type = 0; try diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 87299810ab6b..df3329ea947d 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -388,7 +388,8 @@ const OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const return aReservedWords[nWord]; } -MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( std::u16string_view rMS ) const +// static +MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( std::u16string_view rMS ) { //! TODO: could be cached too if ( o3tl::equalsIgnoreAsciiCase( rMS, u"metric" ) ) diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index f61aeaf1a2a7..6c65b95cdea9 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -261,7 +261,8 @@ bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart, return bRet; } -void TextSearch::ReplaceBackReferences( OUString& rReplaceStr, std::u16string_view rStr, const SearchResult& rResult ) const +// static +void TextSearch::ReplaceBackReferences( OUString& rReplaceStr, std::u16string_view rStr, const SearchResult& rResult ) { if( rResult.subRegExpressions <= 0 ) return; |