Kaydet (Commit) e9ac56d4 authored tarafından Zhe Wang's avatar Zhe Wang Kaydeden (comit) Caolán McNamara

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 691aff9c)

Change-Id: I1a1de0152feaacb449f2e2bad444d1bff9e7c4cb
üst 9645818f
...@@ -3063,6 +3063,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ...@@ -3063,6 +3063,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
} }
if ( !mbPresObj ) if ( !mbPresObj )
{ {
if (ePageType == MASTER )
{
SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
if (pObj && pObj->IsNotVisibleAsMaster())
continue;
}
mType = "drawing.Text"; mType = "drawing.Text";
ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment