convert remains of String to vbahelper module to OUString

Change-Id: Ibbecdd1c28ba078e1031ec6185beaff05b6d8b6e

include/vbahelper/vbahelper.hxx

@@ -59,7 +59,7 @@ namespace ooo
 
         /** Returns the VBA document implementation object representing the passed UNO document model. */
         VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getVBADocument( const css::uno::Reference< css::frame::XModel >& xModel );
-        VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getUnoDocModule( const String& aModName, SfxObjectShell* pShell );
+        VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getUnoDocModule( const OUString& aModName, SfxObjectShell* pShell );
         VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
 
         css::uno::Reference< css::frame::XModel > getCurrentDoc( const OUString& sKey ) throw (css::uno::RuntimeException);

vbahelper/source/vbahelper/vbahelper.cxx

@@ -557,8 +557,8 @@ ContainerUtilities::FieldInList( const uno::Sequence< OUString >& SearchList, co
 }
 bool NeedEsc(sal_Unicode cCode)
 {
-    String sEsc(".^$+\\|{}()");
-    return (STRING_NOTFOUND != sEsc.Search(cCode));
+    OUString sEsc(".^$+\\|{}()");
+    return -1 != sEsc.indexOf(cCode);
 }
 
 OUString VBAToRegexp(const OUString &rIn, bool bForLike )
@@ -1137,7 +1137,7 @@ uno::Reference< XHelperInterface > getVBADocument( const uno::Reference< frame::
     return xIf;
 }
 
-uno::Reference< XHelperInterface > getUnoDocModule( const String& aModName, SfxObjectShell* pShell )
+uno::Reference< XHelperInterface > getUnoDocModule( const OUString& aModName, SfxObjectShell* pShell )
 {
     uno::Reference< XHelperInterface > xIf;
     if ( pShell )