diff options
| author | Radek Doulik <rodo@novell.com> | 2010-11-02 18:38:25 +0100 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2010-11-02 18:38:25 +0100 |
| commit | fda453dbd2c90a55bf9813b39570e92dbb0ee5f6 (patch) | |
| tree | 2ff087823cdc0190f1d94b8aedc9f2e3b97acedf | |
| parent | 64fbda9b7a9da35fdba7417326130724eeddb7ef (diff) | |
make the patch apply
* patches/dev300/apply:
* patches/dev300/oox-pptx-import-fix-groups-2.diff:
| -rw-r--r-- | patches/dev300/apply | 8 | ||||
| -rw-r--r-- | patches/dev300/oox-pptx-import-fix-groups-2.diff | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index dfa4963b7..bfb402204 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -411,17 +411,17 @@ reportdesigner-no-license-m16.diff reportdesigner-no-license.diff [ ExtensionFixes ] -presenterscreen-no-license.diff +#presenterscreen-no-license.diff presentation-minimizer-no-license.diff pdfimport-no-license.diff -wiki-publisher-no-license.diff +#wiki-publisher-no-license.diff # Fixing build breake in apache-common module when you use UTF-8 based locale in the build system apache-commons-build-fix-invalid-chars.diff, kami -build-java-target-extensions.diff, i#93115, pmladek +#build-java-target-extensions.diff, i#93115, pmladek # Fix from Andre, allows to step back one animation effect -slideshow-effect-rewind-sdext.diff, i#48179, thorsten +#slideshow-effect-rewind-sdext.diff, i#48179, thorsten [ Fixes ] # Fix from Andre, allows to step back one animation effect diff --git a/patches/dev300/oox-pptx-import-fix-groups-2.diff b/patches/dev300/oox-pptx-import-fix-groups-2.diff index 010ec6d90..2021decea 100644 --- a/patches/dev300/oox-pptx-import-fix-groups-2.diff +++ b/patches/dev300/oox-pptx-import-fix-groups-2.diff @@ -34,7 +34,7 @@ diff -rup ../ooo330-m2-orig/oox/source/drawingml/shape.cxx oox/source/drawingml/ , mpFillPropertiesPtr( pSourceShape->mpFillPropertiesPtr ) @@ -237,45 +239,34 @@ void Shape::addChildren( Shape& rMaster, - const Theme* pTheme, + const ThemePtr& rxTheme, const Reference< XShapes >& rxShapes, - const awt::Rectangle& rClientRect, + const awt::Rectangle&, @@ -94,6 +94,6 @@ diff -rup ../ooo330-m2-orig/oox/source/drawingml/shape.cxx oox/source/drawingml/ + + pShapeRect = &aShapeRect; + - (*aIter++)->addShape( rFilterBase, pTheme, rxShapes, pShapeRect, pShapeMap ); + (*aIter++)->addShape( rFilterBase, rxTheme, rxShapes, pShapeRect, pShapeMap ); } } |