#79763# separator line properties added to SwXTextColumns; property names of page styles corrected

2 files changed, 33 insertions, 7 deletions

diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index f221a493a334..3267c36ee728 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unomap.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: os $ $Date: 2000-10-24 14:26:57 $
+ *  last change: $Author: os $ $Date: 2000-10-25 12:59:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -317,6 +317,9 @@
 #ifndef _COM_SUN_STAR_STYLE_GRAPHICLOCATION_HPP_
 #include <com/sun/star/style/GraphicLocation.hpp>
 #endif
+#ifndef _COM_SUN_STAR_STYLE_VERTICALALIGNMENT_HPP_
+#include <com/sun/star/style/VerticalAlignment.hpp>
+#endif
 #ifndef _COM_SUN_STAR_CONTAINER_XINDEXREPLACE_HPP_
 #include <com/sun/star/container/XIndexReplace.hpp>
 #endif
@@ -856,13 +859,15 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_FOOTER_IS_ON),                      FN_UNO_FOOTER_ON,           &::getBooleanCppuType(),            PROPERTY_NONE ,0         },
 
 
-                    { SW_PROP_NAME(UNO_NAME_LANDSCAPE),                 SID_ATTR_PAGE,          &::getBooleanCppuType(),            PROPERTY_NONE ,MID_PAGE_ORIENTATION   },
+                    { SW_PROP_NAME(UNO_NAME_IS_LANDSCAPE),              SID_ATTR_PAGE,          &::getBooleanCppuType(),            PROPERTY_NONE ,MID_PAGE_ORIENTATION   },
                     { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE),            SID_ATTR_PAGE,          &::getCppuType((const sal_Int16*)0),            PROPERTY_NONE , MID_PAGE_NUMTYPE       },
                     { SW_PROP_NAME(UNO_NAME_PAGE_STYLE_LAYOUT),         SID_ATTR_PAGE,          &::getCppuType((const style::PageStyleLayout*)0),   PROPERTY_NONE ,MID_PAGE_LAYOUT     },
                     { SW_PROP_NAME(UNO_NAME_PRINTER_PAPER_TRAY),        RES_PAPER_BIN,          &::getCppuType((const sal_Int8*)0),             PROPERTY_NONE , 0 },
                     { SW_PROP_NAME(UNO_NAME_REGISTER_MODE_ACTIVE),  SID_SWREGISTER_MODE,    &::getBooleanCppuType(),            PROPERTY_NONE , 0 },
                     { SW_PROP_NAME(UNO_NAME_REGISTER_PARAGRAPH_STYLE),SID_ATTR_PAGE_EXT1,   &::getCppuType((const OUString*)0),         PROPERTY_NONE , 0 },
-                    { SW_PROP_NAME(UNO_NAME_SIZE),                  SID_ATTR_PAGE_SIZE,     &::getCppuType((const awt::Size*)0),            PROPERTY_NONE, CONVERT_TWIPS},
+                    { SW_PROP_NAME(UNO_NAME_SIZE),                  SID_ATTR_PAGE_SIZE,     &::getCppuType((const awt::Size*)0),            PROPERTY_NONE,   MID_SIZE_SIZE|CONVERT_TWIPS},
+                    { SW_PROP_NAME(UNO_NAME_WIDTH),                 SID_ATTR_PAGE_SIZE,     &::getCppuType((const sal_Int32*)0)  ,          PROPERTY_NONE, MID_SIZE_WIDTH|CONVERT_TWIPS},
+                    { SW_PROP_NAME(UNO_NAME_HEIGHT),                SID_ATTR_PAGE_SIZE,     &::getCppuType((const sal_Int32*)0)  ,          PROPERTY_NONE, MID_SIZE_HEIGHT|CONVERT_TWIPS            },
                     { SW_PROP_NAME(UNO_NAME_TEXT_COLUMNS),          RES_COL,                &::getCppuType((uno::Reference<text::XTextColumns>*)0),    PROPERTY_NONE, MID_COLUMNS},
                     { SW_PROP_NAME(UNO_NAME_TOP_MARGIN),            RES_UL_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_BOTTOM_MARGIN),             RES_UL_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
