[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/oox-fix-placeholder-layout.diff |   41 ++++++++++++++-----------
 1 file changed, 23 insertions(+), 18 deletions(-)

New commits:
commit 7710ba2760370e7d4692820b857f50581b9fff67
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Apr 22 09:44:43 2010 +0200

    fixed so that it applies to the clean build
    
    * patches/dev300/oox-fix-placeholder-layout.diff:

diff --git a/patches/dev300/oox-fix-placeholder-layout.diff b/patches/dev300/oox-fix-placeholder-layout.diff
index 6f8239e..8d07cc1 100644
--- a/patches/dev300/oox-fix-placeholder-layout.diff
+++ b/patches/dev300/oox-fix-placeholder-layout.diff
@@ -1,7 +1,7 @@
-diff -wrup ../ooo320-m15-orig/oox/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx
---- ../ooo320-m15-orig/oox/inc/oox/drawingml/shape.hxx	2010-04-21 15:01:17.000000000 +0200
-+++ oox/inc/oox/drawingml/shape.hxx	2010-04-21 14:53:39.000000000 +0200
-@@ -138,6 +138,7 @@ public:
+diff -rup oox-orig/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx
+--- oox-orig/inc/oox/drawingml/shape.hxx	2010-04-22 09:36:44.000000000 +0200
++++ oox/inc/oox/drawingml/shape.hxx	2010-04-22 09:37:09.000000000 +0200
+@@ -126,6 +126,7 @@ public:
      sal_Int32                       getSubType() const { return mnSubType; }
      void                            setSubTypeIndex( sal_uInt32 nSubTypeIndex ) { mnSubTypeIndex = nSubTypeIndex; }
      sal_Int32						getSubTypeIndex() const { return mnSubTypeIndex; }
@@ -9,9 +9,9 @@ diff -wrup ../ooo320-m15-orig/oox/inc/oox/drawingml/shape.hxx oox/inc/oox/drawin
  
      // setDefaults has to be called if styles are imported (OfficeXML is not storing properties having the default value)
      void                            setDefaults();
-diff -wrup ../ooo320-m15-orig/oox/source/ppt/pptshapecontext.cxx oox/source/ppt/pptshapecontext.cxx
---- ../ooo320-m15-orig/oox/source/ppt/pptshapecontext.cxx	2010-04-21 15:00:58.000000000 +0200
-+++ oox/source/ppt/pptshapecontext.cxx	2010-04-21 14:53:58.000000000 +0200
+diff -rup oox-orig/source/ppt/pptshapecontext.cxx oox/source/ppt/pptshapecontext.cxx
+--- oox-orig/source/ppt/pptshapecontext.cxx	2010-04-22 09:36:43.000000000 +0200
++++ oox/source/ppt/pptshapecontext.cxx	2010-04-22 09:42:11.000000000 +0200
 @@ -86,6 +86,26 @@ oox::drawingml::ShapePtr findPlaceholder
      return aShapePtr;
  }
@@ -78,21 +78,26 @@ diff -wrup ../ooo320-m15-orig/oox/source/ppt/pptshapecontext.cxx oox/source/ppt/
                          if ( eShapeLocation == Layout )		// for layout objects the referenced object can be found within the same shape tree
                              pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, -1, mpSlidePersistPtr->getShapes()->getChildren() );
                          else if ( eShapeLocation == Slide )	// normal slide shapes have to search within the corresponding master tree for referenced objects
-@@ -167,15 +199,14 @@ Reference< XFastContextHandler > PPTShap
+@@ -167,15 +199,15 @@ Reference< XFastContextHandler > PPTShap
                                  pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder,
                                      pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() );
                          }
-+                    }
-+                }
-                         if ( pPlaceholder.get() )
-                         {
-                             mpShapePtr->applyShapeReference( *pPlaceholder.get() );
-                             PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
-                             if ( pPPTShape )
-                                 pPPTShape->setReferenced( sal_True );
--				    pPPTShapePtr->setPlaceholder( pPlaceholder );
+-                        if ( pPlaceholder.get() )
+-                        {
+-                            mpShapePtr->applyShapeReference( *pPlaceholder.get() );
+-                            PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
+-                            if ( pPPTShape )
+-                                pPPTShape->setReferenced( sal_True );
 -                        }
--                    }
+                     }
                  }
++		if ( pPlaceholder.get() )
++		{
++		    mpShapePtr->applyShapeReference( *pPlaceholder.get() );
++		    PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
++		    if ( pPPTShape )
++		      pPPTShape->setReferenced( sal_True );
++		}
              }
          }
+         break;