From 0699b6ec3fa3de953f226e9f857a67dfa3ac0fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 7 Mar 2013 14:45:18 +0000 Subject: [PATCH] Resolves: fdo#61241 force area page to size itself --- ...41-force-area-page-to-size-itself-fo.patch | 38 +++++++++++++++++++ libreoffice.spec | 3 ++ 2 files changed, 41 insertions(+) create mode 100644 0001-Resolves-fdo-61241-force-area-page-to-size-itself-fo.patch diff --git a/0001-Resolves-fdo-61241-force-area-page-to-size-itself-fo.patch b/0001-Resolves-fdo-61241-force-area-page-to-size-itself-fo.patch new file mode 100644 index 0000000..ee44b73 --- /dev/null +++ b/0001-Resolves-fdo-61241-force-area-page-to-size-itself-fo.patch @@ -0,0 +1,38 @@ +From b83c2e7ac73cc1e4b3ee954ff5c6cdbda6c41d8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 27 Feb 2013 20:57:01 +0000 +Subject: [PATCH] Resolves: fdo#61241 force area page to size itself for max + visible controls + +Change-Id: I2d67ce71528786ef300ab83ee1e5b1cad6b4abe8 +(cherry picked from commit fc8022431a1684f3cfb1e2f7e4ec923a8e71df94) +Reviewed-on: https://gerrit.libreoffice.org/2451 +Reviewed-by: Miklos Vajna +Reviewed-by: Eike Rathke +Reviewed-by: Muthu Subramanian K +Tested-by: Muthu Subramanian K +--- + cui/source/tabpages/tparea.cxx | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx +index 87b410f..47f4878 100644 +--- a/cui/source/tabpages/tparea.cxx ++++ b/cui/source/tabpages/tparea.cxx +@@ -765,6 +765,13 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : + aLbColor.SetAccessibleRelationMemberOf( &aFlProp ); + aMtrFldOffset.SetAccessibleRelationLabeledBy(&aFlOffset); + aMtrFldOffset.SetAccessibleName(aFlOffset.GetText()); ++ ++ //fdo#61241 lock down size of this tab page until it's ++ //converted to .ui (remember to use some sizegroups ++ //that take into account hidden frames) ++ Size aSize(GetSizePixel()); ++ set_width_request(aSize.Width()); ++ set_height_request(aSize.Height()); + } + + // ----------------------------------------------------------------------- +-- +1.8.1.2 + diff --git a/libreoffice.spec b/libreoffice.spec index d1c232c..53c1a64 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -254,6 +254,7 @@ Patch20: 0001-Resolves-rhbz-895196-sc-filter-float-a11y-parent-of-.patch Patch21: 0001-do-not-access-vector-elements-beyond-size-rhbz-84751.patch Patch22: 0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch Patch23: 0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch +Patch24: 0001-Resolves-fdo-61241-force-area-page-to-size-itself-fo.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1000,6 +1001,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch21 -p1 -b .do-not-access-vector-elements-beyond-size-rhbz-84751.patch %patch22 -p1 -b .rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch %patch23 -p1 -b .rhbz-902884-check-for-GetSelectedMasterPage-.patch +%patch24 -p1 -b .fdo-61241-force-area-page-to-size-itself-fo.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2069,6 +2071,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Thu Mar 07 2013 Caolán McNamara - 1:4.0.1.2-2 - Related: rhbz#902884 check for NULL GetSelectedMasterPage +- Resolves: fdo#61241 force area page to size itself * Thu Feb 28 2013 David Tardon - 1:4.0.1.2-1 - 4.0.1 rc2