diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-05-15 18:33:48 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-05-15 18:41:58 +0200 |
commit | d278cc769e484b0452b1fb6000e213561d8d955d (patch) | |
tree | 0d92b617a0623ecfb420de31c87168cfabcaf322 /xmloff | |
parent | i#119922: reverse engineer 9a37613b5e8f08fae585d54a5745e887eb08f8ce (diff) | |
download | core-d278cc769e484b0452b1fb6000e213561d8d955d.tar.gz core-d278cc769e484b0452b1fb6000e213561d8d955d.zip |
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
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
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 ); |