rpms/openoffice.org/devel openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch, NONE, 1.1 openoffice.org.spec, 1.1481, 1.1482
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Apr 16 12:55:57 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4378
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
Log Message:
add openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch:
--- NEW FILE openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch ---
Index: source/ui/inc/output.hxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/inc/output.hxx,v
retrieving revision 1.19
diff -u -r1.19 output.hxx
--- openoffice.org.orig/sc/source/ui/inc/output.hxx 26 Jun 2007 11:50:45 -0000 1.19
+++ openoffice.org/sc/source/ui/inc/output.hxx 16 Apr 2008 12:05:59 -0000
@@ -242,6 +242,7 @@
void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);
void DrawFrame();
+ bool UseNormalClip(SCROW nCellY, const SfxItemSet* pCondSet);
// with logic MapMode set!
void DrawEdit(BOOL bPixelToLogic);
Index: source/ui/view/output2.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/output2.cxx,v
retrieving revision 1.54.216.1
diff -u -r1.54.216.1 output2.cxx
--- openoffice.org.orig/sc/source/ui/view/output2.cxx 18 Jan 2008 12:02:36 -0000 1.54.216.1
+++ openoffice.org/sc/source/ui/view/output2.cxx 16 Apr 2008 12:19:34 -0000
@@ -83,6 +83,8 @@
#include "scmod.hxx"
#include "fillinfo.hxx"
+#include <stdio.h>
+
//! Autofilter-Breite mit column.cxx zusammenfassen
#define DROPDOWN_BITMAP_SIZE 17
@@ -2003,6 +2005,21 @@
}
}
+bool ScOutputData::UseNormalClip(SCROW nCellY, const SfxItemSet* pCondSet)
+{
+ bool bNormalClip = false;
+ // Don't clip for text height when printing rows with optimal height,
+ // except when font size is from conditional formatting.
+ //! Allow clipping when vertically merged?
+ if ( eType != OUTTYPE_PRINTER ||
+ ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
+ ( pCondSet && SFX_ITEM_SET ==
+ pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) )
+ bNormalClip = TRUE;
+ return bNormalClip;
+}
+
+
void ScOutputData::DrawEdit(BOOL bPixelToLogic)
{
vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
@@ -2694,13 +2711,8 @@
(ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
- // Don't clip for text height when printing rows with optimal height,
- // except when font size is from conditional formatting.
- //! Allow clipping when vertically merged?
- if ( eType != OUTTYPE_PRINTER ||
- ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
- ( pCondSet && SFX_ITEM_SET ==
- pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) )
+
+ if (UseNormalClip(nCellY, pCondSet))
bClip = TRUE;
else
bSimClip = TRUE;
@@ -2750,6 +2762,18 @@
#endif
Rectangle aLogicClip;
+ if (
+ ((nAttrRotate == 9000) || (nAttrRotate == 27000)) &&
+ (!(eOrient==SVX_ORIENTATION_STANDARD && !bAsianVertical)) &&
+ (!(bClip || bSimClip))
+ )
+ {
+ if (UseNormalClip(nCellY, pCondSet))
+ bClip = TRUE;
+ else
+ bSimClip = TRUE;
+ }
+
if (bClip || bSimClip)
{
// Clip marks are already handled in GetOutputArea
@@ -2805,10 +2829,20 @@
}
else
{
+ long nDiff = 0;
if (eHorJust==SVX_HOR_JUSTIFY_RIGHT)
- aLogicStart.X() += nAvailWidth - nEngineWidth;
+ nDiff = nAvailWidth - nEngineWidth;
else if (eHorJust==SVX_HOR_JUSTIFY_CENTER)
- aLogicStart.X() += (nAvailWidth - nEngineWidth) / 2;
+ nDiff = (nAvailWidth - nEngineWidth) / 2;
+
+ if (nEngineWidth > nAvailWidth)
+ {
+ if (nAttrRotate == 9000)
+ nDiff = 0;
+ else if (nAttrRotate == 27000)
+ nDiff = nAvailWidth - nEngineWidth;
+ }
+ aLogicStart.X() += nDiff;
}
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1481
retrieving revision 1.1482
diff -u -r1.1481 -r1.1482
--- openoffice.org.spec 16 Apr 2008 07:56:39 -0000 1.1481
+++ openoffice.org.spec 16 Apr 2008 12:55:16 -0000 1.1482
@@ -142,6 +142,7 @@
Patch69: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
Patch70: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
Patch71: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
+Patch72: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1253,6 +1254,7 @@
%patch69 -p1 -b .ooo88260.decl-defi-mismatch.patch
%patch70 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
%patch71 -p1 -b .oo88319.setup_native.missing.patch
+%patch72 -p1 -b .ooo88341.sc.verticalboxes.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3283,7 +3285,7 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Tue Apr 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.7.1
+* Wed Apr 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.7.1
- next version
- drop integrated openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
- extend selinux bodge to s390x
@@ -3291,6 +3293,7 @@
- add openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
- disable pdfimport for now
- add openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
+- add openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
* Wed Apr 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
More information about the fedora-extras-commits
mailing list