diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 00:40:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 12:02:38 +0000 |
| commit | 80b0a3a7b647b3d60379344a37a5f9b15a2bbfe9 (patch) | |
| tree | f417692b42e7caa5a2834eccc8038b35f79df0e4 /writerfilter | |
| parent | 18a48b7489650c7addef4c64b7c5b6985a3c68fe (diff) | |
fold i18npaper into i18nutil
It's too small to justify standalone existence.
We can accumulate i18n things we link to directly into
i18nutil and rework i18npool uno implementions in terms
of thin wrappers over i18nutil and prefer linking to
i18nutil internally and leave the uno forwarders for
use by external components and scripting
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/Library_ooxml.mk | 2 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
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> |