[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                         |    3 -
 patches/dev300/calc-cell-270-degree-fix.diff |   63 ---------------------------
 2 files changed, 66 deletions(-)

New commits:
commit 6139ddcf12574510e47ac2644192170a6b48c18f
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Oct 5 12:20:29 2010 -0400

    Removed calc-cell-270-degree-fix.diff; moved to git.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 04eac31..29e8097 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2809,8 +2809,5 @@ oox-pptx-import-fix-text-body-properties.diff, n#621744, rodo
 
 [ CalcFixes ]
 
-# Fix the bug that caused cell content to disappear under certain conditions.
-calc-cell-270-degree-fix.diff, n#640128, kohei
-
 # Fix performance bug on row height adjustments during ods import.
 calc-perf-ods-import-row-heights.diff, n#640112, kohei
diff --git a/patches/dev300/calc-cell-270-degree-fix.diff b/patches/dev300/calc-cell-270-degree-fix.diff
deleted file mode 100644
index ff5c486..0000000
--- a/patches/dev300/calc-cell-270-degree-fix.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git sc/source/ui/view/output2.cxx sc/source/ui/view/output2.cxx
-index 8c96d95..780123b 100644
---- sc/source/ui/view/output2.cxx
-+++ sc/source/ui/view/output2.cxx
-@@ -3011,7 +3011,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
-                                         aLogicStart.Y() += nTopM;
-                                 }
- 
--                                if (!aAlignParam.mbAsianVertical &&
-+                                if (!aAlignParam.mbAsianVertical && !aAlignParam.isVerticallyOriented() &&
-                                     (aAlignParam.meOrient == SVX_ORIENTATION_STANDARD || aAlignParam.meOrient == SVX_ORIENTATION_STACKED || !aAlignParam.mbBreak))
-                                 {
-                                     if (aAlignParam.meVerJust==SVX_VER_JUSTIFY_BOTTOM ||
-@@ -3055,7 +3055,49 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
-                                     // nOriVal = -900;
-                                     nOriVal = 2700;
-                                     if (aAlignParam.meHorJust != SVX_HOR_JUSTIFY_BLOCK)
-+                                    {
-                                         aLogicStart.X() += nEngineWidth;
-+                                        if (!aAlignParam.mbBreak)
-+                                        {
-+                                            // Set the paper width to text size.
-+                                            Size aPSize = pEngine->GetPaperSize();
-+                                            aPSize.Width() = pEngine->CalcTextWidth();
-+                                            pEngine->SetPaperSize(aPSize);
-+
-+                                            long nGap = 0;
-+                                            long nTopOffset = 0; // offset by top margin
-+                                            if (bPixelToLogic)
-+                                            {
-+                                                nGap = pRefDevice->LogicToPixel(aPSize).Width() - pRefDevice->LogicToPixel(aCellSize).Height();
-+                                                nGap = pRefDevice->PixelToLogic(Size(0, nGap)).Height();
-+                                                nTopOffset = pRefDevice->PixelToLogic(Size(0,nTopM)).Height();
-+                                            }
-+                                            else
-+                                            {
-+                                                nGap = aPSize.Width() - aCellSize.Height();
-+                                                nTopOffset = nTopM;
-+                                            }
-+                                            aLogicStart.Y() += nTopOffset;
-+
-+                                            switch (aAlignParam.meVerJust)
-+                                            {
-+                                                case SVX_VER_JUSTIFY_STANDARD:
-+                                                case SVX_VER_JUSTIFY_BOTTOM:
-+                                                    // align to bottom
-+                                                    aLogicStart.Y() -= nGap;
-+                                                break;
-+                                                case SVX_VER_JUSTIFY_CENTER:
-+                                                    // center it.
-+                                                    aLogicStart.Y() -= nGap / 2;
-+                                                break;
-+                                                case SVX_VER_JUSTIFY_BLOCK:
-+                                                case SVX_VER_JUSTIFY_TOP:
-+                                                    // align to top (do nothing)
-+                                                default:
-+                                                    ;
-+                                            }
-+                                        }
-+                                    }
-                                 }
-                                 else if (aAlignParam.meOrient == SVX_ORIENTATION_BOTTOMTOP)
-                                 {