summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
authorFrank Schönheit <fs@openoffice.org>2002-12-20 07:37:06 +0000
committerFrank Schönheit <fs@openoffice.org>2002-12-20 07:37:06 +0000
commitd23900f0fab538d4abe545482001a43f49b6b314 (patch)
treee8e3c895ffe6e5e77d00485ccb30f8f1478a3129 /xmloff/source
parent7a58fc8548254ec5cf7cedaf50fa23a722f0db5d (diff)
#104402# -aControlStyleProperties / +getControlStypePropertyMap - problems with order of initialization of static variables
Diffstat (limited to 'xmloff/source')
-rw-r--r--xmloff/source/forms/layerimport.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 7e5e571fecd3..3e959173244a 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: layerimport.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: fs $ $Date: 2002-10-25 13:16:25 $
+ * last change: $Author: fs $ $Date: 2002-12-20 08:37:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -313,7 +313,7 @@ namespace xmloff
// initialize our style map
m_xPropertyHandlerFactory = new OControlPropertyHandlerFactory();
- ::vos::ORef< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper(aControlStyleProperties, m_xPropertyHandlerFactory.getBodyPtr());
+ ::vos::ORef< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper(getControlStylePropertyMap(), m_xPropertyHandlerFactory.getBodyPtr());
m_xImportMapper = new SvXMLImportPropertyMapper(xStylePropertiesMapper.getBodyPtr(), _rImporter);
// 'initialize'
@@ -616,6 +616,9 @@ namespace xmloff
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.15 2002/10/25 13:16:25 fs
+ * #104402# importing grid column styles now
+ *
* Revision 1.14 2001/09/21 16:27:53 dvo
* #92176# include PrinterPaperTray property
* SvXMLImportProperty now 'knows' the SvXMLImport in order to