#86116#: char vertical-rel for character bound frames changed to text

2 files changed, 33 insertions, 41 deletions

diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index fffcd5dfa2dc..515210b8acf3 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtimppr.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-15 11:28:36 $
+ *  last change: $Author: mib $ $Date: 2001-04-27 07:25:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,9 +66,6 @@
 #ifndef _COM_SUN_STAR_TABLE_BORDERLINE_HPP_
 #include <com/sun/star/table/BorderLine.hpp>
 #endif
-#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
-#include <com/sun/star/text/TextContentAnchorType.hpp>
-#endif
 #ifndef _COM_SUN_STAR_TEXT_VERTORIENTATION_HPP_
 #include <com/sun/star/text/VertOrientation.hpp>
 #endif
@@ -446,44 +443,39 @@ void XMLTextImportPropertyMapper::finished(
 
     if( pVertOrient && pVertOrientRelAsChar )
     {
-        TextContentAnchorType eAnchorType;
-        if( pAnchorType && (pAnchorType->maValue >>= eAnchorType) &&
-            TextContentAnchorType_AS_CHARACTER == eAnchorType )
+        sal_Int16 nVertOrient;
+        pVertOrient->maValue >>= nVertOrient;
+        sal_Int16 nVertOrientRel;
+        pVertOrientRelAsChar->maValue >>= nVertOrientRel;
+        switch( nVertOrient )
         {
-            sal_Int16 nVertOrient;
-            pVertOrient->maValue >>= nVertOrient;
-            sal_Int16 nVertOrientRel;
-            pVertOrientRelAsChar->maValue >>= nVertOrientRel;
-            switch( nVertOrient )
+        case VertOrientation::TOP:
+            nVertOrient = nVertOrientRel;
+            break;
+        case VertOrientation::CENTER:
+            switch( nVertOrientRel )
             {
-            case VertOrientation::TOP:
-                nVertOrient = nVertOrientRel;
+            case VertOrientation::CHAR_TOP:
+                nVertOrient = VertOrientation::CHAR_CENTER;
                 break;
-            case VertOrientation::CENTER:
-                switch( nVertOrientRel )
-                {
-                case VertOrientation::CHAR_TOP:
-                    nVertOrient = VertOrientation::CHAR_CENTER;
-                    break;
-                case VertOrientation::LINE_TOP:
-                    nVertOrient = VertOrientation::LINE_CENTER;
-                    break;
-                }
+            case VertOrientation::LINE_TOP:
+                nVertOrient = VertOrientation::LINE_CENTER;
                 break;
-            case VertOrientation::BOTTOM:
-                switch( nVertOrientRel )
-                {
-                case VertOrientation::CHAR_TOP:
-                    nVertOrient = VertOrientation::CHAR_BOTTOM;
-                    break;
-                case VertOrientation::LINE_TOP:
-                    nVertOrient = VertOrientation::LINE_BOTTOM;
-                    break;
-                }
+            }
+            break;
+        case VertOrientation::BOTTOM:
+            switch( nVertOrientRel )
+            {
+            case VertOrientation::CHAR_TOP:
+                nVertOrient = VertOrientation::CHAR_BOTTOM;
+                break;
+            case VertOrientation::LINE_TOP:
+                nVertOrient = VertOrientation::LINE_BOTTOM;
                 break;
             }
-            pVertOrient->maValue <<= nVertOrientRel;
+            break;
         }
+        pVertOrient->maValue <<= nVertOrient;
         pVertOrientRelAsChar->mnIndex = -1;
     }
 
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 917bafe79367..d3f3fdfb0e20 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtprhdl.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: mib $ $Date: 2001-04-04 13:55:56 $
+ *  last change: $Author: mib $ $Date: 2001-04-27 07:25:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -256,9 +256,9 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelAsChar_Enum[] =
     { sXML_baseline,        VertOrientation::TOP        },
     { sXML_baseline,        VertOrientation::CENTER     },  // export only
     { sXML_baseline,        VertOrientation::BOTTOM     },  // export only
-    { sXML_char,            VertOrientation::CHAR_TOP   },
-    { sXML_char,            VertOrientation::CHAR_CENTER    },  // export only
-    { sXML_char,            VertOrientation::CHAR_BOTTOM    },  // export only
+    { sXML_text,            VertOrientation::CHAR_TOP   },
+    { sXML_text,            VertOrientation::CHAR_CENTER    },  // export only
+    { sXML_text,            VertOrientation::CHAR_BOTTOM    },  // export only
     { sXML_line,            VertOrientation::LINE_TOP   },
     { sXML_line,            VertOrientation::LINE_CENTER    },  // export only
     { sXML_line,            VertOrientation::LINE_BOTTOM    },  // export only