summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-16 10:11:04 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-18 10:03:44 +0000
commit2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae (patch)
tree66ba7ff0b95cf5ceeda5e53294a71c6786460eb3 /include/sfx2
parent4e59eecc077d27dd9762e7c890b2aaf92a212959 (diff)
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other plugins too. Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035 Reviewed-on: https://gerrit.libreoffice.org/25057 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/app.hxx1
-rw-r--r--include/sfx2/bindings.hxx1
-rw-r--r--include/sfx2/ctrlitem.hxx8
-rw-r--r--include/sfx2/dinfedt.hxx40
-rw-r--r--include/sfx2/dockwin.hxx4
-rw-r--r--include/sfx2/fcontnr.hxx12
-rw-r--r--include/sfx2/frmdescr.hxx28
-rw-r--r--include/sfx2/module.hxx1
-rw-r--r--include/sfx2/objface.hxx2
-rw-r--r--include/sfx2/objsh.hxx4
-rw-r--r--include/sfx2/sidebar/ControllerItem.hxx6
-rw-r--r--include/sfx2/tbxctrl.hxx47
-rw-r--r--include/sfx2/unoctitm.hxx1
13 files changed, 0 insertions, 155 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index bd7e52e055dc..4978bc732377 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -192,7 +192,6 @@ public:
SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, const SfxTbxCtrlFactory&);
SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl& GetTbxCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl& GetStbCtrlFactories_Impl() const;
- SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl& GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl& GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE SfxViewFrameArr_Impl& GetViewFrames_Impl() const;
SAL_DLLPRIVATE SfxViewShellArr_Impl& GetViewShells_Impl() const;
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index b31d4e553165..9d88ea25b52a 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -202,7 +202,6 @@ public:
SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
- SAL_DLLPRIVATE bool ExecuteCommand_Impl( const OUString& rCommand );
SAL_DLLPRIVATE void SetRecorder_Impl( css::uno::Reference< css::frame::XDispatchRecorder >& );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index 45c4fcc45578..f94a59f99bd5 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -38,11 +38,6 @@ private:
SfxControllerItem* pNext; // to notify next ControllerItem
SfxBindings* pBindings;
-protected:
-#if defined( DBG_UTIL )
- SAL_DLLPRIVATE void CheckConfigure_Impl( SfxSlotMode nType );
-#endif
-
public:
SfxBindings & GetBindings() {
DBG_ASSERT(pBindings, "no Bindings");
@@ -63,7 +58,6 @@ public:
void ReBind();
bool IsBound() const;
void ClearCache();
- void SetBindings(SfxBindings &rBindings) { pBindings = &rBindings; }
SfxControllerItem* GetItemLink();
SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewLink );
@@ -78,8 +72,6 @@ public:
static SfxItemState GetItemState( const SfxPoolItem* pState );
- SAL_DLLPRIVATE bool IsBindable_Impl() const
- { return pBindings != nullptr; }
SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* );
};
diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx
deleted file mode 100644
index 2908565f8f88..000000000000
--- a/include/sfx2/dinfedt.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SFX2_DINFEDT_HXX
-#define INCLUDED_SFX2_DINFEDT_HXX
-
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-
-// class InfoEdit_Impl ---------------------------------------------------
-
-class InfoEdit_Impl : public Edit
-{
-public:
- InfoEdit_Impl( vcl::Window* pParent, const ResId& rResId ) :
- Edit( pParent, rResId ) {}
-
- virtual void KeyInput( const KeyEvent& rKEvent ) override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 110745f94a05..2b83ccead17f 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -77,10 +77,6 @@ public:
SfxDockingWindow( SfxBindings *pBindings,
SfxChildWindow *pCW,
vcl::Window* pParent,
- const ResId& rResId);
- SfxDockingWindow( SfxBindings *pBindings,
- SfxChildWindow *pCW,
- vcl::Window* pParent,
const OString& rID, const OUString& rUIXMLDescription );
virtual ~SfxDockingWindow();
virtual void dispose() override;
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index d7a783411c8f..aded0de15b47 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -41,18 +41,6 @@ class SfxFilterContainer_Impl;
class SfxFrame;
-class SfxRefItem : public SfxPoolItem
-{
- tools::SvRef<SvRefBase> maRef;
-public:
- SfxRefItem( sal_uInt16 nWhichId, const tools::SvRef<SvRefBase>& rValue ) : SfxPoolItem( nWhichId )
- { maRef = rValue; }
- virtual SfxPoolItem* Clone( SfxItemPool* = nullptr ) const override
- { return new SfxRefItem( *this ); }
- virtual bool operator==( const SfxPoolItem& rL) const override
- { return static_cast<const SfxRefItem&>(rL).maRef == maRef; }
-};
-
typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
class SFX2_DLLPUBLIC SfxFilterContainer
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index df96ceeab04d..633ac8b94fd0 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -186,34 +186,6 @@ public:
SfxFrameProperties& operator =( const SfxFrameProperties &rProp );
};
-class SfxFrameDescriptorItem : public SfxPoolItem
-{
- SfxFrameProperties aProperties;
-public:
-
- SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
- : SfxPoolItem( nId )
- {}
-
- SfxFrameDescriptorItem( const SfxFrameDescriptorItem& rCpy )
- : SfxPoolItem( rCpy )
- {
- aProperties = rCpy.aProperties;
- }
-
- virtual ~SfxFrameDescriptorItem();
-
- virtual bool operator ==( const SfxPoolItem& ) const override;
- SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & );
-
- virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-};
-
#endif // INCLUDED_SFX2_FRMDESCR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index b3fcf3d972ff..6e10d7cd029b 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -100,7 +100,6 @@ public:
SAL_DLLPRIVATE static void DestroyModules_Impl();
SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
- SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE ImageList* GetImageList_Impl( bool bBig );
};
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index a6999076e269..9e30197d312f 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -79,9 +79,7 @@ public:
sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const;
sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const;
sal_uInt16 GetChildWindowCount() const;
- void RegisterPopupMenu( const ResId& );
void RegisterPopupMenu( const OUString& );
- const ResId& GetPopupMenuResId() const;
const OUString& GetPopupMenuName() const;
sal_uInt32 GetStatusBarId() const;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index bcdbad4dcf14..24b1d82862f9 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -811,10 +811,6 @@ public:
SfxPoolItem( 0 ),
pObjSh( nullptr )
{}
- SfxObjectShellItem( SfxObjectShell *pObjShell ):
- SfxPoolItem( 0 ),
- pObjSh( pObjShell )
- {}
SfxObjectShellItem( sal_uInt16 nWhichId,
SfxObjectShell *pObjShell ):
SfxPoolItem( nWhichId ),
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 2c31f8be3481..7a52de26bae3 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -103,12 +103,6 @@ public:
*/
Image GetIcon() const;
- /** Convenience method for setting all relevant properties for the
- slot/command represented by the called object at the given tool
- box.
- */
- void SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16 nIndex);
-
/** Do not call. Used by local class only. Should be a member of
a local and hidden interface.
*/
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 571242ae284c..b77a4ca316b2 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -239,53 +239,6 @@ public:
Class::CreateImpl, typeid(nItemClass), nSlotId ) ); }
-class SfxDragButton_Impl : public FixedImage
-{
-public:
-
- SfxDragButton_Impl( vcl::Window *pParent );
- virtual void Command ( const CommandEvent& rCEvt ) override;
- virtual void MouseMove( const MouseEvent& rMEvt ) override;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
-};
-
-class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
-{
-public:
- SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
- virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
- virtual void Select(sal_uInt16 nSelectModifier) override;
-};
-
-
-class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
-{
-protected:
- virtual void Select(sal_uInt16 nSelectModifier ) override;
-
-public:
- SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
-};
-
-class SfxPopupMenuManager;
-class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
-
-/* [Description]
-
- Internal helper class to provide the addons popup menu through the addons
- toolbox button.
-*/
-
-{
-protected:
- virtual void Click() override;
- virtual void Select(sal_uInt16 nSelectModifier) override;
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
-public:
- SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
- virtual ~SfxAddonsToolBoxControl_Impl();
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 863f880d5f0b..1eab7de7dfeb 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -61,7 +61,6 @@ public:
// Something else
virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
- void UnBind();
void GetNewDispatch();
void ReleaseDispatch();
void ReleaseBindings();