From d54dc89a531be105dff87700801bb9737623d04e Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Mon, 20 Aug 2012 11:29:29 +0200 Subject: n#793401, fdo#53175: Don't load the default values of the styles in writerfilter ...or we may have some additional properties set on some styles. (cherry picked from commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I5a5d307931a2a6c1f25bd2da93381d8de65c2480 --- sw/inc/IDocumentSettingAccess.hxx | 3 ++- sw/inc/doc.hxx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sw/inc') diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 27b9b8f49d3a..ac5770bb5ac9 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -96,7 +96,8 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd PURGE_OLE, KERN_ASIAN_PUNCTUATION, MATH_BASELINE_ALIGNMENT, - FLOATTABLE_NOMARGINS + FLOATTABLE_NOMARGINS, + STYLES_NODEFAULT }; public: diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index c76ce8977625..1f269bf2c830 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -568,6 +568,7 @@ private: // attribute 'WrapInfluenceOnObjPos'. bool mbMathBaselineAlignment : 1; // TL 2010-10-29 #i972# bool mbFloattableNomargins : 1; ///< If paragraph margins next to a floating table should be ignored. + bool mbStylesNoDefault : 1; // non-ui-compatibility flags: bool mbOldNumbering : 1; -- cgit