convert i18npool to gbuild

4 files changed, 21 insertions, 62 deletions

diff --git a/i18npool/inc/i18npool/i18npooldllapi.h b/i18npool/inc/i18npool/i18npooldllapi.h
index e188a1de2fb5..eb38e89b8744 100644
--- a/i18npool/inc/i18npool/i18npooldllapi.h
+++ b/i18npool/inc/i18npool/i18npooldllapi.h
@@ -31,12 +31,19 @@
 
 #include "sal/types.h"
 
-#if defined(I18NPOOL_DLLIMPLEMENTATION)
-#define I18NPOOL_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#if defined(I18NPAPER_DLLIMPLEMENTATION)
+#define I18NPAPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else
-#define I18NPOOL_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#define I18NPAPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
-#define I18NPOOL_DLLPRIVATE SAL_DLLPRIVATE
+#define I18NPAPER_DLLPRIVATE SAL_DLLPRIVATE
+
+#if defined(I18NISOLANG_DLLIMPLEMENTATION)
+#define I18NISOLANG_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define I18NISOLANG_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define I18NISOLANG_DLLPRIVATE SAL_DLLPRIVATE
 
 #endif /* INCLUDED_I18NPOOL_I18NPOOLDLLAPI_H */
 
diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx
index a38ccdfd68c1..717a5bb52c74 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX
-#define INCLUDED_I18NPOOL_MSLANGID_HXX
+#ifndef INCLUDED_I18NISOLANG_MSLANGID_HXX
+#define INCLUDED_I18NISOLANG_MSLANGID_HXX
 
 #include <sal/config.h>
 
@@ -38,7 +38,7 @@
 
 /** Methods related to Microsoft language IDs. For details about MS-LANGIDs
     please see lang.h */
-class I18NPOOL_DLLPUBLIC MsLangId
+class I18NISOLANG_DLLPUBLIC MsLangId
 {
 public:
 
@@ -251,14 +251,14 @@ private:
 
     // Substitute LANGUAGE_SYSTEM for LANGUAGE_SYSTEM_DEFAULT and
     // LANGUAGE_PROCESS_OR_USER_DEFAULT, other values aren't touched.
-    I18NPOOL_DLLPRIVATE static inline LanguageType simplifySystemLanguages( LanguageType nLang );
+    I18NISOLANG_DLLPRIVATE static inline LanguageType simplifySystemLanguages( LanguageType nLang );
 
     // Several locale lookups with fall-back
-    I18NPOOL_DLLPRIVATE static LanguageType lookupFallbackLanguage( LanguageType nLang );
-    I18NPOOL_DLLPRIVATE static LanguageType lookupFallbackLanguage(
+    I18NISOLANG_DLLPRIVATE static LanguageType lookupFallbackLanguage( LanguageType nLang );
+    I18NISOLANG_DLLPRIVATE static LanguageType lookupFallbackLanguage(
             const ::com::sun::star::lang::Locale & rLocale );
-    I18NPOOL_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale( LanguageType nLang );
-    I18NPOOL_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale(
+    I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale( LanguageType nLang );
+    I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale lookupFallbackLocale(
             const ::com::sun::star::lang::Locale & rLocale );
 };
 
@@ -276,6 +276,6 @@ inline LanguageType MsLangId::getSystemUILanguage()
     return getPlatformSystemUILanguage();
 }
 
-#endif // INCLUDED_I18NPOOL_MSLANGID_HXX
+#endif // INCLUDED_I18NISOLANG_MSLANGID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx
index ad95e0db8cc8..ed8396e1842c 100644
--- a/i18npool/inc/i18npool/paper.hxx
+++ b/i18npool/inc/i18npool/paper.hxx
@@ -128,7 +128,7 @@ enum Paper
 // - Paper -
 // ---------
 
-class I18NPOOL_DLLPUBLIC PaperInfo
+class I18NPAPER_DLLPUBLIC PaperInfo
 {
     Paper m_eType;
     long m_nPaperWidth;     // width in 100thMM
diff --git a/i18npool/inc/makefile.mk b/i18npool/inc/makefile.mk
deleted file mode 100644
index 3195ab22fbaf..000000000000
--- a/i18npool/inc/makefile.mk
+++ /dev/null
@@ -1,48 +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=i18npool
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-