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

[Kohei Yoshida]

 patches/dev300/apply                                        |    3 -
 patches/dev300/calc-xls-export-row-height-wrapped-text.diff |   28 ------------
 2 files changed, 31 deletions(-)

New commits:
commit 46392dc38a1461f046f556f976e33b4a67617ed0
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Sep 28 15:03:35 2010 -0400

    Removed calc-xls-export-row-height-wrapped-text.diff.
    
    The patch moved to the split repos.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b50e29b..1ee862a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -514,9 +514,6 @@ calc-xlsx-import-default-cellstyle.diff, n#558577, kohei
 # The work to increase Calc's row size limit, and any work associated with it.
 SectionOwner => kohei
 
-# correctly export the heights of rows with wrapped text.
-calc-xls-export-row-height-wrapped-text.diff, n#580094, kohei
-
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
 # this is an increasingly marginal win ...
diff --git a/patches/dev300/calc-xls-export-row-height-wrapped-text.diff b/patches/dev300/calc-xls-export-row-height-wrapped-text.diff
deleted file mode 100644
index 9d41e0a..0000000
--- a/patches/dev300/calc-xls-export-row-height-wrapped-text.diff
+++ /dev/null
@@ -1,28 +0,0 @@
----
- sc/source/filter/excel/xetable.cxx |    9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx
-index 9644976..dfed546 100644
---- sc/source/filter/excel/xetable.cxx
-+++ sc/source/filter/excel/xetable.cxx
-@@ -1832,13 +1832,10 @@ XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt16 nXclRow,
- 
-     // *** Row height *** -----------------------------------------------------
- 
--    if (bUserHeight)
--        mnHeight = GetDoc().GetRowHeight(nScRow, nScTab, false);
--    else
--        mnHeight = EXC_ROW_DEFAULTHEIGHT;
-+    // Always get the actual row height even if the manual size flag is not set,
-+    // to correctly export the heights of rows with wrapped texts.
- 
--    // #76250# not usable in Applix
--//    ::set_flag( mnHeight, EXC_ROW_FLAGDEFHEIGHT, !bUserHeight );
-+    mnHeight = GetDoc().GetRowHeight(nScRow, nScTab, false);
- 
-     // *** Outline data *** ---------------------------------------------------
- 
--- 
-1.7.0.1
-