[Libreoffice-commits] .: svx/inc svx/source

[Libreoffice Gerrit user]

 svx/inc/tbunosearchcontrollers.hxx             |    7 +------
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |    7 +++----
 2 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 88b2c05411ac4a63f088b0cbce09b2d3669c4c2c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 17 11:38:26 2013 +0100

    -Werror,-Wunused-private-field

diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 87f9756..674f718 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -139,9 +139,7 @@ class ExitSearchToolboxController   : public svt::ToolboxController,
                                       public css::lang::XServiceInfo
 {
 public:
-    enum Type { EXIT };
-
-    ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager, Type eType );
+    ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager );
     ~ExitSearchToolboxController();
 
     // XInterface
@@ -172,9 +170,6 @@ public:
 
     // XStatusListener
     virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException );
-
-private:
-    Type meType;
 };
 
 class UpDownSearchToolboxController : public svt::ToolboxController,
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index af48a73..0dff510 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -606,11 +606,10 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe
 //-----------------------------------------------------------------------------------------------------------
 // class ExitSearchToolboxController
 
-ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, Type eType )
+ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager )
     : svt::ToolboxController( rServiceManager,
             css::uno::Reference< css::frame::XFrame >(),
-            rtl::OUString( COMMAND_EXITSEARCH ) ),
-      meType( eType )
+            rtl::OUString( COMMAND_EXITSEARCH ) )
 {
 }
 
@@ -904,7 +903,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL UpSearchToolboxController_c
 css::uno::Reference< css::uno::XInterface > SAL_CALL ExitFindbarToolboxController_createInstance(
     const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr )
 {
-    return *new ExitSearchToolboxController( rSMgr, ExitSearchToolboxController::EXIT );
+    return *new ExitSearchToolboxController( rSMgr );
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createInstance(