diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-10-06 23:55:50 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-10-06 23:55:50 +0200 |
| commit | 8258bf4a02c76312b96f7bed838070ba2e60b8a3 (patch) | |
| tree | de9aa0d85cf5ba83edf76c19dfcdd6380ddb4ac4 /sc/source/filter/xml/xmlstyle.cxx | |
| parent | 227b28d8f597a6a275b7497134b39430e387b621 (diff) | |
fate#307731, fate#307730: Adds dotted and dashed border lines
Diffstat (limited to 'sc/source/filter/xml/xmlstyle.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlstyle.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 09b72123bffa..bd48092f33f5 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -54,6 +54,7 @@ #include <com/sun/star/table/CellHoriJustify.hpp> #include <com/sun/star/table/CellJustifyMethod.hpp> #include <com/sun/star/table/TableBorder.hpp> +#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/sheet/XSheetConditionalEntries.hpp> #include <com/sun/star/sheet/XSheetConditionalEntry.hpp> #include <com/sun/star/sheet/XSheetCondition.hpp> @@ -323,7 +324,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter( { if( pBorder_Left && pBorder_Right && pBorder_Top && pBorder_Bottom ) { - table::BorderLine aLeft, aRight, aTop, aBottom; + table::BorderLine2 aLeft, aRight, aTop, aBottom; pBorder_Left->maValue >>= aLeft; pBorder_Right->maValue >>= aRight; @@ -334,7 +335,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(); @@ -361,7 +364,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter( { if( pLeftBorderWidthState && pRightBorderWidthState && pTopBorderWidthState && pBottomBorderWidthState ) { - table::BorderLine aLeft, aRight, aTop, aBottom; + table::BorderLine2 aLeft, aRight, aTop, aBottom; pLeftBorderWidthState->maValue >>= aLeft; pRightBorderWidthState->maValue >>= aRight; |