update this patch too

openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch

@@ -1,11 +1,18 @@
-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
-@@ -303,6 +303,8 @@
+From 5316edea6948f3e2a77e4fc68799f67de21fada7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 5 Dec 2011 15:28:19 +0100
+Subject: [PATCH] vertical content overflowing out of cell (#i88341#)
+
+---
+ sc/source/ui/inc/output.hxx   |    2 +
+ sc/source/ui/view/output2.cxx |   66 ++++++++++++++++++++++++++--------------
+ 2 files changed, 45 insertions(+), 23 deletions(-)
+
+diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
+index 72934cf..3a91c14 100644
+--- a/sc/source/ui/inc/output.hxx
++++ b/sc/source/ui/inc/output.hxx
+@@ -306,6 +306,8 @@ public:
      void    DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom);
      void    DrawFrame();
  
@@ -14,14 +21,11 @@ diff -u -r1.19 output.hxx
                      // with logic MapMode set!
      void    DrawEdit(sal_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
-@@ -2819,13 +2819,7 @@
+diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
+index de1506a..5522e69 100644
+--- a/sc/source/ui/view/output2.cxx
++++ b/sc/source/ui/view/output2.cxx
+@@ -2818,13 +2818,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
                  (ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE);
          bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
  
@@ -36,7 +40,7 @@ diff -u -r1.54.216.1 output2.cxx
              bClip = true;
          else
              bSimClip = true;
-@@ -2861,6 +2855,19 @@
+@@ -2859,6 +2853,19 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
      }
  
      Rectangle aLogicClip;
@@ -56,7 +60,7 @@ diff -u -r1.54.216.1 output2.cxx
      if (bClip || bSimClip)
      {
          // Clip marks are already handled in GetOutputArea
-@@ -3357,13 +3364,8 @@
+@@ -3191,13 +3198,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
                  (ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE);
          bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
  
@@ -72,7 +76,7 @@ diff -u -r1.54.216.1 output2.cxx
              bClip = true;
          else
              bSimClip = true;
-@@ -3740,13 +3742,7 @@
+@@ -3563,13 +3565,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam)
                  (ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE);
          bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
  
@@ -87,8 +91,8 @@ diff -u -r1.54.216.1 output2.cxx
              bClip = true;
          else
              bSimClip = true;
-@@ -3880,6 +3876,20 @@
-     DrawEditStandard(rParam);
+@@ -4460,6 +4456,20 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam)
+     rParam.adjustForHyperlinkInPDF(aURLStart, pDev);
  }
  
 +bool ScOutputData::UseNormalClip(SCROW nCellY, const SfxItemSet* pCondSet)
@@ -108,7 +112,7 @@ diff -u -r1.54.216.1 output2.cxx
  void ScOutputData::DrawEdit(sal_Bool bPixelToLogic)
  {
      ScFieldEditEngine* pEngine = NULL;
-@@ -4622,11 +4632,21 @@
+@@ -5168,11 +5178,21 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic)
                                      else
                                      {
                                          //  bei gedrehtem Text ist Standard zentriert
@@ -132,3 +136,6 @@ diff -u -r1.54.216.1 output2.cxx
                                      }
                                  }
  
+-- 
+1.7.7.3
+