[Libreoffice-commits] core.git: 2 commits - basic/source connectivity/source cui/source editeng/inc editeng/source include/editeng include/svl include/svx sc/source sfx2/inc sfx2/source svtools/inc svtools/source svx/inc svx/source sw/source vcl/inc
Caolán McNamara
caolanm at redhat.com
Mon Aug 18 05:00:17 PDT 2014
basic/source/classes/sbxmod.cxx | 1 -
basic/source/sbx/sbxbase.cxx | 1 -
connectivity/source/drivers/dbase/DTable.cxx | 15 +++++++++++++++
cui/source/dialogs/SpellDialog.cxx | 1 -
cui/source/dialogs/cuicharmap.cxx | 1 -
cui/source/dialogs/cuifmsearch.cxx | 1 -
cui/source/dialogs/cuigrfflt.cxx | 1 -
cui/source/dialogs/cuitbxform.cxx | 1 -
cui/source/dialogs/dlgname.cxx | 1 -
cui/source/dialogs/hyphen.cxx | 1 -
cui/source/dialogs/iconcdlg.cxx | 1 -
cui/source/dialogs/postdlg.cxx | 1 -
cui/source/dialogs/showcols.cxx | 1 -
cui/source/dialogs/thesdlg.cxx | 1 -
cui/source/dialogs/zoom.cxx | 1 -
cui/source/options/fontsubs.cxx | 1 -
cui/source/options/optasian.cxx | 1 -
cui/source/options/optdict.cxx | 1 -
cui/source/options/optgenrl.cxx | 1 -
cui/source/options/optinet2.cxx | 1 -
cui/source/options/optjsearch.cxx | 1 -
cui/source/options/optlingu.cxx | 1 -
cui/source/options/optpath.cxx | 1 -
cui/source/options/optsave.cxx | 1 -
cui/source/tabpages/align.cxx | 1 -
cui/source/tabpages/autocdlg.cxx | 1 +
cui/source/tabpages/connect.cxx | 1 -
cui/source/tabpages/dstribut.cxx | 1 -
cui/source/tabpages/grfpage.cxx | 1 -
cui/source/tabpages/labdlg.cxx | 1 -
cui/source/tabpages/measure.cxx | 1 -
cui/source/tabpages/numpages.cxx | 1 -
cui/source/tabpages/tabline.cxx | 1 -
cui/source/tabpages/tabstpge.cxx | 1 -
cui/source/tabpages/textanim.cxx | 1 -
cui/source/tabpages/textattr.cxx | 1 -
cui/source/tabpages/tparea.cxx | 1 -
cui/source/tabpages/tpbitmap.cxx | 1 -
cui/source/tabpages/tpcolor.cxx | 1 -
cui/source/tabpages/tpgradnt.cxx | 1 -
cui/source/tabpages/tphatch.cxx | 1 -
cui/source/tabpages/tpline.cxx | 1 -
cui/source/tabpages/tplnedef.cxx | 1 -
cui/source/tabpages/tplneend.cxx | 1 -
cui/source/tabpages/tpshadow.cxx | 1 -
cui/source/tabpages/transfrm.cxx | 1 -
editeng/inc/pch/precompiled_editeng.hxx | 1 -
editeng/source/editeng/editdoc.cxx | 1 -
editeng/source/items/optitems.cxx | 1 -
editeng/source/items/paperinf.cxx | 1 -
editeng/source/misc/splwrap.cxx | 1 -
editeng/source/misc/unolingu.cxx | 1 -
include/editeng/eerdll.hxx | 1 -
include/editeng/itemtype.hxx | 1 -
include/svl/cntwall.hxx | 1 -
include/svx/charmap.hxx | 1 -
sc/source/core/data/docpool.cxx | 1 -
sc/source/core/data/documen7.cxx | 2 --
sc/source/core/tool/autoform.cxx | 1 -
sc/source/core/tool/chgtrack.cxx | 1 -
sc/source/ui/cctrl/tbinsert.cxx | 1 -
sc/source/ui/miscdlgs/anyrefdg.cxx | 1 -
sc/source/ui/unoobj/afmtuno.cxx | 1 -
sfx2/inc/pch/precompiled_sfx.hxx | 1 -
sfx2/source/appl/appserv.cxx | 1 -
svtools/inc/pch/precompiled_svt.hxx | 1 -
svtools/source/misc/langtab.cxx | 2 --
svx/inc/pch/precompiled_svx.hxx | 1 -
svx/inc/pch/precompiled_svxcore.hxx | 1 -
svx/source/customshapes/tbxcustomshapes.cxx | 1 -
svx/source/dialog/_bmpmask.cxx | 1 -
svx/source/dialog/_contdlg.cxx | 1 -
svx/source/dialog/checklbx.cxx | 2 --
svx/source/dialog/ctredlin.cxx | 1 -
svx/source/dialog/dlgctrl.cxx | 1 -
svx/source/dialog/fontwork.cxx | 1 -
svx/source/dialog/grfflt.cxx | 1 -
svx/source/dialog/hdft.cxx | 1 -
svx/source/dialog/imapdlg.cxx | 1 -
svx/source/dialog/langbox.cxx | 1 -
svx/source/dialog/optgrid.cxx | 1 -
svx/source/dialog/prtqry.cxx | 1 -
svx/source/dialog/rubydialog.cxx | 1 -
svx/source/dialog/strarray.cxx | 2 --
svx/source/dialog/svxbmpnumvalueset.cxx | 1 -
svx/source/dialog/svxruler.cxx | 1 -
svx/source/dialog/txenctab.cxx | 7 -------
svx/source/engine3d/dragmt3d.cxx | 1 -
svx/source/engine3d/float3d.cxx | 1 -
svx/source/engine3d/view3d.cxx | 1 -
svx/source/engine3d/view3d1.cxx | 1 -
svx/source/fmcomp/fmgridcl.cxx | 1 -
svx/source/fmcomp/gridcell.cxx | 1 -
svx/source/fmcomp/gridctrl.cxx | 1 -
svx/source/form/filtnav.cxx | 1 -
svx/source/form/fmPropBrw.cxx | 1 -
svx/source/form/fmexpl.cxx | 1 -
svx/source/form/fmobj.cxx | 1 -
svx/source/form/fmobjfac.cxx | 1 -
svx/source/form/fmpage.cxx | 1 -
svx/source/form/fmpgeimp.cxx | 1 -
svx/source/form/fmshell.cxx | 1 -
svx/source/form/fmsrcimp.cxx | 1 -
svx/source/form/fmundo.cxx | 1 -
svx/source/form/formcontroller.cxx | 1 -
svx/source/form/tabwin.cxx | 1 -
svx/source/form/tbxform.cxx | 1 -
svx/source/items/svxerr.cxx | 2 --
svx/source/stbctrls/insctrl.cxx | 1 -
svx/source/stbctrls/pszctrl.cxx | 1 -
svx/source/stbctrls/selctrl.cxx | 1 -
svx/source/stbctrls/xmlsecctrl.cxx | 1 -
svx/source/stbctrls/zoomctrl.cxx | 1 -
svx/source/tbxctrls/itemwin.cxx | 1 -
svx/source/tbxctrls/tbcontrl.cxx | 1 -
svx/source/tbxctrls/tbxalign.cxx | 1 -
svx/source/tbxctrls/tbxdrctl.cxx | 1 -
svx/source/unodraw/unoprov.cxx | 1 -
svx/source/unodraw/unoshape.cxx | 1 -
sw/source/core/doc/doc.cxx | 1 -
sw/source/core/doc/docredln.cxx | 1 -
sw/source/core/doc/tblafmt.cxx | 1 -
sw/source/core/fields/docufld.cxx | 1 -
sw/source/core/text/frmpaint.cxx | 1 -
sw/source/core/text/guess.cxx | 1 -
sw/source/core/text/redlnitr.cxx | 1 -
sw/source/core/txtnode/fntcache.cxx | 1 -
sw/source/core/view/vdraw.cxx | 1 -
sw/source/core/view/viewimp.cxx | 1 -
sw/source/filter/xml/xmliteme.cxx | 1 -
sw/source/ui/config/optload.cxx | 1 -
sw/source/ui/misc/outline.cxx | 1 -
sw/source/uibase/app/mainwn.cxx | 1 -
sw/source/uibase/envelp/envimg.cxx | 1 -
sw/source/uibase/envelp/labimg.cxx | 1 -
sw/source/uibase/shells/annotsh.cxx | 1 -
sw/source/uibase/shells/drawsh.cxx | 1 -
sw/source/uibase/shells/drwbassh.cxx | 1 -
sw/source/uibase/shells/drwtxtex.cxx | 1 -
sw/source/uibase/shells/listsh.cxx | 1 -
sw/source/uibase/uiview/uivwimp.cxx | 1 -
sw/source/uibase/uiview/viewdlg2.cxx | 2 --
sw/source/uibase/uno/dlelstnr.cxx | 1 -
sw/source/uibase/uno/unomailmerge.cxx | 1 -
sw/source/uibase/uno/unomod.cxx | 1 -
vcl/inc/svdata.hxx | 1 -
146 files changed, 16 insertions(+), 156 deletions(-)
New commits:
commit d21d5a7261dc4cfb6acf5d03bdddfda13116e28c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 18 11:23:55 2014 +0100
drop unnecessary shl.hxx includes
Change-Id: Ieb984987c4a4f888a563377e0500444b12f43506
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index b76f9fbd..8c26024 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -25,7 +25,6 @@
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
#include <svl/SfxBroadcaster.hxx>
-#include <tools/shl.hxx>
#include <basic/sbx.hxx>
#include <basic/sbuno.hxx>
#include "sb.hxx"
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index ed0c030..6e4f68f 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/stream.hxx>
#include <basic/sbx.hxx>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index bae28d3..c38b033 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/menu.hxx>
#include <vcl/layout.hxx>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 5ea074d..df37c79 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -19,7 +19,6 @@
#include <stdio.h>
-#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#include <svtools/colorcfg.hxx>
#include <svl/eitem.hxx>
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 184e9db..393567a 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -20,7 +20,6 @@
#include <tools/debug.hxx>
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
-#include <tools/shl.hxx>
#include <dialmgr.hxx>
#include <sfx2/tabdlg.hxx>
#include <osl/mutex.hxx>
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4c8b79f..cb26be4 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/builder.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index 3a9f696..134712d 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -18,7 +18,6 @@
*/
#include <string>
-#include <tools/shl.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index add6bbe..f032a59 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <cuires.hrc>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index edf181b..383c454 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -27,7 +27,6 @@
#include <svtools/langtab.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dlgutil.hxx>
-#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#define HYPH_POS_CHAR '='
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 5c795db..eed1d13 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -19,7 +19,6 @@
#include <sfx2/app.hxx>
#include <tools/rc.h>
-#include <tools/shl.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index c420eee..724ca7c 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index d0a79b7..45c5cf8 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -20,7 +20,6 @@
#include "showcols.hxx"
#include "fmsearch.hrc"
-#include <tools/shl.hxx>
#include <dialmgr.hxx>
#include <vcl/msgbox.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 28f2134..162862d 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -22,7 +22,6 @@
#include "cuires.hrc"
#include "dialmgr.hxx"
-#include <tools/shl.hxx>
#include <svl/lngmisc.hxx>
#include <vcl/graphicfilter.hxx>
#include <svtools/svlbitm.hxx>
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 28eb9a0..d619cfa 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <svl/itemset.hxx>
#include <svl/itempool.hxx>
#include <sfx2/objsh.hxx>
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 2a2cc40..96014db 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -20,7 +20,6 @@
#include "sal/config.h"
#include <officecfg/Office/Common.hxx>
-#include <tools/shl.hxx>
#include <svtools/ctrltool.hxx>
#include <svtools/svlbitm.hxx>
#include <vcl/svapp.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index a29ec7e..9877760 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -24,7 +24,6 @@
#include <dialmgr.hxx>
#include <cuires.hrc>
#include <i18nlangtag/mslangid.hxx>
-#include <tools/shl.hxx>
#include <svl/asiancfg.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 6047228..4141037 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <editeng/unolingu.hxx>
#include <svx/dlgutil.hxx>
#include <sfx2/sfxuno.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index c20b73b..7e3f877 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -19,7 +19,6 @@
#include <comphelper/string.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/saveopt.hxx>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 02f5bf7..45f2a54 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/config.hxx>
#include <vcl/msgbox.hxx>
#include <svl/intitem.hxx>
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index e313e89..43f3222 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <unotools/searchopt.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <cuires.hrc>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a5f8f7a..3f43ee7 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -21,7 +21,6 @@
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/settings.hxx>
-#include <tools/shl.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <unotools/lingucfg.hxx>
#include <editeng/unolingu.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index d65a9f0..4ffc216 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/svxdlg.hxx>
-#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/app.hxx>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index c2b8d2a..abdcbbd 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index a66e7d9..d278737 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -30,7 +30,6 @@
#include <editeng/justifyitem.hxx>
#include <dialmgr.hxx>
#include <svx/dlgutil.hxx>
-#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/itemconnect.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index e122603..27c0ba1 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -25,6 +25,7 @@
#include <vcl/settings.hxx>
#include <sot/exchange.hxx>
#include <svtools/transfer.hxx>
+#include <tools/shl.hxx>
#include <unotools/syslocale.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 59a0dbd..61ac685 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -22,7 +22,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/request.hxx>
-#include <tools/shl.hxx>
#include <svx/connctrl.hxx>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 8a48196..edfbed3 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -23,7 +23,6 @@
#include <svx/dialogs.hrc>
#include <svx/svddef.hxx>
#include <dialmgr.hxx>
-#include <tools/shl.hxx>
/*************************************************************************
|*
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index c0bf573..9bda93f 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index dbefb15..37bfe3e 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -23,7 +23,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <swpossizetabpage.hxx>
-#include <tools/shl.hxx>
#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 319f558..8483b87 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -22,7 +22,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/request.hxx>
-#include <tools/shl.hxx>
#include <vcl/settings.hxx>
#include <svx/dialmgr.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ede42d2..7f60b7a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -24,7 +24,6 @@
#include <numpages.hxx>
#include <numpages.hrc>
#include <dialmgr.hxx>
-#include <tools/shl.hxx>
#include <tools/mapunit.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <helpid.hrc>
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 133060a..01ac68b 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index dc60944..4f0ac3c 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/app.hxx>
-#include <tools/shl.hxx>
#include <svtools/ruler.hxx>
#include <svx/dialogs.hrc>
#include <vcl/settings.hxx>
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index ca5ccc4..4ba2bb7 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -19,7 +19,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-#include <tools/shl.hxx>
#include <cuires.hrc>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 8145328..a09a7ee 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -19,7 +19,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-#include <tools/shl.hxx>
#include <cuires.hrc>
#include <svx/svddef.hxx>
#include <svx/sdtditm.hxx>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 8094413..818613d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -19,7 +19,6 @@
#include <stdlib.h>
-#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 85938a9..9383d51 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -18,7 +18,6 @@
*/
#include <vcl/wrkwin.hxx>
-#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <tools/urlobj.hxx>
#include <unotools/ucbstreamhelper.hxx>
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 24ca821..02d4005 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 38c502c..571b4c4 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -18,7 +18,6 @@
*/
#include <vcl/wrkwin.hxx>
-#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 501bd67..e73b3c8 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 6221929..eb9e86e 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -18,7 +18,6 @@
*/
#include <editeng/sizeitem.hxx>
-#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index a221f6e..2cddd29 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 4390554..94cf763 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 0a56580..43eeabf 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 54485a8..fdc4d4e 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <svx/svdview.hxx>
#include <svx/svdobj.hxx>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 5c28e1c..30fed2f 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -267,7 +267,6 @@
#include <tools/poly.hxx>
#include <tools/resid.hxx>
#include <tools/rtti.hxx>
-#include <tools/shl.hxx>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
#include <tools/urlobj.hxx>
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 24369ca..fb38208 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -60,7 +60,6 @@
#include <tools/stream.hxx>
#include <tools/debug.hxx>
-#include <tools/shl.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <cassert>
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index cebe639..d9ea20f 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <tools/resid.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 71540dc..579c7ae 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -18,7 +18,6 @@
*/
#include <limits.h>
-#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#include <editeng/editrids.hrc>
#include <editeng/paperinf.hxx>
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 9a76777..2a88cc6 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -18,7 +18,6 @@
*/
#include <rtl/ustring.hxx>
-#include <tools/shl.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 516d9ca..4a9da15 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -46,7 +46,6 @@
#include <ucbhelper/content.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-#include <tools/shl.hxx>
#include <linguistic/misc.hxx>
#include <editeng/eerdll.hxx>
#include <editeng/editrids.hrc>
diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx
index 2f7912e..bbf2a6c 100644
--- a/include/editeng/eerdll.hxx
+++ b/include/editeng/eerdll.hxx
@@ -23,7 +23,6 @@
class GlobalEditData;
#include <tools/resid.hxx>
-#include <tools/shl.hxx>
#include <editeng/editengdllapi.h>
class EDITENG_DLLPUBLIC EditResId: public ResId
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index b1687b0..54a518e 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -27,7 +27,6 @@
#include <tools/resid.hxx>
#include <tools/bigint.hxx>
#include <svl/poolitem.hxx>
-#include <tools/shl.hxx>
#include <editeng/editengdllapi.h>
class Color;
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index 9d6f32c..224168b 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -21,7 +21,6 @@
#include <svl/svldllapi.h>
-#include <tools/shl.hxx>
#include <tools/rtti.hxx>
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index d9335fa..ed48d5d 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -24,7 +24,6 @@
#include <vcl/scrbar.hxx>
#include <boost/shared_ptr.hpp>
#include <map>
-#include <tools/shl.hxx>
#include <svx/svxdllapi.h>
// define ----------------------------------------------------------------
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index ee6d557..6cce7c7 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -22,7 +22,6 @@
#include <boost/static_assert.hpp>
#include <comphelper/string.hxx>
#include <i18nutil/unicode.hxx>
-#include <tools/shl.hxx>
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 1682332..2e71884 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -39,8 +39,6 @@
#include "formulagroup.hxx"
#include <refhint.hxx>
-#include <tools/shl.hxx>
-
#include "globstr.hrc"
extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index b8ddd9c..43d4849 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -23,7 +23,6 @@
#include <sfx2/docfile.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/itemset.hxx>
-#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
#include <svx/dialmgr.hxx>
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 48e4f7f..f847d67 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -35,7 +35,6 @@
#include "refupdatecontext.hxx"
#include <refupdat.hxx>
-#include <tools/shl.hxx>
#include <tools/rtti.hxx>
#include <svl/zforlist.hxx>
#include <svl/itemset.hxx>
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index ac679ef..4332cc2 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -19,7 +19,6 @@
#include <string>
-#include <tools/shl.hxx>
#include <svl/intitem.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 37db74e..61ac61f 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -23,7 +23,6 @@
#include <sfx2/viewsh.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/mnemonic.hxx>
-#include <tools/shl.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 17b0a2f..bf6d3f5 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -19,7 +19,6 @@
#include "scitems.hxx"
#include <editeng/memberids.hrc>
-#include <tools/shl.hxx>
#include <svl/poolitem.hxx>
#include <vcl/svapp.hxx>
#include <svx/unomid.hxx>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 209038c..7c113c2 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -699,7 +699,6 @@
#include <tools/rcid.h>
#include <tools/resary.hxx>
#include <tools/rtti.hxx>
-#include <tools/shl.hxx>
#include <tools/stream.hxx>
#include <tools/svborder.hxx>
#include <tools/tenccvt.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 274c12b..08adac7 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -72,7 +72,6 @@
#include <unotools/moduleoptions.hxx>
#include <svtools/helpopt.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/shl.hxx>
#include <unotools/bootstrap.hxx>
#include <rtl/bootstrap.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 7f4726b..55bb370 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -382,7 +382,6 @@
#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
#include <tools/rtti.hxx>
-#include <tools/shl.hxx>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
#include <tools/time.hxx>
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 7000ef0..88bf4dd 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -19,8 +19,6 @@
#include <boost/static_assert.hpp>
-#include <tools/shl.hxx>
-
#include <com/sun/star/i18n/DirectionProperty.hpp>
#include <i18nlangtag/lang.h>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 2feabf6..15bb626 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -459,7 +459,6 @@
#include <tools/rcid.h>
#include <tools/resary.hxx>
#include <tools/resid.hxx>
-#include <tools/shl.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <tools/wldcrd.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index b728c4e..9bb0722 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -748,7 +748,6 @@
#include <tools/rcid.h>
#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
-#include <tools/shl.hxx>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
#include <tools/urlobj.hxx>
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index bb25d07..a2798fc 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -21,7 +21,6 @@
#include <string>
#include <svx/svxids.hrc>
-#include <tools/shl.hxx>
#include <svl/eitem.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index c42549d..c39bfbb 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -18,7 +18,6 @@
*/
#include <vcl/wrkwin.hxx>
-#include <tools/shl.hxx>
#include <vcl/metaact.hxx>
#include <vcl/settings.hxx>
#include <svtools/valueset.hxx>
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 817202e..9458fbe 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -19,7 +19,6 @@
#include <vcl/wrkwin.hxx>
#include <sot/factory.hxx>
-#include <tools/shl.hxx>
#include <tools/helpers.hxx>
#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 1c8a12b..732076eb 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
-
#include <svtools/treelistentry.hxx>
#include <svx/checklbx.hxx>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 53f1685..d3aebb7 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -20,7 +20,6 @@
#include <vcl/dialog.hxx>
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
-#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <unotools/textsearch.hxx>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 637ca5a..58214e7 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/builder.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index dd6a045..0a8a647 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -19,7 +19,6 @@
#include <sfx2/module.hxx>
#include <sfx2/dispatch.hxx>
-#include <tools/shl.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdopath.hxx>
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 7c45e38..4890faa 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index da4790d..4c9b21e 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <svl/itemiter.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 64bcedd..feb1c30 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <stdlib.h>
-#include <tools/shl.hxx>
#include <tools/errinf.hxx>
#include <tools/urlobj.hxx>
#include <unotools/ucbstreamhelper.hxx>
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 2eea8f6..8d3f6f9 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -24,7 +24,6 @@
#include <unotools/localedatawrapper.hxx>
#include <tools/urlobj.hxx>
#include <svtools/langtab.hxx>
-#include <tools/shl.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/lang.h>
#include <editeng/scripttypeitem.hxx>
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index f1df7ae..61f8004 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <svl/intitem.hxx>
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index c405fbf..c2aa112 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -21,7 +21,6 @@
#include <svx/dialogs.hrc>
#include <svx/prtqry.hxx>
#include <svx/dialmgr.hxx>
-#include <tools/shl.hxx>
SvxPrtQryBox::SvxPrtQryBox(Window* pParent) :
MessBox(pParent, 0,
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index ec2daf3..cb6898a 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/rubydialog.hxx>
-#include <tools/shl.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <sfx2/app.hxx>
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index 144ca2b..4e540c3 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
-
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
#include <svx/strarray.hxx>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 42ccac0..de1300c 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -19,7 +19,6 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-#include <tools/shl.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <svtools/valueset.hxx>
#include <svl/languageoptions.hxx>
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5ff0952..7e3d27c 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -20,7 +20,6 @@
#include <cstring>
#include <climits>
-#include <tools/shl.hxx>
#include <vcl/image.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index a2de927..0240d19 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -21,9 +21,6 @@
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
#include "svx/txenctab.hxx"
-#include <tools/shl.hxx>
-
-
SvxTextEncodingTable::SvxTextEncodingTable()
:
@@ -31,14 +28,10 @@ SvxTextEncodingTable::SvxTextEncodingTable()
{
}
-
-
SvxTextEncodingTable::~SvxTextEncodingTable()
{
}
-
-
const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const
{
sal_uInt32 nPos = FindIndex( (long)nEnc );
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index afd8030..72b79da 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -19,7 +19,6 @@
#include <dragmt3d.hxx>
-#include <tools/shl.hxx>
#include <svx/svdpagv.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svddrgmt.hxx>
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 3b5f45f..7dcc3b8 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -24,7 +24,6 @@
#include <svtools/colrdlg.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/viewsh.hxx>
-#include <tools/shl.hxx>
#include <svx/xflclit.hxx>
#include <svx/svdmodel.hxx>
#include <svx/globl3d.hxx>
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 960fac5..2c43355 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -21,7 +21,6 @@
#include <vcl/wrkwin.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdopath.hxx>
-#include <tools/shl.hxx>
#include "svx/svditer.hxx"
#include <svx/svdpool.hxx>
#include <svx/svdorect.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 9de4503..414faa5 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -18,7 +18,6 @@
*/
-#include <tools/shl.hxx>
#include "svx/svditer.hxx"
#include <svx/svdpool.hxx>
#include <svx/svdmodel.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 5a672de..57b5931 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -63,7 +63,6 @@
#include <svtools/fmtfield.hxx>
#include <svl/numuno.hxx>
#include <tools/multisel.hxx>
-#include <tools/shl.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/help.hxx>
#include <vcl/image.hxx>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 7ac32ba..e4107ca 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -61,7 +61,6 @@
#include <svx/dialmgr.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/shl.hxx>
#include <vcl/longcurr.hxx>
#include <vcl/settings.hxx>
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index f3dd511..f991024 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -48,7 +48,6 @@
#include "svx/fmresids.hrc"
#include <svx/svxids.hrc>
-#include <tools/shl.hxx>
#include <svx/dialmgr.hxx>
#include "fmservs.hxx"
#include "sdbdatacolumn.hxx"
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 36afdb9..f90fbbf 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -49,7 +49,6 @@
#include <svx/fmshell.hxx>
#include <svx/fmtools.hxx>
#include <svx/svxids.hrc>
-#include <tools/shl.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/settings.hxx>
#include <tools/diagnose_ex.h>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index a1b2cf5..57523e4 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -61,7 +61,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/shl.hxx>
#include <unotools/confignode.hxx>
#include <vcl/stdtext.hxx>
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 4b0ef8d..6fd2b10 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -47,7 +47,6 @@
#include <vcl/menu.hxx>
#include <sfx2/objitem.hxx>
#include <sfx2/request.hxx>
-#include <tools/shl.hxx>
#include <vcl/wrkwin.hxx>
#include <svx/fmshell.hxx>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index ed347e9..8b5a49e 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/util/XCloneable.hpp>
#include "svx/fmtools.hxx"
-#include <tools/shl.hxx>
#include <comphelper/property.hxx>
#include <comphelper/processfactory.hxx>
#include <toolkit/awt/vclxdevice.hxx>
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index f1bad87..2e406d6 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -38,7 +38,6 @@
#include <tools/resid.hxx>
#include "svx/fmresids.hrc"
-#include <tools/shl.hxx>
#include <svx/dialmgr.hxx>
#include "tabwin.hxx"
#include "fmexpl.hxx"
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 252ce39..3a8e136 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -29,7 +29,6 @@
#include "fmobj.hxx"
#include <svx/fmresids.hrc>
-#include <tools/shl.hxx>
#include <svx/dialmgr.hxx>
#include "fmpgeimp.hxx"
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 22a0a33..dd67c04 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -43,7 +43,6 @@
#include <svx/fmmodel.hxx>
#include <tools/resid.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/shl.hxx>
#include <vcl/stdtext.hxx>
#include <svx/dialmgr.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 05abd279..69cd665 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -59,7 +59,6 @@
#include "fmexch.hxx"
#include <svx/fmglob.hxx>
#include <svl/eitem.hxx>
-#include <tools/shl.hxx>
#include <tools/diagnose_ex.h>
#include <svx/svdpage.hxx>
#include <svx/fmmodel.hxx>
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index baf98b6..3504132 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -26,7 +26,6 @@
#include <tools/diagnose_ex.h>
#include <tools/wldcrd.hxx>
#include <vcl/msgbox.hxx>
-#include <tools/shl.hxx>
#include <svx/dialmgr.hxx>
#include <vcl/svapp.hxx>
#include <unotools/textsearch.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index de316e3..11487c7 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -45,7 +45,6 @@
#include "svx/fmtools.hxx"
#include <svl/macitem.hxx>
-#include <tools/shl.hxx>
#include <tools/diagnose_ex.h>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index ca825ad..1777ec7 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -81,7 +81,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index d1edce9..1ddfb40 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -45,7 +45,6 @@
#include "svx/fmresids.hrc"
#include <svx/dialmgr.hxx>
-#include <tools/shl.hxx>
#include <svx/svdpagv.hxx>
#include <sfx2/objitem.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index dd014a1..a8a4745 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -18,7 +18,6 @@
*/
#include <string>
-#include <tools/shl.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index 9dd0df1..fff3165 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
-
#include "svx/svxerr.hxx"
#include <svx/dialmgr.hxx>
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index c0424b7..fdd3ec4 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/status.hxx>
#include <svl/eitem.hxx>
#include <sfx2/app.hxx>
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index e48498c..ae5ae3c 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -18,7 +18,6 @@
*/
#include <limits.h>
-#include <tools/shl.hxx>
#include <vcl/status.hxx>
#include <vcl/menu.hxx>
#include <vcl/image.hxx>
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 1536aa4..e123fe2 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <vcl/menu.hxx>
#include <vcl/status.hxx>
#include <svl/intitem.hxx>
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 46ea35b..ad31b54 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -18,7 +18,6 @@
*/
-#include <tools/shl.hxx>
#include <vcl/status.hxx>
#include <vcl/menu.hxx>
#include <vcl/image.hxx>
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index d5af62d..70a270b 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -18,7 +18,6 @@
*/
#include <i18nutil/unicode.hxx>
-#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/status.hxx>
#include <vcl/menu.hxx>
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 40865b8..f85b488 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -19,7 +19,6 @@
#include <com/sun/star/drawing/FillStyle.hpp>
-#include <tools/shl.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5728791..61b191d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -18,7 +18,6 @@
*/
#include <string>
-#include <tools/shl.hxx>
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index aed1aa4..59d7f1f 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -23,7 +23,6 @@
#include <svx/dialogs.hrc>
#include "svx/tbxalign.hxx"
-#include <tools/shl.hxx>
#include <sfx2/imagemgr.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 312aeb8..69c36b6 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -20,7 +20,6 @@
#include <string>
-#include <tools/shl.hxx>
#include <svl/aeitem.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index b4d7575..df64e3e 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <boost/unordered_map.hpp>
#include <tools/fldunit.hxx>
-#include <tools/shl.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/propertysetinfo.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5d8bfb2..dfec07e 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -64,7 +64,6 @@
#include "svx/svdpagv.hxx"
#include "svx/svdpool.hxx"
#include <tools/gen.hxx>
-#include <tools/shl.hxx>
#include "svx/dialmgr.hxx"
#include "svx/dialogs.hrc"
#include "svx/svdocapt.hxx"
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 12b50d7..0812256 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -38,7 +38,6 @@
#include <DocumentExternalDataManager.hxx>
#include <UndoManager.hxx>
#include <hintids.hxx>
-#include <tools/shl.hxx>
#include <tools/globname.hxx>
#include <svx/svxids.hrc>
#include <rtl/random.h>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index e79b98e..9fb4aa6 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <tools/shl.hxx>
#include <svl/itemiter.hxx>
#include <sfx2/app.hxx>
#include <editeng/colritem.hxx>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 66826f2..546e86f 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -19,7 +19,6 @@
#include <tools/resid.hxx>
#include <tools/stream.hxx>
-#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 81d8c43..01d13de 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -60,7 +60,6 @@
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Time.hpp>
-#include <tools/shl.hxx>
#include <swmodule.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 77cd5dc..df7195a 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -19,7 +19,6 @@
#include <com/sun/star/text/HoriOrientation.hpp>
#include <hintids.hxx>
-#include <tools/shl.hxx>
#include <editeng/pgrditem.hxx>
#include <editeng/lrspitem.hxx>
#include <pagedesc.hxx>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 44deb6a..3bc0a0f 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -19,7 +19,6 @@
#include <ctype.h>
#include <editeng/unolingu.hxx>
-#include <tools/shl.hxx>
#include <dlelstnr.hxx>
#include <swmodule.hxx>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index c8706a4..828f6ef9 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -19,7 +19,6 @@
#include "hintids.hxx"
#include <svl/whiter.hxx>
-#include <tools/shl.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <swmodule.hxx>
#include <redline.hxx>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 38b1f6c..40f9d96 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -44,7 +44,6 @@
#include <tgrditem.hxx>
#include <scriptinfo.hxx>
#include <editeng/brushitem.hxx>
-#include <tools/shl.hxx>
#include <swmodule.hxx>
#include <accessibilityoptions.hxx>
#include <svtools/accessibilityoptions.hxx>
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 872537f..0450eb1 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -19,7 +19,6 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
-#include <tools/shl.hxx>
#include <swmodule.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <svx/svdpagv.hxx>
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 71e2a3e..45acc4c 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -29,7 +29,6 @@
#include "swregion.hxx"
#include "dflyobj.hxx"
#include "dview.hxx"
-#include <tools/shl.hxx>
#include <swmodule.hxx>
#include <svx/svdpage.hxx>
#include <accmap.hxx>
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index cb1976b..c2d13b9 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -22,7 +22,6 @@
#include <hintids.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <tools/shl.hxx>
#include <xmloff/xmluconv.hxx>
#include "xmlexpit.hxx"
#include <xmloff/nmspmap.hxx>
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index d886841..fd598f4 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -19,7 +19,6 @@
#include <officecfg/Office/Writer.hxx>
#include <comphelper/string.hxx>
-#include <tools/shl.hxx>
#include <swtypes.hxx>
#include <helpid.h>
#include <uiitems.hxx>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 92e109a..62df032 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <tools/shl.hxx>
#include <vcl/menu.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index d7553a0..db6f616 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -18,7 +18,6 @@
*/
#include <mdiexp.hxx>
-#include <tools/shl.hxx>
#include <sfx2/progress.hxx>
#include <tools/resid.hxx>
#include <docsh.hxx>
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 1b8082d..f913cbd 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -25,7 +25,6 @@
#include <editeng/paperinf.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <unotools/useroptions.hxx>
-#include <tools/shl.hxx>
#include <swmodule.hxx>
#include <swtypes.hxx>
#include <envimg.hxx>
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index 7c096fce..428f85a 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <unotools/useroptions.hxx>
-#include <tools/shl.hxx>
#include <swmodule.hxx>
#include "labimg.hxx"
#include "cmdid.h"
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 73a968a..e26f7d6 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <tools/shl.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 0c19b19..5986acb 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <svx/svdview.hxx>
#include <svx/svdotext.hxx>
#include <svl/whiter.hxx>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 8fdac97..3a2e4ff 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/shl.hxx>
#include <hintids.hxx>
#include <helpid.h>
#include <swtypes.hxx>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 1ff6989..559a50d 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -25,7 +25,6 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/request.hxx>
-#include <tools/shl.hxx>
#include <svx/svdview.hxx>
#include <editeng/spltitem.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 3b7d1d0..7e24741 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -29,7 +29,6 @@
#include <svl/eitem.hxx>
#include <svl/whiter.hxx>
#include <svl/intitem.hxx>
-#include <tools/shl.hxx>
#include <svl/srchitem.hxx>
#include <numrule.hxx>
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 3c121f6..3a66ec6 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -22,7 +22,6 @@
#include <cmdid.h>
#include "globals.hrc"
-#include <tools/shl.hxx>
#include <com/sun/star/scanner/XScannerManager2.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index ff168a0..248c82f 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -24,8 +24,6 @@
#include <expfld.hxx>
#include <modcfg.hxx>
-#include <tools/shl.hxx>
-
#include "swmodule.hxx"
#include "view.hxx"
#include "wview.hxx"
diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx
index 7827b65..c57a6e5 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -31,7 +31,6 @@
#include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-#include <tools/shl.hxx>
#include "dlelstnr.hxx"
#include <swmodule.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 5f54102..695bc18 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -22,7 +22,6 @@
#include <svl/itemprop.hxx>
#include <svl/urihelper.hxx>
#include <svx/dataaccessdescriptor.hxx>
-#include <tools/shl.hxx>
#include <unotools/tempfile.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 0e2ec54..a0b27cd 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -25,7 +25,6 @@
#include <unoprnms.hxx>
#include <unomap.hxx>
#include <prtopt.hxx>
-#include <tools/shl.hxx>
#include <swmodule.hxx>
#include <view.hxx>
#include <docsh.hxx>
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index b505ad6..b8df3e7 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -25,7 +25,6 @@
#include <osl/thread.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
-#include "tools/shl.hxx"
#include "tools/link.hxx"
#include "tools/fldunit.hxx"
#include "tools/color.hxx"
commit d4e64d030092984077021a9af9d281cd64c476bf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 18 12:07:27 2014 +0100
check len before memcpying into it
valgrind + bff on sf_3e0068c9b19bb548826bed0599f65745-CrdWMI-minimized.gif
Change-Id: I74cc21609f1c97a27e13615593f678cbbc8463e3
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index b205958..a9f74b9 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -806,6 +806,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
(*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen;
(*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
}
+
switch(nType)
{
case DataType::INTEGER:
@@ -882,6 +883,8 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
else if ( DataType::INTEGER == nType )
{
sal_Int32 nValue = 0;
+ if (static_cast<size_t>(nLen) > sizeof(nValue))
+ return false;
memcpy(&nValue, pData, nLen);
*(_rRow->get())[i] = nValue;
}
@@ -891,6 +894,8 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
if (getBOOL((*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency is treated separately
{
sal_Int64 nValue = 0;
+ if (static_cast<size_t>(nLen) > sizeof(nValue))
+ return false;
memcpy(&nValue, pData, nLen);
if ( m_aScales[i-1] )
@@ -900,6 +905,8 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
}
else
{
+ if (static_cast<size_t>(nLen) > sizeof(d))
+ return false;
memcpy(&d, pData, nLen);
}
@@ -1873,6 +1880,8 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, cons
case DataType::INTEGER:
{
sal_Int32 nValue = thisColVal;
+ if (static_cast<size_t>(nLen) > sizeof(nValue))
+ return false;
memcpy(pData,&nValue,nLen);
}
break;
@@ -1888,10 +1897,16 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, cons
nValue = (sal_Int64)(d * pow(10.0,(int)m_aScales[i]));
else
nValue = (sal_Int64)(d);
+ if (static_cast<size_t>(nLen) > sizeof(nValue))
+ return false;
memcpy(pData,&nValue,nLen);
} // if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency is treated separately
else
+ {
+ if (static_cast<size_t>(nLen) > sizeof(d))
+ return false;
memcpy(pData,&d,nLen);
+ }
}
break;
case DataType::DECIMAL:
More information about the Libreoffice-commits
mailing list