diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-04 08:29:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-04 14:10:44 +0200 |
| commit | 59b072e22b0610abc7ffdbc75873ef5cbba58de7 (patch) | |
| tree | 663c2d01a983508f9b22ec87fae29b16ab5a1683 /embeddedobj | |
| parent | baa411b59c3840a4dddf5447a0b4583eb5edea74 (diff) | |
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/commonembedding/persistence.cxx | 2 | ||||
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 9 | ||||
| -rw-r--r-- | embeddedobj/source/general/intercept.cxx | 2 | ||||
| -rw-r--r-- | embeddedobj/source/msole/ownview.cxx | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 5d1d7e223459..576cbcf794f5 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -604,7 +604,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr aArgs[3].Name = "HierarchicalDocumentName"; aArgs[3].Value <<= aHierarchName; - xStorable->storeToURL( OUString( "private:stream" ), aArgs ); + xStorable->storeToURL( "private:stream", aArgs ); try { xTempOut->closeOutput(); diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 6c8f7b0ed038..601507555b63 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -532,7 +532,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() if( xUIConfigManager.is()) { xResult = xUIConfigManager->getSettings( - OUString( "private:resource/menubar/menubar" ), + "private:resource/menubar/menubar", sal_False ); } } @@ -554,7 +554,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() xModConfSupplier->getUIConfigurationManager( aModuleIdent ), uno::UNO_QUERY_THROW ); xResult = xModUIConfMan->getSettings( - OUString( "private:resource/menubar/menubar" ), + "private:resource/menubar/menubar", sal_False ); } } @@ -652,8 +652,7 @@ bool DocumentHolder::MergeMenus_Impl( const uno::Reference< css::frame::XLayoutM try { uno::Reference< css::ui::XUIElementSettings > xUISettings( - xContLM->getElement( - OUString( "private:resource/menubar/menubar" ) ), + xContLM->getElement( "private:resource/menubar/menubar" ), uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xContMenu = xUISettings->getSettings( sal_True ); if ( !xContMenu.is() ) @@ -981,7 +980,7 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace ) sUrl = "private:object"; xComponentLoader->loadComponentFromURL( sUrl, - OUString( "_self" ), + "_self", 0, aArgs.getPropertyValues() ); diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 732cac693f86..1a0c7f2aeae6 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -113,7 +113,7 @@ Interceptor::dispatch( } uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - URL, OUString( "_self" ), 0 ); + URL, "_self", 0 ); if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index b880d220b8a3..53e2d0b20225 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -133,7 +133,7 @@ bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL ) uno::Reference< frame::XModel > xModel( xDocumentLoader->loadComponentFromURL( aFileURL, - OUString( "_blank" ), + "_blank", 0, aArgs ), uno::UNO_QUERY ); |