summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/inc/helper/shareablemutex.hxx3
-rw-r--r--framework/inc/services/uriabbreviation.hxx4
-rw-r--r--framework/inc/uiconfiguration/globalsettings.hxx5
-rw-r--r--framework/inc/uielement/menubarmerger.hxx36
-rw-r--r--framework/inc/uielement/rootitemcontainer.hxx4
-rw-r--r--framework/inc/uielement/statusbarmerger.hxx20
-rw-r--r--framework/inc/uielement/toolbarmerger.hxx5
-rw-r--r--include/framework/menuconfiguration.hxx2
8 files changed, 32 insertions, 47 deletions
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index 1a3b506906da..8e846eae2abc 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -82,8 +82,7 @@ class ShareGuard
}
private:
- ShareGuard();
- ShareGuard& operator=( const ShareGuard& );
+ ShareGuard& operator=( const ShareGuard& ) SAL_DELETED_FUNCTION;
ShareableMutex& m_rShareMutex;
};
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 55a1f4005bfc..8ba08a7b3b89 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -45,8 +45,8 @@ public:
virtual OUString SAL_CALL abbreviateString(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- UriAbbreviation(UriAbbreviation &); // not defined
- void operator =(UriAbbreviation &); // not defined
+ UriAbbreviation(UriAbbreviation &) SAL_DELETED_FUNCTION;
+ void operator =(UriAbbreviation &) SAL_DELETED_FUNCTION;
virtual ~UriAbbreviation() {}
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index f949f3cbc03d..00b995e1d068 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -63,9 +63,8 @@ class GlobalSettings
bool GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue );
private:
- GlobalSettings();
- GlobalSettings(const GlobalSettings&);
- GlobalSettings& operator=(const GlobalSettings& );
+ GlobalSettings(const GlobalSettings&) SAL_DELETED_FUNCTION;
+ GlobalSettings& operator=(const GlobalSettings& ) SAL_DELETED_FUNCTION;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
};
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index e658d902a7d4..c42d48eecbca 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -57,59 +57,53 @@ struct ReferencePathInfo
RPResultInfo eResult;
};
-class MenuBarMerger
+namespace MenuBarMerger
{
- public:
- static bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier );
+ bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier );
- static void RetrieveReferencePath( const OUString&,
+ void RetrieveReferencePath( const OUString&,
std::vector< OUString >& aReferencePath );
- static ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu );
- static sal_uInt16 FindMenuItem( const OUString& rCmd,
+ ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu );
+ sal_uInt16 FindMenuItem( const OUString& rCmd,
Menu* pMenu );
- static void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry,
+ void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry,
AddonMenuItem& aAddonMenu );
- static void GetSubMenu( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSubMenuEntries,
+ void GetSubMenu( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSubMenuEntries,
AddonMenuContainer& rSubMenu );
- static bool ProcessMergeOperation( Menu* pMenu,
+ bool ProcessMergeOperation( Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16& rItemId,
const OUString& rMergeCommand,
const OUString& rMergeCommandParameter,
const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
- static bool ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo,
+ bool ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo,
sal_uInt16& rItemId,
const OUString& rMergeCommand,
const OUString& rMergeFallback,
const ::std::vector< OUString >& rReferencePath,
const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
- static bool ProcessFallbackOperation();
- static bool MergeMenuItems( Menu* pMenu,
+ bool ProcessFallbackOperation();
+ bool MergeMenuItems( Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16 nModIndex,
sal_uInt16& rItemId,
const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
- static bool ReplaceMenuItem( Menu* pMenu,
+ bool ReplaceMenuItem( Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16& rItemId,
const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
- static bool RemoveMenuItems( Menu* pMenu,
+ bool RemoveMenuItems( Menu* pMenu,
sal_uInt16 nPos,
const OUString& rMergeCommandParameter );
- static bool CreateSubMenu( Menu* pSubMenu,
+ bool CreateSubMenu( Menu* pSubMenu,
sal_uInt16& nItemId,
const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonSubMenu );
-
- private:
- MenuBarMerger();
- MenuBarMerger( const MenuBarMerger& );
- MenuBarMerger& operator=( const MenuBarMerger& );
-};
+}
} // namespace framework
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 838c307a52e0..917340d43e3d 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -125,8 +125,8 @@ class RootItemContainer : private cppu::BaseMutex,
static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
private:
- RootItemContainer& operator=( const RootItemContainer& );
- RootItemContainer( const RootItemContainer& );
+ RootItemContainer& operator=( const RootItemContainer& ) SAL_DELETED_FUNCTION;
+ RootItemContainer( const RootItemContainer& ) SAL_DELETED_FUNCTION;
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer );
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index 27387171f66d..d4675fa95c9d 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -43,19 +43,18 @@ struct AddonStatusbarItem
typedef ::std::vector< AddonStatusbarItem > AddonStatusbarItemContainer;
-class StatusbarMerger
+namespace StatusbarMerger
{
-public:
- static bool IsCorrectContext( const ::rtl::OUString& aContext,
+ bool IsCorrectContext( const ::rtl::OUString& aContext,
const ::rtl::OUString& aModuleIdentifier );
- static bool ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence,
+ bool ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence,
AddonStatusbarItemContainer& rContainer );
- static sal_uInt16 FindReferencePos( StatusBar* pStatusbar,
+ sal_uInt16 FindReferencePos( StatusBar* pStatusbar,
const ::rtl::OUString& rReferencePoint );
- static bool ProcessMergeOperation( StatusBar* pStatusbar,
+ bool ProcessMergeOperation( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
const ::rtl::OUString& rModuleIdentifier,
@@ -63,19 +62,14 @@ public:
const ::rtl::OUString& rMergeCommandParameter,
const AddonStatusbarItemContainer& rItems );
- static bool ProcessMergeFallback( StatusBar* pStatusbar,
+ bool ProcessMergeFallback( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
const ::rtl::OUString& rModuleIdentifier,
const ::rtl::OUString& rMergeCommand,
const ::rtl::OUString& rMergeFallback,
const AddonStatusbarItemContainer& rItems );
-
-private:
- StatusbarMerger();
- StatusbarMerger( const StatusbarMerger& );
- StatusbarMerger& operator=( const StatusbarMerger& );
-};
+}
}
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index fe1ab31c49da..8a595a9878fa 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -143,9 +143,8 @@ class ToolBarMerger
const AddonToolbarItem& rAddonToolbarItem );
private:
- ToolBarMerger();
- ToolBarMerger( const ToolBarMerger& );
- ToolBarMerger& operator=( const ToolBarMerger& );
+ ToolBarMerger( const ToolBarMerger& ) SAL_DELETED_FUNCTION;
+ ToolBarMerger& operator=( const ToolBarMerger& ) SAL_DELETED_FUNCTION;
};
} // namespace framework
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index feeed6353046..2672ae8dbc8f 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -76,7 +76,7 @@ private:
{
}
- MenuAttributes(const MenuAttributes&); //not-implemented
+ MenuAttributes(const MenuAttributes&) SAL_DELETED_FUNCTION;
public:
OUString aTargetFrame;
generated by cgit (git 2.34.1) at 2024-12-25 13:02:33 +0000