From d0c301bba0b483c7ffef83fe93fa9658aa10bd44 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 26 Aug 2011 14:04:17 +0200 Subject: convert package to gbuild --- package/inc/Deflater.hxx | 73 ----------------------------------- package/inc/Inflater.hxx | 65 ------------------------------- package/inc/ZipFile.hxx | 2 +- package/inc/ZipOutputStream.hxx | 2 +- package/inc/makefile.mk | 47 ---------------------- package/inc/package/Deflater.hxx | 73 +++++++++++++++++++++++++++++++++++ package/inc/package/Inflater.hxx | 65 +++++++++++++++++++++++++++++++ package/inc/package/packagedllapi.hxx | 15 +++++++ package/inc/packagedllapi.hxx | 15 ------- 9 files changed, 155 insertions(+), 202 deletions(-) delete mode 100644 package/inc/Deflater.hxx delete mode 100644 package/inc/Inflater.hxx delete mode 100644 package/inc/makefile.mk create mode 100644 package/inc/package/Deflater.hxx create mode 100644 package/inc/package/Inflater.hxx create mode 100644 package/inc/package/packagedllapi.hxx delete mode 100644 package/inc/packagedllapi.hxx (limited to 'package/inc') diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx deleted file mode 100644 index 6c1cf4456d30..000000000000 --- a/package/inc/Deflater.hxx +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _DEFLATER_HXX_ -#define _DEFLATER_HXX_ - -#include -#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_Int32 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_Int32 SAL_CALL getTotalIn( ); - sal_Int32 SAL_CALL getTotalOut( ); - void SAL_CALL reset( ); - void SAL_CALL end( ); -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx deleted file mode 100644 index f5241df133d2..000000000000 --- a/package/inc/Inflater.hxx +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _INFLATER_HXX_ -#define _INFLATER_HXX_ - -#include -#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/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 #include +#include #include #include -#include #include #include 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 #include +#include #include -#include #include #include 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 -# -# 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/package/Deflater.hxx b/package/inc/package/Deflater.hxx new file mode 100644 index 000000000000..6c1cf4456d30 --- /dev/null +++ b/package/inc/package/Deflater.hxx @@ -0,0 +1,73 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _DEFLATER_HXX_ +#define _DEFLATER_HXX_ + +#include +#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_Int32 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_Int32 SAL_CALL getTotalIn( ); + sal_Int32 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 new file mode 100644 index 000000000000..f5241df133d2 --- /dev/null +++ b/package/inc/package/Inflater.hxx @@ -0,0 +1,65 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _INFLATER_HXX_ +#define _INFLATER_HXX_ + +#include +#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 new file mode 100644 index 000000000000..41e8efa4dae4 --- /dev/null +++ b/package/inc/package/packagedllapi.hxx @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#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: */ diff --git a/package/inc/packagedllapi.hxx b/package/inc/packagedllapi.hxx deleted file mode 100644 index 41e8efa4dae4..000000000000 --- a/package/inc/packagedllapi.hxx +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#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: */ -- cgit