#116001# Reverted revision 1366087

5 files changed, 76 insertions, 5 deletions

diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
new file mode 100644
index 000000000000..495a04cff862
--- /dev/null
+++ b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
@@ -0,0 +1,70 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
+#define __com_sun_star_drawing_TextFitToSizeType_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module drawing {
+
+//=============================================================================
+
+// DocMerge from xml: enum com::sun::star::drawing::TextFitToSizeType
+/** This enumeration specifies how the text within a shape relates to the
+    size of the shape.
+ */
+published enum TextFitToSizeType
+{
+    //-------------------------------------------------------------------------
+    /** the text size is only defined by the font properties
+    */
+    NONE,
+
+    //-------------------------------------------------------------------------
+
+    /** if the shape is scaled, the text character size is scaled proportional
+    */
+    PROPORTIONAL,
+
+    //-------------------------------------------------------------------------
+
+    /** like <code>PROPORTIONAL</code>, but the width of each text row is
+        also scaled proportional.
+    */
+    ALLLINES,
+
+    //-------------------------------------------------------------------------
+
+    /** if the shape is scaled, the font attributes are scaled and hard set
+        on the text */
+    RESIZEATTR
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index c49018c8b552..a0bf27f7e756 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -51,6 +51,10 @@
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
 #endif
 
+#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
+#include <com/sun/star/drawing/TextFitToSizeType.idl>
+#endif
+
 #ifndef __com_sun_star_drawing_TextAdjust_idl__
 #include <com/sun/star/drawing/TextAdjust.idl>
 #endif
@@ -172,7 +176,7 @@ published service TextProperties
     /** With this set to <TRUE/>, the text inside of the <type>Shape</type>
         is stretched to fit into the <type>Shape</type>.
      */
-    [property] boolean TextFitToSize;
+    [property] com::sun::star::drawing::TextFitToSizeType TextFitToSize;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/drawing/makefile.mk b/offapi/com/sun/star/drawing/makefile.mk
index 847e0093f28e..6c7a23fc747d 100644
--- a/offapi/com/sun/star/drawing/makefile.mk
+++ b/offapi/com/sun/star/drawing/makefile.mk
@@ -169,6 +169,7 @@ IDLFILES=\
     TextAdjust.idl\
     TextAnimationDirection.idl\
     TextAnimationKind.idl\
+    TextFitToSizeType.idl\
     TextHorizontalAdjust.idl\
     TextProperties.idl\
     TextShape.idl\
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index 09847ce5c5d1..1b47f11b3841 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -189,7 +189,3 @@
 
 06/11/2012 (JSC): TaskID=119944
   Update reference type library to 3.4 version
-
-07/26/2012 (ALG): TaskId=116001
-  Changed type of TextFitToSize too boolean and removed TextFitToSizeType 
-  accordingly due to being boolean in implementation/core and in ODF, too.
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 35fca2ed8fa2..c9264fe7b57c 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb