additional floating frame properties

10 files changed, 178 insertions, 51 deletions

diff --git a/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmlkywd.hxx
index 9e87f742968f..cb9c5b5422f8 100644
--- a/xmloff/inc/xmlkywd.hxx
+++ b/xmloff/inc/xmlkywd.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlkywd.hxx,v $
  *
- *  $Revision: 1.130 $
+ *  $Revision: 1.131 $
  *
- *  last change: $Author: sab $ $Date: 2001-03-15 11:05:23 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 09:55:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -223,6 +223,7 @@ XML_CONSTASCII_ACTION( sXML_annotation, "annotation" );
 XML_CONSTASCII_ACTION( sXML_annotations, "annotations" );
 XML_CONSTASCII_ACTION( sXML_annote, "annote" );
 XML_CONSTASCII_ACTION( sXML_applet, "applet");
+XML_CONSTASCII_ACTION( sXML_applet_name, "applet-name");
 XML_CONSTASCII_ACTION( sXML_application_data, "application-data");
 XML_CONSTASCII_ACTION( sXML_application_xml, "application-xml");
 XML_CONSTASCII_ACTION( sXML_apply, "apply" );
@@ -766,7 +767,12 @@ XML_CONSTASCII_ACTION( sXML_formulas, "formulas");
 XML_CONSTASCII_ACTION( sXML_fraction, "fraction" );
 XML_CONSTASCII_ACTION( sXML_frame, "frame" );
 XML_CONSTASCII_ACTION( sXML_frame_content, "frame-content" );
+XML_CONSTASCII_ACTION( sXML_frame_display_scrollbar, "frame-display-scrollbar" );
+XML_CONSTASCII_ACTION( sXML_frame_display_border, "frame-display-border" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_horizontal, "frame-margin-horizontal" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_vertical, "frame-margin-vertical" );
 XML_CONSTASCII_ACTION( sXML_frame_end_margin, "frame-end-margin" );
+XML_CONSTASCII_ACTION( sXML_frame_name, "frame-name" );
 XML_CONSTASCII_ACTION( sXML_frame_start_margin, "frame-start-margin" );
 XML_CONSTASCII_ACTION( sXML_freeze, "freeze" );
 XML_CONSTASCII_ACTION( sXML_freeze_position, "freeze-position" );
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 37a1197ba341..bd75e94bc5f7 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmluconv.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-19 09:38:48 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 09:57:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -296,6 +296,15 @@ sal_Bool SvXMLUnitConverter::convertMeasure( sal_Int32& rValue,
             if( sal_Unicode('%') != rString[nPos] )
                 return sal_False;
         }
