incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wangz...@apache.org
Subject svn commit: r1381867 - /incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx
Date Fri, 07 Sep 2012 04:52:33 GMT
Author: wangzcdl
Date: Fri Sep  7 04:52:32 2012
New Revision: 1381867

URL: http://svn.apache.org/viewvc?rev=1381867&view=rev
Log:
  Fix issue #i120768#: [From Symphony]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>

Modified:
    incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx

Modified: incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx?rev=1381867&r1=1381866&r2=1381867&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx Fri Sep  7 04:52:32 2012
@@ -5038,6 +5038,13 @@ void PPTWriter::ImplWritePage( const PHL
                 }
                 if ( !mbPresObj )
                 {
+					if (ePageType == MASTER )
+					{
+						SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
+						if (pObj && pObj->IsNotVisibleAsMaster())
+							continue;
+					}
+					
                     mType = "drawing.Text";
 	                ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
                 }



Mime
View raw message