[Libreoffice-commits] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                            |    4 -
 patches/dev300/calc-xls-import-cell-border.diff |   64 ------------------------
 2 files changed, 68 deletions(-)

New commits:
commit 808850142572edb6e0f4ef76f4bbc3cb5ac1af13
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Dec 21 00:57:01 2010 -0500

    Removed ported patch.
    
    calc-xls-import-cell-border.diff is now in git.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c512f26..f5a7929 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2268,10 +2268,6 @@ SectionOwner => cbosdo
 #FIXME: Incomplete, not to be included in 3.2.1
 #border-types-more.diff, fate#309127
 
-[ CalcFixes ]
-# Better mapping of cell border thickness & inner padding.
-calc-xls-import-cell-border.diff, n#636691, kohei
-
 [ OOXML ]
 oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
 oox-smartart-import.diff, thorsten
diff --git a/patches/dev300/calc-xls-import-cell-border.diff b/patches/dev300/calc-xls-import-cell-border.diff
deleted file mode 100644
index f60317b..0000000
--- a/patches/dev300/calc-xls-import-cell-border.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git sc/source/filter/excel/xistyle.cxx sc/source/filter/excel/xistyle.cxx
-index f40ee7f..5f30ae3 100644
---- sc/source/filter/excel/xistyle.cxx
-+++ sc/source/filter/excel/xistyle.cxx
-@@ -878,26 +878,33 @@ bool XclImpCellBorder::HasAnyOuterBorder() const
- 
- namespace {
- 
-+// TODO: These values are approximate; we should probably tweak these values 
-+// further to better match Excel's border thickness.
-+#define XLS_LINE_WIDTH_HAIR    1
-+#define XLS_LINE_WIDTH_THIN    6
-+#define XLS_LINE_WIDTH_MEDIUM 18
-+#define XLS_LINE_WIDTH_THICK  24
-+
- /** Converts the passed line style to a SvxBorderLine, or returns false, if style is "no line". */
- bool lclConvertBorderLine( SvxBorderLine& rLine, const XclImpPalette& rPalette, sal_uInt8 nXclLine, sal_uInt16 nXclColor )
- {
-     static const sal_uInt16 ppnLineParam[][ 4 ] =
-     {
--        //  outer width,        inner width,        distance    type
--        {   0,                  0,                  0,          SOLID },                // 0 = none
--        {   DEF_LINE_WIDTH_1,   0,                  0,          SOLID },                // 1 = thin
--        {   DEF_LINE_WIDTH_2,   0,                  0,          SOLID },                // 2 = medium
--        {   DEF_LINE_WIDTH_1,   0,                  0,          DASHED },               // 3 = dashed
--        {   DEF_LINE_WIDTH_1,   0,                  0,          DOTTED },               // 4 = dotted
--        {   DEF_LINE_WIDTH_3,   0,                  0,          SOLID },                // 5 = thick
--        {   DEF_LINE_WIDTH_1,   DEF_LINE_WIDTH_1,   DEF_LINE_WIDTH_1 },                 // 6 = double
--        {   DEF_LINE_WIDTH_0,   0,                  0,          SOLID },                // 7 = hair
--        {   DEF_LINE_WIDTH_2,   0,                  0,          DASHED },               // 8 = med dash
--        {   DEF_LINE_WIDTH_1,   0,                  0,          SOLID },                // 9 = thin dashdot
--        {   DEF_LINE_WIDTH_2,   0,                  0,          SOLID },                // A = med dashdot
--        {   DEF_LINE_WIDTH_1,   0,                  0,          SOLID },                // B = thin dashdotdot
--        {   DEF_LINE_WIDTH_2,   0,                  0,          SOLID },                // C = med dashdotdot
--        {   DEF_LINE_WIDTH_2,   0,                  0,          SOLID }                 // D = med slant dashdot
-+        //  outer width,        inner width,        distance              type
-+        {   0,                     0,                  0,                    SOLID },  // 0 = none
-+        {   XLS_LINE_WIDTH_THIN,   0,                  0,                    SOLID },  // 1 = thin
-+        {   XLS_LINE_WIDTH_MEDIUM, 0,                  0,                    SOLID },  // 2 = medium
-+        {   XLS_LINE_WIDTH_THIN,   0,                  0,                    DASHED }, // 3 = dashed
-+        {   XLS_LINE_WIDTH_THIN,   0,                  0,                    DOTTED }, // 4 = dotted
-+        {   XLS_LINE_WIDTH_THICK,  0,                  0,                    SOLID },  // 5 = thick
-+        {   XLS_LINE_WIDTH_THIN,   XLS_LINE_WIDTH_THIN, XLS_LINE_WIDTH_THIN, SOLID },  // 6 = double
-+        {   XLS_LINE_WIDTH_HAIR,   0,                  0,                    SOLID },  // 7 = hair
-+        {   XLS_LINE_WIDTH_MEDIUM, 0,                  0,                    DASHED }, // 8 = med dash
-+        {   XLS_LINE_WIDTH_THIN,   0,                  0,                    SOLID },  // 9 = thin dashdot
-+        {   XLS_LINE_WIDTH_MEDIUM, 0,                  0,                    SOLID },  // A = med dashdot
-+        {   XLS_LINE_WIDTH_THIN,   0,                  0,                    SOLID },  // B = thin dashdotdot
-+        {   XLS_LINE_WIDTH_MEDIUM, 0,                  0,                    SOLID },  // C = med dashdotdot
-+        {   XLS_LINE_WIDTH_MEDIUM, 0,                  0,                    SOLID }   // D = med slant dashdot
-     };
- 
-     if( nXclLine == EXC_LINE_NONE )
-@@ -1230,6 +1237,10 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs )
-         ScfTools::PutItem( rItemSet, SvxRotateModeItem( eRotateMode, ATTR_ROTATE_MODE ), bSkipPoolDefs );
-     }
- 
-+    // Excel's cell margins are different from Calc's default margins.
-+    SvxMarginItem aItem(40, 40, 40, 40, ATTR_MARGIN);
-+    ScfTools::PutItem(rItemSet, aItem, bSkipPoolDefs);
-+
-     return *mpPattern;
- }
-