diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-31 19:37:03 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-31 19:37:03 -0500 |
| commit | 02bd365494a59bb9080a4d73eafbde7903bd2cc9 (patch) | |
| tree | d588b40845b221f227d22f151c754e473ed29bff /vbahelper/inc | |
| parent | 76f63f4c9b324de9a6d2e1de1c6f718a153feb26 (diff) | |
targeted string re-work
Change-Id: I7a67dba479e562ae3b08e6acf9bb6139eb155556
Diffstat (limited to 'vbahelper/inc')
| -rw-r--r-- | vbahelper/inc/vbahelper/vbacollectionimpl.hxx | 12 | ||||
| -rw-r--r-- | vbahelper/inc/vbahelper/vbapropvalue.hxx | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx index a0447bde4ef0..2149821c78be 100644 --- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx +++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx @@ -249,7 +249,7 @@ protected: virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException) { if ( !m_xNameAccess.is() ) - throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() ); + throw css::uno::RuntimeException( rtl::OUString( "ScVbaCollectionBase string index access not supported by this object" ), css::uno::Reference< css::uno::XInterface >() ); if( mbIgnoreCase ) { @@ -269,12 +269,11 @@ protected: virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) { if ( !m_xIndexAccess.is() ) - throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() ); + throw css::uno::RuntimeException( rtl::OUString( "ScVbaCollectionBase numeric index access not supported by this object" ), css::uno::Reference< css::uno::XInterface >() ); if ( nIndex <= 0 ) { throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "index is 0 or negative" ) ), + ::rtl::OUString( "index is 0 or negative" ), css::uno::Reference< css::uno::XInterface >() ); } // need to adjust for vba index ( for which first element is 1 ) @@ -305,8 +304,7 @@ public: if ( ( Index1 >>= nIndex ) != sal_True ) { rtl::OUString message; - message = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Couldn't convert index to Int32")); + message = rtl::OUString( "Couldn't convert index to Int32"); throw css::lang::IndexOutOfBoundsException( message, css::uno::Reference< css::uno::XInterface >() ); } @@ -320,7 +318,7 @@ public: // XDefaultMethod ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException) { - const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") ); + const static rtl::OUString sName( "Item" ); return sName; } // XEnumerationAccess diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx index 87414d1a7055..5cc8d73ca4f9 100644 --- a/vbahelper/inc/vbahelper/vbapropvalue.hxx +++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx @@ -55,7 +55,7 @@ public: virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } + rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } }; #endif //SC_VBA_PROPVALULE_HXX |