diff options
33 files changed, 27 insertions, 95 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 72be0719ecd6..cbd016bfb960 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ cppu \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmfwk \ sal \ diff --git a/Repository.mk b/Repository.mk index cdc26da1cb6d..72c2f5ca7c97 100644 --- a/Repository.mk +++ b/Repository.mk @@ -221,7 +221,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ helplinker \ hwp \ hyphen \ - i18npaper \ i18nregexp \ icd \ icg \ diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index b1111cecf055..da59f2910caa 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -38,7 +38,7 @@ #include <svx/pagectrl.hxx> #include <svx/frmdirlbox.hxx> #include <editeng/svxenum.hxx> -#include <i18npool/paper.hxx> +#include <i18nutil/paper.hxx> #include <svx/flagsdef.hxx> // class SvxPageDescPage ------------------------------------------------- diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h index 6d5821fdc5ea..c394eb181a20 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -31,8 +31,8 @@ // define ---------------------------------------------------------------- //!! the values of the following defines must correspond to the array position -//!! of the respective paper size in the file i18npool/source/paper/paper.cxx -//!! There are enums for them in i18npool/inc/i18npool/paper.hxx but unfortunately +//!! of the respective paper size in the file i18nutil/source/utility/paper.cxx +//!! There are enums for them in i18npool/inc/i18nutil/paper.hxx but unfortunately //!! the resource compiler does not understand enums, thus the enum values need //!! to be duplicated here for use in the src file. #define PAPERSIZE_A0 0 diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index e42cae544d06..9edbdb09f6f9 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -51,7 +51,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,editeng_borderline, \ sal \ salhelper \ i18nisolang1 \ - i18npaper \ + i18nutil \ $(gb_STDLIBS) \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 5075872826aa..c0c55443fc9c 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -151,7 +151,7 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ sal \ salhelper \ i18nisolang1 \ - i18npaper \ + i18nutil \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18npaper.mk b/i18npool/Library_i18npaper.mk deleted file mode 100644 index 88813abf1901..000000000000 --- a/i18npool/Library_i18npaper.mk +++ /dev/null @@ -1,57 +0,0 @@ -# -*- Mode: makefile-gmake; 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_Library_Library,i18npaper)) - -$(eval $(call gb_Library_add_package_headers,i18npaper,i18npool_inc)) - -$(eval $(call gb_Library_set_include,i18npaper,\ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_add_api,i18npaper,\ - udkapi \ - offapi \ -)) - -$(eval $(call gb_Library_add_defs,i18npaper,\ - -DI18NPAPER_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,i18npaper,\ - comphelper \ - cppu \ - sal \ - $(gb_STDLIBS) \ -)) - -$(eval $(call gb_Library_add_exception_objects,i18npaper,\ - i18npool/source/paper/paper \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 3cd75e3dc4f7..3a90cef00e3c 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,i18npool,\ Library_dict_ja \ Library_dict_zh \ Library_i18nisolang1 \ - Library_i18npaper \ Library_i18npool \ Library_i18nsearch \ Library_index_data \ diff --git a/i18npool/Package_inc.mk b/i18npool/Package_inc.mk index 7d7fec126197..9fd2f203822f 100644 --- a/i18npool/Package_inc.mk +++ b/i18npool/Package_inc.mk @@ -33,6 +33,5 @@ $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/version.mk,../versio $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/i18npooldllapi.h,i18npool/i18npooldllapi.h)) $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/lang.h,i18npool/lang.h)) $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/mslangid.hxx,i18npool/mslangid.hxx)) -$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/paper.hxx,i18npool/paper.hxx)) # vim: set noet sw=4 ts=4: diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index a05c3d017f89..990b1cafe314 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,i18nutil,\ $(eval $(call gb_Library_add_exception_objects,i18nutil,\ i18nutil/source/utility/casefolding \ i18nutil/source/utility/oneToOneMapping \ + i18nutil/source/utility/paper \ i18nutil/source/utility/scripttypedetector \ i18nutil/source/utility/unicode \ i18nutil/source/utility/widthfolding \ diff --git a/i18nutil/Package_inc.mk b/i18nutil/Package_inc.mk index 3ea2b55d46be..f72180e36bdc 100644 --- a/i18nutil/Package_inc.mk +++ b/i18nutil/Package_inc.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Package_Package,i18nutil_inc,$(SRCDIR)/i18nutil/inc)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/i18nutildllapi.h,i18nutil/i18nutildllapi.h)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/casefolding.hxx,i18nutil/casefolding.hxx)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/oneToOneMapping.hxx,i18nutil/oneToOneMapping.hxx)) +$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/paper.hxx,i18nutil/paper.hxx)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/scripttypedetector.hxx,i18nutil/scripttypedetector.hxx)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/unicode.hxx,i18nutil/unicode.hxx)) $(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/widthfolding.hxx,i18nutil/widthfolding.hxx)) diff --git a/i18nutil/README b/i18nutil/README new file mode 100644 index 000000000000..6839c5d85be7 --- /dev/null +++ b/i18nutil/README @@ -0,0 +1,4 @@ +i18nutil is internalization related utilties + +It comprises of honest c++ code which you just link to directly, while i18npool +tends to consist of code you interact with via uno. diff --git a/i18npool/inc/i18npool/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx index ed8396e1842c..d5be9ec0bca4 100644 --- a/i18npool/inc/i18npool/paper.hxx +++ b/i18nutil/inc/i18nutil/paper.hxx @@ -26,12 +26,10 @@ * ************************************************************************/ -#ifndef INCLUDED_I18NPOOL_PAPER_HXX -#define INCLUDED_I18NPOOL_PAPER_HXX +#ifndef INCLUDED_I18NUTIL_PAPER_HXX +#define INCLUDED_I18NUTIL_PAPER_HXX -#include <sal/config.h> - -#include "i18npool/i18npooldllapi.h" +#include "i18nutildllapi.h" #include <rtl/string.hxx> #include <com/sun/star/lang/Locale.hpp> @@ -128,7 +126,7 @@ enum Paper // - Paper - // --------- -class I18NPAPER_DLLPUBLIC PaperInfo +class I18NUTIL_DLLPUBLIC PaperInfo { Paper m_eType; long m_nPaperWidth; // width in 100thMM @@ -152,6 +150,6 @@ public: static long sloppyFitPageDimension(long nDimension); }; -#endif // INCLUDED_I18NPOOL_PAPER_HXX +#endif // INCLUDED_I18NUTIL_PAPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/paper/paper.cxx b/i18nutil/source/utility/paper.cxx index d9e2f47ef618..63b5cff2a93d 100644 --- a/i18npool/source/paper/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include "i18npool/paper.hxx" +#include "i18nutil/paper.hxx" #include <utility> #include <cstdlib> diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 16f05622c760..32be9b883db6 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -38,7 +38,7 @@ #include <ooo/vba/excel/XlPageOrientation.hpp> #include <ooo/vba/excel/XlOrder.hpp> #include <ooo/vba/excel/Constants.hpp> -#include <i18npool/paper.hxx> +#include <i18nutil/paper.hxx> #include <editeng/paperinf.hxx> #include <ooo/vba/excel/XlPaperSize.hpp> #include <sal/macros.h> diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 0e164f40725c..55bf2bfd5a6e 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -69,7 +69,6 @@ ICUDATALIB=-licudata .ENDIF I18NUTILLIB=-li18nutil$(COMID) I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) -I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX) SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION) XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) @@ -359,7 +358,7 @@ UNOTOOLSLIB+=$(UCBHELPERLIB) TOOLSLIB+=$(BASEGFXLIB) TOOLSLIB+=$(ZLIB3RDLIB) -VCLLIB+=$(ICUUCLIB) $(I18NPAPERLIB) +VCLLIB+=$(ICUUCLIB) .ENDIF @@ -385,7 +384,6 @@ ICUUCLIB=icuuc.lib ICUDATALIB=icudt.lib I18NUTILLIB=ii18nutil.lib I18NISOLANGLIB=ii18nisolang.lib -I18NPAPERLIB=ii18npaper.lib I18NREGEXPLIB=ii18nregexp.lib SALHELPERLIB=isalhelper.lib XMLSCRIPTLIB=ixcr.lib diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 3c73abb56c62..24ba9023e3a3 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -54,7 +54,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,starmath_qa_cppunit,\ cppuhelper \ editeng \ i18nisolang1 \ - i18npaper \ + i18nutil \ sal \ sfx \ sot \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index b5d2ea1e6c03..110fa23c1aa2 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_linked_libs,sm,\ cppu \ cppuhelper \ editeng \ - i18npaper \ + i18nutil \ msfilter \ oox \ sal \ diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 34ae144d88a4..93186f55cbd3 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -60,7 +60,6 @@ class SW_DLLPUBLIC SwBreakIt void _GetForbidden( const LanguageType aLang ); void createBreakIterator() const; - void createScriptTypeDetector(); // forbidden and not implemented. SwBreakIt(); diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index bae926505bef..a4357fa04ecb 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -55,7 +55,6 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 3e4aa8a604b7..a1beef24d2f4 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -73,7 +73,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ cppu \ sal \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 4be0bfca52d6..c665284c703b 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -49,7 +49,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index b5a6eb0dadd2..201daa346c86 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 0b859647152f..d35787a6dfb1 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -69,7 +69,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 3f9e66a05495..3735c5c1cbdb 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -63,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 311d86dc5d5e..9d8dfb32f8b8 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index f96109dc461a..8bb14d6a5c5e 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ comphelper \ cppuhelper \ i18nisolang1 \ - i18npaper \ i18nutil \ jvmaccess \ cppu \ diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx index f1c05b52b3f7..e660428bf3c7 100644 --- a/vcl/inc/vcl/prntypes.hxx +++ b/vcl/inc/vcl/prntypes.hxx @@ -30,7 +30,7 @@ #define _SV_PRNTYPES_HXX #include <vcl/sv.h> -#include <i18npool/paper.hxx> +#include <i18nutil/paper.hxx> // --------------- // - Duplex Mode - diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 48b5b0245cbe..d8d6f9b7732c 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -42,7 +42,7 @@ #include "tools/debug.hxx" #include "tools/config.hxx" -#include "i18npool/paper.hxx" +#include "i18nutil/paper.hxx" #include <comphelper/string.hxx> #include "rtl/strbuf.hxx" #include <sal/macros.h> diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk index 5cea5492a8c5..94b1e00661ed 100644 --- a/writerfilter/Library_ooxml.mk +++ b/writerfilter/Library_ooxml.mk @@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,ooxml,\ cppuhelper \ doctok \ i18nisolang1 \ - i18npaper \ + i18nutil \ oox \ resourcemodel \ sal \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index e0c4f88556b6..5fe7556ab88b 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter,\ cppuhelper \ doctok \ i18nisolang1 \ - i18npaper \ + i18nutil \ oox \ ooxml \ rtftok \ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 34c23f71957d..54be38431af8 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -33,7 +33,7 @@ #include <ModelEventListener.hxx> #include <MeasureHandler.hxx> #include <i18npool/mslangid.hxx> -#include <i18npool/paper.hxx> +#include <i18nutil/paper.hxx> #include <ooxml/OOXMLFastTokens.hxx> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp> diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 6230d1b8f812..575730f1bdd3 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -29,7 +29,7 @@ #include <ooxml/resourceids.hxx> #include <DomainMapper_Impl.hxx> #include <ConversionHelper.hxx> -#include <i18npool/paper.hxx> +#include <i18nutil/paper.hxx> #include <rtl/oustringostreaminserter.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> |