From 59b072e22b0610abc7ffdbc75873ef5cbba58de7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 4 Nov 2015 08:29:36 +0200 Subject: yyyyy Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548 --- extensions/source/abpilot/datasourcehandling.cxx | 2 +- extensions/source/abpilot/typeselectionpage.cxx | 6 +++--- extensions/source/bibliography/bibload.cxx | 2 +- extensions/source/dbpilots/controlwizard.cxx | 2 +- extensions/source/propctrlr/editpropertyhandler.cxx | 2 +- extensions/source/propctrlr/sqlcommanddesign.cxx | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'extensions') diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 9f7210091cae..da41d1036a63 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -146,7 +146,7 @@ namespace abp if (xNewDataSource.is()) { xNewDataSource->setPropertyValue( - OUString( "URL" ), + "URL", makeAny( OUString::createFromAscii( _pInitialAsciiURL ) ) ); } diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 15219b9976da..1a7c2642fdfe 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -77,7 +77,7 @@ namespace abp try { // check whether Evolution is available - Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:evolution:local")) ); + Reference< XDriver > xDriver( xManager->getDriverByURL("sdbc:address:evolution:local") ); if ( xDriver.is() ) bHaveEvolution = true; } @@ -88,7 +88,7 @@ namespace abp // check whether KDE address book is available try { - Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:kab")) ); + Reference< XDriver > xDriver( xManager->getDriverByURL("sdbc:address:kab") ); if ( xDriver.is() ) bHaveKab = true; } @@ -99,7 +99,7 @@ namespace abp try { // check whether Mac OS X address book is available - Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:macab")) ); + Reference< XDriver > xDriver( xManager->getDriverByURL("sdbc:address:macab") ); if ( xDriver.is() ) bHaveMacab = true; } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 78aa2a4e2dc0..8717542f1f69 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -322,7 +322,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt } if ( xLayoutManager.is() ) - xLayoutManager->createElement( OUString( "private:resource/menubar/menubar" )); + xLayoutManager->createElement( "private:resource/menubar/menubar" ); } BibDataManager* BibliographyLoader::GetDataManager()const diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 18a56c1a9760..f758757d2fe3 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -654,7 +654,7 @@ namespace dbp { OUString sControlLabel(_pSettings->sControlLabel); m_aContext.xObjectModel->setPropertyValue( - OUString("Label"), + "Label", makeAny(sControlLabel) ); } diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 1126cb44c3aa..65e9bbf0dbe1 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -282,7 +282,7 @@ namespace pcr _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TEXTTYPE_SINGLELINE ); _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TEXTTYPE_SINGLELINE ); - _rxInspectorUI->showCategory( OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); + _rxInspectorUI->showCategory( "Data", nTextType != TEXTTYPE_RICHTEXT ); } break; diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 4aff1ef70d6c..333fee9612d0 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -247,8 +247,8 @@ namespace pcr aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing(); Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL( - OUString( ".component:DB/QueryDesign" ), - OUString( "_self" ), + ".component:DB/QueryDesign", + "_self", FrameSearchFlag::TASKS | FrameSearchFlag::CREATE, aArgs ); @@ -295,7 +295,7 @@ namespace pcr Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW ); - xFrame = xDesktop->findFrame( OUString( "_blank" ), FrameSearchFlag::CREATE ); + xFrame = xDesktop->findFrame( "_blank", FrameSearchFlag::CREATE ); OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" ); xDesktopFramesCollection->remove( xFrame ); } @@ -332,7 +332,7 @@ namespace pcr Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) ); Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW ); - Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, OUString( "_top" ), FrameSearchFlag::SELF ) ); + Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, "_top", FrameSearchFlag::SELF ) ); OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" ); if ( xDispatch.is() ) { -- cgit