[PATCH] Resolves fdo#55846 - Font Size list does not display with ve...

Rushi Shukla (via Code Review) gerrit at gerrit.libreoffice.org
Wed Jan 16 06:48:22 PST 2013


I have submitted a patch for review:


To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/1717/1

Resolves fdo#55846 - Font Size list does not display with vertical Formatting toolbar
When the Formatting toolbar is positioned/docked horizontally, the Font Size drop-down list expands correctly. When docked vertically, the Font Size drop-down list does not expand at all.
The Font Size drop-down list should now expand whether the Formatting toolbar is vertically or horizontally positioned/docked.
Author : Rushi Shukla (rushboy52 at gmail.com)
Change-Id: I62f5d49b3c1d1e37dc74cdf8c18bde51cede4cf4
M svtools/source/control/ctrlbox.cxx
1 file changed, 7 insertions(+), 0 deletions(-)

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 09cf09f..c66f85e 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -28,6 +28,9 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/charclass.hxx>
+#include <window.h>
+#include <window.hxx>  
+#include <dockwin.hxx>
 #include <svtools/sampletext.hxx>
 #include <svtools/svtresid.hxx>
@@ -38,6 +41,8 @@
 #include <vcl/i18nhelp.hxx>
 #include <vcl/fontcapabilities.hxx>
+#include <vcl/dockingarea.hxx>
+#include <vcl/floatwin.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -1670,6 +1675,8 @@
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontSizeBox(Window *pParent, VclBuilder::stringmap &rMap)
     bool bDropdown = extractDropdown(rMap);
+    if(pParent->IsPined() && !(pParent->IsHorizontal()))
+        bDropdown = true;
     if (bDropdown)
         nWinBits |= WB_DROPDOWN;

To view, visit https://gerrit.libreoffice.org/1717
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62f5d49b3c1d1e37dc74cdf8c18bde51cede4cf4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rushi Shukla <rushboy52 at gmail.com>

More information about the LibreOffice mailing list