sw/source/uibase/docvw/HeaderFooterWin.cxx | 2 +- writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf |binary writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 +--- 3 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit 145e2dfc4501cb3fa01a1771cb6829b5945df4a6 Author: Caolán McNamara <[email protected]> Date: Sun Aug 7 16:58:22 2016 +0100 fftester: guard against empty table manager stack Change-Id: Ibb4cadb58aa17eacfc9741f7f13c780be347cd8b diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf new file mode 100644 index 0000000..a03be13 Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf differ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 64e650a..98a9900 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1306,7 +1306,6 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper } } - void DomainMapper_Impl::appendTextContent( const uno::Reference< text::XTextContent >& xContent, const uno::Sequence< beans::PropertyValue >& xPropertyValues @@ -1317,7 +1316,7 @@ void DomainMapper_Impl::appendTextContent( return; uno::Reference< text::XTextAppendAndConvert > xTextAppendAndConvert( m_aTextAppendStack.top().xTextAppend, uno::UNO_QUERY ); OSL_ENSURE( xTextAppendAndConvert.is(), "trying to append a text content without XTextAppendAndConvert" ); - if(xTextAppendAndConvert.is() && ! getTableManager( ).isIgnore()) + if (xTextAppendAndConvert.is() && hasTableManager() && !getTableManager().isIgnore()) { try { @@ -1335,7 +1334,6 @@ void DomainMapper_Impl::appendTextContent( } } - void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const OLEHandlerPtr& pOLEHandler ) { static const char sEmbeddedService[] = "com.sun.star.text.TextEmbeddedObject"; commit ff5beeeae6cc40a21ba7b41a36286318348b77ab Author: Caolán McNamara <[email protected]> Date: Fri Aug 5 14:07:30 2016 +0100 can drop the intermediate OUString here Change-Id: I19ef66c037a69debc90f260f82cbc2bf6355ea8d diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index b170140..5434839 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -307,7 +307,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl aSeq[2] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, OUString(m_sLabel), 0, m_sLabel.getLength(), + aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), aFontAttr, css::lang::Locale(), aLineColor)); // Create the 'plus' or 'arrow' primitive
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
