diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /embeddedobj | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'embeddedobj')
41 files changed, 769 insertions, 769 deletions
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 974051b63a31..24a7850427ca 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -102,7 +102,7 @@ void OCommonEmbeddedObject::Deactivate() catch( const uno::Exception& e ) { throw embed::StorageWrappedTargetException( - ::rtl::OUString( "The client could not store the object!" ), + OUString( "The client could not store the object!" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ), uno::makeAny( e ) ); } @@ -227,7 +227,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) { if ( !m_xClientSite.is() ) throw embed::WrongStateException( - ::rtl::OUString( "client site not set, yet" ), + OUString( "client site not set, yet" ), *this ); @@ -310,7 +310,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) uno::Reference< frame::XDispatchProvider > xContainerDP = xInplaceClient->getInplaceDispatchProvider(); // get the container module name - ::rtl::OUString aModuleName; + OUString aModuleName; try { uno::Reference< embed::XComponentSupplier > xCompSupl( m_xClientSite, uno::UNO_QUERY_THROW ); @@ -387,7 +387,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) } } else - throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ), + throw embed::WrongStateException( OUString( "The object is in unacceptable state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -400,7 +400,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_ break; if ( nCurInd == m_aAcceptedStates.getLength() ) - throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ), + throw embed::WrongStateException( OUString( "The object is in unacceptable state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int32 nDestInd = 0; @@ -410,7 +410,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_ if ( nDestInd == m_aAcceptedStates.getLength() ) throw embed::UnreachableStateException( - ::rtl::OUString( "The state either not reachable, or the object allows the state only as an intermediate one!\n" ), + OUString( "The state either not reachable, or the object allows the state only as an intermediate one!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), m_nObjectState, nNewState ); @@ -434,7 +434,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int32 nOldState = m_nObjectState; @@ -442,7 +442,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) if ( m_nTargetState != -1 ) { // means that the object is currently trying to reach the target state - throw embed::StateChangeInProgressException( ::rtl::OUString(), + throw embed::StateChangeInProgressException( OUString(), uno::Reference< uno::XInterface >(), m_nTargetState ); } @@ -487,7 +487,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) // let the object window be shown if ( nNewState == embed::EmbedStates::UI_ACTIVE || nNewState == embed::EmbedStates::INPLACE_ACTIVE ) - PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + PostEvent_Impl( OUString( "OnVisAreaChanged" ) ); } } @@ -500,7 +500,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aAcceptedStates; @@ -515,7 +515,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_nObjectState; @@ -546,7 +546,7 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for internal documents this call is just a duplicate of changeState @@ -579,7 +579,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aObjectVerbs; @@ -599,7 +599,7 @@ void SAL_CALL OCommonEmbeddedObject::setClientSite( { if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING ) throw embed::WrongStateException( - ::rtl::OUString( "The client site can not be set currently!\n" ), + OUString( "The client site can not be set currently!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xClientSite = xClient; @@ -615,7 +615,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_xClientSite; @@ -632,10 +632,10 @@ void SAL_CALL OCommonEmbeddedObject::update() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + PostEvent_Impl( OUString( "OnVisAreaChanged" ) ); } //---------------------------------------------- @@ -648,7 +648,7 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE @@ -669,7 +669,7 @@ sal_Int64 SAL_CALL OCommonEmbeddedObject::getStatus( sal_Int64 ) } //---------------------------------------------- -void SAL_CALL OCommonEmbeddedObject::setContainerName( const ::rtl::OUString& sName ) +void SAL_CALL OCommonEmbeddedObject::setContainerName( const OUString& sName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx index d5aa627400b8..2acc4f1b5829 100644 --- a/embeddedobj/source/commonembedding/inplaceobj.cxx +++ b/embeddedobj/source/commonembedding/inplaceobj.cxx @@ -46,7 +46,7 @@ void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle& if ( m_nObjectState != embed::EmbedStates::INPLACE_ACTIVE && m_nObjectState != embed::EmbedStates::UI_ACTIVE ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not activated inplace!\n" ), + throw embed::WrongStateException( OUString( "The object is not activated inplace!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Rectangle aNewRectToShow = GetRectangleInterception( aPosRect, aClipRect ); diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 6b09b0742b9b..70b86960a9ad 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -235,7 +235,7 @@ void OCommonEmbeddedObject::LinkInit_Impl( if ( m_aLinkFilterName.getLength() ) { ::comphelper::MimeConfigurationHelper aHelper( m_xContext ); - ::rtl::OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName ); + OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName ); m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) ); } @@ -318,7 +318,7 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect ) } //------------------------------------------------------ -void OCommonEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName ) +void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName ) { if ( m_pInterfaceContainer ) { @@ -472,7 +472,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OCommonEmbeddedObject::getClassName() +OUString SAL_CALL OCommonEmbeddedObject::getClassName() throw ( uno::RuntimeException ) { if ( m_bDisposed ) @@ -483,7 +483,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::setClassInfo( - const uno::Sequence< sal_Int8 >& /*aClassID*/, const ::rtl::OUString& /*aClassName*/ ) + const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ ) throw ( lang::NoSupportException, uno::RuntimeException ) { @@ -503,7 +503,7 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw uno::RuntimeException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw uno::RuntimeException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 064c74feffd5..ca43e9287027 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -110,7 +110,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans: if ( !bAsTemplateSet ) { aResult.realloc( nLength + 1 ); - aResult[nLength].Name = ::rtl::OUString( "AsTemplate" ); + aResult[nLength].Name = OUString( "AsTemplate" ); aResult[nLength].Value <<= sal_True; } @@ -144,7 +144,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor( } catch( const uno::Exception& e ) { throw embed::StorageWrappedTargetException( - ::rtl::OUString( "Can't copy storage!" ), + OUString( "Can't copy storage!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } @@ -181,7 +181,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc { const uno::Reference< beans::XPropertySet > xSourceProps( i_rSource, uno::UNO_QUERY_THROW ); const uno::Reference< beans::XPropertySet > xTargetProps( i_rTarget, uno::UNO_QUERY_THROW ); - const ::rtl::OUString sMediaTypePropName( "MediaType" ); + const OUString sMediaTypePropName( "MediaType" ); xTargetProps->setPropertyValue( sMediaTypePropName, xSourceProps->getPropertyValue( sMediaTypePropName ) ); } catch( const uno::Exception& ) @@ -192,7 +192,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc //------------------------------------------------------ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rDocumentServiceName, bool _bEmbeddedScriptSupport, const bool i_bDocumentRecoverySupport ) + const OUString& _rDocumentServiceName, bool _bEmbeddedScriptSupport, const bool i_bDocumentRecoverySupport ) { ::comphelper::NamedValueCollection aArguments; aArguments.put( "EmbeddedObject", (sal_Bool)sal_True ); @@ -219,14 +219,14 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< } //------------------------------------------------------ -static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, const ::rtl::OUString& aModuleName ) +static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, const OUString& aModuleName ) { if ( xDocument.is() ) { uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); + aSeq[0].Name = OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; - xDocument->attachResource( ::rtl::OUString(), aSeq ); + xDocument->attachResource( OUString(), aSeq ); if ( !aModuleName.isEmpty() ) { @@ -244,7 +244,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c //------------------------------------------------------ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, const uno::Reference< embed::XStorage >& xNewObjectStorage, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) { @@ -280,7 +280,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X //------------------------------------------------------ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) return; @@ -382,14 +382,14 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() sal_Int32 nLen = 2; uno::Sequence< beans::PropertyValue > aArgs( nLen ); - aArgs[0].Name = ::rtl::OUString( "URL" ); + aArgs[0].Name = OUString( "URL" ); aArgs[0].Value <<= m_aLinkURL; - aArgs[1].Name = ::rtl::OUString( "FilterName" ); + aArgs[1].Name = OUString( "FilterName" ); aArgs[1].Value <<= m_aLinkFilterName; if ( m_bLinkHasPassword ) { aArgs.realloc( ++nLen ); - aArgs[nLen-1].Name = ::rtl::OUString( "Password" ); + aArgs[nLen-1].Name = OUString( "Password" ); aArgs[nLen-1].Value <<= m_aLinkPassword; } @@ -443,9 +443,9 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() } //------------------------------------------------------ -::rtl::OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) const +OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) const { - ::rtl::OUString aFilterName = GetPresetFilterName(); + OUString aFilterName = GetPresetFilterName(); if ( aFilterName.isEmpty() ) { try { @@ -466,7 +466,7 @@ void OCommonEmbeddedObject::FillDefaultLoadArgs_Impl( const uno::Reference< embe o_rLoadArgs.put( "HierarchicalDocumentName", m_aEntryName ); o_rLoadArgs.put( "ReadOnly", m_bReadOnly ); - ::rtl::OUString aFilterName = GetFilterName( ::comphelper::OStorageHelper::GetXStorageFormat( i_rxStorage ) ); + OUString aFilterName = GetFilterName( ::comphelper::OStorageHelper::GetXStorageFormat( i_rxStorage ) ); OSL_ENSURE( !aFilterName.isEmpty(), "OCommonEmbeddedObject::FillDefaultLoadArgs_Impl: Wrong document service name!" ); if ( aFilterName.isEmpty() ) throw io::IOException(); // TODO: error message/code @@ -512,13 +512,13 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag if ( !xTempInpStream.is() ) throw uno::RuntimeException(); - ::rtl::OUString aTempFileURL; + OUString aTempFileURL; try { // no need to let the file stay after the stream is removed since the embedded document // can not be stored directly uno::Reference< beans::XPropertySet > xTempStreamProps( xTempInpStream, uno::UNO_QUERY_THROW ); - xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL; + xTempStreamProps->getPropertyValue( OUString( "Uri" ) ) >>= aTempFileURL; } catch( const uno::Exception& ) { @@ -571,8 +571,8 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag //------------------------------------------------------ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStream_Impl( sal_Int32 nStorageFormat, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName ) + const OUString& aBaseURL, + const OUString& aHierarchName ) { uno::Reference < io::XOutputStream > xTempOut( io::TempFile::create(m_xContext), @@ -592,23 +592,23 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr if( !xStorable.is() ) throw uno::RuntimeException(); // TODO: - ::rtl::OUString aFilterName = GetFilterName( nStorageFormat ); + OUString aFilterName = GetFilterName( nStorageFormat ); OSL_ENSURE( !aFilterName.isEmpty(), "Wrong document service name!" ); if ( aFilterName.isEmpty() ) throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 4 ); - aArgs[0].Name = ::rtl::OUString( "FilterName" ); + aArgs[0].Name = OUString( "FilterName" ); aArgs[0].Value <<= aFilterName; - aArgs[1].Name = ::rtl::OUString( "OutputStream" ); + aArgs[1].Name = OUString( "OutputStream" ); aArgs[1].Value <<= xTempOut; - aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[2].Name = OUString( "DocumentBaseURL" ); aArgs[2].Value <<= aBaseURL; - aArgs[3].Name = ::rtl::OUString( "HierarchicalDocumentName" ); + aArgs[3].Name = OUString( "HierarchicalDocumentName" ); aArgs[3].Value <<= aHierarchName; - xStorable->storeToURL( ::rtl::OUString( "private:stream" ), aArgs ); + xStorable->storeToURL( OUString( "private:stream" ), aArgs ); try { xTempOut->closeOutput(); @@ -648,9 +648,9 @@ void OCommonEmbeddedObject::SaveObject_Impl() } //------------------------------------------------------ -::rtl::OUString OCommonEmbeddedObject::GetBaseURL_Impl() const +OUString OCommonEmbeddedObject::GetBaseURL_Impl() const { - ::rtl::OUString aBaseURL; + OUString aBaseURL; sal_Int32 nInd = 0; if ( m_xClientSite.is() ) @@ -661,7 +661,7 @@ void OCommonEmbeddedObject::SaveObject_Impl() uno::Sequence< beans::PropertyValue > aModelProps = xParentModel->getArgs(); for ( nInd = 0; nInd < aModelProps.getLength(); nInd++ ) if ( aModelProps[nInd].Name.equals( - ::rtl::OUString( "DocumentBaseURL" ) ) ) + OUString( "DocumentBaseURL" ) ) ) { aModelProps[nInd].Value >>= aBaseURL; break; @@ -677,7 +677,7 @@ void OCommonEmbeddedObject::SaveObject_Impl() { for ( nInd = 0; nInd < m_aDocMediaDescriptor.getLength(); nInd++ ) if ( m_aDocMediaDescriptor[nInd].Name.equals( - ::rtl::OUString( "DocumentBaseURL" ) ) ) + OUString( "DocumentBaseURL" ) ) ) { m_aDocMediaDescriptor[nInd].Value >>= aBaseURL; break; @@ -691,11 +691,11 @@ void OCommonEmbeddedObject::SaveObject_Impl() } //------------------------------------------------------ -::rtl::OUString OCommonEmbeddedObject::GetBaseURLFrom_Impl( +OUString OCommonEmbeddedObject::GetBaseURLFrom_Impl( const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) { - ::rtl::OUString aBaseURL; + OUString aBaseURL; sal_Int32 nInd = 0; for ( nInd = 0; nInd < lArguments.getLength(); nInd++ ) @@ -735,8 +735,8 @@ void OCommonEmbeddedObject::SwitchDocToStorage_Impl( const uno::Reference< docum //------------------------------------------------------ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed::XStorage >& xStorage, sal_Int32 nStorageFormat, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName, + const OUString& aBaseURL, + const OUString& aHierarchName, sal_Bool bAttachToTheStorage ) { OSL_ENSURE( xStorage.is(), "No storage is provided for storing!" ); @@ -754,18 +754,18 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed: if ( xDoc.is() ) { - ::rtl::OUString aFilterName = GetFilterName( nStorageFormat ); + OUString aFilterName = GetFilterName( nStorageFormat ); OSL_ENSURE( !aFilterName.isEmpty(), "Wrong document service name!" ); if ( aFilterName.isEmpty() ) throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 3 ); - aArgs[0].Name = ::rtl::OUString( "FilterName" ); + aArgs[0].Name = OUString( "FilterName" ); aArgs[0].Value <<= aFilterName; - aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[2].Name = OUString( "DocumentBaseURL" ); aArgs[2].Value <<= aBaseURL; - aArgs[1].Name = ::rtl::OUString( "HierarchicalDocumentName" ); + aArgs[1].Name = OUString( "HierarchicalDocumentName" ); aArgs[1].Value <<= aHierarchName; xDoc->storeToStorage( xStorage, aArgs ); @@ -860,16 +860,16 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ aTempMediaDescr.realloc( 4 ); // TODO/LATER: may be private:stream should be used as target URL - ::rtl::OUString aTempFileURL; + OUString aTempFileURL; uno::Reference< io::XInputStream > xTempStream = StoreDocumentToTempStream_Impl( SOFFICE_FILEFORMAT_CURRENT, - ::rtl::OUString(), - ::rtl::OUString() ); + OUString(), + OUString() ); try { // no need to let the file stay after the stream is removed since the embedded document // can not be stored directly uno::Reference< beans::XPropertySet > xTempStreamProps( xTempStream, uno::UNO_QUERY_THROW ); - xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL; + xTempStreamProps->getPropertyValue( OUString( "Uri" ) ) >>= aTempFileURL; } catch( const uno::Exception& ) { @@ -877,21 +877,21 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ OSL_ENSURE( !aTempFileURL.isEmpty(), "Couldn't retrieve temporary file URL!\n" ); - aTempMediaDescr[0].Name = ::rtl::OUString( "URL" ); + aTempMediaDescr[0].Name = OUString( "URL" ); aTempMediaDescr[0].Value <<= aTempFileURL; - aTempMediaDescr[1].Name = ::rtl::OUString( "InputStream" ); + aTempMediaDescr[1].Name = OUString( "InputStream" ); aTempMediaDescr[1].Value <<= xTempStream; - aTempMediaDescr[2].Name = ::rtl::OUString( "FilterName" ); + aTempMediaDescr[2].Name = OUString( "FilterName" ); aTempMediaDescr[2].Value <<= GetFilterName( nStorageFormat ); - aTempMediaDescr[3].Name = ::rtl::OUString( "AsTemplate" ); + aTempMediaDescr[3].Name = OUString( "AsTemplate" ); aTempMediaDescr[3].Value <<= sal_True; } else { aTempMediaDescr.realloc( 2 ); - aTempMediaDescr[0].Name = ::rtl::OUString( "URL" ); + aTempMediaDescr[0].Name = OUString( "URL" ); aTempMediaDescr[0].Value <<= m_aLinkURL; - aTempMediaDescr[1].Name = ::rtl::OUString( "FilterName" ); + aTempMediaDescr[1].Name = OUString( "FilterName" ); aTempMediaDescr[1].Value <<= m_aLinkFilterName; } @@ -903,7 +903,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -923,12 +923,12 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -943,7 +943,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( // it can switch persistent representation only without initialization throw embed::WrongStateException( - ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), + OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -967,7 +967,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( } else throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1124,7 +1124,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( //TODO: //} else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } @@ -1132,7 +1132,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1150,13 +1150,13 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for now support of this interface is required to allow breaking of links and converting them to normal embedded @@ -1258,7 +1258,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1278,13 +1278,13 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for now support of this interface is required to allow breaking of links and converting them to normal embedded @@ -1325,7 +1325,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: OSL_FAIL( "Can not retrieve own storage media type!\n" ); } - PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) ); + PostEvent_Impl( OUString( "OnSaveAs" ) ); sal_Bool bTryOptimization = sal_False; for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ ) @@ -1413,7 +1413,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1424,7 +1424,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) { if ( bUseNew ) m_aEntryName = m_aNewEntryName; - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); return; } @@ -1449,7 +1449,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( xModif.is() ) xModif->setModified( sal_False ); - PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" )); + PostEvent_Impl( OUString( "OnSaveAsDone" )); } else { @@ -1466,7 +1466,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xNewObjectStorage = uno::Reference< embed::XStorage >(); m_xNewParentStorage = uno::Reference< embed::XStorage >(); - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); m_aNewDocMediaDescriptor.realloc( 0 ); m_bWaitSaveCompleted = sal_False; @@ -1492,7 +1492,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_xObjectStorage.is() ) @@ -1502,7 +1502,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OCommonEmbeddedObject::getEntryName() +OUString SAL_CALL OCommonEmbeddedObject::getEntryName() throw ( embed::WrongStateException, uno::RuntimeException ) { @@ -1513,13 +1513,13 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -1545,13 +1545,13 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bReadOnly ) @@ -1561,7 +1561,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( m_nObjectState == embed::EmbedStates::LOADED ) return; - PostEvent_Impl( ::rtl::OUString( "OnSave" ) ); + PostEvent_Impl( OUString( "OnSave" ) ); OSL_ENSURE( m_pDocHolder->GetComponent().is(), "If an object is activated or in running state it must have a document!\n" ); if ( !m_pDocHolder->GetComponent().is() ) @@ -1610,7 +1610,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( xModif.is() ) xModif->setModified( sal_False ); - PostEvent_Impl( ::rtl::OUString( "OnSaveDone" ) ); + PostEvent_Impl( OUString( "OnSaveDone" ) ); } //------------------------------------------------------ @@ -1625,13 +1625,13 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_bReadOnly; @@ -1657,7 +1657,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1665,33 +1665,33 @@ void SAL_CALL OCommonEmbeddedObject::reload( { // the object is still not loaded throw embed::WrongStateException( - ::rtl::OUString( "The object must be in loaded state to be reloaded!\n" ), + OUString( "The object must be in loaded state to be reloaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bIsLink ) { // reload of the link - ::rtl::OUString aOldLinkFilter = m_aLinkFilterName; + OUString aOldLinkFilter = m_aLinkFilterName; - ::rtl::OUString aNewLinkFilter; + OUString aNewLinkFilter; for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ ) { if ( lArguments[nInd].Name == "URL" ) { // the new URL lArguments[nInd].Value >>= m_aLinkURL; - m_aLinkFilterName = ::rtl::OUString(); + m_aLinkFilterName = OUString(); } else if ( lArguments[nInd].Name == "FilterName" ) { lArguments[nInd].Value >>= aNewLinkFilter; - m_aLinkFilterName = ::rtl::OUString(); + m_aLinkFilterName = OUString(); } } @@ -1703,7 +1703,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( else { uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); + aArgs[0].Name = OUString( "URL" ); aArgs[0].Value <<= m_aLinkURL; m_aLinkFilterName = aHelper.UpdateMediaDescriptorWithFilterName( aArgs, sal_False ); } @@ -1764,7 +1764,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( lang::IllegalArgumentException, embed::WrongStateException, io::IOException, @@ -1779,7 +1779,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString( "The object is not a valid linked object!\n" ), + OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } else @@ -1789,12 +1789,12 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt } if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1802,13 +1802,13 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString( "The object is not a valid linked object!\n" ), + OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY ); @@ -1852,8 +1852,8 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt m_pDocHolder->Show(); m_bIsLink = sal_False; - m_aLinkFilterName = ::rtl::OUString(); - m_aLinkURL = ::rtl::OUString(); + m_aLinkFilterName = OUString(); + m_aLinkURL = OUString(); } //------------------------------------------------------ @@ -1869,7 +1869,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isLink() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OCommonEmbeddedObject::getLinkURL() +OUString SAL_CALL OCommonEmbeddedObject::getLinkURL() throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException ) @@ -1880,7 +1880,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isLink() if ( !m_bIsLink ) throw embed::WrongStateException( - ::rtl::OUString( "The object is not a link object!\n" ), + OUString( "The object is not a link object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aLinkURL; diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index d8fcaf7631f6..d21480694389 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -35,7 +35,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory( { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager ) diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index c4e4e373109f..7aca13b50b65 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -107,13 +107,13 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR // TODO: if object is in loaded state it should switch itself to the running state if ( m_nObjectState == -1 || m_nObjectState == embed::EmbedStates::LOADED ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ), + throw embed::WrongStateException( OUString( "The own object has no model!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: return for the aspect of the document @@ -134,7 +134,7 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); maSize = aSize; @@ -153,11 +153,11 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ), + throw embed::WrongStateException( OUString( "The own object has no model!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Size aResult; @@ -175,7 +175,7 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; @@ -204,7 +204,7 @@ void SAL_CALL OSpecialEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( nVerbID == -7 ) diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index 499507e07b7f..a3826de0963c 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -46,11 +46,11 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_bHasClonedSize = sal_False; @@ -86,7 +86,7 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); @@ -126,11 +126,11 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bHasClonedSize ) @@ -169,14 +169,14 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Bool bBackToLoaded = sal_False; @@ -205,8 +205,8 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe throw uno::RuntimeException(); datatransfer::DataFlavor aDataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), - ::rtl::OUString( "GDIMetaFile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), + OUString( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); if( xTransferable->isDataFlavorSupported( aDataFlavor )) diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 404635e73a79..74e4d4f0563a 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -37,18 +37,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoEmbeddedObjectFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.OOoEmbeddedObjectFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); + return OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -61,7 +61,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::impl_static //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitFromEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -73,12 +73,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -101,9 +101,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta if ( !xPropSet.is() ) throw uno::RuntimeException(); - ::rtl::OUString aMediaType; + OUString aMediaType; try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ) ); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" ) ); aAny >>= aMediaType; } catch ( const uno::Exception& ) @@ -153,7 +153,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -164,19 +164,19 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is FilterName - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); uno::Reference< uno::XInterface > xResult; @@ -217,9 +217,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitNew( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -231,12 +231,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -268,9 +268,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -283,12 +283,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -299,7 +299,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( lArguments ); if ( nEntryConnectionMode == embed::EntryInitModes::MEDIA_DESCRIPTOR_INIT ) { - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); if ( aFilterName.isEmpty() ) // the object must be OOo embedded object, if it is not an exception must be thrown throw io::IOException(); // TODO: @@ -331,7 +331,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceLink( const uno::Reference< embed::XStorage >& /*xStorage*/, - const ::rtl::OUString& /*sEntName*/, + const OUString& /*sEntName*/, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -346,17 +346,17 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is URL, URL must exist - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ ) if ( aTempMedDescr[nInd].Name == "URL" ) aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); if ( !aFilterName.isEmpty() ) { @@ -385,9 +385,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceLinkUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -401,24 +401,24 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); uno::Sequence< beans::PropertyValue > aTempMedDescr( lArguments ); - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ ) if ( aTempMedDescr[nInd].Name == "URL" ) aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -426,7 +426,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta if ( !aObject.getLength() ) throw io::IOException(); // unexpected mimetype of the storage - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); if ( !aFilterName.isEmpty() ) { @@ -449,17 +449,17 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoEmbeddedObjectFactory::getImplementationName() +OUString SAL_CALL OOoEmbeddedObjectFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OOoEmbeddedObjectFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OOoEmbeddedObjectFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -469,25 +469,25 @@ sal_Bool SAL_CALL OOoEmbeddedObjectFactory::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); + return OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -500,9 +500,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& /*xStorage*/, - const ::rtl::OUString& /*sEntName*/, + const OUString& /*sEntName*/, sal_Int32 /*nEntryConnectionMode*/, const uno::Sequence< beans::PropertyValue >& /*lArguments*/, const uno::Sequence< beans::PropertyValue >& /*lObjArgs*/ ) @@ -524,17 +524,17 @@ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::crea } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::getImplementationName() +OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OOoSpecialEmbeddedObjectFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OOoSpecialEmbeddedObjectFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -544,7 +544,7 @@ sal_Bool SAL_CALL OOoSpecialEmbeddedObjectFactory::supportsService( const ::rtl: } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index 0125d1fa4f38..a13b2aa3c318 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -42,9 +42,9 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -52,23 +52,23 @@ public: // XEmbedObjectCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; @@ -89,21 +89,21 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index f34d55c68a04..b9deda50e7a7 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -102,12 +102,12 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& sal_Int32 nTargetIndex, const uno::Reference< container::XIndexAccess >& xSourceMenu, sal_Int32 nSourceIndex, - const ::rtl::OUString aContModuleName, + const OUString aContModuleName, const uno::Reference< frame::XDispatchProvider >& xSourceDisp ) { sal_Int32 nInd = 0; - ::rtl::OUString aModuleIdentPropName( "ModuleIdentifier" ); - ::rtl::OUString aDispProvPropName( "DispatchProvider" ); + OUString aModuleIdentPropName( "ModuleIdentifier" ); + OUString aDispProvPropName( "DispatchProvider" ); sal_Bool bModuleNameSet = sal_False; sal_Bool bDispProvSet = sal_False; @@ -164,11 +164,11 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& m_aOutplaceFrameProps.realloc( 3 ); beans::NamedValue aArg; - aArg.Name = ::rtl::OUString("TopWindow"); + aArg.Name = OUString("TopWindow"); aArg.Value <<= sal_True; m_aOutplaceFrameProps[0] <<= aArg; - aArg.Name = ::rtl::OUString("MakeVisible"); + aArg.Name = OUString("MakeVisible"); aArg.Value <<= sal_False; m_aOutplaceFrameProps[1] <<= aArg; @@ -183,7 +183,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& } m_refCount--; - aArg.Name = ::rtl::OUString("ParentFrame"); + aArg.Name = OUString("ParentFrame"); aArg.Value <<= xDesktop; //TODO/LATER: should use parent document frame m_aOutplaceFrameProps[2] <<= aArg; } @@ -366,7 +366,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra { uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xLayoutManager; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; if ( xLayoutManager.is() ) { xLayoutManager->setVisible( bVisible ); @@ -434,7 +434,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& } awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_TOP, - ::rtl::OUString("dockingwindow"), + OUString("dockingwindow"), xMyParent, 0, awt::Rectangle(),//aOwnRectangle, @@ -453,14 +453,14 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& uno::Sequence< uno::Any > aArgs( 2 ); beans::NamedValue aArg; - aArg.Name = ::rtl::OUString("ContainerWindow"); + aArg.Name = OUString("ContainerWindow"); aArg.Value <<= xOwnWindow; aArgs[0] <<= aArg; uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY ); if ( xContFrame.is() ) { - aArg.Name = ::rtl::OUString("ParentFrame"); + aArg.Name = OUString("ParentFrame"); aArg.Value <<= xContFrame; aArgs[1] <<= aArg; } @@ -535,7 +535,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() if( xUIConfigManager.is()) { xResult = xUIConfigManager->getSettings( - ::rtl::OUString( "private:resource/menubar/menubar" ), + OUString( "private:resource/menubar/menubar" ), sal_False ); } } @@ -546,7 +546,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() { // no internal document configuration, use the one from the module uno::Reference< frame::XModuleManager2 > xModuleMan = frame::ModuleManager::create(m_xContext); - ::rtl::OUString aModuleIdent = + OUString aModuleIdent = xModuleMan->identify( uno::Reference< uno::XInterface >( m_xComponent, uno::UNO_QUERY ) ); if ( !aModuleIdent.isEmpty() ) @@ -557,7 +557,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() xModConfSupplier->getUIConfigurationManager( aModuleIdent ), uno::UNO_QUERY_THROW ); xResult = xModUIConfMan->getSettings( - ::rtl::OUString( "private:resource/menubar/menubar" ), + OUString( "private:resource/menubar/menubar" ), sal_False ); } } @@ -580,7 +580,7 @@ void DocumentHolder::FindConnectPoints( { uno::Sequence< beans::PropertyValue > aProps; xMenu->getByIndex( nInd ) >>= aProps; - rtl::OUString aCommand; + OUString aCommand; for ( sal_Int32 nSeqInd = 0; nSeqInd < aProps.getLength(); nSeqInd++ ) if ( aProps[nSeqInd].Name == "CommandURL" ) { @@ -602,7 +602,7 @@ void DocumentHolder::FindConnectPoints( uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( const uno::Reference< container::XIndexAccess >& xContMenu, const uno::Reference< frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName, + const OUString& aContModuleName, const uno::Reference< container::XIndexAccess >& xOwnMenu, const uno::Reference< frame::XDispatchProvider >& xOwnDisp ) throw ( uno::Exception ) @@ -639,7 +639,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( } } else - InsertMenu_Impl( xMergedMenu, nInd, xOwnMenu, nInd, ::rtl::OUString(), xOwnDisp ); + InsertMenu_Impl( xMergedMenu, nInd, xOwnMenu, nInd, OUString(), xOwnDisp ); } return uno::Reference< container::XIndexAccess >( xMergedMenu, uno::UNO_QUERY_THROW ); @@ -649,14 +649,14 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const uno::Reference< frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName ) + const OUString& aContModuleName ) { sal_Bool bMenuMerged = sal_False; try { uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings( xContLM->getElement( - ::rtl::OUString( "private:resource/menubar/menubar" ) ), + OUString( "private:resource/menubar/menubar" ) ), uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xContMenu = xUISettings->getSettings( sal_True ); if ( !xContMenu.is() ) @@ -678,7 +678,7 @@ sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM, const uno::Reference< frame::XDispatchProvider >& xContainerDP, - const ::rtl::OUString& aContModuleName ) + const OUString& aContModuleName ) { sal_Bool bResult = sal_False; if ( xContainerLM.is() ) @@ -690,7 +690,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame:: try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM; xDocAreaAcc = xContainerLM->getDockingAreaAcceptor(); } catch( const uno::Exception& ){} @@ -783,7 +783,7 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame:: try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM; } catch( const uno::Exception& ) {} @@ -860,7 +860,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame() uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM; try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM; } catch( const uno::Exception& ) {} @@ -969,21 +969,21 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace ) aArgs.put( "ReadOnly", m_bReadOnly ); if ( bInPlace ) aArgs.put( "PluginMode", sal_Int16(1) ); - ::rtl::OUString sUrl; + OUString sUrl; uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY); if ( xServiceInfo.is() - && xServiceInfo->supportsService(::rtl::OUString("com.sun.star.report.ReportDefinition")) ) + && xServiceInfo->supportsService(OUString("com.sun.star.report.ReportDefinition")) ) { - sUrl = ::rtl::OUString(".component:DB/ReportDesign"); + sUrl = OUString(".component:DB/ReportDesign"); } else if( xServiceInfo.is() - && xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.chart2.ChartDocument") )) - sUrl = ::rtl::OUString("private:factory/schart"); + && xServiceInfo->supportsService( OUString("com.sun.star.chart2.ChartDocument") )) + sUrl = OUString("private:factory/schart"); else - sUrl = ::rtl::OUString("private:object"); + sUrl = OUString("private:object"); xComponentLoader->loadComponentFromURL( sUrl, - rtl::OUString( "_self" ), + OUString( "_self" ), 0, aArgs.getPropertyValues() ); @@ -1173,7 +1173,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent ) // if the component does not support document::XEventBroadcaster // the modify notifications are used as workaround, but only for running state if( aEvent.Source == m_xComponent && m_pEmbedObj && m_pEmbedObj->getCurrentState() == embed::EmbedStates::RUNNING ) - m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + m_pEmbedObj->PostEvent_Impl( OUString( "OnVisAreaChanged" ) ); } //--------------------------------------------------------------------------- diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 9d62ae63ce91..12fb3189300c 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -44,12 +44,12 @@ void ODummyEmbeddedObject::CheckInit() throw lang::DisposedException(); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } //---------------------------------------------- -void ODummyEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName ) +void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName ) { if ( m_pInterfaceContainer ) { @@ -208,7 +208,7 @@ sal_Int64 SAL_CALL ODummyEmbeddedObject::getStatus( sal_Int64 ) } //---------------------------------------------- -void SAL_CALL ODummyEmbeddedObject::setContainerName( const ::rtl::OUString& ) +void SAL_CALL ODummyEmbeddedObject::setContainerName( const OUString& ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +228,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_nCachedAspect = nAspect; @@ -249,12 +249,12 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_bHasCachedSize || m_nCachedAspect != nAspect ) throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aCachedSize; @@ -271,7 +271,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; @@ -288,14 +288,14 @@ embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRep CheckInit(); // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } //---------------------------------------------- void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& /* lArguments */, const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ ) @@ -310,12 +310,12 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -323,7 +323,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( && ( m_nObjectState == -1 || nEntryConnectionMode != embed::EntryInitModes::NO_INIT ) ) { throw embed::WrongStateException( - ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), + OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -333,7 +333,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) ); else throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -348,20 +348,20 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( m_nObjectState = embed::EmbedStates::LOADED; } else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong entry is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong entry is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); } else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } //------------------------------------------------------ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& /* lArguments */, const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ ) throw ( lang::IllegalArgumentException, @@ -375,7 +375,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName ); @@ -383,7 +383,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X //------------------------------------------------------ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& /* lArguments */, const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ ) throw ( lang::IllegalArgumentException, @@ -397,10 +397,10 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) ); + PostEvent_Impl( OUString( "OnSaveAs" ) ); m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName ); @@ -435,11 +435,11 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xParentStorage = m_xNewParentStorage; m_aEntryName = m_aNewEntryName; - PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" ) ); + PostEvent_Impl( OUString( "OnSaveAsDone" ) ); } m_xNewParentStorage = uno::Reference< embed::XStorage >(); - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); m_bWaitSaveCompleted = sal_False; } @@ -453,7 +453,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_aEntryName.isEmpty() ) @@ -463,7 +463,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry() } //------------------------------------------------------ -::rtl::OUString SAL_CALL ODummyEmbeddedObject::getEntryName() +OUString SAL_CALL ODummyEmbeddedObject::getEntryName() throw ( embed::WrongStateException, uno::RuntimeException ) { @@ -472,7 +472,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -490,7 +490,7 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // the object can not be activated or changed @@ -507,7 +507,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // this object can not be changed @@ -529,7 +529,7 @@ void SAL_CALL ODummyEmbeddedObject::reload( if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // nothing to reload @@ -548,19 +548,19 @@ uno::Sequence< sal_Int8 > SAL_CALL ODummyEmbeddedObject::getClassID() } //------------------------------------------------------ -::rtl::OUString SAL_CALL ODummyEmbeddedObject::getClassName() +OUString SAL_CALL ODummyEmbeddedObject::getClassName() throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) throw lang::DisposedException(); // TODO - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------ void SAL_CALL ODummyEmbeddedObject::setClassInfo( - const uno::Sequence< sal_Int8 >& /*aClassID*/, const ::rtl::OUString& /*aClassName*/ ) + const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ ) throw ( lang::NoSupportException, uno::RuntimeException ) { diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index a47ef9bed158..7848b8e549c8 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -29,13 +29,13 @@ using namespace ::com::sun::star; #define IUL 6 -uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL); +uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); struct equalOUString { bool operator()( - const rtl::OUString& rKey1, - const rtl::OUString& rKey2 ) const + const OUString& rKey1, + const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -44,7 +44,7 @@ struct equalOUString struct hashOUString { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -54,12 +54,12 @@ struct hashOUString class StatusChangeListenerContainer : public ::cppu::OMultiTypeInterfaceContainerHelperVar< -rtl::OUString,hashOUString,equalOUString> +OUString,hashOUString,equalOUString> { public: StatusChangeListenerContainer( ::osl::Mutex& aMutex ) : cppu::OMultiTypeInterfaceContainerHelperVar< - rtl::OUString,hashOUString,equalOUString>(aMutex) + OUString,hashOUString,equalOUString>(aMutex) { } }; @@ -103,12 +103,12 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) m_pDisposeEventListeners(0), m_pStatCL(0) { - m_aInterceptedURL[0] = rtl::OUString(".uno:Save"); - m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll"); - m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc"); - m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin"); - m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame"); - m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs"); + m_aInterceptedURL[0] = OUString(".uno:Save"); + m_aInterceptedURL[1] = OUString(".uno:SaveAll"); + m_aInterceptedURL[2] = OUString(".uno:CloseDoc"); + m_aInterceptedURL[3] = OUString(".uno:CloseWin"); + m_aInterceptedURL[4] = OUString(".uno:CloseFrame"); + m_aInterceptedURL[5] = OUString(".uno:SaveAs"); } @@ -166,12 +166,12 @@ Interceptor::dispatch( if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" ); + aNewArgs[nInd].Name = OUString( "SaveTo" ); aNewArgs[nInd].Value <<= sal_True; } uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - URL, ::rtl::OUString( "_self" ), 0 ); + URL, OUString( "_self" ), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } @@ -194,10 +194,10 @@ Interceptor::addStatusListener( { // Save frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = rtl::OUString("Update"); + aStateEvent.FeatureDescriptor = OUString("Update"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() ); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); { @@ -218,10 +218,10 @@ Interceptor::addStatusListener( { // Close and return frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return"); + aStateEvent.FeatureDescriptor = OUString("Close and Return"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() ); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); @@ -240,10 +240,10 @@ Interceptor::addStatusListener( { // SaveAs frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo"); + aStateEvent.FeatureDescriptor = OUString("SaveCopyTo"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); Control->statusChanged(aStateEvent); { @@ -279,7 +279,7 @@ Interceptor::removeStatusListener( //XInterceptorInfo -uno::Sequence< ::rtl::OUString > +uno::Sequence< OUString > SAL_CALL Interceptor::getInterceptedURLs( ) throw ( @@ -297,7 +297,7 @@ Interceptor::getInterceptedURLs( ) uno::Reference< frame::XDispatch > SAL_CALL Interceptor::queryDispatch( const util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( uno::RuntimeException diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index c3ac0250c74c..b3e025777260 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -41,18 +41,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.EmbeddedObjectCreator"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.EmbeddedObjectCreator"); + aRet[1] = OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName() +OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); + return OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); } //------------------------------------------------------------------------- @@ -65,9 +65,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::impl_static //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitNew( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -79,21 +79,21 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); - ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); + OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); if ( aEmbedFactory.isEmpty() ) { // use system fallback // TODO: in future users factories can be tested - aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); + aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); } uno::Reference < uno::XInterface > xFact( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext) ); @@ -110,7 +110,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMedDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -122,12 +122,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) UNOEmbeddedObjectCreator::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -139,8 +139,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta if ( !xNameAccess->hasByName( sEntName ) ) throw container::NoSuchElementException(); - ::rtl::OUString aMediaType; - ::rtl::OUString aEmbedFactory; + OUString aMediaType; + OUString aEmbedFactory; if ( xStorage->isStorageElement( sEntName ) ) { // the object must be based on storage @@ -152,7 +152,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta throw uno::RuntimeException(); try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" )); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" )); aAny >>= aMediaType; } catch ( const uno::Exception& ) @@ -184,10 +184,10 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta throw uno::RuntimeException(); try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" )); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" )); aAny >>= aMediaType; if ( aMediaType == "application/vnd.sun.star.oleobject" ) - aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); + aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); } catch ( const uno::Exception& ) { @@ -217,7 +217,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference < embed::XEmbedObjectFactory > xEmbFact( xFact, uno::UNO_QUERY ); if ( xEmbFact.is() ) - return xEmbFact->createInstanceUserInit( uno::Sequence< sal_Int8 >(), ::rtl::OUString(), xStorage, sEntName, embed::EntryInitModes::DEFAULT_INIT, aMedDescr, lObjArgs); + return xEmbFact->createInstanceUserInit( uno::Sequence< sal_Int8 >(), OUString(), xStorage, sEntName, embed::EntryInitModes::DEFAULT_INIT, aMedDescr, lObjArgs); } // the default object should be created, it will allow to store the contents on the next saving @@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromMediaDescriptor( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -243,12 +243,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // TODO: use lObjArgs if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -256,7 +256,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is FilterName - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); if ( !aFilterName.isEmpty() ) { @@ -292,9 +292,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& sClassName, + const OUString& sClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Sequence< beans::PropertyValue >& aObjectArgs ) @@ -308,16 +308,16 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); - ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); + OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); uno::Reference< embed::XEmbedObjectFactory > xEmbFactory( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), uno::UNO_QUERY ); @@ -336,7 +336,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -351,17 +351,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is URL, URL must exist - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ ) if ( aTempMedDescr[nInd].Name == "URL" ) aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); if ( !aFilterName.isEmpty() ) { @@ -386,13 +386,13 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // was also extended. if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -409,9 +409,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLinkUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -423,7 +423,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; - ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); + OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); uno::Reference< embed::XLinkFactory > xLinkFactory( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), uno::UNO_QUERY ); @@ -440,17 +440,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName() +OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -460,7 +460,7 @@ sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 2100ff2cc522..fba8d218d928 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -100,10 +100,10 @@ protected: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDocMediaDescriptor; ::com::sun::star::uno::Sequence< sal_Int8 > m_aClassID; - ::rtl::OUString m_aClassName; + OUString m_aClassName; - ::rtl::OUString m_aDocServiceName; - ::rtl::OUString m_aPresetFilterName; + OUString m_aDocServiceName; + OUString m_aPresetFilterName; sal_Int64 m_nMiscStatus; @@ -115,9 +115,9 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite; - ::rtl::OUString m_aContainerName; - ::rtl::OUString m_aDefaultParentBaseURL; - ::rtl::OUString m_aModuleName; + OUString m_aContainerName; + OUString m_aDefaultParentBaseURL; + OUString m_aModuleName; sal_Bool m_bEmbeddedScriptSupport; sal_Bool m_bDocumentRecoverySupport; @@ -125,7 +125,7 @@ protected: // following information will be used between SaveAs and SaveCompleted sal_Bool m_bWaitSaveCompleted; - ::rtl::OUString m_aNewEntryName; + OUString m_aNewEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewObjectStorage; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aNewDocMediaDescriptor; @@ -137,16 +137,16 @@ protected: sal_Bool m_bIsLink; // embedded object related stuff - ::rtl::OUString m_aEntryName; + OUString m_aEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xObjectStorage; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xRecoveryStorage; // link related stuff - ::rtl::OUString m_aLinkURL; - ::rtl::OUString m_aLinkFilterName; + OUString m_aLinkURL; + OUString m_aLinkFilterName; sal_Bool m_bLinkHasPassword; - ::rtl::OUString m_aLinkPassword; + OUString m_aLinkPassword; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; @@ -166,19 +166,19 @@ private: void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewObjectStorage, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); - ::rtl::OUString GetDocumentServiceName() const { return m_aDocServiceName; } - ::rtl::OUString GetPresetFilterName() const { return m_aPresetFilterName; } + OUString GetDocumentServiceName() const { return m_aDocServiceName; } + OUString GetPresetFilterName() const { return m_aPresetFilterName; } ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > StoreDocumentToTempStream_Impl( sal_Int32 nStorageFormat, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName ); + const OUString& aBaseURL, + const OUString& aHierarchName ); sal_Int32 ConvertVerbToState_Impl( sal_Int32 nVerb ); @@ -190,7 +190,7 @@ private: ::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateStatesSequence_Impl( sal_Int32 nNewState ); - ::rtl::OUString GetFilterName( sal_Int32 nVersion ) const; + OUString GetFilterName( sal_Int32 nVersion ) const; ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > LoadDocumentFromStorage_Impl(); ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > LoadLink_Impl(); @@ -199,8 +199,8 @@ private: void StoreDocToStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, sal_Int32 nStorageVersion, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName, + const OUString& aBaseURL, + const OUString& aHierarchName, sal_Bool bAttachToStorage ); void SwitchDocToStorage_Impl( @@ -221,8 +221,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > CreateTempDocFromLink_Impl(); - ::rtl::OUString GetBaseURL_Impl() const; - ::rtl::OUString GetBaseURLFrom_Impl( + OUString GetBaseURL_Impl() const; + OUString GetBaseURLFrom_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ); @@ -245,7 +245,7 @@ public: void requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ); // not a real listener and should not be - void PostEvent_Impl( const ::rtl::OUString& aEventName ); + void PostEvent_Impl( const OUString& aEventName ); // XInterface @@ -315,7 +315,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName ) + virtual void SAL_CALL setContainerName( const OUString& sName ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -347,7 +347,7 @@ public: virtual void SAL_CALL setPersistentEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) @@ -357,7 +357,7 @@ public: ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) + virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -366,7 +366,7 @@ public: virtual void SAL_CALL storeAsEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, @@ -384,14 +384,14 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getEntryName() + virtual OUString SAL_CALL getEntryName() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); // XLinkageSupport virtual void SAL_CALL breakLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -402,7 +402,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkURL() + virtual OUString SAL_CALL getLinkURL() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -453,11 +453,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getClassName() + virtual OUString SAL_CALL getClassName() throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setClassInfo( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index f6c801aa8a4b..111f9e962cf2 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -67,8 +67,8 @@ private: ::com::sun::star::awt::Rectangle m_aObjRect; ::com::sun::star::frame::BorderWidths m_aBorderWidths; - ::rtl::OUString m_aContainerName; - ::rtl::OUString m_aDocumentNamePart; + OUString m_aContainerName; + OUString m_aDocumentNamePart; sal_Bool m_bReadOnly; @@ -97,7 +97,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName ); + const OUString& aContModuleName ); public: @@ -109,7 +109,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenusForInplace( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xContMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName, + const OUString& aContModuleName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xOwnMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xOwnDisp ) throw ( ::com::sun::star::uno::Exception ); @@ -129,12 +129,12 @@ public: void CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose ); void CloseFrame(); - rtl::OUString GetTitle() const + OUString GetTitle() const { - return m_aContainerName + ::rtl::OUString( " - " ) + m_aDocumentNamePart; + return m_aContainerName + OUString( " - " ) + m_aDocumentNamePart; } - rtl::OUString GetContainerName() const { return m_aContainerName; } + OUString GetContainerName() const { return m_aContainerName; } void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aProps ) { m_aOutplaceFrameProps = aProps; } @@ -151,7 +151,7 @@ public: sal_Bool ShowUI( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP, - const ::rtl::OUString& aContModuleName ); + const OUString& aContModuleName ); sal_Bool HideUI( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM ); diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx index 8f1f1e9594dc..7574a80890c5 100644 --- a/embeddedobj/source/inc/dummyobject.hxx +++ b/embeddedobj/source/inc/dummyobject.hxx @@ -52,7 +52,7 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2 ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer; sal_Bool m_bDisposed; - ::rtl::OUString m_aEntryName; + OUString m_aEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; sal_Int32 m_nObjectState; @@ -64,12 +64,12 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2 // following information will be used between SaveAs and SaveCompleted sal_Bool m_bWaitSaveCompleted; - ::rtl::OUString m_aNewEntryName; + OUString m_aNewEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; protected: void CheckInit(); - void PostEvent_Impl( const ::rtl::OUString& aEventName ); + void PostEvent_Impl( const OUString& aEventName ); public: @@ -133,7 +133,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName ) + virtual void SAL_CALL setContainerName( const OUString& sName ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -165,7 +165,7 @@ public: virtual void SAL_CALL setPersistentEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) @@ -175,7 +175,7 @@ public: ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) + virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -184,7 +184,7 @@ public: virtual void SAL_CALL storeAsEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, @@ -202,7 +202,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getEntryName() + virtual OUString SAL_CALL getEntryName() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); @@ -234,11 +234,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getClassName() + virtual OUString SAL_CALL getClassName() throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setClassInfo( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index 21429fdf223d..d4e878f09fcf 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -80,7 +80,7 @@ public: ); //XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw ( ::com::sun::star::uno::RuntimeException @@ -91,7 +91,7 @@ public: ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( ::com::sun::star::uno::RuntimeException @@ -149,7 +149,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - static ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aInterceptedURL; + static ::com::sun::star::uno::Sequence< OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; StatusChangeListenerContainer* m_pStatCL; diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 245b4e64556f..58726ba46f2d 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -127,18 +127,18 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Sequence< sal_Int8 > m_aClassID; - ::rtl::OUString m_aClassName; + OUString m_aClassName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite; - ::rtl::OUString m_aContainerName; + OUString m_aContainerName; ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > m_xClosePreventer; sal_Bool m_bWaitSaveCompleted; sal_Bool m_bNewVisReplInStream; ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewCachedVisRepl; - ::rtl::OUString m_aNewEntryName; + OUString m_aNewEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewObjectStream; sal_Bool m_bStoreLoaded; @@ -167,12 +167,12 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5 sal_Int64 m_nStatusAspect; // embedded object related stuff - ::rtl::OUString m_aEntryName; + OUString m_aEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xObjectStream; // link related stuff - ::rtl::OUString m_aLinkURL; // ??? + OUString m_aLinkURL; // ??? // points to own view provider if the object has no server OwnView_Impl* m_pOwnView; @@ -180,9 +180,9 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5 // whether the object should be initialized from clipboard in case of default initialization sal_Bool m_bFromClipboard; - ::rtl::OUString m_aTempURL; + OUString m_aTempURL; - ::rtl::OUString m_aTempDumpURL; + OUString m_aTempDumpURL; // STAMPIT solution // the following member is used during verb execution to detect whether the verb execution modifies the object @@ -206,7 +206,7 @@ protected: #ifdef WNT void SwitchComponentToRunningState_Impl(); #endif - void MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName ); + void MakeEventListenerNotification_Impl( const OUString& aEventName ); #ifdef WNT void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > GetStreamForSaving(); @@ -224,17 +224,17 @@ protected: void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xNewObjectStream, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); void GetRidOfComponent(); void StoreToLocation_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs, sal_Bool bSaveAs ) throw ( ::com::sun::star::uno::Exception ); @@ -271,22 +271,22 @@ protected: void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; } #ifdef WNT - ::rtl::OUString CreateTempURLEmpty_Impl(); - ::rtl::OUString GetTempURL_Impl(); + OUString CreateTempURLEmpty_Impl(); + OUString GetTempURL_Impl(); #endif - ::rtl::OUString GetContainerName_Impl() { return m_aContainerName; } + OUString GetContainerName_Impl() { return m_aContainerName; } // the following 4 methods are related to switch to wrapping mode void MoveListeners(); - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > CreateTemporarySubstorage( ::rtl::OUString& o_aStorageName ); - ::rtl::OUString MoveToTemporarySubstream(); + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > CreateTemporarySubstorage( OUString& o_aStorageName ); + OUString MoveToTemporarySubstream(); sal_Bool TryToConvertToOOo(); public: // in case a new object must be created the class ID must be specified OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName ); + const OUString& aClassName ); // in case object will be loaded from a persistent entry or from a file the class ID will be detected on loading // factory can do it for OOo objects, but for OLE objects OS dependent code is required @@ -354,7 +354,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName ) + virtual void SAL_CALL setContainerName( const OUString& sName ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -387,7 +387,7 @@ public: virtual void SAL_CALL setPersistentEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) @@ -397,7 +397,7 @@ public: ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) + virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -406,7 +406,7 @@ public: virtual void SAL_CALL storeAsEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, @@ -424,14 +424,14 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getEntryName() + virtual OUString SAL_CALL getEntryName() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); // XLinkageSupport virtual void SAL_CALL breakLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -442,7 +442,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkURL() + virtual OUString SAL_CALL getLinkURL() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -472,11 +472,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getClassName() + virtual OUString SAL_CALL getClassName() throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setClassInfo( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 5e8b908fafe8..7a90121b87e4 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -43,9 +43,9 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -53,23 +53,23 @@ public: // XEmbedObjectCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const ::rtl::OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index 7d3855884836..e054f7a95005 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; sal_Bool ConvertBufferToFormat( void* pBuf, sal_uInt32 nBufSize, - const ::rtl::OUString& aMimeType, + const OUString& aMimeType, uno::Any& aResult ) { // produces sequence with data in requested format and returns it in aResult @@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf, { uno::Reference < graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(comphelper::getProcessComponentContext())); uno::Sequence< beans::PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( "InputStream" ); + aMediaProperties[0].Name = OUString( "InputStream" ); aMediaProperties[0].Value <<= xIn; uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); if( xGraphic.is() ) @@ -62,9 +62,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf, SvMemoryStream aNewStream( 65535, 65535 ); uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream ); uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 ); - aOutMediaProperties[0].Name = ::rtl::OUString( "OutputStream" ); + aOutMediaProperties[0].Name = OUString( "OutputStream" ); aOutMediaProperties[0].Value <<= xOut; - aOutMediaProperties[1].Name = ::rtl::OUString( "MimeType" ); + aOutMediaProperties[1].Name = OUString( "MimeType" ); aOutMediaProperties[1].Value <<= aMimeType; xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties ); diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 4222d489ea19..f8a51984b743 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -162,10 +162,10 @@ public: sal_Bool ConvertBufferToFormat( void* pBuf, sal_uInt32 nBufSize, - const ::rtl::OUString& aFormatShortName, + const OUString& aFormatShortName, uno::Any& aResult ); -::rtl::OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); +OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); typedef ::std::vector< FORMATETC* > FormatEtcList; @@ -189,28 +189,28 @@ struct OleComponentNative_Impl { m_aSupportedGraphFormats.realloc( 5 ); m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )), - ::rtl::OUString( "Windows Enhanced Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )), + OUString( "Windows Enhanced Metafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[1] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Windows Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Windows Metafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[2] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), - ::rtl::OUString( "Bitmap" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), + OUString( "Bitmap" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[3] = datatransfer::DataFlavor( - ::rtl::OUString( "image/png" ), - ::rtl::OUString( "PNG" ), + OUString( "image/png" ), + OUString( "PNG" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), - ::rtl::OUString( "GDIMetafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), + OUString( "GDIMetafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); } @@ -241,16 +241,16 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor ) } //---------------------------------------------- -::rtl::OUString GetFlavorSuffixFromAspect( DWORD nAsp ) +OUString GetFlavorSuffixFromAspect( DWORD nAsp ) { - ::rtl::OUString aResult; + OUString aResult; if ( nAsp == DVASPECT_THUMBNAIL ) - aResult = ::rtl::OUString( ";Aspect=THUMBNAIL" ); + aResult = OUString( ";Aspect=THUMBNAIL" ); else if ( nAsp == DVASPECT_ICON ) - aResult = ::rtl::OUString( ";Aspect=ICON" ); + aResult = OUString( ";Aspect=ICON" ); else if ( nAsp == DVASPECT_DOCPRINT ) - aResult = ::rtl::OUString( ";Aspect=DOCPRINT" ); + aResult = OUString( ";Aspect=DOCPRINT" ); // no suffix for DVASPECT_CONTENT @@ -258,11 +258,11 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor ) } //---------------------------------------------- -HRESULT OpenIStorageFromURL_Impl( const ::rtl::OUString& aURL, IStorage** ppIStorage ) +HRESULT OpenIStorageFromURL_Impl( const OUString& aURL, IStorage** ppIStorage ) { OSL_ENSURE( ppIStorage, "The pointer must not be empty!" ); - ::rtl::OUString aFilePath; + OUString aFilePath; if ( !ppIStorage || ::osl::FileBase::getSystemPathFromFileURL( aURL, aFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -288,11 +288,11 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium unsigned char* pBuf = NULL; sal_uInt32 nBufSize = 0; - ::rtl::OUString aFormat; + OUString aFormat; if ( aMedium.tymed == TYMED_MFPICT ) // Win Metafile { - aFormat = ::rtl::OUString("image/x-wmf"); + aFormat = OUString("image/x-wmf"); METAFILEPICT* pMF = ( METAFILEPICT* )GlobalLock( aMedium.hMetaFilePict ); if ( pMF ) { @@ -323,7 +323,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium } else if ( aMedium.tymed == TYMED_ENHMF ) // Enh Metafile { - aFormat = ::rtl::OUString("image/x-emf"); + aFormat = OUString("image/x-emf"); nBufSize = GetEnhMetaFileBits( aMedium.hEnhMetaFile, 0, NULL ); pBuf = new unsigned char[nBufSize]; if ( nBufSize && nBufSize == GetEnhMetaFileBits( aMedium.hEnhMetaFile, nBufSize, pBuf ) ) @@ -337,7 +337,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium } else if ( aMedium.tymed == TYMED_GDI ) // Bitmap { - aFormat = ::rtl::OUString("image/x-MS-bmp"); + aFormat = OUString("image/x-MS-bmp"); nBufSize = GetBitmapBits( aMedium.hBitmap, 0, NULL ); pBuf = new unsigned char[nBufSize]; if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf ) ) ) @@ -398,9 +398,9 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe } //---------------------------------------------- -::rtl::OUString WinAccToVcl_Impl( const sal_Unicode* pStr ) +OUString WinAccToVcl_Impl( const sal_Unicode* pStr ) { - ::rtl::OUString aResult; + OUString aResult; if( pStr ) { @@ -408,12 +408,12 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe { if ( *pStr == '&' ) { - aResult += ::rtl::OUString( "~" ); + aResult += OUString( "~" ); while( *( ++pStr ) == '&' ); } else { - aResult += ::rtl::OUString( pStr, 1 ); + aResult += OUString( pStr, 1 ); pStr++; } } @@ -556,7 +556,7 @@ void OleComponent::CreateNewIStorage_Impl() // TODO: in future a global memory could be used instead of file. // write the stream to the temporary file - ::rtl::OUString aTempURL; + OUString aTempURL; OSL_ENSURE( m_pUnoOleObject, "Unexpected object absence!" ); if ( m_pUnoOleObject ) @@ -568,7 +568,7 @@ void OleComponent::CreateNewIStorage_Impl() throw uno::RuntimeException(); // TODO // open an IStorage based on the temporary file - ::rtl::OUString aTempFilePath; + OUString aTempFilePath; if ( ::osl::FileBase::getSystemPathFromFileURL( aTempURL, aTempFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -584,7 +584,7 @@ uno::Sequence< datatransfer::DataFlavor > OleComponentNative_Impl::GetFlavorsFor for ( sal_uInt32 nAsp = 1; nAsp <= 8; nAsp *= 2 ) if ( ( nSupportedAspects & nAsp ) == nAsp ) { - ::rtl::OUString aAspectSuffix = GetFlavorSuffixFromAspect( nAsp ); + OUString aAspectSuffix = GetFlavorSuffixFromAspect( nAsp ); sal_Int32 nLength = aResult.getLength(); aResult.realloc( nLength + m_aSupportedGraphFormats.getLength() ); @@ -718,7 +718,7 @@ sal_Bool OleComponent::InitializeObject_Impl() } //---------------------------------------------- -void OleComponent::LoadEmbeddedObject( const ::rtl::OUString& aTempURL ) +void OleComponent::LoadEmbeddedObject( const OUString& aTempURL ) { if ( !aTempURL.getLength() ) throw lang::IllegalArgumentException(); // TODO @@ -827,7 +827,7 @@ void OleComponent::CreateObjectFromData( const uno::Reference< datatransfer::XTr } //---------------------------------------------- -void OleComponent::CreateObjectFromFile( const ::rtl::OUString& aFileURL ) +void OleComponent::CreateObjectFromFile( const OUString& aFileURL ) { if ( m_pNativeImpl->m_pIStorage ) throw io::IOException(); // TODO:the object is already initialized @@ -836,7 +836,7 @@ void OleComponent::CreateObjectFromFile( const ::rtl::OUString& aFileURL ) if ( !m_pNativeImpl->m_pIStorage ) throw uno::RuntimeException(); // TODO: - ::rtl::OUString aFilePath; + OUString aFilePath; if ( ::osl::FileBase::getSystemPathFromFileURL( aFileURL, aFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -857,7 +857,7 @@ void OleComponent::CreateObjectFromFile( const ::rtl::OUString& aFileURL ) } //---------------------------------------------- -void OleComponent::CreateLinkFromFile( const ::rtl::OUString& aFileURL ) +void OleComponent::CreateLinkFromFile( const OUString& aFileURL ) { if ( m_pNativeImpl->m_pIStorage ) throw io::IOException(); // TODO:the object is already initialized @@ -866,7 +866,7 @@ void OleComponent::CreateLinkFromFile( const ::rtl::OUString& aFileURL ) if ( !m_pNativeImpl->m_pIStorage ) throw uno::RuntimeException(); // TODO: - ::rtl::OUString aFilePath; + OUString aFilePath; if ( ::osl::FileBase::getSystemPathFromFileURL( aFileURL, aFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -937,7 +937,7 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ) hr = pOleLink->GetSourceDisplayName( &pOleStr ); if ( SUCCEEDED( hr ) && pOleStr ) { - ::rtl::OUString aFilePath( ( sal_Unicode* )pOleStr ); + OUString aFilePath( ( sal_Unicode* )pOleStr ); if ( pMalloc ) pMalloc->Free( ( void* )pOleStr ); @@ -1096,8 +1096,8 @@ void OleComponent::ExecuteVerb( sal_Int32 nVerbID ) } //---------------------------------------------- -void OleComponent::SetHostName( const ::rtl::OUString&, - const ::rtl::OUString& ) +void OleComponent::SetHostName( const OUString&, + const OUString& ) { if ( !m_pNativeImpl->m_pOleObject ) throw embed::WrongStateException(); // TODO: the object is in wrong state @@ -1405,7 +1405,7 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect ) { uno::Reference < awt::XRequestCallback > xRequestCallback( m_xFactory->createInstance( - ::rtl::OUString("com.sun.star.awt.AsyncCallback")), + OUString("com.sun.star.awt.AsyncCallback")), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect ), uno::Any() ); } @@ -1426,7 +1426,7 @@ void OleComponent::OnClose_Impl() { uno::Reference < awt::XRequestCallback > xRequestCallback( m_xFactory->createInstance( - ::rtl::OUString("com.sun.star.awt.AsyncCallback")), + OUString("com.sun.star.awt.AsyncCallback")), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE ), uno::Any() ); } diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx index 9db4e76f0b07..2ec7f8922db3 100644 --- a/embeddedobj/source/msole/olecomponent.hxx +++ b/embeddedobj/source/msole/olecomponent.hxx @@ -105,13 +105,13 @@ public: ::com::sun::star::awt::Size CalculateTheRealSize( const ::com::sun::star::awt::Size& aContSize, sal_Bool bUpdate ); // ==== Initialization ================================================== - void LoadEmbeddedObject( const ::rtl::OUString& aTempURL ); + void LoadEmbeddedObject( const OUString& aTempURL ); void CreateObjectFromClipboard(); void CreateNewEmbeddedObject( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeqCLSID ); void CreateObjectFromData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransfer ); - void CreateObjectFromFile( const ::rtl::OUString& aFileName ); - void CreateLinkFromFile( const ::rtl::OUString& aFileName ); + void CreateObjectFromFile( const OUString& aFileName ); + void CreateLinkFromFile( const OUString& aFileName ); void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ); // ====================================================================== @@ -121,7 +121,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > GetVerbList(); void ExecuteVerb( sal_Int32 nVerbID ); - void SetHostName( const ::rtl::OUString& aContName, const ::rtl::OUString& aEmbDocName ); + void SetHostName( const OUString& aContName, const OUString& aEmbDocName ); void SetExtent( const ::com::sun::star::awt::Size& aVisAreaSize, sal_Int64 nAspect ); ::com::sun::star::awt::Size GetExtent( sal_Int64 nAspect ); diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index f4abfbf6a57c..859a9b9fdebb 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -202,14 +202,14 @@ void OleEmbeddedObject::MoveListeners() } //---------------------------------------------- -uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( ::rtl::OUString& o_aStorageName ) +uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( OUString& o_aStorageName ) { uno::Reference< embed::XStorage > xResult; for ( sal_Int32 nInd = 0; nInd < 32000 && !xResult.is(); nInd++ ) { - ::rtl::OUString aName = ::rtl::OUString::valueOf( nInd ); - aName += ::rtl::OUString( "TMPSTOR" ); + OUString aName = OUString::valueOf( nInd ); + aName += OUString( "TMPSTOR" ); aName += m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { @@ -220,7 +220,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( if ( !xResult.is() ) { - o_aStorageName = ::rtl::OUString(); + o_aStorageName = OUString(); throw uno::RuntimeException(); } @@ -228,13 +228,13 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( } //---------------------------------------------- -::rtl::OUString OleEmbeddedObject::MoveToTemporarySubstream() +OUString OleEmbeddedObject::MoveToTemporarySubstream() { - ::rtl::OUString aResult; + OUString aResult; for ( sal_Int32 nInd = 0; nInd < 32000 && aResult.isEmpty(); nInd++ ) { - ::rtl::OUString aName = ::rtl::OUString::valueOf( nInd ); - aName += ::rtl::OUString( "TMPSTREAM" ); + OUString aName = OUString::valueOf( nInd ); + aName += OUString( "TMPSTREAM" ); aName += m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { @@ -254,8 +254,8 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() { sal_Bool bResult = sal_False; - ::rtl::OUString aStorageName; - ::rtl::OUString aTmpStreamName; + OUString aStorageName; + OUString aTmpStreamName; sal_Int32 nStep = 0; if ( m_pOleComponent || m_bReadOnly ) @@ -268,17 +268,17 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() // the stream must be seekable uno::Reference< io::XSeekable > xSeekable( m_xObjectStream, uno::UNO_QUERY_THROW ); xSeekable->seek( 0 ); - ::rtl::OUString aFilterName = OwnView_Impl::GetFilterNameFromExtentionAndInStream( m_xFactory, ::rtl::OUString(), m_xObjectStream->getInputStream() ); + OUString aFilterName = OwnView_Impl::GetFilterNameFromExtentionAndInStream( m_xFactory, OUString(), m_xObjectStream->getInputStream() ); // use the solution only for OOXML format currently if ( !aFilterName.isEmpty() && ( aFilterName == "Calc MS Excel 2007 XML" || aFilterName == "Impress MS PowerPoint 2007 XML" || aFilterName == "MS Word 2007 XML" ) ) { uno::Reference< container::XNameAccess > xFilterFactory( - m_xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.FilterFactory" )), + m_xFactory->createInstance( OUString( "com.sun.star.document.FilterFactory" )), uno::UNO_QUERY_THROW ); - ::rtl::OUString aDocServiceName; + OUString aDocServiceName; uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName ); uno::Sequence< beans::PropertyValue > aFilterData; if ( aFilterAnyData >>= aFilterData ) @@ -292,7 +292,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() { // create the model uno::Sequence< uno::Any > aArguments(1); - aArguments[0] <<= beans::NamedValue( ::rtl::OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True )); + aArguments[0] <<= beans::NamedValue( OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True )); uno::Reference< util::XCloseable > xDocument( m_xFactory->createInstanceWithArguments( aDocServiceName, aArguments ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW ); @@ -301,21 +301,21 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() // let the model behave as embedded one uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); + aSeq[0].Name = OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; - xModel->attachResource( ::rtl::OUString(), aSeq ); + xModel->attachResource( OUString(), aSeq ); // load the model from the stream uno::Sequence< beans::PropertyValue > aArgs( 5 ); - aArgs[0].Name = ::rtl::OUString( "HierarchicalDocumentName" ); + aArgs[0].Name = OUString( "HierarchicalDocumentName" ); aArgs[0].Value <<= m_aEntryName; - aArgs[1].Name = ::rtl::OUString( "ReadOnly" ); + aArgs[1].Name = OUString( "ReadOnly" ); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString( "FilterName" ); + aArgs[2].Name = OUString( "FilterName" ); aArgs[2].Value <<= aFilterName; - aArgs[3].Name = ::rtl::OUString( "URL" ); - aArgs[3].Value <<= ::rtl::OUString( "private:stream" ); - aArgs[4].Name = ::rtl::OUString( "InputStream" ); + aArgs[3].Name = OUString( "URL" ); + aArgs[3].Value <<= OUString( "private:stream" ); + aArgs[4].Name = OUString( "InputStream" ); aArgs[4].Value <<= m_xObjectStream->getInputStream(); xSeekable->seek( 0 ); @@ -326,13 +326,13 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() xStorDoc->storeToStorage( xTmpStorage, uno::Sequence< beans::PropertyValue >() ); xDocument->close( sal_True ); uno::Reference< beans::XPropertySet > xStorProps( xTmpStorage, uno::UNO_QUERY_THROW ); - ::rtl::OUString aMediaType; - xStorProps->getPropertyValue( ::rtl::OUString( "MediaType" ) ) >>= aMediaType; + OUString aMediaType; + xStorProps->getPropertyValue( OUString( "MediaType" ) ) >>= aMediaType; xTmpStorage->dispose(); // look for the related embedded object factory ::comphelper::MimeConfigurationHelper aConfigHelper( comphelper::getComponentContext(m_xFactory) ); - ::rtl::OUString aEmbedFactory; + OUString aEmbedFactory; if ( !aMediaType.isEmpty() ) aEmbedFactory = aConfigHelper.GetFactoryNameByMediaType( aMediaType ); @@ -463,7 +463,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // in case the object is already in requested state @@ -476,7 +476,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) if ( m_nTargetState != -1 ) { // means that the object is currently trying to reach the target state - throw embed::StateChangeInProgressException( ::rtl::OUString(), + throw embed::StateChangeInProgressException( OUString(), uno::Reference< uno::XInterface >(), m_nTargetState ); } @@ -619,7 +619,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -661,7 +661,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: Shouldn't we ask object? ( I guess no ) @@ -688,10 +688,10 @@ namespace //Dump the objects content to a tempfile, just the "CONTENTS" stream if //there is one for non-compound documents, otherwise the whole content. //On success a file is returned which must be removed by the caller - rtl::OUString lcl_ExtractObject(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory, + OUString lcl_ExtractObject(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory, ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xObjectStream) { - rtl::OUString sUrl; + OUString sUrl; // the solution is only active for Unix systems #ifndef WNT @@ -705,7 +705,7 @@ namespace aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( xFactory->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"), + OUString("com.sun.star.embed.OLESimpleStorage"), aArgs ), uno::UNO_QUERY_THROW ); uno::Reference< io::XStream > xCONTENTS; @@ -729,9 +729,9 @@ namespace if (bCopied) { - xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"), + xNativeTempFile->setPropertyValue(OUString("RemoveFile"), uno::makeAny(sal_False)); - uno::Any aUrl = xNativeTempFile->getPropertyValue(::rtl::OUString("Uri")); + uno::Any aUrl = xNativeTempFile->getPropertyValue(OUString("Uri")); aUrl >>= sUrl; xNativeTempFile = uno::Reference<beans::XPropertySet>(); @@ -743,7 +743,7 @@ namespace } else { - xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"), + xNativeTempFile->setPropertyValue(OUString("RemoveFile"), uno::makeAny(sal_True)); } #else @@ -779,7 +779,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -879,7 +879,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) { uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( ::com::sun::star::system::SystemShellExecute::create(comphelper::getComponentContext(m_xFactory)) ); - xSystemShellExecute->execute(m_aTempDumpURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + xSystemShellExecute->execute(m_aTempDumpURL, OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } else throw embed::UnreachableStateException(); @@ -914,7 +914,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT if ( m_pOleComponent ) @@ -959,7 +959,7 @@ void SAL_CALL OleEmbeddedObject::setClientSite( { if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING ) throw embed::WrongStateException( - ::rtl::OUString( "The client site can not be set currently!\n" ), + OUString( "The client site can not be set currently!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xClientSite = xClient; @@ -985,7 +985,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_xClientSite; @@ -1012,7 +1012,7 @@ void SAL_CALL OleEmbeddedObject::update() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nUpdateMode == embed::EmbedUpdateModes::EXPLICIT_UPDATE ) @@ -1046,7 +1046,7 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE @@ -1076,7 +1076,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object must be in running state!\n" ), + throw embed::WrongStateException( OUString( "The object must be in running state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int64 nResult = 0; @@ -1099,7 +1099,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 } //---------------------------------------------- -void SAL_CALL OleEmbeddedObject::setContainerName( const ::rtl::OUString& sName ) +void SAL_CALL OleEmbeddedObject::setContainerName( const OUString& sName ) throw ( uno::RuntimeException ) { // begin wrapping related part ==================== diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index a71944bd4cea..d14733a85530 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -31,13 +31,13 @@ using namespace ::com::sun::star; -sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); +sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); //------------------------------------------------------ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName ) + const OUString& aClassName ) : m_pOleComponent( NULL ) , m_pInterfaceContainer( NULL ) , m_bReadOnly( sal_False ) @@ -154,7 +154,7 @@ OleEmbeddedObject::~OleEmbeddedObject() } //------------------------------------------------------ -void OleEmbeddedObject::MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName ) +void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEventName ) { if ( m_pInterfaceContainer ) { @@ -317,7 +317,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OleEmbeddedObject::getClassName() +OUString SAL_CALL OleEmbeddedObject::getClassName() throw ( uno::RuntimeException ) { // begin wrapping related part ==================== @@ -338,7 +338,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID() //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::setClassInfo( - const uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( lang::NoSupportException, uno::RuntimeException ) { @@ -376,7 +376,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent() if ( m_nObjectState == -1 ) // || m_nObjectState == embed::EmbedStates::LOADED ) { // the object is still not running - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 351aa34bbb56..cd8324972960 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; using namespace ::comphelper; //------------------------------------------------------------------------- -sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) +sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) { if ( !xFactory.is() ) return sal_False; @@ -75,19 +75,19 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: } //---------------------------------------------- -::rtl::OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) +OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) { OSL_ENSURE( xFactory.is(), "No factory is provided!\n" ); - ::rtl::OUString aResult; + OUString aResult; uno::Reference < beans::XPropertySet > xTempFile( io::TempFile::create(comphelper::getComponentContext(xFactory)), uno::UNO_QUERY_THROW ); try { - xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); + xTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xTempFile->getPropertyValue( OUString( "Uri" )); aUrl >>= aResult; } catch ( const uno::Exception& ) @@ -101,14 +101,14 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: } //----------------------------------------------- -::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, +OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw ( io::IOException, uno::RuntimeException ) { OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!\n" ); - ::rtl::OUString aResult = GetNewTempFileURL_Impl( xFactory ); + OUString aResult = GetNewTempFileURL_Impl( xFactory ); if ( !aResult.isEmpty() ) { @@ -145,17 +145,17 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: catch( const uno::Exception& ) { KillFile_Impl( aResult, xFactory ); - aResult = ::rtl::OUString(); + aResult = OUString(); } } return aResult; } #ifdef WNT -::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const ::rtl::OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) +OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException, uno::RuntimeException ) { - ::rtl::OUString aResult; + OUString aResult; try { @@ -166,8 +166,8 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: xParentStorage->copyStreamElementData( aEntryName, xTempStream ); - xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); + xTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xTempFile->getPropertyValue( OUString( "Uri" )); aUrl >>= aResult; } catch( const uno::RuntimeException& ) @@ -185,13 +185,13 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: } //------------------------------------------------------ -void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, const ::rtl::OUString& aMediaType ) +void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, const OUString& aMediaType ) { uno::Reference< beans::XPropertySet > xPropSet( xStream, uno::UNO_QUERY ); if ( !xPropSet.is() ) throw uno::RuntimeException(); // TODO: all the storage streams must support XPropertySet - xPropSet->setPropertyValue( ::rtl::OUString( "MediaType" ), uno::makeAny( aMediaType ) ); + xPropSet->setPropertyValue( OUString( "MediaType" ), uno::makeAny( aMediaType ) ); } #endif //------------------------------------------------------ @@ -201,7 +201,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre if ( !xPropSet.is() ) throw uno::RuntimeException(); // Only StorageStreams must be provided here, they must implement the interface - xPropSet->setPropertyValue( ::rtl::OUString( "UseCommonStoragePasswordEncryption" ), + xPropSet->setPropertyValue( OUString( "UseCommonStoragePasswordEncryption" ), uno::makeAny( (sal_Bool)sal_True ) ); } #ifdef WNT @@ -379,7 +379,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -502,7 +502,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea throw io::IOException(); // TODO: // insert the result file as replacement image - ::rtl::OUString aCacheName = ::rtl::OUString( "\002OlePres000" ); + OUString aCacheName = OUString( "\002OlePres000" ); if ( xNameContainer->hasByName( aCacheName ) ) xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) ); else @@ -528,7 +528,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -537,8 +537,8 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - ::rtl::OUString aStreamName( "\002OlePres00" ); - aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); + OUString aStreamName( "\002OlePres00" ); + aStreamName += OUString::valueOf( (sal_Int32)nInd ); if ( xNameContainer->hasByName( aStreamName ) ) xNameContainer->removeByName( aStreamName ); } @@ -597,7 +597,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -605,8 +605,8 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() { for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ ) { - ::rtl::OUString aStreamName( "\002OlePres00" ); - aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); + OUString aStreamName( "\002OlePres00" ); + aStreamName += OUString::valueOf( (sal_Int32)nInd ); try { bExists = xNameContainer->hasByName( aStreamName ); @@ -644,7 +644,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { xNameContainer = uno::Reference< container::XNameContainer >( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); } @@ -655,8 +655,8 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - ::rtl::OUString aStreamName( "\002OlePres00" ); - aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); + OUString aStreamName( "\002OlePres00" ); + aStreamName += OUString::valueOf( (sal_Int32)nInd ); uno::Reference< io::XStream > xCachedCopyStream; try { @@ -673,7 +673,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres if ( nInd == 0 ) { // to be compatible with the old versions Ole10Native is checked after OlePress000 - aStreamName = ::rtl::OUString( "\001Ole10Native" ); + aStreamName = OUString( "\001Ole10Native" ); try { if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() ) @@ -692,7 +692,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { if ( bAllowToRepair50 && !xResult.is() ) { - ::rtl::OUString aOrigContName( "Ole-Object" ); + OUString aOrigContName( "Ole-Object" ); if ( xNameContainer->hasByName( aOrigContName ) ) { uno::Reference< embed::XClassifiedObject > xClassified( xNameContainer, uno::UNO_QUERY_THROW ); @@ -728,7 +728,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { // this is the own stream, so the temporary URL must be cleaned if it exists KillFile_Impl( m_aTempURL, m_xFactory ); - m_aTempURL = ::rtl::OUString(); + m_aTempURL = OUString(); } #ifdef WNT @@ -764,7 +764,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres //------------------------------------------------------ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, const uno::Reference< io::XStream >& xNewObjectStream, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) { @@ -789,7 +789,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor //------------------------------------------------------ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) return; @@ -871,7 +871,7 @@ sal_Bool OleEmbeddedObject::OnShowWindow_Impl( sal_Bool bShow ) void OleEmbeddedObject::OnIconChanged_Impl() { // TODO/LATER: currently this notification seems to be impossible - // MakeEventListenerNotification_Impl( ::rtl::OUString( "OnIconChanged" ) ); + // MakeEventListenerNotification_Impl( OUString( "OnIconChanged" ) ); } //------------------------------------------------------ @@ -901,7 +901,7 @@ void OleEmbeddedObject::OnViewChanged_Impl() // The view is changed while the object is in running state, save the new object m_xCachedVisualRepresentation = uno::Reference< io::XStream >(); SaveObject_Impl(); - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" ) ); } // =============================================================== } @@ -921,7 +921,7 @@ void OleEmbeddedObject::OnClosed_Impl() } //------------------------------------------------------ -::rtl::OUString OleEmbeddedObject::CreateTempURLEmpty_Impl() +OUString OleEmbeddedObject::CreateTempURLEmpty_Impl() { OSL_ENSURE( m_aTempURL.isEmpty(), "The object has already the temporary file!" ); m_aTempURL = GetNewTempFileURL_Impl( m_xFactory ); @@ -930,7 +930,7 @@ void OleEmbeddedObject::OnClosed_Impl() } //------------------------------------------------------ -::rtl::OUString OleEmbeddedObject::GetTempURL_Impl() +OUString OleEmbeddedObject::GetTempURL_Impl() { if ( m_aTempURL.isEmpty() ) { @@ -1071,7 +1071,7 @@ void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > //------------------------------------------------------ void OleEmbeddedObject::StoreToLocation_Impl( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs, sal_Bool bSaveAs ) throw ( uno::Exception ) @@ -1082,13 +1082,13 @@ void OleEmbeddedObject::StoreToLocation_Impl( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" ); @@ -1170,7 +1170,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( if ( !xTargetStream.is() ) throw io::IOException(); //TODO: access denied - SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" )); + SetStreamMediaType_Impl( xTargetStream, OUString( "application/vnd.sun.star.oleobject" )); uno::Reference< io::XOutputStream > xOutStream = xTargetStream->getOutputStream(); if ( !xOutStream.is() ) throw io::IOException(); //TODO: access denied @@ -1283,7 +1283,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::setPersistentEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -1317,12 +1317,12 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1337,7 +1337,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( // it can switch persistent representation only without initialization throw embed::WrongStateException( - ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), + OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1347,7 +1347,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) ); else throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1436,14 +1436,14 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( else if ( nEntryConnectionMode == embed::EntryInitModes::MEDIA_DESCRIPTOR_INIT ) { // use URL ( may be content or stream later ) from MediaDescriptor to initialize object - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ ) if ( lArguments[nInd].Name == "URL" ) lArguments[nInd].Value >>= aURL; if ( aURL.isEmpty() ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Empty URL is provided in the media descriptor!\n" ), + OUString( "Empty URL is provided in the media descriptor!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -1465,7 +1465,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( //TODO: //} else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } @@ -1483,7 +1483,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( // do nothing, the object has already switched it's persistence } else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -1492,7 +1492,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1526,7 +1526,7 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1583,7 +1583,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1624,7 +1624,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xNewObjectStream = uno::Reference< io::XStream >(); m_xNewParentStorage = uno::Reference< embed::XStorage >(); - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); m_bWaitSaveCompleted = sal_False; m_bNewVisReplInStream = sal_False; m_xNewCachedVisRepl = uno::Reference< io::XStream >(); @@ -1648,13 +1648,13 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) aGuard.clear(); if ( bUseNew ) { - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveAsDone" )); + MakeEventListenerNotification_Impl( OUString( "OnSaveAsDone" )); // the object can be changed only on windows // the notification should be done only if the object is not in loaded state if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded ) { - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" )); + MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" )); } } } @@ -1679,7 +1679,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_xObjectStream.is() ) @@ -1689,7 +1689,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OleEmbeddedObject::getEntryName() +OUString SAL_CALL OleEmbeddedObject::getEntryName() throw ( embed::WrongStateException, uno::RuntimeException ) { @@ -1709,13 +1709,13 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -1754,13 +1754,13 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bReadOnly ) @@ -1780,7 +1780,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( !m_xObjectStream.is() ) throw io::IOException(); //TODO: access denied - SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" )); + SetStreamMediaType_Impl( m_xObjectStream, OUString( "application/vnd.sun.star.oleobject" )); uno::Reference< io::XOutputStream > xOutStream = m_xObjectStream->getOutputStream(); if ( !xOutStream.is() ) throw io::IOException(); //TODO: access denied @@ -1834,12 +1834,12 @@ void SAL_CALL OleEmbeddedObject::storeOwn() aGuard.clear(); - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveDone" )); + MakeEventListenerNotification_Impl( OUString( "OnSaveDone" )); // the object can be changed only on Windows // the notification should be done only if the object is not in loaded state if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded ) - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" )); + MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" )); } //------------------------------------------------------ @@ -1863,13 +1863,13 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_bReadOnly; @@ -1904,13 +1904,13 @@ void SAL_CALL OleEmbeddedObject::reload( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: @@ -1921,7 +1921,7 @@ void SAL_CALL OleEmbeddedObject::reload( //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( lang::IllegalArgumentException, embed::WrongStateException, io::IOException, @@ -1943,12 +1943,12 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1957,7 +1957,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString( "The object is not a valid linked object!\n" ), + OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1966,7 +1966,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); @@ -1976,8 +1976,8 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag // TODO: create an object based on the link // disconnect the old temporary URL - ::rtl::OUString aOldTempURL = m_aTempURL; - m_aTempURL = ::rtl::OUString(); + OUString aOldTempURL = m_aTempURL; + m_aTempURL = OUString(); OleComponent* pNewOleComponent = new OleComponent( m_xFactory, this ); try { @@ -2030,7 +2030,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag } m_bIsLink = sal_False; - m_aLinkURL = ::rtl::OUString(); + m_aLinkURL = OUString(); } else #endif @@ -2061,7 +2061,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isLink() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OleEmbeddedObject::getLinkURL() +OUString SAL_CALL OleEmbeddedObject::getLinkURL() throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException ) @@ -2081,12 +2081,12 @@ sal_Bool SAL_CALL OleEmbeddedObject::isLink() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_bIsLink ) throw embed::WrongStateException( - ::rtl::OUString( "The object is not a link object!\n" ), + OUString( "The object is not a link object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: probably the link URL can be retrieved from OLE diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index f16a29a63aa2..c9bca296a1cb 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -35,7 +35,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory( { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager ) diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 1628a36c853d..c09634f666fb 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -54,16 +54,16 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo { // it's a bitmap aVisualRepr.Flavor = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), - ::rtl::OUString( "Bitmap" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), + OUString( "Bitmap" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } else { // it's a metafile aVisualRepr.Flavor = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Windows Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Windows Metafile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } @@ -100,11 +100,11 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -180,11 +180,11 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Size aResult; @@ -218,7 +218,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) catch( const uno::Exception& ) { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -261,7 +261,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) if ( !bSuccess ) throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); aGuard.reset(); @@ -280,7 +280,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) catch ( const uno::Exception& ) { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -296,7 +296,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) else { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -328,13 +328,13 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: if the object has cached representation then it should be returned // TODO: if the object has no cached representation and is in loaded state it should switch itself to the running state if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); embed::VisualRepresentation aVisualRepr; @@ -361,8 +361,8 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres changeState( embed::EmbedStates::RUNNING ); datatransfer::DataFlavor aDataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Windows Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Windows Metafile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aVisualRepr.Data = m_pOleComponent->getTransferData( aDataFlavor ); @@ -394,7 +394,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres if ( !m_xCachedVisualRepresentation.is() ) { // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -421,11 +421,11 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 1f5fb367b2fb..cd60186efab2 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star; using namespace ::comphelper; -::rtl::OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); -::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); -sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); +OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); +OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); +sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); uno::Reference< io::XStream > TryToGetAcceptableFormat_Impl( const uno::Reference< io::XStream >& xStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw ( uno::Exception ); //======================================================== @@ -109,7 +109,7 @@ OwnView_Impl::~OwnView_Impl() } //-------------------------------------------------------- -sal_Bool OwnView_Impl::CreateModelFromURL( const ::rtl::OUString& aFileURL ) +sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL ) { sal_Bool bResult = sal_False; @@ -120,28 +120,28 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const ::rtl::OUString& aFileURL ) uno::Sequence< beans::PropertyValue > aArgs( m_aFilterName.isEmpty() ? 4 : 5 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); + aArgs[0].Name = OUString( "URL" ); aArgs[0].Value <<= aFileURL; - aArgs[1].Name = ::rtl::OUString( "ReadOnly" ); + aArgs[1].Name = OUString( "ReadOnly" ); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString( "InteractionHandler" ); + aArgs[2].Name = OUString( "InteractionHandler" ); aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >( static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY ); - aArgs[3].Name = ::rtl::OUString( "DontEdit" ); + aArgs[3].Name = OUString( "DontEdit" ); aArgs[3].Value <<= sal_True; if ( !m_aFilterName.isEmpty() ) { - aArgs[4].Name = ::rtl::OUString( "FilterName" ); + aArgs[4].Name = OUString( "FilterName" ); aArgs[4].Value <<= m_aFilterName; } uno::Reference< frame::XModel > xModel( xDocumentLoader->loadComponentFromURL( aFileURL, - ::rtl::OUString( "_blank" ), + OUString( "_blank" ), 0, aArgs ), uno::UNO_QUERY ); @@ -193,41 +193,41 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative ) } //-------------------------------------------------------- -::rtl::OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( +OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, - const ::rtl::OUString& aNameWithExtention, + const OUString& aNameWithExtention, const uno::Reference< io::XInputStream >& xInputStream ) { if ( !xInputStream.is() ) throw uno::RuntimeException(); uno::Reference< document::XTypeDetection > xTypeDetection( - xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.TypeDetection" )), + xFactory->createInstance( OUString( "com.sun.star.document.TypeDetection" )), uno::UNO_QUERY_THROW ); - ::rtl::OUString aTypeName; + OUString aTypeName; if ( !aNameWithExtention.isEmpty() ) { - ::rtl::OUString aURLToAnalyze = - ( ::rtl::OUString( "file:///" ) + aNameWithExtention ); + OUString aURLToAnalyze = + ( OUString( "file:///" ) + aNameWithExtention ); aTypeName = xTypeDetection->queryTypeByURL( aURLToAnalyze ); } uno::Sequence< beans::PropertyValue > aArgs( aTypeName.isEmpty() ? 2 : 3 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); - aArgs[0].Value <<= ::rtl::OUString( "private:stream" ); - aArgs[1].Name = ::rtl::OUString( "InputStream" ); + aArgs[0].Name = OUString( "URL" ); + aArgs[0].Value <<= OUString( "private:stream" ); + aArgs[1].Name = OUString( "InputStream" ); aArgs[1].Value <<= xInputStream; if ( !aTypeName.isEmpty() ) { - aArgs[2].Name = ::rtl::OUString( "TypeName" ); + aArgs[2].Name = OUString( "TypeName" ); aArgs[2].Value <<= aTypeName; } aTypeName = xTypeDetection->queryTypeByDescriptor( aArgs, sal_True ); - ::rtl::OUString aFilterName; + OUString aFilterName; for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ ) if ( aArgs[nInd].Name == "FilterName" ) aArgs[nInd].Value >>= aFilterName; @@ -262,7 +262,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io xSeekable->seek( 0 ); // create m_aNativeTempURL - ::rtl::OUString aNativeTempURL; + OUString aNativeTempURL; uno::Reference < beans::XPropertySet > xNativeTempFile( io::TempFile::create(comphelper::getComponentContext(m_xFactory)), uno::UNO_QUERY_THROW ); @@ -273,8 +273,8 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io throw uno::RuntimeException(); try { - xNativeTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); - uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); + xNativeTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xNativeTempFile->getPropertyValue( OUString( "Uri" )); aUrl >>= aNativeTempURL; } catch ( uno::Exception& ) @@ -282,7 +282,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io } sal_Bool bFailed = sal_False; - ::rtl::OUString aFileSuffix; + OUString aFileSuffix; if ( bParseHeader ) { @@ -308,7 +308,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io aReadSeq[0] == '.' ) { - aFileSuffix += ::rtl::OUString::valueOf( (sal_Unicode) aReadSeq[0] ); + aFileSuffix += OUString::valueOf( (sal_Unicode) aReadSeq[0] ); } } while( aReadSeq[0] ); @@ -421,11 +421,11 @@ void OwnView_Impl::CreateNative() aArgs[0] <<= xInStream; uno::Reference< container::XNameAccess > xNameAccess( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aSubStreamName = ::rtl::OUString( "\1Ole10Native" ); + OUString aSubStreamName = OUString( "\1Ole10Native" ); uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, uno::UNO_QUERY_THROW ); uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID(); @@ -450,7 +450,7 @@ void OwnView_Impl::CreateNative() if ( !bOk && !m_aNativeTempURL.isEmpty() ) { KillFile_Impl( m_aNativeTempURL, m_xFactory ); - m_aNativeTempURL = ::rtl::OUString(); + m_aNativeTempURL = OUString(); } } @@ -461,7 +461,7 @@ void OwnView_Impl::CreateNative() if ( !bOk && !m_aNativeTempURL.isEmpty() ) { KillFile_Impl( m_aNativeTempURL, m_xFactory ); - m_aNativeTempURL = ::rtl::OUString(); + m_aNativeTempURL = OUString(); } } } diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx index d776922e93ee..4a17623f7bfd 100644 --- a/embeddedobj/source/msole/ownview.hxx +++ b/embeddedobj/source/msole/ownview.hxx @@ -38,17 +38,17 @@ class OwnView_Impl : public ::cppu::WeakImplHelper2 < ::com::sun::star::util::XC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::rtl::OUString m_aTempFileURL; - ::rtl::OUString m_aNativeTempURL; + OUString m_aTempFileURL; + OUString m_aNativeTempURL; - ::rtl::OUString m_aFilterName; + OUString m_aFilterName; sal_Bool m_bBusy; sal_Bool m_bUseNative; private: - sal_Bool CreateModelFromURL( const ::rtl::OUString& aFileURL ); + sal_Bool CreateModelFromURL( const OUString& aFileURL ); sal_Bool CreateModel( sal_Bool bUseNative ); @@ -57,9 +57,9 @@ private: void CreateNative(); public: - static ::rtl::OUString GetFilterNameFromExtentionAndInStream( + static OUString GetFilterNameFromExtentionAndInStream( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, - const ::rtl::OUString& aNameWithExtention, + const OUString& aNameWithExtention, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream ); OwnView_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index b4e5d509afb6..72d950836a6e 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -105,18 +105,18 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_In } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.MSOLEObjectSystemCreator"); + aRet[1] = OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName() +OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); + return OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); } //------------------------------------------------------------------------- @@ -129,7 +129,7 @@ uno::Reference< uno::XInterface > SAL_CALL MSOLEDialogObjectCreator::impl_static //------------------------------------------------------------------------- embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDialog( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aInObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -142,12 +142,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia #ifdef WNT if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( !sEntName.getLength() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -170,11 +170,11 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia ::osl::Module aOleDlgLib; - if( !aOleDlgLib.load( ::rtl::OUString( "oledlg" ) )) + if( !aOleDlgLib.load( OUString( "oledlg" ) )) throw uno::RuntimeException(); OleUIInsertObjectA_Type * pInsertFct = (OleUIInsertObjectA_Type *) - aOleDlgLib.getSymbol( ::rtl::OUString( "OleUIInsertObjectA" )); + aOleDlgLib.getSymbol( OUString( "OleUIInsertObjectA" )); if( !pInsertFct ) throw uno::RuntimeException(); @@ -201,20 +201,20 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia aClassID = GetRelatedInternalID_Impl( aClassID ); //TODO: retrieve ClassName - ::rtl::OUString aClassName; + OUString aClassName; aObjectInfo.Object = uno::Reference< embed::XEmbeddedObject >( xEmbCreator->createInstanceInitNew( aClassID, aClassName, xStorage, sEntName, aObjArgs ), uno::UNO_QUERY ); } else { - ::rtl::OUString aFileName = ::rtl::OStringToOUString( ::rtl::OString( szFile ), osl_getThreadTextEncoding() ); - rtl::OUString aFileURL; + OUString aFileName = OStringToOUString( OString( szFile ), osl_getThreadTextEncoding() ); + OUString aFileURL; if ( osl::FileBase::getFileURLFromSystemPath( aFileName, aFileURL ) != osl::FileBase::E_None ) throw uno::RuntimeException(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = ::rtl::OUString( "URL" ); + aMediaDescr[0].Name = OUString( "URL" ); aMediaDescr[0].Value <<= aFileURL; // TODO: use config helper for type detection @@ -252,14 +252,14 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia if ( nBufSize && nBufSize == GetMetaFileBitsEx( pMF->hMF, nBufSize, pBuf+22 ) ) { datatransfer::DataFlavor aFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Image WMF" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Image WMF" ), getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) ); aObjectInfo.Options.realloc( 2 ); - aObjectInfo.Options[0].Name = ::rtl::OUString( "Icon" ); + aObjectInfo.Options[0].Name = OUString( "Icon" ); aObjectInfo.Options[0].Value <<= aMetafile; - aObjectInfo.Options[1].Name = ::rtl::OUString( "IconFormat" ); + aObjectInfo.Options[1].Name = OUString( "IconFormat" ); aObjectInfo.Options[1].Value <<= aFlavor; } @@ -283,7 +283,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia //------------------------------------------------------------------------- embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitFromClipboard( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntryName, + const OUString& sEntryName, const uno::Sequence< beans::PropertyValue >& aObjectArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -294,12 +294,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF #ifdef WNT if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( !sEntryName.getLength() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -333,17 +333,17 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MSOLEDialogObjectCreator::getImplementationName() +OUString SAL_CALL MSOLEDialogObjectCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -353,7 +353,7 @@ sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MSOLEDialogObjectCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx index 8f448b21a121..9201328bda21 100644 --- a/embeddedobj/source/msole/xdialogcreator.hxx +++ b/embeddedobj/source/msole/xdialogcreator.hxx @@ -43,9 +43,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -53,15 +53,15 @@ public: // XInsertObjectDialog - virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectClipboardCreator - virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index f5fdff4eedd1..fb3baeb05e66 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -36,18 +36,18 @@ using namespace ::com::sun::star; // TODO: do not create OLE objects that represent OOo documents //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.OLEEmbeddedObjectFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.OLEEmbeddedObjectFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); + return OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -60,7 +60,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::impl_static //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMedDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -72,12 +72,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -133,7 +133,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -144,12 +144,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -174,9 +174,9 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitNew( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -186,12 +186,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitNew" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -216,7 +216,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -227,13 +227,13 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceLink" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -259,9 +259,9 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 /*nEntryConnectionMode*/, const uno::Sequence< beans::PropertyValue >& /*lArguments*/, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -274,12 +274,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -304,17 +304,17 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::getImplementationName() +OUString SAL_CALL OleEmbeddedObjectFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -324,7 +324,7 @@ sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx index b1d780b5363c..37747e8fe7ac 100644 --- a/embeddedobj/source/msole/xolefactory.hxx +++ b/embeddedobj/source/msole/xolefactory.hxx @@ -41,9 +41,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -51,20 +51,20 @@ public: // XEmbedObjectCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx index d1d55a9ed520..4c5dcb6281ab 100644 --- a/embeddedobj/test/MainThreadExecutor/register.cxx +++ b/embeddedobj/test/MainThreadExecutor/register.cxx @@ -32,7 +32,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager && aImplName.equals( UNOMainThreadExecutor::impl_staticGetImplementationName() ) ) @@ -62,11 +62,11 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK uno::Reference< registry::XRegistryKey > xNewKey; - xNewKey = xKey->createKey( ::rtl::OUString("/") + + xNewKey = xKey->createKey( OUString("/") + UNOMainThreadExecutor::impl_staticGetImplementationName() + - ::rtl::OUString( "/UNO/SERVICES") ); + OUString( "/UNO/SERVICES") ); - uno::Sequence< ::rtl::OUString > &rServices = UNOMainThreadExecutor::impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > &rServices = UNOMainThreadExecutor::impl_staticGetSupportedServiceNames(); for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx index e35feb8cd3ac..2634e7a336ff 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx @@ -82,17 +82,17 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(1); + uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.comp.thread.MainThreadExecutor"; return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOMainThreadExecutor::impl_staticGetImplementationName() +OUString SAL_CALL UNOMainThreadExecutor::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.thread.MainThreadExecutor"); + return OUString("com.sun.star.comp.thread.MainThreadExecutor"); } //------------------------------------------------------------------------- @@ -103,17 +103,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOMainThreadExecutor::impl_staticCre } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOMainThreadExecutor::getImplementationName() +OUString SAL_CALL UNOMainThreadExecutor::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL UNOMainThreadExecutor::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL UNOMainThreadExecutor::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -123,7 +123,7 @@ sal_Bool SAL_CALL UNOMainThreadExecutor::supportsService( const ::rtl::OUString& } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOMainThreadExecutor::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOMainThreadExecutor::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx index 97213d543aec..7e2b29abec5b 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx @@ -40,9 +40,9 @@ public: { } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -52,9 +52,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx index 593741078374..7f0907835681 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx @@ -26,18 +26,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); + uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.BitmapCreator"; aRet[1] = "com.sun.star.comp.embed.BitmapCreator"; return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName() +OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.BitmapCreator"); + return OUString("com.sun.star.comp.embed.BitmapCreator"); } //------------------------------------------------------------------------- @@ -84,17 +84,17 @@ uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstanceWithA } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL VCLBitmapCreator::getImplementationName() +OUString SAL_CALL VCLBitmapCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -104,7 +104,7 @@ sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const ::rtl::OUString& Serv } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx index aeb0a6d68111..6770347c54f5 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx @@ -37,9 +37,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) {} - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); @@ -49,9 +49,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx index 084efe6c5f21..788c0e819fd1 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx @@ -24,18 +24,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); + uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.thread.MainThreadExecutor"; aRet[1] = "com.sun.star.comp.thread.MainThreadExecutor"; return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName() +OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.thread.MainThreadExecutor"); + return OUString("com.sun.star.comp.thread.MainThreadExecutor"); } //------------------------------------------------------------------------- @@ -85,17 +85,17 @@ IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThrea } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MainThreadExecutor::getImplementationName() +OUString SAL_CALL MainThreadExecutor::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL MainThreadExecutor::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL MainThreadExecutor::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -105,7 +105,7 @@ sal_Bool SAL_CALL MainThreadExecutor::supportsService( const ::rtl::OUString& Se } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MainThreadExecutor::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx index fb2da650fcd0..a1a12b6b6222 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx @@ -52,9 +52,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) {} - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); @@ -65,9 +65,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx index 7ef94d2cf6df..d3fffbb03699 100644 --- a/embeddedobj/test/mtexecutor/mteregister.cxx +++ b/embeddedobj/test/mtexecutor/mteregister.cxx @@ -33,7 +33,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager ) @@ -73,20 +73,20 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ); uno::Reference< registry::XRegistryKey > xNewKey; - uno::Sequence< ::rtl::OUString > rServices; + uno::Sequence< OUString > rServices; sal_Int32 ind = 0; - xNewKey = xKey->createKey( ::rtl::OUString("/") + + xNewKey = xKey->createKey( OUString("/") + MainThreadExecutor::impl_staticGetImplementationName() + - ::rtl::OUString( "/UNO/SERVICES") ); + OUString( "/UNO/SERVICES") ); rServices = MainThreadExecutor::impl_staticGetSupportedServiceNames(); for( ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); - xNewKey = xKey->createKey( ::rtl::OUString("/") + + xNewKey = xKey->createKey( OUString("/") + VCLBitmapCreator::impl_staticGetImplementationName() + - ::rtl::OUString( "/UNO/SERVICES") ); + OUString( "/UNO/SERVICES") ); rServices = VCLBitmapCreator::impl_staticGetSupportedServiceNames(); for( ind = 0; ind < rServices.getLength(); ind++ ) |