[ooo-build-commit] 3 commits - patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Tue Nov 10 08:47:54 PST 2009
patches/dev300/apply | 9 -
patches/dev300/oox-fix-ole2.diff | 101 -----------------
patches/dev300/oox-fix-slide-background-gradients.diff | 34 -----
3 files changed, 144 deletions(-)
New commits:
commit 90c13610674ac9d9f34bd0f234f299e02eef67cc
Author: Radek Doulik <rodo at novell.com>
Date: Tue Nov 10 17:16:17 2009 +0100
removed patch which is no longer needed
* patches/dev300/apply:
* patches/dev300/oox-fix-slide-background-gradients.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b72c879..5a24aa9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2101,10 +2101,6 @@ oox-custom-shape-polygons.diff, n#485418, rodo
# FIXME_ 2009-09-02: Applies but causes compilation errors. --tml
# oox-import-sheet-protect.diff, n#481317, janneke
-# FIXME: 2009-08-12: Does not apply. Upstream code has been
-# significantly restructured. --tml
-# oox-fix-slide-background-gradients.diff, n#383555, rodo
-
oox-import-drawing-font-spacing.diff, n#479822, rodo
oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
diff --git a/patches/dev300/oox-fix-slide-background-gradients.diff b/patches/dev300/oox-fix-slide-background-gradients.diff
deleted file mode 100644
index 0e28d18..0000000
--- a/patches/dev300/oox-fix-slide-background-gradients.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rup oox-orig/inc/oox/drawingml/fillproperties.hxx oox/inc/oox/drawingml/fillproperties.hxx
---- oox-orig/inc/oox/drawingml/fillproperties.hxx 2009-04-07 15:40:24.000000000 +0200
-+++ oox/inc/oox/drawingml/fillproperties.hxx 2009-04-07 15:46:04.000000000 +0200
-@@ -104,6 +104,7 @@ struct FillProperties
- OptValue< sal_Int32 > moTileAlign; /// Anchor point inside bitmap.
-
- static FillPropertyNames DEFAULTNAMES; /// Default fill property names for shape fill.
-+ static FillPropertyNames DEFAULTBGNAMES; /// Default fill property names for background fill.
- static FillPropertyNames DEFAULTPICNAMES; /// Default fill property names for pictures.
-
- /** Overwrites all members that are explicitly set in rSourceProps. */
-diff -rup oox-orig/source/drawingml/fillproperties.cxx oox/source/drawingml/fillproperties.cxx
---- oox-orig/source/drawingml/fillproperties.cxx 2009-04-07 15:40:22.000000000 +0200
-+++ oox/source/drawingml/fillproperties.cxx 2009-04-07 15:46:16.000000000 +0200
-@@ -215,6 +215,7 @@ FillPropertyNames::FillPropertyNames( co
- // ============================================================================
-
- FillPropertyNames FillProperties::DEFAULTNAMES( sppcDefaultFillNames, false, false, false );
-+FillPropertyNames FillProperties::DEFAULTBGNAMES( sppcDefaultFillNames, true, false, false );
- FillPropertyNames FillProperties::DEFAULTPICNAMES( sppcDefaultPicNames, false, false, true );
-
- void FillProperties::assignUsed( const FillProperties& rSourceProps )
-diff -rup oox-orig/source/ppt/slidepersist.cxx oox/source/ppt/slidepersist.cxx
---- oox-orig/source/ppt/slidepersist.cxx 2009-04-07 15:40:22.000000000 +0200
-+++ oox/source/ppt/slidepersist.cxx 2009-04-07 15:45:47.000000000 +0200
-@@ -180,7 +180,7 @@ void SlidePersist::createBackground( con
- uno::Reference< beans::XPropertySet > xPropertySet( aPropMap.makePropertySet() );
- PropertySet aPropSet( xPropertySet );
- mpBackgroundPropertiesPtr->pushToPropSet(
-- aPropSet, ::oox::drawingml::FillProperties::DEFAULTNAMES,
-+ aPropSet, ::oox::drawingml::FillProperties::DEFAULTBGNAMES,
- rFilterBase, rFilterBase.getModelObjectContainer(), 0, -1 );
- xPagePropSet->setPropertyValue( sBackground, Any( xPropertySet ) );
- }
commit b1d42646daaa9e50f0aebec47564aff0fdf755a6
Author: Radek Doulik <rodo at novell.com>
Date: Tue Nov 10 17:15:43 2009 +0100
removed the patch also from repository
* patches/dev300/oox-fix-ole2.diff:
diff --git a/patches/dev300/oox-fix-ole2.diff b/patches/dev300/oox-fix-ole2.diff
deleted file mode 100644
index 9b0b425..0000000
--- a/patches/dev300/oox-fix-ole2.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git oox/inc/oox/vml/drawing.hxx oox/inc/oox/vml/drawing.hxx
-index 4a73925..89dae3e 100644
---- oox/inc/oox/vml/drawing.hxx
-+++ oox/inc/oox/vml/drawing.hxx
-@@ -49,6 +49,7 @@ public:
-
- ShapePtr createShapeById( const rtl::OUString sId ) const;
- rtl::OUString getGraphicUrlById( const rtl::OUString sId ) const;
-+ rtl::OUString getGraphicUrlBySpId( const rtl::OUString sId ) const;
-
- private:
-
-diff --git oox/inc/oox/vml/shape.hxx oox/inc/oox/vml/shape.hxx
-index 986685c..ce2c3ea 100644
---- oox/inc/oox/vml/shape.hxx
-+++ oox/inc/oox/vml/shape.hxx
-@@ -65,6 +65,7 @@ class Shape
-
- rtl::OUString msServiceName;
- rtl::OUString msId;
-+ rtl::OUString msSpId;
- rtl::OUString msType;
- rtl::OUString msShapeType;
-
-diff --git oox/source/drawingml/graphicshapecontext.cxx oox/source/drawingml/graphicshapecontext.cxx
-index 42e6156..6a59eb3 100644
---- oox/source/drawingml/graphicshapecontext.cxx
-+++ oox/source/drawingml/graphicshapecontext.cxx
-@@ -201,7 +201,7 @@ PresentationOle2006Context::~PresentationOle2006Context()
- oox::vml::DrawingPtr pDrawingPtr = rFilter.getDrawings();
- if ( pDrawingPtr )
- {
-- OUString aGraphicURL( pDrawingPtr->getGraphicUrlById( msSpid ) );
-+ OUString aGraphicURL( pDrawingPtr->getGraphicUrlBySpId( msSpid ) );
- if ( aGraphicURL.getLength() )
- {
- try
-diff --git oox/source/ppt/pptshape.cxx oox/source/ppt/pptshape.cxx
-index c28be5b..462d90e 100644
---- oox/source/ppt/pptshape.cxx
-+++ oox/source/ppt/pptshape.cxx
-@@ -83,7 +83,8 @@ void PPTShape::addShape(
- oox::drawingml::TextListStylePtr aMasterTextListStyle;
- Reference< lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW );
-
-- if ( sServiceName != OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
-+ if ( sServiceName != OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) &&
-+ sServiceName != OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) )
- {
- switch( mnSubType )
- {
-diff --git oox/source/vml/vmldrawing.cxx oox/source/vml/vmldrawing.cxx
-index 5ef9a04..c59e661 100644
---- oox/source/vml/vmldrawing.cxx
-+++ oox/source/vml/vmldrawing.cxx
-@@ -91,4 +91,20 @@ rtl::OUString Drawing::getGraphicUrlById( const rtl::OUString sId ) const
- return sGraphicURL;
- }
-
-+rtl::OUString Drawing::getGraphicUrlBySpId( const rtl::OUString sId ) const
-+{
-+ rtl::OUString sGraphicURL;
-+ std::vector< ShapePtr >::const_iterator aIter( maShapes.begin() );
-+ while( aIter != maShapes.end() )
-+ {
-+ if ( (*aIter)->msSpId == sId )
-+ {
-+ sGraphicURL = (*aIter)->msGraphicURL;
-+ break;
-+ }
-+ aIter++;
-+ }
-+ return sGraphicURL;
-+}
-+
- } }
-diff --git oox/source/vml/vmldrawingfragmenthandler.cxx oox/source/vml/vmldrawingfragmenthandler.cxx
-index c094f57..a1dfb2e 100644
---- oox/source/vml/vmldrawingfragmenthandler.cxx
-+++ oox/source/vml/vmldrawingfragmenthandler.cxx
-@@ -72,6 +72,7 @@ static void ApplyCoreAttributes( const Reference< XFastAttributeList >& xAttribs
- {
- // AG_Id
- rShape.msId = xAttribs->getOptionalValue( XML_id );
-+ rShape.msSpId = xAttribs->getOptionalValue( NMSP_OFFICE|XML_spid );
-
- // AG_Style
- if ( xAttribs->hasAttribute( XML_style ) )
-diff --git oox/source/vml/vmlshape.cxx oox/source/vml/vmlshape.cxx
-index d990b8b..e06c984 100644
---- oox/source/vml/vmlshape.cxx
-+++ oox/source/vml/vmlshape.cxx
-@@ -55,6 +55,8 @@ void Shape::applyAttributes( const vml::Shape& rSource )
- {
- if ( rSource.msId.getLength() )
- msId = rSource.msId;
-+ if ( rSource.msSpId.getLength() )
-+ msSpId = rSource.msSpId;
- if ( rSource.msType.getLength() )
- msType = rSource.msType;
- if ( rSource.msShapeType.getLength() )
commit b87448e36c98f5d2fdd0936aa566158a56ee3b88
Author: Radek Doulik <rodo at novell.com>
Date: Tue Nov 10 17:07:32 2009 +0100
removed patch which is no longer needed
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c27515e..b72c879 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2092,11 +2092,6 @@ oox-fix-list-style-apply.diff, n#485417, rodo
# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
# oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
-# FIXME: 2009-08-12: Like docx-import-fixes.diff, this is related to
-# the vml shape code which has been significantly restructured
-# upstream. --tml
-# oox-fix-ole2.diff, n#485418, rodo
-
oox-custom-shape-polygons.diff, n#485418, rodo
# FIXME: 2009-08-12: This stuff seems to be already in dev300-m54
More information about the ooo-build-commit
mailing list