[Libreoffice-commits] core.git: desktop/source i18npool/source include/svtools include/unotools vcl/inc writerfilter/source

[Jochen Nitschke]

 desktop/source/deployment/gui/dp_gui_service.cxx      |    1 -
 i18npool/source/textconversion/textconversionImpl.cxx |    1 -
 include/svtools/DocumentInfoPreview.hxx               |    1 -
 include/unotools/pathoptions.hxx                      |    2 +-
 vcl/inc/fontattributes.hxx                            |    1 -
 vcl/inc/impfontmetricdata.hxx                         |    2 ++
 writerfilter/source/dmapper/TextEffectsHandler.hxx    |    1 -
 writerfilter/source/dmapper/ThemeTable.cxx            |    1 +
 writerfilter/source/dmapper/ThemeTable.hxx            |    2 +-
 9 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit d880df3a44497cdec49017538a9d38d48e543bad
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Thu May 18 17:44:09 2017 +0200

    remove unused languagetag.hxx includes
    
    and fix the fallout
    
    Change-Id: I8f59944bcc01a8e2ab371808c40eaf9b5198c143
    Reviewed-on: https://gerrit.libreoffice.org/37785
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 77e6d5c74d03..1673d46ef63f 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -28,7 +28,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <comphelper/unwrapargs.hxx>
-#include <i18nlangtag/languagetag.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index ea15b1088cc8..4451a291249d 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -22,7 +22,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <textconversionImpl.hxx>
 #include <localedata.hxx>
-#include <i18nlangtag/languagetag.hxx>
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index f071fdaf568f..aa58ebc42bda 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -23,7 +23,6 @@
 #include <memory>
 #include <sal/config.h>
 
-#include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <svtools/svtdllapi.h>
 #include <tools/wintypes.hxx>
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index cc86e04e5926..37e172632298 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
 
+#include <rtl/ustring.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <i18nlangtag/languagetag.hxx>
 #include <unotools/options.hxx>
 
 #define SVT_SEARCHPATH_DELIMITER      ';'
diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index 9b3cc7f65363..83b68f89464b 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_FONTATTRIBUTES_HXX
 
 #include <rtl/ustring.hxx>
-#include <i18nlangtag/languagetag.hxx>
 #include <vcl/vclenum.hxx>
 
 
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 40ff182d64ae..c3865ce06018 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -24,6 +24,8 @@
 #include <tools/ref.hxx>
 #include "fontattributes.hxx"
 
+#include <vector>
+
 class ImplFontMetricData;
 typedef tools::SvRef<ImplFontMetricData> ImplFontMetricDataRef;
 
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 31984efabed2..6ec17f59aeea 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -15,7 +15,6 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <i18nlangtag/languagetag.hxx>
 
 #include <PropertyIds.hxx>
 
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index c66777f16651..9fec626f3085 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <ThemeTable.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <ooxml/resourceids.hxx>
 
 using namespace com::sun::star;
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 5965e7c42e02..7115f3b44da2 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -23,7 +23,7 @@
 #include "LoggedResources.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/lang.h>
 #include <map>
 #include <memory>