diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 15:15:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 19:00:36 +0100 |
commit | 45e366eadbba69140214a8e745a1d3ce3e4e8337 (patch) | |
tree | cf01cfc9006789d7effb61ae140028829fc879c6 /sw/inc | |
parent | 8bb4b18127cdc6259ecd65ec0f28d27d0513cb26 (diff) |
drop unnecessary tools/string includes
Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/IDocumentListItems.hxx | 2 | ||||
-rw-r--r-- | sw/inc/IDocumentListsAccess.hxx | 2 | ||||
-rw-r--r-- | sw/inc/IDocumentOutlineNodes.hxx | 2 | ||||
-rw-r--r-- | sw/inc/acmplwrd.hxx | 2 | ||||
-rw-r--r-- | sw/inc/calc.hxx | 6 | ||||
-rw-r--r-- | sw/inc/ccoll.hxx | 10 | ||||
-rw-r--r-- | sw/inc/crsrsh.hxx | 1 | ||||
-rw-r--r-- | sw/inc/dbgoutsw.hxx | 2 | ||||
-rw-r--r-- | sw/inc/dbmgr.hxx | 3 | ||||
-rw-r--r-- | sw/inc/docsh.hxx | 1 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 1 | ||||
-rw-r--r-- | sw/inc/fmtcol.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtrfmrk.hxx | 3 | ||||
-rw-r--r-- | sw/inc/frmfmt.hxx | 1 | ||||
-rw-r--r-- | sw/inc/ftninfo.hxx | 2 | ||||
-rw-r--r-- | sw/inc/index.hxx | 1 | ||||
-rw-r--r-- | sw/inc/iodetect.hxx | 4 | ||||
-rw-r--r-- | sw/inc/list.hxx | 2 | ||||
-rw-r--r-- | sw/inc/paratr.hxx | 1 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 1 | ||||
-rw-r--r-- | sw/inc/redline.hxx | 2 | ||||
-rw-r--r-- | sw/inc/shellres.hxx | 2 | ||||
-rw-r--r-- | sw/inc/sortopt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swabstdlg.hxx | 1 | ||||
-rw-r--r-- | sw/inc/swcalwrp.hxx | 2 | ||||
-rw-r--r-- | sw/inc/txtfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unochart.hxx | 1 | ||||
-rw-r--r-- | sw/inc/unosrch.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unotbl.hxx | 1 | ||||
-rw-r--r-- | sw/inc/viewopt.hxx | 1 |
30 files changed, 23 insertions, 42 deletions
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx index f4e766aeff53..c6ced05615d7 100644 --- a/sw/inc/IDocumentListItems.hxx +++ b/sw/inc/IDocumentListItems.hxx @@ -21,7 +21,7 @@ #define IDOCUMENTLISTITEMS_HXX_INCLUDED #include <vector> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwNodeNum; /** Provides numbered items of a document. diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx index 1c072f73d524..4351d6fe28b1 100644 --- a/sw/inc/IDocumentListsAccess.hxx +++ b/sw/inc/IDocumentListsAccess.hxx @@ -20,7 +20,7 @@ #ifndef IDOCUMENTLISTSACCESS_HXX_INCLUDED #define IDOCUMENTLISTSACCESS_HXX_INCLUDED -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwList; diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx index 80a0fde55135..0fc0156f2a66 100644 --- a/sw/inc/IDocumentOutlineNodes.hxx +++ b/sw/inc/IDocumentOutlineNodes.hxx @@ -20,8 +20,8 @@ #ifndef IDOCUMENTOUTLINENODES_HXX_INCLUDED #define IDOCUMENTOUTLINENODES_HXX_INCLUDED +#include <rtl/ustring.hxx> #include <sal/types.h> -#include <tools/string.hxx> #include <vector> class SwTxtNode; diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx index 9b6adc3a7377..47795c46340e 100644 --- a/sw/inc/acmplwrd.hxx +++ b/sw/inc/acmplwrd.hxx @@ -24,7 +24,7 @@ #include <editeng/swafopt.hxx> #include <editeng/Trie.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwDoc; class SwAutoCompleteWord_Impl; diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index fa3d0fffbe1c..d75420345b16 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -21,12 +21,8 @@ #define SW_CALC_HXX #include <vector> - -#include <tools/string.hxx> -#include <unotools/syslocale.hxx> - #include <basic/sbxvar.hxx> - +#include <unotools/syslocale.hxx> #include "swdllapi.h" class CharClass; diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 6935b842db2c..e3f64d88a4fb 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -19,21 +19,17 @@ #ifndef _CCOLL_HXX #define _CCOLL_HXX +#include <rtl/string.hxx> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> -#include <tools/string.hxx> #include <sfx2/tabdlg.hxx> - +#include <svtools/svtabbx.hxx> #include <vcl/fixed.hxx> - #include <vcl/button.hxx> -#include <svtools/svtabbx.hxx> - #include <vcl/lstbox.hxx> #include "swdllapi.h" #include "cmdid.h" -#include <rtl/string.hxx> - //*********************************************************** struct CollName { diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index e9843292c2d8..8994c37bdf06 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/i18n/WordType.hpp> #include <rtl/ustring.hxx> -#include <tools/string.hxx> #include <tools/link.hxx> #include <tools/rtti.hxx> diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 118dba8b6fce..8ad766fe43e9 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -22,9 +22,9 @@ #ifdef DBG_UTIL #include <boost/unordered_map.hpp> +#include <rtl/ustring.hxx> #include <tox.hxx> #include <cstdio> -#include "tools/string.hxx" class SwNode; class SwTxtAttr; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index d5b20702d3a6..9ab0b91b36cf 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -19,8 +19,7 @@ #ifndef _SWDBMGR_HXX #define _SWDBMGR_HXX - -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/link.hxx> #include <com/sun/star/util/Date.hpp> #include "swdllapi.h" diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 333d6db26af5..1891f3ad126d 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -31,7 +31,6 @@ #include <svl/lstner.hxx> #include <svtools/embedhlp.hxx> -#include <tools/string.hxx> class SwDoc; class SfxDocumentInfoDialog; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 013fcdc2824d..d3a1aa5a3516 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <tools/string.hxx> #include <vcl/font.hxx> #include <editeng/swafopt.hxx> #include "swdllapi.h" diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 8b89070aa40d..590f53449c54 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -23,7 +23,7 @@ #include <frmatr.hxx> #include <swtypes.hxx> // For MAXLEVEL. #include <boost/ptr_container/ptr_vector.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwDoc; // For friend. diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index f1b8975028e7..b8ea3333b60d 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -19,8 +19,7 @@ #ifndef _FMTRFMRK_HXX #define _FMTRFMRK_HXX - -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> class SwTxtRefMark; diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index f322e75769b4..bfe0c2585840 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/text/PositionLayoutDir.hpp> #include <cppuhelper/weakref.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <format.hxx> #include "swdllapi.h" diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index a5f1e840ddea..aaad290ff3f4 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -19,7 +19,7 @@ #ifndef _FTNINFO_HXX #define _FTNINFO_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include "swdllapi.h" #include <calbck.hxx> #include <editeng/numitem.hxx> diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index e664538a285a..6934c26142e0 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -23,6 +23,7 @@ #include "rtl/instance.hxx" #include <tools/solar.h> +#include <tools/string.hxx> #include <tools/rtti.hxx> // for RTTI of SwIndexReg #include <swdllapi.h> diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index e347c190c8b0..ef9933d33fdd 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -20,11 +20,11 @@ #ifndef _IODETECT_HXX_ #define _IODETECT_HXX_ +#include <osl/endian.h> +#include <rtl/ustring.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> -#include <osl/endian.h> -#include <tools/string.hxx> #include <swddllapi.h> #define FILTER_RTF "RTF" ///< RTF filter diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx index 5b0a703e7828..1d85296d28a7 100644 --- a/sw/inc/list.hxx +++ b/sw/inc/list.hxx @@ -20,7 +20,7 @@ #ifndef LIST_HXX_INCLUDED #define LIST_HXX_INCLUDED -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwNumRule; class SwNodes; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index b6b5543d21eb..56093c22bd70 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -27,7 +27,6 @@ #include <format.hxx> #include <swtypes.hxx> #include <editeng/adjustitem.hxx> -#include <tools/string.hxx> class SwCharFmt; class IntlWrapper; diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 053b441ada8a..2ffc449f0fef 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -28,7 +28,6 @@ #include "salhelper/simplereferenceobject.hxx" #include "svl/urihelper.hxx" #include "svtools/treelistentry.hxx" -#include "tools/string.hxx" #include "vcl/metric.hxx" #include "vcl/svapp.hxx" #include <algorithm> diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index df7a92b18562..6a2750b93ffc 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -20,7 +20,7 @@ #define _REDLINE_HXX #include <tools/datetime.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <pam.hxx> diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 3f1bcf6c4e1c..85d5d95b7971 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -20,7 +20,7 @@ #define _SHELLRES_HXX #include <swdllapi.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/rc.hxx> #include <vcl/bitmap.hxx> diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 87029f4203a8..f8a3bf1b1fec 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -19,7 +19,7 @@ #ifndef _SORTOPT_HXX #define _SORTOPT_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include "swdllapi.h" #include <vector> diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 2e039534e033..f5ed3bf60cf3 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -21,7 +21,6 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> #include <sfx2/sfxdlg.hxx> #include <svx/svxdlg.hxx> #include <vcl/syswin.hxx> diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx index f624ad79eaca..d98d0ff3a71e 100644 --- a/sw/inc/swcalwrp.hxx +++ b/sw/inc/swcalwrp.hxx @@ -21,7 +21,7 @@ #define _SWCALWRP_HXX #include <i18nlangtag/lang.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <unotools/calendarwrapper.hxx> #include <salhelper/singletonref.hxx> diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 55aab0fd6673..33ce24e5c9fc 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -20,7 +20,7 @@ #define _TXTFLD_HXX #include <txatbase.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwTxtNode; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 656d1c451147..16baeacc6def 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -48,7 +48,6 @@ #include <cppuhelper/implbase10.hxx> // helper for implementations #include <cppuhelper/weakref.hxx> -#include <tools/string.hxx> #include <tools/link.hxx> #include <vcl/timer.hxx> diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index 9b683bb3f29b..63d3f72e9f0e 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase3.hxx> // helper for implementations -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SfxItemPropertySet; class SwXTextDocument; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 342759d059b2..19f1db863bee 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -40,7 +40,6 @@ #include <cppuhelper/interfacecontainer.h> #include <comphelper/uno3.hxx> -#include <tools/string.hxx> #include <calbck.hxx> #include <TextCursorHelper.hxx> diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 3a91d57f0e19..93683e282c5a 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -23,7 +23,6 @@ #include <config_features.h> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <tools/color.hxx> #include <sfx2/zoomitem.hxx> |