+        else if( MAP_PIXEL == eDstUnit )
+        {
+            if( nPos + 1 >= nLen ||
+                (sal_Unicode('p') != rString[nPos] &&
+                 sal_Unicode('P') != rString[nPos])||
+                (sal_Unicode('x') != rString[nPos+1] &&
+                 sal_Unicode('X') != rString[nPos+1]) )
+                return sal_False;
+        }
         else
         {
             DBG_ASSERT( MAP_TWIP == eDstUnit || MAP_POINT ||
@@ -506,6 +515,22 @@ void SvXMLUnitConverter::convertPercent( OUStringBuffer& rBuffer,
     rBuffer.append( sal_Unicode('%' ) );
 }
 
+/** convert string to pixel measure */
+sal_Bool SvXMLUnitConverter::convertMeasurePx( sal_Int32& rPixel,
+                                         const OUString& rString )
+{
+    return convertMeasure( rPixel, rString, MAP_PIXEL );
+}
+
+/** convert pixel measure to string */
+void SvXMLUnitConverter::convertMeasurePx( OUStringBuffer& rBuffer,
+                                         sal_Int32 nValue )
+{
+    rBuffer.append( nValue );
+    rBuffer.append( sal_Unicode('p' ) );
+    rBuffer.append( sal_Unicode('x' ) );
+}
+
 /** convert string to enum using given enum map, if the enum is
     not found in the map, this method will return false
 */
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index 37ba09fffe3c..049f9eb51af5 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prhdlfac.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: dvo $ $Date: 2001-02-21 19:28:48 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 09:57:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -244,6 +244,9 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::GetBasicHandler( sal_Int32
             case XML_TYPE_PERCENT16 :
                 pPropHdl = new XMLPercentPropHdl( 2 );
                 break;
+            case XML_TYPE_MEASURE_PX :
+                pPropHdl = new XMLMeasurePxPropHdl( 4 );
+                break;
             case XML_TYPE_STRING :
                 pPropHdl = new XMLStringPropHdl;
                 break;
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index a5dea41f7d88..2da1bcc1ccea 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlbahdl.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: aw $ $Date: 2001-02-26 10:28:52 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 09:57:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -390,6 +390,44 @@ sal_Bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue
 
 ///////////////////////////////////////////////////////////////////////////////
 //
+// class XMLMeasurePxPropHdl
+//
+
+XMLMeasurePxPropHdl::~XMLMeasurePxPropHdl()
+{
+    // nothing to do
+}
+
+sal_Bool XMLMeasurePxPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+{
+    sal_Bool bRet = sal_False;
+
+    sal_Int32 nValue;
+    bRet = rUnitConverter.convertMeasurePx( nValue, rStrImpValue );
+    lcl_xmloff_setAny( rValue, nValue, nBytes );
+
+    return bRet;
+}
+
+sal_Bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+{
+    sal_Bool bRet = sal_False;
+    sal_Int32 nValue;
+      OUStringBuffer aOut;
+
+    if( lcl_xmloff_getAny( rValue, nValue, nBytes ) )
+    {
+         rUnitConverter.convertMeasurePx( aOut, nValue );
+        rStrExpValue = aOut.makeStringAndClear();
+
+        bRet = sal_True;
+    }
+
+    return bRet;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
 // class XMLColorPropHdl
 //
 
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 0c5ffca6343c..0683a5796cb4 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlbahdl.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mib $ $Date: 2000-11-23 11:51:54 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 09:57:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,6 +130,20 @@ public:
 };
 
 /**
+    PropertyHandler for the XML-data-type: XML_TYPE_PERCENT
+*/
+class XMLMeasurePxPropHdl : public XMLPropertyHandler
+{
+    sal_Int8 nBytes;
+public:
+    XMLMeasurePxPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {}
+    virtual ~XMLMeasurePxPropHdl();
+
+    virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+    virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+};
+
+/**
     PropertyHandler for the XML-data-type: XML_TYPE_BOOL
 */
 class XMLBoolPropHdl : public XMLPropertyHandler
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 1697d02b59b9..2bb81222f2b9 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextFrameContext.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-16 12:49:19 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -386,18 +386,20 @@ XMLTextFrameContext::XMLTextFrameContext(
     OUString    sCode;
     OUString    sObject;
     OUString    sArchive;
-    sal_Bool    bMayScript = sal_False;
     OUString    sMimeType;
+    OUString    sFrameName;
+    OUString    sAppletName;
 
     sal_Int32   nX = 0;
     sal_Int32   nY = 0;
     sal_Int32   nWidth = 0;
     sal_Int32   nHeight = 0;
-    sal_Int8    nRelWidth = 0;
-    sal_Int8    nRelHeight = 0;
     sal_Int32   nZIndex = -1;
     sal_Int16   nPage = 0;
     sal_Int16   nRotation = 0;
+    sal_Int8    nRelWidth = 0;
+    sal_Int8    nRelHeight = 0;
+    sal_Bool    bMayScript = sal_False;
 
     TextContentAnchorType   eAnchorType = eATyp;
 
@@ -427,6 +429,12 @@ XMLTextFrameContext::XMLTextFrameContext(
         case XML_TOK_TEXT_FRAME_NAME:
             sName = rValue;
             break;
+        case XML_TOK_TEXT_FRAME_FRAME_NAME:
+            sFrameName = rValue;
+            break;
+        case XML_TOK_TEXT_FRAME_APPLET_NAME:
+            sAppletName = rValue;
+            break;
         case XML_TOK_TEXT_FRAME_ANCHOR_TYPE:
             if( TextContentAnchorType_AT_PARAGRAPH == eAnchorType ||
                 TextContentAnchorType_AT_CHARACTER == eAnchorType ||
@@ -597,33 +605,36 @@ XMLTextFrameContext::XMLTextFrameContext(
         case XML_TEXT_FRAME_OBJECT:
         case XML_TEXT_FRAME_OBJECT_OLE:
         {
-            OUString sClassId;
-            OUString sURL( GetImport().ResolveEmbeddedObjectURL( sHRef, sClassId ) );
+            OUString sURL( GetImport().ResolveEmbeddedObjectURL( sHRef, OUString() ) );
 
             if( sURL.getLength() )
-                xPropSet = GetImport().GetTextImport()->createAndInsertOLEObject(
-                                                            GetImport(), sURL,
-                                                            sClassId, nWidth,
-                                                            nHeight );
+                xPropSet = GetImport().GetTextImport()
+                        ->createAndInsertOLEObject( GetImport(), sURL,
+                                                    nWidth, nHeight );
             break;
         }
         case XML_TEXT_FRAME_APPLET:
         {
-            xPropSet = GetImport().GetTextImport()->createApplet(
-                                    sCode, sName, bMayScript, sHRef, nWidth, nHeight);
+            xPropSet = GetImport().GetTextImport()
+                            ->createAndInsertApplet( sAppletName, sCode,
+                                                     bMayScript, sHRef,
+                                                     nWidth, nHeight);
             break;
         }
         case XML_TEXT_FRAME_PLUGIN:
         {
-            xPropSet = GetImport().GetTextImport()->createPlugin(
-                                    sMimeType, sHRef, nWidth, nHeight);
+            xPropSet = GetImport().GetTextImport()
+                            ->createAndInsertPlugin( sMimeType, sHRef,
+                                                         nWidth, nHeight);
 
             break;
         }
         case XML_TEXT_FRAME_FLOATING_FRAME:
         {
-            xPropSet = GetImport().GetTextImport()->createFloatingFrame(
-                                    sHRef, nWidth, nHeight);
+            xPropSet = GetImport().GetTextImport()
+                            ->createAndInsertFloatingFrame( sFrameName, sHRef,
+                                                            sStyleName,
+                                                            nWidth, nHeight);
             break;
         }
         default:
@@ -652,10 +663,12 @@ XMLTextFrameContext::XMLTextFrameContext(
     Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
 
     // set name
-    if( sName.getLength() )
+    Reference < XNamed > xNamed( xPropSet, UNO_QUERY );
+    if( xNamed.is() )
     {
-        Reference < XNamed > xNamed( xPropSet, UNO_QUERY );
-        if( xNamed.is() )
+        OUString sOrigName( xNamed->getName() );
+        if( !sOrigName.getLength() ||
+            (sName.getLength() && sOrigName != sName) )
         {
             OUString sOldName( sName );
             sal_Int32 i = 0;
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 507dbb06feb4..15949f169b53 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtflde.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-19 09:41:43 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -929,9 +929,10 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
         // export text style with the addition of the combined characters
         DBG_ASSERT(NULL != pCombinedCharactersPropertyState,
                    "need proper PropertyState for combined characters");
+        const XMLPropertyState *aStates[] = { pCombinedCharactersPropertyState, 0 };
         GetExport().GetTextParagraphExport()->Add(
             XML_STYLE_FAMILY_TEXT_TEXT, xRangePropSet,
-            pCombinedCharactersPropertyState);
+            aStates);
         break;
     }
 
@@ -1671,10 +1672,11 @@ void XMLTextFieldExport::ExportFieldHelper(
     case FIELD_ID_COMBINED_CHARACTERS:
     {
         // get style name for current style + combine letters and export a span
+        const XMLPropertyState *aStates[] = { pCombinedCharactersPropertyState, 0 };
         ProcessString(sXML_style_name,
                       GetExport().GetTextParagraphExport()->Find(
                           XML_STYLE_FAMILY_TEXT_TEXT, rRangePropSet,
-                          sEmpty, pCombinedCharactersPropertyState) );
+                          sEmpty, aStates) );
         ExportElement(sXML_span, sPresentation);
         break;
     }
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index bd555b172c80..dbd15fc27fe4 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtimp.cxx,v $
  *
- *  $Revision: 1.59 $
+ *  $Revision: 1.60 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-20 14:04:22 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -475,6 +475,8 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
     { XML_NAMESPACE_DRAW,   sXML_archive,       XML_TOK_TEXT_FRAME_ARCHIVE },
     { XML_NAMESPACE_DRAW,   sXML_may_script,    XML_TOK_TEXT_FRAME_MAY_SCRIPT },
     { XML_NAMESPACE_DRAW,   sXML_mime_type,     XML_TOK_TEXT_FRAME_MIME_TYPE },
+    { XML_NAMESPACE_DRAW, sXML_applet_name, XML_TOK_TEXT_FRAME_APPLET_NAME },
+    { XML_NAMESPACE_DRAW, sXML_frame_name, XML_TOK_TEXT_FRAME_FRAME_NAME },
     XML_TOKEN_MAP_END
 };
 
@@ -1792,7 +1794,6 @@ sal_Bool XMLTextImportHelper::IsInHeaderFooter() const
 Reference< XPropertySet> XMLTextImportHelper::createAndInsertOLEObject(
                                         SvXMLImport& rImport,
                                         const OUString& rHRef,
-                                          const OUString& rClassId,
                                         sal_Int32 nWidth, sal_Int32 nHeight )
 {
     Reference< XPropertySet> xPropSet;
@@ -1800,7 +1801,7 @@ Reference< XPropertySet> XMLTextImportHelper::createAndInsertOLEObject(
 }
 
 
-Reference< XPropertySet> XMLTextImportHelper::createApplet(
+Reference< XPropertySet> XMLTextImportHelper::createAndInsertApplet(
                                         const OUString& rCode,
                                           const OUString& rName,
                                           sal_Bool bMayScript,
@@ -1810,7 +1811,7 @@ Reference< XPropertySet> XMLTextImportHelper::createApplet(
     Reference< XPropertySet> xPropSet;
     return xPropSet;
 }
-Reference< XPropertySet> XMLTextImportHelper::createPlugin(
+Reference< XPropertySet> XMLTextImportHelper::createAndInsertPlugin(
                                           const OUString& rMimeType,
                                           const OUString& rHRef,
                                         sal_Int32 nWidth, sal_Int32 nHeight )
@@ -1818,8 +1819,10 @@ Reference< XPropertySet> XMLTextImportHelper::createPlugin(
     Reference< XPropertySet> xPropSet;
     return xPropSet;
 }
-Reference< XPropertySet> XMLTextImportHelper::createFloatingFrame(
+Reference< XPropertySet> XMLTextImportHelper::createAndInsertFloatingFrame(
+                                          const OUString& rName,
                                           const OUString& rHRef,
+                                          const OUString& rStyleName,
                                         sal_Int32 nWidth, sal_Int32 nHeight )
 {
     Reference< XPropertySet> xPropSet;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 633782f4760f..1cc2d37ba8b6 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtparae.cxx,v $
  *
- *  $Revision: 1.67 $
+ *  $Revision: 1.68 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-16 12:49:19 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -261,7 +261,7 @@ SV_IMPL_OP_PTRARR_SORT( OUStringsSort_Impl, OUStringPtr )
 
 void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
                                   const Reference < XPropertySet > & rPropSet,
-                                  const XMLPropertyState* pAddState)
+                                  const XMLPropertyState** ppAddStates)
 {
     sal_Bool bCache = sal_False;
     UniReference < SvXMLExportPropertyMapper > xPropMapper;
@@ -288,8 +288,14 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
 
     vector< XMLPropertyState > xPropStates =
             xPropMapper->Filter( rPropSet );
-    if (NULL != pAddState)
-        xPropStates.push_back(*pAddState);
+    if( ppAddStates )
+    {
+        while( *ppAddStates )
+        {
+            xPropStates.push_back( **ppAddStates );
+            ppAddStates++;
+        }
+    }
 
     if( xPropStates.size() > 0L || bCache )
     {
@@ -379,7 +385,7 @@ OUString XMLTextParagraphExport::Find(
         sal_uInt16 nFamily,
            const Reference < XPropertySet > & rPropSet,
         const OUString& rParent,
-        const XMLPropertyState* pAddState) const
+        const XMLPropertyState** ppAddStates) const
 {
     sal_Bool bCache = sal_False;
     OUString sName( rParent );
@@ -415,8 +421,14 @@ OUString XMLTextParagraphExport::Find(
     DBG_ASSERT( xPropMapper.is(), "There is the property mapper?" );
     vector< XMLPropertyState > xPropStates =
             xPropMapper->Filter( rPropSet );
-    if (NULL != pAddState)
-        xPropStates.push_back(*pAddState);
+    if( ppAddStates )
+    {
+        while( *ppAddStates )
+        {
+            xPropStates.push_back( **ppAddStates );
+            ppAddStates++;
+        }
+    }
 
     if( xPropStates.size() > 0L )
         sName = GetAutoStylePool().Find( nFamily, sName, xPropStates );
@@ -2069,6 +2081,12 @@ void XMLTextParagraphExport::exportShape(
     }
 }
 
+void XMLTextParagraphExport::_collectTextEmbeddedAutoStyles(
+        const Reference < XPropertySet > & rPropSet )
+{
+    Add( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet );
+}
+
 void XMLTextParagraphExport::_exportTextEmbedded(
         const Reference < XPropertySet > & rPropSet,
         const Reference < XPropertySetInfo > & rPropSetInfo )
@@ -2148,7 +2166,7 @@ void XMLTextParagraphExport::exportTextEmbedded(
 
     if( bAutoStyles )
     {
-        Add( XML_STYLE_FAMILY_TEXT_FRAME, xPropSet );
+        _collectTextEmbeddedAutoStyles( xPropSet );
     }
     else
     {
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 45c215c86630..d6757c9d8331 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtprmap.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: dvo $ $Date: 2001-03-20 11:33:56 $
+ *  last change: $Author: mib $ $Date: 2001-03-21 10:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -618,6 +618,11 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
     { "Transparency",   XML_NAMESPACE_DRAW, sXML_transparency,      XML_TYPE_PERCENT16, 0 },
     // RES_GRFATR_DRAWMODE
     { "GraphicColorMode", XML_NAMESPACE_DRAW, sXML_color_mode,          XML_TYPE_COLOR_MODE, 0 },
+    // special entries for floating frames
+    M_E( "",            DRAW,   frame_display_scrollbar,    XML_TYPE_BOOL|MID_FLAG_NO_PROPERTY, CTF_FRAME_DISPLAY_SCROLLBAR ),
+    M_E( "",            DRAW,   frame_display_border,   XML_TYPE_BOOL|MID_FLAG_NO_PROPERTY, CTF_FRAME_DISPLAY_BORDER ),
+    M_E( "",            DRAW,   frame_margin_horizontal,    XML_TYPE_MEASURE_PX|MID_FLAG_NO_PROPERTY,   CTF_FRAME_MARGIN_HORI ),
+    M_E( "",            DRAW,   frame_margin_vertical,  XML_TYPE_MEASURE_PX|MID_FLAG_NO_PROPERTY,   CTF_FRAME_MARGIN_VERT ),
     M_E( "UserDefinedAttributes", TEXT, xmlns, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
     { 0, 0, 0, 0 }
 };