writerfilter: move QNameToString to the OOXML tokenizer

It's filled with contents in the OOXML tokenizer anyway, keeping its
interface outside of it is pointless.

Change-Id: I10051c5b41a1247417bfb3dd3170a76bf20925aa

3 files changed, 2 insertions, 57 deletions

diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx
index 3b730bd77461..6aa834b2b801 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/resourcemodel/LoggedResources.cxx
@@ -19,7 +19,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <resourcemodel/LoggedResources.hxx>
-#include <resourcemodel/QNameToString.hxx>
+#include <ooxml/QNameToString.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index d10610cb519c..d6c17b5b35f9 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -20,7 +20,7 @@
 #include <libxml/xmlstring.h>
 #include <string.h>
 #include <resourcemodel/TagLogger.hxx>
-#include <resourcemodel/QNameToString.hxx>
+#include <ooxml/QNameToString.hxx>
 #include <boost/unordered_map.hpp>
 
 using namespace css;
diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx
deleted file mode 100644
index 861e994d39e1..000000000000
--- a/writerfilter/source/resourcemodel/qnametostrcore.cxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <resourcemodel/QNameToString.hxx>
-
-namespace writerfilter
-{
-
-QNameToString::Pointer_t QNameToString::pInstance;
-
-QNameToString::Pointer_t QNameToString::Instance()
-{
-    if (pInstance.get() == nullptr)
-        pInstance = QNameToString::Pointer_t(new QNameToString());
-
-    return pInstance;
-}
-
-std::string QNameToString::operator()(Id qName)
-{
-    (void) qName;
-#ifdef DEBUG_WRITERFILTER
-    Map::const_iterator aIt = mMap.find(qName);
-
-    if (aIt != mMap.end())
-        return aIt->second;
-
-#endif
-    return std::string();
-}
-
-QNameToString::QNameToString()
-{
-    init_ooxml();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */