diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-27 13:15:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:44 +0200 |
| commit | 9f4c18e64c1e552a57126975b88a7fbf2b092d3f (patch) | |
| tree | 2df4322dfd241d411d30e7bc7310a5080141c673 | |
| parent | b47e4dbc08b782824000f4be477c5d7fa62f51e7 (diff) | |
convert remains of String to vbahelper module to OUString
Change-Id: Ibbecdd1c28ba078e1031ec6185beaff05b6d8b6e
| -rw-r--r-- | include/vbahelper/vbahelper.hxx | 2 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index be5d73906c53..f2f69f7bdcd2 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/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); diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 3f40c670da0b..ae2077f7128a 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/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 ) |