Convert include/svtools/ehdl.hxx from String to OUString

and de-virtual SfxErrorContext::GetString, since nothing was
overriding it.

Change-Id: Ie274c57b22880742dd221c37284441b788dfb411

include/svtools/ehdl.hxx

@@ -37,15 +37,15 @@ public:
             sal_uInt16 nCtxIdP, Window *pWin=0,
             sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0);
     SfxErrorContext(
-            sal_uInt16 nCtxIdP, const String &aArg1, Window *pWin=0,
+            sal_uInt16 nCtxIdP, const OUString &aArg1, Window *pWin=0,
             sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0);
-    virtual bool GetString(sal_uLong nErrId, OUString &rStr);
+    bool GetString(sal_uLong nErrId, OUString &rStr);
 
 private:
     sal_uInt16 nCtxId;
     sal_uInt16 nResId;
     ResMgr *pMgr;
-    String aArg1;
+    OUString aArg1;
 };
 
 class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler
@@ -66,7 +66,7 @@ private:
     ResMgr          *pMgr;
     ResMgr          *pFreeMgr;
 
-    SVT_DLLPRIVATE sal_Bool             GetClassString(sal_uLong lErrId, String &) const;
+    SVT_DLLPRIVATE sal_Bool             GetClassString(sal_uLong lErrId, OUString &) const;
     virtual bool     CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const;
 };
 

svtools/source/misc/ehdl.cxx

@@ -266,7 +266,7 @@ struct ErrorResource_Impl : private Resource
 };
 
 
-sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, String &rStr) const
+sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const
 
 /*  [Beschreibung]
 
@@ -358,12 +358,12 @@ sal_Bool SfxErrorHandler::GetErrorString(
 
     if( bRet )
     {
-        String aErrStr;
+        OUString aErrStr;
         GetClassString(lErrId & ERRCODE_CLASS_MASK,
                        aErrStr);
-        if(aErrStr.Len())
-            aErrStr += OUString(".\n");
-        rStr = rStr.replaceAll(OUString("$(CLASS)"),aErrStr);
+        if(!aErrStr.isEmpty())
+            aErrStr += ".\n";
+        rStr = rStr.replaceAll("$(CLASS)",aErrStr);
     }
 
     return bRet;
@@ -382,7 +382,7 @@ SfxErrorContext::SfxErrorContext(
 //-------------------------------------------------------------------------
 
 SfxErrorContext::SfxErrorContext(
-    sal_uInt16 nCtxIdP, const String &aArg1P, Window *pWindow,
+    sal_uInt16 nCtxIdP, const OUString &aArg1P, Window *pWindow,
     sal_uInt16 nResIdP, ResMgr *pMgrP)
 :   ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP),
     aArg1(aArg1P)