diff options
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf113183.docx | bin | 0 -> 17163 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/GraphicHelpers.cxx | 4 | ||||
| -rw-r--r-- | writerperfect/source/writer/EPUBExportFilter.cxx | 2 | ||||
| -rw-r--r-- | writerperfect/source/writer/EPUBExportUIComponent.cxx | 2 |
5 files changed, 16 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf113183.docx b/sw/qa/extras/ooxmlexport/data/tdf113183.docx Binary files differnew file mode 100644 index 000000000000..197f483ba011 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf113183.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index b139210c3bff..a4796900f9bd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -147,6 +147,16 @@ DECLARE_OOXMLEXPORT_TEST(testSignatureLineShape, "signature-line-all-props-set.d CPPUNIT_ASSERT_EQUAL(OUString("Check the machines!"), aSigningInstructions); } +DECLARE_OOXMLEXPORT_TEST(testTdf113183, "tdf113183.docx") +{ + // This was 2096, the horizontal positioning of the star shape affected the + // positioning of the triangle one, so the triangle was outside the page + // frame. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), + getProperty<sal_Int32>(getShapeByName("triangle"), + "HoriOrientPosition")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index 62579dbaa864..8108445d24fb 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.cxx +++ b/writerfilter/source/dmapper/GraphicHelpers.cxx @@ -133,9 +133,11 @@ void PositionHandler::lcl_sprm(Sprm& rSprm) { case NS_ooxml::LN_CT_PosH_posOffset: m_nPosition = oox::drawingml::convertEmuToHmm(m_rPositionOffsets.first.toInt32()); + m_rPositionOffsets.first.clear(); break; case NS_ooxml::LN_CT_PosV_posOffset: m_nPosition = oox::drawingml::convertEmuToHmm(m_rPositionOffsets.second.toInt32()); + m_rPositionOffsets.second.clear(); break; case NS_ooxml::LN_CT_PosH_align: { @@ -150,6 +152,7 @@ void PositionHandler::lcl_sprm(Sprm& rSprm) m_nOrient = text::HoriOrientation::INSIDE; else if (rAlign == "outside") m_nOrient = text::HoriOrientation::OUTSIDE; + rAlign.clear(); break; } case NS_ooxml::LN_CT_PosV_align: @@ -165,6 +168,7 @@ void PositionHandler::lcl_sprm(Sprm& rSprm) m_nOrient = text::VertOrientation::NONE; else if (rAlign == "outside") m_nOrient = text::VertOrientation::NONE; + rAlign.clear(); break; } } diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx b/writerperfect/source/writer/EPUBExportFilter.cxx index d1f2c73621f4..0e0a72dbe015 100644 --- a/writerperfect/source/writer/EPUBExportFilter.cxx +++ b/writerperfect/source/writer/EPUBExportFilter.cxx @@ -197,7 +197,7 @@ uno::Sequence<OUString> EPUBExportFilter::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * com_sun_star_comp_Writer_EPUBExportFilter_get_implementation(uno::XComponentContext *pContext, uno::Sequence<uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface *com_sun_star_comp_Writer_EPUBExportFilter_get_implementation(uno::XComponentContext *pContext, uno::Sequence<uno::Any> const &) { return cppu::acquire(new EPUBExportFilter(pContext)); } diff --git a/writerperfect/source/writer/EPUBExportUIComponent.cxx b/writerperfect/source/writer/EPUBExportUIComponent.cxx index e7f7f7f005a8..65164b67aa1b 100644 --- a/writerperfect/source/writer/EPUBExportUIComponent.cxx +++ b/writerperfect/source/writer/EPUBExportUIComponent.cxx @@ -83,7 +83,7 @@ sal_Int16 EPUBExportUIComponent::execute() return ui::dialogs::ExecutableDialogResults::CANCEL; } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * com_sun_star_comp_Writer_EPUBExportUIComponent_get_implementation(uno::XComponentContext *pCtx, uno::Sequence<uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface *com_sun_star_comp_Writer_EPUBExportUIComponent_get_implementation(uno::XComponentContext *pCtx, uno::Sequence<uno::Any> const &) { return cppu::acquire(new EPUBExportUIComponent(pCtx)); } |