[Libreoffice-commits] .: avmedia/source basic/source chart2/source connectivity/source cppu/inc cui/source dbaccess/source drawinglayer/source editeng/source filter/source framework/inc sc/source sd/inc sd/source sfx2/source slideshow/source sot/inc sot/source svx/source sw/inc sw/source unotools/source unoxml/source vcl/source vcl/win xmloff/source xmlsecurity/source
Michael Meeks
michael at kemper.freedesktop.org
Thu Jun 21 11:34:51 PDT 2012
avmedia/source/gstreamer/gstframegrabber.hxx | 2 -
avmedia/source/gstreamer/gstmanager.hxx | 2 -
avmedia/source/gstreamer/gstplayer.hxx | 2 -
avmedia/source/gstreamer/gstwindow.cxx | 2 -
avmedia/source/gstreamer/gstwindow.hxx | 2 -
avmedia/source/quicktime/framegrabber.hxx | 2 -
avmedia/source/quicktime/manager.hxx | 2 -
avmedia/source/quicktime/player.hxx | 2 -
avmedia/source/quicktime/window.hxx | 2 -
avmedia/source/viewer/mediawindow_impl.cxx | 4 +-
avmedia/source/viewer/mediawindowbase_impl.cxx | 2 -
avmedia/source/win/framegrabber.hxx | 2 -
avmedia/source/win/manager.hxx | 2 -
avmedia/source/win/player.hxx | 2 -
avmedia/source/win/window.cxx | 2 -
avmedia/source/win/window.hxx | 2 -
basic/source/runtime/step0.cxx | 2 -
chart2/source/inc/LifeTime.hxx | 2 -
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx | 2 -
cppu/inc/com/sun/star/uno/Reference.hxx | 2 -
cppu/inc/com/sun/star/uno/Type.h | 2 -
cui/source/dialogs/hangulhanjadlg.cxx | 4 +-
dbaccess/source/core/api/datacolumn.hxx | 2 -
dbaccess/source/core/api/resultcolumn.hxx | 2 -
dbaccess/source/ui/control/dbtreelistbox.cxx | 2 -
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2 -
editeng/source/editeng/editview.cxx | 2 -
editeng/source/misc/svxacorr.cxx | 2 -
filter/source/svg/svgfilter.cxx | 20 +++++-----
filter/source/svg/svgfilter.hxx | 4 +-
framework/inc/recording/dispatchrecorder.hxx | 2 -
sc/source/ui/vba/vbarange.cxx | 2 -
sc/source/ui/vba/vbarange.hxx | 4 +-
sd/inc/drawdoc.hxx | 2 -
sd/source/filter/xml/sdxmlwrp.cxx | 2 -
sd/source/ui/tools/IdleDetection.cxx | 2 -
sfx2/source/appl/appuno.cxx | 4 +-
slideshow/source/engine/shapes/viewmediashape.cxx | 2 -
slideshow/source/engine/soundplayer.cxx | 2 -
sot/inc/sot/exchange.hxx | 2 -
sot/source/sdstor/ucbstorage.cxx | 2 -
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4 +-
svx/source/dialog/fntctrl.cxx | 2 -
svx/source/dialog/langbox.cxx | 2 -
svx/source/form/fmundo.cxx | 2 -
svx/source/svdraw/svdotextpathdecomposition.cxx | 4 +-
svx/source/xml/xmlxtimp.cxx | 2 -
sw/inc/breakit.hxx | 2 -
sw/source/core/access/textmarkuphelper.hxx | 6 +--
sw/source/core/attr/hints.cxx | 2 -
sw/source/core/bastyp/breakit.cxx | 2 -
sw/source/core/crsr/callnk.cxx | 2 -
sw/source/core/crsr/swcrsr.cxx | 4 +-
sw/source/core/doc/doc.cxx | 4 +-
sw/source/core/doc/docedt.cxx | 2 -
sw/source/core/doc/docfmt.cxx | 2 -
sw/source/core/doc/docruby.cxx | 4 +-
sw/source/core/docnode/node.cxx | 2 -
sw/source/core/edit/edattr.cxx | 2 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2 -
sw/source/core/text/itradj.cxx | 2 -
sw/source/core/text/itratr.cxx | 2 -
sw/source/core/text/itrform2.cxx | 2 -
sw/source/core/text/porfld.cxx | 2 -
sw/source/core/text/porlay.cxx | 6 +--
sw/source/core/text/pormulti.cxx | 2 -
sw/source/core/text/portxt.cxx | 2 -
sw/source/core/text/redlnitr.cxx | 2 -
sw/source/core/text/txtdrop.cxx | 2 -
sw/source/core/text/txtftn.cxx | 2 -
sw/source/core/txtnode/fmtatr2.cxx | 2 -
sw/source/core/txtnode/fntcache.cxx | 4 +-
sw/source/core/txtnode/fntcap.cxx | 4 +-
sw/source/core/txtnode/swfont.cxx | 2 -
sw/source/core/txtnode/txatritr.cxx | 2 -
sw/source/core/txtnode/txtedt.cxx | 4 +-
sw/source/core/unocore/swunohelper.cxx | 2 -
sw/source/filter/rtf/rtffld.cxx | 2 -
sw/source/filter/ww8/docxattributeoutput.cxx | 2 -
sw/source/filter/ww8/docxexport.cxx | 2 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 -
sw/source/filter/ww8/rtfexport.cxx | 2 -
sw/source/filter/ww8/writerwordglue.cxx | 2 -
sw/source/filter/ww8/wrtw8esh.cxx | 2 -
sw/source/filter/ww8/wrtw8nds.cxx | 2 -
sw/source/filter/ww8/wrtw8num.cxx | 2 -
sw/source/filter/ww8/wrtw8sty.cxx | 2 -
sw/source/filter/ww8/ww8atr.cxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 2 -
sw/source/filter/ww8/ww8par5.cxx | 2 -
sw/source/ui/chrdlg/drpcps.cxx | 2 -
unotools/source/i18n/localedatawrapper.cxx | 2 -
unotools/source/i18n/textsearch.cxx | 2 -
unotools/source/ucbhelper/ucbstreamhelper.cxx | 2 -
unoxml/source/dom/attr.cxx | 2 -
unoxml/source/dom/element.cxx | 2 -
vcl/source/control/imgctrl.cxx | 2 -
vcl/win/source/window/salframe.cxx | 2 -
xmloff/source/style/XMLRectangleMembersHandler.cxx | 2 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 -
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 2 -
101 files changed, 126 insertions(+), 128 deletions(-)
New commits:
commit ec5fa0164b9bae5c5bc6654f581e493206584301
Author: Michael Meeks <michael.meeks at suse.com>
Date: Thu Jun 21 17:39:01 2012 +0100
replace all but one .hdl include with equivalent .hpp includes.
Change-Id: I15e94f112144549692d0c2babeb48c77adcb93a9
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index fc07952..31dc3cf 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -31,7 +31,7 @@
#include "gstcommon.hxx"
-#include "com/sun/star/media/XFrameGrabber.hdl"
+#include "com/sun/star/media/XFrameGrabber.hpp"
namespace avmedia { namespace gstreamer {
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 2d83215..73048f2 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -31,7 +31,7 @@
#include "gstcommon.hxx"
-#include "com/sun/star/media/XManager.hdl"
+#include "com/sun/star/media/XManager.hpp"
// -----------
// - Manager -
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index b5d7d83..aa6c020 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -32,7 +32,7 @@
#include <osl/conditn.hxx>
#include "gstcommon.hxx"
-#include "com/sun/star/media/XPlayer.hdl"
+#include "com/sun/star/media/XPlayer.hpp"
typedef struct _GstXOverlay GstXOverlay;
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 7f569f7..e7809ef 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <com/sun/star/awt/SystemPointer.hdl>
+#include <com/sun/star/awt/SystemPointer.hpp>
#include "gstwindow.hxx"
#include "gstplayer.hxx"
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 18b9a7d..df864ab 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -32,7 +32,7 @@
#include "gstcommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#include "com/sun/star/media/XPlayerWindow.hdl"
+#include "com/sun/star/media/XPlayerWindow.hpp"
namespace avmedia { namespace gstreamer {
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 8fa2b5b..60d7a29 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -31,7 +31,7 @@
#include "quicktimecommon.hxx"
-#include "com/sun/star/media/XFrameGrabber.hdl"
+#include "com/sun/star/media/XFrameGrabber.hpp"
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 8c87496..adab01f 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -31,7 +31,7 @@
#include "quicktimecommon.hxx"
-#include "com/sun/star/media/XManager.hdl"
+#include "com/sun/star/media/XManager.hpp"
// -----------
// - Manager -
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index ec795fd..f110c30 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -32,7 +32,7 @@
#include <osl/conditn.h>
#include "quicktimecommon.hxx"
-#include "com/sun/star/media/XPlayer.hdl"
+#include "com/sun/star/media/XPlayer.hpp"
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index fc54779..a9689c4 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -32,7 +32,7 @@
#include "quicktimecommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#include "com/sun/star/media/XPlayerWindow.hdl"
+#include "com/sun/star/media/XPlayerWindow.hpp"
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 556a599..5e756d2 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -40,8 +40,8 @@
#include <vcl/sysdata.hxx>
#endif
-#include <com/sun/star/awt/SystemPointer.hdl>
-#include <com/sun/star/lang/XComponent.hdl>
+#include <com/sun/star/awt/SystemPointer.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
#define AVMEDIA_TOOLBOXITEM_PREV 0x0001
#define AVMEDIA_TOOLBOXITEM_PLAY 0x0002
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 79e0bdf..69e655b 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -35,7 +35,7 @@
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XComponent.hdl>
+#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/media/XManager.hpp>
#define MEDIA_TIMER_TIMEOUT 100
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 0499a50..1168b32 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -31,7 +31,7 @@
#include "wincommon.hxx"
-#include "com/sun/star/media/XFrameGrabber.hdl"
+#include "com/sun/star/media/XFrameGrabber.hpp"
struct IMediaDet;
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 0dd5262..7a73e32 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -31,7 +31,7 @@
#include "wincommon.hxx"
-#include "com/sun/star/media/XManager.hdl"
+#include "com/sun/star/media/XManager.hpp"
// -----------
// - Manager -
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index debdecc..61adf52 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -31,7 +31,7 @@
#include "wincommon.hxx"
-#include "com/sun/star/media/XPlayer.hdl"
+#include "com/sun/star/media/XPlayer.hpp"
struct IGraphBuilder;
struct IBaseFilter;
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 2ea2221..22d223b 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -38,7 +38,7 @@
#if defined _MSC_VER
#pragma warning(pop)
#endif
-#include <com/sun/star/awt/SystemPointer.hdl>
+#include <com/sun/star/awt/SystemPointer.hpp>
#include "window.hxx"
#include "player.hxx"
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 22a6c29..4d4b83e 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -32,7 +32,7 @@
#include "wincommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#include "com/sun/star/media/XPlayerWindow.hdl"
+#include "com/sun/star/media/XPlayerWindow.hpp"
struct IVideoWindow;
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 69c748b..41e4817 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -38,7 +38,7 @@
#include "sbunoobj.hxx"
#include "image.hxx"
#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/util/SearchOptions.hdl>
+#include <com/sun/star/util/SearchOptions.hpp>
#include <vcl/svapp.hxx>
#include <unotools/textsearch.hxx>
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index bb154c8..b864e62 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -30,7 +30,7 @@
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
-#include <com/sun/star/uno/Exception.hdl>
+#include <com/sun/star/uno/Exception.hpp>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/util/XCloseListener.hpp>
#include <com/sun/star/util/XCloseable.hpp>
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index aeec1a6..2683b15 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
@@ -25,7 +25,7 @@
#include <MNSInclude.hxx>
#include <cppuhelper/compbase1.hxx>
#include <com/sun/star/mozilla/XCodeProxy.hpp>
-#include "com/sun/star/mozilla/XProxyRunner.hdl"
+#include "com/sun/star/mozilla/XProxyRunner.hpp"
namespace connectivity
{
diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx
index b5b4954..100a430 100644
--- a/cppu/inc/com/sun/star/uno/Reference.hxx
+++ b/cppu/inc/com/sun/star/uno/Reference.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hdl>
+#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/genfunc.hxx>
namespace com
diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h
index 0bd732e..1d71910 100644
--- a/cppu/inc/com/sun/star/uno/Type.h
+++ b/cppu/inc/com/sun/star/uno/Type.h
@@ -20,9 +20,7 @@
#define _COM_SUN_STAR_UNO_TYPE_H_
#include <typelib/typedescription.h>
-#ifndef _COM_SUN_STAR_UNO_TYPECLASS_HDL_
#include <com/sun/star/uno/TypeClass.hdl>
-#endif
#include <cppu/macros.hxx>
#include <rtl/ustring.hxx>
#include <rtl/alloc.h>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 2deec05..c66f708 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -40,9 +40,9 @@
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
#include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
-#include <com/sun/star/linguistic2/ConversionDirection.hdl>
+#include <com/sun/star/linguistic2/ConversionDirection.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/TextConversionOption.hdl>
+#include <com/sun/star/i18n/TextConversionOption.hpp>
#include <com/sun/star/util/XFlushable.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index d1c596c..1c17245 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaData.hdl>
+#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <com/sun/star/sdb/XColumn.hpp>
#include <com/sun/star/sdb/XColumnUpdate.hpp>
#include <resultcolumn.hxx>
diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx
index dcaea73..9a6d2a6 100644
--- a/dbaccess/source/core/api/resultcolumn.hxx
+++ b/dbaccess/source/core/api/resultcolumn.hxx
@@ -20,7 +20,7 @@
#ifndef _DBACORE_RESULTCOLUMN_HXX_
#define _DBACORE_RESULTCOLUMN_HXX_
-#include <com/sun/star/sdbc/XResultSetMetaData.hdl>
+#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <column.hxx>
#include <boost/optional.hpp>
namespace dbaccess
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 99ebcae..7e593f0 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -24,7 +24,7 @@
#include "listviewitems.hxx"
#include "callbacks.hxx"
-#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/ui/XContextMenuInterceptor.hpp>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 3cad086..2edb866 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -56,7 +56,7 @@
#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ustring.hxx>
-#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <drawinglayer/primitive2d/controlprimitive2d.hxx>
#include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index dccb777..bd13494 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -65,7 +65,7 @@
#include <osl/file.hxx>
#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/beans/PropertyValues.hdl>
+#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <linguistic/lngprops.hxx>
#include <vcl/settings.hxx>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index bc23e90..5ade810 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -37,7 +37,7 @@
#include <svtools/helpopt.hxx>
#include <svl/urihelper.hxx>
#include <unotools/charclass.hxx>
-#include <com/sun/star/i18n/UnicodeType.hdl>
+#include <com/sun/star/i18n/UnicodeType.hpp>
#include <unotools/collatorwrapper.hxx>
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <com/sun/star/i18n/UnicodeScript.hpp>
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 89ca2c3..33697db 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -33,25 +33,25 @@
#include <uno/environment.h>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawView.hpp>
-#include <com/sun/star/frame/XDesktop.hdl>
-#include <com/sun/star/frame/XController.hdl>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hdl>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/drawing/XDrawSubController.hdl>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/drawing/XDrawSubController.hpp>
#include <com/sun/star/drawing/XDrawSubController.hpp>
-#include <com/sun/star/container/XNamed.hdl>
#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/uno/XComponentContext.hdl>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/drawing/framework/XControllerManager.hdl>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hdl>
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
+#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/XResource.hdl>
#include <com/sun/star/drawing/framework/XResource.hpp>
-#include <com/sun/star/drawing/framework/XView.hdl>
+#include <com/sun/star/drawing/framework/XResource.hpp>
+#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/drawing/framework/ResourceId.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 0f52b3e..9660a77 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -55,11 +55,11 @@
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/java/XJavaVM.hpp>
#include <com/sun/star/java/XJavaThreadRegister_11.hpp>
-#include <com/sun/star/style/ParagraphAdjust.hdl>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hdl>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <boost/unordered_set.hpp>
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 33d7867..22599b3 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -42,7 +42,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/RuntimeException.hdl>
+#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
#include <cppuhelper/weak.hxx>
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index bdedeab..a10ded4 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -94,7 +94,7 @@
#include <com/sun/star/sheet/XSubTotalCalculatable.hpp>
#include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
-#include <com/sun/star/sheet/GeneralFunction.hdl>
+#include <com/sun/star/sheet/GeneralFunction.hpp>
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
#include <com/sun/star/sheet/XSheetAnnotations.hpp>
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 23290c1..a76136f 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -37,8 +37,8 @@
#include <ooo/vba/excel/XComment.hpp>
#include <ooo/vba/XCollection.hpp>
#include <ooo/vba/excel/XPivotTable.hpp>
-#include <ooo/vba/excel/XlPasteType.hdl>
-#include <ooo/vba/excel/XlPasteSpecialOperation.hdl>
+#include <ooo/vba/excel/XlPasteType.hpp>
+#include <ooo/vba/excel/XlPasteSpecialOperation.hpp>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 700fa9c..fe70260 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/text/WritingMode.hpp>
-#include <com/sun/star/frame/XModel.hdl>
+#include <com/sun/star/frame/XModel.hpp>
#include <vcl/print.hxx>
#include <svx/fmmodel.hxx>
#include "pres.hxx"
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index eaf5285..77caf60 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hdl>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <comphelper/processfactory.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx
index fe412bb..a145b7e 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -36,7 +36,7 @@
#include <vcl/window.hxx>
#include <sfx2/viewfrm.hxx>
-#include <com/sun/star/frame/XFrame.hdl>
+#include <com/sun/star/frame/XFrame.hpp>
#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index c973705..ca36ecf 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2076,8 +2076,8 @@ throw (::com::sun::star::uno::RuntimeException)
#ifdef TEST_HANDLERS
#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/awt/XKeyHandler.hdl>
-#include <com/sun/star/awt/XMouseClickHandler.hdl>
+#include <com/sun/star/awt/XKeyHandler.hpp>
+#include <com/sun/star/awt/XMouseClickHandler.hpp>
class TestKeyHandler: public ::cppu::WeakImplHelper2
<
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 16a824a..cb74d66 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -62,7 +62,7 @@
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/lang/XComponent.hdl>
+#include <com/sun/star/lang/XComponent.hpp>
#include "viewmediashape.hxx"
#include "mediashape.hxx"
diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx
index 2736d6e..26b49b4 100644
--- a/slideshow/source/engine/soundplayer.cxx
+++ b/slideshow/source/engine/soundplayer.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/XComponent.hdl>
+#include <com/sun/star/lang/XComponent.hpp>
#include <tools/urlobj.hxx>
diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx
index 2623ad4..e4d49c8 100644
--- a/sot/inc/sot/exchange.hxx
+++ b/sot/inc/sot/exchange.hxx
@@ -34,7 +34,7 @@
#include <tools/string.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include <com/sun/star/datatransfer/dnd/DNDConstants.hdl>
+#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include "sot/sotdllapi.h"
class SotDataObject;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index e8b809d..5554013 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ucb/ResultSetException.hpp>
#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/sdbc/XResultSet.hdl>
+#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 498cdfc..0b60720 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -56,10 +56,10 @@
#include <numeric>
#include <algorithm>
#include <comphelper/processfactory.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <basegfx/polygon/b2dpolygontools.hxx>
using namespace com::sun::star;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index f7db5c9..c9137ad 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <vector>
#include <svtools/colorcfg.hxx>
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 627b862..bfcb511 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <com/sun/star/linguistic2/XLinguServiceManager.hdl>
+#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
#include <com/sun/star/linguistic2/XAvailableLocales.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <linguistic/misc.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 72834ce..4b9acad 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -80,7 +80,7 @@ using namespace ::com::sun::star::form::binding;
using namespace ::svxform;
-#include <com/sun/star/script/XScriptListener.hdl>
+#include <com/sun/star/script/XScriptListener.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index c5eeafa..3470421 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -41,10 +41,10 @@
#include <svx/xftshtit.hxx>
#include <vcl/virdev.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <comphelper/processfactory.hxx>
-#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <editeng/unolingu.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index e445d91..e552dda 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/drawing/Hatch.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hdl>
+#include <com/sun/star/io/XSeekable.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 031d91c..bc22897 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/XScriptTypeDetector.hpp>
-#include <com/sun/star/i18n/ForbiddenCharacters.hdl>
+#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
#include <i18npool/lang.h>
#include <swdllapi.h>
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index 90f1d5d..1195510 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -29,9 +29,9 @@
#define _TEXTMARKUPHELPER_HXX_
#include <sal/types.h>
-#include "com/sun/star/lang/IndexOutOfBoundsException.hdl"
-#include "com/sun/star/lang/IllegalArgumentException.hdl"
-#include "com/sun/star/uno/RuntimeException.hdl"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.h"
namespace com { namespace sun { namespace star { namespace accessibility {
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 35001d8..10119f4 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -28,7 +28,7 @@
#include <hints.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/scripttypeitem.hxx>
#include <hintids.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 4c84379..21cb4a9 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -30,7 +30,7 @@
#include "breakit.hxx"
#include <unicode/uchar.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <unotools/localedatawrapper.hxx>
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index aa09674..e2101b5 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -28,7 +28,7 @@
#include <hintids.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <fmtcntnt.hxx>
#include <txatbase.hxx>
#include <frmatr.hxx>
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index a700610..451fbd0 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -28,8 +28,8 @@
#include <hintids.hxx>
#include <editeng/protitem.hxx>
-#include <com/sun/star/i18n/WordType.hdl>
-#include <com/sun/star/i18n/CharType.hdl>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/CharType.hpp>
#include <unotools/charclass.hxx>
#include <svl/ctloptions.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index bdacd9a..ed3c4d1 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -36,8 +36,8 @@
#include <svx/svxids.hrc>
#include <rtl/random.h>
-#include <com/sun/star/i18n/WordType.hdl>
-#include <com/sun/star/i18n/ForbiddenCharacters.hdl>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 371351d..d5fca9e 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -35,7 +35,7 @@
#include <editeng/brkitem.hxx>
#include <linguistic/lngprops.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/i18n/WordType.hdl>
+#include <com/sun/star/i18n/WordType.hpp>
#include <unotools/charclass.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 73df01b..21b507f 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -41,7 +41,7 @@
#endif
#include <comphelper/processfactory.hxx>
#include <unotools/misccfg.hxx>
-#include <com/sun/star/i18n/WordType.hdl>
+#include <com/sun/star/i18n/WordType.hpp>
#include <fmtpdsc.hxx>
#include <fmthdft.hxx>
#include <fmtcntnt.hxx>
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 924a01f..4513f58 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -29,8 +29,8 @@
#include <string.h> // for strchr()
-#include <com/sun/star/i18n/UnicodeType.hdl>
-#include <com/sun/star/i18n/WordType.hdl>
+#include <com/sun/star/i18n/UnicodeType.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
#include <unotools/charclass.hxx>
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 86200b8..fc519c0 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -30,7 +30,7 @@
#include <hintids.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/protitem.hxx>
-#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <fmtcntnt.hxx>
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 76a61c2..bea269b 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -31,7 +31,7 @@
#include <editeng/tstpitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/scripttypeitem.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <txatbase.hxx>
#include <txtftn.hxx>
#include <fmtftn.hxx>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 6a4210d..cfa3120 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <EnhancedPDFExportHelper.hxx>
#include <hintids.hxx>
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index faab402..adef28a 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <vcl/outdev.hxx>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index b422e0c..f54f660 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -58,7 +58,7 @@
#include <itrtxt.hxx>
#include <breakit.hxx>
#include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/lrspitem.hxx>
#include <switerator.hxx>
#include <boost/foreach.hpp>
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e33666a..7a6fba1 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -29,7 +29,7 @@
#include "hintids.hxx"
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/lspcitem.hxx>
#include <txtflcnt.hxx>
#include <txtftn.hxx>
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index fbb5eb7..4f31d01 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -28,7 +28,7 @@
#include <hintids.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <vcl/graph.hxx>
#include <editeng/brshitem.hxx>
#include <vcl/metric.hxx>
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 06a71d2..9ab7bbe 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -38,9 +38,9 @@
#include <pormulti.hxx> // SwMultiPortion
#include <breakit.hxx>
#include <unicode/uchar.h>
-#include <com/sun/star/i18n/ScriptType.hdl>
-#include <com/sun/star/i18n/CTLScriptType.hdl>
-#include <com/sun/star/i18n/WordType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/CTLScriptType.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
#include <paratr.hxx>
#include <editeng/adjitem.hxx>
#include <editeng/scripttypeitem.hxx>
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 397dcad..ed072ba 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -28,7 +28,7 @@
#include <hintids.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/twolinesitem.hxx>
#include <editeng/charrotateitem.hxx>
#include <vcl/outdev.hxx>
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 6cb66ce..6eb1abe 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -28,7 +28,7 @@
#include <ctype.h>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <i18npool/mslangid.hxx>
#include <hintids.hxx> // CH_TXTATR
#include <SwPortionHandler.hxx>
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index ca56113..621930e 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -29,7 +29,7 @@
#include "hintids.hxx"
#include <svl/whiter.hxx>
#include <tools/shl.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <swmodule.hxx>
#include <redline.hxx> // SwRedline
#include <txtatr.hxx> // SwTxt ...
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 90e0b73..1753aba 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -40,7 +40,7 @@
#include <txtpaint.hxx> // SwSaveClip
#include <blink.hxx> // pBlink
#include <breakit.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <editeng/langitem.hxx>
#include <charatr.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index c346be9..1cb527d 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -43,7 +43,7 @@
#include <editeng/brshitem.hxx>
#include <editeng/charrotateitem.hxx>
#include <breakit.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <tabfrm.hxx>
// #i28701#
#include <sortedobjs.hxx>
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index eb70464..dc927f6 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -43,7 +43,7 @@
#include <hints.hxx> // SwUpdateAttr
#include <unostyle.hxx>
#include <unoevent.hxx> // SwHyperlinkEventDescriptor
-#include <com/sun/star/text/RubyAdjust.hdl>
+#include <com/sun/star/text/RubyAdjust.hpp>
#include <cmdid.h>
#include <com/sun/star/uno/Any.h>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 3db14e6..a78890e 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -33,8 +33,8 @@
#include <vcl/metric.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
-#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
-#include <com/sun/star/i18n/WordType.hdl>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
#include <breakit.hxx>
#include <viewsh.hxx>
#include <viewopt.hxx>
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 44273bd..c96c3a7 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -31,8 +31,8 @@
#include <editeng/svxfont.hxx>
#include <vcl/outdev.hxx>
-#include <com/sun/star/i18n/CharType.hdl>
-#include <com/sun/star/i18n/WordType.hdl>
+#include <com/sun/star/i18n/CharType.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
#include <vcl/print.hxx>
#include <fntcache.hxx>
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 1993cc4..0fe7f1d 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -28,7 +28,7 @@
#include <hintids.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <vcl/outdev.hxx>
#include <unotools/localedatawrapper.hxx>
#include <editeng/unolingu.hxx>
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index b22f63d..d51dbf5 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -19,7 +19,7 @@
#include <hintids.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <tools/string.hxx>
#include <editeng/langitem.hxx>
#include <txatritr.hxx>
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 7f350c6..497ceb2 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -75,8 +75,8 @@
#include <unomid.h>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/i18n/WordType.hdl>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index fd40f9c..31d2fe8 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp>
-#include <com/sun/star/ucb/NameClash.hdl>
+#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index a22170c..da3ba11 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -31,7 +31,7 @@
#include <hintids.hxx>
#include <sal/macros.h>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <comphelper/string.hxx>
#include <vcl/graph.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 17d67ed..4abaed0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -123,7 +123,7 @@
#include <tools/color.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 059c46f..b6dde35 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <oox/token/tokens.hxx>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index b3d44ed..f5cfd8c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -103,7 +103,7 @@
#include <vcl/cvtgrf.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
using ::editeng::SvxBorderLine;
using rtl::OString;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index efcea5b..48ef607 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -32,7 +32,7 @@
#include "rtfattributeoutput.hxx"
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <docsh.hxx>
#include <viewsh.hxx>
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 7dbed56..f731c5d 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -36,7 +36,7 @@
#include <unicode/ubidi.h> //ubidi_getLogicalRun
#include <tools/tenccvt.hxx> //GetExtendedTextEncoding
-#include <com/sun/star/i18n/ScriptType.hdl> //ScriptType
+#include <com/sun/star/i18n/ScriptType.hpp> //ScriptType
#include <unotools/fontcvt.hxx> //GetSubsFontName
#include <editeng/paperinf.hxx> //lA0Width...
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d4d7801..3631db8 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -91,7 +91,7 @@
#include <pagedesc.hxx>
#include <ww8par.hxx>
#include <breakit.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include "ww8attributeoutput.hxx"
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2874d44..b444324 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -88,7 +88,7 @@
#include <txtatr.hxx>
#include <fmtsrnd.hxx>
#include <fmtrowsplt.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <writerfilter/doctok/sprmids.hxx>
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index d656b69..bbcf244 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -37,7 +37,7 @@
#include <paratr.hxx>
#include <charfmt.hxx>
#include <ndtxt.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <writerfilter/doctok/sprmids.hxx>
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 6e5166e..34e7843 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -30,7 +30,7 @@
#include <algorithm>
#include <functional>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <rtl/tencinfo.h>
#include <hintids.hxx>
#include <editeng/boxitem.hxx>
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index ed60d5a..17cd539 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -115,7 +115,7 @@
#include <tox.hxx>
#include <fmtftntx.hxx>
#include <breakit.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <unotools/localedatawrapper.hxx>
#include <tgrditem.hxx>
#include <flddropdown.hxx>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c497602..bb4a8d4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -162,7 +162,7 @@ using namespace nsHdFtFlags;
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <filter/msfilter/msvbahelper.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0a24803..f35563e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -51,7 +51,7 @@
#include <ucbhelper/contentbroker.hxx>
#include <ucbhelper/commandenvironment.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <hintids.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/fhgtitem.hxx>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 7a1ae49..8866bec 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -47,7 +47,7 @@
#include <editeng/svxfont.hxx>
#include <vcl/print.hxx>
#include <sfx2/printer.hxx>
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/scripttypeitem.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 0c130ec..67663ac 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
-#include <com/sun/star/i18n/NumberFormatIndex.hdl>
+#include <com/sun/star/i18n/NumberFormatIndex.hpp>
#include <rtl/instance.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/macros.h>
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index c541790..92b8a2e 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -29,7 +29,7 @@
#include <i18npool/mslangid.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/TextSearch.hpp>
-#include <com/sun/star/util/SearchFlags.hdl>
+#include <com/sun/star/util/SearchFlags.hpp>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <unotools/charclass.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 9201a86..2e15876 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -32,7 +32,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hdl>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/io/XActiveDataStreamer.hpp>
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index 51bbb8e..e116950 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -23,7 +23,7 @@
#include <boost/shared_ptr.hpp>
-#include <com/sun/star/xml/dom/DOMException.hdl>
+#include <com/sun/star/xml/dom/DOMException.hpp>
#include <com/sun/star/xml/dom/events/XMutationEvent.hpp>
#include <document.hxx>
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 5cf8772..7244dd8 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -34,7 +34,7 @@
#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/xml/sax/FastToken.hdl>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <comphelper/attributelist.hxx>
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 6108821..9347732 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -31,7 +31,7 @@
#include <vcl/imgctrl.hxx>
#include <tools/rcid.h>
-#include <com/sun/star/awt/ImageScaleMode.hdl>
+#include <com/sun/star/awt/ImageScaleMode.hpp>
namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 99e4447..2af53d3 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -91,7 +91,7 @@
using ::std::max;
#endif
-#include <com/sun/star/uno/Exception.hdl>
+#include <com/sun/star/uno/Exception.hpp>
#include <time.h>
diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx
index 5443999..3233fd4 100644
--- a/xmloff/source/style/XMLRectangleMembersHandler.cxx
+++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx
@@ -30,7 +30,7 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/awt/Rectangle.hdl>
+#include <com/sun/star/awt/Rectangle.hpp>
#include "XMLRectangleMembersHandler.hxx"
#include <xmloff/xmltypes.hxx>
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index c85a251..bf1cbeb 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/security/NoPasswordException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/security/CertificateValidity.hdl>
+#include <com/sun/star/security/CertificateValidity.hpp>
#include <com/sun/star/packages/WrongPasswordException.hpp>
#include <com/sun/star/security/SerialNumberAdapter.hpp>
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 234bc73..31f5e98 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -29,7 +29,7 @@
#include <sal/config.h>
#include <rtl/uuid.h>
-#include "com/sun/star/xml/crypto/SecurityOperationStatus.hdl"
+#include "com/sun/star/xml/crypto/SecurityOperationStatus.hpp"
#include "xmlsignature_mscryptimpl.hxx"
#include "xmldocumentwrapper_xmlsecimpl.hxx"
#include "xmlelementwrapper_xmlsecimpl.hxx"
More information about the Libreoffice-commits
mailing list