On Tue, 2013-02-26 at 01:07 +0530, Janit Anjaria wrote: > I am hereby sending you the patch for review.
Your original patch is unfortunately quite badly mangled, you've included... a) a new file called vcl/0001-New-table-dialog-from-impress-and-draw-converted-to-patch which is surely an accidental pickup b) a new file called vcl/source/window/toolbox2.cxx.save which might be the desired result of modifying toolbox2.cxx or it might be an older abandoned attempt accidentally picked up :-( c) and your git name and email aren't set right So, see http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup to set your username and email correctly On the basis that vcl/source/window/toolbox2.cxx.save is a modified version of vcl/source/window/toolbox2.cxx with your real changes in there I've sucked the attached patch out of the car crash which does actually enable the comboboxes to appear in vertical toolbar mode which is progress. Catch is though that the font name and font style entries aren't suitable for vertical toolbar mode so it would be a step backwards to apply the attached patch. But I'm only guessing that this is your real patch :-). If the patch you intended to send is different than the attached try and re-submit it, but spend a few secs to scan through the patch manually to make sure it looks like you expect. C.
>From 94e0198ab7dd76414d80620cbd3cb5f33e296326 Mon Sep 17 00:00:00 2001 From: Computer1 <[email protected]> Date: Tue, 26 Feb 2013 10:36:49 +0000 Subject: [PATCH] Resolves: fdo#55846 FontSize not displayed when the toolbar is vertical The font size and font name now appears in the vertical toolbar after making changes in the code at toolbox.cxx and toolbox2.cxx Change-Id: I71ee29ce607f912111f01515d9b2b918bb517e06 --- vcl/source/window/toolbox.cxx | 1 + vcl/source/window/toolbox2.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 2e7bddf..0477694 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1919,6 +1919,7 @@ sal_Bool ToolBox::ImplCalcItem() if( it->mbVisibleText && !mbHorz ) { long tmp = it->maItemSize.Width(); + //fdo#55846 The UI for the same is managed by changing the snippet here. it->maItemSize.Width() = it->maItemSize.Height(); it->maItemSize.Height() = tmp; } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 85f7ca9..cd0c608 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -222,7 +222,7 @@ Size ImplToolItem::GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWid { aSize = maItemSize; - if ( mpWindow && bHorz ) + if ( mpWindow ) { // get size of item window and check if it fits // no windows in vertical toolbars (the default is mbShowWindow=sal_False) -- 1.8.1.2
_______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
