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

10 files changed, 2 insertions, 10 deletions

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>