execute move of global headers

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

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a

5 files changed, 0 insertions, 180 deletions

diff --git a/package/Module_package.mk b/package/Module_package.mk
index 0ed480bd415e..1943546c0e9f 100644
--- a/package/Module_package.mk
+++ b/package/Module_package.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,package,\
 	Library_package2 \
 	Library_xstor \
 	Package_dtd \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/package/Package_inc.mk b/package/Package_inc.mk
deleted file mode 100644
index f85f4322d1bd..000000000000
--- a/package/Package_inc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,package_inc,$(SRCDIR)/package/inc))
-
-$(eval $(call gb_Package_add_file,package_inc,inc/package/Deflater.hxx,package/Deflater.hxx))
-$(eval $(call gb_Package_add_file,package_inc,inc/package/Inflater.hxx,package/Inflater.hxx))
-$(eval $(call gb_Package_add_file,package_inc,inc/package/packagedllapi.hxx,package/packagedllapi.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/package/inc/package/Deflater.hxx b/package/inc/package/Deflater.hxx
deleted file mode 100644
index 7531e3a1ac66..000000000000
--- a/package/inc/package/Deflater.hxx
+++ /dev/null
@@ -1,65 +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 _DEFLATER_HXX_
-#define _DEFLATER_HXX_
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include "packagedllapi.hxx"
-
-struct z_stream_s;
-
-namespace ZipUtils {
-
-class DLLPUBLIC_PACKAGE Deflater
-{
-    typedef struct z_stream_s z_stream;
-
-protected:
-    com::sun::star::uno::Sequence< sal_Int8 > sInBuffer;
-    sal_Bool                bFinish;
-    sal_Bool                bFinished;
-    sal_Bool                bSetParams;
-    sal_Int32               nLevel, nStrategy;
-    sal_Int64               nOffset, nLength;
-    z_stream*               pStream;
-
-    void init (sal_Int32 nLevel, sal_Int32 nStrategy, sal_Bool bNowrap);
-    sal_Int32 doDeflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
-
-public:
-    ~Deflater();
-    Deflater(sal_Int32 nSetLevel, sal_Bool bNowrap);
-    void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
-    void SAL_CALL setLevel( sal_Int32 nNewLevel );
-    sal_Bool SAL_CALL needsInput(  );
-    void SAL_CALL finish(  );
-    sal_Bool SAL_CALL finished(  );
-    sal_Int32 SAL_CALL doDeflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
-    sal_Int64 SAL_CALL getTotalIn(  );
-    sal_Int64 SAL_CALL getTotalOut(  );
-    void SAL_CALL reset(  );
-    void SAL_CALL end(  );
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/package/Inflater.hxx b/package/inc/package/Inflater.hxx
deleted file mode 100644
index 284451750e43..000000000000
--- a/package/inc/package/Inflater.hxx
+++ /dev/null
@@ -1,57 +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 _INFLATER_HXX_
-#define _INFLATER_HXX_
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include "packagedllapi.hxx"
-
-struct z_stream_s;
-
-namespace ZipUtils {
-
-class DLLPUBLIC_PACKAGE Inflater
-{
-    typedef struct z_stream_s z_stream;
-
-protected:
-    sal_Bool                bFinish, bFinished, bSetParams, bNeedDict;
-    sal_Int32               nOffset, nLength, nLastInflateError;
-    z_stream*               pStream;
-    com::sun::star::uno::Sequence < sal_Int8 >  sInBuffer;
-    sal_Int32   doInflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
-
-public:
-    Inflater(sal_Bool bNoWrap = sal_False);
-    ~Inflater();
-    void SAL_CALL setInput( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer );
-    sal_Bool SAL_CALL needsDictionary(  );
-    sal_Bool SAL_CALL finished(  );
-    sal_Int32 SAL_CALL doInflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
-    void SAL_CALL end(  );
-
-    sal_Int32 getLastInflateError() { return nLastInflateError; }
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/package/packagedllapi.hxx b/package/inc/package/packagedllapi.hxx
deleted file mode 100644
index 72a3dab60f07..000000000000
--- a/package/inc/package/packagedllapi.hxx
+++ /dev/null
@@ -1,22 +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/.
- */
-#ifndef INCLUDED_PACKAGEDLLAPI_H
-#define INCLUDED_PACKAGEDLLAPI_H
-
-#include "sal/types.h"
-
-#if defined(DLLIMPLEMENTATION_PACKAGE)
-#define DLLPUBLIC_PACKAGE  SAL_DLLPUBLIC_EXPORT
-#else
-#define DLLPUBLIC_PACKAGE  SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif /* INCLUDED_PACKAGEDLLAPI_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */