Kaydet (Commit) 98eef218 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:deletedspecial

Change-Id: I8de9f20ba2d19631da111f11cfe85225039e30f6
üst c1894ced
......@@ -82,8 +82,7 @@ class ShareGuard
}
private:
ShareGuard();
ShareGuard& operator=( const ShareGuard& );
ShareGuard& operator=( const ShareGuard& ) SAL_DELETED_FUNCTION;
ShareableMutex& m_rShareMutex;
};
......
......@@ -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() {}
......
......@@ -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;
};
......
......@@ -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
......
......@@ -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 );
......
......@@ -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& );
};
}
}
......
......@@ -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
......
......@@ -76,7 +76,7 @@ private:
{
}
MenuAttributes(const MenuAttributes&); //not-implemented
MenuAttributes(const MenuAttributes&) SAL_DELETED_FUNCTION;
public:
OUString aTargetFrame;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment