[ooo-build-commit] .: 3 commits - bin/mkcppcheck.sh patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Fri Apr 23 04:54:20 PDT 2010
bin/mkcppcheck.sh | 2 -
patches/dev300/apply | 3 --
patches/dev300/oox-fix-placeholder-layout.diff | 10 -------
patches/dev300/oox-smartart-import.diff | 6 +++-
patches/dev300/pptx-gfx-layout-fix.diff | 33 +------------------------
5 files changed, 9 insertions(+), 45 deletions(-)
New commits:
commit 15e1f6d29369f34d0ea561703d1334d7e43dd479
Author: Thorsten Behrens <thb at openoffice.org>
Date: Fri Apr 23 13:47:49 2010 +0200
Fix the build in oox, put back removed ctor members in Shape
* patches/dev300/oox-fix-placeholder-layout.diff:
* patches/dev300/oox-smartart-import.diff: added back member
copying in ctor, really looking forward to c++0x for auto-copying
* patches/dev300/pptx-gfx-layout-fix.diff: removed senseless dupe
method
diff --git a/patches/dev300/oox-fix-placeholder-layout.diff b/patches/dev300/oox-fix-placeholder-layout.diff
index 8d07cc1..d1a6c99 100644
--- a/patches/dev300/oox-fix-placeholder-layout.diff
+++ b/patches/dev300/oox-fix-placeholder-layout.diff
@@ -1,14 +1,4 @@
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; }
-+ sal_Int32 getSubTypeIndex() { return mnSubTypeIndex; }
-
- // setDefaults has to be called if styles are imported (OfficeXML is not storing properties having the default value)
- void setDefaults();
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
diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index e5bcb4f..7df8f61 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -5334,7 +5334,7 @@
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
#include <com/sun/star/drawing/ConnectorType.hpp>
#include <com/sun/star/text/XText.hpp>
-@@ -103,6 +105,29 @@ Shape::Shape( const sal_Char* pServiceNa
+@@ -103,6 +105,33 @@ Shape::Shape( const sal_Char* pServiceNa
msServiceName = OUString::createFromAscii( pServiceName );
setDefaults();
}
@@ -5346,6 +5346,8 @@
+, mpFillPropertiesPtr( pSourceShape->mpFillPropertiesPtr )
+, mpGraphicPropertiesPtr( pSourceShape->mpGraphicPropertiesPtr )
+, mpCustomShapePropertiesPtr( pSourceShape->mpCustomShapePropertiesPtr )
++, mpTablePropertiesPtr( pSourceShape->mpTablePropertiesPtr )
++, mp3DPropertiesPtr( pSourceShape->mp3DPropertiesPtr )
+, maShapeProperties( pSourceShape->maShapeProperties )
+, mpMasterTextListStyle( pSourceShape->mpMasterTextListStyle )
+, mxShape()
@@ -5353,6 +5355,8 @@
+, msName( pSourceShape->msName )
+, msId( pSourceShape->msId )
+, mnSubType( pSourceShape->mnSubType )
++, mnSubTypeIndex( pSourceShape->mnSubTypeIndex )
++, maShapeStyleRefs( pSourceShape->maShapeStyleRefs )
+, maSize( pSourceShape->maSize )
+, maPosition( pSourceShape->maPosition )
+, mxCreateCallback( pSourceShape->mxCreateCallback )
diff --git a/patches/dev300/pptx-gfx-layout-fix.diff b/patches/dev300/pptx-gfx-layout-fix.diff
index 1448039..38638f5 100644
--- a/patches/dev300/pptx-gfx-layout-fix.diff
+++ b/patches/dev300/pptx-gfx-layout-fix.diff
@@ -156,7 +156,7 @@
+ std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() );
+ while( aRevIter != rShapes.rend() )
+ {
-+ if ( (*aRevIter)->getIndex() == nIdx )
++ if ( (*aRevIter)->getSubTypeIndex() == nIdx )
+ {
+ aShapePtr = *aRevIter;
+ break;
@@ -197,7 +197,7 @@
+ OUString sIdx( xAttribs->getOptionalValue( XML_idx ) );
+ sal_Bool bHasIdx = sIdx.getLength() > 0;
+ sal_Int32 nIdx = sIdx.toInt32();
-+ mpShapePtr->setIndex( nIdx );
++ mpShapePtr->setSubTypeIndex( nIdx );
+
+ if ( nSubType || bHasIdx )
+ {
commit 536926a63ca9d2ba7330736e2e69873b415cbe43
Author: Thorsten Behrens <thb at openoffice.org>
Date: Fri Apr 23 12:16:51 2010 +0200
Enabled pptx-gfx-layout-fix again for m15
* patches/dev300/apply: enabled patch
* patches/dev300/pptx-gfx-layout-fix.diff: removed hunks no longer
existing in source file
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 073e913..c0ccb99 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3379,9 +3379,8 @@ pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
# ugly temp fix to make GraphicShapeContext recognise layout
pptx-gfx-layout-fix-m14.diff, thorsten
[ OOXMLExport >= ooo320-15 ]
-# FIXME_ 2010-04-20: need port to ooo320-m15, --pmladek
# ugly temp fix to make GraphicShapeContext recognise layout
-#pptx-gfx-layout-fix.diff, thorsten
+pptx-gfx-layout-fix.diff, thorsten
[ OOXMLExport ]
# handles case where a connector shape is not connected
diff --git a/patches/dev300/pptx-gfx-layout-fix.diff b/patches/dev300/pptx-gfx-layout-fix.diff
index bb7ef06..1448039 100644
--- a/patches/dev300/pptx-gfx-layout-fix.diff
+++ b/patches/dev300/pptx-gfx-layout-fix.diff
@@ -301,35 +301,6 @@
+
+
+} }
---- oox/source/ppt/pptshapecontext.cxx.old 2010-03-03 16:59:43.000000000 +0100
-+++ oox/source/ppt/pptshapecontext.cxx 2010-03-03 17:00:05.000000000 +0100
-@@ -66,7 +66,7 @@ PPTShapeContext::PPTShapeContext( Contex
- {
- }
-
--oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
-+static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
- {
- oox::drawingml::ShapePtr aShapePtr;
- std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() );
-@@ -86,7 +86,7 @@ oox::drawingml::ShapePtr findPlaceholder
- return aShapePtr;
- }
-
--oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes )
-+static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes )
- {
- oox::drawingml::ShapePtr aShapePtr;
- std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() );
-@@ -107,7 +107,7 @@ oox::drawingml::ShapePtr findPlaceholder
- }
-
- // if nFirstPlaceholder can't be found, it will be searched for nSecondPlaceholder
--oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
-+static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
- {
- oox::drawingml::ShapePtr pPlaceholder = findPlaceholder( nFirstPlaceholder, rShapes );
- return !nSecondPlaceholder || pPlaceholder.get() ? pPlaceholder : findPlaceholder( nSecondPlaceholder, rShapes );
--- oox/source/ppt/pptshapegroupcontext.cxx.old 2009-10-07 15:06:37.000000000 +0200
+++ oox/source/ppt/pptshapegroupcontext.cxx 2010-03-03 17:00:05.000000000 +0100
@@ -33,6 +33,7 @@
commit b54385c3e554531eb74e41a421d83a465e98c5e2
Author: Thorsten Behrens <thb at openoffice.org>
Date: Tue Apr 20 11:09:05 2010 +0200
Made all include paths absolute for cppcheck
* bin/mkcppcheck.sh:
diff --git a/bin/mkcppcheck.sh b/bin/mkcppcheck.sh
index 68f4792..9102933 100755
--- a/bin/mkcppcheck.sh
+++ b/bin/mkcppcheck.sh
@@ -57,7 +57,7 @@ INCLUDE_PATH=`echo $SOLARINC | sed -e ' s/-I\.//'g | sed -e ' s/ -I/ /'g | sed -
for PROJECT in $INPUT_PROJECTS;
do
echo "Checking module $PROJECT"
- cppcheck -j$NCPUS $REPORT_UNUSED -v $STYLE $SOLARINC -I$PROJECT/inc -I$PROJECT/inc/pch $PROJECT/source
+ cppcheck -j$NCPUS $REPORT_UNUSED -v $STYLE $SOLARINC -I$SRC_ROOT/$PROJECT/inc -I$SRC_ROOT/$PROJECT/inc/pch $PROJECT/source
echo
done
More information about the ooo-build-commit
mailing list