summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-20 08:44:33 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-20 10:07:10 +0200
commit1c5cae479bebd2d325182adc2c9821fd948fd1bd (patch)
tree639e50ced55620dc2d1e9eb5a7ed8a6298c4de09 /sfx2/source
parentda24355234ec12f2f4c652113dbbb1216ba5492c (diff)
loplugin:unusedmethods
Change-Id: Ib7a9b1b0802ca751da258065e89b412b090bb672 Reviewed-on: https://gerrit.libreoffice.org/36718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx2
-rw-r--r--sfx2/source/dialog/styfitem.cxx1
-rw-r--r--sfx2/source/inc/sfxtypes.hxx1
-rw-r--r--sfx2/source/sidebar/ControllerItem.cxx63
-rw-r--r--sfx2/source/sidebar/Theme.cxx1
5 files changed, 1 insertions, 67 deletions
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 1b5c039a8700..9b5e53f5d544 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -27,7 +27,7 @@
#include <glib.h>
#include <osl/mutex.hxx>
#include <osl/module.hxx>
-#include "tools/rc.hxx"
+#include <tools/resmgr.hxx>
#include <sfx2/app.hxx>
#include "app.hrc"
#include "shutdownicon.hxx"
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 5821500bd928..c6b693871f38 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -19,7 +19,6 @@
#include <osl/diagnose.h>
#include <sfx2/styfitem.hxx>
-#include <tools/rc.hxx>
#include <tools/rcid.h>
#include <tools/debug.hxx>
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index cfa3d1d77780..40719fcc5a11 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <sal/log.hxx>
-#include <tools/rc.hxx>
#include <tools/rcid.h>
#include <tools/resid.hxx>
#include <vcl/svapp.hxx>
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 7a1ac1f588b6..2ebff3df3a8c 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -35,55 +35,6 @@
using namespace css;
using namespace css::uno;
-namespace
-{
- typedef ::cppu::WeakComponentImplHelper <
- css::frame::XFrameActionListener
- > FrameActionListenerInterfaceBase;
-
- class FrameActionListener
- : public ::cppu::BaseMutex,
- public FrameActionListenerInterfaceBase
- {
- public:
- FrameActionListener (
- sfx2::sidebar::ControllerItem& rControllerItem,
- const Reference<frame::XFrame>& rxFrame)
- : FrameActionListenerInterfaceBase(m_aMutex),
- mrControllerItem(rControllerItem),
- mxFrame(rxFrame)
- {
- if (mxFrame.is())
- mxFrame->addFrameActionListener(this);
- }
-
- virtual void SAL_CALL disposing() override
- {
- SolarMutexGuard g;
- if (mxFrame.is())
- mxFrame->removeFrameActionListener(this);
- }
- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override
- {
- (void)rEvent;
-
- SolarMutexGuard g;
- mrControllerItem.ResetFrame();
- mxFrame = nullptr;
- }
- virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) override
- {
- SolarMutexGuard g;
- if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
- mrControllerItem.NotifyFrameContextChange();
- }
-
- private:
- sfx2::sidebar::ControllerItem& mrControllerItem;
- Reference<frame::XFrame> mxFrame;
- };
-}
-
namespace sfx2 { namespace sidebar {
ControllerItem::ControllerItem (
@@ -98,20 +49,6 @@ ControllerItem::ControllerItem (
{
}
-ControllerItem::ControllerItem (
- const sal_uInt16 nSlotId,
- SfxBindings &rBindings,
- ItemUpdateReceiverInterface& rItemUpdateReceiver,
- const ::rtl::OUString& rsCommandName,
- const Reference<frame::XFrame>& rxFrame)
- : SfxControllerItem(nSlotId, rBindings),
- mrItemUpdateReceiver(rItemUpdateReceiver),
- mxFrame(rxFrame),
- mxFrameActionListener(new FrameActionListener(*this, mxFrame)),
- msCommandName(rsCommandName)
-{
-}
-
ControllerItem::~ControllerItem()
{
dispose();
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 7d4e18059b45..2b29083f5bd9 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -22,7 +22,6 @@
#include <sfx2/app.hxx>
#include <tools/svborder.hxx>
-#include <tools/rc.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>