[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Jan Holesovsky]

 include/sfx2/sidebar/SidebarToolBox.hxx |   10 --------
 sfx2/source/sidebar/SidebarToolBox.cxx  |   37 +++++++++++---------------------
 2 files changed, 14 insertions(+), 33 deletions(-)

New commits:
commit d69c03a3520205db549b2c84e7825967c8ea3ac5
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Apr 4 10:54:19 2016 +0200

    Kill some written-only member vars in SidebarToolBox.
    
    Change-Id: I26b89fefafea90a24252dc3a167682b4daf0193c

diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index e9fae35..e834393 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -62,15 +62,7 @@ public:
     css::uno::Reference<css::frame::XToolbarController> GetFirstController();
 
 private:
-    class ItemDescriptor
-    {
-    public:
-        css::uno::Reference<css::frame::XToolbarController> mxController;
-        css::util::URL maURL;
-        rtl::OUString msCurrentCommand;
-    };
-
-    typedef std::map<sal_uInt16, ItemDescriptor> ControllerContainer;
+    typedef std::map<sal_uInt16, css::uno::Reference<css::frame::XToolbarController>> ControllerContainer;
     ControllerContainer maControllers;
     bool mbAreHandlersRegistered;
 
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index dfebb0e..f09a711 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -81,7 +81,7 @@ void SidebarToolBox::dispose()
          iController!=iEnd;
          ++iController)
     {
-        Reference<lang::XComponent> xComponent (iController->second.mxController, UNO_QUERY);
+        Reference<lang::XComponent> xComponent(iController->second, UNO_QUERY);
         if (xComponent.is())
             xComponent->dispose();
     }
@@ -137,52 +137,41 @@ void SidebarToolBox::CreateController (
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     const sal_Int32 nItemWidth)
 {
-    ItemDescriptor aDescriptor;
-
     const OUString sCommandName (GetItemCommand(nItemId));
 
-    aDescriptor.mxController = sfx2::sidebar::ControllerFactory::CreateToolBoxController(
-                                                this, nItemId, sCommandName, rxFrame, rxFrame->getController(),
-                                                VCLUnoHelper::GetInterface(this), nItemWidth);
-    if (aDescriptor.mxController.is())
-    {
-        aDescriptor.maURL = sfx2::sidebar::Tools::GetURL(sCommandName);
-        aDescriptor.msCurrentCommand = sCommandName;
+    uno::Reference<frame::XToolbarController> xController(sfx2::sidebar::ControllerFactory::CreateToolBoxController(
+            this, nItemId, sCommandName, rxFrame, rxFrame->getController(),
+            VCLUnoHelper::GetInterface(this), nItemWidth));
 
-        maControllers.insert(std::make_pair(nItemId, aDescriptor));
-    }
+    if (xController.is())
+        maControllers.insert(std::make_pair(nItemId, xController));
 }
 
 Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (const sal_uInt16 nItemId) const
 {
     ControllerContainer::const_iterator iController (maControllers.find(nItemId));
     if (iController != maControllers.end())
-        return iController->second.mxController;
+        return iController->second;
     else
         return nullptr;
 }
 
 void SidebarToolBox::SetController(const sal_uInt16 nItemId,
                                    const css::uno::Reference<css::frame::XToolbarController>& rxController,
-                                   const OUString& rsCommandName)
+                                   const OUString& /*rsCommandName*/)
 {
-    ItemDescriptor aDescriptor;
-    aDescriptor.mxController = rxController;
-    aDescriptor.maURL = sfx2::sidebar::Tools::GetURL(rsCommandName);
-    aDescriptor.msCurrentCommand = rsCommandName;
-
     ControllerContainer::iterator iController (maControllers.find(nItemId));
     if (iController != maControllers.end())
     {
-        Reference<lang::XComponent> xComponent (iController->second.mxController, UNO_QUERY);
+        Reference<lang::XComponent> xComponent(rxController, UNO_QUERY);
         if (xComponent.is())
             xComponent->dispose();
 
-        iController->second = aDescriptor;
+        iController->second = rxController;
     }
     else
     {
-        maControllers[nItemId] = aDescriptor;
+        maControllers[nItemId] = rxController;
     }
 
     if (rxController.is())
@@ -195,7 +184,7 @@ sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubTool
          iController!=iEnd;
          ++iController)
     {
-        Reference<frame::XToolbarController> xController (iController->second.mxController);
+        Reference<frame::XToolbarController> xController(iController->second);
         Reference<frame::XSubToolbarController> xSubToolbarController (xController, UNO_QUERY);
         if (xSubToolbarController.is())
         {
@@ -212,7 +201,7 @@ css::uno::Reference<css::frame::XToolbarController> SidebarToolBox::GetFirstCont
     if (maControllers.empty())
         return css::uno::Reference<css::frame::XToolbarController>();
 
-    return maControllers.begin()->second.mxController;
+    return maControllers.begin()->second;
 }
 
 void SidebarToolBox::RegisterHandlers()