diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-24 23:32:54 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-25 07:13:57 +0000 |
| commit | ead5810d62f66443e03f28474e77519e19880ec0 (patch) | |
| tree | f5b5fb9b741c5f8e0f4e69e5367b7b444ae59c8a /reportdesign/source/filter/xml/xmlExport.cxx | |
| parent | 703cf9193e7fa345f9535045bd0dbcacbfa026d8 (diff) | |
fdo#33617 adapt report engine to incompatible BorderLine2 change
Change-Id: I482e4b7b9f056247de3dae247d9328eb672eeba8
Reviewed-on: https://gerrit.libreoffice.org/5086
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'reportdesign/source/filter/xml/xmlExport.cxx')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 60a93cbf3d89..1b17eec00447 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -48,7 +48,8 @@ #include <com/sun/star/report/XFunction.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/table/BorderLine.hpp> +#include <com/sun/star/table/BorderLine2.hpp> +#include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/report/XFixedLine.hpp> #include <com/sun/star/frame/XController.hpp> #include "RptDef.hxx" @@ -1174,10 +1175,12 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted if ( xFixedLine.is() ) { uno::Reference<beans::XPropertySet> xBorderProp = OXMLHelper::createBorderPropertySet(); - table::BorderLine aValue; + table::BorderLine2 aValue; aValue.Color = COL_BLACK; aValue.InnerLineWidth = aValue.LineDistance = 0; aValue.OuterLineWidth = 2; + aValue.LineStyle = table::BorderLineStyle::SOLID; + aValue.LineWidth = 2; awt::Point aPos = xFixedLine->getPosition(); awt::Size aSize = xFixedLine->getSize(); @@ -1220,7 +1223,8 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue)); - aValue.Color = aValue.OuterLineWidth = 0; + aValue.Color = aValue.OuterLineWidth = aValue.LineWidth = 0; + aValue.LineStyle = table::BorderLineStyle::NONE; uno::Any aEmpty; aEmpty <<= aValue; ::std::for_each(aProps.begin(),aProps.end(), |