summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-03-12 09:58:17 +0000
committerRüdiger Timm <rt@openoffice.org>2008-03-12 09:58:17 +0000
commite96f83ef0e6979791f497a2f05824cf73a8e6b25 (patch)
tree1d1a77cb323d135cea168c4b0ed72097cb31b15e /xmloff
parent9e863671ade41b8bcd70e99d82706f07b9ddd654 (diff)
INTEGRATION: CWS impresstables2 (1.41.36); FILE MERGED
2008/03/11 18:21:33 cl 1.41.36.4: RESYNC: (1.43-1.44); FILE MERGED 2007/11/29 18:50:47 cl 1.41.36.3: #i68103# working on table templates 2007/08/01 14:37:07 cl 1.41.36.2: RESYNC: (1.41-1.43); FILE MERGED 2007/07/27 09:09:55 cl 1.41.36.1: fixed build issues due to pch and namespace ::rtl
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/style/xmlstyle.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 3bc50896f72f..8f291274c7ea 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: xmlstyle.cxx,v $
*
- * $Revision: 1.44 $
+ * $Revision: 1.45 $
*
- * last change: $Author: kz $ $Date: 2008-03-07 16:18:14 $
+ * last change: $Author: rt $ $Date: 2008-03-12 10:58:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -150,7 +150,9 @@
#include "PageMasterImportPropMapper.hxx"
#endif
-using namespace ::rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
@@ -655,13 +657,8 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
xAttrList, *this, nFamily );
break;
case XML_STYLE_FAMILY_SCH_CHART_ID:
-#ifndef SVX_LIGHT
pStyle = new XMLChartStyleContext( GetImport(), nPrefix, rLocalName,
xAttrList, *this, nFamily );
-#else
- // create default context to skip content
- pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily );
-#endif
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID: