summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source')
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx10
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.hxx8
-rw-r--r--xmloff/source/style/PageMasterPropHdlFactory.cxx10
-rw-r--r--xmloff/source/style/PageMasterStyleMap.cxx5
-rw-r--r--xmloff/source/style/PagePropertySetContext.cxx12
-rw-r--r--xmloff/source/style/xmlimppr.cxx11
6 files changed, 42 insertions, 14 deletions
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 2b22db7ed153..a8a2816a5b4f 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: PageMasterExportPropMapper.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dr $ $Date: 2000-10-20 16:30:27 $
+ * last change: $Author: mib $ $Date: 2000-10-26 08:35:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,7 +81,8 @@ XMLPageMasterExportPropMapper::XMLPageMasterExportPropMapper(
const UniReference< XMLPropertySetMapper >& rMapper,
SvXMLExport& rExport ) :
SvXMLExportPropertyMapper( rMapper ),
- aBackgroundImageExport( rExport )
+ aBackgroundImageExport( rExport ),
+ aTextColumnsExport( rExport )
{
}
@@ -126,6 +127,9 @@ void XMLPageMasterExportPropMapper::handleElementItem(
getPropertySetMapper()->GetEntryNameSpace( nPropIndex ),
getPropertySetMapper()->GetEntryXMLName( nPropIndex ) );
}
+ case CTF_PM_TEXTCOLUMNS:
+ pThis->aTextColumnsExport.exportXML( rProperty.maValue );
+ break;
}
}
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index bc11ee0159b5..8a3e495fc5ac 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: PageMasterExportPropMapper.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dr $ $Date: 2000-10-20 16:30:27 $
+ * last change: $Author: mib $ $Date: 2000-10-26 08:35:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,6 +68,9 @@
#ifndef _XMLBACKGROUNDIMAGEEXPORT_HXX
#include "XMLBackgroundImageExport.hxx"
#endif
+#ifndef _XMLOFF_XMLTEXTCOLUMNSEXPORT_HXX
+#include "XMLTextColumnsExport.hxx"
+#endif
//______________________________________________________________________________
@@ -76,6 +79,7 @@ class XMLPageMasterExportPropMapper : public SvXMLExportPropertyMapper
{
protected:
XMLBackgroundImageExport aBackgroundImageExport;
+ XMLTextColumnsExport aTextColumnsExport;
public:
XMLPageMasterExportPropMapper(
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index bb303cf6af99..48c8fec3d0b1 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: PageMasterPropHdlFactory.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: dr $ $Date: 2000-10-23 09:53:27 $
+ * last change: $Author: mib $ $Date: 2000-10-26 08:35:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,6 +75,9 @@
#ifndef _XMLOFF_NAMEDBOOLPROPERTYHANDLER_HXX
#include "NamedBoolPropertyHdl.hxx"
#endif
+#ifndef _XMLOFF_XMLTEXTCOLUMNSPPROPERTYHANDLER_HXX
+#include "XMLTextColumnsPropertyHandler.hxx"
+#endif
#ifndef _XMLOFF_PAGEMASTERPROPHDL_HXX_
#include "PageMasterPropHdl.hxx"
@@ -155,6 +158,9 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
case XML_PM_TYPE_FIRSTPAGENUMBER:
pHdl = new XMLNumberNonePropHdl( sXML_continue, 2 );
break;
+ case XML_TYPE_TEXT_COLUMNS:
+ pHdl = new XMLTextColumnsPropertyHandler;
+ break;
}
if( pHdl )
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 57add825c914..4c6e68dbfebd 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: PageMasterStyleMap.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: sab $ $Date: 2000-10-25 16:31:11 $
+ * last change: $Author: mib $ $Date: 2000-10-26 08:35:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -120,6 +120,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
{ "FirstPageNumber", XML_NAMESPACE_STYLE, sXML_first_page_number, XML_PM_TYPE_FIRSTPAGENUMBER, 0 },
{ "PageScale", XML_NAMESPACE_STYLE, sXML_scale_to, XML_TYPE_NUMBER16, CTF_PM_SCALETO },
{ "ScaleToPages", XML_NAMESPACE_STYLE, sXML_scale_to_pages, XML_TYPE_NUMBER16, CTF_PM_SCALETOPAGES },
+ { "TextColumns", XML_NAMESPACE_STYLE, sXML_columns, MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_COLUMNS, CTF_PM_TEXTCOLUMNS },
// { "CenterHorizontally", XML_NAMESPACE_STYLE, sXML_center_horizontally, XML_TYPE_BOOL, 0 },
// { "CenterVertically", XML_NAMESPACE_STYLE, sXML_center_vertically, XML_TYPE_BOOL, 0 },
// header
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 8c1c505b0a23..6c8db69ae76d 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: PagePropertySetContext.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: sab $ $Date: 2000-10-25 15:00:52 $
+ * last change: $Author: mib $ $Date: 2000-10-26 08:35:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,6 +69,9 @@
#ifndef _XMLBACKGROUNDIMAGECONTEXT_HXX
#include "XMLBackgroundImageContext.hxx"
#endif
+#ifndef _XMLTEXTCOLUMNSCONTEXT_HXX
+#include "XMLTextColumnsContext.hxx"
+#endif
#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX
#include "PageMasterStyleMap.hxx"
#endif
@@ -140,6 +143,11 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext(
rProp.mnIndex-1,
rProperties );
break;
+ case CTF_PM_TEXTCOLUMNS:
+ pContext = new XMLTextColumnsContext( GetImport(), nPrefix,
+ rLocalName, xAttrList, rProp,
+ rProperties );
+ break;
}
if( !pContext )
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 72d11fa320d4..511d4e996b23 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmlimppr.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: mib $ $Date: 2000-10-25 11:46:38 $
+ * last change: $Author: mib $ $Date: 2000-10-26 08:35:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -140,7 +140,12 @@ void SvXMLImportPropertyMapper::importXML(
const OUString& rValue = xAttrList->getValueByIndex( i );
- sal_Int32 nIndex = nStartIdx; // index of actual property map entry
+ // index of actual property map entry
+ // This looks very strange, but it works well:
+ // If the start index is 0, the new value will become -1, and
+ // GetEntryIndex will start searching with position 0.
+ // Otherwise GetEntryIndex will start with the next position specified.
+ sal_Int32 nIndex = nStartIdx - 1;
sal_uInt32 nFlags = 0; // flags of actual property map entry
do
{
generated by cgit (git 2.34.1) at 2025-05-05 21:03:25 +0000