diff options
126 files changed, 406 insertions, 501 deletions
diff --git a/avmedia/source/opengl/ogluno.cxx b/avmedia/source/opengl/ogluno.cxx index b393f8ba552d..fc9f6095be34 100644 --- a/avmedia/source/opengl/ogluno.cxx +++ b/avmedia/source/opengl/ogluno.cxx @@ -31,7 +31,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaogl_component_getFactory( xFactory.set( ::cppu::createSingleFactory( static_cast< lang::XMultiServiceFactory* >( pServiceManager ), - OUString("com.sun.star.comp.avmedia.Manager_OpenGL" ), + "com.sun.star.comp.avmedia.Manager_OpenGL", create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) ); } diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 2aaf3b865db0..51b66d4712ce 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -414,7 +414,7 @@ bool ModulWindow::LoadBasic() xFP->setDisplayDirectory ( aCurPath ); xFP->appendFilter( "BASIC" , "*.bas" ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) ); + xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( "BASIC" ); if( xFP->execute() == RET_OK ) @@ -465,7 +465,7 @@ bool ModulWindow::SaveBasicSource() xFP->setDisplayDirectory ( aCurPath ); xFP->appendFilter( "BASIC", "*.bas" ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) ); + xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( "BASIC" ); if( xFP->execute() == RET_OK ) diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 83493ec5de54..782dc1ad8268 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -685,11 +685,11 @@ bool DialogWindow::SaveDialog() if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); - xFP->setDefaultName( OUString( GetName() ) ); + xFP->setDefaultName( GetName() ); OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); - xFP->appendFilter( aDialogStr, OUString( "*.xdl" ) ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) ); + xFP->appendFilter( aDialogStr, "*.xdl" ); + xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) @@ -933,8 +933,8 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script xFP->setDisplayDirectory ( aCurPath ); OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); - xFP->appendFilter( aDialogStr, OUString( "*.xdl" ) ); - xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) ); + xFP->appendFilter( aDialogStr, "*.xdl" ); + xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All ); xFP->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) @@ -1283,7 +1283,7 @@ void DialogWindow::StoreData() Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); - xLib->replaceByName( OUString( GetName() ), makeAny( xISP ) ); + xLib->replaceByName( GetName(), makeAny( xISP ) ); } } } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 3f645660f667..c6bb54841288 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -201,7 +201,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl() if( xContext.is() ) { xContext->getValueByName( - OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ) + "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) >>= xAccess; OSL_ENSURE( xAccess.is(), "### TypeDescriptionManager singleton not accessible!?" ); } @@ -1726,7 +1726,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass) if ( xInv.is() ) { OUString sTypeName; - xInv->getValue( OUString( "$GetTypeName" ) ) >>= sTypeName; + xInv->getValue( "$GetTypeName" ) >>= sTypeName; if ( sTypeName.isEmpty() || sTypeName == "IDispatch" ) { // can't check type, leave it pass diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx index 24e90d960ed1..eefff5d46645 100644 --- a/basic/source/runtime/comenumwrapper.cxx +++ b/basic/source/runtime/comenumwrapper.cxx @@ -31,7 +31,7 @@ sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements() if ( m_xInvocation.is() ) { sal_Int32 nLength = 0; - bResult = ( ( m_xInvocation->getValue( OUString("length" ) ) >>= nLength ) && nLength > m_nCurInd ); + bResult = ( ( m_xInvocation->getValue( "length" ) >>= nLength ) && nLength > m_nCurInd ); } } catch(const uno::Exception& ) @@ -55,7 +55,7 @@ uno::Any SAL_CALL ComEnumerationWrapper::nextElement() aArgs[0] <<= m_nCurInd++; - return m_xInvocation->invoke( OUString("item"), + return m_xInvocation->invoke( "item", aArgs, aNamedParamIndex, aNamedParam ); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 7958051d207e..e2b978bfa632 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -293,7 +293,7 @@ bool hasUno() { Reference< XUniversalContentBroker > xManager = UniversalContentBroker::create(xContext); - if ( !( xManager->queryContentProvider( OUString("file:///" ) ).is() ) ) + if ( !( xManager->queryContentProvider( "file:///" ).is() ) ) { // No UCB bRetVal = false; diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 6c396ae507db..0a44213f0625 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3884,7 +3884,7 @@ OUString getObjectTypeName( SbxVariable* pVar ) { try { - xInv->getValue( OUString( "$GetTypeName" ) ) >>= sRet; + xInv->getValue( "$GetTypeName" ) >>= sRet; } catch(const Exception& ) { diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 9766d74d1141..be8cd6a113e8 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -384,7 +384,7 @@ Reference< css::resource::XStringResourcePersistence > return xRet; } - xRet = resource::StringResourceWithStorage::create(mxContext, xLibraryStor, bReadOnly, aLocale, OUString(aResourceFileNameBase), aComment); + xRet = resource::StringResourceWithStorage::create(mxContext, xLibraryStor, bReadOnly, aLocale, aResourceFileNameBase, aComment); } else { @@ -392,7 +392,7 @@ Reference< css::resource::XStringResourcePersistence > // TODO: Real handler? Reference< task::XInteractionHandler > xDummyHandler; - xRet = resource::StringResourceWithLocation::create(mxContext, aLocation, bReadOnly, aLocale, OUString(aResourceFileNameBase), aComment, xDummyHandler); + xRet = resource::StringResourceWithLocation::create(mxContext, aLocation, bReadOnly, aLocale, aResourceFileNameBase, aComment, xDummyHandler); } return xRet; @@ -539,7 +539,7 @@ void SfxDialogLibrary::storeResourcesToURL( const OUString& URL, if( m_xStringResourcePersistence.is() ) { m_xStringResourcePersistence->storeToURL - ( URL, OUString(aResourceFileNameBase), aComment, xHandler ); + ( URL, aResourceFileNameBase, aComment, xHandler ); } } @@ -551,7 +551,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const css::uno::Reference< css:: if( m_xStringResourcePersistence.is() ) { m_xStringResourcePersistence->storeToStorage - ( xStorage, OUString(aResourceFileNameBase), aComment ); + ( xStorage, aResourceFileNameBase, aComment ); } } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 6996ab1e70d1..30f551b5dd66 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -3450,7 +3450,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript try { Reference< XExtensionManager > xManager = ExtensionManager::get( m_xContext ); - m_aUserPackagesSeq = xManager->getDeployedExtensions(OUString("user"), + m_aUserPackagesSeq = xManager->getDeployedExtensions("user", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); } @@ -3505,7 +3505,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri try { Reference< XExtensionManager > xSharedManager = ExtensionManager::get( m_xContext ); - m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions(OUString("shared"), + m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions("shared", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); } @@ -3559,7 +3559,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScr try { Reference< XExtensionManager > xManager = ExtensionManager::get( m_xContext ); - m_aBundledPackagesSeq = xManager->getDeployedExtensions(OUString("bundled"), + m_aBundledPackagesSeq = xManager->getDeployedExtensions("bundled", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); } diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 819d2556a58b..6aaba789085d 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -590,7 +590,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag() uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag(0); - xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; + xTextDocumentPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty bool bEmbeddings = false; const char* testEmbeddedFileNames[3] = {"word/embeddings/Microsoft_Excel_Worksheet3.xlsx", @@ -1115,7 +1115,7 @@ void Chart2ExportTest::testEmbeddingsOleObjectGrabBag() uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag(0); - xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; + xTextDocumentPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty bool bEmbeddings = false; const char* testEmbeddedFileNames[1] = {"word/embeddings/oleObject1.bin"}; diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 976cd4f91134..fc63b1111750 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -71,7 +71,7 @@ uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDa { ::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS); - xProp->getPropertyValue( OUString("DataRowSource") ) >>= aDataRowSource; + xProp->getPropertyValue( "DataRowSource" ) >>= aDataRowSource; bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource); } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 1fb9a57468e5..4f301e460fb7 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -195,8 +195,7 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere uno::Reference< chart2::data::XDataSequence > xSequence( aSequences[nI]->getValues()); uno::Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW ); OUString aRole; - if( ( xSeqProp->getPropertyValue( - OUString( "Role" )) >>= aRole ) && + if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) && aRole.match( aRolePrefix ) && aRole.indexOf(aDirection) >= 0 ) { return xSequence->getSourceRangeRepresentation(); diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index fa86241957ec..09e93dd3e515 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -80,12 +80,12 @@ const uno::Reference < embed::XStorage >& EmbedImpl::GetReplacements() try { mxImageStorage = mxStorage->openStorageElement( - OUString("ObjectReplacements"), embed::ElementModes::READWRITE ); + "ObjectReplacements", embed::ElementModes::READWRITE ); } catch (const uno::Exception&) { mxImageStorage = mxStorage->openStorageElement( - OUString("ObjectReplacements"), embed::ElementModes::READ ); + "ObjectReplacements", embed::ElementModes::READ ); } } @@ -1282,7 +1282,7 @@ namespace { try { uno::Reference< embed::XStorage > xPictures = xDocStor->openStorageElement( - OUString( "Pictures" ), + "Pictures", embed::ElementModes::READWRITE ); uno::Reference< io::XStream > xObjReplStr = xPictures->openStreamElement( aStreamName, diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index 6dc3e21d332e..c927c7e40efa 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -532,8 +532,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString& OUString aEntryDocName; if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is() - && ( xObjectProps->getByName( - OUString( "ObjectDocumentServiceName" ) ) >>= aEntryDocName ) + && ( xObjectProps->getByName( "ObjectDocumentServiceName" ) >>= aEntryDocName ) && aEntryDocName == aDocName ) { xObjectProps->getByName("ObjectFactory") >>= aResult; diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx index daffd7cb618b..c9c281198db2 100644 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ b/comphelper/source/misc/officeresourcebundle.cxx @@ -155,8 +155,7 @@ namespace comphelper Reference< XResourceBundleLoader > xLoader; try { - Any aValue( m_xContext->getValueByName( - OUString( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ) ); + Any aValue( m_xContext->getValueByName( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ); OSL_VERIFY( aValue >>= xLoader ); } catch( const Exception& ) diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 7ba751c0951b..01d3efbe7a0c 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -281,9 +281,7 @@ void OfficeInstallationDirectories::initDirs() uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(m_xCtx); - *m_pOfficeBrandDir = - xExpander->expandMacros( - OUString( "$BRAND_BASE_DIR" ) ); + *m_pOfficeBrandDir = xExpander->expandMacros( "$BRAND_BASE_DIR" ); OSL_ENSURE( !m_pOfficeBrandDir->isEmpty(), "Unable to obtain office brand installation directory!" ); @@ -292,7 +290,7 @@ void OfficeInstallationDirectories::initDirs() *m_pUserDir = xExpander->expandMacros( - OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ); + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ); OSL_ENSURE( !m_pUserDir->isEmpty(), "Unable to obtain office user data directory!" ); diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx index f9b3f5a55ce6..79d7c61c7156 100644 --- a/compilerplugins/clang/stringconstant.cxx +++ b/compilerplugins/clang/stringconstant.cxx @@ -11,6 +11,7 @@ #include <limits> #include <stack> #include <string> +#include <iostream> #include "compat.hxx" #include "plugin.hxx" @@ -104,6 +105,8 @@ private: void handleOUStringCtor( CallExpr const * expr, unsigned arg, std::string const & qname); + void handleOUStringCtor2( + CallExpr const * expr, unsigned arg, std::string const & qname); std::stack<Expr const *> calls_; }; @@ -546,6 +549,12 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) { TreatEmpty::Error); return true; } + // For places where we are calling a method with a 'const OUString&' param + for (unsigned i=0; i < fdecl->getNumParams(); ++i) + { + if (fdecl->getParamDecl(i)->getType().getAsString() == "const ::rtl::OUString &") + handleOUStringCtor2(expr, i, qname); + } return true; } @@ -1283,6 +1292,40 @@ void StringConstant::handleOUStringCtor( << qname << expr->getSourceRange(); } +// For places where we are calling a method with an 'const OUString&' param +// +void StringConstant::handleOUStringCtor2( + CallExpr const * expr, unsigned arg, std::string const & qname) +{ + auto e0 = expr->getArg(arg)->IgnoreParenImpCasts(); + auto e1 = dyn_cast<CXXFunctionalCastExpr>(e0); + if (e1 == nullptr) { + return; + } + e0 = e1->getSubExpr()->IgnoreParenImpCasts(); + auto e2 = dyn_cast<CXXBindTemporaryExpr>(e0); + if (e2 == nullptr) { + return; + } + auto e3 = dyn_cast<CXXConstructExpr>( + e2->getSubExpr()->IgnoreParenImpCasts()); + if (e3 == nullptr) { + return; + } + if (e3->getNumArgs() == 1) + { + std::string s = e3->getArg(0)->getType().getAsString(); + if (s == "sal_Unicode" || s == "char") + return; + } + report( + DiagnosticsEngine::Warning, + ("in call of %0, replace OUString constructed from a string literal" + " directly with the string literal"), + e3->getExprLoc()) + << qname << expr->getSourceRange(); +} + loplugin::Plugin::Registration< StringConstant > X("stringconstant", true); } diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index b2a5a21406a4..4195b7b3e892 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -156,8 +156,7 @@ void RecursiveTest::test() OUString("/org.openoffice.Office.UI.GenericCommands/UserInterface/Commands/" ".uno:WebHtml")), css::uno::UNO_QUERY_THROW); - properties_->addPropertyChangeListener( - OUString("Label"), this); + properties_->addPropertyChangeListener("Label", this); step(); CPPUNIT_ASSERT(count_ == 0); css::uno::Reference< css::lang::XComponent >( @@ -276,12 +275,9 @@ void Test::testSetSetMemberName() "Commands")), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNamed > member; - access->getByName( - OUString(".uno:FontworkGalleryFloater")) >>= - member; + access->getByName(".uno:FontworkGalleryFloater") >>= member; CPPUNIT_ASSERT(member.is()); - member->setName( - OUString(".uno:FontworkShapeType")); + member->setName(".uno:FontworkShapeType"); css::uno::Reference< css::util::XChangesBatch >( access, css::uno::UNO_QUERY_THROW)->commitChanges(); css::uno::Reference< css::lang::XComponent >( @@ -347,12 +343,9 @@ void Test::testReadCommands() css::uno::Reference< css::container::XNameAccess > child; if (access->getByName(names[j]) >>= child) { CPPUNIT_ASSERT(child.is()); - child->getByName( - OUString("Label")); - child->getByName( - OUString("ContextLabel")); - child->getByName( - OUString("Properties")); + child->getByName("Label"); + child->getByName("ContextLabel"); + child->getByName("Properties"); } } } diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 0a1e1252582f..d970f0333e9d 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -755,7 +755,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() OUString aLocation; Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey( - OUString("/UNO/ACTIVATOR") ); + "/UNO/ACTIVATOR" ); if( xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII ) { aActivatorUrl = xActivatorKey->getAsciiValue(); @@ -765,7 +765,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() aActivatorName = tmpActivator.getToken(0, ':', nIndex ); Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey( - OUString("/UNO/LOCATION") ); + "/UNO/LOCATION" ); if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII ) aLocation = xLocationKey->getAsciiValue(); } @@ -774,7 +774,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() // old style"url" // the location of the program code of the implementation Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey( - OUString("/UNO/URL") ); + "/UNO/URL" ); // is the key of the right type ? if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII ) { @@ -819,8 +819,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames() // not yet loaded try { - Reference<XRegistryKey > xKey = xImplementationKey->openKey( - OUString("UNO/SERVICES") ); + Reference<XRegistryKey > xKey = xImplementationKey->openKey( "UNO/SERVICES" ); if (xKey.is()) { diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 3c8340bc5cf1..623770ef5077 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3478,8 +3478,7 @@ void ToolbarSaveInData::SetSystemStyle( uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY ); if ( xPropSet.is() ) { - uno::Any a = xPropSet->getPropertyValue( - OUString( "LayoutManager" ) ); + uno::Any a = xPropSet->getPropertyValue( "LayoutManager" ); a >>= xLayoutManager; } @@ -3990,7 +3989,7 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar ) if ( pToolbar->IsUserDefined() ) { xProps->setPropertyValue( - OUString(ITEM_DESCRIPTOR_UINAME ), + ITEM_DESCRIPTOR_UINAME, uno::makeAny( OUString( pToolbar->GetName() ) ) ); } @@ -4038,7 +4037,7 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar ) xPropertySet( xSettings, uno::UNO_QUERY ); xPropertySet->setPropertyValue( - OUString(ITEM_DESCRIPTOR_UINAME ), + ITEM_DESCRIPTOR_UINAME, uno::makeAny( pToolbar->GetName() ) ); try @@ -5046,8 +5045,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( uno::Reference< beans::XPropertySet > props = m_xGraphProvider->queryGraphicDescriptor( aMediaProps ); - uno::Any a = props->getPropertyValue( - OUString("SizePixel") ); + uno::Any a = props->getPropertyValue( "SizePixel" ); a >>= aSize; if (0 == aSize.Width || 0 == aSize.Height) return false; @@ -5223,8 +5221,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) uno::Reference< beans::XPropertySet > props = m_xGraphProvider->queryGraphicDescriptor( aMediaProps ); - uno::Any a = props->getPropertyValue( - OUString("SizePixel") ); + uno::Any a = props->getPropertyValue("SizePixel"); xGraphic = m_xGraphProvider->queryGraphic( aMediaProps ); if ( xGraphic.is() ) diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 173a9ecfed08..115dcab17793 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -759,14 +759,12 @@ void SvxConfigGroupListBox::GroupSelected() continue; } - Any value = xPropSet->getPropertyValue( - OUString("URI")); + Any value = xPropSet->getPropertyValue("URI"); value >>= uri; try { - value = xPropSet->getPropertyValue( - OUString("Description")); + value = xPropSet->getPropertyValue("Description"); value >>= description; } catch (Exception &) { diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 247cea9321e9..06a8ba26836b 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -350,7 +350,7 @@ bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) uno::Sequence< beans::PropertyValue > aArg(1); aArg.getArray()[0].Name = "Hidden"; aArg.getArray()[0].Value <<= true; - xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg ); + xComp = xLoader->loadComponentFromURL( aURL, "_blank", 0, aArg ); } catch( const io::IOException& ) { diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 6c8a7b579fd3..bade98ceff5c 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -117,7 +117,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) { xFilePicker->appendFilter( OUString(), - OUString( "*.*" ) + "*.*" ); } catch( const IllegalArgumentException& ) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 52c58ba52369..e4811b902b3e 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -600,8 +600,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const if( !xNameReplace.is() ) return; - xNameReplace->replaceByName( OUString("ForceSafeServiceImpl"), - makeAny(!_bEnabled) ); + xNameReplace->replaceByName( "ForceSafeServiceImpl", makeAny(!_bEnabled) ); Reference< XChangesBatch > xChangesBatch( mxForceFlagNameAccess, UNO_QUERY ); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 036caaa378cc..3f422737b952 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -660,13 +660,13 @@ bool Desktop::QueryExit() Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() ); Reference< XPropertySet > xPropertySet(xDesktop, UNO_QUERY_THROW); - xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(true) ); + xPropertySet->setPropertyValue( SUSPEND_QUICKSTARTVETO, Any(true) ); bool bExit = xDesktop->terminate(); if ( !bExit ) { - xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(false) ); + xPropertySet->setPropertyValue( SUSPEND_QUICKSTARTVETO, Any(false) ); } else if (!Application::IsEventTestingModeEnabled()) { @@ -1941,8 +1941,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/swriter"), - OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/swriter", + "_blank", 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const css::uno::Exception& ) @@ -1953,8 +1953,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/scalc"), - OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/scalc", + "_blank", 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const css::uno::Exception& ) @@ -1965,8 +1965,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/sdraw"), - OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/sdraw", + "_blank", 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const css::uno::Exception& ) @@ -1977,8 +1977,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/simpress"), - OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/simpress", + "_blank", 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const css::uno::Exception& ) @@ -2099,9 +2099,7 @@ void Desktop::PreloadConfigurationData() css::frame::thePopupMenuControllerFactory::get( xContext ); try { - (void)xPopupMenuControllerFactory->hasController( - OUString( ".uno:CharFontName" ), - OUString() ); + (void)xPopupMenuControllerFactory->hasController( ".uno:CharFontName", OUString() ); } catch ( const css::uno::Exception& ) { @@ -2207,7 +2205,7 @@ void Desktop::OpenClients() OUString aDefault( "0" ); OUString aPreloadData; - aPerfTuneIniFile.getFrom( OUString( "QuickstartPreloadConfiguration" ), aPreloadData, aDefault ); + aPerfTuneIniFile.getFrom( "QuickstartPreloadConfiguration", aPreloadData, aDefault ); if ( aPreloadData == "1" ) { if ( rArgs.IsWriter() || @@ -2526,7 +2524,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) { // no visible task that could be activated found Reference< css::awt::XWindow > xContainerWindow; - Reference< XFrame > xBackingFrame = xDesktop->findFrame(OUString( "_blank" ), 0); + Reference< XFrame > xBackingFrame = xDesktop->findFrame( "_blank", 0); if (xBackingFrame.is()) xContainerWindow = xBackingFrame->getContainerWindow(); if (xContainerWindow.is()) @@ -2696,7 +2694,7 @@ void Desktop::OpenSplashScreen() UNO_QUERY); if(m_rSplashScreen.is()) - m_rSplashScreen->start(OUString("SplashScreen"), 100); + m_rSplashScreen->start("SplashScreen", 100); } } @@ -2732,7 +2730,7 @@ void Desktop::DoFirstRunInitializations() try { Reference< XJobExecutor > xExecutor = theJobExecutor::get( ::comphelper::getProcessComponentContext() ); - xExecutor->trigger( OUString("onFirstRunInitialization") ); + xExecutor->trigger( "onFirstRunInitialization" ); } catch(const css::uno::Exception&) { @@ -2752,7 +2750,7 @@ void Desktop::ShowBackingComponent(Desktop * progress) { progress->SetSplashScreenProgress(60); } - Reference< XFrame > xBackingFrame = xDesktop->findFrame(OUString( "_blank" ), 0); + Reference< XFrame > xBackingFrame = xDesktop->findFrame( "_blank", 0); Reference< css::awt::XWindow > xContainerWindow; if (xBackingFrame.is()) diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 45d30f51cf16..103355af0de0 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -512,7 +512,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() OUString aDefault( "0" ); OUString aPreloadData; - aPerfTuneIniFile.getFrom( OUString( "FastPipeCommunication" ), aPreloadData, aDefault ); + aPerfTuneIniFile.getFrom( "FastPipeCommunication", aPreloadData, aDefault ); OUString aUserInstallPathHashCode; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index cd34cd4d108c..85fbabb65e5c 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -35,7 +35,7 @@ #include "dp_update.hxx" #define USER_PACKAGE_MANAGER OUString("user") -#define SHARED_PACKAGE_MANAGER OUString("shared") +#define SHARED_PACKAGE_MANAGER "shared" using namespace ::com::sun::star; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b81a6f871c57..bcc215be170c 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -436,7 +436,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, uno::Reference<lang::XComponent> xComponent; xComponent = xComponentLoader->loadComponentFromURL( - aURL, OUString("_blank"), 0, + aURL, "_blank", 0, aFilterOptions); if (!xComponent.is()) @@ -1464,7 +1464,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback, pLib); if (pUserProfilePath) - rtl::Bootstrap::set(OUString("UserInstallation"), OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8)); + rtl::Bootstrap::set("UserInstallation", OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8)); OUString aAppPath; if (pAppPath) diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 2320851d3410..5d43c9b1ceab 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -249,10 +249,8 @@ Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName ) UNO_QUERY ); if ( rNamingService.is() ) { - rNamingService->registerObject( - OUString("StarOffice.ServiceManager" ), m_rContext->getServiceManager() ); - rNamingService->registerObject( - OUString("StarOffice.ComponentContext" ), m_rContext ); + rNamingService->registerObject( "StarOffice.ServiceManager", m_rContext->getServiceManager() ); + rNamingService->registerObject( "StarOffice.ComponentContext", m_rContext ); rInstance = rNamingService; } } diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index eac18d4ca8f2..5b51a534a72a 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -441,9 +441,7 @@ Reference<XComponentContext> getUNO( { // do not create any user data (for the root user) in --shared mode: if (shared) { - rtl::Bootstrap::set( - OUString("CFG_CacheUrl"), - OUString()); + rtl::Bootstrap::set("CFG_CacheUrl", OUString()); } // hold lock during process runtime: 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 ); diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index f39b1281b118..5d1ee226054f 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -899,7 +899,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL evtatt_component_getFactory( { Reference< XSingleServiceFactory > xFactory( createOneInstanceFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( IMPLNAME ), + IMPLNAME, ::comp_EventAttacher::EventAttacherImpl_CreateInstance, ::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static() ) ); 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() ) { diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index a453cacf00e2..8388e52c2b78 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1096,7 +1096,7 @@ basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape if(mXPropSet.is()) { - const Any aAny = mXPropSet->getPropertyValue(OUString("Transformation")); + const Any aAny = mXPropSet->getPropertyValue("Transformation"); if(aAny.hasValue()) { diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index f9ba4cb05eb8..0e82712b275b 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -900,7 +900,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& sal_Int32 nTotalPageCount = aRangeEnum.size(); if ( bSecondPassForImpressNotes ) nTotalPageCount *= 2; - mxStatusIndicator->start( OUString( ResId( PDF_PROGRESS_BAR, *pResMgr ) ), nTotalPageCount ); + mxStatusIndicator->start( ResId( PDF_PROGRESS_BAR, *pResMgr ), nTotalPageCount ); } } diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 0ac63a4f869d..de4d56244133 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -301,7 +301,7 @@ bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOut if(xStatusIndicator.is()) { - xStatusIndicator->start(OUString( "PlaceWare:" ),xDrawPages->getCount()); + xStatusIndicator->start( "PlaceWare:", xDrawPages->getCount()); } Reference< XDrawPage > xDrawPage; diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index c689a2c1a633..79ce86731a37 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -522,7 +522,7 @@ void T602ImportFilter::inschrdef(unsigned char ch) pst.waspar = false; if (mxHandler.is()) - mxHandler->characters(OUString(xch)); + mxHandler->characters(xch); } void T602ImportFilter::wrtfnt() diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index f0eb7e4d1109..4290eaa5204a 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -77,7 +77,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >())); if (xStatusIndicator.is()){ - xStatusIndicator->start(OUString( "Loading :" ),nProgressRange); + xStatusIndicator->start( "Loading :",nProgressRange); } OUString sXMLImportService ( udImport ); @@ -102,8 +102,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property Reference< XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) ); - xInfoSet->setPropertyValue( - OUString( "BaseURI" ), makeAny( aBaseURI )); + xInfoSet->setPropertyValue( "BaseURI", makeAny( aBaseURI )); aAnys[0] <<= xInfoSet; @@ -199,7 +198,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >())); if (xStatusIndicator.is()) - xStatusIndicator->start(OUString( "Saving :" ),nProgressRange); + xStatusIndicator->start( "Saving :",nProgressRange); // Set up converter bridge. Reference< css::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY); @@ -258,13 +257,11 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property Reference< XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) ); - xInfoSet->setPropertyValue( - OUString( "UsePrettyPrinting" ), makeAny( bPrettyPrint )); + xInfoSet->setPropertyValue("UsePrettyPrinting", makeAny( bPrettyPrint )); xInfoSet->setPropertyValue( - OUString( "ExportTextNumberElement" ), + "ExportTextNumberElement", makeAny( bExportTextNumberElementForListItems )); - xInfoSet->setPropertyValue( - OUString( "BaseURI" ), makeAny( aBaseURI )); + xInfoSet->setPropertyValue("BaseURI", makeAny( aBaseURI )); aAnys[1] <<= xInfoSet; Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 403debb29597..dc478cef6336 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -255,7 +255,7 @@ namespace XSLT css::uno::Reference<XStringSubstitution> subs(css::util::PathSubstitution::create(m_xContext)); - OUString aWorkingDir(subs->getSubstituteVariableValue(OUString( "$(progurl)"))); + OUString aWorkingDir(subs->getSubstituteVariableValue( "$(progurl)" )); INetURLObject aObj(aWorkingDir); aObj.setFinalSlash(); bool bWasAbsolute; diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 5d1aeccb4c79..21a9f7f9c6b2 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -401,8 +401,7 @@ namespace frm { // forward to our aggregate, so the EditEngine knows about it if ( m_xAggregateSet.is() ) - m_xAggregateSet->setPropertyValue( - OUString( "WritingMode" ), _rValue ); + m_xAggregateSet->setPropertyValue( "WritingMode", _rValue ); } break; diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index b918a531e4dd..f4ac1b174ff2 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -12,7 +12,7 @@ * contributor license agreements. See the NOTICE file distributed * with this work for additional information regarding copyright * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file + * License, Version 2.0 (the "License"; you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx index 647881113d0e..f5b0d98b9281 100644 --- a/hwpfilter/source/formula.cxx +++ b/hwpfilter/source/formula.cxx @@ -36,7 +36,7 @@ extern std::list<Node*> nodelist; #define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(false) #define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(false) #define rchars(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(x); } while(false) -#define runistr(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x)); } while(false) +#define runistr(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(x); } while(false) #define reucstr(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x,y, RTL_TEXTENCODING_EUC_KR)); } while(false) #define padd(x,y,z) pList->addAttribute(x,y,z) #else diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 13bd651cff00..ae0e90033d1d 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -40,7 +40,7 @@ #endif // To be shorten source code by realking -#define hconv(x) OUString(hstr2ucsstr(x).c_str()) +#define hconv(x) hstr2ucsstr(x).c_str() #define ascii(x) OUString::createFromAscii(x) #define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(false) #define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(false) @@ -2700,7 +2700,7 @@ char *HwpReader::getPStyleName(int index, char *_buf) void HwpReader::makeChars(hchar_string & rStr) { - rchars(OUString(rStr.c_str())); + rchars(rStr.c_str()); rStr.clear(); } @@ -3132,31 +3132,31 @@ void HwpReader::makeFieldCode(hchar_string & rStr, FieldCode *hbox) padd("text:description", sXML_CDATA, hconv(field)); rstartEl( "text:placeholder", rList); pList->clear(); - rchars( OUString(rStr.c_str())); + rchars( rStr.c_str() ); rendEl( "text:placeholder" ); } /* Document Summary */ else if( hbox->type[0] == 3 && hbox->type[1] == 0 ) { - if (hconv(hbox->str3) == "title") + if (OUString(hconv(hbox->str3)) == "title") { rstartEl( "text:title", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:title" ); } - else if (hconv(hbox->str3) == "subject") + else if (OUString(hconv(hbox->str3)) == "subject") { rstartEl( "text:subject", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:subject" ); } - else if (hconv(hbox->str3) == "author") + else if (OUString(hconv(hbox->str3)) == "author") { rstartEl( "text:author-name", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:author-name" ); } - else if (hconv(hbox->str3) == "keywords") + else if (OUString(hconv(hbox->str3)) == "keywords") { rstartEl( "text:keywords", rList ); rchars( hconv(hbox->str2) ); @@ -3166,61 +3166,61 @@ void HwpReader::makeFieldCode(hchar_string & rStr, FieldCode *hbox) /* Personal Information */ else if( hbox->type[0] == 3 && hbox->type[1] == 1 ) { - if (hconv(hbox->str3) == "User") + if (OUString(hconv(hbox->str3)) == "User") { rstartEl( "text:sender-lastname", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-lastname" ); } - else if (hconv(hbox->str3) == "Company") + else if (OUString(hconv(hbox->str3)) == "Company") { rstartEl( "text:sender-company", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-company" ); } - else if (hconv(hbox->str3) == "Position") + else if (OUString(hconv(hbox->str3)) == "Position") { rstartEl( "text:sender-title", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-title" ); } - else if (hconv(hbox->str3) == "Division") + else if (OUString(hconv(hbox->str3)) == "Division") { rstartEl( "text:sender-position", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-position" ); } - else if (hconv(hbox->str3) == "Fax") + else if (OUString(hconv(hbox->str3)) == "Fax") { rstartEl( "text:sender-fax", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-fax" ); } - else if (hconv(hbox->str3) == "Pager") + else if (OUString(hconv(hbox->str3)) == "Pager") { rstartEl( "text:phone-private", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:phone-private" ); } - else if (hconv(hbox->str3) == "E-mail") + else if (OUString(hconv(hbox->str3)) == "E-mail") { rstartEl( "text:sender-email", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-email" ); } - else if (hconv(hbox->str3) == "Zipcode(office)") + else if (OUString(hconv(hbox->str3)) == "Zipcode(office)") { rstartEl( "text:sender-postal-code", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-postal-code" ); } - else if (hconv(hbox->str3) == "Phone(office)") + else if (OUString(hconv(hbox->str3)) == "Phone(office)") { rstartEl( "text:sender-phone-work", rList ); rchars( hconv(hbox->str2) ); rendEl( "text:sender-phone-work" ); } - else if (hconv(hbox->str3) == "Address(office)") + else if (OUString(hconv(hbox->str3)) == "Address(office)") { rstartEl( "text:sender-street", rList ); rchars( hconv(hbox->str2) ); @@ -4767,7 +4767,7 @@ void HwpReader::makeMailMerge(MailMerge * hbox) void HwpReader::makeOutline(Outline * hbox) { if( hbox->kind == 1 ) - rchars(OUString(hbox->GetUnicode().c_str())); + rchars( hbox->GetUnicode().c_str() ); } diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 0a7e414ed49e..8292fab24fbf 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -263,9 +263,7 @@ OString BootParams::getClasspath() { OString sClassPath; OUString sCP; - if (Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_CLASSPATH), - sCP)) + if (Bootstrap::get()->getFrom( UNO_JAVA_JFW_CLASSPATH, sCP )) { sClassPath = OUStringToOString(sCP, osl_getThreadTextEncoding()); SAL_INFO( @@ -275,9 +273,7 @@ OString BootParams::getClasspath() } OUString sEnvCP; - if (Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_ENV_CLASSPATH), - sEnvCP)) + if (Bootstrap::get()->getFrom( UNO_JAVA_JFW_ENV_CLASSPATH, sEnvCP )) { char * pCp = getenv("CLASSPATH"); if (pCp) @@ -336,10 +332,8 @@ OUString BootParams::getJREHome() { OUString sJRE; OUString sEnvJRE; - bool bJRE = Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_JREHOME) ,sJRE); - bool bEnvJRE = Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_ENV_JREHOME) ,sEnvJRE); + bool bJRE = Bootstrap::get()->getFrom(UNO_JAVA_JFW_JREHOME, sJRE); + bool bEnvJRE = Bootstrap::get()->getFrom(UNO_JAVA_JFW_ENV_JREHOME, sEnvJRE); if (bJRE && bEnvJRE) { @@ -394,9 +388,7 @@ OUString BootParams::getJREHome() OUString BootParams::getClasspathUrls() { OUString sParams; - Bootstrap::get()->getFrom( - OUString(UNO_JAVA_JFW_CLASSPATH_URLS), - sParams); + Bootstrap::get()->getFrom( UNO_JAVA_JFW_CLASSPATH_URLS, sParams); SAL_INFO( "jfw.level2", "Using bootstrap parameter " UNO_JAVA_JFW_CLASSPATH_URLS " = " diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx index d176c3ba4142..c2e14259ea7e 100644 --- a/libreofficekit/qa/unit/tiledrendering.cxx +++ b/libreofficekit/qa/unit/tiledrendering.cxx @@ -83,7 +83,7 @@ void TiledRenderingTest::runAllTests() OUString aWorkdirRootPath = OUString::createFromAscii(pWorkdirRoot); OUString aWorkdirRootURL = getFileURLFromSystemPath(aWorkdirRootPath); OUString sUserInstallURL = aWorkdirRootURL + "/unittest"; - rtl::Bootstrap::set(OUString("UserInstallation"), sUserInstallURL); + rtl::Bootstrap::set("UserInstallation", sUserInstallURL); std::unique_ptr< Office > pOffice( lok_cpp_init( m_sLOPath.c_str() ) ); diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 9c22264a4404..13f195d8ad82 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -154,7 +154,7 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs ) { // use '/' to representent the root of the zip package ( and provide a 'file' scheme to // keep the XUriReference implementation happy ) - Reference< XUriReference > xBase = xFactory->parse( OUString("file:///") ); + Reference< XUriReference > xBase = xFactory->parse( "file:///" ); Reference< XUriReference > xPart = xFactory->parse( rAttribs.getString( XML_Target, OUString() ) ); Reference< XUriReference > xAbs = xFactory->makeAbsolute( xBase, xPart, sal_True, RelativeUriExcessParentSegments_RETAIN ); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index d530701564dd..93b78a83df60 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1124,8 +1124,8 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase& rFilterBase ) } else xSet->setPropertyValue( aGrabBagPropName, Any( maDiagramDoms ) ); - xSet->setPropertyValue( OUString( "MoveProtect" ), Any( sal_True ) ); - xSet->setPropertyValue( OUString( "SizeProtect" ), Any( sal_True ) ); + xSet->setPropertyValue( "MoveProtect", Any( sal_True ) ); + xSet->setPropertyValue( "SizeProtect", Any( sal_True ) ); // Replace existing shapes with a new Graphic Object rendered // from them @@ -1203,10 +1203,10 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) Reference < lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW ); xShape = Reference < XShape > ( xServiceFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), UNO_QUERY_THROW ); Reference < XPropertySet > xPropSet( xShape, UNO_QUERY_THROW ); - xPropSet->setPropertyValue( OUString( "Graphic" ), Any( xGraphic ) ); - xPropSet->setPropertyValue( OUString( "MoveProtect" ), Any( sal_True ) ); - xPropSet->setPropertyValue( OUString( "SizeProtect" ), Any( sal_True ) ); - xPropSet->setPropertyValue( OUString( "Name" ), Any( OUString( "RenderedShapes" ) ) ); + xPropSet->setPropertyValue( "Graphic", Any( xGraphic ) ); + xPropSet->setPropertyValue( "MoveProtect", Any( sal_True ) ); + xPropSet->setPropertyValue( "SizeProtect", Any( sal_True ) ); + xPropSet->setPropertyValue( "Name", Any( OUString( "RenderedShapes" ) ) ); } catch( const Exception& e ) { diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 67835981bd39..0c297a2a824c 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1510,7 +1510,7 @@ void Output::newLine() void Output::emptyLine( size_t nCount ) { for( size_t nIdx = 0; nIdx < nCount; ++nIdx ) - mxStrm->writeString( OUString( '\n' ) ); + mxStrm->writeString( OUString('\n') ); } void Output::incIndent() diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index ecf16b797d70..f823c2723698 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -144,8 +144,7 @@ public: OUString aRole; return ( xProp.is() && - (xProp->getPropertyValue( - OUString( "Role" ) ) >>= aRole ) && + (xProp->getPropertyValue( "Role" ) >>= aRole ) && m_aRole.equals( aRole )); } @@ -707,8 +706,7 @@ void ChartExport::_ExportContent() Reference< lang::XServiceInfo > xServ( xChartDoc, uno::UNO_QUERY ); if( xServ.is()) { - if( xServ->supportsService( - OUString("com.sun.star.chart.ChartTableAddressSupplier"))) + if( xServ->supportsService("com.sun.star.chart.ChartTableAddressSupplier")) { Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY ); if( xProp.is()) @@ -717,8 +715,7 @@ void ChartExport::_ExportContent() try { OUString sChartAddress; - aAny = xProp->getPropertyValue( - OUString("ChartRangeAddress")); + aAny = xProp->getPropertyValue("ChartRangeAddress"); aAny >>= msChartAddress; //maExportHelper.SetChartRangeAddress( sChartAddress ); @@ -795,8 +792,7 @@ void ChartExport::exportExternalData( Reference< css::chart::XChartDocument > xC { try { - Any aAny( xDocPropSet->getPropertyValue( - OUString( "ExternalData" ))); + Any aAny( xDocPropSet->getPropertyValue( "ExternalData" )); aAny >>= externalDataPath; } catch( beans::UnknownPropertyException & ) @@ -849,14 +845,11 @@ void ChartExport::exportChart( Reference< css::chart::XChartDocument > xChartDoc try { bool bHasSubTitle = false; - Any aAny( xDocPropSet->getPropertyValue( - OUString( "HasMainTitle" ))); + Any aAny( xDocPropSet->getPropertyValue("HasMainTitle")); aAny >>= bHasMainTitle; - aAny = xDocPropSet->getPropertyValue( - OUString( "HasSubTitle" )); + aAny = xDocPropSet->getPropertyValue("HasSubTitle"); aAny >>= bHasSubTitle; - aAny = xDocPropSet->getPropertyValue( - OUString( "HasLegend" )); + aAny = xDocPropSet->getPropertyValue("HasLegend"); aAny >>= bHasLegend; } catch( beans::UnknownPropertyException & ) @@ -976,8 +969,7 @@ void ChartExport::exportLegend( Reference< css::chart::XChartDocument > xChartDo css::chart::ChartLegendPosition aLegendPos = css::chart::ChartLegendPosition_NONE; try { - Any aAny( xProp->getPropertyValue( - OUString( "Alignment" ))); + Any aAny( xProp->getPropertyValue( "Alignment" )); aAny >>= aLegendPos; } catch( beans::UnknownPropertyException & ) @@ -2424,16 +2416,13 @@ void ChartExport::InitPlotArea( ) Reference<lang::XServiceInfo> xServiceInfo (mxDiagram, uno::UNO_QUERY); if (xServiceInfo.is()) { - if (xServiceInfo->supportsService( - OUString("com.sun.star.chart.ChartAxisZSupplier"))) + if (xServiceInfo->supportsService("com.sun.star.chart.ChartAxisZSupplier")) { - xDiagramProperties->getPropertyValue( - OUString("HasZAxis")) >>= mbHasZAxis; + xDiagramProperties->getPropertyValue("HasZAxis") >>= mbHasZAxis; } } - xDiagramProperties->getPropertyValue( - OUString ("Dim3D")) >>= mbIs3DChart; + xDiagramProperties->getPropertyValue("Dim3D") >>= mbIs3DChart; Reference< chart2::XChartDocument > xNewDoc( getModel(), uno::UNO_QUERY ); if( mbHasCategoryLabels && mxNewDiagram.is()) @@ -2487,30 +2476,19 @@ void ChartExport::exportAxis(const AxisIdPair& rAxisIdPair) Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY); - xDiagramProperties->getPropertyValue( - OUString ("HasXAxisTitle")) >>= bHasXAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasYAxisTitle")) >>= bHasYAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasZAxisTitle")) >>= bHasZAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasSecondaryXAxisTitle")) >>= bHasSecondaryXAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasSecondaryYAxisTitle")) >>= bHasSecondaryYAxisTitle; - - xDiagramProperties->getPropertyValue( - OUString ("HasXAxisGrid")) >>= bHasXAxisMajorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasYAxisGrid")) >>= bHasYAxisMajorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasZAxisGrid")) >>= bHasZAxisMajorGrid; - - xDiagramProperties->getPropertyValue( - OUString ("HasXAxisHelpGrid")) >>= bHasXAxisMinorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasYAxisHelpGrid")) >>= bHasYAxisMinorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasZAxisHelpGrid")) >>= bHasZAxisMinorGrid; + xDiagramProperties->getPropertyValue("HasXAxisTitle") >>= bHasXAxisTitle; + xDiagramProperties->getPropertyValue("HasYAxisTitle") >>= bHasYAxisTitle; + xDiagramProperties->getPropertyValue("HasZAxisTitle") >>= bHasZAxisTitle; + xDiagramProperties->getPropertyValue("HasSecondaryXAxisTitle") >>= bHasSecondaryXAxisTitle; + xDiagramProperties->getPropertyValue("HasSecondaryYAxisTitle") >>= bHasSecondaryYAxisTitle; + + xDiagramProperties->getPropertyValue("HasXAxisGrid") >>= bHasXAxisMajorGrid; + xDiagramProperties->getPropertyValue("HasYAxisGrid") >>= bHasYAxisMajorGrid; + xDiagramProperties->getPropertyValue("HasZAxisGrid") >>= bHasZAxisMajorGrid; + + xDiagramProperties->getPropertyValue("HasXAxisHelpGrid") >>= bHasXAxisMinorGrid; + xDiagramProperties->getPropertyValue("HasYAxisHelpGrid") >>= bHasYAxisMinorGrid; + xDiagramProperties->getPropertyValue("HasZAxisHelpGrid") >>= bHasZAxisMinorGrid; Reference< XPropertySet > xAxisProp; Reference< drawing::XShape > xAxisTitle; @@ -2691,8 +2669,7 @@ void ChartExport::_exportAxis( bool bVisible = true; if( xAxisProp.is() ) { - xAxisProp->getPropertyValue( - OUString ("Visible")) >>= bVisible; + xAxisProp->getPropertyValue("Visible") >>= bVisible; } // only export each axis only once non-deleted @@ -3160,11 +3137,9 @@ void ChartExport::exportDataPoints( Sequence< sal_Int32 > aDataPointSeq; if( xSeriesProperties.is()) { - Any aAny = xSeriesProperties->getPropertyValue( - OUString( "AttributedDataPoints" )); + Any aAny = xSeriesProperties->getPropertyValue( "AttributedDataPoints" ); aAny >>= aDataPointSeq; - xSeriesProperties->getPropertyValue( - OUString( "VaryColorsByPoint" )) >>= bVaryColorsByPoint; + xSeriesProperties->getPropertyValue( "VaryColorsByPoint" ) >>= bVaryColorsByPoint; } const sal_Int32 * pPoints = aDataPointSeq.getConstArray(); @@ -3597,8 +3572,7 @@ Reference< chart2::data::XDataSequence> getLabeledSequence( uno::Reference< chart2::data::XDataSequence > xSequence( aSequences[nI]->getValues()); uno::Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW ); OUString aRole; - if( ( xSeqProp->getPropertyValue( - OUString( "Role" )) >>= aRole ) && + if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) && aRole.match( aRolePrefix ) && aRole.indexOf(aDirection) >= 0 ) { return xSequence; diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 822465dd731b..f56cf044f324 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -188,8 +188,8 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c rtl::Bootstrap bootstrap(path); // look for pythonhome - bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONHOME"), pythonHome ); - bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONPATH" ) , pythonPath ); + bootstrap.getFrom( "PYUNO_LOADER_PYTHONHOME", pythonHome ); + bootstrap.getFrom( "PYUNO_LOADER_PYTHONPATH", pythonPath ); // pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console // sadly, there is no api for setting the pythonpath, we have to use the environment variable diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 0b67219316bc..9fde244ed123 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2420,17 +2420,17 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY); uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get()); - xStyles->insertByName(OUString("PageStyles"),uno::makeAny(xPageStyles)); + xStyles->insertByName("PageStyles",uno::makeAny(xPageStyles)); uno::Reference< style::XStyle> xPageStyle(createInstance("com.sun.star.style.PageStyle"),uno::UNO_QUERY); xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle)); uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get()); - xStyles->insertByName(OUString("FrameStyles"),uno::makeAny(xFrameStyles)); + xStyles->insertByName("FrameStyles",uno::makeAny(xFrameStyles)); uno::Reference< style::XStyle> xFrameStyle(createInstance("com.sun.star.style.FrameStyle"),uno::UNO_QUERY); xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle)); uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get()); - xStyles->insertByName(OUString("graphics"),uno::makeAny(xGraphicStyles)); + xStyles->insertByName("graphics",uno::makeAny(xGraphicStyles)); uno::Reference< style::XStyle> xGraphicStyle(createInstance("com.sun.star.style.GraphicStyle"),uno::UNO_QUERY); xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle)); } diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 76e66e891ca3..84727cd65202 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -417,10 +417,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen ,const uno::Reference< uno::XInterface>& _xReportComponent) { uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(cppu::UnoType<XInterface>::get()); - xNameCont->insertByName(OUString("FormComponent"),uno::makeAny(_xFormComponent)); - xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(_xReportComponent)); - xNameCont->insertByName(OUString("RowSet") - ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); + xNameCont->insertByName("FormComponent",uno::makeAny(_xFormComponent)); + xNameCont->insertByName("ReportComponent",uno::makeAny(_xReportComponent)); + xNameCont->insertByName("RowSet",uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); return xNameCont.get(); } @@ -532,7 +531,7 @@ void PropBrw::Update( OSectionView* pNewView ) uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection()); m_xLastSection = xTemp; uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(cppu::UnoType<XInterface>::get() ); - xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(xTemp)); + xNameCont->insertByName("ReportComponent",uno::makeAny(xTemp)); xTemp = xNameCont; implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 9d933a370d0f..195e3ce585dd 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -49,7 +49,7 @@ void ScCopyPasteTest::testCopyPasteXLS() CPPUNIT_ASSERT( xDesktop.is() ); // create a frame - Reference< frame::XFrame > xTargetFrame = xDesktop->findFrame( OUString("_blank"), 0 ); + Reference< frame::XFrame > xTargetFrame = xDesktop->findFrame( "_blank", 0 ); CPPUNIT_ASSERT( xTargetFrame.is() ); // 1. Open the document @@ -98,8 +98,8 @@ void ScCopyPasteTest::testCopyPasteXLS() args[0].Value <<= sal_True; uno::Reference< lang::XComponent > xComponent = xDesktop->loadComponentFromURL( - OUString("private:factory/scalc"), - OUString("_blank"), + "private:factory/scalc", + "_blank", 0, args ); CPPUNIT_ASSERT( xComponent.is() ); diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 96b4d46c51cf..e53b017e8f9f 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -517,8 +517,7 @@ sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions ) { try { - uno::Any aAny = xOptions->getPropertyValue( - OUString( "NullDate" ) ); + uno::Any aAny = xOptions->getPropertyValue( "NullDate" ); util::Date aDate; if ( aAny >>= aDate ) return DateToDays( aDate.Day, aDate.Month, aDate.Year ); diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index 51ff569c1da7..9bfa752ee2d7 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -269,7 +269,7 @@ namespace basprov aArgs[3].Value <<= OUString("Module"); aArgs[4].Name = "Line"; aArgs[4].Value <<= static_cast< sal_uInt32 >( nLine1 ); - xHelper->executeDispatch( xProv, OUString(".uno:BasicIDEAppear"), OUString(), 0, aArgs ); + xHelper->executeDispatch( xProv, ".uno:BasicIDEAppear", OUString(), 0, aArgs ); } } } diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index ad70df0e7c01..594d7ded6bea 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -309,7 +309,7 @@ namespace basprov OUString aDescription = sfUri->getName(); - OUString aLocation = sfUri->getParameter( OUString("location") ); + OUString aLocation = sfUri->getParameter( "location" ); sal_Int32 nIndex = 0; // In some strange circumstances the Library name can have an diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 1107fc711094..1d51a3ae3fbc 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -112,7 +112,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW ); // TODO: Ctor Reference< resource::XStringResourceManager > xStringResourceManager( xSMgr_->createInstanceWithContext - ( OUString("com.sun.star.resource.StringResourceWithLocation"), + ( "com.sun.star.resource.StringResourceWithLocation", i_xContext ), UNO_QUERY ); if( xStringResourceManager.is() ) { @@ -325,8 +325,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; if ( nIndex != -1 ) sDlgName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - OUString sLocation = sfUri->getParameter( - OUString("location") ); + OUString sLocation = sfUri->getParameter( "location" ); // get dialog library container diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 96ef8094d770..2fcec9351420 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -190,12 +190,12 @@ void SdExportTest::testN821567() xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xPage, uno::UNO_QUERY ); - uno::Any aAny = xPropSet->getPropertyValue( OUString("Background") ); + uno::Any aAny = xPropSet->getPropertyValue( "Background" ); if(aAny.hasValue()) { uno::Reference< beans::XPropertySet > aXBackgroundPropSet; aAny >>= aXBackgroundPropSet; - aAny = aXBackgroundPropSet->getPropertyValue( OUString("FillBitmapName")); + aAny = aXBackgroundPropSet->getPropertyValue( "FillBitmapName" ); aAny >>= bgImage; } CPPUNIT_ASSERT_MESSAGE("Slide Background is not exported properly", !bgImage.isEmpty()); @@ -594,7 +594,7 @@ void SdExportTest::testFdo83751() uno::Reference<document::XDocumentProperties> xProps( xDocumentPropertiesSupplier->getDocumentProperties(), uno::UNO_QUERY ); uno::Reference<beans::XPropertySet> xUDProps( xProps->getUserDefinedProperties(), uno::UNO_QUERY ); OUString propValue; - xUDProps->getPropertyValue(OUString("Testing")) >>= propValue; + xUDProps->getPropertyValue("Testing") >>= propValue; CPPUNIT_ASSERT_EQUAL(OUString("Document"), propValue); xDocShRef->DoClose(); } @@ -1117,7 +1117,7 @@ void SdExportTest::testTdf91378() uno::Reference<document::XDocumentProperties> xProps( xDocumentPropertiesSupplier->getDocumentProperties(), uno::UNO_QUERY ); uno::Reference<beans::XPropertySet> xUDProps( xProps->getUserDefinedProperties(), uno::UNO_QUERY ); OUString propValue; - xUDProps->getPropertyValue(OUString("Testing")) >>= propValue; + xUDProps->getPropertyValue("Testing") >>= propValue; CPPUNIT_ASSERT(propValue.isEmpty()); xDocShRef = saveAndReload( xDocShRef, PPTX ); } diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index e05cf4d47ff7..9376286f67bd 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -646,7 +646,7 @@ void SdImportTest::testFdo71075() CPPUNIT_ASSERT_MESSAGE( "failed to load shape", xShape.is() ); uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); - aAny = xPropSet->getPropertyValue( OUString("Model") ); + aAny = xPropSet->getPropertyValue( "Model" ); CPPUNIT_ASSERT_MESSAGE( "failed to load shape", aAny.hasValue() ); uno::Reference< chart::XChartDocument > xChartDoc; diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 2912b666440b..668aef1d5279 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -1346,7 +1346,7 @@ void createVisibilityOnOffNode(Reference< XTimeContainer >& rxParentContainer, S xAnimate->setTarget(aAny); // set AttributeName - xAnimate->setAttributeName(OUString("Visibility")); + xAnimate->setAttributeName("Visibility"); // set attribute value aAny <<= bVisible; diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index aa76a395ce45..830d451aac5f 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -511,11 +511,11 @@ static void implCreateTableTemplate( const Reference< XNameContainer >& xTableFa { if( xTableFamily.is() ) try { - if( !xTableFamily->hasByName( OUString( rName ) ) ) + if( !xTableFamily->hasByName( rName ) ) { Reference< XSingleServiceFactory > xFactory( xTableFamily, UNO_QUERY_THROW ); Reference< XNameReplace > xDefaultTableStyle( xFactory->createInstance(), UNO_QUERY_THROW ); - xTableFamily->insertByName( OUString( rName ), Any( xDefaultTableStyle ) ); + xTableFamily->insertByName( rName, Any( xDefaultTableStyle ) ); xDefaultTableStyle->replaceByName( "body", rBody ); xDefaultTableStyle->replaceByName( "odd-rows" , rBanding ); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 575d9f307786..3679ca1f67bd 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -110,7 +110,7 @@ void PPTWriter::exportPPTPre( const std::vector< css::beans::PropertyValue >& rM { mbStatusIndicator = true; mnStatMaxValue = ( mnPages + mnMasterPages ) * 5; - mXStatusIndicator->start( OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); + mXStatusIndicator->start( "PowerPoint Export", mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); } SvGlobalName aGName( 0x64818d10L, 0x4f9b, 0x11cf, 0x86, 0xea, 0x00, 0xaa, 0x00, 0xb9, 0x29, 0xe8 ); @@ -145,7 +145,7 @@ void PPTWriter::exportPPTPost( ) if ( mbStatusIndicator ) { - mXStatusIndicator->setText( OUString( "PowerPoint Export" ) ); + mXStatusIndicator->setText( "PowerPoint Export" ); sal_uInt32 nValue = mnStatMaxValue + ( mnStatMaxValue >> 3 ); if ( nValue > mnLatestStatValue ) { diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index b349a438471b..a99caae77db2 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -145,9 +145,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - OUString("Width")) >>= aPageSize.Width; + "Width") >>= aPageSize.Width; xSlideProps->getPropertyValue( - OUString("Height")) >>= aPageSize.Height; + "Height") >>= aPageSize.Height; ::awt::Point aPicPos; @@ -188,9 +188,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - OUString("Width")) >>= aPageSize.Width; + "Width") >>= aPageSize.Width; xSlideProps->getPropertyValue( - OUString("Height")) >>= aPageSize.Height; + "Height") >>= aPageSize.Height; // grab the left one void* pD1 = pImagesLst->GetEntryData(i); @@ -293,9 +293,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - OUString("Width")) >>= aPageSize.Width; + "Width") >>= aPageSize.Width; xSlideProps->getPropertyValue( - OUString("Height")) >>= aPageSize.Height; + "Height") >>= aPageSize.Height; // grab the upper left one void* pD1 = pImagesLst->GetEntryData(i); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index b167ab23c08a..79b34a445423 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -211,9 +211,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript { Any aPage; aPage <<= rpDescriptor->GetPage()->getUnoPage(); - xSet->setPropertyValue ( - OUString("CurrentPage"), - aPage); + xSet->setPropertyValue( "CurrentPage", aPage ); } } catch (const Exception&) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 6628f31bc15a..c69c49ad6723 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -212,7 +212,7 @@ void Listener::ConnectToController() { try { - xSet->addPropertyChangeListener(OUString("CurrentPage"), this); + xSet->addPropertyChangeListener("CurrentPage", this); } catch (beans::UnknownPropertyException&) { @@ -220,7 +220,7 @@ void Listener::ConnectToController() } try { - xSet->addPropertyChangeListener(OUString("IsMasterPageMode"), this); + xSet->addPropertyChangeListener("IsMasterPageMode", this); } catch (beans::UnknownPropertyException&) { @@ -252,12 +252,8 @@ void Listener::DisconnectFromController() // Remove the property listener. if (xSet.is()) { - xSet->removePropertyChangeListener ( - OUString("CurrentPage"), - this); - xSet->removePropertyChangeListener ( - OUString("IsMasterPageMode"), - this); + xSet->removePropertyChangeListener( "CurrentPage", this ); + xSet->removePropertyChangeListener( "IsMasterPageMode", this); } // Remove the dispose listener. diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 14fcf10edc95..c544e70753bd 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -181,7 +181,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) // First make sure that the sidebar is visible pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - OUString("SdSlideTransitionPanel"), + "SdSlideTransitionPanel", pShell->GetViewFrame()->GetFrame().GetFrameInterface()); rRequest.Ignore (); break; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index d3c32d68a0d2..5f1a09abda98 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -208,7 +208,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) // First make sure that the sidebar is visible GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - OUString("SdTableDesignPanel"), + "SdTableDesignPanel", GetViewFrame()->GetFrame().GetFrameInterface()); } diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index f218a21d81df..2552f2b8d01c 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -381,7 +381,7 @@ void EventMultiplexer::Implementation::ConnectToController() { try { - xSet->addPropertyChangeListener(OUString(aCurrentPagePropertyName), this); + xSet->addPropertyChangeListener(aCurrentPagePropertyName, this); } catch (const beans::UnknownPropertyException&) { @@ -390,7 +390,7 @@ void EventMultiplexer::Implementation::ConnectToController() try { - xSet->addPropertyChangeListener(OUString(aEditModePropertyName), this); + xSet->addPropertyChangeListener(aEditModePropertyName, this); } catch (const beans::UnknownPropertyException&) { @@ -425,7 +425,7 @@ void EventMultiplexer::Implementation::DisconnectFromController() { try { - xSet->removePropertyChangeListener(OUString(aCurrentPagePropertyName), this); + xSet->removePropertyChangeListener(aCurrentPagePropertyName, this); } catch (const beans::UnknownPropertyException&) { @@ -434,7 +434,7 @@ void EventMultiplexer::Implementation::DisconnectFromController() try { - xSet->removePropertyChangeListener(OUString(aEditModePropertyName), this); + xSet->removePropertyChangeListener(aEditModePropertyName, this); } catch (const beans::UnknownPropertyException&) { diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 439389902628..4df152a283d1 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -122,7 +122,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( // First make sure that the sidebar is visible mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR); sfx2::sidebar::Sidebar::ShowPanel( - OUString("SdLayoutsPanel"), + "SdLayoutsPanel", mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface()); break; } diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index ed8a376b08af..c0d928b66739 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -96,7 +96,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont else { xCC->addResourceFactory( - OUString("private:resource/pane/Presenter/*"), + "private:resource/pane/Presenter/*", this); } } diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index d95c582ed852..4a610d3075aa 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -229,10 +229,8 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag awt::Size aSlideSize; try { - xPropertySet->getPropertyValue( - OUString("Width")) >>= aSlideSize.Width; - xPropertySet->getPropertyValue( - OUString("Height")) >>= aSlideSize.Height; + xPropertySet->getPropertyValue("Width") >>= aSlideSize.Width; + xPropertySet->getPropertyValue("Height") >>= aSlideSize.Height; } catch (beans::UnknownPropertyException&) { diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index ba534a88e543..59032ad2b178 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -351,7 +351,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Listen for changes of the current slide. Reference<beans::XPropertySet> xControllerProperties (rxController, UNO_QUERY_THROW); xControllerProperties->addPropertyChangeListener( - OUString("CurrentPage"), + "CurrentPage", this); // Move the current slide in the center of the window. diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index bd40fc4826a3..146360220998 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -204,9 +204,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::Reference< css::uno::XCurrentContext > current( css::uno::getCurrentContext()); if (current.is()) { - current->getValueByName( - OUString("system.desktop-environment")) >>= - desktop; + current->getValueByName("system.desktop-environment") >>= desktop; } // Fall back to the default if the specific backend is not available: diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 626c4cf0e3d1..71cdb6b1b650 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -61,12 +61,10 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( if (0 == ::rtl_str_compare( pImplName, COMP_IMPL_NAME )) { - OUString serviceName(COMP_SERVICE_NAME); - xFactory = ::cppu::createSingleComponentFactory( createInstance, - OUString( COMP_IMPL_NAME ), - Sequence< OUString >( &serviceName, 1 ) ); + COMP_IMPL_NAME, + Sequence< OUString > { COMP_SERVICE_NAME } ); } if (xFactory.is()) diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 91da763b1b46..127acd85b527 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -90,8 +90,7 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : if (xCurrentContext.is()) { - Any aValue = xCurrentContext->getValueByName( - OUString( "system.desktop-environment" ) ); + Any aValue = xCurrentContext->getValueByName( "system.desktop-environment" ); OUString aDesktopEnvironment; if (aValue >>= aDesktopEnvironment) @@ -162,8 +161,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar css::uno::Reference< css::util::XMacroExpander > exp = css::util::theMacroExpander::get(m_xContext); OUString aProgramURL; try { - aProgramURL = exp->expandMacros( - OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/")); + aProgramURL = exp->expandMacros( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/"); } catch (css::lang::IllegalArgumentException &) { throw SystemShellExecuteException( diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 299413079668..6a26ef0b25e3 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -59,12 +59,10 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( if (0 == ::rtl_str_compare( pImplName, SHELLEXEC_IMPL_NAME )) { - OUString serviceName( SHELLEXEC_SERVICE_NAME ); - xFactory = ::cppu::createSingleComponentFactory( createInstance, - OUString( SHELLEXEC_IMPL_NAME ), - Sequence< OUString >( &serviceName, 1 ) ); + SHELLEXEC_IMPL_NAME, + Sequence< OUString > { SHELLEXEC_SERVICE_NAME } ); } diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 56bfecf7b5f4..778a2088bf20 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -718,9 +718,7 @@ void BaseNode::showState() const // read shape name OUString aName; - if( (xPropSet->getPropertyValue( - OUString("Name") ) - >>= aName) ) + if( xPropSet->getPropertyValue("Name") >>= aName ) { SAL_INFO("slideshow.verbose", "Node info: n" << reinterpret_cast<const char*>(this)+debugGetCurrentOffset() << diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 7ab7a0b86ae9..7afef45cb56a 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -135,8 +135,7 @@ namespace slideshow uno::UNO_QUERY_THROW ); uno::Reference< awt::XWindow2 > xParentWindow( - xPropSet->getPropertyValue( - OUString("Window" )), + xPropSet->getPropertyValue("Window"), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory> xFactory( diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index f15cc842b726..fb272d5db79d 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -321,14 +321,12 @@ namespace slideshow { OUString aURL; xPropSet->getPropertyValue("MediaMimeType") >>= sMimeType; - if ((xPropSet->getPropertyValue( - OUString( "PrivateTempFileURL")) >>= aURL) + if ((xPropSet->getPropertyValue("PrivateTempFileURL") >>= aURL) && !aURL.isEmpty()) { implInitializeMediaPlayer( aURL, sMimeType ); } - else if (xPropSet->getPropertyValue( - OUString( "MediaURL")) >>= aURL) + else if (xPropSet->getPropertyValue("MediaURL") >>= aURL) { implInitializeMediaPlayer( aURL, sMimeType ); } diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 1c4677394e1e..a34f14421880 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -717,8 +717,7 @@ namespace slideshow uno::UNO_QUERY_THROW ); // read bound rect awt::Rectangle aTmpRect; - if( !(xPropSet->getPropertyValue( - OUString("BoundRect") ) >>= aTmpRect) ) + if( !(xPropSet->getPropertyValue("BoundRect") >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 09c7e0cdcd14..e36e9e94e419 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -160,12 +160,12 @@ void Test::test() { css::uno::Reference< css::frame::XModel >( xDesktop->loadComponentFromURL( test::toAbsoluteFileUrl(doc), - OUString("_default"), + "_default", 0, args), css::uno::UNO_QUERY_THROW)->getCurrentController(), css::uno::UNO_SET_THROW)->getFrame(), css::uno::UNO_QUERY_THROW)->queryDispatch( - url, OUString("_self"), 0), + url, "_self", 0), css::uno::UNO_QUERY_THROW); Result result; // Shifted to main thread to work around potential deadlocks (i112867): diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index f8fb17925dea..75f98de9619f 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -841,9 +841,8 @@ SotStorage* SotStorage::OpenOLEStorage( const css::uno::Reference < css::embed:: if ( nMode & StreamMode::WRITE ) { uno::Reference < beans::XPropertySet > xStreamProps( xStream, uno::UNO_QUERY_THROW ); - xStreamProps->setPropertyValue( - OUString( "MediaType" ), - uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) ); + xStreamProps->setPropertyValue( "MediaType", + uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) ); } pStream = utl::UcbStreamHelper::CreateStream( xStream ); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index bd5f1351062d..72ca5a104a0a 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -756,12 +756,12 @@ bool SmDocShell::Load( SfxMedium& rMedium ) uno::Reference < container::XNameAccess > xAccess (xStorage, uno::UNO_QUERY); if ( ( - xAccess->hasByName( OUString("content.xml") ) && - xStorage->isStreamElement( OUString("content.xml") ) + xAccess->hasByName( "content.xml" ) && + xStorage->isStreamElement( "content.xml" ) ) || ( - xAccess->hasByName( OUString("Content.xml") ) && - xStorage->isStreamElement( OUString("Content.xml") ) + xAccess->hasByName( "Content.xml" ) && + xStorage->isStreamElement( "Content.xml" ) ) ) { diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 103ca38038aa..29eeaff572c8 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1384,7 +1384,7 @@ void SmViewShell::Insert( SfxMedium& rMedium ) uno::Reference <container::XNameAccess> xNameAccess(xStorage, uno::UNO_QUERY); if (xNameAccess.is() && xNameAccess->getElementNames().getLength()) { - if (xNameAccess->hasByName(OUString("content.xml")) || xNameAccess->hasByName(OUString("Content.xml"))) + if (xNameAccess->hasByName("content.xml") || xNameAccess->hasByName("Content.xml")) { // is this a fabulous math package ? Reference<css::frame::XModel> xModel(pDoc->GetModel()); diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 83707ead3ed6..b97d03e38a43 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -64,8 +64,8 @@ IdlReflectionServiceImpl::IdlReflectionServiceImpl( , _xMgr( xContext->getServiceManager(), UNO_QUERY ) , _aElements( CACHE_SIZE ) { - xContext->getValueByName( OUString( - "/singletons/com.sun.star.reflection.theTypeDescriptionManager") ) >>= _xTDMgr; + xContext->getValueByName( + "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) >>= _xTDMgr; OSL_ENSURE( _xTDMgr.is(), "### cannot get singleton \"TypeDescriptionManager\" from context!" ); } diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 7b80dbd492e7..684d96761db3 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -138,9 +138,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL // get a java vm, where we can create a loader css::uno::Reference<XJavaVM> javaVM_xJavaVM( m_xComponentContext->getValueByName( - OUString( - "/singletons/" - "com.sun.star.java.theJavaVirtualMachine")), + ("/singletons/" + "com.sun.star.java.theJavaVirtualMachine")), UNO_QUERY_THROW); // Use the special protocol of XJavaVM.getJavaVM: If the passed in diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index c3ec2516c932..9d1571186a47 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -279,7 +279,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, css::uno::Reference<css::registry::XSimpleRegistry> xConfRegistry_simple(xConfRegistry, css::uno::UNO_QUERY); if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException("javavm.cxx: couldn't get ConfigurationRegistry", 0); - xConfRegistry_simple->open(OUString("org.openoffice.Inet"), sal_True, sal_False); + xConfRegistry_simple->open("org.openoffice.Inet", sal_True, sal_False); css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey(); // if ooInetProxyType is not 0 then read the settings @@ -373,7 +373,7 @@ void getDefaultLocaleFromConfig( throw css::uno::RuntimeException( OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); - xConfRegistry_simple->open(OUString("org.openoffice.Setup"), sal_True, sal_False); + xConfRegistry_simple->open("org.openoffice.Setup", sal_True, sal_False); css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey(); // read locale @@ -429,7 +429,7 @@ void getJavaPropsFromSafetySettings( OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); xConfRegistry_simple->open( - OUString("org.openoffice.Office.Java"), + "org.openoffice.Office.Java", sal_True, sal_False); css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey(); @@ -455,7 +455,7 @@ void getJavaPropsFromSafetySettings( pjvm->pushProp(sProperty); } css::uno::Reference<css::registry::XRegistryKey> key_CheckSecurity= xRegistryRootKey->openKey( - OUString("VirtualMachine/Security")); + "VirtualMachine/Security"); if( key_CheckSecurity.is()) { bool val = (bool) key_CheckSecurity->getLongValue(); @@ -1531,8 +1531,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { css::uno::Reference< css::util::XMacroExpander > exp = css::util::theMacroExpander::get(m_xContext); OUString baseUrl; try { - baseUrl = exp->expandMacros( - OUString("$URE_INTERNAL_JAVA_DIR/")); + baseUrl = exp->expandMacros("$URE_INTERNAL_JAVA_DIR/"); } catch (css::lang::IllegalArgumentException &) { throw css::uno::RuntimeException( OUString("css::lang::IllegalArgumentException"), @@ -1540,8 +1539,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { } OUString classPath; try { - classPath = exp->expandMacros( - OUString("$URE_INTERNAL_JAVA_CLASSPATH")); + classPath = exp->expandMacros("$URE_INTERNAL_JAVA_CLASSPATH"); } catch (css::lang::IllegalArgumentException &) {} jclass class_URLClassLoader = environment->FindClass( "java/net/URLClassLoader"); diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index f6ebf38d80fe..72eea5142258 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -265,7 +265,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction { if (xContext.is()) { - Any acc(xContext->getValueByName(OUString(s_acRestriction))); + Any acc(xContext->getValueByName(s_acRestriction)); if (typelib_TypeClass_INTERFACE == acc.pType->eTypeClass) { // avoid ref-counting diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 4d10bd44e99d..73c9ec1ab526 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -883,8 +883,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( if (xProps.is()) { Reference< XComponentContext > xDefContext; - xProps->getPropertyValue( - OUString("DefaultContext") ) >>= xDefContext; + xProps->getPropertyValue( "DefaultContext" ) >>= xDefContext; OSL_ENSURE( xContext == xDefContext, "### default context of service manager singleton differs from context holding it!" ); @@ -947,8 +946,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( if (xProps.is()) { Reference< XComponentContext > xDefContext; - xProps->getPropertyValue( - OUString("DefaultContext") ) >>= xDefContext; + xProps->getPropertyValue( "DefaultContext" ) >>= xDefContext; OSL_ENSURE( xContext == xDefContext, "### default context of service manager singleton differs from context holding it!" ); @@ -1501,8 +1499,7 @@ void ORegistryServiceManager::fillAllNamesFromRegistry( HashSet_OWString & rSet try { - Reference<XRegistryKey > xServicesKey = xRootKey->openKey( - OUString("SERVICES") ); + Reference<XRegistryKey > xServicesKey = xRootKey->openKey( "SERVICES" ); // root + /Services + / if( xServicesKey.is() ) { diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index 947eb15bcdb9..f31041077304 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -41,20 +41,20 @@ static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 }; #define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray)) -#define ROOTNODE_START OUString("Office.Common/Print/Option") -#define ROOTNODE_PRINTOPTION OUString("org.openoffice.Office.Common/Print/Option") - -#define PROPERTYNAME_REDUCETRANSPARENCY OUString("ReduceTransparency") -#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString("ReducedTransparencyMode") -#define PROPERTYNAME_REDUCEGRADIENTS OUString("ReduceGradients") -#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString("ReducedGradientMode") -#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT OUString("ReducedGradientStepCount") -#define PROPERTYNAME_REDUCEBITMAPS OUString("ReduceBitmaps") -#define PROPERTYNAME_REDUCEDBITMAPMODE OUString("ReducedBitmapMode") -#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION OUString("ReducedBitmapResolution") -#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY OUString("ReducedBitmapIncludesTransparency") -#define PROPERTYNAME_CONVERTTOGREYSCALES OUString("ConvertToGreyscales") -#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString("PDFAsStandardPrintJobFormat") +#define ROOTNODE_START "Office.Common/Print/Option" +#define ROOTNODE_PRINTOPTION "org.openoffice.Office.Common/Print/Option" + +#define PROPERTYNAME_REDUCETRANSPARENCY "ReduceTransparency" +#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE "ReducedTransparencyMode" +#define PROPERTYNAME_REDUCEGRADIENTS "ReduceGradients" +#define PROPERTYNAME_REDUCEDGRADIENTMODE "ReducedGradientMode" +#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT "ReducedGradientStepCount" +#define PROPERTYNAME_REDUCEBITMAPS "ReduceBitmaps" +#define PROPERTYNAME_REDUCEDBITMAPMODE "ReducedBitmapMode" +#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION "ReducedBitmapResolution" +#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY "ReducedBitmapIncludesTransparency" +#define PROPERTYNAME_CONVERTTOGREYSCALES "ConvertToGreyscales" +#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT "PDFAsStandardPrintJobFormat" using namespace ::utl; using namespace ::osl; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 98b01730fb76..8ae8b16dc467 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -659,9 +659,7 @@ std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu() { Reference< XCommandInfo > aCommands = aCnt.getCommands(); if ( aCommands.is() ) - bEnableDelete - = aCommands->hasCommandByName( - OUString( "delete" ) ); + bEnableDelete = aCommands->hasCommandByName( "delete" ); else bEnableDelete = false; } @@ -678,9 +676,7 @@ std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu() Reference< XPropertySetInfo > aProps = aCnt.getProperties(); if ( aProps.is() ) { - Property aProp - = aProps->getPropertyByName( - OUString( "Title" ) ); + Property aProp = aProps->getPropertyByName("Title"); bEnableRename = !( aProp.Attributes & PropertyAttribute::READONLY ); } @@ -762,9 +758,7 @@ void ViewTabListBox_Impl::DeleteEntries() ::ucbhelper::Content aCnt( aURL, mxCmdEnv, comphelper::getProcessComponentContext() ); Reference< XCommandInfo > aCommands = aCnt.getCommands(); if ( aCommands.is() ) - canDelete - = aCommands->hasCommandByName( - OUString( "delete" ) ); + canDelete = aCommands->hasCommandByName( "delete" ); else canDelete = false; } diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 31d1d60fdcce..1e6afc1c1558 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -116,8 +116,7 @@ IMPL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, p, void ) xWindow->setVisible( sal_False ); // reparent the window - xWinPeer->setProperty( OUString( "PluginParent" ), - uno::makeAny( (sal_Int64) 0 ) ); + xWinPeer->setProperty( "PluginParent", uno::makeAny( (sal_Int64) 0 ) ); vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 0b4fe2d5e8e6..8ea50c2f015f 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -914,7 +914,7 @@ OUString EmbeddedObjectRef::GetChartType() if( xProp.is()) { bool bCurrent = false; - if( xProp->getPropertyValue( OUString("SwapXAndYAxis") ) >>= bCurrent ) + if( xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bCurrent ) { if (bCurrent) Style += "Bars"; diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 6a811ca3c266..92f653bdf184 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -147,7 +147,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(Runti try { - setPropertyValue(OUString(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle)); + setPropertyValue(UNODIALOG_PROPERTY_TITLE, makeAny(_rTitle)); } catch(RuntimeException&) { diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 6eb89778ff92..679dce605d9a 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -1268,7 +1268,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( Reference< XInterface > xFactory( createSingleComponentFactory( bridge_test::TestBridgeImpl_create, - OUString( IMPLNAME ), + IMPLNAME, bridge_test::getSupportedServiceNames() ) ); if (xFactory.is()) diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index eee2194febd4..57b7b4750824 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -962,7 +962,7 @@ void Test_Impl::testConstructorsService( 0.123f, 0.456, 'X', - OUString("test"), + "test", UnoType< Any >::get(), makeAny(true), arg14, @@ -1189,7 +1189,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( { Reference< XSingleServiceFactory > xFactory( createSingleFactory( static_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( IMPLNAME ), + IMPLNAME, bridge_object::Test_Impl_create, bridge_object::getSupportedServiceNames() ) ); diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index 0c20128345a0..15aef4d18593 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -127,29 +127,27 @@ OUString testMulti( OUString("12" "abc"), css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >( multi, css::uno::UNO_QUERY_THROW)->fn12( - OUString("abc"))); + "abc")); checkEqual( OUString("12" "abc-2"), static_cast< test::testtools::bridgetest::XMultiBase2 * >( - multi.get())->fn12(OUString("abc-2"))); + multi.get())->fn12("abc-2")); checkEqual( OUString("12" "abc-2"), css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >( - multi, css::uno::UNO_QUERY_THROW)->fn12( - OUString("abc-2"))); + multi, css::uno::UNO_QUERY_THROW)->fn12("abc-2")); checkEqual( OUString("12" "abc-5"), static_cast< test::testtools::bridgetest::XMultiBase5 * >( - multi.get())->fn12(OUString("abc-5"))); + multi.get())->fn12("abc-5")); checkEqual( OUString("12" "abc-5"), css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( - multi, css::uno::UNO_QUERY_THROW)->fn12( - OUString("abc-5"))); + multi, css::uno::UNO_QUERY_THROW)->fn12("abc-5")); checkEqual< sal_Int32 >(21 * 2, multi->fn21(2)); checkEqual( OUString("22" "de"), - multi->fn22(OUString("de"))); + multi->fn22("de")); checkEqual< sal_Int32 >( 31 * 3, css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( @@ -191,17 +189,15 @@ OUString testMulti( checkEqual( OUString("32" "f"), css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( - multi, css::uno::UNO_QUERY_THROW)->fn32( - OUString("f"))); + multi, css::uno::UNO_QUERY_THROW)->fn32("f")); checkEqual( OUString("32" "f-5"), static_cast< test::testtools::bridgetest::XMultiBase5 * >( - multi.get())->fn32(OUString("f-5"))); + multi.get())->fn32("f-5")); checkEqual( OUString("32" "f-5"), css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( - multi, css::uno::UNO_QUERY_THROW)->fn32( - OUString("f-5"))); + multi, css::uno::UNO_QUERY_THROW)->fn32("f-5")); checkEqual< sal_Int32 >( 33, css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( @@ -222,7 +218,7 @@ OUString testMulti( checkEqual< sal_Int32 >(71 * 7, multi->fn71(7)); checkEqual( OUString("72" "g"), - multi->fn72(OUString("g"))); + multi->fn72("g")); checkEqual< sal_Int32 >(73, multi->fn73()); } catch (CheckFailed const & f) { return f.message; diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index f94c42e6f950..3f5cecdd8d44 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -73,8 +73,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace toolkit; -#define PROPERTY_RESOURCERESOLVER OUString( "ResourceResolver" ) - +#define PROPERTY_RESOURCERESOLVER "ResourceResolver" struct LanguageDependentProp { const char* pPropName; diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index acc0307215ad..611b96957347 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -155,7 +155,7 @@ namespace toolkitform Reference< XInterface > xNormalizedLookup( _rxRadioModel, UNO_QUERY ); OUString sRadioGroupName; - OSL_VERIFY( _rxRadioModel->getPropertyValue( OUString(FM_PROP_NAME) ) >>= sRadioGroupName ); + OSL_VERIFY( _rxRadioModel->getPropertyValue( FM_PROP_NAME ) >>= sRadioGroupName ); Reference< XIndexAccess > xCurrentContainer( xRoot ); sal_Int32 nStartWithChild = 0; diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 318c1b14e1f6..9a6698316aae 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -792,9 +792,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, Any aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( - OUString("Handle"), - aAny ); + xNewPropNameReplace->replaceByName( "Handle", aAny ); // ... value aNewKey1 = aKey; @@ -802,9 +800,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( - OUString("Value"), - aAny ); + xNewPropNameReplace->replaceByName( "Value", aAny ); // ... state aNewKey1 = aKey; @@ -812,9 +808,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( - OUString("State"), - aAny ); + xNewPropNameReplace->replaceByName( "State", aAny ); // ... attributes aNewKey1 = aKey; @@ -822,9 +816,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( - OUString("Attributes"), - aAny ); + xNewPropNameReplace->replaceByName( "Attributes", aAny ); // Insert new item. xNewContainer->insertByName( @@ -1308,13 +1300,11 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty } // Write value - xNameReplace->replaceByName( - OUString("Value"), - aValue ); + xNameReplace->replaceByName( "Value", aValue ); // Write state ( Now it is a directly set value ) xNameReplace->replaceByName( - OUString("State"), + "State", makeAny( sal_Int32( PropertyState_DIRECT_VALUE ) ) ); @@ -1588,24 +1578,24 @@ void SAL_CALL PersistentPropertySet::addProperty( // Set handle xNameReplace->replaceByName( - OUString("Handle"), + "Handle", makeAny( sal_Int32( -1 ) ) ); // Set default value xNameReplace->replaceByName( - OUString("Value"), + "Value", DefaultValue ); // Set state ( always "default" ) xNameReplace->replaceByName( - OUString("State"), + "State", makeAny( sal_Int32( PropertyState_DEFAULT_VALUE ) ) ); // Set attributes xNameReplace->replaceByName( - OUString("Attributes"), + "Attributes", makeAny( sal_Int32( Attributes ) ) ); // Insert new item. @@ -2041,7 +2031,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( { // Write handle xNameReplace->replaceByName( - OUString("Handle"), + "Handle", makeAny( rNewValue.Handle ) ); // Save old value @@ -2052,12 +2042,12 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( aValueName ); // Write value xNameReplace->replaceByName( - OUString("Value"), + "Value", rNewValue.Value ); // Write state ( Now it is a directly set value ) xNameReplace->replaceByName( - OUString("State"), + "State", makeAny( sal_Int32( PropertyState_DIRECT_VALUE ) ) ); diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 366bd2d0d4f5..0e2ff62efdb9 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -328,9 +328,7 @@ bool HierarchyEntry::setData( } else { - xParentNameAccess->getByName( - OUString("Children") ) - >>= xNameAccess; + xParentNameAccess->getByName("Children") >>= xNameAccess; } if ( xNameAccess->hasByName( m_aName ) ) @@ -376,8 +374,7 @@ bool HierarchyEntry::setData( { // Append new entry to parents child list, // which is a set of entries. - xParentNameAccess->getByName( - OUString( "Children" ) ) >>= xFac; + xParentNameAccess->getByName("Children") >>= xFac; } OSL_ENSURE( xFac.is(), @@ -408,7 +405,7 @@ bool HierarchyEntry::setData( { // Set Title value. xNameReplace->replaceByName( - OUString("Title"), + "Title", uno::makeAny( rData.getTitle() ) ); // Set TargetURL value. @@ -424,14 +421,14 @@ bool HierarchyEntry::setData( = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNameReplace->replaceByName( - OUString("TargetURL"), + "TargetURL", uno::makeAny( aValue ) ); // Set Type value. sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNameReplace->replaceByName( - OUString("Type"), + "Type", uno::makeAny( nType ) ); if ( xContainer.is() ) @@ -636,9 +633,7 @@ bool HierarchyEntry::move( } else { - xOldParentNameAccess->getByName( - OUString("Children") ) - >>= xOldNameContainer; + xOldParentNameAccess->getByName("Children") >>= xOldNameContainer; } aEntry = xOldNameContainer->getByName( m_aName ); @@ -715,9 +710,7 @@ bool HierarchyEntry::move( } else { - xNewParentNameAccess->getByName( - OUString("Children") ) - >>= xNewNameContainer; + xNewParentNameAccess->getByName("Children") >>= xNewNameContainer; } } else @@ -727,7 +720,7 @@ bool HierarchyEntry::move( return false; xNewNameReplace->replaceByName( - OUString("Title"), + "Title", uno::makeAny( rData.getTitle() ) ); // TargetURL property may contain a reference to the Office @@ -739,11 +732,11 @@ bool HierarchyEntry::move( if ( m_xOfficeInstDirs.is() && !aValue.isEmpty() ) aValue = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNewNameReplace->replaceByName( - OUString("TargetURL"), + "TargetURL", uno::makeAny( aValue ) ); sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNewNameReplace->replaceByName( - OUString("Type"), + "Type", uno::makeAny( nType ) ); xNewNameContainer->insertByName( aNewKey, aEntry ); @@ -852,9 +845,7 @@ bool HierarchyEntry::remove() { // Append new entry to parents child list, // which is a set of entries. - xParentNameAccess->getByName( - OUString("Children") ) - >>= xContainer; + xParentNameAccess->getByName("Children") >>= xContainer; } OSL_ENSURE( xContainer.is(), diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 864593a901b9..0e79ffaa38d5 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -2281,8 +2281,7 @@ bool Content::loadData( try { uno::Any aHasEncryptedEntries - = xPackagePropSet->getPropertyValue( - OUString( "HasEncryptedEntries" ) ); + = xPackagePropSet->getPropertyValue( "HasEncryptedEntries" ); if ( !( aHasEncryptedEntries >>= rProps.bHasEncryptedEntries ) ) { OSL_FAIL( "Content::loadData - " @@ -2328,9 +2327,7 @@ bool Content::loadData( // MediaType try { - uno::Any aMediaType - = xPropSet->getPropertyValue( - OUString("MediaType") ); + uno::Any aMediaType = xPropSet->getPropertyValue("MediaType"); if ( !( aMediaType >>= rProps.aMediaType ) ) { OSL_FAIL( "Content::loadData - Got no MediaType value!" ); @@ -2372,9 +2369,7 @@ bool Content::loadData( // Size ( only available for streams ) try { - uno::Any aSize - = xPropSet->getPropertyValue( - OUString("Size") ); + uno::Any aSize = xPropSet->getPropertyValue("Size"); if ( !( aSize >>= rProps.nSize ) ) { OSL_FAIL( "Content::loadData - Got no Size value!" ); @@ -2395,9 +2390,7 @@ bool Content::loadData( // Compressed ( only available for streams ) try { - uno::Any aCompressed - = xPropSet->getPropertyValue( - OUString("Compressed") ); + uno::Any aCompressed = xPropSet->getPropertyValue("Compressed"); if ( !( aCompressed >>= rProps.bCompressed ) ) { OSL_FAIL( "Content::loadData - Got no Compressed value!" ); @@ -2418,9 +2411,7 @@ bool Content::loadData( // Encrypted ( only available for streams ) try { - uno::Any aEncrypted - = xPropSet->getPropertyValue( - OUString("Encrypted") ); + uno::Any aEncrypted = xPropSet->getPropertyValue("Encrypted"); if ( !( aEncrypted >>= rProps.bEncrypted ) ) { OSL_FAIL( "Content::loadData - Got no Encrypted value!" ); @@ -2514,7 +2505,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) try { xPackagePropSet->setPropertyValue( - OUString("EncryptionKey"), + "EncryptionKey", uno::makeAny( m_aProps.aEncryptionKey ) ); m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED; } @@ -2639,7 +2630,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) if ( m_nModifiedProps & MEDIATYPE_MODIFIED ) { xPropSet->setPropertyValue( - OUString("MediaType"), + "MediaType", uno::makeAny( m_aProps.aMediaType ) ); m_nModifiedProps &= ~MEDIATYPE_MODIFIED; } @@ -2648,7 +2639,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - OUString("Compressed"), + "Compressed", uno::makeAny( m_aProps.bCompressed ) ); m_nModifiedProps &= ~COMPRESSED_MODIFIED; @@ -2658,7 +2649,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - OUString("Encrypted"), + "Encrypted", uno::makeAny( m_aProps.bEncrypted ) ); m_nModifiedProps &= ~ENCRYPTED_MODIFIED; @@ -2668,7 +2659,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - OUString("EncryptionKey"), + "EncryptionKey", uno::makeAny( m_aProps.aEncryptionKey ) ); m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED; diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index b50589f6e8e0..b350f31c8c00 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -2383,7 +2383,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData, // According to MBA, if no mediatype is set, folder and all // its contents will be lost on save of the document!!! xPropSet->setPropertyValue( - OUString( "MediaType" ), + "MediaType", uno::makeAny( OUString( // @@@ better mediatype "application/binary" ) ) ); diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 18084a7d8108..18151f61e774 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -144,8 +144,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) { try { - uno::Any aValue = xPropSet->getPropertyValue( - OUString( "RuntimeUID" ) ); + uno::Any aValue = xPropSet->getPropertyValue("RuntimeUID"); aValue >>= aId; } catch ( beans::UnknownPropertyException const & ) diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index ea5f1e8acfc5..964fab071f33 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -433,8 +433,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( "No XPropertySet interface!" ); try { - uno::Any aPropValue = xPropSet->getPropertyValue( - OUString( "OpenMode" ) ); + uno::Any aPropValue = xPropSet->getPropertyValue("OpenMode"); sal_Int32 nOpenMode = 0; if ( aPropValue >>= nOpenMode ) diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 7a778ed2c443..e04c00f42994 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -95,7 +95,7 @@ void test::BootstrapFixtureBase::setUp() { // set UserInstallation to user profile dir in test/user-template OUString sUserInstallURL = m_aWorkdirRootURL + "/unittest"; - rtl::Bootstrap::set(OUString("UserInstallation"), sUserInstallURL); + rtl::Bootstrap::set("UserInstallation", sUserInstallURL); m_xContext = comphelper::getProcessComponentContext(); m_xFactory = m_xContext->getServiceManager(); diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index cf23ee4d1e83..d7a57d5577b6 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -47,7 +47,7 @@ uno::Reference<css::lang::XComponent> MacrosTest::loadFromDesktop(const OUString args.insert(args.end(), rExtraArgs.begin(), rExtraArgs.end()); - uno::Reference<lang::XComponent> xComponent = xLoader->loadComponentFromURL(rURL, OUString("_default"), 0, comphelper::containerToSequence(args)); + uno::Reference<lang::XComponent> xComponent = xLoader->loadComponentFromURL(rURL, "_default", 0, comphelper::containerToSequence(args)); OUString sMessage = "loading failed: " + rURL; CPPUNIT_ASSERT_MESSAGE(OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is()); return xComponent; diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 0d8f516046eb..40dcf5d5a392 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -64,7 +64,7 @@ namespace utl OUString makeImplName() { OUString uri; - rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); + rtl::Bootstrap::get( "BRAND_BASE_DIR", uri); return uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap"); } } @@ -736,7 +736,7 @@ bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, { // try to open version.ini (versionrc) OUString uri; - rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); + rtl::Bootstrap::get( "BRAND_BASE_DIR", uri); rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 5249ac567a89..6d0e8b1b603c 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -912,7 +912,7 @@ bool SvtLinguConfig::GetSupportedDictionaryFormatsFor( xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rSetName ), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rSetEntry ), uno::UNO_QUERY_THROW ); - if (xNA->getByName( OUString(aG_SupportedDictionaryFormats) ) >>= rFormatList) + if (xNA->getByName( aG_SupportedDictionaryFormats ) >>= rFormatList) bSuccess = true; DBG_ASSERT( rFormatList.getLength(), "supported dictionary format list is empty" ); } @@ -953,16 +953,16 @@ bool SvtLinguConfig::GetDictionaryEntry( { uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW ); - xNA.set( xNA->getByName(OUString(aG_Dictionaries)), uno::UNO_QUERY_THROW ); + xNA.set( xNA->getByName( aG_Dictionaries ), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rNodeName ), uno::UNO_QUERY_THROW ); // read group data... uno::Sequence< OUString > aLocations; OUString aFormatName; uno::Sequence< OUString > aLocaleNames; - bSuccess = (xNA->getByName( OUString(aG_Locations) ) >>= aLocations) && - (xNA->getByName( OUString(aG_Format) ) >>= aFormatName) && - (xNA->getByName( OUString(aG_Locales) ) >>= aLocaleNames); + bSuccess = (xNA->getByName( aG_Locations ) >>= aLocations) && + (xNA->getByName( aG_Format ) >>= aFormatName) && + (xNA->getByName( aG_Locales ) >>= aLocaleNames); DBG_ASSERT( aLocations.getLength(), "Dictionary locations not set" ); DBG_ASSERT( !aFormatName.isEmpty(), "Dictionary format name not set" ); DBG_ASSERT( aLocaleNames.getLength(), "No locales set for the dictionary" ); @@ -1000,7 +1000,7 @@ uno::Sequence< OUString > SvtLinguConfig::GetDisabledDictionaries() const { uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW ); - xNA->getByName( OUString(aG_DisabledDictionaries) ) >>= aResult; + xNA->getByName( aG_DisabledDictionaries ) >>= aResult; } catch (uno::Exception &) { diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 0e1e6c9837c0..8cadd7bfc560 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -128,7 +128,7 @@ handleNoSuchFilterRequest_( // out by using DocumentService property later! uno::Reference< container::XEnumeration > xFilters = xFilterContainer->createSubSetEnumerationByQuery( - OUString( "_query_all:sort_prop=uiname:iflags=1:eflags=143360")); + "_query_all:sort_prop=uiname:iflags=1:eflags=143360"); while (xFilters->hasMoreElements()) { try diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 3ed30d62d701..82dbb2ab8136 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -131,8 +131,8 @@ public: { uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY ); if ( xServiceInfo.is() - && ( ( xServiceInfo->supportsService( OUString(aSpreadsheetDocument) ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT ) - || ( xServiceInfo->supportsService( OUString(aTextDocument) ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) ) + && ( ( xServiceInfo->supportsService( aSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT ) + || ( xServiceInfo->supportsService( aTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) ) { uno::Reference< frame::XModel > xModel( xServiceInfo, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given m_documents.push_back( xModel ); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index fc735b5ca3e1..b7ef652b9a9d 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -983,7 +983,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() if( !mpfnImport ) { #ifndef DISABLE_DYNLOADING - mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME))); + mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol(IMPORT_FUNCTION_NAME)); #else if( maFiltername.equalsAscii( "icd" ) ) mpfnImport = icdGraphicImport; @@ -2096,7 +2096,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString OUString aPhysicalName( ImpCreateFullFilterPath( aFilterPath.getToken(i, ';'), aFilterName ) ); osl::Module aLibrary( aPhysicalName ); - PFilterCall pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME))); + PFilterCall pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol(EXPORT_FUNCTION_NAME)); // Execute dialog in DLL #else PFilterCall pFunc = NULL; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 0732483b3915..88d118ca04ec 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -119,17 +119,17 @@ PrinterOptions::~PrinterOptions() { } -#define PROPERTYNAME_REDUCETRANSPARENCY OUString("ReduceTransparency") -#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString("ReducedTransparencyMode") -#define PROPERTYNAME_REDUCEGRADIENTS OUString("ReduceGradients") -#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString("ReducedGradientMode") -#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT OUString("ReducedGradientStepCount") -#define PROPERTYNAME_REDUCEBITMAPS OUString("ReduceBitmaps") -#define PROPERTYNAME_REDUCEDBITMAPMODE OUString("ReducedBitmapMode") -#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION OUString("ReducedBitmapResolution") -#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY OUString("ReducedBitmapIncludesTransparency") -#define PROPERTYNAME_CONVERTTOGREYSCALES OUString("ConvertToGreyscales") -#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString("PDFAsStandardPrintJobFormat") +#define PROPERTYNAME_REDUCETRANSPARENCY "ReduceTransparency" +#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE "ReducedTransparencyMode" +#define PROPERTYNAME_REDUCEGRADIENTS "ReduceGradients" +#define PROPERTYNAME_REDUCEDGRADIENTMODE "ReducedGradientMode" +#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT "ReducedGradientStepCount" +#define PROPERTYNAME_REDUCEBITMAPS "ReduceBitmaps" +#define PROPERTYNAME_REDUCEDBITMAPMODE "ReducedBitmapMode" +#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION "ReducedBitmapResolution" +#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY "ReducedBitmapIncludesTransparency" +#define PROPERTYNAME_CONVERTTOGREYSCALES "ConvertToGreyscales" +#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT "PDFAsStandardPrintJobFormat" bool PrinterOptions::ReadFromConfig( bool i_bFile ) { diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index ab0a88275aea..560f6951890a 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -234,12 +234,12 @@ static OUString queryFile( Printer* pPrinter ) bPDF = false; } if( bPS ) - xFilePicker->appendFilter( OUString( "PostScript" ), OUString( "*.ps" ) ); + xFilePicker->appendFilter( "PostScript", "*.ps" ); if( bPDF ) - xFilePicker->appendFilter( OUString( "Portable Document Format" ), OUString( "*.pdf" ) ); + xFilePicker->appendFilter( "Portable Document Format", "*.pdf" ); #elif defined WNT (void)pPrinter; - xFilePicker->appendFilter( OUString( "*.PRN" ), OUString( "*.prn" ) ); + xFilePicker->appendFilter( "*.PRN", "*.prn" ); #endif // add arbitrary files xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 0b3101129df4..3ae9e30fafc7 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -42,7 +42,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY)) { fp = reinterpret_cast<VclAbstractDialogFactory* (SAL_CALL*)()>( - aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ) ); + aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" ) ); } #else fp = CreateDialogFactory; diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx index 1db42c84095d..5e610fe1f2e1 100644 --- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx +++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx @@ -60,9 +60,9 @@ GtkPrintWrapper::~GtkPrintWrapper() void GtkPrintWrapper::impl_load() { - m_aModule.load(OUString("libgtk-x11-2.0.so.0")); + m_aModule.load("libgtk-x11-2.0.so.0"); if (!m_aModule.is()) - m_aModule.load(OUString("libgtk-x11-2.0.so")); + m_aModule.load("libgtk-x11-2.0.so"); if (!m_aModule.is()) return; diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 3e0749fd0d0d..929fa5e54db9 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -620,7 +620,7 @@ static void activate_uno(GSimpleAction *action, GVariant*, gpointer) return; uno::Sequence < css::beans::PropertyValue > args(0); - xDesktop->loadComponentFromURL(sFactoryService, OUString("_blank"), 0, args); + xDesktop->loadComponentFromURL(sFactoryService, "_blank", 0, args); return; } diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index e9e2e3638a6d..b9e47ea5c53c 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -222,7 +222,7 @@ OString Databases::getImageTheme() lParams) ); uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW); - uno::Any aResult = xAccess->getByHierarchicalName(OUString("Misc/SymbolStyle")); + uno::Any aResult = xAccess->getByHierarchicalName("Misc/SymbolStyle"); OUString aSymbolsStyleName; aResult >>= aSymbolsStyleName; @@ -985,7 +985,7 @@ void Databases::cascadingStylesheet( const OUString& Language, uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY ); if ( xVclWindowPeer.is() ) { - uno::Any aHCMode = xVclWindowPeer->getProperty( OUString( "HighContrastMode" ) ); + uno::Any aHCMode = xVclWindowPeer->getProperty( "HighContrastMode" ); if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode ) { aCSS = "highcontrastblack"; @@ -1258,7 +1258,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack { Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions - ( OUString("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + ( "user", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); m_bUserPackagesLoaded = true; } @@ -1286,7 +1286,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa { Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions - ( OUString("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + ( "shared", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); m_bSharedPackagesLoaded = true; } @@ -1314,7 +1314,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP { Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions - ( OUString("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + ( "bundled", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); m_bBundledPackagesLoaded = true; } |