summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.cxx1
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.cxx1
-rw-r--r--dbaccess/source/filter/xml/xmlEnums.hxx10
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx22
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx4
5 files changed, 0 insertions, 38 deletions
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index 91dc85582883..50e56df9ef41 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -23,7 +23,6 @@
#include <xmloff/xmluconv.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
-#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <strings.hxx>
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx
index dde08cd1fe23..c842d0c3ccd8 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -22,7 +22,6 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
-#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <strings.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx
index 0a52cd22f8bd..0f4be1aaa9dc 100644
--- a/dbaccess/source/filter/xml/xmlEnums.hxx
+++ b/dbaccess/source/filter/xml/xmlEnums.hxx
@@ -21,16 +21,6 @@
#define PROGRESS_BAR_STEP 20
-namespace dbaxml
-{
- enum XMLDocContentTokens
- {
- XML_TOK_CONTENT_AUTOSTYLES,
- XML_TOK_CONTENT_STYLES,
- XML_TOK_CONTENT_SCRIPTS,
- XML_TOK_CONTENT_BODY,
- };
-} // namespace dbaxml
#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLENUMS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 97dd78c21c01..eb0e3d505202 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -588,28 +588,6 @@ void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
}
-const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() const
-{
- if (!m_pDocContentElemTokenMap)
- {
- static const SvXMLTokenMapEntry aElemTokenMap[]=
- {
- { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_CONTENT_STYLES },
- { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_CONTENT_STYLES },
- { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_CONTENT_AUTOSTYLES },
- { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_CONTENT_AUTOSTYLES },
- { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_CONTENT_SCRIPTS },
- { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_CONTENT_BODY },
- { XML_NAMESPACE_OOO, XML_BODY, XML_TOK_CONTENT_BODY },
- XML_TOKEN_MAP_END
- };
- m_pDocContentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
- }
- return *m_pDocContentElemTokenMap;
-}
-
-
-
SvXMLImportContext* ODBFilter::CreateStylesContext( bool bIsAutoStyle )
{
SvXMLImportContext *pContext = new OTableStylesContext(*this, bIsAutoStyle);
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 16e4b2c557cf..7025c49b655c 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -63,8 +63,6 @@ private:
TPropertyNameMap m_aTablesSettings;
std::vector< css::beans::PropertyValue> m_aInfoSequence;
- mutable std::unique_ptr<SvXMLTokenMap> m_pDocContentElemTokenMap;
-
mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper;
mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
@@ -116,8 +114,6 @@ public:
const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;}
- const SvXMLTokenMap& GetDocContentElemTokenMap() const;
-
rtl::Reference < XMLPropertySetMapper > const & GetTableStylesPropertySetMapper() const;
rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const;
rtl::Reference < XMLPropertySetMapper > const & GetCellStylesPropertySetMapper() const;