You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/05/14 18:23:55 UTC
svn commit: r1482424 - in /openoffice/trunk/main/sfx2:
inc/sfx2/sidebar/ControllerFactory.hxx source/sidebar/FocusManager.cxx
source/sidebar/SidebarToolBox.cxx
Author: af
Date: Tue May 14 16:23:55 2013
New Revision: 1482424
URL: http://svn.apache.org/r1482424
Log:
122302: Added missing includes.
Modified:
openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx
Modified: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx?rev=1482424&r1=1482423&r2=1482424&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx (original)
+++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx Tue May 14 16:23:55 2013
@@ -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.
Modified: openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx?rev=1482424&r1=1482423&r2=1482424&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx Tue May 14 16:23:55 2013
@@ -194,11 +194,13 @@ FocusManager::FocusLocation FocusManager
{
// 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)
{
Modified: openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx?rev=1482424&r1=1482423&r2=1482424&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx Tue May 14 16:23:55 2013
@@ -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;