include/sfx2/sidebar/SidebarToolBox.hxx | 4 ++-- sfx2/source/sidebar/ControllerFactory.cxx | 3 +-- sfx2/source/sidebar/SidebarToolBox.cxx | 11 +++++------ 3 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit b4c7b62d5cb7c499fec6705239b3619d2e3d2ad6 Author: Caolán McNamara <caol...@redhat.com> Date: Wed May 15 09:58:16 2013 +0100 various build fixes Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 6bc9a34..4d5625c 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -85,8 +85,8 @@ private: DECL_LINK(ClickHandler, ToolBox*); DECL_LINK(DoubleClickHandler, ToolBox*); DECL_LINK(SelectHandler, ToolBox*); - DECL_LINK(Activate, ToolBox*); - DECL_LINK(Deactivate, ToolBox*); + DECL_LINK(ActivateToolBox, ToolBox*); + DECL_LINK(DeactivateToolBox, ToolBox*); void CreateController ( const sal_uInt16 nItemId, diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index e7463a8..7ce9eb8 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 ea4f910..61110ee 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; }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits