diff options
Diffstat (limited to 'reportdesign/source/filter/xml')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlCell.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 10 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlHelper.cxx | 10 |
3 files changed, 17 insertions, 11 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 6a7ad00e66e3..f9554944b7b7 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/report/XShape.hpp> #include <com/sun/star/report/XFixedLine.hpp> -#include <com/sun/star/table/BorderLine.hpp> +#include <com/sun/star/table/BorderLine2.hpp> #include "xmlstrings.hrc" #include "xmlTable.hxx" #include "xmlFormattedField.hxx" @@ -228,10 +228,12 @@ void OXMLCell::EndElement() try { pAutoStyle->FillPropertySet(xBorderProp); - table::BorderLine aRight,aLeft; + table::BorderLine2 aRight,aLeft; xBorderProp->getPropertyValue(PROPERTY_BORDERRIGHT) >>= aRight; xBorderProp->getPropertyValue(PROPERTY_BORDERLEFT) >>= aLeft; - xFixedLine->setOrientation( (aRight.OuterLineWidth != 0 || aLeft.OuterLineWidth != 0) ? 1 : 0); + const sal_Int16 rWidth = (aRight.LineWidth == 0) ? aRight.OuterLineWidth : aRight.LineWidth; + const sal_Int16 lWidth = (aLeft.LineWidth == 0) ? aLeft.OuterLineWidth : aLeft.LineWidth; + xFixedLine->setOrientation( (rWidth != 0 || lWidth != 0) ? 1 : 0); } catch(uno::Exception&) { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 627853a6a73d..52cb74e7656f 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(), diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index ae05c7dfebba..21a0bc92397e 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -37,7 +37,7 @@ #include <xmloff/contextid.hxx> #include <xmloff/txtprmap.hxx> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> -#include <com/sun/star/table/BorderLine.hpp> +#include <com/sun/star/table/BorderLine2.hpp> #include <xmloff/XMLConstantsPropertyHandler.hxx> #include <com/sun/star/report/ForceNewPage.hpp> #include <com/sun/star/report/ReportPrintOption.hpp> @@ -323,10 +323,10 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet() { static comphelper::PropertyMapEntry pMap[] = { - {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERLEFT)-1), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERRIGHT)-1), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERTOP)-1), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERBOTTOM)-1), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERLEFT)-1), 0, &::getCppuType((const table::BorderLine2*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERRIGHT)-1), 1, &::getCppuType((const table::BorderLine2*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERTOP)-1), 2, &::getCppuType((const table::BorderLine2*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(SAL_N_ELEMENTS(PROPERTY_BORDERBOTTOM)-1), 3, &::getCppuType((const table::BorderLine2*)0) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); |