#116001# TextToFitSize item/property optimized to boolean

5 files changed, 5 insertions, 76 deletions

diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
deleted file mode 100644
index 495a04cff862..000000000000
--- a/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+++ /dev/null
@@ -1,70 +0,0 @@
-/**************************************************************
- *
- * 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 a0bf27f7e756..c49018c8b552 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -51,10 +51,6 @@
 #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
@@ -176,7 +172,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] com::sun::star::drawing::TextFitToSizeType TextFitToSize;
+    [property] boolean TextFitToSize;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/drawing/makefile.mk b/offapi/com/sun/star/drawing/makefile.mk
index 6c7a23fc747d..847e0093f28e 100644
--- a/offapi/com/sun/star/drawing/makefile.mk
+++ b/offapi/com/sun/star/drawing/makefile.mk
@@ -169,7 +169,6 @@ 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 1b47f11b3841..09847ce5c5d1 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -189,3 +189,7 @@
 
 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 c9264fe7b57c..35fca2ed8fa2 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb