diff options
Diffstat (limited to 'package/inc')
-rw-r--r-- | package/inc/ZipFile.hxx | 2 | ||||
-rw-r--r-- | package/inc/ZipOutputStream.hxx | 2 | ||||
-rw-r--r-- | package/inc/makefile.mk | 47 | ||||
-rw-r--r-- | package/inc/package/Deflater.hxx (renamed from package/inc/Deflater.hxx) | 0 | ||||
-rw-r--r-- | package/inc/package/Inflater.hxx (renamed from package/inc/Inflater.hxx) | 0 | ||||
-rw-r--r-- | package/inc/package/packagedllapi.hxx (renamed from package/inc/packagedllapi.hxx) | 0 |
6 files changed, 2 insertions, 49 deletions
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 05186c0abccf..bb348f3c3262 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -35,9 +35,9 @@ #include <com/sun/star/xml/crypto/XCipherContext.hpp> #include <com/sun/star/xml/crypto/XDigestContext.hpp> +#include <package/Inflater.hxx> #include <ByteGrabber.hxx> #include <HashMaps.hxx> -#include <Inflater.hxx> #include <EncryptionData.hxx> #include <mutexholder.hxx> diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index b5d6ee8b54f2..abd5efc31249 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -34,8 +34,8 @@ #include <com/sun/star/xml/crypto/XCipherContext.hpp> #include <com/sun/star/xml/crypto/XDigestContext.hpp> +#include <package/Deflater.hxx> #include <ByteChucker.hxx> -#include <Deflater.hxx> #include <CRC32.hxx> #include <vector> diff --git a/package/inc/makefile.mk b/package/inc/makefile.mk deleted file mode 100644 index 19d89678b0ae..000000000000 --- a/package/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 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. -# -#************************************************************************* -PRJ=.. - -PRJNAME=package -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/package/inc/Deflater.hxx b/package/inc/package/Deflater.hxx index 6c1cf4456d30..6c1cf4456d30 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/package/Deflater.hxx diff --git a/package/inc/Inflater.hxx b/package/inc/package/Inflater.hxx index f5241df133d2..f5241df133d2 100644 --- a/package/inc/Inflater.hxx +++ b/package/inc/package/Inflater.hxx diff --git a/package/inc/packagedllapi.hxx b/package/inc/package/packagedllapi.hxx index 41e8efa4dae4..41e8efa4dae4 100644 --- a/package/inc/packagedllapi.hxx +++ b/package/inc/package/packagedllapi.hxx |