Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

20 files changed, 75 insertions, 101 deletions

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index d9ab7f16fd79..917cc2ced113 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -35,14 +35,12 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <cppuhelper/weak.hxx>
+#include <rtl/ustring.hxx>
+#include <svl/lstner.hxx>
 #include <tools/link.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
-#include <svl/lstner.hxx>
-
-#include <cppuhelper/weak.hxx>
 #include <ucbhelper/content.hxx>
-
 #include <vector>
 
 class SvKeyValueIterator;
@@ -78,17 +76,6 @@ public:
                                    StreamMode nOpenMode,
                                    const SfxFilter *pFilter = 0,
                                    SfxItemSet *pSet = 0 );
-                        //TODO: the next, non-defined overload is only there to
-                        // detect uses of the above (String, StreamMode, etc.)
-                        // overload from when it still had an additional third
-                        // parameter sal_Bool bDirect, where now a leftover
-                        // "false" or "sal_False" could be mistaken for a null
-                        // pointer argument for the pFilter parameter; it can be
-                        // removed once we are confident all old uses of the
-                        // original overload have been adapted (in platform
-                        // specific code etc.):
-                        SfxMedium(String const &, StreamMode, void *)
-                            SAL_DELETED_FUNCTION;
 
                         /**
                          * @param pSet does NOT take ownership
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index bd2d41e92da8..2470155462e8 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -19,23 +19,22 @@
 #ifndef _SFX_DOCFILT_HACK_HXX
 #define _SFX_DOCFILT_HACK_HXX
 
-#include <sal/config.h>
-#include <sfx2/dllapi.h>
-#include <sal/types.h>
-#include <tools/solar.h>
-#include <tools/string.hxx>
 #include <com/sun/star/plugin/PluginDescription.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <comphelper/documentconstants.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/sfxdefs.hxx>
+#include <tools/solar.h>
 #include <tools/wldcrd.hxx>
 
-#include <comphelper/documentconstants.hxx>
 #define SFX_FILTER_STARTPRESENTATION 0x20000000L
 
-#include <sfx2/sfxdefs.hxx>
-
 class SfxFilterContainer;
 class SotStorage;
 
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index beee0aff0138..414991d7728d 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -20,13 +20,12 @@
 #ifndef _SFX_DOCINSERT_HXX
 #define _SFX_DOCINSERT_HXX
 
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
 #include <tools/errcode.hxx>
 #include <tools/link.hxx>
-#include <tools/string.hxx>
 #include <vector>
 
-#include "sfx2/dllapi.h"
-
 namespace sfx2 { class FileDialogHelper; }
 class SfxMedium;
 class SfxItemSet;
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index f79a4b5f327b..cc3fc4e0ea74 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -19,11 +19,11 @@
 #ifndef _SFXDOCTEMPL_HXX
 #define _SFXDOCTEMPL_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <tools/ref.hxx>
-#include <tools/string.hxx>
 
 // CLASS -----------------------------------------------------------------
 
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 67fbc847bceb..f178a40544cd 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -22,7 +22,6 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sfx2/sfx.hrc"
-#include <tools/string.hxx>
 #include <svl/hint.hxx>
 #include <unotools/eventcfg.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index b2944162c008..163eef9a1388 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <tools/errcode.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 7bff40381ee9..510f79bdd664 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -54,11 +54,12 @@ namespace com
         }
     }
 }
-#include <tools/ref.hxx>
-#include <tools/string.hxx>
+
+#include <comphelper/namedvaluecollection.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/poolitem.hxx>
-#include <comphelper/namedvaluecollection.hxx>
+#include <tools/ref.hxx>
 #include <vector>
 
 class SvBorder;
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index dae89392d709..7837849f8768 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -19,14 +19,13 @@
 #ifndef _SFX_FRMDESCRHXX
 #define _SFX_FRMDESCRHXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/sfxsids.hrc>
 #include <svl/poolitem.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/string.hxx>
 #include <tools/gen.hxx>
+#include <tools/urlobj.hxx>
 
 class SvStream;
 struct SfxFrameDescriptor_Impl;
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index f8ddc888d242..909a5ae09823 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -19,13 +19,12 @@
 #ifndef _LINKMGR_HXX
 #define _LINKMGR_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/linksrc.hxx>
-#include <tools/string.hxx>
-
-#include <vector>
 #include <set>
+#include <vector>
 
 class SfxObjectShell;
 class Graphic;
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 5b8d1b1d8c2e..71ccb16b8888 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -20,12 +20,12 @@
 #define _LNKBASE_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/linksrc.hxx>
 #include <sot/exchange.hxx>
 #include <tools/ref.hxx>
-#include <tools/string.hxx>
-#include <sfx2/linksrc.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno
 {
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 87f3d09010e4..ff89a4d5cc0b 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_SFX_MAILMODEL_HXX
 #define INCLUDED_SFX_MAILMODEL_HXX
 
-#include <vector>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "tools/link.hxx"
-#include <tools/string.hxx>
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
+#include <tools/link.hxx>
+#include <vector>
 
 // class AddressList_Impl ------------------------------------------------
 typedef ::std::vector< OUString > AddressList_Impl;
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index 1e70ae99cf2f..e324946c4164 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -20,11 +20,11 @@
 #ifndef _MIECLIP_HXX
 #define _MIECLIP_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 
 class SvStream;
 class SotDataObject;
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index f08bb68824e2..41780767474f 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -19,10 +19,11 @@
 #ifndef _SFX_MINFITEM_HXX
 #define _SFX_MINFITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <svl/poolitem.hxx>
+
 class BasicManager;
 
 class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index c2b7d2b3e5ad..5fa53213e559 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -19,8 +19,12 @@
 #ifndef _SFXMNUITEM_HXX
 #define _SFXMNUITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/ctrlitem.hxx>
+#include <sfx2/dllapi.h>
 
 class SfxVirtualMenu;
 class SfxBindings;
@@ -30,11 +34,6 @@ class PopupMenu;
 class SfxUnoMenuControl;
 class SfxUnoControllerItem;
 struct SfxMenuCtrlFactory;
-#include <tools/string.hxx>
-#include <sfx2/ctrlitem.hxx>
-
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/util/URL.hpp>
 
 class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
 {
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index 891bcac0402b..9f0a4eb84c4e 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -19,13 +19,11 @@
 #ifndef _SFXMSGPOOL_HXX
 #define _SFXMSGPOOL_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/msg.hxx>
-#include <tools/string.hxx>
-
 #include <string>
 #include <vector>
 
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 3a0a81b59d1f..f852a0009a6a 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -19,15 +19,12 @@
 #ifndef _SFXOBJFACE_HXX
 #define _SFXOBJFACE_HXX
 
-#include "sal/config.h"
-
-#include "rtl/ustring.hxx"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
-#include <tools/string.hxx>
-#include <tools/resid.hxx>
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/msg.hxx>
+#include <tools/resid.hxx>
 
 struct SfxFormalArgument;
 struct SfxInterface_Impl;
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index a3e059bb3a62..b5455a8216ad 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -19,17 +19,15 @@
 #ifndef _SFX_SHELL_HXX
 #define _SFX_SHELL_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
 #include <com/sun/star/embed/VerbDescriptor.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/sfxuno.hxx>
+#include <svl/brdcst.hxx>
 #include <tools/debug.hxx>
 #include <tools/rtti.hxx>
-#include <svl/brdcst.hxx>
-
-#include <tools/string.hxx>
-
-#include <sfx2/sfxuno.hxx>
 
 class ResMgr;
 class Window;
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 67beb335833a..69915308004f 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -19,13 +19,12 @@
 #ifndef _SFX_STYFITEM_HXX
 #define _SFX_STYFITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 #include <tools/rc.hxx>
-#include <tools/string.hxx>
 #include <rsc/rscsfx.hxx>
 #include <vector>
 
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 93278038fec5..30fa06ea2dbe 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -19,12 +19,12 @@
 #ifndef _SFX_TPLPITEM_HXX
 #define _SFX_TPLPITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
-#include <tools/rtti.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <svl/flagitem.hxx>
 #include <svl/style.hrc>
+#include <tools/rtti.hxx>
 
 class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 {
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 7ff45729dad1..a4184c15dc2f 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -19,9 +19,9 @@
 #ifndef _VIEWFAC_HXX
 #define _VIEWFAC_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <tools/resid.hxx>
 
 class SfxViewFrame;