summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2014-10-03 18:21:08 +0200
committerLuboš Luňák <l.lunak@collabora.com>2014-10-07 16:52:18 +0200
commit4a9e2e29c00309145e87f72516f1e53063f11529 (patch)
tree8bd91370191c19cdb464a88a77cf65089e1cbcd1
parentde3d9bd60370333c1ad8348cb033b4d7b5b0c007 (diff)
copy default drawinglayer attributes when doing mailmergeprivate/llunak/mailmerge_01
(cherry picked from commit f4825097a98c681cc187d88cfc1f8fd82362e1e0) Unittest not included because of MM test framework missing in 4.1.x. Conflicts: sw/qa/extras/mailmerge/mailmerge.cxx Change-Id: I4c6fc31ae72d179975c65aec0b560741474d433e
-rw-r--r--sw/source/core/doc/docnew.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 30932f0abdfa..caed1415d58c 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -90,6 +90,7 @@
#include <unochart.hxx>
#include <fldbas.hxx>
#include <wrtsh.hxx>
+#include <svx/xdef.hxx>
#include <cmdid.h> // for the default printer in SetJob
@@ -1054,6 +1055,7 @@ void SwDoc::ReplaceDefaults(const SwDoc& rSource)
RES_PARATR_BEGIN, RES_PARATR_END-1,
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
+ XATTR_START, XATTR_END-1,
0
};
@@ -1062,6 +1064,11 @@ void SwDoc::ReplaceDefaults(const SwDoc& rSource)
sal_uInt16 nRange = 0;
while (aRangeOfDefaults[nRange] != 0)
{
+ if( aRangeOfDefaults[nRange] == XATTR_START && ( !mpDrawModel || !mbSetDrawDefaults))
+ {
+ nRange += 2;
+ continue;
+ }
for (sal_uInt16 nWhich = aRangeOfDefaults[nRange];
nWhich <= aRangeOfDefaults[nRange + 1]; ++nWhich)
{