execute move of global headers

see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a

7 files changed, 0 insertions, 424 deletions

diff --git a/xmlreader/Module_xmlreader.mk b/xmlreader/Module_xmlreader.mk
index 6f6702f48e61..97d413ad3774 100644
--- a/xmlreader/Module_xmlreader.mk
+++ b/xmlreader/Module_xmlreader.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_Module,xmlreader))
 
 $(eval $(call gb_Module_add_targets,xmlreader,\
 	Library_xmlreader \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Package_inc.mk b/xmlreader/Package_inc.mk
deleted file mode 100644
index ab2b5576e351..000000000000
--- a/xmlreader/Package_inc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,xmlreader_inc,$(SRCDIR)/xmlreader/inc))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/pad.hxx,xmlreader/pad.hxx))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/span.hxx,xmlreader/span.hxx))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/xmlreader.hxx,xmlreader/xmlreader.hxx))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/detail/xmlreaderdllapi.hxx,xmlreader/detail/xmlreaderdllapi.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/inc/xmlreader/README b/xmlreader/inc/xmlreader/README
deleted file mode 100644
index 41b43e7e8882..000000000000
--- a/xmlreader/inc/xmlreader/README
+++ /dev/null
@@ -1,28 +0,0 @@
-#**************************************************************
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-#**************************************************************
-
-<http://qa.openoffice.org/issues/show_bug.cgi?id=115203>: "Issue 113189
-extracted xmlreader from configmgr, to make the former available within URE.
-The xmlreader library is for now considered a private part of URE (cf.
-ure/source/README), for simplicity uses OOO_DLLPUBLIC_XMLREADER-based symbol
-visibility (and thus no symbol versioning), but is of course used from outside
-URE in configmgr.  This works as long as its ABI does not change.  If it ever
-changes, symbol versioning will have to be added (in some form or other)."
diff --git a/xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx b/xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx
deleted file mode 100644
index 6325bdbe71bd..000000000000
--- a/xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx
+++ /dev/null
@@ -1,35 +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 .
- */
-
-#ifndef INCLUDED_XMLREADER_DETAIL_XMLREADERDLLAPI_HXX
-#define INCLUDED_XMLREADER_DETAIL_XMLREADERDLLAPI_HXX
-
-#include "sal/config.h"
-
-#include "sal/types.h"
-
-#if defined OOO_DLLIMPLEMENTATION_XMLREADER
-#define OOO_DLLPUBLIC_XMLREADER SAL_DLLPUBLIC_EXPORT
-#else
-#define OOO_DLLPUBLIC_XMLREADER SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlreader/inc/xmlreader/pad.hxx b/xmlreader/inc/xmlreader/pad.hxx
deleted file mode 100644
index 0b8e1f3b7453..000000000000
--- a/xmlreader/inc/xmlreader/pad.hxx
+++ /dev/null
@@ -1,53 +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 .
- */
-
-#ifndef INCLUDED_XMLREADER_PAD_HXX
-#define INCLUDED_XMLREADER_PAD_HXX
-
-#include "sal/config.h"
-
-#include "rtl/strbuf.hxx"
-#include "sal/types.h"
-#include "xmlreader/detail/xmlreaderdllapi.hxx"
-#include "xmlreader/span.hxx"
-
-namespace xmlreader {
-
-class OOO_DLLPUBLIC_XMLREADER Pad {
-public:
-    void add(char const * begin, sal_Int32 length);
-
-    void addEphemeral(char const * begin, sal_Int32 length);
-
-    void clear();
-
-    Span get() const;
-
-private:
-    SAL_DLLPRIVATE void flushSpan();
-
-    Span span_;
-    OStringBuffer buffer_;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlreader/inc/xmlreader/span.hxx b/xmlreader/inc/xmlreader/span.hxx
deleted file mode 100644
index 4f3e4d1c285d..000000000000
--- a/xmlreader/inc/xmlreader/span.hxx
+++ /dev/null
@@ -1,79 +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 .
- */
-
-#ifndef INCLUDED_XMLREADER_SPAN_HXX
-#define INCLUDED_XMLREADER_SPAN_HXX
-
-#include "sal/config.h"
-
-#include "rtl/string.hxx"
-#include "rtl/stringutils.hxx"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "xmlreader/detail/xmlreaderdllapi.hxx"
-
-namespace xmlreader {
-
-struct OOO_DLLPUBLIC_XMLREADER Span {
-    char const * begin;
-    sal_Int32 length;
-
-    inline Span(): begin(0), length(0) {}
-        // init length to avoid compiler warnings
-
-    inline Span(char const * theBegin, sal_Int32 theLength):
-        begin(theBegin), length(theLength) {}
-
-    inline void clear() throw() { begin = 0; }
-
-    inline bool is() const { return begin != 0; }
-
-    inline bool equals(Span const & text) const {
-        return rtl_str_compare_WithLength(
-            begin, length, text.begin, text.length) == 0;
-    }
-
-    inline bool equals(char const * textBegin, sal_Int32 textLength) const {
-        return equals(Span(textBegin, textLength));
-    }
-
-    inline bool equals(OString const & text) const {
-        return rtl_str_compare_WithLength(
-            begin, length, text.getStr(), text.getLength()) == 0;
-    }
-
-    /**
-     @overload
-     This function accepts an ASCII string literal as its argument.
-    */
-    template< typename T > bool
-    equals( T& literal, typename rtl::internal::ConstCharArrayDetector< T, rtl::internal::Dummy >::Type = rtl::internal::Dummy() ) SAL_THROW(())
-    {
-        assert( strlen( literal ) == rtl::internal::ConstCharArrayDetector< T >::size - 1 );
-        return rtl_str_compare_WithLength( begin, length, literal, rtl::internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
-    }
-
-    OUString convertFromUtf8() const;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlreader/inc/xmlreader/xmlreader.hxx b/xmlreader/inc/xmlreader/xmlreader.hxx
deleted file mode 100644
index 90770a9432da..000000000000
--- a/xmlreader/inc/xmlreader/xmlreader.hxx
+++ /dev/null
@@ -1,193 +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 .
- */
-
-#ifndef INCLUDED_XMLREADER_XMLREADER_HXX
-#define INCLUDED_XMLREADER_XMLREADER_HXX
-
-#include "sal/config.h"
-
-#include <stack>
-#include <vector>
-
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/container/NoSuchElementException.hpp"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "osl/file.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "xmlreader/detail/xmlreaderdllapi.hxx"
-#include "xmlreader/pad.hxx"
-#include "xmlreader/span.hxx"
-
-namespace xmlreader {
-
-class OOO_DLLPUBLIC_XMLREADER XmlReader: private boost::noncopyable {
-public:
-    explicit XmlReader(OUString const & fileUrl)
-        SAL_THROW((
-            com::sun::star::container::NoSuchElementException,
-            com::sun::star::uno::RuntimeException));
-
-    ~XmlReader();
-
-    enum { NAMESPACE_NONE = -2, NAMESPACE_UNKNOWN = -1, NAMESPACE_XML = 0 };
-
-    enum Text { TEXT_NONE, TEXT_RAW, TEXT_NORMALIZED };
-
-    enum Result { RESULT_BEGIN, RESULT_END, RESULT_TEXT, RESULT_DONE };
-
-    int registerNamespaceIri(Span const & iri);
-
-    // RESULT_BEGIN: data = localName, ns = ns
-    // RESULT_END: data, ns unused
-    // RESULT_TEXT: data = text, ns unused
-    Result nextItem(Text reportText, Span * data, int * nsId);
-
-    bool nextAttribute(int * nsId, Span * localName);
-
-    // the span returned by getAttributeValue is only valid until the next call
-    // to nextItem or getAttributeValue
-    Span getAttributeValue(bool fullyNormalize);
-
-    int getNamespaceId(Span const & prefix) const;
-
-    OUString getUrl() const;
-
-private:
-    typedef std::vector< Span > NamespaceIris;
-
-    // If NamespaceData (and similarly ElementData and AttributeData) is made
-    // SAL_DLLPRIVATE, at least gcc 4.2.3 erroneously warns about
-    // "'xmlreader::XmlReader' declared with greater visibility than the type of
-    // its field 'xmlreader::XmlReader::namespaces_'" (and similarly for
-    // elements_ and attributes_):
-
-    struct NamespaceData {
-        Span prefix;
-        int nsId;
-
-        NamespaceData() {}
-
-        NamespaceData(Span const & thePrefix, int theNsId):
-            prefix(thePrefix), nsId(theNsId) {}
-    };
-
-    typedef std::vector< NamespaceData > NamespaceList;
-
-    struct ElementData {
-        Span name;
-        NamespaceList::size_type inheritedNamespaces;
-        int defaultNamespaceId;
-
-        ElementData(
-            Span const & theName,
-            NamespaceList::size_type theInheritedNamespaces,
-            int theDefaultNamespaceId):
-            name(theName), inheritedNamespaces(theInheritedNamespaces),
-            defaultNamespaceId(theDefaultNamespaceId)
-        {}
-    };
-
-    typedef std::stack< ElementData > ElementStack;
-
-    struct AttributeData {
-        char const * nameBegin;
-        char const * nameEnd;
-        char const * nameColon;
-        char const * valueBegin;
-        char const * valueEnd;
-
-        AttributeData(
-            char const * theNameBegin, char const * theNameEnd,
-            char const * theNameColon, char const * theValueBegin,
-            char const * theValueEnd):
-            nameBegin(theNameBegin), nameEnd(theNameEnd),
-            nameColon(theNameColon), valueBegin(theValueBegin),
-            valueEnd(theValueEnd)
-        {}
-    };
-
-    typedef std::vector< AttributeData > Attributes;
-
-    enum State {
-        STATE_CONTENT, STATE_START_TAG, STATE_END_TAG, STATE_EMPTY_ELEMENT_TAG,
-        STATE_DONE };
-
-    SAL_DLLPRIVATE inline char read() { return pos_ == end_ ? '\0' : *pos_++; }
-
-    SAL_DLLPRIVATE inline char peek() { return pos_ == end_ ? '\0' : *pos_; }
-
-    SAL_DLLPRIVATE void normalizeLineEnds(Span const & text);
-
-    SAL_DLLPRIVATE void skipSpace();
-
-    SAL_DLLPRIVATE bool skipComment();
-
-    SAL_DLLPRIVATE void skipProcessingInstruction();
-
-    SAL_DLLPRIVATE void skipDocumentTypeDeclaration();
-
-    SAL_DLLPRIVATE Span scanCdataSection();
-
-    SAL_DLLPRIVATE bool scanName(char const ** nameColon);
-
-    SAL_DLLPRIVATE int scanNamespaceIri(
-        char const * begin, char const * end);
-
-    SAL_DLLPRIVATE char const * handleReference(
-        char const * position, char const * end);
-
-    SAL_DLLPRIVATE Span handleAttributeValue(
-        char const * begin, char const * end, bool fullyNormalize);
-
-    SAL_DLLPRIVATE Result handleStartTag(int * nsId, Span * localName);
-
-    SAL_DLLPRIVATE Result handleEndTag();
-
-    SAL_DLLPRIVATE void handleElementEnd();
-
-    SAL_DLLPRIVATE Result handleSkippedText(Span * data, int * nsId);
-
-    SAL_DLLPRIVATE Result handleRawText(Span * text);
-
-    SAL_DLLPRIVATE Result handleNormalizedText(Span * text);
-
-    SAL_DLLPRIVATE int toNamespaceId(NamespaceIris::size_type pos);
-
-    OUString fileUrl_;
-    oslFileHandle fileHandle_;
-    sal_uInt64 fileSize_;
-    void * fileAddress_;
-    NamespaceIris namespaceIris_;
-    NamespaceList namespaces_;
-    ElementStack elements_;
-    char const * pos_;
-    char const * end_;
-    State state_;
-    Attributes attributes_;
-    Attributes::iterator currentAttribute_;
-    bool firstAttribute_;
-    Pad pad_;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */