From 3be786451b6a9accc46a08f0aed4f8d5a8794ffe Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 16 Jun 2012 06:58:09 -0500 Subject: gbuildification of sax Change-Id: I6e8220e88566e04b20687d54181205d31ec68e13 --- sax/inc/sax/dllapi.h | 42 -------------------------------------- sax/inc/sax/fastattribs.hxx | 2 +- sax/inc/sax/fshelper.hxx | 1 - sax/inc/sax/parser/saxparser.hxx | 1 - sax/inc/sax/saxdllapi.h | 42 ++++++++++++++++++++++++++++++++++++++ sax/inc/sax/tools/attributemap.hxx | 2 -- sax/inc/sax/tools/saxobject.hxx | 2 +- sax/inc/sax/tools/tokenmap.hxx | 1 - 8 files changed, 44 insertions(+), 49 deletions(-) delete mode 100644 sax/inc/sax/dllapi.h create mode 100644 sax/inc/sax/saxdllapi.h (limited to 'sax/inc') diff --git a/sax/inc/sax/dllapi.h b/sax/inc/sax/dllapi.h deleted file mode 100644 index 1e4904718776..000000000000 --- a/sax/inc/sax/dllapi.h +++ /dev/null @@ -1,42 +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 INCLUDED_SAX_DLLAPI_H -#define INCLUDED_SAX_DLLAPI_H - -#include "sal/types.h" - -#if defined SAX_DLLIMPLEMENTATION -#define SAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define SAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sax/inc/sax/fastattribs.hxx b/sax/inc/sax/fastattribs.hxx index 6759b58c1c74..1db74e12cc0d 100644 --- a/sax/inc/sax/fastattribs.hxx +++ b/sax/inc/sax/fastattribs.hxx @@ -35,7 +35,7 @@ #include #include -#include "sax/dllapi.h" +#include "sax/saxdllapi.h" #include #include diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx index 73d04eb9560c..9278081ebe4f 100644 --- a/sax/inc/sax/fshelper.hxx +++ b/sax/inc/sax/fshelper.hxx @@ -35,7 +35,6 @@ #include #include #include -#include "sax/dllapi.h" #define FSNS(namespc, element) ((namespc << 16) | element) const sal_Int32 FSEND = -1; // same as XML_TOKEN_INVALID diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx index 16bd1a3446e3..d8235dfebd40 100644 --- a/sax/inc/sax/parser/saxparser.hxx +++ b/sax/inc/sax/parser/saxparser.hxx @@ -29,7 +29,6 @@ #ifndef _SAX_SAXPARSER_HXX_ #define _SAX_SAXPARSER_HXX_ -#include "sax/dllapi.h" #include #include #include diff --git a/sax/inc/sax/saxdllapi.h b/sax/inc/sax/saxdllapi.h new file mode 100644 index 000000000000..7602424c1fdf --- /dev/null +++ b/sax/inc/sax/saxdllapi.h @@ -0,0 +1,42 @@ +/* -*- 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 INCLUDED_SAX_DLLAPI_H +#define INCLUDED_SAX_DLLAPI_H + +#include + +#if defined SAX_DLLIMPLEMENTATION +#define SAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sax/inc/sax/tools/attributemap.hxx b/sax/inc/sax/tools/attributemap.hxx index 7a867c932a9d..579356ea8c5a 100644 --- a/sax/inc/sax/tools/attributemap.hxx +++ b/sax/inc/sax/tools/attributemap.hxx @@ -29,8 +29,6 @@ #ifndef _SAX_ATTRIBUTEMAP_HXX_ #define _SAX_ATTRIBUTEMAP_HXX_ -#include "sax/dllapi.h" - #include #include "sax/tools/tokenmap.hxx" diff --git a/sax/inc/sax/tools/saxobject.hxx b/sax/inc/sax/tools/saxobject.hxx index ee72ceeac983..4a1fba477bc9 100644 --- a/sax/inc/sax/tools/saxobject.hxx +++ b/sax/inc/sax/tools/saxobject.hxx @@ -30,7 +30,7 @@ #define _SAX_OBJECT_HXX_ #include -#include "sax/dllapi.h" +#include "sax/saxdllapi.h" namespace sax { diff --git a/sax/inc/sax/tools/tokenmap.hxx b/sax/inc/sax/tools/tokenmap.hxx index 8749a6587b1c..71704f092a09 100644 --- a/sax/inc/sax/tools/tokenmap.hxx +++ b/sax/inc/sax/tools/tokenmap.hxx @@ -31,7 +31,6 @@ #include #include -#include "sax/dllapi.h" #include "sax/tools/saxobject.hxx" namespace sax -- cgit