diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 10:02:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 10:05:00 +0200 |
| commit | 422f873ba8ec3ad7d4a6dd054cbde4d9d7d3a5cb (patch) | |
| tree | 9b9207adcf600b630d67a3c2e191a80a62aec4b0 /oox | |
| parent | e4d500221f90d8c75e38107896c8b86ec5a3f683 (diff) | |
Partial revert of e910705421b40f3accff684e956854ff68761574
"Use Any.get<T>(..) instead of Any.getValue(..) and ugly cast." An empty
OString means a different thing than a char* nullptr to
FastSerializerHelper::startElementNS. Broke CppunitTest_sd_export_tests at
least --with-export-validation.
Change-Id: I4ad23c4130bf39708064569b964bcb7fb44cd3b0
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 36869e663385..8436c9bb94ce 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -632,11 +632,10 @@ void DrawingML::WriteOutline( Reference<XPropertySet> rXPropSet ) break; } - OString sWidth = (nLineWidth > 1 && nStyleLineWidth != nLineWidth) ? I64S(MM100toEMU(nLineWidth)) : NULL; - mpFS->startElementNS( XML_a, XML_ln, XML_cap, cap, - XML_w, sWidth, + XML_w, nLineWidth > 1 && nStyleLineWidth != nLineWidth ? + I64S( MM100toEMU( nLineWidth ) ) :NULL, FSEND ); if( bColorSet ) |