diff options
Diffstat (limited to 'sw/source/ui/vba')
138 files changed, 1285 insertions, 1286 deletions
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index dbe5f9c05409..f8e03294d9e5 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) : +SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) : SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload ) { } @@ -34,21 +34,21 @@ SwVbaAddin::~SwVbaAddin() { } -::rtl::OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException) { - rtl::OUString sName; + OUString sName; INetURLObject aURL( msFileURL ); ::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName ); return sName; } void SAL_CALL -SwVbaAddin::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ) +SwVbaAddin::setName( const OUString& ) throw ( css::uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); } -::rtl::OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException) { INetURLObject aURL( msFileURL ); aURL.CutLastName(); @@ -74,20 +74,20 @@ void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::Runt } } -rtl::OUString +OUString SwVbaAddin::getServiceImplName() { - return rtl::OUString("SwVbaAddin"); + return OUString("SwVbaAddin"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaAddin::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Addin" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Addin" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index b026f4db67f4..30b74ac6154c 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -28,25 +28,25 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAddin > SwVbaAddin_BASE; class SwVbaAddin : public SwVbaAddin_BASE { private: - rtl::OUString msFileURL; + OUString msFileURL; sal_Bool mbAutoload; sal_Bool mbInstalled; public: - SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException ); + SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException ); virtual ~SwVbaAddin(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException); virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_ADDIN_HXX */ diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index b72e98837e50..de2de86614dc 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -36,14 +36,14 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u SvtPathOptions aPathOpt; // FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin String aAddinPath = aPathOpt.GetAddinPath(); - OSL_TRACE("lcl_getAddinCollection: %s", rtl::OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("lcl_getAddinCollection: %s", OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() ); if( xSFA->isFolder( aAddinPath ) ) { - uno::Sequence< rtl::OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False ); + uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False ); sal_Int32 nEntry = sEntries.getLength(); for( sal_Int32 index = 0; index < nEntry; ++index ) { - rtl::OUString sUrl = sEntries[ index ]; + OUString sUrl = sEntries[ index ]; if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) ) { maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, sal_True ) ) ); @@ -79,20 +79,20 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaAddins::getServiceImplName() { - return rtl::OUString("SwVbaAddins"); + return OUString("SwVbaAddins"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaAddins::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Addins"); + sNames[0] = OUString("ooo.vba.word.Addins"); } return sNames; } diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index 0f6bfb8bd29a..a036e8cb70ab 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -37,8 +37,8 @@ public: // SwVbaAddins_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_ADDINS_HXX */ diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 88cf4786edb0..35e6d6ec60c2 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; -using ::rtl::OUString; SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext ) { @@ -57,10 +56,10 @@ SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XMod return static_cast< SfxObjectShell* >( word::getDocShell( xModel ) ); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName("Microsoft Word" ); + static OUString appName("Microsoft Word" ); return appName; } @@ -172,20 +171,20 @@ SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) return getCurrentWordDoc( mxContext ); } -rtl::OUString +OUString SwVbaApplication::getServiceImplName() { - return rtl::OUString("SwVbaApplication"); + return OUString("SwVbaApplication"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaApplication::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Application" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Application" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index c15f6e8c9a63..1009c877dbc5 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -42,7 +42,7 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XApplication - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException); @@ -59,8 +59,8 @@ public: virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException); virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); }; diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 0d3f165b4985..e46b0c8dd745 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -41,14 +41,14 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R if( pWhere ) { uno::Reference< text::XTextRange > xTextRange = pWhere->getXTextRange(); - xTextRange->setString( rtl::OUString("x") ); // set marker + xTextRange->setString( OUString("x") ); // set marker uno::Reference< text::XTextRange > xEndMarker = xTextRange->getEnd(); - xEndMarker->setString( rtl::OUString("x") ); // set marker + xEndMarker->setString( OUString("x") ); // set marker uno::Reference< text::XText > xText = pWhere->getXText(); mxEntry->applyTo( xEndMarker->getStart() ); uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() ); xTC->goRight( 1, sal_True ); - xTC->setString( rtl::OUString("") ); // remove marker + xTC->setString( OUString("") ); // remove marker // remove the blank paragraph if it is a rich text sal_Bool bRich = sal_False; _richtext >>= bRich; @@ -63,32 +63,32 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R uno::Reference< text::XTextViewCursor > xTVCursor = word::getXTextViewCursor( xModel ); uno::Reference< text::XTextRange > xCurrentRange( xTC->getEnd(), uno::UNO_QUERY_THROW ); xTVCursor->gotoRange( xCurrentRange, sal_False ); - rtl::OUString url = rtl::OUString( ".uno:Delete"); + OUString url = OUString( ".uno:Delete"); dispatchRequests( xModel,url ); xTVCursor->gotoRange( xEndMarker->getEnd(), sal_False ); } } - xEndMarker->setString( rtl::OUString("") ); // remove marker + xEndMarker->setString( OUString("") ); // remove marker xTC = xText->createTextCursorByRange( xEndMarker->getEnd() ); pWhere->setXTextCursor( xTC ); } return uno::Reference< word::XRange >( pWhere ); } -rtl::OUString +OUString SwVbaAutoTextEntry::getServiceImplName() { - return rtl::OUString("SwVbaAutoTextEntry"); + return OUString("SwVbaAutoTextEntry"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaAutoTextEntry::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.AutoTextEntry" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.AutoTextEntry" ); } return aServiceNames; } @@ -107,7 +107,7 @@ SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Any @@ -117,20 +117,20 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) ); } -rtl::OUString +OUString SwVbaAutoTextEntries::getServiceImplName() { - return rtl::OUString("SwVbaAutoTextEntries"); + return OUString("SwVbaAutoTextEntries"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaAutoTextEntries::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.AutoTextEntries"); + sNames[0] = OUString("ooo.vba.word.AutoTextEntries"); } return sNames; } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 38349473300a..e286b0f05b05 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -42,8 +42,8 @@ public: virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; @@ -65,8 +65,8 @@ public: // SwVbaAutoTextEntries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_AUTOTEXTENTRY_HXX */ diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index 0120130fb669..cafe3bef44c3 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -32,7 +32,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const css::uno::Reference< frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ) : + const css::uno::Reference< frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException ) : SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( true ) { uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW ); @@ -46,7 +46,7 @@ SwVbaBookmark::~SwVbaBookmark() void SwVbaBookmark::checkVality() throw ( uno::RuntimeException ) { if( !mbValid ) - throw uno::RuntimeException( rtl::OUString("The bookmark is not valid" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("The bookmark is not valid" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException ) @@ -64,12 +64,12 @@ void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException ) xSelectSupp->select( uno::makeAny( mxBookmark ) ); } -rtl::OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException ) +OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException ) { return maName; } -void SAL_CALL SwVbaBookmark::setName( const rtl::OUString& _name ) throw ( uno::RuntimeException ) +void SAL_CALL SwVbaBookmark::setName( const OUString& _name ) throw ( uno::RuntimeException ) { uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW ); xNamed->setName( _name ); @@ -83,20 +83,20 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException ) return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) ); } -rtl::OUString +OUString SwVbaBookmark::getServiceImplName() { - return rtl::OUString("SwVbaBookmark"); + return OUString("SwVbaBookmark"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaBookmark::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Bookmark" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Bookmark" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index 7343a541096f..a49b292da25b 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -32,7 +32,7 @@ class SwVbaBookmark : public SwVbaBookmark_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XTextContent > mxBookmark; - rtl::OUString maName; + OUString maName; bool mbValid; private: @@ -40,19 +40,19 @@ private: public: SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException ); virtual ~SwVbaBookmark(); // Methods - virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ); + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); + virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException ); virtual void SAL_CALL Select() throw ( css::uno::RuntimeException ); virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_BOOKMARK_HXX */ diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index aae43bfb1eb5..08515b1f9f8d 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -39,7 +39,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) ); } @@ -62,17 +62,17 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return mxIndexAccess->getElementType(); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return mxIndexAccess->hasElements(); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { return mxNameAccess->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { if( mxNameAccess->hasByName( aName ) ) { @@ -84,7 +84,7 @@ public: for( sal_Int32 nIndex = 0; nIndex < mxIndexAccess->getCount(); nIndex++ ) { uno::Reference< container::XNamed > xNamed( mxIndexAccess->getByIndex( nIndex ), uno::UNO_QUERY_THROW ); - rtl::OUString aBookmarkName = xNamed->getName(); + OUString aBookmarkName = xNamed->getName(); if( aName.equalsIgnoreAsciiCase( aBookmarkName ) ) { cachePos <<= xNamed; @@ -127,27 +127,27 @@ uno::Any SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW ); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); } -void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException) +void SwVbaBookmarks::removeBookmarkByName( const OUString& rName ) throw (uno::RuntimeException) { uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW ); word::getXTextViewCursor( mxModel )->getText()->removeTextContent( xBookmark ); } -void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const rtl::OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException) +void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.Bookmark") ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( OUString("com.sun.star.text.Bookmark") ), uno::UNO_QUERY_THROW ); uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW ); xNamed->setName( rName ); rTextRange->getText()->insertTextContent( rTextRange, xBookmark, sal_False ); } uno::Any SAL_CALL -SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException) +SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException) { uno::Reference< text::XTextRange > xTextRange; uno::Reference< word::XRange > xRange; @@ -164,7 +164,7 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw } // remove the exist bookmark - rtl::OUString aName = rName; + OUString aName = rName; if( m_xNameAccess->hasByName( aName ) ) removeBookmarkByName( aName ); @@ -198,26 +198,26 @@ SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeEx } sal_Bool SAL_CALL -SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException) +SwVbaBookmarks::Exists( const OUString& rName ) throw (css::uno::RuntimeException) { sal_Bool bExist = m_xNameAccess->hasByName( rName ); return bExist; } -rtl::OUString +OUString SwVbaBookmarks::getServiceImplName() { - return rtl::OUString("SwVbaBookmarks"); + return OUString("SwVbaBookmarks"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaBookmarks::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Bookmarks"); + sNames[0] = OUString("ooo.vba.word.Bookmarks"); } return sNames; } diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index d0eb92333ae6..4016233b7707 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -38,21 +38,21 @@ private: css::uno::Reference< css::text::XText > mxText; private: - void removeBookmarkByName( const rtl::OUString& rName ) throw (css::uno::RuntimeException); + void removeBookmarkByName( const OUString& rName ) throw (css::uno::RuntimeException); public: SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel ); virtual ~SwVbaBookmarks() {} - static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const rtl::OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException); + static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaBookmarks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XBookmarks virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException); @@ -60,8 +60,8 @@ public: virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException); virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException); }; #endif /* SW_VBA_BOOKMARKS_HXX */ diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 293b56189f20..38825f64f531 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -39,7 +39,7 @@ typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical }; -const static rtl::OUString sTableBorder("TableBorder"); +const static OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; @@ -140,18 +140,18 @@ private: } SwVbaBorder(); // no impl protected: - virtual rtl::OUString getServiceImplName() + virtual OUString getServiceImplName() { - return rtl::OUString("SwVbaBorder"); + return OUString("SwVbaBorder"); } - virtual css::uno::Sequence<rtl::OUString> getServiceNames() + virtual css::uno::Sequence<OUString> getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Border" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Border" ); } return aServiceNames; } @@ -226,12 +226,12 @@ public: break; } default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -351,20 +351,20 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::Runtim // TODO: } -rtl::OUString +OUString SwVbaBorders::getServiceImplName() { - return rtl::OUString("SwVbaBorders"); + return OUString("SwVbaBorders"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaBorders::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Borders" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Borders" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index 3e32f3c93d45..61e0679177dc 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -47,8 +47,8 @@ public: virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException); virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SW_VBA_BORDERS_HXX diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx index 4ffbf5d4d232..7756099e6423 100644 --- a/sw/source/ui/vba/vbacell.cxx +++ b/sw/source/ui/vba/vbacell.cxx @@ -88,20 +88,20 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) throw ( setHeight( uno::makeAny( height ) ); } -rtl::OUString +OUString SwVbaCell::getServiceImplName() { - return rtl::OUString("SwVbaCell"); + return OUString("SwVbaCell"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaCell::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Cell" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Cell" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 4d116e7da586..40ee0e1d182b 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -50,8 +50,8 @@ public: virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_CELL_HXX */ diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index d70b9cd9b4d5..37028bfd6a16 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -192,20 +192,20 @@ SwVbaCells::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaCells::getServiceImplName() { - return rtl::OUString("SwVbaCells"); + return OUString("SwVbaCells"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaCells::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Cells"); + sNames[0] = OUString("ooo.vba.word.Cells"); } return sNames; } diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index 0e3f2a1e4fbb..95dd41f52cf7 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -55,8 +55,8 @@ public: // SwVbaCells_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_CELLS_HXX */ diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx index 7eafde40289d..f5d6e9c9ee29 100644 --- a/sw/source/ui/vba/vbacheckbox.cxx +++ b/sw/source/ui/vba/vbacheckbox.cxx @@ -30,10 +30,10 @@ using namespace ::com::sun::star; SwVbaCheckBox::SwVbaCheckBox( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel, const uno::Reference< text::XFormField >& xFormField ) throw ( uno::RuntimeException ) : SwVbaCheckBox_BASE( rParent, rContext ), mxModel( rModel ), mxFormField( xFormField ) { - rtl::OUString sType = mxFormField->getFieldType(); + OUString sType = mxFormField->getFieldType(); if( !sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMCHECKBOX ) ) { - throw uno::RuntimeException( rtl::OUString( + throw uno::RuntimeException( OUString( "It is not a CheckBox"), uno::Reference< uno::XInterface >() ); } } @@ -62,24 +62,24 @@ sal_Bool SAL_CALL SwVbaCheckBox::getValue() throw ( uno::RuntimeException ) void SAL_CALL SwVbaCheckBox::setValue( sal_Bool value ) throw ( uno::RuntimeException ) { - rtl::OUString sValue = value ? rtl::OUString("on") : rtl::OUString("off"); - mxFormField->addParam( rtl::OUString( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True ); + OUString sValue = value ? OUString("on") : OUString("off"); + mxFormField->addParam( OUString( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True ); } -rtl::OUString +OUString SwVbaCheckBox::getServiceImplName() { - return rtl::OUString("SwVbaCheckBox"); + return OUString("SwVbaCheckBox"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaCheckBox::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.word.CheckBox" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.word.CheckBox" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacheckbox.hxx b/sw/source/ui/vba/vbacheckbox.hxx index d450f11996c6..d305ea26c56f 100644 --- a/sw/source/ui/vba/vbacheckbox.hxx +++ b/sw/source/ui/vba/vbacheckbox.hxx @@ -41,8 +41,8 @@ public: void SAL_CALL setValue( sal_Bool value ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_CHECKBOX_HXX */ diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index a4a20c3bd597..2093e4b9aae2 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -62,35 +62,35 @@ SwVbaColumn::Select( ) throw ( uno::RuntimeException ) void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw ( uno::RuntimeException ) { - rtl::OUStringBuffer aRangeName; - rtl::OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn ); + OUStringBuffer aRangeName; + OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn ); aRangeName.append(sStartCol).append(sal_Int32( 1 ) ); - rtl::OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn ); + OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn ); sal_Int32 nRowCount = xTextTable->getRows()->getCount(); aRangeName.append(':').append( sEndCol ).append( sal_Int32( nRowCount ) ); uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW ); - rtl::OUString sSelRange = aRangeName.makeStringAndClear(); + OUString sSelRange = aRangeName.makeStringAndClear(); uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( sSelRange ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelection->select( uno::makeAny( xSelRange ) ); } -rtl::OUString +OUString SwVbaColumn::getServiceImplName() { - return rtl::OUString("SwVbaColumn"); + return OUString("SwVbaColumn"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaColumn::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Column" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Column" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 1165069f5a2f..b116b690d798 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -47,8 +47,8 @@ public: static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_COLUMN_HXX */ diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index b9a9afb2c195..f41d6a4bcba0 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -104,11 +104,11 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /* { if( nIndex <= 0 || nIndex > getCount() ) { - throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw lang::IndexOutOfBoundsException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -129,20 +129,20 @@ SwVbaColumns::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaColumns::getServiceImplName() { - return rtl::OUString("SwVbaColumns"); + return OUString("SwVbaColumns"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaColumns::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Columns"); + sNames[0] = OUString("ooo.vba.word.Columns"); } return sNames; } diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index 1c91eab497e9..023e2ab4405c 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -57,8 +57,8 @@ public: // SwVbaColumns_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_COLUMNS_HXX */ diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index 547ba47f8f49..73397041d631 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -37,33 +37,33 @@ static const WordDialogTable aWordDialogTable[] = { 0, 0 } }; -rtl::OUString +OUString SwVbaDialog::mapIndexToName( sal_Int32 nIndex ) { for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ ) { if( nIndex == pTable->wdDialog ) { - return rtl::OUString::createFromAscii( pTable->ooDialog ); + return OUString::createFromAscii( pTable->ooDialog ); } } - return rtl::OUString(); + return OUString(); } -rtl::OUString +OUString SwVbaDialog::getServiceImplName() { - return rtl::OUString("SwVbaDialog"); + return OUString("SwVbaDialog"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaDialog::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialog" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialog" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index 633515df8c7b..2036cea8dc5d 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~SwVbaDialog() {} // Methods - virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_DIALOG_HXX */ diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx index ac1e5bc5cd87..db1f53019836 100644 --- a/sw/source/ui/vba/vbadialogs.cxx +++ b/sw/source/ui/vba/vbadialogs.cxx @@ -32,20 +32,20 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString +OUString SwVbaDialogs::getServiceImplName() { - return rtl::OUString("SwVbaDialogs"); + return OUString("SwVbaDialogs"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaDialogs::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialogs" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialogs" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index d4a1187bfb44..f4bf15bd765c 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -38,8 +38,8 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_DIALOGS_HXX */ diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index fa2402e0adbe..829d44d51960 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -118,7 +118,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno } catch(const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) ); @@ -240,10 +240,10 @@ SwVbaDocument::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) ); } -rtl::OUString +OUString SwVbaDocument::getServiceImplName() { - return rtl::OUString("SwVbaDocument"); + return OUString("SwVbaDocument"); } uno::Any SAL_CALL @@ -253,7 +253,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) uno::Reference<document::XDocumentPropertiesSupplier> const xDocPropSupp( getModel(), uno::UNO_QUERY_THROW); uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); - rtl::OUString sTemplateUrl = xDocProps->getTemplateURL(); + OUString sTemplateUrl = xDocProps->getTemplateURL(); xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateUrl ); return uno::makeAny( xTemplate ); @@ -262,12 +262,12 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) void SAL_CALL SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException) { - rtl::OUString sTemplate; + OUString sTemplate; if( !( _attachedtemplate >>= sTemplate ) ) { throw uno::RuntimeException(); } - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( sTemplate ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -326,7 +326,7 @@ void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( ::sal_Bool /*_updatestyleson // check this property only in default paragraph style sal_Bool IsAutoHyphenation = sal_False; uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= IsAutoHyphenation; + xParaProps->getPropertyValue( OUString("ParaIsHyphenation") ) >>= IsAutoHyphenation; return IsAutoHyphenation; } @@ -334,7 +334,7 @@ void SAL_CALL SwVbaDocument::setAutoHyphenation( ::sal_Bool _autohyphenation ) t { //TODO uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( _autohyphenation ) ); + xParaProps->setPropertyValue( OUString("ParaIsHyphenation"), uno::makeAny( _autohyphenation ) ); } ::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() throw (uno::RuntimeException) @@ -353,7 +353,7 @@ void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone* //TODO sal_Int16 nHyphensLimit = 0; uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->getPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens") ) >>= nHyphensLimit; + xParaProps->getPropertyValue( OUString("ParaHyphenationMaxHyphens") ) >>= nHyphensLimit; return nHyphensLimit; } @@ -361,7 +361,7 @@ void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutiv { sal_Int16 nHyphensLimit = static_cast< sal_Int16 >( _consecutivehyphenslimit ); uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens"), uno::makeAny( nHyphensLimit ) ); + xParaProps->setPropertyValue( OUString("ParaHyphenationMaxHyphens"), uno::makeAny( nHyphensLimit ) ); } void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) throw (uno::RuntimeException) @@ -377,13 +377,13 @@ void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno void SAL_CALL SwVbaDocument::PrintPreview( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:PrintPreview"); + OUString url = OUString( ".uno:PrintPreview"); dispatchRequests( mxModel,url ); } void SAL_CALL SwVbaDocument::ClosePrintPreview( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:ClosePreview"); + OUString url = OUString( ".uno:ClosePreview"); dispatchRequests( mxModel,url ); } @@ -410,7 +410,7 @@ SwVbaDocument::Frames( const uno::Any& index ) throw (uno::RuntimeException) } uno::Any -SwVbaDocument::getControlShape( const ::rtl::OUString& sName ) +SwVbaDocument::getControlShape( const OUString& sName ) { uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); @@ -440,38 +440,38 @@ SwVbaDocument::getIntrospection( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -SwVbaDocument::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf", - rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); throw uno::RuntimeException(); // unsupported operation } void SAL_CALL -SwVbaDocument::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +SwVbaDocument::setValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { throw uno::RuntimeException(); // unsupported operation } uno::Any SAL_CALL -SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) +SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } ::sal_Bool SAL_CALL -SwVbaDocument::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) +SwVbaDocument::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException) { return sal_False; } ::sal_Bool SAL_CALL -SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +SwVbaDocument::hasProperty( const OUString& aName ) throw (uno::RuntimeException) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) @@ -499,14 +499,14 @@ SwVbaDocument::getFormControls() return xFormControls; } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaDocument::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Document" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Document" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index 3760139840fe..c1f4469dbada 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -32,7 +32,7 @@ private: css::uno::Reference< css::text::XTextDocument > mxTextDocument; void Initialize(); - css::uno::Any getControlShape( const rtl::OUString& sName ); + css::uno::Any getControlShape( const OUString& sName ); css::uno::Reference< css::container::XNameAccess > getFormControls(); public: @@ -79,15 +79,15 @@ public: // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_DOCUMENT_HXX */ diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index db8f40865ce6..9a3701a033c8 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -74,8 +74,8 @@ public: uno::UNO_SET_THROW); } virtual ~PropertGetSetHelper() {} - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) = 0; - virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) = 0; + virtual uno::Any getPropertyValue( const OUString& rPropName ) = 0; + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) = 0; virtual uno::Reference< beans::XPropertySet > getUserDefinedProperties() { return uno::Reference<beans::XPropertySet>( m_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); @@ -89,7 +89,7 @@ public: BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) { if ( rPropName == "EditingDuration" ) { @@ -150,7 +150,7 @@ public: return getUserDefinedProperties()->getPropertyValue(rPropName); } } - virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) { if ("EditingDuration" == rPropName) { @@ -270,12 +270,12 @@ public: CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) { return getUserDefinedProperties()->getPropertyValue(rPropName); } virtual void setPropertyValue( - const rtl::OUString& rPropName, const uno::Any& rValue) + const OUString& rPropName, const uno::Any& rValue) { return getUserDefinedProperties()->setPropertyValue(rPropName, rValue); } @@ -291,7 +291,7 @@ public: mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW ); mpDocShell = word::getDocShell( xModel ); } - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) { try { @@ -336,7 +336,7 @@ public: return aReturn; } - virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) { uno::Sequence< beans::NamedValue > stats( m_xDocProps->getDocumentStatistics()); @@ -357,11 +357,11 @@ public: class DocPropInfo { public: - rtl::OUString msMSODesc; - rtl::OUString msOOOPropName; + OUString msMSODesc; + OUString msOOOPropName; boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper; - static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) + static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) { DocPropInfo aItem; aItem.msMSODesc = sDesc; @@ -372,7 +372,7 @@ public: static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) { - return createDocPropInfo( rtl::OUString::createFromAscii( sDesc ), rtl::OUString::createFromAscii( sPropName ), rHelper ); + return createDocPropInfo( OUString::createFromAscii( sDesc ), OUString::createFromAscii( sPropName ), rHelper ); } uno::Any getValue() { @@ -453,21 +453,21 @@ public: SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); // XDocumentProperty virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException); virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException); virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); //XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return rtl::OUString("Value"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return OUString("Value"); } // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual uno::Sequence<OUString> getServiceNames(); }; class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty @@ -479,10 +479,10 @@ public: virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException); }; @@ -504,21 +504,21 @@ SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw { } -rtl::OUString +OUString SwVbaCustomDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException) { // #FIXME we need to store the link content somewhere - return rtl::OUString(); + return OUString(); } void -SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaCustomDocumentProperty::setLinkSource( const OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // #FIXME we need to store the link source somewhere } void SAL_CALL -SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // setName on existing property ? // #FIXME @@ -551,14 +551,14 @@ SwVbaBuiltInDocumentProperty::Delete( ) throw (script::BasicErrorException, uno throw uno::RuntimeException(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaBuiltInDocumentProperty::getName( ) throw (script::BasicErrorException, uno::RuntimeException) { return mPropInfo.msMSODesc; } void SAL_CALL -SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaBuiltInDocumentProperty::setName( const OUString& ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); @@ -605,7 +605,7 @@ SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::B mPropInfo.setValue( Value ); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin @@ -613,26 +613,26 @@ SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorExcepti } void SAL_CALL -SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); } -rtl::OUString +OUString SwVbaBuiltInDocumentProperty::getServiceImplName() { - return rtl::OUString("SwVbaBuiltinDocumentProperty"); + return OUString("SwVbaBuiltinDocumentProperty"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaBuiltInDocumentProperty::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperty" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperty" ); } return aServiceNames; } @@ -663,7 +663,7 @@ public: } }; -typedef boost::unordered_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName; +typedef boost::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash, ::std::equal_to< OUString > > DocPropsByName; class BuiltInPropertiesImpl : public PropertiesImpl_BASE { @@ -699,7 +699,7 @@ protected: throw lang::IndexOutOfBoundsException(); return uno::makeAny( it->second ); } - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -707,17 +707,17 @@ protected: return uno::Any( it->second ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aNames( getCount() ); - rtl::OUString* pName = aNames.getArray(); + uno::Sequence< OUString > aNames( getCount() ); + OUString* pName = aNames.getArray(); DocPropsByName::iterator it_end = mNamedDocProps.end(); for( DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName ) *pName = it->first; return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { DocPropsByName::iterator it = mNamedDocProps.find( aName ); if ( it == mNamedDocProps.end() ) @@ -744,10 +744,10 @@ SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Refer } uno::Reference< XDocumentProperty > SAL_CALL -SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) { throw uno::RuntimeException( - rtl::OUString("not supported for Builtin properties"), uno::Reference< uno::XInterface >() ); + OUString("not supported for Builtin properties"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -773,20 +773,20 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource } // XHelperInterface -rtl::OUString +OUString SwVbaBuiltinDocumentProperties::getServiceImplName() { - return rtl::OUString("SwVbaBuiltinDocumentProperties"); + return OUString("SwVbaBuiltinDocumentProperties"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaBuiltinDocumentProperties::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperties" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperties" ); } return aServiceNames; } @@ -822,7 +822,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -831,21 +831,21 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); - uno::Sequence< rtl::OUString > aNames( aProps.getLength() ); - rtl::OUString* pString = aNames.getArray(); - rtl::OUString* pEnd = ( pString + aNames.getLength() ); + uno::Sequence< OUString > aNames( aProps.getLength() ); + OUString* pString = aNames.getArray(); + OUString* pEnd = ( pString + aNames.getLength() ); beans::Property* pProp = aProps.getArray(); for ( ; pString != pEnd; ++pString, ++pProp ) *pString = pProp->Name; return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { - OSL_TRACE("hasByName(%s) returns %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); + OSL_TRACE("hasByName(%s) returns %d", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ); } @@ -873,7 +873,7 @@ public: return new DocPropEnumeration( simpleDocPropSnapShot ); } - void addProp( const ::rtl::OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value ) + void addProp( const OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value ) { sal_Int16 attributes = 128; uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW ); @@ -892,13 +892,13 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen } uno::Reference< XDocumentProperty > SAL_CALL -SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaCustomDocumentProperties::Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException) { CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() ); uno::Reference< XDocumentProperty > xDocProp; if ( pCustomProps ) { - rtl::OUString sLinkSource; + OUString sLinkSource; pCustomProps->addProp( Name, Type, Value ); xDocProp.set( m_xNameAccess->getByName( Name ), uno::UNO_QUERY_THROW ); @@ -911,10 +911,10 @@ SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool Link } // XHelperInterface -rtl::OUString +OUString SwVbaCustomDocumentProperties::getServiceImplName() { - return rtl::OUString("SwVbaCustomDocumentProperties"); + return OUString("SwVbaCustomDocumentProperties"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 5842039f13b3..cbe1b7b81fd3 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -34,7 +34,7 @@ public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); @@ -42,8 +42,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties @@ -51,9 +51,9 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties public: SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); + virtual OUString getServiceImplName(); }; #endif /* SW_VBA_DOCUMENTPROPERTY_HXX */ diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 5e55df3a67c9..b05bdd1bca90 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -107,7 +107,7 @@ SwVbaDocuments::createCollectionObject( const uno::Any& aSource ) uno::Any SAL_CALL SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException) { - rtl::OUString sFileName; + OUString sFileName; if( Template.hasValue() && ( Template >>= sFileName ) ) { return Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any()); @@ -128,10 +128,10 @@ SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*Origin // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException) +SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException) { // we need to detect if this is a URL, if not then assume its a file path - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( Filename ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -150,20 +150,20 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm return aRet; } -rtl::OUString +OUString SwVbaDocuments::getServiceImplName() { - return rtl::OUString("SwVbaDocuments"); + return OUString("SwVbaDocuments"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaDocuments::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Documents"); + sNames[0] = OUString("ooo.vba.word.Documents"); } return sNames; } diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 69d37d76a0b5..aaf1529995ff 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -41,12 +41,12 @@ public: // SwVbaDocuments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // Methods virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException); }; diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index c5c9e93add22..2e0e533be8a3 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -75,11 +75,11 @@ void SwVbaEventsHelper::implPostProcessEvent( EventQueue& /*rEventQueue*/, // nothing to do after any event } -::rtl::OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/, +OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/, const uno::Sequence< uno::Any >& /*rArgs*/ ) const throw (lang::IllegalArgumentException) { // TODO: get actual codename from document - return ::rtl::OUString( "ThisDocument" ); + return OUString( "ThisDocument" ); } // ============================================================================ diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index 8e405334396c..92f7d62d1c65 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -36,7 +36,7 @@ protected: virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); }; // ============================================================================ diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 4e5150fa7dd4..df729ad1c553 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -51,20 +51,20 @@ sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString +OUString SwVbaField::getServiceImplName() { - return rtl::OUString("SwVbaField"); + return OUString("SwVbaField"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaField::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Field" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Field" ); } return aServiceNames; } @@ -323,7 +323,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, { sal_Int32 nType = word::WdFieldType::wdFieldEmpty; Type >>= nType; - rtl::OUString sText; + OUString sText; Text >>= sText; String sFieldName; @@ -331,7 +331,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, { SwVbaReadFieldParams aReadParam(sText); sFieldName = aReadParam.GetFieldName(); - OSL_TRACE("SwVbaFields::Add, the field name is %s ",rtl::OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SwVbaFields::Add, the field name is %s ",OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() ); } uno::Reference< text::XTextContent > xTextField; @@ -345,7 +345,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() ); @@ -355,9 +355,9 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW ), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) ); } -uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl::OUString _text ) throw (uno::RuntimeException) +uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUString _text ) throw (uno::RuntimeException) { - uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( rtl::OUString("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( OUString("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW ); sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT; if( !_text.isEmpty() ) { @@ -375,14 +375,14 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl aReadParam.SkipToNextToken(); break; default: - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); break; } } } uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( rtl::OUString("FileFormat"), uno::makeAny( nFileFormat ) ); + xProps->setPropertyValue( OUString("FileFormat"), uno::makeAny( nFileFormat ) ); return xTextField; } @@ -424,7 +424,7 @@ static const DocPropertyTable aDocPropertyTables[] = { NULL, NULL } }; -uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const rtl::OUString _text ) throw (uno::RuntimeException) +uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString _text ) throw (uno::RuntimeException) { String aDocProperty; SwVbaReadFieldParams aReadParam( _text ); @@ -444,21 +444,21 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const } } aDocProperty = comphelper::string::remove(aDocProperty, '"'); - OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",rtl::OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() ); if( aDocProperty.Len() == 0 ) { throw uno::RuntimeException(); } bool bCustom = true; - rtl::OUString sFieldService; + OUString sFieldService; // find the build in document properties for( const DocPropertyTable* pTable = aDocPropertyTables; pTable->sDocPropertyName != NULL; pTable++ ) { if( aDocProperty.EqualsIgnoreCaseAscii( pTable->sDocPropertyName ) ) { if( pTable->sFieldService != NULL ) - sFieldService = rtl::OUString::createFromAscii(pTable->sFieldService); + sFieldService = OUString::createFromAscii(pTable->sFieldService); bCustom = false; break; } @@ -466,11 +466,11 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { - sFieldService = rtl::OUString( "com.sun.star.text.textfield.docinfo.Custom" ); + sFieldService = OUString( "com.sun.star.text.textfield.docinfo.Custom" ); } else if( sFieldService.isEmpty() ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( sFieldService ), uno::UNO_QUERY_THROW ); @@ -478,8 +478,8 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - rtl::OUString sDocPropertyName( aDocProperty ); - xProps->setPropertyValue( rtl::OUString("Name"), uno::makeAny( sDocPropertyName ) ); + OUString sDocPropertyName( aDocProperty ); + xProps->setPropertyValue( OUString("Name"), uno::makeAny( sDocPropertyName ) ); } return xTextField; @@ -517,10 +517,10 @@ sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString +OUString SwVbaFields::getServiceImplName() { - return rtl::OUString("SwVbaFields"); + return OUString("SwVbaFields"); } // XEnumerationAccess @@ -530,14 +530,14 @@ SwVbaFields::getElementType() throw (uno::RuntimeException) return word::XField::static_type(0); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaFields::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Fields" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Fields" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 56092a2af856..8bafae282fde 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -36,8 +36,8 @@ public: virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; // *** SwVbaFields *********************************************** @@ -49,8 +49,8 @@ class SwVbaFields : public SwVbaFields_BASE css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; private: - css::uno::Reference< css::text::XTextField > Create_Field_FileName( const rtl::OUString _text ) throw (css::uno::RuntimeException); - css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const rtl::OUString _text ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XTextField > Create_Field_FileName( const OUString _text ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const OUString _text ) throw (css::uno::RuntimeException); public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -64,8 +64,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index 0dce30854922..bc6deacf8680 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -57,13 +57,13 @@ bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrent return false; } -void SwVbaFind::SetReplaceWith( const rtl::OUString& rText ) throw (uno::RuntimeException) +void SwVbaFind::SetReplaceWith( const OUString& rText ) throw (uno::RuntimeException) { mxPropertyReplace->setReplaceString( rText ); mbReplace = true; } -rtl::OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException) +OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException) { return mxPropertyReplace->getReplaceString(); } @@ -175,12 +175,12 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException) return result; } -::rtl::OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException) { return mxPropertyReplace->getSearchString(); } -void SAL_CALL SwVbaFind::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException) +void SAL_CALL SwVbaFind::setText( const OUString& _text ) throw (uno::RuntimeException) { mxPropertyReplace->setSearchString( _text ); } @@ -192,20 +192,20 @@ uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException) void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } ::sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException) { sal_Bool bBackward = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchBackwards") ) >>= bBackward; + mxPropertyReplace->getPropertyValue( OUString("SearchBackwards") ) >>= bBackward; return !bBackward; } void SAL_CALL SwVbaFind::setForward( ::sal_Bool _forward ) throw (uno::RuntimeException) { sal_Bool bBackward = !_forward; - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchBackwards"), uno::makeAny( bBackward ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchBackwards"), uno::makeAny( bBackward ) ); } ::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException) @@ -233,76 +233,76 @@ void SAL_CALL SwVbaFind::setFormat( ::sal_Bool _format ) throw (uno::RuntimeExce ::sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchCaseSensitive") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchCaseSensitive") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchCase( ::sal_Bool _matchcase ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchCaseSensitive"), uno::makeAny( _matchcase ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchCaseSensitive"), uno::makeAny( _matchcase ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchWords") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchWords") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchWords"), uno::makeAny( _matchwholeword ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchWords"), uno::makeAny( _matchwholeword ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchRegularExpression") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchRegularExpression") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchWildcards( ::sal_Bool _matchwildcards ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchRegularExpression"), uno::makeAny( _matchwildcards ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchRegularExpression"), uno::makeAny( _matchwildcards ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchSimilarity") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (uno::RuntimeException) { // seems not accurate - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchsoundslike ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchSimilarity"), uno::makeAny( _matchsoundslike ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchSimilarity") ) >>= value; if( value ) - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarityRelax") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchSimilarityRelax") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (uno::RuntimeException) { // seems not accurate - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchallwordforms ) ); - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarityRelax"), uno::makeAny( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchSimilarity"), uno::makeAny( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchSimilarityRelax"), uno::makeAny( _matchallwordforms ) ); } uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } sal_Bool SAL_CALL @@ -311,7 +311,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u sal_Bool result = sal_False; if( FindText.hasValue() ) { - rtl::OUString sText; + OUString sText; FindText >>= sText; setText( sText ); } @@ -368,7 +368,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u if( ReplaceWith.hasValue() ) { - rtl::OUString sValue; + OUString sValue; ReplaceWith >>= sValue; SetReplaceWith( sValue ); } @@ -392,20 +392,20 @@ SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException) mxPropertyReplace->setSearchAttributes( aSearchAttribs ); } -rtl::OUString +OUString SwVbaFind::getServiceImplName() { - return rtl::OUString("SwVbaFind"); + return OUString("SwVbaFind"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFind::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Find" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Find" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index 219260269e4d..55167b340e41 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -48,8 +48,8 @@ private: bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); void SetReplace( sal_Int32 type ); - void SetReplaceWith( const rtl::OUString& rText ) throw ( css::uno::RuntimeException ); - rtl::OUString GetReplaceWith() throw ( css::uno::RuntimeException ); + void SetReplaceWith( const OUString& rText ) throw ( css::uno::RuntimeException ); + OUString GetReplaceWith() throw ( css::uno::RuntimeException ); css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException ); sal_Bool SearchReplace() throw ( css::uno::RuntimeException ); @@ -58,8 +58,8 @@ public: virtual ~SwVbaFind(); // Attributes - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException); virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException); @@ -86,8 +86,8 @@ public: virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_FIND_HXX */ diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index ac74b19eebad..7866611bed55 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -74,9 +74,9 @@ private: } } public: - static rtl::OUString propName() + static OUString propName() { - static rtl::OUString sPropName("CharUnderline"); + static OUString sPropName("CharUnderline"); return sPropName; } @@ -126,10 +126,10 @@ SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeExcepti } } -rtl::OUString +OUString SwVbaFont::getServiceImplName() { - return rtl::OUString("SwVbaFont"); + return OUString("SwVbaFont"); } void SAL_CALL @@ -220,14 +220,14 @@ SwVbaFont::getShadow() throw (uno::RuntimeException) return aLongAnyFalse; } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFont::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Font" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Font" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 814318ac43d6..b4b3721e681f 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -44,8 +44,8 @@ public: virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx index 2fdc03fbbb7d..7384dd6a120a 100644 --- a/sw/source/ui/vba/vbaformfield.cxx +++ b/sw/source/ui/vba/vbaformfield.cxx @@ -37,10 +37,10 @@ SwVbaFormField::~SwVbaFormField() { } -rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException ) +OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException ) { - rtl::OUString sResult; - rtl::OUString sType = mxFormField->getFieldType(); + OUString sResult; + OUString sType = mxFormField->getFieldType(); if( sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMTEXT ) ) { uno::Reference< text::XTextContent > xTextContent( mxFormField, uno::UNO_QUERY_THROW ); @@ -63,18 +63,18 @@ rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException } } - sResult = rtl::OUString::valueOf( nValue ); + sResult = OUString::valueOf( nValue ); } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return sResult; } -void SAL_CALL SwVbaFormField::setResult( const rtl::OUString& result ) throw ( uno::RuntimeException ) +void SAL_CALL SwVbaFormField::setResult( const OUString& result ) throw ( uno::RuntimeException ) { - rtl::OUString sType = mxFormField->getFieldType(); + OUString sType = mxFormField->getFieldType(); if( sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMTEXT ) ) { uno::Reference< text::XTextContent > xTextContent( mxFormField, uno::UNO_QUERY_THROW ); @@ -87,7 +87,7 @@ void SAL_CALL SwVbaFormField::setResult( const rtl::OUString& result ) throw ( u } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } @@ -107,20 +107,20 @@ uno::Any SAL_CALL SwVbaFormField::CheckBox() throw ( uno::RuntimeException ) return uno::makeAny( uno::Reference< word::XCheckBox >( new SwVbaCheckBox( this, mxContext, mxModel, mxFormField ) ) ); } -rtl::OUString +OUString SwVbaFormField::getServiceImplName() { - return rtl::OUString("SwVbaFormField"); + return OUString("SwVbaFormField"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFormField::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.FormField" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.FormField" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaformfield.hxx b/sw/source/ui/vba/vbaformfield.hxx index 2d55d5a463df..d99849b91a19 100644 --- a/sw/source/ui/vba/vbaformfield.hxx +++ b/sw/source/ui/vba/vbaformfield.hxx @@ -37,15 +37,15 @@ public: virtual ~SwVbaFormField(); // Methods - rtl::OUString SAL_CALL getResult() throw ( css::uno::RuntimeException ); - void SAL_CALL setResult( const rtl::OUString& result ) throw ( css::uno::RuntimeException ); + OUString SAL_CALL getResult() throw ( css::uno::RuntimeException ); + void SAL_CALL setResult( const OUString& result ) throw ( css::uno::RuntimeException ); sal_Bool SAL_CALL getEnabled() throw ( css::uno::RuntimeException ); void SAL_CALL setEnabled( sal_Bool enabled ) throw ( css::uno::RuntimeException ); css::uno::Any SAL_CALL CheckBox() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_FORMFIELD_HXX */ diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx index a421088d96ea..ba554fb07fd4 100644 --- a/sw/source/ui/vba/vbaformfields.cxx +++ b/sw/source/ui/vba/vbaformfields.cxx @@ -32,16 +32,16 @@ typedef std::vector< uno::Reference< text::XFormField > > XFormFieldVec; typedef ::cppu::WeakImplHelper1< container::XEnumeration > FormFiledEnumeration_BASE; typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > FormFieldCollectionHelper_BASE; -rtl::OUString lcl_getFormFieldName( const uno::Reference< text::XFormField >& xFormField ) +OUString lcl_getFormFieldName( const uno::Reference< text::XFormField >& xFormField ) { - rtl::OUString sName; + OUString sName; sal_Int32 nCount = xFormField->getParamCount(); for( sal_Int32 i = 0; i < nCount; i++ ) { if( xFormField->getParamName(i).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) ) { sName = xFormField->getParamValue(i); - OSL_TRACE("lcl_getFormFieldName: %s", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("lcl_getFormFieldName: %s", OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); break; } } @@ -101,17 +101,17 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return word::XFormField::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XFormField > xFormField( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XFormField >( new SwVbaFormField( mxParent, mxContext, mxModel, xFormField ) ) ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > sNames( mxFormFields.size() ); - rtl::OUString* pString = sNames.getArray(); + uno::Sequence< OUString > sNames( mxFormFields.size() ); + OUString* pString = sNames.getArray(); XFormFieldVec::iterator it = mxFormFields.begin(); XFormFieldVec::iterator it_end = mxFormFields.end(); for ( ; it != it_end; ++it, ++pString ) @@ -121,7 +121,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { cachePos = mxFormFields.begin(); XFormFieldVec::iterator it_end = mxFormFields.end(); @@ -174,20 +174,20 @@ SwVbaFormFields::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaFormFields::getServiceImplName() { - return rtl::OUString("SwVbaFormFields"); + return OUString("SwVbaFormFields"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaFormFields::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.FormFields"); + sNames[0] = OUString("ooo.vba.word.FormFields"); } return sNames; } diff --git a/sw/source/ui/vba/vbaformfields.hxx b/sw/source/ui/vba/vbaformfields.hxx index 7b81688385b8..8ce86466a04d 100644 --- a/sw/source/ui/vba/vbaformfields.hxx +++ b/sw/source/ui/vba/vbaformfields.hxx @@ -42,8 +42,8 @@ public: // SwVbaFormFields_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_FORMFIELDS_HXX */ diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx index 3dc5bad28821..4b1564dde8f1 100644 --- a/sw/source/ui/vba/vbaframe.cxx +++ b/sw/source/ui/vba/vbaframe.cxx @@ -43,20 +43,20 @@ void SAL_CALL SwVbaFrame::Select() throw ( uno::RuntimeException ) xSelectSupp->select( uno::makeAny( mxTextFrame ) ); } -rtl::OUString +OUString SwVbaFrame::getServiceImplName() { - return rtl::OUString("SwVbaFrame"); + return OUString("SwVbaFrame"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFrame::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Frame" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Frame" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 2fb130f6bf34..7bde2fc94376 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -40,8 +40,8 @@ public: virtual void SAL_CALL Select() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_FRAME_HXX */ diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 259584f003d7..84863a268cd0 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -78,20 +78,20 @@ SwVbaFrames::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XFrame > ( new SwVbaFrame( this, mxContext, mxModel, xTextFrame ) ) ); } -rtl::OUString +OUString SwVbaFrames::getServiceImplName() { - return rtl::OUString("SwVbaFrames"); + return OUString("SwVbaFrames"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaFrames::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Frames"); + sNames[0] = OUString("ooo.vba.word.Frames"); } return sNames; } diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx index 363631b720b9..c2df6683df4c 100644 --- a/sw/source/ui/vba/vbaframes.hxx +++ b/sw/source/ui/vba/vbaframes.hxx @@ -42,8 +42,8 @@ public: // SwVbaFrames_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 3088dd116542..6772cd5384ff 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno; using namespace ::ooo::vba; -rtl::OUString sDocCtxName("WordDocumentContext"); +OUString sDocCtxName("WordDocumentContext"); // ============================================================================= // SwVbaGlobals @@ -41,7 +41,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere { OSL_TRACE("SwVbaGlobals::SwVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = rtl::OUString("Application"); + aInitArgs[ 0 ].Name = OUString("Application"); aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -85,7 +85,7 @@ SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException) return getApplication()->getActiveWindow(); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaGlobals::getName() throw (uno::RuntimeException) { return getApplication()->getName(); @@ -138,35 +138,35 @@ float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (un return getApplication()->CentimetersToPoints( _Centimeters ); } -rtl::OUString +OUString SwVbaGlobals::getServiceImplName() { - return rtl::OUString("SwVbaGlobals"); + return OUString("SwVbaGlobals"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaGlobals::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Globals" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Globals" ); } return aServiceNames; } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) { static bool bInit = false; - static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() ); + static uno::Sequence< OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() ); if ( !bInit ) { - rtl::OUString names[] = { - ::rtl::OUString( "ooo.vba.word.Document" ), + OUString names[] = { + OUString( "ooo.vba.word.Document" ), // #FIXME #TODO make Application a proper service -// ::rtl::OUString( "ooo.vba.word.Application" ), +// OUString( "ooo.vba.word.Application" ), }; sal_Int32 nWordServices = SAL_N_ELEMENTS( names ); sal_Int32 startIndex = serviceNames.getLength(); diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index ac452f28b028..2b848dc90060 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -51,7 +51,7 @@ public: virtual ~SwVbaGlobals(); // XGlobals - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException); @@ -64,11 +64,11 @@ public: virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); // XMultiServiceFactory - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_GLOBALS_HXX */ diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index e13eafda4ce3..9714e7623616 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -51,18 +51,18 @@ void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool /*_linktoprevious uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno::RuntimeException) { - rtl::OUString sPropsNameText; + OUString sPropsNameText; if( mbHeader ) { - sPropsNameText = rtl::OUString("HeaderText"); + sPropsNameText = OUString("HeaderText"); } else { - sPropsNameText = rtl::OUString("FooterText"); + sPropsNameText = OUString("FooterText"); } if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages ) { - sPropsNameText = sPropsNameText.concat( rtl::OUString("Left") ); + sPropsNameText = sPropsNameText.concat( OUString("Left") ); } uno::Reference< text::XText > xText( mxPageStyleProps->getPropertyValue( sPropsNameText ), uno::UNO_QUERY_THROW ); @@ -83,20 +83,20 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaHeaderFooter::getServiceImplName() { - return rtl::OUString("SwVbaHeaderFooter"); + return OUString("SwVbaHeaderFooter"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaHeaderFooter::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 199314d2dd72..2b934a429947 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -46,8 +46,8 @@ public: virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_HEADERFOOTER_HXX */ diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx index 15d5e9263c32..23d9551d9a84 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx @@ -42,7 +42,7 @@ sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException) { uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW ); - rtl::OUString aImplName = xServiceInfo->getImplementationName(); + OUString aImplName = xServiceInfo->getImplementationName(); if ( aImplName == "SwXHeadFootText" ) return sal_True; return sal_False; @@ -54,8 +54,8 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - rtl::OUString aPropIsShared = rtl::OUString("HeaderIsShared"); - rtl::OUString aPropText = rtl::OUString("HeaderText"); + OUString aPropIsShared = OUString("HeaderIsShared"); + OUString aPropText = OUString("HeaderText"); uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -64,9 +64,9 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = rtl::OUString("HeaderTextLeft"); + aPropText = OUString("HeaderTextLeft"); else - aPropText = rtl::OUString("HeaderTextRight"); + aPropText = OUString("HeaderTextRight"); } uno::Reference< text::XText > xHeaderText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); @@ -104,7 +104,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; - xStyleProps->getPropertyValue( rtl::OUString("HeaderIsShared")) >>= isShared; + xStyleProps->getPropertyValue( OUString("HeaderIsShared")) >>= isShared; if( !isShared ) { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); @@ -120,8 +120,8 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - rtl::OUString aPropIsShared = rtl::OUString("FooterIsShared"); - rtl::OUString aPropText = rtl::OUString("FooterText"); + OUString aPropIsShared = OUString("FooterIsShared"); + OUString aPropText = OUString("FooterText"); uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -130,9 +130,9 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = rtl::OUString("FooterTextLeft"); + aPropText = OUString("FooterTextLeft"); else - aPropText = rtl::OUString("FooterTextRight"); + aPropText = OUString("FooterTextRight"); } uno::Reference< text::XText > xFooterText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); @@ -169,7 +169,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; - xStyleProps->getPropertyValue( rtl::OUString("FooterIsShared")) >>= isShared; + xStyleProps->getPropertyValue( OUString("FooterIsShared")) >>= isShared; if( !isShared ) { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index ec41e33d025f..b85be8af0fc8 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -119,20 +119,20 @@ SwVbaHeadersFooters::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaHeadersFooters::getServiceImplName() { - return rtl::OUString("SwVbaHeadersFooters"); + return OUString("SwVbaHeadersFooters"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaHeadersFooters::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.HeadersFooters"); + sNames[0] = OUString("ooo.vba.word.HeadersFooters"); } return sNames; } diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index ac1f65c75ba5..c51f7c14be89 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -44,8 +44,8 @@ public: // SwVbaHeadersFooters_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_HEADERSFOOTERS_HXX */ diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index ea7cf40fd5e2..bfb58d413e5c 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -68,17 +68,17 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor if( isFirstElement ) { sal_Bool isNumberingRestart = !bContinuePreviousList; - xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( isNumberingRestart ) ); + xProps->setPropertyValue( OUString("ParaIsNumberingRestart"), uno::makeAny( isNumberingRestart ) ); if( isNumberingRestart ) { sal_Int16 nStartValue = 1; - xProps->setPropertyValue( rtl::OUString("NumberingStartValue"), uno::makeAny( nStartValue ) ); + xProps->setPropertyValue( OUString("NumberingStartValue"), uno::makeAny( nStartValue ) ); } isFirstElement = sal_False; } else { - xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( OUString("ParaIsNumberingRestart"), uno::makeAny( sal_False ) ); } pListTemplate->applyListTemplate( xProps ); } @@ -86,23 +86,23 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) throw (css::uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } -rtl::OUString +OUString SwVbaListFormat::getServiceImplName() { - return rtl::OUString("SwVbaListFormat"); + return OUString("SwVbaListFormat"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListFormat::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListFormat" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index e666f0173b58..b6d940bbba3f 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -43,8 +43,8 @@ public: virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_LISTFORMAT_HXX */ diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index d25cbf0c415f..37ce9015bef2 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -62,7 +62,7 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A || nIndex == word::WdListGalleryType::wdOutlineNumberGallery ) return uno::makeAny( uno::Reference< word::XListGallery >( new SwVbaListGallery( this, mxContext, mxTextDocument, nIndex ) ) ); } - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -84,20 +84,20 @@ SwVbaListGalleries::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaListGalleries::getServiceImplName() { - return rtl::OUString("SwVbaListGalleries"); + return OUString("SwVbaListGalleries"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaListGalleries::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.ListGalleries"); + sNames[0] = OUString("ooo.vba.word.ListGalleries"); } return sNames; } diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx index 3895b325cd81..bbbb8bf04632 100644 --- a/sw/source/ui/vba/vbalistgalleries.hxx +++ b/sw/source/ui/vba/vbalistgalleries.hxx @@ -43,8 +43,8 @@ public: // SwVbaListGalleries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_LISTGALLERIES_HXX */ diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx index b7127f994b6d..812e930d73cb 100644 --- a/sw/source/ui/vba/vbalistgallery.cxx +++ b/sw/source/ui/vba/vbalistgallery.cxx @@ -41,20 +41,20 @@ SwVbaListGallery::ListTemplates( const uno::Any& index ) throw (uno::RuntimeExce return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaListGallery::getServiceImplName() { - return rtl::OUString("SwVbaListGallery"); + return OUString("SwVbaListGallery"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListGallery::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListGallery" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListGallery" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 402ccd88c13c..92369b411c51 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -41,8 +41,8 @@ public: virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_LISTGALLERY_HXX */ diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index c0974226993b..8cd6c854f62e 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -60,17 +60,17 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException ) { case word::WdListGalleryType::wdBulletGallery: { - msStyleName = rtl::OUString(WORD_BULLET_GALLERY ); + msStyleName = OUString(WORD_BULLET_GALLERY ); break; } case word::WdListGalleryType::wdNumberGallery: { - msStyleName = rtl::OUString(WORD_NUMBER_GALLERY ); + msStyleName = OUString(WORD_NUMBER_GALLERY ); break; } case word::WdListGalleryType::wdOutlineNumberGallery: { - msStyleName = rtl::OUString(WORD_OUTLINE_NUMBER_GALLERY ); + msStyleName = OUString(WORD_OUTLINE_NUMBER_GALLERY ); break; } default: @@ -78,29 +78,29 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException ) throw uno::RuntimeException(); } } - msStyleName += rtl::OUString::valueOf( mnTemplateType ); + msStyleName += OUString::valueOf( mnTemplateType ); // get the numbering style uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW ); - mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName(rtl::OUString( "NumberingStyles" ) ), uno::UNO_QUERY_THROW ); - OSL_TRACE("SwVbaListHelper::Init: numbering style name: %s", rtl::OUStringToOString( msStyleName, RTL_TEXTENCODING_UTF8 ).getStr() ); + mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName(OUString( "NumberingStyles" ) ), uno::UNO_QUERY_THROW ); + OSL_TRACE("SwVbaListHelper::Init: numbering style name: %s", OUStringToOString( msStyleName, RTL_TEXTENCODING_UTF8 ).getStr() ); if( mxStyleFamily->hasByName( msStyleName ) ) { mxStyleProps.set( mxStyleFamily->getByName( msStyleName ), uno::UNO_QUERY_THROW ); - mxNumberingRules.set( mxStyleProps->getPropertyValue( rtl::OUString( "NumberingRules" ) ), uno::UNO_QUERY_THROW ); + mxNumberingRules.set( mxStyleProps->getPropertyValue( OUString( "NumberingRules" ) ), uno::UNO_QUERY_THROW ); } else { // create new numbering style uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW ); - mxStyleProps.set( xDocMSF->createInstance( rtl::OUString( "com.sun.star.style.NumberingStyle" ) ), uno::UNO_QUERY_THROW ); + mxStyleProps.set( xDocMSF->createInstance( OUString( "com.sun.star.style.NumberingStyle" ) ), uno::UNO_QUERY_THROW ); // insert this style into style family, or the property NumberingRules doesn't exist. mxStyleFamily->insertByName( msStyleName, uno::makeAny( mxStyleProps ) ); - mxStyleProps->getPropertyValue( rtl::OUString( "NumberingRules" ) ) >>= mxNumberingRules; + mxStyleProps->getPropertyValue( OUString( "NumberingRules" ) ) >>= mxNumberingRules; CreateListTemplate(); - mxStyleProps->setPropertyValue( rtl::OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); + mxStyleProps->setPropertyValue( OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); } } @@ -136,47 +136,47 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti sal_Int32 nLevel = 0; uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - rtl::OUString sCharStyleName( "Bullet Symbols" ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); + OUString sCharStyleName( "Bullet Symbols" ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - rtl::OUString aBulletChar; + OUString aBulletChar; switch( mnTemplateType ) { case 1: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); + aBulletChar = OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); break; } case 2: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_EMPTY_DOT ) ); + aBulletChar = OUString( sal_Unicode( CHAR_EMPTY_DOT ) ); break; } case 3: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_SQUARE ) ); + aBulletChar = OUString( sal_Unicode( CHAR_SQUARE ) ); break; } case 4: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_STAR_SYMBOL ) ); + aBulletChar = OUString( sal_Unicode( CHAR_STAR_SYMBOL ) ); break; } case 5: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); + aBulletChar = OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); break; } case 6: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_ARROW ) ); + aBulletChar = OUString( sal_Unicode( CHAR_ARROW ) ); break; } case 7: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_CHECK_MARK ) ); + aBulletChar = OUString( sal_Unicode( CHAR_CHECK_MARK ) ); break; } default: @@ -185,7 +185,7 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -198,49 +198,49 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; sal_Int16 nNumberingType = 0; - rtl::OUString sSuffix; + OUString sSuffix; switch( mnTemplateType ) { case 1: { nNumberingType = style::NumberingType::ARABIC; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 2: { nNumberingType = style::NumberingType::ARABIC; - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 4: { nNumberingType = style::NumberingType::CHARS_UPPER_LETTER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 7: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -249,8 +249,8 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -305,8 +305,8 @@ void SwVbaListHelper::CreateOutlineNumberListTemplate() throw( css::uno::Runtime void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = 0; - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) @@ -318,57 +318,57 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 2: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 4: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 5: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -376,9 +376,9 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -387,18 +387,18 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce { sal_Int16 nNumberingType = style::NumberingType::ARABIC; sal_Int16 nParentNumbering = 0; - rtl::OUString sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + OUString sSuffix = OUString::valueOf( sal_Unicode('.') ); uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); } mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -407,44 +407,44 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL; - rtl::OUString sCharStyleName( "Bullet Symbols" ); - rtl::OUString aBulletChar; + OUString sCharStyleName( "Bullet Symbols" ); + OUString aBulletChar; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); switch( nLevel ) { case 0: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); + aBulletChar = OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); break; } case 1: case 5: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_ARROW ) ); + aBulletChar = OUString( sal_Unicode( CHAR_ARROW ) ); break; } case 2: case 6: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_SQUARE ) ); + aBulletChar = OUString( sal_Unicode( CHAR_SQUARE ) ); break; } case 3: case 7: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); + aBulletChar = OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); break; } case 4: case 8: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_DIAMOND ) ); + aBulletChar = OUString( sal_Unicode( CHAR_DIAMOND ) ); break; } default: @@ -452,7 +452,7 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -460,8 +460,8 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = 0; - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) @@ -472,66 +472,66 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); sal_Int16 nParentNumbering = 0; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); break; } case 2: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 4: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -539,9 +539,9 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -555,11 +555,11 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); } mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -568,8 +568,8 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = 0; - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) @@ -580,64 +580,64 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 1: { nNumberingType = style::NumberingType::CHARS_UPPER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 2: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 4: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -645,9 +645,9 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -656,31 +656,31 @@ void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeExce { sal_Int16 nNumberingType = style::NumberingType::ARABIC; uno::Sequence< beans::PropertyValue > aPropertyValues; - rtl::OUString sPrefix("Chapter "); + OUString sPrefix("Chapter "); for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } -uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException ) +uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException ) { uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; return getPropertyValue( aPropertyValues, sName ); } -void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ) +void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ) { uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; setOrAppendPropertyValue( aPropertyValues, sName, aValue ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); - mxStyleProps->setPropertyValue( rtl::OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); + mxStyleProps->setPropertyValue( OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index 0e862fa0dd2c..2d755d70e10b 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -47,7 +47,7 @@ private: css::uno::Reference< css::beans::XPropertySet > mxStyleProps; sal_Int32 mnGalleryType; sal_Int32 mnTemplateType; - rtl::OUString msStyleName; + OUString msStyleName; void Init() throw( css::uno::RuntimeException ); void CreateListTemplate() throw( css::uno::RuntimeException ); @@ -67,8 +67,8 @@ public: sal_Int32 getGalleryType() const { return mnGalleryType; } css::uno::Reference< css::container::XIndexReplace > getNumberingRules() const { return mxNumberingRules; } - css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException ); - void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ); + css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException ); + void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ); }; diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index b18754c0e590..0166b254baa0 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -39,7 +39,7 @@ SwVbaListLevel::~SwVbaListLevel() ::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment() throw (uno::RuntimeException) { sal_Int16 nAlignment = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust") ) >>= nAlignment; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("Adjust") ) >>= nAlignment; switch( nAlignment ) { case text::HoriOrientation::LEFT: @@ -90,17 +90,17 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno: throw uno::RuntimeException(); } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust"), uno::makeAny( nAlignment ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("Adjust"), uno::makeAny( nAlignment ) ); } uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getIndex() throw (uno::RuntimeException) @@ -108,24 +108,24 @@ void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::X return mnLevel + 1; } -::rtl::OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException) { // TODO: - return rtl::OUString(); + return OUString(); } -void SAL_CALL SwVbaListLevel::setLinkedStyle( const ::rtl::OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException) +void SAL_CALL SwVbaListLevel::setLinkedStyle( const OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException) { // TODO: } -::rtl::OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException) { // TODO:: - return rtl::OUString(); + return OUString(); } -void SAL_CALL SwVbaListLevel::setNumberFormat( const ::rtl::OUString& /*_numberformat*/ ) throw (uno::RuntimeException) +void SAL_CALL SwVbaListLevel::setNumberFormat( const OUString& /*_numberformat*/ ) throw (uno::RuntimeException) { // TODO:: } @@ -135,8 +135,8 @@ float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException) // indentAt + firstlineindent sal_Int32 nIndentAt = 0; sal_Int32 nFirstLineIndent = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent") ) >>= nFirstLineIndent; sal_Int32 nResult = nIndentAt + nFirstLineIndent; @@ -148,16 +148,16 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter( _numberposition ); sal_Int32 nIndentAt = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; sal_Int32 nFirstLineIndent = nNumberPosition - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() throw (uno::RuntimeException) { sal_Int16 nNumberingType = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType") ) >>= nNumberingType; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("NumberingType") ) >>= nNumberingType; switch( nNumberingType ) { case style::NumberingType::CHAR_SPECIAL: @@ -212,7 +212,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } return nNumberingType; @@ -285,11 +285,11 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType"), uno::makeAny( nNumberingType ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("NumberingType"), uno::makeAny( nNumberingType ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() throw (uno::RuntimeException) @@ -306,20 +306,20 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) ::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt() throw (uno::RuntimeException) { sal_Int16 nStartWith = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith") ) >>= nStartWith; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("StartWith") ) >>= nStartWith; return nStartWith; } void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) throw (uno::RuntimeException) { sal_Int16 nStartWith = (sal_Int16)_startat; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith"), uno::makeAny( nStartWith ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("StartWith"), uno::makeAny( nStartWith ) ); } float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException) { sal_Int32 nTabPosition = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition") ) >>= nTabPosition; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("ListtabStopPosition") ) >>= nTabPosition; return static_cast< float >( Millimeter::getInPoints( nTabPosition ) ); } @@ -327,14 +327,14 @@ float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException) void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) throw (uno::RuntimeException) { sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter( _tabposition ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition"), uno::makeAny( nTabPosition ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("ListtabStopPosition"), uno::makeAny( nTabPosition ) ); } float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException) { // indentAt sal_Int32 nIndentAt = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; return static_cast< float >( Millimeter::getInPoints( nIndentAt ) ); } @@ -343,21 +343,21 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: { sal_Int32 nIndentAt = 0; sal_Int32 nFirstLineIndent = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent") ) >>= nFirstLineIndent; sal_Int32 nAlignedAt = nIndentAt + nFirstLineIndent; nIndentAt = Millimeter::getInHundredthsOfOneMillimeter( _textposition ); nFirstLineIndent = nAlignedAt - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt"), uno::makeAny( nIndentAt ) ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt"), uno::makeAny( nIndentAt ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() throw (uno::RuntimeException) { sal_Int16 nLabelFollowedBy= 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy") ) >>= nLabelFollowedBy; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("LabelFollowedBy") ) >>= nLabelFollowedBy; return nLabelFollowedBy; } @@ -365,23 +365,23 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (uno::RuntimeException) { sal_Int16 nLabelFollowedBy = (sal_Int16)_trailingcharacter; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy"), uno::makeAny( nLabelFollowedBy ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("LabelFollowedBy"), uno::makeAny( nLabelFollowedBy ) ); } -rtl::OUString +OUString SwVbaListLevel::getServiceImplName() { - return rtl::OUString("SwVbaListLevel"); + return OUString("SwVbaListLevel"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListLevel::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListLevel" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListLevel" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index 3d41ebf599c2..1fd51d1e8049 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -44,10 +44,10 @@ public: virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLinkedStyle( const ::rtl::OUString& _linkedstyle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException); - virtual void SAL_CALL setNumberFormat( const ::rtl::OUString& _numberformat ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException); + virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException); virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException); virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException); @@ -64,8 +64,8 @@ public: virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_LISTLEVEL_HXX */ diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index 470e5763cdb9..81ff8a67c387 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -63,7 +63,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& if( ( Index1 >>= nIndex ) == sal_False ) throw uno::RuntimeException(); if( nIndex <=0 || nIndex > getCount() ) - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); return uno::makeAny( uno::Reference< word::XListLevel >( new SwVbaListLevel( this, mxContext, pListHelper, nIndex - 1 ) ) ); } @@ -87,20 +87,20 @@ SwVbaListLevels::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaListLevels::getServiceImplName() { - return rtl::OUString("SwVbaListLevels"); + return OUString("SwVbaListLevels"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaListLevels::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.ListLevels"); + sNames[0] = OUString("ooo.vba.word.ListLevels"); } return sNames; } diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index 1879ea898338..acd8f9ab4ad7 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -44,8 +44,8 @@ public: // SwVbaListLevels_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_LISTLEVELS_HXX */ diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx index 485a5278398b..122ba191a9b0 100644 --- a/sw/source/ui/vba/vbalisttemplate.cxx +++ b/sw/source/ui/vba/vbalisttemplate.cxx @@ -45,23 +45,23 @@ SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeExcept void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) { uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules(); - xProps->setPropertyValue( rtl::OUString("NumberingRules") , uno::makeAny( xNumberingRules ) ); + xProps->setPropertyValue( OUString("NumberingRules") , uno::makeAny( xNumberingRules ) ); } -rtl::OUString +OUString SwVbaListTemplate::getServiceImplName() { - return rtl::OUString("SwVbaListTemplate"); + return OUString("SwVbaListTemplate"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListTemplate::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListTemplate" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListTemplate" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index d46b830d3223..02c574dc3283 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -43,8 +43,8 @@ public: virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_LISTTEMPLATE_HXX */ diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index 01b56c27a33d..b7ba7fe1256b 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -57,7 +57,7 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A if( ( Index1 >>= nIndex ) == sal_False ) throw uno::RuntimeException(); if( nIndex <=0 || nIndex > getCount() ) - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); return uno::makeAny( uno::Reference< word::XListTemplate >( new SwVbaListTemplate( this, mxContext, mxTextDocument, mnGalleryType, nIndex ) ) ); } @@ -81,20 +81,20 @@ SwVbaListTemplates::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaListTemplates::getServiceImplName() { - return rtl::OUString("SwVbaListTemplates"); + return OUString("SwVbaListTemplates"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaListTemplates::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.ListTemplates"); + sNames[0] = OUString("ooo.vba.word.ListTemplates"); } return sNames; } diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index 87a76ef9e499..7ad5b7b94c80 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -44,8 +44,8 @@ public: // SwVbaListTemplates_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_LISTTEMPLATES_HXX */ diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index 898c7939e740..0c21ae0fca93 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -45,44 +45,44 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) { case word::WdDefaultFilePath::wdDocumentsPath: { - msDefaultFilePath = rtl::OUString("Work"); + msDefaultFilePath = OUString("Work"); break; } case word::WdDefaultFilePath::wdPicturesPath: { - msDefaultFilePath = rtl::OUString("Gallery"); + msDefaultFilePath = OUString("Gallery"); break; } case word::WdDefaultFilePath::wdUserTemplatesPath: case word::WdDefaultFilePath::wdWorkgroupTemplatesPath: { - msDefaultFilePath = rtl::OUString("Template"); + msDefaultFilePath = OUString("Template"); break; } case word::WdDefaultFilePath::wdStartupPath: { - msDefaultFilePath = rtl::OUString("Addin"); + msDefaultFilePath = OUString("Addin"); break; } case word::WdDefaultFilePath::wdUserOptionsPath: { - msDefaultFilePath = rtl::OUString("UserConfig"); + msDefaultFilePath = OUString("UserConfig"); break; } case word::WdDefaultFilePath::wdToolsPath: case word::WdDefaultFilePath::wdProgramPath: { - msDefaultFilePath = rtl::OUString("Module"); + msDefaultFilePath = OUString("Module"); break; } case word::WdDefaultFilePath::wdTempFilePath: { - msDefaultFilePath = rtl::OUString("Temp"); + msDefaultFilePath = OUString("Temp"); break; } default: { - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); break; } } @@ -91,12 +91,12 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) void SwVbaOptions::setValueEvent( const uno::Any& value ) { - rtl::OUString sNewPath; + OUString sNewPath; value >>= sNewPath; - rtl::OUString sNewPathUrl; + OUString sNewPathUrl; ::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl ); - uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); - rtl::OUString sOldPathUrl; + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); + OUString sOldPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently // only the last path is from interest. @@ -110,8 +110,8 @@ void SwVbaOptions::setValueEvent( const uno::Any& value ) uno::Any SwVbaOptions::getValueEvent() { - uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); - rtl::OUString sPathUrl; + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); + OUString sPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently // only the last path is from interest. @@ -120,7 +120,7 @@ uno::Any SwVbaOptions::getValueEvent() { sPathUrl = sPathUrl.copy( nIndex + 1 ); } - rtl::OUString sPath; + OUString sPath; ::osl::File::getSystemPathFromFileURL( sPathUrl, sPath ); return uno::makeAny( sPath ); } @@ -255,20 +255,20 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autof // not support in Writer } -rtl::OUString +OUString SwVbaOptions::getServiceImplName() { - return rtl::OUString("SwVbaOptions"); + return OUString("SwVbaOptions"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaOptions::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Options" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Options" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index 753d2b6eaba7..dbd89e4aaf23 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -31,7 +31,7 @@ class SwVbaOptions : public SwVbaOptions_BASE, public PropListener { private: - rtl::OUString msDefaultFilePath; + OUString msDefaultFilePath; css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; public: SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ) throw ( css::uno::RuntimeException ); @@ -73,8 +73,8 @@ public: virtual css::uno::Any getValueEvent(); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_OPTIONS_HXX */ diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index ffa2c69cf1bb..b7d3d140c4b8 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -59,9 +59,9 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException) { sal_Bool isHeaderOn = sal_False; - mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; + mxPageProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); return VbaPageSetupBase::getHeaderMargin(); } @@ -82,29 +82,29 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw sal_Int32 aktSpacing = 0; sal_Int32 aktHeaderHeight = 0; - mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; + mxPageProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); - mxPageProps->getPropertyValue( rtl::OUString("TopMargin")) >>= aktTopMargin; - mxPageProps->getPropertyValue( rtl::OUString("HeaderBodyDistance")) >>= aktSpacing; - mxPageProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= aktHeaderHeight; + mxPageProps->getPropertyValue( OUString("TopMargin")) >>= aktTopMargin; + mxPageProps->getPropertyValue( OUString("HeaderBodyDistance")) >>= aktSpacing; + mxPageProps->getPropertyValue( OUString("HeaderHeight")) >>= aktHeaderHeight; sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin ); sal_Int32 height = aktHeaderHeight - aktSpacing; sal_Int32 newHeaderHeight = newSpacing + height; - mxPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( newHeaderDistance ) ); - mxPageProps->setPropertyValue( rtl::OUString("HeaderBodyDistance"), uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue( rtl::OUString("HeaderHeight"), uno::makeAny( newHeaderHeight ) ); + mxPageProps->setPropertyValue( OUString("TopMargin"), uno::makeAny( newHeaderDistance ) ); + mxPageProps->setPropertyValue( OUString("HeaderBodyDistance"), uno::makeAny( newSpacing ) ); + mxPageProps->setPropertyValue( OUString("HeaderHeight"), uno::makeAny( newHeaderHeight ) ); } double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException) { sal_Bool isFooterOn = sal_False; - mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn; + mxPageProps->getPropertyValue( OUString("FooterIsOn")) >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_True ) ); return VbaPageSetupBase::getFooterMargin(); } @@ -116,26 +116,26 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw sal_Int32 aktSpacing = 0; sal_Int32 aktFooterHeight = 0; - mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn; + mxPageProps->getPropertyValue( OUString("FooterIsOn")) >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_True ) ); - mxPageProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= aktBottomMargin; - mxPageProps->getPropertyValue( rtl::OUString("FooterBodyDistance")) >>= aktSpacing; - mxPageProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= aktFooterHeight; + mxPageProps->getPropertyValue( OUString("BottomMargin")) >>= aktBottomMargin; + mxPageProps->getPropertyValue( OUString("FooterBodyDistance")) >>= aktSpacing; + mxPageProps->getPropertyValue( OUString("FooterHeight")) >>= aktFooterHeight; sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin ); sal_Int32 height = aktFooterHeight - aktSpacing; sal_Int32 newFooterHeight = newSpacing + height; - mxPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( newFooterDistance ) ); - mxPageProps->setPropertyValue( rtl::OUString("FooterBodyDistance"), uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue( rtl::OUString("FooterHeight"), uno::makeAny( newFooterHeight ) ); + mxPageProps->setPropertyValue( OUString("BottomMargin"), uno::makeAny( newFooterDistance ) ); + mxPageProps->setPropertyValue( OUString("FooterBodyDistance"), uno::makeAny( newSpacing ) ); + mxPageProps->setPropertyValue( OUString("FooterHeight"), uno::makeAny( newFooterHeight ) ); } sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException) { - rtl::OUString pageStyle = getStyleOfFirstPage(); + OUString pageStyle = getStyleOfFirstPage(); if ( pageStyle == "First Page" ) return sal_True; @@ -147,34 +147,34 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status if( status == getDifferentFirstPageHeaderFooter() ) return; - rtl::OUString newStyle; + OUString newStyle; if( status ) - newStyle = rtl::OUString("First Page"); + newStyle = OUString("First Page"); else - newStyle = rtl::OUString("Standard"); + newStyle = OUString("Standard"); uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); sal_Int32 nTopMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("TopMargin")) >>= nTopMargin; + xStyleProps->getPropertyValue( OUString("TopMargin")) >>= nTopMargin; sal_Int32 nBottomMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= nBottomMargin; + xStyleProps->getPropertyValue( OUString("BottomMargin")) >>= nBottomMargin; sal_Int32 nLeftMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("LeftMargin")) >>= nLeftMargin; + xStyleProps->getPropertyValue( OUString("LeftMargin")) >>= nLeftMargin; sal_Int32 nRightMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("RightMargin")) >>= nRightMargin; + xStyleProps->getPropertyValue( OUString("RightMargin")) >>= nRightMargin; sal_Int32 nHeaderHeight = 0; - xStyleProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= nHeaderHeight; + xStyleProps->getPropertyValue( OUString("HeaderHeight")) >>= nHeaderHeight; sal_Int32 nFooterHeight = 0; - xStyleProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= nFooterHeight; + xStyleProps->getPropertyValue( OUString("FooterHeight")) >>= nFooterHeight; sal_Bool isHeaderOn = sal_False; - xStyleProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; + xStyleProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn; if( isHeaderOn ) { nTopMargin += nHeaderHeight; nBottomMargin += nFooterHeight; - xStyleProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_False ) ); - xStyleProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_False ) ); + xStyleProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_False ) ); + xStyleProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_False ) ); } uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); if( xPageCursor->getPage() != 1 ) @@ -183,26 +183,26 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status } uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( OUString("TextTable") ), uno::UNO_QUERY ); if( xTableProps.is() ) { - xTableProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) ); + xTableProps->setPropertyValue( OUString("PageDescName"), uno::makeAny( newStyle ) ); } else { - xCursorProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) ); + xCursorProps->setPropertyValue( OUString("PageDescName"), uno::makeAny( newStyle ) ); } uno::Reference< beans::XPropertySet > xFirstPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); - xFirstPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( nTopMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( nBottomMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nLeftMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString("RightMargin"), uno::makeAny( nRightMargin ) ); + xFirstPageProps->setPropertyValue( OUString("TopMargin"), uno::makeAny( nTopMargin ) ); + xFirstPageProps->setPropertyValue( OUString("BottomMargin"), uno::makeAny( nBottomMargin ) ); + xFirstPageProps->setPropertyValue( OUString("LeftMargin"), uno::makeAny( nLeftMargin ) ); + xFirstPageProps->setPropertyValue( OUString("RightMargin"), uno::makeAny( nRightMargin ) ); } -rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) +OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) { - rtl::OUString styleFirstPage; + OUString styleFirstPage; uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); if( xPageCursor->getPage() != 1 ) { @@ -210,14 +210,14 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException } uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( OUString("TextTable") ), uno::UNO_QUERY ); if( xTableProps.is() ) { - xTableProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage; + xTableProps->getPropertyValue( OUString("PageDescName") ) >>= styleFirstPage; } else { - xCursorProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage; + xCursorProps->getPropertyValue( OUString("PageDescName") ) >>= styleFirstPage; } return styleFirstPage; } @@ -227,7 +227,7 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException // FIXME: sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage; uno::Reference< container::XNamed > xNamed( mxPageProps, uno::UNO_QUERY_THROW ); - rtl::OUString sStyleName = xNamed->getName(); + OUString sStyleName = xNamed->getName(); if ( sStyleName == "Left Page" ) wdSectionStart = word::WdSectionStart::wdSectionEvenPage; else if ( sStyleName == "Right Page" ) @@ -243,20 +243,20 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) t // #FIXME: } -rtl::OUString +OUString SwVbaPageSetup::getServiceImplName() { - return rtl::OUString("SwVbaPageSetup"); + return OUString("SwVbaPageSetup"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaPageSetup::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.PageSetup" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.PageSetup" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index 641479ef7acb..310b5808e238 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -31,7 +31,7 @@ typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSet class SwVbaPageSetup : public SwVbaPageSetup_BASE { private: - rtl::OUString getStyleOfFirstPage() throw (css::uno::RuntimeException); + OUString getStyleOfFirstPage() throw (css::uno::RuntimeException); public: SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, @@ -53,8 +53,8 @@ public: virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index f0e8e35bc3b7..40b9e163c485 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -43,24 +43,24 @@ SwVbaPane::View() throw ( css::uno::RuntimeException ) void SAL_CALL SwVbaPane::Close( ) throw ( css::uno::RuntimeException ) { - rtl::OUString url = rtl::OUString( ".uno:CloseWin"); + OUString url = OUString( ".uno:CloseWin"); dispatchRequests( mxModel,url ); } -rtl::OUString +OUString SwVbaPane::getServiceImplName() { - return rtl::OUString("SwVbaPane"); + return OUString("SwVbaPane"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaPane::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index 78f86311bebb..61eed74bb916 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -40,8 +40,8 @@ public: virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_PANE_HXX */ diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index d3a62629a915..f7971f784260 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -96,20 +96,20 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaPanes::getServiceImplName() { - return rtl::OUString("SwVbaPanes"); + return OUString("SwVbaPanes"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaPanes::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Panes"); + sNames[0] = OUString("ooo.vba.word.Panes"); } return sNames; } diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 257566c1e33a..9f15784adbdc 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -42,8 +42,8 @@ public: // SwVbaPanes_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_PANES_HXX */ diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 1618a1167555..da478a8ac2f3 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -54,20 +54,20 @@ SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException xRange->setStyle( style ); } -rtl::OUString +OUString SwVbaParagraph::getServiceImplName() { - return rtl::OUString("SwVbaParagraph"); + return OUString("SwVbaParagraph"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaParagraph::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Paragraph" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Paragraph" ); } return aServiceNames; } @@ -100,7 +100,7 @@ public: while( xParEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.Paragraph") ) ) { nCount++; } @@ -116,7 +116,7 @@ public: while( xParEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.Paragraph") ) ) { if( Index == nCount ) return uno::makeAny( xServiceInfo ); @@ -157,20 +157,20 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) ); } -rtl::OUString +OUString SwVbaParagraphs::getServiceImplName() { - return rtl::OUString("SwVbaParagraphs"); + return OUString("SwVbaParagraphs"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaParagraphs::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Paragraphs"); + sNames[0] = OUString("ooo.vba.word.Paragraphs"); } return sNames; } diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 23465f44d646..8fd5a3637046 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -46,8 +46,8 @@ public: virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; @@ -68,8 +68,8 @@ public: // SwVbaParagraphs_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_PARAGRAPH_HXX */ diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 2caa2e64001c..df635ecc8a47 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -48,33 +48,33 @@ SwVbaParagraphFormat::~SwVbaParagraphFormat() sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException) { style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT; - mxParaProps->getPropertyValue( rtl::OUString("ParaAdjust") ) >>= aParaAdjust; + mxParaProps->getPropertyValue( OUString("ParaAdjust") ) >>= aParaAdjust; return getMSWordAlignment( aParaAdjust ); } void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException) { style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment ); - mxParaProps->setPropertyValue( rtl::OUString("ParaAdjust"), uno::makeAny( aParaAdjust ) ); + mxParaProps->setPropertyValue( OUString("ParaAdjust"), uno::makeAny( aParaAdjust ) ); } float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException) { sal_Int32 indent = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaFirstLineIndent") ) >>= indent; + mxParaProps->getPropertyValue( OUString("ParaFirstLineIndent") ) >>= indent; return (float)( Millimeter::getInPoints( indent ) ); } void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException) { sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent ); - mxParaProps->setPropertyValue( rtl::OUString("ParaFirstLineIndent"), uno::makeAny( indent ) ); + mxParaProps->setPropertyValue( OUString("ParaFirstLineIndent"), uno::makeAny( indent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException) { sal_Bool bKeep = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaKeepTogether") ) >>= bKeep; + mxParaProps->getPropertyValue( OUString("ParaKeepTogether") ) >>= bKeep; return uno::makeAny ( bKeep ); } @@ -83,18 +83,18 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth sal_Bool bKeep = sal_False; if( _keeptogether >>= bKeep ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaKeepTogether"), uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue( OUString("ParaKeepTogether"), uno::makeAny( bKeep ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException) { sal_Bool bKeep = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaSplit") ) >>= bKeep; + mxParaProps->getPropertyValue( OUString("ParaSplit") ) >>= bKeep; return uno::makeAny ( bKeep ); } @@ -103,18 +103,18 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne sal_Bool bKeep = sal_False; if( _keepwithnext >>= bKeep ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaSplit"), uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue( OUString("ParaSplit"), uno::makeAny( bKeep ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException) { sal_Bool bHypn = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= bHypn; + mxParaProps->getPropertyValue( OUString("ParaIsHyphenation") ) >>= bHypn; return uno::makeAny ( bHypn ); } @@ -123,46 +123,46 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation sal_Bool bHypn = sal_False; if( _hyphenation >>= bHypn ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( bHypn ) ); + mxParaProps->setPropertyValue( OUString("ParaIsHyphenation"), uno::makeAny( bHypn ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; + mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing; return getMSWordLineSpacing( aLineSpacing ); } void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; + mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing; aLineSpacing = getOOoLineSpacing( _linespacing, aLineSpacing.Mode ); - mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue( OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); } sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; + mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing; return getMSWordLineSpacingRule( aLineSpacing ); } void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException) { style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule ); - mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue( OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException) { sal_Bool noLineNum = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineNumberCount") ) >>= noLineNum; + mxParaProps->getPropertyValue( OUString("ParaLineNumberCount") ) >>= noLineNum; return uno::makeAny ( noLineNum ); } @@ -171,20 +171,20 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb sal_Bool noLineNum = sal_False; if( _nolinenumber >>= noLineNum ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaLineNumberCount"), uno::makeAny( noLineNum ) ); + mxParaProps->setPropertyValue( OUString("ParaLineNumberCount"), uno::makeAny( noLineNum ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeException) { sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText; - rtl::OUString aHeading; - const rtl::OUString HEADING = rtl::OUString("Heading"); - mxParaProps->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aHeading; + OUString aHeading; + const OUString HEADING = OUString("Heading"); + mxParaProps->getPropertyValue( OUString("ParaStyleName") ) >>= aHeading; if( aHeading.indexOf( HEADING ) == 0 ) { // get the sub string after "Heading" @@ -204,7 +204,7 @@ void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) t uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException) { style::BreakType aBreakType; - mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType; + mxParaProps->getPropertyValue( OUString("BreakType") ) >>= aBreakType; sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH ); return uno::makeAny( bBreakBefore ); } @@ -215,7 +215,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe if( _breakbefore >>= bBreakBefore ) { style::BreakType aBreakType; - mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType; + mxParaProps->getPropertyValue( OUString("BreakType") ) >>= aBreakType; if( bBreakBefore ) { if( aBreakType == style::BreakType_NONE ) @@ -230,64 +230,64 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe else if ( aBreakType == style::BreakType_PAGE_BEFORE ) aBreakType = style::BreakType_PAGE_AFTER; } - mxParaProps->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( aBreakType ) ); + mxParaProps->setPropertyValue( OUString("BreakType"), uno::makeAny( aBreakType ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException) { sal_Int32 nSpace = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaTopMargin") ) >>= nSpace; + mxParaProps->getPropertyValue( OUString("ParaTopMargin") ) >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue( rtl::OUString("ParaTopMargin"), uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue( OUString("ParaTopMargin"), uno::makeAny( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException) { sal_Int32 nSpace = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaBottomMargin") ) >>= nSpace; + mxParaProps->getPropertyValue( OUString("ParaBottomMargin") ) >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue( rtl::OUString("ParaBottomMargin"), uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue( OUString("ParaBottomMargin"), uno::makeAny( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException) { sal_Int32 nIndent = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaLeftMargin") ) >>= nIndent; + mxParaProps->getPropertyValue( OUString("ParaLeftMargin") ) >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent ); - mxParaProps->setPropertyValue( rtl::OUString("ParaLeftMargin"), uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue( OUString("ParaLeftMargin"), uno::makeAny( nIndent ) ); } float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException) { sal_Int32 nIndent = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaRightMargin") ) >>= nIndent; + mxParaProps->getPropertyValue( OUString("ParaRightMargin") ) >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent ); - mxParaProps->setPropertyValue( rtl::OUString("ParaRightMargin"), uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue( OUString("ParaRightMargin"), uno::makeAny( nIndent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException) @@ -297,16 +297,16 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeExcepti void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException) { sal_Bool bWidow = sal_False; sal_Int8 nWidow = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaWidows") ) >>= nWidow; + mxParaProps->getPropertyValue( OUString("ParaWidows") ) >>= nWidow; sal_Int8 nOrphan = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaOrphans") ) >>= nOrphan; + mxParaProps->getPropertyValue( OUString("ParaOrphans") ) >>= nOrphan; // if the amount of single lines on one page > 1 and the same of start and end of the paragraph, // true is retured. bWidow = ( nWidow > 1 && nOrphan == nWidow ); @@ -321,12 +321,12 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr if( _widowcontrol >>= bWidow ) { sal_Int8 nControl = bWidow? 2:1; - mxParaProps->setPropertyValue( rtl::OUString("ParaWidows"), uno::makeAny( nControl ) ); - mxParaProps->setPropertyValue( rtl::OUString("ParaOrphans"), uno::makeAny( nControl ) ); + mxParaProps->setPropertyValue( OUString("ParaWidows"), uno::makeAny( nControl ) ); + mxParaProps->setPropertyValue( OUString("ParaOrphans"), uno::makeAny( nControl ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } @@ -404,7 +404,7 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacingFromRule( sal_Int32 _l } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); break; } } @@ -469,7 +469,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } return wdLineSpacing; @@ -478,7 +478,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException) { float fCharHeight = 0.0; - mxParaProps->getPropertyValue( rtl::OUString("CharHeight") ) >>= fCharHeight; + mxParaProps->getPropertyValue( OUString("CharHeight") ) >>= fCharHeight; return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) ); } @@ -509,7 +509,7 @@ sal_Int32 SwVbaParagraphFormat::getOOoAlignment( sal_Int32 _alignment ) } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } return nParaAjust; @@ -542,26 +542,26 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment ) } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } return wdAlignment; } -rtl::OUString +OUString SwVbaParagraphFormat::getServiceImplName() { - return rtl::OUString("SwVbaParagraphFormat"); + return OUString("SwVbaParagraphFormat"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaParagraphFormat::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ParagraphFormat" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ParagraphFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index f80081ddcbcc..b095d670ad7e 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -81,8 +81,8 @@ public: virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_PARAGRAPHFORMAT_HXX */ diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 9553b343aa36..95f275006680 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -72,7 +72,7 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText ); if( !mxTextCursor.is() ) - throw uno::RuntimeException( rtl::OUString("Fails to create text cursor"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Fails to create text cursor"), uno::Reference< uno::XInterface >() ); mxTextCursor->collapseToStart(); if( rEnd.is() ) @@ -93,10 +93,10 @@ SwVbaRange::getXTextRange() throw (uno::RuntimeException) * an issue that the last paragraph in a document does not have a trailing CRLF. * @return */ -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaRange::getText() throw ( uno::RuntimeException ) { - rtl::OUString aText = mxTextCursor->getString(); + OUString aText = mxTextCursor->getString(); sal_Int32 nLen = aText.getLength(); // FIXME: should add a line separator if the range includes the last paragraph @@ -123,11 +123,11 @@ SwVbaRange::getText() throw ( uno::RuntimeException ) } void SAL_CALL -SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) +SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException ) { // Emulate the MSWord behavior, Don't delete the bookmark // which contains no text string in current inserting position, - rtl::OUString sName; + OUString sName; uno::Reference< text::XTextRange > xRange( mxTextCursor, uno::UNO_QUERY_THROW ); try { @@ -145,7 +145,7 @@ SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException if( rText.indexOf( '\n' ) != -1 ) { - mxTextCursor->setString( rtl::OUString() ); + mxTextCursor->setString( OUString() ); // process CR in strings SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True ); } @@ -192,22 +192,22 @@ void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno:: case word::WdBreakType::wdSectionBreakNextPage: case word::WdBreakType::wdSectionBreakOddPage: case word::WdBreakType::wdTextWrappingBreak: - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); break; default: - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } if( eBreakType != style::BreakType_NONE ) { if( !mxTextCursor->isCollapsed() ) { - mxTextCursor->setString( rtl::OUString() ); + mxTextCursor->setString( OUString() ); mxTextCursor->collapseToStart(); } uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( eBreakType ) ); + xProp->setPropertyValue( OUString("BreakType"), uno::makeAny( eBreakType ) ); } } @@ -223,7 +223,7 @@ SwVbaRange::Select() throw ( uno::RuntimeException ) void SAL_CALL SwVbaRange::InsertParagraph() throw ( uno::RuntimeException ) { - mxTextCursor->setString( rtl::OUString("") ); + mxTextCursor->setString( OUString("") ); InsertParagraphBefore(); } @@ -252,31 +252,31 @@ SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException ) void SAL_CALL SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } -void SwVbaRange::GetStyleInfo(rtl::OUString& aStyleName, rtl::OUString& aStyleType ) throw ( uno::RuntimeException ) +void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); - if( ( xProp->getPropertyValue( rtl::OUString("CharStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) + if( ( xProp->getPropertyValue( OUString("CharStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = rtl::OUString("CharacterStyles"); + aStyleType = OUString("CharacterStyles"); } - else if( ( xProp->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) + else if( ( xProp->getPropertyValue( OUString("ParaStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = rtl::OUString("ParagraphStyles"); + aStyleType = OUString("ParagraphStyles"); } if( aStyleType.isEmpty() ) { - DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); + DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() ); } } uno::Any SAL_CALL SwVbaRange::getStyle() throw ( uno::RuntimeException ) { - rtl::OUString aStyleName; - rtl::OUString aStyleType; + OUString aStyleName; + OUString aStyleType; GetStyleInfo( aStyleName, aStyleType ); uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW ); @@ -322,11 +322,11 @@ SwVbaRange::PageSetup( ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); - rtl::OUString aPageStyleName; - xParaProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xParaProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) ); } @@ -407,20 +407,20 @@ SwVbaRange::Fields( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaRange::getServiceImplName() { - return rtl::OUString("SwVbaRange"); + return OUString("SwVbaRange"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaRange::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Range" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Range" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index 804e8d4aed62..6ec5ff644d70 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -42,7 +42,7 @@ private: private: void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException); - void GetStyleInfo(rtl::OUString& aStyleName, rtl::OUString& aStyleType ) throw ( css::uno::RuntimeException ); + void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException ); public: SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException); SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException); @@ -56,8 +56,8 @@ public: void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException); // Attribute - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException); virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException); @@ -84,8 +84,8 @@ public: virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_RANGE_HXX */ diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index 0c45260159da..e1326a5fa6f1 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -61,7 +61,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u } -void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException ) +void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException ) { sal_Int32 nlastIndex = 0; sal_Int32 nIndex = 0; @@ -84,7 +84,7 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa { xRange = xRange->getEnd(); - rtl::OUString aWatt = rStr.copy( nlastIndex ); + OUString aWatt = rStr.copy( nlastIndex ); rText->insertString( xRange, aWatt, _bAbsorb ); } } diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx index db199b49f0ef..537acc05722c 100644 --- a/sw/source/ui/vba/vbarangehelper.hxx +++ b/sw/source/ui/vba/vbarangehelper.hxx @@ -29,7 +29,7 @@ class SwVbaRangeHelper { public: static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException ); - static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException ); + static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException ); static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException ); static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException ); static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException ); diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx index b983613b1bf7..13ace911d77f 100644 --- a/sw/source/ui/vba/vbareplacement.cxx +++ b/sw/source/ui/vba/vbareplacement.cxx @@ -32,12 +32,12 @@ SwVbaReplacement::~SwVbaReplacement() { } -::rtl::OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException) { return mxPropertyReplace->getReplaceString(); } -void SAL_CALL SwVbaReplacement::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException) +void SAL_CALL SwVbaReplacement::setText( const OUString& _text ) throw (uno::RuntimeException) { mxPropertyReplace->setReplaceString( _text ); } @@ -48,20 +48,20 @@ void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException) mxPropertyReplace->setReplaceAttributes( aPropValues ); } -rtl::OUString +OUString SwVbaReplacement::getServiceImplName() { - return rtl::OUString("SwVbaReplacement"); + return OUString("SwVbaReplacement"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaReplacement::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Replacement" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Replacement" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index 7c49cc51e07b..9569a6c9d90d 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -36,15 +36,15 @@ public: virtual ~SwVbaReplacement(); // Attributes - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); //Methods virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_REPLACEMENT_HXX */ diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index 05fb97c765f9..ae45f7473408 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -73,20 +73,20 @@ SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException ) pDoc->RejectRedline( GetPosition(), sal_True ); } -rtl::OUString +OUString SwVbaRevision::getServiceImplName() { - return rtl::OUString("SwVbaRevision"); + return OUString("SwVbaRevision"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaRevision::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Revision" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Revision" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index 52f970220724..5d28fc488453 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -43,8 +43,8 @@ public: virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_REVISION_HXX */ diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 5f240b5bb129..8ad58e83468e 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -157,20 +157,20 @@ void SAL_CALL SwVbaRevisions::RejectAll( ) throw (css::uno::RuntimeException) throw uno::RuntimeException(); } -rtl::OUString +OUString SwVbaRevisions::getServiceImplName() { - return rtl::OUString("SwVbaRevisions"); + return OUString("SwVbaRevisions"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaRevisions::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Revisions"); + sNames[0] = OUString("ooo.vba.word.Revisions"); } return sNames; } diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index f9971f0cd6f2..acf0dc459436 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -48,8 +48,8 @@ public: // SwVbaRevisions_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_PANES_HXX */ diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 333611dc84de..5d3b0eec555b 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -47,7 +47,7 @@ uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException) return uno::makeAny( sal_Int32( word::WdConstants::wdUndefined ) ); sal_Int32 nHeight = 0; - mxRowProps->getPropertyValue( rtl::OUString("Height") ) >>= nHeight; + mxRowProps->getPropertyValue( OUString("Height") ) >>= nHeight; return uno::makeAny( (float)Millimeter::getInPoints( nHeight ) ); } @@ -57,20 +57,20 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru _height >>= height; sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( height ); - mxRowProps->setPropertyValue( rtl::OUString("Height"), uno::makeAny( nHeight ) ); + mxRowProps->setPropertyValue( OUString("Height"), uno::makeAny( nHeight ) ); } ::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException) { sal_Bool isAutoHeight = sal_False; - mxRowProps->getPropertyValue( rtl::OUString("IsAutoHeight") ) >>= isAutoHeight; + mxRowProps->getPropertyValue( OUString("IsAutoHeight") ) >>= isAutoHeight; return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly; } void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException) { sal_Bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto ); - mxRowProps->setPropertyValue( rtl::OUString("IsAutoHeight"), uno::makeAny( isAutoHeight ) ); + mxRowProps->setPropertyValue( OUString("IsAutoHeight"), uno::makeAny( isAutoHeight ) ); } void SAL_CALL @@ -81,17 +81,17 @@ SwVbaRow::Select( ) throw ( uno::RuntimeException ) void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw ( uno::RuntimeException ) { - rtl::OUStringBuffer aRangeName; + OUStringBuffer aRangeName; aRangeName.append('A').append(sal_Int32( nStartRow + 1 ) ); SwVbaTableHelper aTableHelper( xTextTable ); sal_Int32 nColCount = aTableHelper.getTabColumnsCount( nEndRow ); // FIXME: the column count > 26 //sal_Char cCol = 'A' + nColCount - 1; - rtl::OUString sCol = aTableHelper.getColumnStr( nColCount - 1); + OUString sCol = aTableHelper.getColumnStr( nColCount - 1); aRangeName.append(':').append( sCol ).append( sal_Int32( nEndRow + 1 ) ); uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW ); - rtl::OUString sSelRange = aRangeName.makeStringAndClear(); + OUString sSelRange = aRangeName.makeStringAndClear(); uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( sSelRange ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -104,20 +104,20 @@ void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) throw (c setHeight( uno::makeAny( height ) ); } -rtl::OUString +OUString SwVbaRow::getServiceImplName() { - return rtl::OUString("SwVbaRow"); + return OUString("SwVbaRow"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaRow::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Row" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Row" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index 7169156db747..5eeb78f1e0fc 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -52,8 +52,8 @@ public: static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_ROW_HXX */ diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index d479834c9ae4..1d6140f75ab7 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -79,7 +79,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u { sal_Int16 nAlignment = text::HoriOrientation::LEFT; uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->getPropertyValue( rtl::OUString("HoriOrient") ) >>= nAlignment; + xTableProps->getPropertyValue( OUString("HoriOrient") ) >>= nAlignment; sal_Int32 nRet = 0; switch( nAlignment ) { @@ -122,7 +122,7 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt } } uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->setPropertyValue( rtl::OUString("HoriOrient"), uno::makeAny( nAlignment ) ); + xTableProps->setPropertyValue( OUString("HoriOrient"), uno::makeAny( nAlignment ) ); } uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException) @@ -133,7 +133,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep { uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); sal_Bool bSplit = sal_False; - xRowProps->getPropertyValue( rtl::OUString("IsSplitAllowed") ) >>= bSplit; + xRowProps->getPropertyValue( OUString("IsSplitAllowed") ) >>= bSplit; if( index == 0 ) { bAllowBreak = bSplit; @@ -155,7 +155,7 @@ void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakac for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index ) { uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); - xRowProps->setPropertyValue( rtl::OUString("IsSplitAllowed"), uno::makeAny( bAllowBreak ) ); + xRowProps->setPropertyValue( OUString("IsSplitAllowed"), uno::makeAny( bAllowBreak ) ); } } @@ -166,8 +166,8 @@ float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( 0, mnStartRowIndex ), uno::UNO_QUERY_THROW ); sal_Int32 nLeftBorderDistance = 0; sal_Int32 nRightBorderDistance = 0; - xCellProps->getPropertyValue( rtl::OUString("LeftBorderDistance") ) >>= nLeftBorderDistance; - xCellProps->getPropertyValue( rtl::OUString("RightBorderDistance") ) >>= nRightBorderDistance; + xCellProps->getPropertyValue( OUString("LeftBorderDistance") ) >>= nLeftBorderDistance; + xCellProps->getPropertyValue( OUString("RightBorderDistance") ) >>= nRightBorderDistance; return static_cast< float >( Millimeter::getInPoints( nLeftBorderDistance + nRightBorderDistance ) ); } @@ -183,8 +183,8 @@ void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) th for( sal_Int32 column = 0; column < nColumns; ++column ) { uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( column, row ), uno::UNO_QUERY_THROW ); - xCellProps->setPropertyValue( rtl::OUString("LeftBorderDistance"), uno::makeAny( nSpace ) ); - xCellProps->setPropertyValue( rtl::OUString("RightBorderDistance"), uno::makeAny( nSpace ) ); + xCellProps->setPropertyValue( OUString("LeftBorderDistance"), uno::makeAny( nSpace ) ); + xCellProps->setPropertyValue( OUString("RightBorderDistance"), uno::makeAny( nSpace ) ); } } } @@ -222,7 +222,7 @@ void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle } default: { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } } } @@ -231,9 +231,9 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE { uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nMargin = 0; - xTableProps->getPropertyValue( rtl::OUString("LeftMargin") ) >>= nMargin; + xTableProps->getPropertyValue( OUString("LeftMargin") ) >>= nMargin; nMargin += indent; - xTableProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nMargin ) ); + xTableProps->setPropertyValue( OUString("LeftMargin"), uno::makeAny( nMargin ) ); } void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) @@ -255,12 +255,12 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // calculate the new width and get the proportion between old and new uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nWidth = 0; - xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth; sal_Int32 nNewWidth = nWidth - indent; if ((nNewWidth <= 0) || (nWidth <= 0)) { throw uno::RuntimeException( - ::rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "Pb with width, in SwVbaRows::setIndentWithAdjustProportional (nNewWidth <= 0) || (nWidth <= 0)" ) @@ -283,7 +283,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue( OUString("Width"), uno::makeAny( nNewWidth ) ); } void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) @@ -291,7 +291,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // calculate the new width and get the width of all columns uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nWidth = 0; - xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth; sal_Int32 nNewWidth = nWidth - indent; // get all columns, calculate and set the new width of the columns @@ -306,7 +306,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue( OUString("Width"), uno::makeAny( nNewWidth ) ); } void SAL_CALL SwVbaRows::Select( ) throw (uno::RuntimeException) @@ -326,11 +326,11 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not { if( nIndex <= 0 || nIndex > getCount() ) { - throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw lang::IndexOutOfBoundsException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( uno::Reference< word::XRow >( new SwVbaRow( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -351,20 +351,20 @@ SwVbaRows::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaRows::getServiceImplName() { - return rtl::OUString("SwVbaRows"); + return OUString("SwVbaRows"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaRows::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Rows"); + sNames[0] = OUString("ooo.vba.word.Rows"); } return sNames; } diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx index e394f75dac98..61e44d6abcc3 100644 --- a/sw/source/ui/vba/vbarows.hxx +++ b/sw/source/ui/vba/vbarows.hxx @@ -69,8 +69,8 @@ public: // SwVbaRows_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_ROWS_HXX */ diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 925472b9d496..5fb2aff82661 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -65,20 +65,20 @@ SwVbaSection::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) ); } -rtl::OUString +OUString SwVbaSection::getServiceImplName() { - return rtl::OUString("SwVbaSection"); + return OUString("SwVbaSection"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaSection::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Section" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Section" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index 59d3463914e3..dfd297729279 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -45,8 +45,8 @@ public: virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_SECTION_HXX */ diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index f996815dc543..2c9823b980d9 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -65,7 +65,7 @@ public: { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW ); sal_Int32 nCount = xPageStyles->getCount(); for( sal_Int32 index = 0; index < nCount; ++index ) { @@ -148,7 +148,7 @@ SwVbaSections::PageSetup( ) throw (uno::RuntimeException) uno::Reference< word::XSection > xSection( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW ); return xSection->PageSetup(); } - throw uno::RuntimeException( rtl::OUString("There is no section"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("There is no section"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -171,20 +171,20 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaSections::getServiceImplName() { - return rtl::OUString("SwVbaSections"); + return OUString("SwVbaSections"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaSections::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Sections"); + sNames[0] = OUString("ooo.vba.word.Sections"); } return sNames; } diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index a2a482d983c7..4ac51e54cda6 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -46,8 +46,8 @@ public: // SwVbaSections_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_SECTIONS_HXX */ diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 62ad26645a83..d564c43a0343 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -81,7 +81,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un { uno::Reference< text::XTextRange > xTextRange; uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextRanges") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.TextRanges") ) ) { uno::Reference< container::XIndexAccess > xTextRanges( xServiceInfo, uno::UNO_QUERY_THROW ); if( xTextRanges->getCount() > 0 ) @@ -92,7 +92,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return xTextRange; } @@ -105,20 +105,20 @@ SwVbaSelection::getRange() throw ( uno::RuntimeException ) return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, xDocument, xTextRange->getStart(), xTextRange->getEnd(), mxTextViewCursor->getText() ) ); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaSelection::getText() throw ( uno::RuntimeException ) { return getRange()->getText(); } void SAL_CALL -SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) +SwVbaSelection::setText( const OUString& rText ) throw ( uno::RuntimeException ) { getRange()->setText( rText ); } void SAL_CALL -SwVbaSelection::TypeText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) +SwVbaSelection::TypeText( const OUString& rText ) throw ( uno::RuntimeException ) { // FIXME: handle the property Options.ReplaceSelection, the default value is sal_True setText( rText ); @@ -154,7 +154,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -189,7 +189,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -215,11 +215,11 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } - rtl::OUString url = rtl::OUString( ".uno:Delete"); + OUString url = OUString( ".uno:Delete"); dispatchRequests( mxModel,url ); } @@ -248,7 +248,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( nExtend == word::WdMovementType::wdExtend ) { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); return; } NextCell( nCount, eDirection ); @@ -258,7 +258,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< view::XViewCursor > xViewCursor( mxTextViewCursor, uno::UNO_QUERY_THROW ); if( eDirection == word::MOVE_UP ) @@ -271,7 +271,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_UP || eDirection == word::MOVE_DOWN ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } if( word::gotoSelectedObjectAnchor( mxModel ) ) { @@ -287,7 +287,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) { uno::Reference< text::XTextRange > xRange( xTextTable->getCellByName( xTextTableCursor->getRangeName()), uno::UNO_QUERY_THROW ); @@ -311,7 +311,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XParagraphCursor > xParagraphCursor( xTextCursor, uno::UNO_QUERY_THROW ); for( sal_Int32 i=0; i<nCount; i++ ) @@ -326,7 +326,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_UP || eDirection == word::MOVE_DOWN ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XWordCursor > xWordCursor( xTextCursor, uno::UNO_QUERY_THROW ); for( sal_Int32 i=0; i<nCount; i++ ) @@ -343,7 +343,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -353,16 +353,16 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection ) uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; uno::Reference< table::XCell > xCell; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("Cell") ) >>= xCell; if( !xTextTable.is() || !xCell.is() ) { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); return; } uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW ); - rtl::OUString aCellName; - xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= aCellName; + OUString aCellName; + xCellProps->getPropertyValue( OUString("CellName") ) >>= aCellName; uno::Reference< text::XTextTableCursor > xTextTableCursor = xTextTable->createCursorByCellName( aCellName ); // move the table cursor switch( eDirection ) @@ -389,7 +389,7 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection ) } default: { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); return; } } @@ -548,7 +548,7 @@ SwVbaSelection::getFont() throw ( uno::RuntimeException ) void SAL_CALL SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException ) { - rtl::OUString url = rtl::OUString( ".uno:SwBackspace"); + OUString url = OUString( ".uno:SwBackspace"); dispatchRequests( mxModel,url ); } @@ -556,7 +556,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w { sal_Int32 nWhat = 0; if( ( _what >>= nWhat ) != sal_True ) - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); switch( nWhat ) { case word::WdGoToItem::wdGoToBookmark: @@ -608,7 +608,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w } if( _name.hasValue() ) { - rtl::OUString sName; + OUString sName; _name >>= sName; sal_Int32 nName = sName.toInt32(); if( nName !=0 ) @@ -648,11 +648,11 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w if( nPage != 0 ) xPageCursor->jumpToPage( ( sal_Int16 )( nPage ) ); else - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); break; } default: - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return getRange(); } @@ -691,7 +691,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) result = uno::makeAny( sal_True ); else @@ -734,8 +734,8 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run case word::WdSeekView::wdSeekFirstPageFooter: { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); - rtl::OUString aPageStyleName; - xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xCursorProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; bool bFirstPage = false; if ( aPageStyleName == "First Page" ) bFirstPage = true; @@ -764,7 +764,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run break; } default: - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return result; } @@ -792,7 +792,7 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) { uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW ); @@ -901,8 +901,8 @@ void SAL_CALL SwVbaSelection::SelectColumn() throw (uno::RuntimeException) uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::RuntimeException) { - rtl::OUString sTLName; - rtl::OUString sBRName; + OUString sTLName; + OUString sBRName; GetSelectedCellRange( sTLName, sBRName ); sal_Int32 nStartRow = 0; @@ -927,8 +927,8 @@ uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::Runt uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) throw (uno::RuntimeException) { - rtl::OUString sTLName; - rtl::OUString sBRName; + OUString sTLName; + OUString sBRName; GetSelectedCellRange( sTLName, sBRName ); sal_Int32 nStartColumn = 0; sal_Int32 nEndColumn = 0; @@ -955,7 +955,7 @@ uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::R { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; return xTextTable; } @@ -977,11 +977,11 @@ bool SwVbaSelection::HasSelection() throw( uno::RuntimeException ) return true; } -void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString& sBRName ) throw( uno::RuntimeException ) +void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( !xTextTable.is() ) throw uno::RuntimeException( ); @@ -998,20 +998,20 @@ void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString if( sTLName.isEmpty() ) { uno::Reference< table::XCell > xCell; - xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell; + xCursorProps->getPropertyValue( OUString("Cell") ) >>= xCell; if( !xCell.is() ) { throw uno::RuntimeException( ); } uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW ); - xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= sTLName; + xCellProps->getPropertyValue( OUString("CellName") ) >>= sTLName; } } uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::RuntimeException) { - rtl::OUString sTLName; - rtl::OUString sBRName; + OUString sTLName; + OUString sBRName; GetSelectedCellRange( sTLName, sBRName ); sal_Int32 nLeft = 0; sal_Int32 nTop = 0; @@ -1041,7 +1041,7 @@ uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::Run void SAL_CALL SwVbaSelection::Copy( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:Copy"); + OUString url = OUString( ".uno:Copy"); dispatchRequests( mxModel,url ); } @@ -1053,7 +1053,7 @@ void SAL_CALL SwVbaSelection::CopyAsPicture( ) throw (uno::RuntimeException) void SAL_CALL SwVbaSelection::Paste( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:Paste"); + OUString url = OUString( ".uno:Paste"); dispatchRequests( mxModel,url ); } @@ -1101,7 +1101,7 @@ void SAL_CALL SwVbaSelection::WholeStory( ) throw (uno::RuntimeException) // insert an empty line uno::Reference< text::XTextRange > xFirstCellRange = word::getFirstObjectPosition( xText ); mxTextViewCursor->gotoRange( xFirstCellRange, sal_False ); - rtl::OUString url = rtl::OUString( ".uno:InsertPara"); + OUString url = OUString( ".uno:InsertPara"); dispatchRequests( mxModel,url ); } } @@ -1162,20 +1162,20 @@ SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return aRet; } -rtl::OUString +OUString SwVbaSelection::getServiceImplName() { - return rtl::OUString("SwVbaSelection"); + return OUString("SwVbaSelection"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaSelection::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Selection" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Selection" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index ca76d9a214fc..6051b15d1300 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -44,7 +44,7 @@ private: void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException); void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection ) throw ( css::uno::RuntimeException ); css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException ); - void GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString& sBRName ) throw ( css::uno::RuntimeException ); + void GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw ( css::uno::RuntimeException ); css::uno::Reference< css::text::XTextTable > GetXTextTable() throw ( css::uno::RuntimeException ); bool IsInTable() throw ( css::uno::RuntimeException ); bool HasSelection() throw ( css::uno::RuntimeException ); @@ -54,12 +54,12 @@ public: virtual ~SwVbaSelection(); // Attribute - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException); virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); - virtual void SAL_CALL TypeText( const rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException); virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); @@ -104,8 +104,8 @@ public: virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_SELECTION_HXX */ diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 5bd5a109311d..ce5cd906af0f 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -37,12 +37,12 @@ SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } void SAL_CALL -SwVbaStyle::setName( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +SwVbaStyle::setName( const OUString& Name ) throw (uno::RuntimeException) { mxStyle->setName(Name); } -::rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaStyle::getName() throw (uno::RuntimeException) { return mxStyle->getName(); @@ -51,14 +51,14 @@ SwVbaStyle::getName() throw (uno::RuntimeException) sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException) { lang::Locale aLocale; - xTCProps->getPropertyValue( rtl::OUString("CharLocale") ) >>= aLocale; + xTCProps->getPropertyValue( OUString("CharLocale") ) >>= aLocale; return LanguageTag( aLocale ).getLanguageType( false); } void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException) { lang::Locale aLocale = LanguageTag( static_cast<LanguageType>(_languageid) ).getLocale(); - xTCProps->setPropertyValue( rtl::OUString("CharLocale"), uno::makeAny( aLocale ) ) ; + xTCProps->setPropertyValue( OUString("CharLocale"), uno::makeAny( aLocale ) ) ; } ::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException) @@ -75,9 +75,9 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R { sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph; uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.ParagraphStyle") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.style.ParagraphStyle") ) ) nType = word::WdStyleType::wdStyleTypeParagraph; - else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.CharacterStyle") ) ) + else if( xServiceInfo->supportsService( OUString("com.sun.star.style.CharacterStyle") ) ) nType = word::WdStyleType::wdStyleTypeCharacter; else nType = word::WdStyleType::wdStyleTypeList; @@ -93,7 +93,7 @@ SwVbaStyle::getFont() throw ( uno::RuntimeException ) void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle )throw (uno::RuntimeException) { - rtl::OUString sStyle; + OUString sStyle; uno::Reference< word::XStyle > xStyle; if( rStyle >>= xStyle ) { @@ -106,23 +106,23 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro if( !sStyle.isEmpty() ) { - xParaProps->setPropertyValue( rtl::OUString("ParaStyleName"), uno::makeAny( sStyle ) ); + xParaProps->setPropertyValue( OUString("ParaStyleName"), uno::makeAny( sStyle ) ); return; } throw uno::RuntimeException(); } -::rtl::OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException) { - rtl::OUString sNameLocal; - mxStyleProps->getPropertyValue( rtl::OUString("DisplayName") ) >>= sNameLocal; + OUString sNameLocal; + mxStyleProps->getPropertyValue( OUString("DisplayName") ) >>= sNameLocal; return sNameLocal; } -void SAL_CALL SwVbaStyle::setNameLocal( const ::rtl::OUString& _namelocal ) throw (uno::RuntimeException) +void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal ) throw (uno::RuntimeException) { - mxStyleProps->setPropertyValue( rtl::OUString("DisplayName"), uno::makeAny( _namelocal ) ); + mxStyleProps->setPropertyValue( OUString("DisplayName"), uno::makeAny( _namelocal ) ); } uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() throw (uno::RuntimeException) @@ -141,20 +141,20 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat ::sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException) { sal_Bool isAutoUpdate = sal_False; - mxStyleProps->getPropertyValue( rtl::OUString("IsAutoUpdate") ) >>= isAutoUpdate; + mxStyleProps->getPropertyValue( OUString("IsAutoUpdate") ) >>= isAutoUpdate; return isAutoUpdate; } void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (uno::RuntimeException) { - mxStyleProps->setPropertyValue( rtl::OUString("IsAutoUpdate"), uno::makeAny( _automaticallyupdate ) ); + mxStyleProps->setPropertyValue( OUString("IsAutoUpdate"), uno::makeAny( _automaticallyupdate ) ); } uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException) { // ParentStyle - rtl::OUString sBaseStyle; - mxStyleProps->getPropertyValue( rtl::OUString("ParentStyle") ) >>= sBaseStyle; + OUString sBaseStyle; + mxStyleProps->getPropertyValue( OUString("ParentStyle") ) >>= sBaseStyle; if( !sBaseStyle.isEmpty() ) { uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); @@ -172,8 +172,8 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno: _basestyle >>= xStyle; if( xStyle.is() ) { - rtl::OUString sBaseStyle = xStyle->getName(); - mxStyleProps->setPropertyValue( rtl::OUString("ParentStyle"), uno::makeAny( sBaseStyle ) ); + OUString sBaseStyle = xStyle->getName(); + mxStyleProps->setPropertyValue( OUString("ParentStyle"), uno::makeAny( sBaseStyle ) ); } else { @@ -184,8 +184,8 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno: uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeException) { //FollowStyle - rtl::OUString sFollowStyle; - mxStyleProps->getPropertyValue( rtl::OUString("FollowStyle") ) >>= sFollowStyle; + OUString sFollowStyle; + mxStyleProps->getPropertyValue( OUString("FollowStyle") ) >>= sFollowStyle; if( !sFollowStyle.isEmpty() ) { uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); @@ -203,8 +203,8 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs _nextparagraphstyle >>= xStyle; if( xStyle.is() ) { - rtl::OUString sFollowStyle = xStyle->getName(); - mxStyleProps->setPropertyValue( rtl::OUString("FollowStyle"), uno::makeAny( sFollowStyle ) ); + OUString sFollowStyle = xStyle->getName(); + mxStyleProps->setPropertyValue( OUString("FollowStyle"), uno::makeAny( sFollowStyle ) ); } else { @@ -215,24 +215,24 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs ::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() throw (uno::RuntimeException) { sal_Int16 nNumberingLevel = 0; - mxStyleProps->getPropertyValue( rtl::OUString("NumberingLevel") ) >>= nNumberingLevel; + mxStyleProps->getPropertyValue( OUString("NumberingLevel") ) >>= nNumberingLevel; return nNumberingLevel; } -rtl::OUString +OUString SwVbaStyle::getServiceImplName() { - return rtl::OUString("SwVbaStyle"); + return OUString("SwVbaStyle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaStyle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyle" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index a71e0aa09ff1..3e0af4d1f2b4 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -45,14 +45,14 @@ public: static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException); // Attributes - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException); virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString& _namelocal ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException); virtual void SAL_CALL setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException); @@ -63,11 +63,11 @@ public: virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException); //XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return rtl::OUString("Name"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Name"); } // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SW_VBA_AXIS_HXX diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 66d055359635..8c3d66ca1b3c 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -171,23 +171,23 @@ public: // we only concern about the Paragraph styles uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStyleFamilies = xStyleSupplier->getStyleFamilies(); - mxParaStyles.set( xStyleFamilies->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); + mxParaStyles.set( xStyleFamilies->getByName( OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); } // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return style::XStyle::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { return mxParaStyles->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { // search in the MSOStyleName table first for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != NULL; pTable++ ) @@ -195,7 +195,7 @@ public: if( aName.equalsIgnoreAsciiCaseAscii( pTable->pMSOStyleName ) ) { //Found it - rtl::OUString sStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName ); + OUString sStyleName = OUString::createFromAscii( pTable->pOOoStyleName ); if( mxParaStyles->hasByName( sStyleName ) ) { cachePos = mxParaStyles->getByName( sStyleName ); @@ -212,10 +212,10 @@ public: } else { - uno::Sequence< rtl::OUString > sElementNames = mxParaStyles->getElementNames(); + uno::Sequence< OUString > sElementNames = mxParaStyles->getElementNames(); for( sal_Int32 j = 0; j < sElementNames.getLength(); j++ ) { - rtl::OUString aStyleName = sElementNames[j]; + OUString aStyleName = sElementNames[j]; if( aStyleName.equalsIgnoreAsciiCase( aName ) ) { cachePos = mxParaStyles->getByName( aStyleName ); @@ -243,7 +243,7 @@ public: // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } }; @@ -301,31 +301,31 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: { if( nIndex == pTable->wdBuiltinStyle ) { - rtl::OUString aStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName ); + OUString aStyleName = OUString::createFromAscii( pTable->pOOoStyleName ); if( !aStyleName.isEmpty() ) { - rtl::OUString aStyleType; + OUString aStyleType; switch( pTable->wdStyleType ) { case word::WdStyleType::wdStyleTypeParagraph: case word::WdStyleType::wdStyleTypeTable: { - aStyleType = rtl::OUString("ParagraphStyles"); + aStyleType = OUString("ParagraphStyles"); break; } case word::WdStyleType::wdStyleTypeCharacter: { - aStyleType = rtl::OUString("CharacterStyles"); + aStyleType = OUString("CharacterStyles"); break; } case word::WdStyleType::wdStyleTypeList: { // should use Paragraph style and set the property "NumberingStyleName" - aStyleType = rtl::OUString("ParagraphStyles"); + aStyleType = OUString("ParagraphStyles"); break; } default: - DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); + DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() ); } uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW ); @@ -333,14 +333,14 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: // set the property "NumberingStyleName" if it is a listbullet if( pTable->wdStyleType == word::WdStyleType::wdStyleTypeList ) { - xStyleProps->setPropertyValue( rtl::OUString("NumberingStyleName"), uno::makeAny( aStyleName ) ); + xStyleProps->setPropertyValue( OUString("NumberingStyleName"), uno::makeAny( aStyleName ) ); } return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProps ) ) ); } else { OSL_TRACE("SwVbaStyles::Item: the builtin style type is not implemented"); - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -348,20 +348,20 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: return SwVbaStyles_BASE::Item( Index1, Index2 ); } -rtl::OUString +OUString SwVbaStyles::getServiceImplName() { - return rtl::OUString("SwVbaStyles"); + return OUString("SwVbaStyles"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaStyles::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyles" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyles" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 321b6dee6e9c..eb7a5bdcd8bc 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -36,8 +36,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index dc690fd77d25..6953bfad1743 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -43,19 +43,19 @@ PrivateProfileStringListener::~PrivateProfileStringListener() { } -void PrivateProfileStringListener::Initialize( const rtl::OUString& rFileName, const rtl::OString& rGroupName, const rtl::OString& rKey ) +void PrivateProfileStringListener::Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey ) { maFileName = rFileName; maGroupName = rGroupName; maKey = rKey; } #ifdef WNT -void lcl_getRegKeyInfo( const rtl::OString& sKeyInfo, HKEY& hBaseKey, rtl::OString& sSubKey ) +void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKey ) { sal_Int32 nBaseKeyIndex = sKeyInfo.indexOf('\\'); if( nBaseKeyIndex > 0 ) { - rtl::OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex ); + OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex ); sSubKey = sKeyInfo.copy( nBaseKeyIndex + 1 ); if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_USER")) ) { @@ -84,20 +84,20 @@ void lcl_getRegKeyInfo( const rtl::OString& sKeyInfo, HKEY& hBaseKey, rtl::OStri uno::Any PrivateProfileStringListener::getValueEvent() { // get the private profile string - rtl::OUString sValue; + OUString sValue; if(!maFileName.isEmpty()) { // get key/value from a file Config aCfg( maFileName ); aCfg.SetGroup( maGroupName ); - sValue = rtl::OStringToOUString(aCfg.ReadKey(maKey), RTL_TEXTENCODING_DONTKNOW); + sValue = OStringToOUString(aCfg.ReadKey(maKey), RTL_TEXTENCODING_DONTKNOW); } else { // get key/value from windows register #ifdef WNT HKEY hBaseKey = NULL; - rtl::OString sSubKey; + OString sSubKey; lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey ); if( hBaseKey != NULL ) { @@ -112,13 +112,13 @@ uno::Any PrivateProfileStringListener::getValueEvent() LPCTSTR lpValueName = TEXT(maKey.getStr()); lResult = RegQueryValueEx( hKey, lpValueName, NULL, NULL, (LPBYTE)szBuffer, &cbData ); RegCloseKey( hKey ); - sValue = rtl::OUString::createFromAscii(szBuffer); + sValue = OUString::createFromAscii(szBuffer); } } return uno::makeAny( sValue ); #else - throw uno::RuntimeException( rtl::OUString("Only support on Windows"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Only support on Windows"), uno::Reference< uno::XInterface >() ); #endif } @@ -128,21 +128,21 @@ uno::Any PrivateProfileStringListener::getValueEvent() void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) { // set the private profile string - rtl::OUString aValue; + OUString aValue; value >>= aValue; if(!maFileName.isEmpty()) { // set value into a file Config aCfg( maFileName ); aCfg.SetGroup( maGroupName ); - aCfg.WriteKey( maKey, rtl::OUStringToOString(aValue, RTL_TEXTENCODING_DONTKNOW) ); + aCfg.WriteKey( maKey, OUStringToOString(aValue, RTL_TEXTENCODING_DONTKNOW) ); } else { //set value into windows register #ifdef WNT HKEY hBaseKey = NULL; - rtl::OString sSubKey; + OString sSubKey; lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey ); if( hBaseKey != NULL ) { @@ -152,7 +152,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) lResult = RegCreateKeyEx( hBaseKey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL ); if( ERROR_SUCCESS == lResult ) { - LPCTSTR szValue = TEXT( rtl::OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); + LPCTSTR szValue = TEXT( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); DWORD cbData = sizeof(TCHAR) * (_tcslen(szValue) + 1); LPCTSTR lpValueName = TEXT(maKey.getStr()); lResult = RegSetValueEx( hKey, lpValueName, 0 /* Reserved */, REG_SZ, (LPBYTE)szValue, cbData ); @@ -161,7 +161,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) } return; #else - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); #endif } @@ -229,7 +229,7 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -241,11 +241,11 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) } uno::Any SAL_CALL -SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException ) +SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( uno::RuntimeException ) { // FIXME: need to detect whether it is a relative file path // we need to detect if this is a URL, if not then assume its a file path - rtl::OUString sFileUrl; + OUString sFileUrl; if( !rFilename.isEmpty() ) { INetURLObject aObj; @@ -257,27 +257,27 @@ SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OU osl::FileBase::getFileURLFromSystemPath( rFilename, sFileUrl); } - rtl::OString aGroupName(rtl::OUStringToOString(rSection, RTL_TEXTENCODING_DONTKNOW)); - rtl::OString aKey(rtl::OUStringToOString(rKey, RTL_TEXTENCODING_DONTKNOW)); + OString aGroupName(OUStringToOString(rSection, RTL_TEXTENCODING_DONTKNOW)); + OString aKey(OUStringToOString(rKey, RTL_TEXTENCODING_DONTKNOW)); maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey ); return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) ); } -rtl::OUString +OUString SwVbaSystem::getServiceImplName() { - return rtl::OUString("SwVbaSystem"); + return OUString("SwVbaSystem"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaSystem::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.System" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.System" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index c82c16bd5bcb..f6b376e54855 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -29,13 +29,13 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSystem > SwVbaSystem_BAS class PrivateProfileStringListener : public PropListener { private: - rtl::OUString maFileName; - rtl::OString maGroupName; - rtl::OString maKey; + OUString maFileName; + OString maGroupName; + OString maKey; public: PrivateProfileStringListener(){}; virtual ~PrivateProfileStringListener(); - void Initialize( const rtl::OUString& rFileName, const rtl::OString& rGroupName, const rtl::OString& rKey ); + void Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey ); //PropListener virtual void setValueEvent( const css::uno::Any& value ); @@ -54,11 +54,11 @@ public: // XSystem virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException ); virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException ); - virtual css::uno::Any SAL_CALL PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_SYSTEM_HXX */ diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index f421ffdbbb9b..7b425c67b245 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -78,7 +78,7 @@ SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*Nest throw uno::RuntimeException(); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaTable::getName() throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( mxTextTable, uno::UNO_QUERY_THROW ); @@ -117,20 +117,20 @@ SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString +OUString SwVbaTable::getServiceImplName() { - return rtl::OUString("SwVbaTable"); + return OUString("SwVbaTable"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaTable::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Table" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Table" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 6b77d8592a0f..79c74aa771ae 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -38,14 +38,14 @@ public: virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getName( ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 7d7029333fe8..59aaf3707c93 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -72,7 +72,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeExceptio return nRet; } -sal_Int32 SwVbaTableHelper::getTabRowIndex( const rtl::OUString& CellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& CellName ) throw (uno::RuntimeException) { sal_Int32 nRet = 0; String sCellName(CellName); @@ -87,7 +87,7 @@ sal_Int32 SwVbaTableHelper::getTabRowIndex( const rtl::OUString& CellName ) thro return nRet; } -sal_Int32 SwVbaTableHelper::getTabColIndex( const rtl::OUString& CellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& CellName ) throw (uno::RuntimeException) { sal_Int32 nRet = 0; String sCellName(CellName); @@ -99,7 +99,7 @@ sal_Int32 SwVbaTableHelper::getTabColIndex( const rtl::OUString& CellName ) thro return nRet; } -rtl::OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol ) +OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol ) { const sal_Int32 coDiff = 52; // 'A'-'Z' 'a' - 'z' sal_Int32 nCalc = 0; @@ -125,14 +125,14 @@ sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException) sal_Int32 nWidth = 0; sal_Bool isWidthRelatvie = sal_False; uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->getPropertyValue( rtl::OUString("IsWidthRelative") ) >>= isWidthRelatvie; + xTableProps->getPropertyValue( OUString("IsWidthRelative") ) >>= isWidthRelatvie; if( isWidthRelatvie ) { - xTableProps->getPropertyValue( rtl::OUString("RelativeWidth") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("RelativeWidth") ) >>= nWidth; } else { - xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth; } return nWidth; } diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx index 1d60af8922fd..aa0b2787dc75 100644 --- a/sw/source/ui/vba/vbatablehelper.hxx +++ b/sw/source/ui/vba/vbatablehelper.hxx @@ -42,15 +42,15 @@ public: ~SwVbaTableHelper() {} sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex ) throw (css::uno::RuntimeException); sal_Int32 getTabColumnsMaxCount( ) throw (css::uno::RuntimeException); - sal_Int32 getTabRowIndex( const rtl::OUString& sCellName ) throw (css::uno::RuntimeException); - sal_Int32 getTabColIndex( const rtl::OUString& sCellName ) throw (css::uno::RuntimeException); + sal_Int32 getTabRowIndex( const OUString& sCellName ) throw (css::uno::RuntimeException); + sal_Int32 getTabColIndex( const OUString& sCellName ) throw (css::uno::RuntimeException); sal_Int32 getTableWidth( ) throw (css::uno::RuntimeException); sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException); void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException); static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException); - static rtl::OUString getColumnStr( sal_Int32 nCol ); + static OUString getColumnStr( sal_Int32 nCol ); }; #endif diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index 2eb70b88b254..9e34d29f3a0a 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -38,13 +38,13 @@ SwVbaTableOfContents::~SwVbaTableOfContents() ::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel() throw (uno::RuntimeException) { sal_Int16 nLevel = 0; - mxTocProps->getPropertyValue(rtl::OUString("Level") ) >>= nLevel; + mxTocProps->getPropertyValue(OUString("Level") ) >>= nLevel; return nLevel; } void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString("Level"), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); + mxTocProps->setPropertyValue( OUString("Level"), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); } ::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() throw (uno::RuntimeException) @@ -61,25 +61,25 @@ void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) t ::sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException) { sal_Bool bUseFields = sal_False; - mxTocProps->getPropertyValue(rtl::OUString("CreateFromMarks") ) >>= bUseFields; + mxTocProps->getPropertyValue(OUString("CreateFromMarks") ) >>= bUseFields; return bUseFields; } void SAL_CALL SwVbaTableOfContents::setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString("CreateFromMarks"), uno::makeAny( _useFields ) ); + mxTocProps->setPropertyValue( OUString("CreateFromMarks"), uno::makeAny( _useFields ) ); } ::sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException) { sal_Bool bUseOutlineLevels = sal_False; - mxTocProps->getPropertyValue(rtl::OUString("CreateFromOutline") ) >>= bUseOutlineLevels; + mxTocProps->getPropertyValue(OUString("CreateFromOutline") ) >>= bUseOutlineLevels; return bUseOutlineLevels; } void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString("CreateFromOutline"), uno::makeAny( _useOutlineLevels ) ); + mxTocProps->setPropertyValue( OUString("CreateFromOutline"), uno::makeAny( _useOutlineLevels ) ); } void SAL_CALL SwVbaTableOfContents::Delete( ) throw (uno::RuntimeException) @@ -93,20 +93,20 @@ void SAL_CALL SwVbaTableOfContents::Update( ) throw (uno::RuntimeException) mxDocumentIndex->update(); } -rtl::OUString +OUString SwVbaTableOfContents::getServiceImplName() { - return rtl::OUString("SwVbaTableOfContents"); + return OUString("SwVbaTableOfContents"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaTableOfContents::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TableOfContents" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.TableOfContents" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index d99e353a8826..fa5d42707cdd 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -53,8 +53,8 @@ public: virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_TABLEOFCONTENTS_HXX */ diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 1448b4bd28e7..e3b4f04d1826 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -53,7 +53,7 @@ static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTab uno::Reference< text::XTextContent > xTextContent( xTable, uno::UNO_QUERY_THROW ); uno::Reference< text::XText > xText = xTextContent->getAnchor()->getText(); uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW ); - rtl::OUString aImplName = xServiceInfo->getImplementationName(); + OUString aImplName = xServiceInfo->getImplementationName(); if ( aImplName == "SwXHeadFootText" ) return true; return false; @@ -98,17 +98,17 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return text::XTextTable::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( xTable ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > sNames( mxTables.size() ); - rtl::OUString* pString = sNames.getArray(); + uno::Sequence< OUString > sNames( mxTables.size() ); + OUString* pString = sNames.getArray(); XTextTableVec::iterator it = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); for ( ; it != it_end; ++it, ++pString ) @@ -118,7 +118,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { cachePos = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); @@ -178,7 +178,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange(); uno::Reference< text::XTextTable > xTable; - xTable.set( xMsf->createInstance( rtl::OUString("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW ); + xTable.set( xMsf->createInstance( OUString("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW ); xTable->initialize( nRows, nCols ); uno::Reference< text::XText > xText = xTextRange->getText(); @@ -209,10 +209,10 @@ SwVbaTables::createCollectionObject( const uno::Any& aSource ) } // XHelperInterface -rtl::OUString +OUString SwVbaTables::getServiceImplName() { - return rtl::OUString("SwVbaTables"); + return OUString("SwVbaTables"); } // XEnumerationAccess @@ -222,14 +222,14 @@ SwVbaTables::getElementType() throw (uno::RuntimeException) return word::XTable::static_type(0); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaTables::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Tables" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Tables" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index a232b68c874f..b9cf16fc6260 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -40,8 +40,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 8be4212c2fdb..656259e6887a 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -112,11 +112,11 @@ uno::Reference< word::XTableOfContents > SAL_CALL SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ ) throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW ); - uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.ContentIndex") ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( OUString("com.sun.star.text.ContentIndex") ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xTocProps( xDocumentIndex, uno::UNO_QUERY_THROW ); sal_Bool isProtected = sal_False; - xTocProps->setPropertyValue( rtl::OUString("IsProtected"), uno::makeAny( isProtected ) ); + xTocProps->setPropertyValue( OUString("IsProtected"), uno::makeAny( isProtected ) ); uno::Reference< word::XTableOfContents > xToc( new SwVbaTableOfContents( this, mxContext, mxTextDocument, xDocumentIndex ) ); @@ -164,20 +164,20 @@ SwVbaTablesOfContents::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaTablesOfContents::getServiceImplName() { - return rtl::OUString("SwVbaTablesOfContents"); + return OUString("SwVbaTablesOfContents"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SwVbaTablesOfContents::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.TablesOfContents"); + sNames[0] = OUString("ooo.vba.word.TablesOfContents"); } return sNames; } diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx index 49cd2fc43ec3..02ddb4344aa5 100644 --- a/sw/source/ui/vba/vbatablesofcontents.hxx +++ b/sw/source/ui/vba/vbatablesofcontents.hxx @@ -46,8 +46,8 @@ public: // SwVbaTablesOfContents_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_TABLESOFCONTENTS_HXX */ diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index 7ff80c3987e8..d780309e6a2c 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -31,20 +31,20 @@ SwVbaTabStop::~SwVbaTabStop() { } -rtl::OUString +OUString SwVbaTabStop::getServiceImplName() { - return rtl::OUString("SwVbaTabStop"); + return OUString("SwVbaTabStop"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaTabStop::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TabStop" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.TabStop" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index a5f4e3697912..441916bb5433 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -37,8 +37,8 @@ public: virtual ~SwVbaTabStop(); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_TABSTOP_HXX */ diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index c6520cf903e2..0af68076fccc 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -28,13 +28,13 @@ using namespace ::com::sun::star; static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) { uno::Sequence< style::TabStop > aSeq; - xParaProps->getPropertyValue( rtl::OUString("ParaTabStops") ) >>= aSeq; + xParaProps->getPropertyValue( OUString("ParaTabStops") ) >>= aSeq; return aSeq; } static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException) { - xParaProps->setPropertyValue( rtl::OUString("ParaTabStops"), uno::makeAny( aSeq ) ); + xParaProps->setPropertyValue( OUString("ParaTabStops"), uno::makeAny( aSeq ) ); } typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base; @@ -144,7 +144,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co case word::WdTabAlignment::wdAlignTabBar: case word::WdTabAlignment::wdAlignTabList: { - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); break; } default: @@ -249,20 +249,20 @@ SwVbaTabStops::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaTabStops::getServiceImplName() { - return rtl::OUString("SwVbaTabStops"); + return OUString("SwVbaTabStops"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaTabStops::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.TabStops"); + sNames[0] = OUString("ooo.vba.word.TabStops"); } return sNames; } diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx index cc4f646500eb..70e6659a54b8 100644 --- a/sw/source/ui/vba/vbatabstops.hxx +++ b/sw/source/ui/vba/vbatabstops.hxx @@ -47,8 +47,8 @@ public: // SwVbaTabStops_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_TABSTOPS_HXX */ diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index e17a2fc87c9c..9abe53aebcee 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -46,7 +46,7 @@ static String lcl_CheckGroupName( const String& rGroupName ) } -SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rFullUrl ) +SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl ) : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl ) { } @@ -56,10 +56,10 @@ SwVbaTemplate::~SwVbaTemplate() { } -rtl::OUString +OUString SwVbaTemplate::getName() throw ( css::uno::RuntimeException ) { - rtl::OUString sName; + OUString sName; if( !msFullUrl.isEmpty() ) { INetURLObject aURL( msFullUrl ); @@ -68,14 +68,14 @@ SwVbaTemplate::getName() throw ( css::uno::RuntimeException ) return sName; } -rtl::OUString +OUString SwVbaTemplate::getPath() throw ( css::uno::RuntimeException ) { - rtl::OUString sPath; + OUString sPath; if( !msFullUrl.isEmpty() ) { INetURLObject aURL( msFullUrl ); - rtl::OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); + OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 ); ::osl::File::getSystemPathFromFileURL( sURL, sPath ); } @@ -89,8 +89,8 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep uno::Reference< text::XAutoTextContainer2 > xAutoTextContainer = text::AutoTextContainer::create( xContext ); // the default template is "Normal.dot" in Word. - rtl::OUString sGroup("Normal"); - rtl::OUString sName = getName(); + OUString sGroup("Normal"); + OUString sName = getName(); sal_Int32 nIndex = sName.lastIndexOf( sal_Unicode('.') ); if( nIndex > 0 ) { @@ -105,7 +105,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep } else { - throw uno::RuntimeException( rtl::OUString("Auto Text Entry doesn't exist"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Auto Text Entry doesn't exist"), uno::Reference< uno::XInterface >() ); } uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) ); @@ -114,20 +114,20 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaTemplate::getServiceImplName() { - return rtl::OUString("SwVbaTemplate"); + return OUString("SwVbaTemplate"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaTemplate::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Template" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Template" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 2d575ad9525c..ff4221d75469 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -28,19 +28,19 @@ class SwVbaTemplate : public SwVbaTemplate_BASE { private: css::uno::Reference< css::frame::XModel > mxModel; - rtl::OUString msFullUrl; + OUString msFullUrl; public: SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& ); + const css::uno::Reference< css::frame::XModel >& rModel, const OUString& ); virtual ~SwVbaTemplate(); // XTemplate - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_TEMPLATE_HXX */ diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx index 3cbed2123c7c..780bb08fadfc 100644 --- a/sw/source/ui/vba/vbavariable.cxx +++ b/sw/source/ui/vba/vbavariable.cxx @@ -26,7 +26,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const uno::Reference< beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( uno::RuntimeException ) : + const uno::Reference< beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( uno::RuntimeException ) : SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maName( rName ) { } @@ -35,16 +35,16 @@ SwVbaVariable::~SwVbaVariable() { } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaVariable::getName() throw ( css::uno::RuntimeException ) { return maName; } void SAL_CALL -SwVbaVariable::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ) +SwVbaVariable::setName( const OUString& ) throw ( css::uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL @@ -75,20 +75,20 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException ) return 0; } -rtl::OUString +OUString SwVbaVariable::getServiceImplName() { - return rtl::OUString("SwVbaVariable"); + return OUString("SwVbaVariable"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaVariable::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Variable" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Variable" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index 8a96490f19aa..128ea1549415 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -30,23 +30,23 @@ class SwVbaVariable : public SwVbaVariable_BASE { private: css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined; - rtl::OUString maName; + OUString maName; public: SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( css::uno::RuntimeException ); virtual ~SwVbaVariable(); // XVariable - virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ); + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); + virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException ); virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException ); virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_VARIABLE_HXX */ diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index b74401a882b1..c1a4b2d6deb6 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -61,33 +61,33 @@ SwVbaVariables::createCollectionObject( const css::uno::Any& aSource ) } uno::Any SAL_CALL -SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException) +SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException) { uno::Any aValue; if( rValue.hasValue() ) aValue = rValue; else - aValue <<= rtl::OUString(); + aValue <<= OUString(); uno::Reference< beans::XPropertyContainer > xPropertyContainer( mxUserDefined, uno::UNO_QUERY_THROW ); xPropertyContainer->addProperty( rName, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVABLE, aValue ); return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) ); } -rtl::OUString +OUString SwVbaVariables::getServiceImplName() { - return rtl::OUString("SwVbaVariables"); + return OUString("SwVbaVariables"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> SwVbaVariables::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Variables"); + sNames[0] = OUString("ooo.vba.word.Variables"); } return sNames; } diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index 1d13bb5b9e3c..dbd4267f6019 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -43,11 +43,11 @@ public: // SwVbaVariables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XVariables - virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException); }; #endif /* SW_VBA_VARIABLES_HXX */ diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index 5591eaaee297..483254bd9f10 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -71,13 +71,13 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) uno::Reference< text::XText > xCurrentText = mxViewCursor->getText(); uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextContent > xTextContent; - while( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent ) + while( xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextContent ) { xCurrentText = xTextContent->getAnchor()->getText(); xCursorProps.set( xCurrentText->createTextCursor(), uno::UNO_QUERY_THROW ); } uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW ); - rtl::OUString aImplName = xServiceInfo->getImplementationName(); + OUString aImplName = xServiceInfo->getImplementationName(); if ( aImplName == "SwXBodyText" ) { return word::WdSeekView::wdSeekMainDocument; @@ -105,7 +105,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) } else if ( aImplName == "SwXFootnote" ) { - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Endnote") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.Endnote") ) ) return word::WdSeekView::wdSeekEndnotes; else return word::WdSeekView::wdSeekFootnotes; @@ -148,7 +148,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio } else { - DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() ); + DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() ); } break; } @@ -163,7 +163,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio } else { - DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() ); + DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() ); } break; } @@ -193,14 +193,14 @@ SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::Run SwVbaView::getTableGridLines() throw (css::uno::RuntimeException) { sal_Bool bShowTableGridLine = sal_False; - mxViewSettings->getPropertyValue( rtl::OUString("ShowTableBoundaries")) >>= bShowTableGridLine; + mxViewSettings->getPropertyValue( OUString("ShowTableBoundaries")) >>= bShowTableGridLine; return bShowTableGridLine; } void SAL_CALL SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException) { - mxViewSettings->setPropertyValue( rtl::OUString("ShowTableBoundaries"), uno::makeAny( _tablegridlines ) ); + mxViewSettings->setPropertyValue( OUString("ShowTableBoundaries"), uno::makeAny( _tablegridlines ) ); } ::sal_Int32 SAL_CALL @@ -208,7 +208,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException) { // FIXME: handle wdPrintPreview type sal_Bool bOnlineLayout = sal_False; - mxViewSettings->getPropertyValue( rtl::OUString("ShowOnlineLayout")) >>= bOnlineLayout; + mxViewSettings->getPropertyValue( OUString("ShowOnlineLayout")) >>= bOnlineLayout; return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView; } @@ -221,12 +221,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException) case word::WdViewType::wdPrintView: case word::WdViewType::wdNormalView: { - mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_False ) ); + mxViewSettings->setPropertyValue( OUString("ShowOnlineLayout"), uno::makeAny( sal_False ) ); break; } case word::WdViewType::wdWebView: { - mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_True ) ); + mxViewSettings->setPropertyValue( OUString("ShowOnlineLayout"), uno::makeAny( sal_True ) ); break; } case word::WdViewType::wdPrintPreview: @@ -235,7 +235,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException) break; } default: - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); } } @@ -244,10 +244,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) { mxModel->lockControllers(); - rtl::OUString aPropIsOn; - rtl::OUString aPropIsShared; - rtl::OUString aPropBodyDistance; - rtl::OUString aPropText; + OUString aPropIsOn; + OUString aPropIsShared; + OUString aPropBodyDistance; + OUString aPropText; switch( nType ) { @@ -256,10 +256,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryFooter: case word::WdSeekView::wdSeekEvenPagesFooter: { - aPropIsOn = rtl::OUString("FooterIsOn"); - aPropIsShared = rtl::OUString("FooterIsShared"); - aPropBodyDistance = rtl::OUString("FooterBodyDistance"); - aPropText = rtl::OUString("FooterText"); + aPropIsOn = OUString("FooterIsOn"); + aPropIsShared = OUString("FooterIsShared"); + aPropBodyDistance = OUString("FooterBodyDistance"); + aPropText = OUString("FooterText"); break; } case word::WdSeekView::wdSeekCurrentPageHeader: @@ -267,10 +267,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryHeader: case word::WdSeekView::wdSeekEvenPagesHeader: { - aPropIsOn = rtl::OUString("HeaderIsOn"); - aPropIsShared = rtl::OUString("HeaderIsShared"); - aPropBodyDistance = rtl::OUString("HeaderBodyDistance"); - aPropText = rtl::OUString("HeaderText"); + aPropIsOn = OUString("HeaderIsOn"); + aPropIsShared = OUString("HeaderIsShared"); + aPropBodyDistance = OUString("HeaderBodyDistance"); + aPropText = OUString("HeaderText"); break; } } @@ -302,8 +302,8 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) // not shared and the current style is applied to a page with // an even page number uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW ); - rtl::OUString aPageStyleName; - xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xCursorProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; if ( aPageStyleName == "First Page" ) { // go to the beginning of where the next style is used @@ -316,7 +316,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) while( hasNextPage && ( xStyle == word::getCurrentPageStyle( mxModel ) ) ); if( !hasNextPage ) - DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_ACTION, OUString() ); } break; } @@ -339,15 +339,15 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) } if( !isShared ) { - rtl::OUString aTempPropText = aPropText; + OUString aTempPropText = aPropText; if( nType == word::WdSeekView::wdSeekEvenPagesFooter || nType == word::WdSeekView::wdSeekEvenPagesHeader ) { - aTempPropText += rtl::OUString("Left"); + aTempPropText += OUString("Left"); } else { - aTempPropText += rtl::OUString("Right"); + aTempPropText += OUString("Right"); } xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW ); } @@ -356,7 +356,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) if( nType == word::WdSeekView::wdSeekEvenPagesFooter || nType == word::WdSeekView::wdSeekEvenPagesHeader ) { - DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_ACTION, OUString() ); } xText.set( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); } @@ -364,26 +364,26 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) mxModel->unlockControllers(); if( !xText.is() ) { - DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); + DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() ); } uno::Reference< text::XTextRange > xTextRange = word::getFirstObjectPosition( xText ); return xTextRange; } -rtl::OUString +OUString SwVbaView::getServiceImplName() { - return rtl::OUString("SwVbaView"); + return OUString("SwVbaView"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaView::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.View" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.View" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index fd14f25ef06a..14de7ad7fffb 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -54,8 +54,8 @@ public: virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SW_VBA_VIEW_HXX */ diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index b8a22620c08e..611299a19c05 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -108,7 +108,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == word::WdWindowState::wdWindowStateNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -128,20 +128,20 @@ SwVbaWindow::ActivePane() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); } -rtl::OUString +OUString SwVbaWindow::getServiceImplName() { - return rtl::OUString("SwVbaWindow"); + return OUString("SwVbaWindow"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaWindow::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Window" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Window" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 31dedaa3b03d..8e7d48202292 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -48,8 +48,8 @@ public: virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SW_VBA_WINDOW_HXX diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index e8573fefca91..efd8c282e861 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -62,29 +62,29 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) case word::WdWrapType::wdWrapSquare: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_False ) ); + m_xPropertySet->setPropertyValue( OUString("SurroundContour"), uno::makeAny( sal_False ) ); break; } case word::WdWrapType::wdWrapTight: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_True ) ); + m_xPropertySet->setPropertyValue( OUString("SurroundContour"), uno::makeAny( sal_True ) ); break; } default: { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } } } - m_xPropertySet->setPropertyValue( rtl::OUString("TextWrap"), uno::makeAny( eTextMode ) ); + m_xPropertySet->setPropertyValue( OUString("TextWrap"), uno::makeAny( eTextMode ) ); } ::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException) { sal_Int32 nType = word::WdWrapType::wdWrapSquare; text::WrapTextMode eTextMode; - m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode; + m_xPropertySet->getPropertyValue( OUString("TextWrap")) >>= eTextMode; switch( eTextMode ) { case text::WrapTextMode_NONE: @@ -100,7 +100,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) case text::WrapTextMode_PARALLEL: { sal_Bool bContour = sal_False; - m_xPropertySet->getPropertyValue( rtl::OUString("SurroundContour")) >>= bContour; + m_xPropertySet->getPropertyValue( OUString("SurroundContour")) >>= bContour; if( bContour ) nType = word::WdWrapType::wdWrapTight; else @@ -132,7 +132,7 @@ void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeE { sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth; text::WrapTextMode eTextMode; - m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode; + m_xPropertySet->getPropertyValue( OUString("TextWrap")) >>= eTextMode; switch( eTextMode ) { case text::WrapTextMode_LEFT: @@ -159,14 +159,14 @@ void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) throw (uno::RuntimeE makeWrap(); } -float SwVbaWrapFormat::getDistance( const rtl::OUString& sName ) throw (uno::RuntimeException) +float SwVbaWrapFormat::getDistance( const OUString& sName ) throw (uno::RuntimeException) { sal_Int32 nDistance = 0; m_xPropertySet->getPropertyValue( sName ) >>= nDistance; return static_cast< float >( Millimeter::getInPoints( nDistance ) ); } -void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) throw (uno::RuntimeException) +void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance ) throw (uno::RuntimeException) { sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance ); m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) ); @@ -174,58 +174,58 @@ void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("TopMargin") ); + return getDistance( OUString("TopMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("TopMargin"), _distancetop ); + setDistance( OUString("TopMargin"), _distancetop ); } float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("BottomMargin") ); + return getDistance( OUString("BottomMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("BottomMargin"), _distancebottom ); + setDistance( OUString("BottomMargin"), _distancebottom ); } float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("LeftMargin") ); + return getDistance( OUString("LeftMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("LeftMargin"), _distanceleft ); + setDistance( OUString("LeftMargin"), _distanceleft ); } float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("RightMargin") ); + return getDistance( OUString("RightMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("RightMargin"), _distanceright ); + setDistance( OUString("RightMargin"), _distanceright ); } -rtl::OUString +OUString SwVbaWrapFormat::getServiceImplName() { - return rtl::OUString("SwVbaWrapFormat"); + return OUString("SwVbaWrapFormat"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaWrapFormat::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.WrapFormat" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.WrapFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index bc9c5007e76b..3ebf610ec4b4 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -35,8 +35,8 @@ private: private: void makeWrap() throw (css::uno::RuntimeException); - float getDistance( const rtl::OUString& sName ) throw (css::uno::RuntimeException); - void setDistance( const rtl::OUString& sName, float _distance ) throw (css::uno::RuntimeException); + float getDistance( const OUString& sName ) throw (css::uno::RuntimeException); + void setDistance( const OUString& sName, float _distance ) throw (css::uno::RuntimeException); public: SwVbaWrapFormat( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); @@ -54,8 +54,8 @@ public: virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException); virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SW_VBA_XWRAPFORMAT_HXX diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index fa5cdf7ec75f..28d714b3b079 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -72,11 +72,11 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) { - rtl::OUString aPageStyleName; - xProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW ); uno::Reference< style::XStyle > xStyle( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW ); return xStyle; @@ -93,8 +93,8 @@ uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); - uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( rtl::OUString("Standard") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( OUString("Standard") ), uno::UNO_QUERY_THROW ); return xStyle; } @@ -108,7 +108,7 @@ uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< if( xParaEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParaEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextTable") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.TextTable") ) ) { uno::Reference< table::XCellRange > xCellRange( xServiceInfo, uno::UNO_QUERY_THROW ); uno::Reference< text::XText> xFirstCellText( xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); @@ -149,14 +149,14 @@ uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XMod //catch exception "no text selection" } uno::Reference< beans::XPropertySet > xVCProps( xTextRange, uno::UNO_QUERY_THROW ); - while( xVCProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent ) + while( xVCProps->getPropertyValue( OUString("TextTable") ) >>= xTextContent ) { xText = xTextContent->getAnchor()->getText(); xVCProps.set( xText->createTextCursor(), uno::UNO_QUERY_THROW ); } if( !xText.is() ) - throw uno::RuntimeException( rtl::OUString( "no text selection" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "no text selection" ), uno::Reference< uno::XInterface >() ); return xText; } |