[PATCH] Enables-fontsize-in-vertical-formatting-toolbar Change-Id: I...

[Rushi Shukla (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1711

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/1711/1

Enables-fontsize-in-vertical-formatting-toolbar
Change-Id: I8a376e657b99e7daa51272f5153d7cbc5bcafe9b
---
M svtools/inc/svtools/ctrlbox.hxx
M svtools/source/control/ctrlbox.cxx
2 files changed, 10 insertions(+), 0 deletions(-)



diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 2d6e6a2..5cc1c1c 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -21,6 +21,9 @@
 #define _CTRLBOX_HXX
 
 #include "svtools/svtdllapi.h"
+#include <window.h>
+#include <window.hxx>  
+#include <dockwin.hxx>
 
 #include <tools/string.hxx>
 #include <vcl/lstbox.hxx>
@@ -29,6 +32,9 @@
 #include <vcl/virdev.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/field.hxx>
+#include <vcl/dockingarea.hxx>
+#include <vcl/floatwin.hxx>
+
 
 class FontList;
 class ImplColorListData;
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 09cf09f..5da4448 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -38,6 +38,7 @@
 
 #include <vcl/i18nhelp.hxx>
 #include <vcl/fontcapabilities.hxx>
+#include <vcl/floatwin.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
@@ -1670,6 +1671,9 @@
 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;
+    
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
     if (bDropdown)
         nWinBits |= WB_DROPDOWN;

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

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