@@ -1782,6 +1787,20 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                 aMapArr[nPropertyId] = aFootnoteMap_Impl;
             }
             break;
+            case PROPERTY_MAP_TEXT_COLUMS :
+            {
+                static SfxItemPropertyMap aTextColumns_Impl[] =
+                {
+                    {SW_PROP_NAME(UNO_NAME_SEPARATOR_LINE_WIDTH),               WID_TXTCOL_LINE_WIDTH, &::getCppuType((const sal_Int32*)0),PROPERTY_NONE,   0},
+                    {SW_PROP_NAME(UNO_NAME_SEPARATOR_LINE_COLOR),               WID_TXTCOL_LINE_COLOR, &::getCppuType((const sal_Int32*)0),PROPERTY_NONE,   0},
+                    {SW_PROP_NAME(UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT),     WID_TXTCOL_LINE_REL_HGT, &::getCppuType((const sal_Int32*)0),PROPERTY_NONE, 0},
+                    {SW_PROP_NAME(UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT),  WID_TXTCOL_LINE_ALIGN, &::getCppuType((style::VerticalAlignment*)0),PROPERTY_NONE,  0},
+                    {SW_PROP_NAME(UNO_NAME_SEPARATOR_LINE_IS_ON),               WID_TXTCOL_LINE_IS_ON, &::getCppuType((const sal_Int32*)0),PROPERTY_NONE,   0},
+                    {0,0,0,0}
+                };
+                aMapArr[nPropertyId] = aTextColumns_Impl;
+            }
+            break;
         }
         Sort(nPropertyId);
     }
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index cb085c2b8423..15e664d0e1a2 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoprnms.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: os $ $Date: 2000-10-24 14:26:57 $
+ *  last change: $Author: os $ $Date: 2000-10-25 12:59:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -192,7 +192,7 @@ const SwPropNameLen __FAR_DATA  UNO_NAME_IS_PROTECTED
 const SwPropNameLen __FAR_DATA  UNO_NAME_KEY_AS_ENTRY                           (MAP_CHAR_LEN("KeyAsEntry"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_PARA_KEEP_TOGETHER                     (MAP_CHAR_LEN("ParaKeepTogether"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_KEEP_TOGETHER                          (MAP_CHAR_LEN("KeepTogether"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_LANDSCAPE                              (MAP_CHAR_LEN("Landscape"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_IS_LANDSCAPE                           (MAP_CHAR_LEN("IsLandscape"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_LINE_SEPARATOR                         (MAP_CHAR_LEN("LineSeparator"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_MARKS                                  (MAP_CHAR_LEN("Marks"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_NUMBER_POSITION                        (MAP_CHAR_LEN("NumberPosition"));
@@ -545,3 +545,10 @@ const SwPropNameLen __FAR_DATA UNO_NAME_HIDE_FIELD_TIPS
 const SwPropNameLen __FAR_DATA UNO_NAME_PARA_SHADOW_FORMAT                      (MAP_CHAR_LEN("ParaShadowFormat"));
 
 const SwPropNameLen __FAR_DATA UNO_NAME_CONTOUR_POLY_POLYGON                    (MAP_CHAR_LEN("ContourPolyPolygon"));
+
+const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_WIDTH                    (MAP_CHAR_LEN("SeparatorLineWidth"));
+const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_COLOR                    (MAP_CHAR_LEN("SeparatorLineColor"));
+const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT          (MAP_CHAR_LEN("SeparatorLineRelativeHeight"));
+const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT       (MAP_CHAR_LEN("SeparatorLineVerticalAlignment"));
+const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_IS_ON                    (MAP_CHAR_LEN("SeparatorLineIsOn"));
+