[Libreoffice-commits] core.git: sd/source

[Zhe Wang]

 sd/source/filter/eppt/epptso.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit e9ac56d4d96d26de9d63d512ba1bd650939bbf60
Author: Zhe Wang <wangzcdl at apache.org>
Date:   Fri Sep 7 03:52:32 2012 +0000

    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 at gmail.com>
    Suggested by: Wang Zhe <kingwisemmx at gmail.com>
    Found by: Yan Ji <yanji.yj at gmail.com>
    Review by: Wang Zhe <kingwisemmx at gmail.com>
    
    (cherry picked from commit 691aff9ca443dbd8ad907b32b96c031dd9ffa829)
    
    Change-Id: I1a1de0152feaacb449f2e2bad444d1bff9e7c4cb

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index edb4afa..30ce35d 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 );
                 }