summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhe Wang <wangzcdl@apache.org>2012-09-07 03:52:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-06 09:19:49 +0100
commite9ac56d4d96d26de9d63d512ba1bd650939bbf60 (patch)
tree0810b08eac9a4796674faa8a8996323c2255acd6
parent9645818f6817652568fe14c83c2dc46a9e5c3489 (diff)
Resolves: #i120768# slide content merged Master viewer content
* subversion/main/sd/source/filter/eppt/epptso.cxx []should drop the redundant presentation placeholder textbox when import to ppt Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by: Yan Ji <yanji.yj@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com> (cherry picked from commit 691aff9ca443dbd8ad907b32b96c031dd9ffa829) Change-Id: I1a1de0152feaacb449f2e2bad444d1bff9e7c4cb
-rw-r--r--sd/source/filter/eppt/epptso.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index edb4afa8c9ca..30ce35de912a 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3063,6 +3063,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
if ( !mbPresObj )
{
+ if (ePageType == MASTER )
+ {
+ SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
+ if (pObj && pObj->IsNotVisibleAsMaster())
+ continue;
+ }
+
mType = "drawing.Text";
ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}