[ooo-build-commit] 2 commits - patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Fri Oct 23 06:09:29 PDT 2009
patches/dev300/apply | 5
patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff | 89 ++++------
2 files changed, 43 insertions(+), 51 deletions(-)
New commits:
commit 7a6b19f1afa5069e103ecf09bad0281778f1e44f
Author: Radek Doulik <rodo at novell.com>
Date: Fri Oct 23 15:08:02 2009 +0200
enabled oox-pptx-import-fix-text-body-properties-priority.diff again
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 10fc66f..6b3fba1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3178,10 +3178,7 @@ fontconfig-cache-pre-substitution.diff, n#529532, kohei
[ OOXML ]
oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
-
-# FIXME: 2009-08-21: Does not apply, not immediately obvious how to
-# adapt. --tml
-# oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
+oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
[ OOXMLExport ]
commit 046f6dc63282c1417afb84b36490ac936bb7855c
Author: Radek Doulik <rodo at novell.com>
Date: Fri Oct 23 15:06:59 2009 +0200
make the patch apply again
* patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff:
diff --git a/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff b/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff
index 1cd7de5..9747102 100644
--- a/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff
+++ b/patches/dev300/oox-pptx-import-fix-text-body-properties-priority.diff
@@ -1,65 +1,60 @@
-diff -rup oox-orig-2/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
---- oox-orig-2/source/drawingml/shape.cxx 2009-05-22 15:56:35.000000000 +0200
-+++ oox/source/drawingml/shape.cxx 2009-05-25 09:33:50.000000000 +0200
-@@ -462,12 +462,14 @@ Reference< XShape > Shape::createAndInse
+diff -rup oox-orig/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
+--- oox-orig/source/drawingml/shape.cxx 2009-10-23 14:52:57.000000000 +0200
++++ oox/source/drawingml/shape.cxx 2009-10-23 15:05:01.000000000 +0200
+@@ -442,7 +442,6 @@ Reference< XShape > Shape::createAndInse
aFillProperties.assignUsed( getFillProperties() );
PropertyMap aShapeProperties;
- aShapeProperties.insert( getShapeProperties().begin(), getShapeProperties().end() );
+ if( mxCreateCallback.get() )
+ aShapeProperties.insert( mxCreateCallback->getShapeProperties().begin(), mxCreateCallback->getShapeProperties().end() );
- // add properties from textbody to shape properties
-+ // add them first as they have priority over shape properties
+@@ -450,6 +449,7 @@ Reference< XShape > Shape::createAndInse
if( mpTextBody.get() )
aShapeProperties.insert( mpTextBody->getTextProperties().maPropertyMap.begin(), mpTextBody->getTextProperties().maPropertyMap.end() );
+ aShapeProperties.insert( getShapeProperties().begin(), getShapeProperties().end() );
-+
// applying properties
PropertySet aPropSet( xSet );
- if ( rServiceName == OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
-diff -rup oox-orig-2/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
---- oox-orig-2/source/drawingml/textbodypropertiescontext.cxx 2009-05-22 15:56:35.000000000 +0200
-+++ oox/source/drawingml/textbodypropertiescontext.cxx 2009-05-25 09:34:59.000000000 +0200
-@@ -69,22 +69,26 @@ TextBodyPropertiesContext::TextBodyPrope
- const OUString sTextRightDistance( RTL_CONSTASCII_USTRINGPARAM( "TextRightDistance" ) );
- const OUString sTextLowerDistance( RTL_CONSTASCII_USTRINGPARAM( "TextLowerDistance" ) );
- OUString sValue;
-- sValue = xAttributes->getOptionalValue( XML_lIns );
-- sal_Int32 nLeftInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
-- mrTextBodyProp.maPropertyMap[ sTextLeftDistance ] <<= static_cast< sal_Int32 >( nLeftInset );
+ if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
+diff -rup oox-orig/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
+--- oox-orig/source/drawingml/textbodypropertiescontext.cxx 2009-10-23 14:52:57.000000000 +0200
++++ oox/source/drawingml/textbodypropertiescontext.cxx 2009-10-23 14:58:58.000000000 +0200
+@@ -67,21 +67,25 @@ TextBodyPropertiesContext::TextBodyPrope
+ // ST_Coordinate
+ OUString sValue;
+ sValue = xAttributes->getOptionalValue( XML_lIns );
+- sal_Int32 nLeftInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
+- mrTextBodyProp.maPropertyMap[ PROP_TextLeftDistance ] <<= static_cast< sal_Int32 >( nLeftInset );
-
-- sValue = xAttributes->getOptionalValue( XML_tIns );
-- sal_Int32 nTopInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
-- mrTextBodyProp.maPropertyMap[ sTextUpperDistance ] <<= static_cast< sal_Int32 >( nTopInset );
++ if( sValue.getLength() ) {
++ sal_Int32 nLeftInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
++ mrTextBodyProp.maPropertyMap[ PROP_TextLeftDistance ] <<= static_cast< sal_Int32 >( nLeftInset );
++ }
+ sValue = xAttributes->getOptionalValue( XML_tIns );
+- sal_Int32 nTopInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
+- mrTextBodyProp.maPropertyMap[ PROP_TextUpperDistance ] <<= static_cast< sal_Int32 >( nTopInset );
-
-- sValue = xAttributes->getOptionalValue( XML_rIns );
-- sal_Int32 nRightInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
-- mrTextBodyProp.maPropertyMap[ sTextRightDistance ] <<= static_cast< sal_Int32 >( nRightInset );
++ if( sValue.getLength() ) {
++ sal_Int32 nTopInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
++ mrTextBodyProp.maPropertyMap[ PROP_TextUpperDistance ] <<= static_cast< sal_Int32 >( nTopInset );
++ }
+ sValue = xAttributes->getOptionalValue( XML_rIns );
+- sal_Int32 nRightInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
+- mrTextBodyProp.maPropertyMap[ PROP_TextRightDistance ] <<= static_cast< sal_Int32 >( nRightInset );
-
-- sValue = xAttributes->getOptionalValue( XML_bIns );
++ if( sValue.getLength() ) {
++ sal_Int32 nRightInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
++ mrTextBodyProp.maPropertyMap[ PROP_TextRightDistance ] <<= static_cast< sal_Int32 >( nRightInset );
++ }
+ sValue = xAttributes->getOptionalValue( XML_bIns );
- sal_Int32 nBottonInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 45720 / 360 );
-- mrTextBodyProp.maPropertyMap[ sTextLowerDistance ] <<= static_cast< sal_Int32 >( nBottonInset );
+- mrTextBodyProp.maPropertyMap[ PROP_TextLowerDistance ] <<= static_cast< sal_Int32 >( nBottonInset );
-
-+ if( sValue.getLength() ) {
-+ sValue = xAttributes->getOptionalValue( XML_lIns );
-+ sal_Int32 nLeftInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
-+ mrTextBodyProp.maPropertyMap[ sTextLeftDistance ] <<= static_cast< sal_Int32 >( nLeftInset );
-+ }
-+ if( sValue.getLength() ) {
-+ sValue = xAttributes->getOptionalValue( XML_tIns );
-+ sal_Int32 nTopInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
-+ mrTextBodyProp.maPropertyMap[ sTextUpperDistance ] <<= static_cast< sal_Int32 >( nTopInset );
-+ }
-+ if( sValue.getLength() ) {
-+ sValue = xAttributes->getOptionalValue( XML_rIns );
-+ sal_Int32 nRightInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 91440 / 360 );
-+ mrTextBodyProp.maPropertyMap[ sTextRightDistance ] <<= static_cast< sal_Int32 >( nRightInset );
-+ }
-+ if( sValue.getLength() ) {
-+ sValue = xAttributes->getOptionalValue( XML_bIns );
-+ sal_Int32 nBottonInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 45720 / 360 );
-+ mrTextBodyProp.maPropertyMap[ sTextLowerDistance ] <<= static_cast< sal_Int32 >( nBottonInset );
-+ }
++ if( sValue.getLength() ) {
++ sal_Int32 nBottonInset = ( sValue.getLength() != 0 ? GetCoordinate( sValue ) : 45720 / 360 );
++ mrTextBodyProp.maPropertyMap[ PROP_TextLowerDistance ] <<= static_cast< sal_Int32 >( nBottonInset );
++ }
// ST_TextAnchoringType
- mrTextBodyProp.maPropertyMap[ CREATE_OUSTRING( "TextVerticalAdjust" ) ] <<= GetTextVerticalAdjust( xAttributes->getOptionalValueToken( XML_anchor, XML_t ) );
+ mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= GetTextVerticalAdjust( xAttributes->getOptionalValueToken( XML_anchor, XML_t ) );
More information about the ooo-build-commit
mailing list