[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Cédric Bosdonnat]

 patches/dev300/border-types-dotted-dashed.diff |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit de42a432a7646e3e762ef6d51856c3aa6e5213bb
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Jun 16 10:00:19 2010 +0200

    Dotted/dashed border in calc: added missing code
    
    * patches/dev300/border-types-dotted-dashed.diff:

diff --git a/patches/dev300/border-types-dotted-dashed.diff b/patches/dev300/border-types-dotted-dashed.diff
index 2ca8731..8d0cbb8 100644
--- a/patches/dev300/border-types-dotted-dashed.diff
+++ b/patches/dev300/border-types-dotted-dashed.diff
@@ -23,7 +23,7 @@ From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
  sc/source/filter/excel/xistyle.cxx                 |   33 ++--
  sc/source/filter/html/htmlexp.cxx                  |    9 +
  sc/source/filter/inc/xlstyle.hxx                   |    3 
- sc/source/filter/xml/xmlstyle.cxx                  |    5 -
+ sc/source/filter/xml/xmlstyle.cxx                  |    9 +
  sc/source/filter/xml/xmlstyli.cxx                  |   12 +
  sc/source/ui/unoobj/cellsuno.cxx                   |   73 +++++----
  sc/source/ui/view/formatsh.cxx                     |    1 
@@ -89,7 +89,7 @@ From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
  xmloff/source/style/bordrhdl.cxx                   |   54 ++++++-
  xmloff/source/text/txtexppr.cxx                    |   16 +-
  xmloff/source/text/txtimppr.cxx                    |   10 +
- 84 files changed, 1200 insertions(+), 482 deletions(-)
+ 84 files changed, 1203 insertions(+), 483 deletions(-)
  create mode 100644 offapi/com/sun/star/table/BorderLine2.idl
  create mode 100644 offapi/com/sun/star/table/BorderLineStyle.idl
  create mode 100644 svtools/inc/borderhelper.hxx
@@ -794,7 +794,7 @@ index e4f53ff..39b2bbd 100644
  // Background patterns --------------------------------------------------------
  
 diff --git sc/source/filter/xml/xmlstyle.cxx sc/source/filter/xml/xmlstyle.cxx
-index 90bade3..2f97963 100644
+index 90bade3..cf252b3 100644
 --- sc/source/filter/xml/xmlstyle.cxx
 +++ sc/source/filter/xml/xmlstyle.cxx
 @@ -54,6 +54,7 @@
@@ -814,7 +814,18 @@ index 90bade3..2f97963 100644
  
              pBorder_Left->maValue >>= aLeft;
              pBorder_Right->maValue >>= aRight;
-@@ -356,7 +357,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
+@@ -329,7 +330,9 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
+                 aLeft.Color == aTop.Color && aLeft.InnerLineWidth == aTop.InnerLineWidth &&
+                 aLeft.OuterLineWidth == aTop.OuterLineWidth && aLeft.LineDistance == aTop.LineDistance &&
+                 aLeft.Color == aBottom.Color && aLeft.InnerLineWidth == aBottom.InnerLineWidth &&
+-                aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance )
++                aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance &&
++                aLeft.LineStyle == aRight.LineStyle && aLeft.LineStyle == aTop.LineStyle && 
++                aLeft.LineStyle == aBottom.LineStyle )
+             {
+                 pBorder_Left->mnIndex = -1;
+                 pBorder_Left->maValue.clear();
+@@ -356,7 +359,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
      {
          if( pLeftBorderWidthState && pRightBorderWidthState && pTopBorderWidthState && pBottomBorderWidthState )
          {