Author: af
Date: Fri May 10 11:30:31 2013
New Revision: 1480982
URL: http://svn.apache.org/r1480982
Log:
122218: Replaced local tool box controller with existing
GenericToolboxController (cleanup).
Removed:
openoffice/trunk/main/svx/source/sidebar/insert/SimpleToolBoxController.cxx
openoffice/trunk/main/svx/source/sidebar/insert/SimpleToolBoxController.hxx
Modified:
openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx
Modified:
openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx?rev=1480982&r1=1480981&r2=1480982&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx Fri
May 10 11:30:31 2013
@@ -23,7 +23,6 @@
#include "InsertPropertyPanel.hxx"
#include "InsertPropertyPanel.hrc"
-#include "SimpleToolBoxController.hxx"
#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include <sfx2/sidebar/Theme.hxx>
@@ -32,6 +31,7 @@
#include <svx/dialmgr.hxx>
#include <svtools/miscopt.hxx>
+#include <svtools/generictoolboxcontroller.hxx>
#include <vcl/toolbox.hxx>
#include <sfx2/tbxctrl.hxx>
#include <framework/sfxhelperfunctions.hxx>
@@ -281,7 +281,12 @@ void InsertPropertyPanel::CreateControll
UNO_QUERY);
if ( ! aDescriptor.mxController.is())
aDescriptor.mxController.set(
- static_cast<XWeak*>(new SimpleToolBoxController(mxFrame,
*pToolBox, nItemId, sCommandName)),
+ static_cast<XWeak*>(new svt::GenericToolboxController(
+ ::comphelper::getProcessServiceFactory(),
+ mxFrame,
+ pToolBox,
+ nItemId,
+ sCommandName)),
UNO_QUERY);
if ( ! aDescriptor.mxController.is())
return;
