summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ivan <alexnivan@yahoo.com>2013-08-23 16:33:36 +0300
committerJan Holesovsky <kendy@collabora.com>2015-09-24 01:00:13 +0200
commit0efd3467a4e28a70fcd1e3bab6255ce8b6bb76d5 (patch)
treed5eb0348f009b7b01de38628d3bba5e32c61fb53
parent1ecd390f9baa006b1bb07a3f8d463b7ced381d58 (diff)
Add some more security to format parent assigning
Change-Id: I3f250f88ae68d6604bb4da0e9ae78ccefabf96e9
-rw-r--r--sw/source/core/doc/swtblfmt.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index 692b3770eff6..078c002e4d69 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -279,6 +279,9 @@ void SwTableFormat::AssignFormatParents( SwTableFormat* pSrcFormat, SwTable &rTa
if( !pHardFormat )
return;
+ if( pSrcFormat && pSrcFormat->IsDefault() )
+ return;
+
if( pSrcFormat )
pHardFormat->GetAttrSet().SetParent( &pSrcFormat->GetAttrSet() );
else