From 946482802fecfd16d4cfb994db832f9a99015c70 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 7 Jul 2011 10:43:02 +0200 Subject: [PATCH] dmapper: don't set default style for shapes, they do not support that --- writerfilter/source/dmapper/DomainMapper.cxx | 3 ++- writerfilter/source/dmapper/DomainMapper_Impl.hxx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 231b1aba3953..0a9e61ad3084 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3161,7 +3161,8 @@ void DomainMapper::lcl_startParagraphGroup() static ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("Standard") ); if (m_pImpl->GetTopContext()) { - m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, uno::makeAny( sDefault ) ); + if (!m_pImpl->IsInShape()) + m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, uno::makeAny( sDefault ) ); if (m_pImpl->isBreakDeferred(PAGE_BREAK)) m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index d4147b1cb782..1b8b2be25036 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -474,6 +474,7 @@ public: bool IsStyleSheetImport()const { return m_bInStyleSheetImport;} void SetAnyTableImport( bool bSet ) { m_bInAnyTableImport = bSet;} bool IsAnyTableImport()const { return m_bInAnyTableImport;} + bool IsInShape()const { return m_bIsInShape;} void PushShapeContext( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); void PopShapeContext();