Fix text paragraph autofit pptx import, n#650035

also revert unwanted changes in apply from last commit

* patches/dev300/apply:
* patches/dev300/oox-pptx-import-fix-text-paragraph-autofit.diff:

2 files changed, 41 insertions, 4 deletions

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bfb402204..4e939b77b 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
@@ -4149,3 +4149,4 @@ netbook-window-decoration-update.diff, n#621116, rodo
 [ Fixes ]
 oox-pptx-import-fix-customshapes-and-groups.diff, n#621739, rodo
 oox-pptx-import-fix-groups-2.diff, n#619678, rodo
+oox-pptx-import-fix-text-paragraph-autofit.diff, n#650035, rodo
diff --git a/patches/dev300/oox-pptx-import-fix-text-paragraph-autofit.diff b/patches/dev300/oox-pptx-import-fix-text-paragraph-autofit.diff
new file mode 100644
index 000000000..d0238da87
--- /dev/null
+++ b/patches/dev300/oox-pptx-import-fix-text-paragraph-autofit.diff
@@ -0,0 +1,36 @@
+From d2d280d45c90b77a92475f78ee64dd18b09f353a Mon Sep 17 00:00:00 2001
+From: Radek Doulik <rodo@novell.com>
+Date: Fri, 24 Sep 2010 09:01:46 +0200
+Subject: [PATCH] Fix text paragraph autofit pptx import
+
+---
+ oox/source/drawingml/textbodypropertiescontext.cxx |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git oox/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
+index 59aab10..d05f126 100644
+--- oox/source/drawingml/textbodypropertiescontext.cxx
++++ oox/source/drawingml/textbodypropertiescontext.cxx
+@@ -30,8 +30,9 @@
+ 
+ #include <com/sun/star/text/ControlCharacter.hpp>
+ #include <com/sun/star/text/WritingMode.hpp>
+-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
++#include <com/sun/star/drawing/TextFitToSizeType.hpp>
+ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
++#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
+ #include "oox/drawingml/textbodyproperties.hxx"
+ #include "oox/drawingml/drawingmltypes.hxx"
+ #include "oox/helper/attributelist.hxx"
+@@ -165,7 +166,7 @@ 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_TextFitToSize ] <<= TextFitToSizeType_AUTOFIT;
+                 mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] <<= false;
+                 break;
+             case NMSP_DRAWINGML|XML_spAutoFit:
+-- 
+1.7.1
+