From d278cc769e484b0452b1fb6000e213561d8d955d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 15 May 2013 18:33:48 +0200 Subject: sw: change pool default of RES_FOLLOW_TEXT_FLOW to "false" For a new document the default is already effectively "false" due to SwDocShell::InitNew() and the ODF and WW8 filters set it explicitly to false... which is also the appropriate value for RTF and DOCX. But only OOoXML and (perhaps) HTML (not sure) want "true" as the default. It is also mysteriously reset to "true" in SwDoc::RemoveAllFmtLanguageDependencies() (which is called after loading a template) for no apparent reason. Change-Id: If5ad33c99f97412cb3ad4f9cec32f47825ed6f6b --- xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 598309d44415..dafadbf14961 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -108,14 +108,12 @@ void XMLGraphicsDefaultStyle::SetDefaults() if ( xInfo->hasPropertyByName( sTextWordWrap ) ) xDefaults->setPropertyValue( sTextWordWrap, Any( bWordWrapDefault ) ); - if (!GetImport().IsOOoXML() + if (GetImport().IsOOoXML() && xInfo->hasPropertyByName("IsFollowingTextFlow")) { - // MSO does not support "style:flow-with-text" so "false" is the better - // default (which may be overridden by the FillPropertySet below). - // Do not do this for OOoXML format: OOo 1.x only supported "true" - // so that is the more appropriate default. - xDefaults->setPropertyValue("IsFollowingTextFlow", uno::makeAny(false)); + // OOo 1.x only supported "true" so that is the more appropriate + // default for OOoXML format documents. + xDefaults->setPropertyValue("IsFollowingTextFlow", uno::makeAny(true)); } FillPropertySet( xDefaults ); -- cgit