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

[Thorsten Behrens]

 patches/dev300/apply                       |    1 
 patches/dev300/fit-list-to-size-ooxml.diff |   38 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

New commits:
commit 5ad2b46e89497de2df259ea84acfe2bd6834ff10
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Feb 4 22:42:09 2010 +0100

    Make ooxml import actually get autofit on, when given
    
    * patches/dev300/apply: added the patch
    * patches/dev300/fit-list-to-size-ooxml.diff: honour normAutofit
      attribute for outline shapes

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 87406c6..96988bd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3240,6 +3240,7 @@ fontconfig-cache-pre-substitution.diff, n#529532, kohei
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
+fit-list-to-size-ooxml.diff, i#94086, thorsten
 
 [ OOXMLExport ]
 oox-pptx-export-hyperlinks.diff, n#499124, rodo
diff --git a/patches/dev300/fit-list-to-size-ooxml.diff b/patches/dev300/fit-list-to-size-ooxml.diff
new file mode 100644
index 0000000..63281e2
--- /dev/null
+++ b/patches/dev300/fit-list-to-size-ooxml.diff
@@ -0,0 +1,38 @@
+Make ooxml import correctly autofit attribute
+
+From: Thorsten Behrens <tbehrens at novell.com>
+
+
+---
+
+ oox/source/drawingml/textbodypropertiescontext.cxx |    3 +++
+ oox/source/token/properties.txt                    |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+
+diff --git oox/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
+index cae55a3..dff3316 100644
+--- oox/source/drawingml/textbodypropertiescontext.cxx
++++ oox/source/drawingml/textbodypropertiescontext.cxx
+@@ -153,6 +153,9 @@ Reference< XFastContextHandler > TextBodyPropertiesContext::createFastChildConte
+                 mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] <<= false;   // CT_TextNoAutofit
+                 break;
+             case NMSP_DRAWINGML|XML_normAutofit:	// CT_TextNormalAutofit
++                mrTextBodyProp.maPropertyMap[ PROP_TextFitToSize ] <<= true;
++                mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] <<= false;
++                break;
+             case NMSP_DRAWINGML|XML_spAutoFit:
+                 mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] <<= true;
+                 break;
+diff --git oox/source/token/properties.txt oox/source/token/properties.txt
+index cd57740..d53c746 100644
+--- oox/source/token/properties.txt
++++ oox/source/token/properties.txt
+@@ -367,6 +367,7 @@ TargetFrame
+ TextAutoGrowHeight
+ TextBreak
+ TextColor
++TextFitToSize
+ TextHorizontalAdjust
+ TextLeftDistance
+ TextLowerDistance