[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/inc sfx2/source
Andre Fischer
af at apache.org
Tue May 14 11:08:58 PDT 2013
sfx2/inc/sfx2/sidebar/ControllerFactory.hxx | 2 ++
sfx2/source/sidebar/FocusManager.cxx | 2 ++
sfx2/source/sidebar/SidebarToolBox.cxx | 3 +++
3 files changed, 7 insertions(+)
New commits:
commit a7d457da0e9d7d2ede3906d346869322801b9707
Author: Andre Fischer <af at apache.org>
Date: Tue May 14 16:23:55 2013 +0000
122302: Added missing includes.
diff --git a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
index 802d3e7..8a08050 100644
--- a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
@@ -29,6 +29,8 @@
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
+class ToolBox;
+
namespace sfx2 { namespace sidebar {
/** Convenience class for easy creation of toolbox controllers.
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index b1e6dd0..93ff036 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -194,10 +194,12 @@ FocusManager::FocusLocation FocusManager::GetFocusLocation (const Window& rWindo
{
// Check the deck title.
if (mpDeckTitleBar != NULL)
+ {
if (mpDeckTitleBar == &rWindow)
return FocusLocation(PC_DeckTitle, -1);
else if (&mpDeckTitleBar->GetToolBox() == &rWindow)
return FocusLocation(PC_DeckToolBox, -1);
+ }
// Search the panels.
for (sal_Int32 nIndex=0,nCount(maPanels.size()); nIndex<nCount; ++nIndex)
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 30a0dab..20408dd 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -28,6 +28,9 @@
#include "sfx2/sidebar/Tools.hxx"
#include <vcl/gradient.hxx>
+#include <svtools/miscopt.hxx>
+#include <framework/imageproducer.hxx>
+#include <com/sun/star/frame/XSubToolbarController.hpp>
using namespace ::com::sun::star;
More information about the Libreoffice-commits
mailing list