diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ControllerFactory.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index e7463a896c0c..7ce9eb8ea907 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -15,7 +15,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "precompiled_sfx2.hxx" #include "sfx2/sidebar/ControllerFactory.hxx" #include "sfx2/sidebar/CommandInfoProvider.hxx" @@ -53,7 +52,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( if ( ! xController.is()) xController.set( static_cast<XWeak*>(new svt::GenericToolboxController( - ::comphelper::getProcessServiceFactory(), + ::comphelper::getProcessComponentContext(), rxFrame, pToolBox, nItemId, diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index ea4f910b9ec2..61110ee19872 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -60,8 +60,8 @@ SidebarToolBox::SidebarToolBox ( SetClickHdl(LINK(this, SidebarToolBox, ClickHandler)); SetDoubleClickHdl(LINK(this, SidebarToolBox, DoubleClickHandler)); SetSelectHdl(LINK(this, SidebarToolBox, SelectHandler)); - SetActivateHdl(LINK(this, SidebarToolBox, Activate)); - SetDeactivateHdl(LINK(this, SidebarToolBox, Deactivate)); + SetActivateHdl(LINK(this, SidebarToolBox, ActivateToolBox)); + SetDeactivateHdl(LINK(this, SidebarToolBox, DeactivateToolBox)); } #ifdef DEBUG @@ -251,14 +251,13 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con void SidebarToolBox::UpdateIcons (const Reference<frame::XFrame>& rxFrame) { const sal_Bool bBigImages (SvtMiscOptions().AreCurrentSymbolsLarge()); - const bool bIsHighContrastActive (sfx2::sidebar::Theme::IsHighContrastMode()); for (ControllerContainer::iterator iController(maControllers.begin()), iEnd(maControllers.end()); iController!=iEnd; ++iController) { const ::rtl::OUString sCommandURL (iController->second.msCurrentCommand); - Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL, bBigImages, bIsHighContrastActive)); + Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL, bBigImages)); SetItemImage(iController->first, aImage); } } @@ -349,7 +348,7 @@ IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox) -IMPL_LINK(SidebarToolBox, Activate, ToolBox*, EMPTYARG) +IMPL_LINK(SidebarToolBox, ActivateToolBox, ToolBox*, EMPTYARG) { return 1; } @@ -357,7 +356,7 @@ IMPL_LINK(SidebarToolBox, Activate, ToolBox*, EMPTYARG) -IMPL_LINK(SidebarToolBox, Deactivate, ToolBox*, EMPTYARG) +IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG) { return 1; } |