strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dmapper: don't set default style for shapes, they do not support that

Browse source
This commit is contained in:
Miklos Vajna 2011-07-07 10:43:02 +02:00
parent 5775d11472
commit 946482802f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
writerfilter/source/dmapper/DomainMapper.cxx
View file

@ -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))

1
writerfilter/source/dmapper/DomainMapper_Impl.hxx
View file

@ -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();