diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-30 16:38:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-31 08:56:20 +0000 |
| commit | 1c3e84d8192218befebcddae2ed9842d081dc6c7 (patch) | |
| tree | f4fc5cddd181d6d49bf55f74e6d3d107b8ae8d18 | |
| parent | e1e6cdbb1e9ff37f0bb740a70045c66953bec50c (diff) | |
teach lolugin:stringconstant about calling constructors
so we can remove unnecessary calls to the OUString(literal) constructor
when calling constructors like this:
Foo(OUString("xxx"), 1)
Change-Id: I1de60ef561437c86b27dc9cb095a5deb2e103b36
Reviewed-on: https://gerrit.libreoffice.org/33698
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
267 files changed, 1118 insertions, 1152 deletions
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 7f90e16ce6b6..baad83868410 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -192,7 +192,7 @@ SbxErrObject::getUnoErrObject() SbxVariableRef const & SbxErrObject::getErrObject() { - static SbxVariableRef pGlobErr = new SbxErrObject( OUString("Err"), uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) ); + static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) ); return pGlobErr; } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 66c1a94e562b..168842bc74db 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -445,7 +445,7 @@ SbxObject* SbiFactory::CreateObject( const OUString& rClass ) } else if( rClass.equalsIgnoreAsciiCase( "Collection" ) ) { - return new BasicCollection( OUString("Collection")); + return new BasicCollection( "Collection" ); } else if( rClass.equalsIgnoreAsciiCase( "FileSystemObject" ) ) { @@ -915,7 +915,7 @@ SbModule* SbClassFactory::FindClass( const OUString& rClassName ) } StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic ) - : SbxObject( OUString("StarBASIC") ), bDocBasic( bIsDocBasic ) + : SbxObject("StarBASIC"), bDocBasic( bIsDocBasic ) { SetParent( p ); pLibInfo = nullptr; @@ -937,7 +937,7 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic ) GetSbData()->pUnoFac = new SbUnoFactory; AddFactory( GetSbData()->pUnoFac ); } - pRtl = new SbiStdObject(OUString(RTLNAME), this ); + pRtl = new SbiStdObject(RTLNAME, this ); // Search via StarBasic is always global SetFlag( SbxFlagBits::GlobalSearch ); pVBAGlobals = nullptr; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index b85772631f74..dd3ea516a0f8 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3051,7 +3051,7 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, bool Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() ); // Create a SbUnoObject out of it and return it - SbUnoObjectRef xUnoObj = new SbUnoObject( OUString( "ProcessServiceManager" ), Any(xFactory) ); + SbUnoObjectRef xUnoObj = new SbUnoObject( "ProcessServiceManager", Any(xFactory) ); refVar->PutObject( xUnoObj.get() ); } @@ -3759,7 +3759,7 @@ SbUnoSingleton* findUnoSingleton( const OUString& rName ) SbUnoSingleton::SbUnoSingleton( const OUString& aName_ ) : SbxObject( aName_ ) { - SbxVariableRef xGetMethodRef = new SbxMethod( OUString( "get" ), SbxOBJECT ); + SbxVariableRef xGetMethodRef = new SbxMethod( "get", SbxOBJECT ); QuickInsert( xGetMethodRef.get() ); } @@ -4130,7 +4130,7 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, bool bWrite Any aContextAny( comphelper::getProcessComponentContext() ); - SbUnoObjectRef xUnoObj = new SbUnoObject( OUString( "DefaultContext" ), aContextAny ); + SbUnoObjectRef xUnoObj = new SbUnoObject( "DefaultContext", aContextAny ); refVar->PutObject( xUnoObj.get() ); } @@ -4775,15 +4775,15 @@ void SbUnoStructRefObject::implCreateDbgProperties() Property aProp; // Id == -1: display the implemented interfaces corresponding the ClassProvider - SbxVariableRef xVarRef = new SbUnoProperty( OUString(ID_DBG_SUPPORTEDINTERFACES), SbxSTRING, SbxSTRING, aProp, -1, false, false ); + SbxVariableRef xVarRef = new SbUnoProperty( ID_DBG_SUPPORTEDINTERFACES, SbxSTRING, SbxSTRING, aProp, -1, false, false ); QuickInsert( xVarRef.get() ); // Id == -2: output the properties - xVarRef = new SbUnoProperty( OUString(ID_DBG_PROPERTIES), SbxSTRING, SbxSTRING, aProp, -2, false, false ); + xVarRef = new SbUnoProperty( ID_DBG_PROPERTIES, SbxSTRING, SbxSTRING, aProp, -2, false, false ); QuickInsert( xVarRef.get() ); // Id == -3: output the Methods - xVarRef = new SbUnoProperty( OUString(ID_DBG_METHODS), SbxSTRING, SbxSTRING, aProp, -3, false, false ); + xVarRef = new SbUnoProperty( ID_DBG_METHODS, SbxSTRING, SbxSTRING, aProp, -3, false, false ); QuickInsert( xVarRef.get() ); } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index e4febca102ea..139d154828f4 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1924,7 +1924,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b } else if( rItem.m_aObjClass.equalsIgnoreAsciiCase( pCollectionStr ) ) { - BasicCollection* pNewCollection = new BasicCollection( OUString(pCollectionStr) ); + BasicCollection* pNewCollection = new BasicCollection( pCollectionStr ); pNewCollection->SetName( rItem.m_aObjName ); pNewCollection->SetParent( rItem.m_pObjParent ); refVar->PutObject( pNewCollection ); diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 3635a47e3bc4..8284a1acf7ed 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -108,7 +108,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite ) SbStdPicture::SbStdPicture() : - SbxObject( OUString("Picture")) + SbxObject( "Picture" ) { // Properties SbxVariable* p = Make( "Type", SbxClassType::Property, SbxVARIANT ); @@ -212,7 +212,7 @@ void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, bool bWrite ) SbStdFont::SbStdFont() - : SbxObject( OUString("Font") ) + : SbxObject( "Font" ) , bBold(false) , bItalic(false) , bStrikeThrough(false) @@ -370,7 +370,7 @@ void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool ) SbStdClipboard::SbStdClipboard() : - SbxObject( OUString("Clipboard") ) + SbxObject( "Clipboard" ) { SbxVariable* p = Find( "Name", SbxClassType::Property ); assert(p && "No Name Property"); diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index f72785057e14..7604137ce246 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -131,7 +131,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : Any propValue( makeAny( beans::PropertyValue( - OUString("nodepath"), -1, + "nodepath", -1, makeAny( OUString("/org.openoffice.Office.Canvas") ), beans::PropertyState_DIRECT_VALUE ) ) ); @@ -143,7 +143,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : propValue = makeAny( beans::PropertyValue( - OUString("nodepath"), -1, + "nodepath", -1, makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ), beans::PropertyState_DIRECT_VALUE ) ); diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index b95c8da2a6d0..3ae27a6b858f 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -53,7 +53,7 @@ public: }; CalcConfigItem::CalcConfigItem() - : ConfigItem( OUString( "Office.Calc/Layout" )) + : ConfigItem( "Office.Calc/Layout" ) { } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 738c8807fa2f..dadecb76a516 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -739,7 +739,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() //create data uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString( "CellRangeRepresentation" ), -1, + "CellRangeRepresentation", -1, uno::makeAny( OUString("all") ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( "HasCategories", diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx index 8b00e84333e8..3238246125c5 100644 --- a/compilerplugins/clang/stringconstant.cxx +++ b/compilerplugins/clang/stringconstant.cxx @@ -152,6 +152,10 @@ private: CallExpr const * expr, unsigned arg, FunctionDecl const * callee, bool explicitFunctionalCastNotation); + void handleOUStringCtor( + Expr const * expr, Expr const * argExpr, FunctionDecl const * callee, + bool explicitFunctionalCastNotation); + void handleFunArgOstring( CallExpr const * expr, unsigned arg, FunctionDecl const * callee); @@ -1054,37 +1058,33 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) { return true; } - - // Now check for calls to one of our exception classes where an unnecessary OUString - // constructor is used for the first parameter. - if (isInUnoIncludeFile(expr->getConstructor()->getCanonicalDecl())) { - return true; - } - if (!expr->getConstructor()->getParent()->getName().endswith("Exception")) { - return true; - } - if (expr->getNumArgs() == 0) { - return true; - } - MaterializeTemporaryExpr const * subExpr1 = dyn_cast<MaterializeTemporaryExpr>(expr->getArg(0)); - if (!subExpr1) { - return true; - } - if (!loplugin::TypeCheck(subExpr1->getType()).Class("OUString").Namespace("rtl").GlobalNamespace()) { + std::string file(compiler.getSourceManager().getFilename( + compiler.getSourceManager().getSpellingLoc(expr->getLocStart()))); + if (file == SRCDIR "/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx") + { return true; } - ImplicitCastExpr const * subExpr2 = dyn_cast<ImplicitCastExpr>(subExpr1->GetTemporaryExpr()); - if (!subExpr2) { + if (isInUnoIncludeFile(expr->getLocStart())) { return true; } - CXXFunctionalCastExpr const * subExpr3 = dyn_cast<CXXFunctionalCastExpr>(subExpr2->getSubExpr()); - if (!subExpr3) { - return true; + auto consDecl = expr->getConstructor(); + for (unsigned i = 0; i != consDecl->getNumParams(); ++i) { + auto t = consDecl->getParamDecl(i)->getType(); + if (loplugin::TypeCheck(t).NotSubstTemplateTypeParmType() + .LvalueReference().Const().NotSubstTemplateTypeParmType() + .Class("OUString").Namespace("rtl").GlobalNamespace()) + { + auto argExpr = expr->getArg(i); + if (argExpr && i <= consDecl->getNumParams()) + { + if (!hasOverloads(consDecl, expr->getNumArgs())) + { + handleOUStringCtor(expr, argExpr, consDecl, true); + } + } + } } - report(DiagnosticsEngine::Warning, - "no need to use an explicit OUString constructor here", - subExpr3->getLocStart()) - << subExpr3->getSourceRange(); + return true; } @@ -1592,7 +1592,14 @@ void StringConstant::handleOUStringCtor( CallExpr const * expr, unsigned arg, FunctionDecl const * callee, bool explicitFunctionalCastNotation) { - auto e0 = expr->getArg(arg)->IgnoreParenImpCasts(); + handleOUStringCtor(expr, expr->getArg(arg), callee, explicitFunctionalCastNotation); +} + +void StringConstant::handleOUStringCtor( + Expr const * expr, Expr const * argExpr, FunctionDecl const * callee, + bool explicitFunctionalCastNotation) +{ + auto e0 = argExpr->IgnoreParenImpCasts(); auto e1 = dyn_cast<CXXFunctionalCastExpr>(e0); if (e1 == nullptr) { if (explicitFunctionalCastNotation) { diff --git a/compilerplugins/clang/test/stringconstant.cxx b/compilerplugins/clang/test/stringconstant.cxx index 0fd8c3b87850..f2cf48c602a7 100644 --- a/compilerplugins/clang/test/stringconstant.cxx +++ b/compilerplugins/clang/test/stringconstant.cxx @@ -14,6 +14,12 @@ #include "com/sun/star/uno/Reference.hxx" #include "rtl/strbuf.hxx" +extern void foo(OUString const &); // expected-error {{extern prototype in main file without definition}} + +struct Foo { + Foo(OUString const &, int) {} +}; + int main() { char const s1[] = "foo"; char const * const s2 = "foo"; @@ -47,6 +53,11 @@ int main() { sb.insert(0, "foo", std::strlen("foo")); // expected-error {{rewrite call of 'rtl::OStringBuffer::insert' with string constant and matching length arguments as call of 'rtl::OStringBuffer::insert' [loplugin:stringconstant]}} sb.insert(0, s1, 3/*std::strlen(s1)*/); // expected-error {{rewrite call of 'rtl::OStringBuffer::insert' with string constant and matching length arguments as call of 'rtl::OStringBuffer::insert' [loplugin:stringconstant]}} sb.insert(0, s2, 3/*std::strlen(s2)*/); // expected-error {{rewrite call of 'rtl::OStringBuffer::insert' with string constant and matching length arguments as call of 'rtl::OStringBuffer::insert', and turn the non-array string constant into an array [loplugin:stringconstant]}} + + foo(OUString("xxx")); // expected-error {{in call of 'foo', replace 'OUString' constructed from a string literal directly with the string literal [loplugin:stringconstant}} + Foo aFoo(OUString("xxx"), 1); // expected-error {{in call of 'Foo::Foo', replace 'OUString' constructed from a string literal directly with the string literal}} + (void)aFoo; } + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index cd4614aa4f8f..682f99f3b75d 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -450,7 +450,7 @@ css::uno::Reference< css::uno::XInterface > Test::createViewAccess( css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - OUString("nodepath"), + "nodepath", css::uno::makeAny(path)))); return provider_->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", @@ -463,7 +463,7 @@ css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess( css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - OUString("nodepath"), + "nodepath", css::uno::makeAny(path)))); return provider_->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 184828958966..ba73d0dddf03 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -927,7 +927,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr throw SQLException( sMessage, nullptr, - OUString( "22018" ), + "22018", 22018, Any() ); @@ -953,7 +953,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour throw SQLException( sMessage, nullptr, - OUString( "22001" ), + "22001", 22001, Any() ); diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 1f2466ca3774..ae8b81bbda99 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -159,7 +159,7 @@ namespace param sal_Int32 nProperties( aProperties.getLength() ); aProperties.realloc( nProperties + 1 ); aProperties[ nProperties ] = Property( - OUString( "Value" ), + "Value", PROPERTY_ID_VALUE, ::cppu::UnoType< Any >::get(), PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index e9983a151782..1f30e6ba419c 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -321,7 +321,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu Sequence< Any > args(1); args[0] = makeAny( NamedValue( - OUString("nodepath"), + "nodepath", makeAny(_rPath))); Reference< XInterface > xInterface( _rxConfProvider->createInstanceWithArguments( diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx index 5eb8888be5cd..04d38c1265af 100644 --- a/connectivity/source/drivers/calc/CTables.cxx +++ b/connectivity/source/drivers/calc/CTables.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::container; sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName) { OCalcTable* pTable = new OCalcTable(this, static_cast<OCalcConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()), - _rName,OUString("TABLE")); + _rName,"TABLE"); sdbcx::ObjectType xRet = pTable; pTable->construct(); return xRet; diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 21ecbe05ac8c..6e920abdf729 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -85,24 +85,24 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString aBoolean[1] = "1"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ShowDeleted") - ,OUString("Display inactive records.") + "ShowDeleted" + ,"Display inactive records." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EnableSQL92Check") - ,OUString("Use SQL92 naming constraints.") + "EnableSQL92Check" + ,"Use SQL92 naming constraints." ,false - ,OUString("0") + ,"0" ,aBoolean) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index a2a5add764e3..787226e2ed84 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::container; sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName) { ODbaseTable* pRet = new ODbaseTable(this, static_cast<ODbaseConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()), - _rName,OUString("TABLE")); + _rName,"TABLE"); sdbcx::ObjectType xRet = pRet; pRet->construct(); diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index a0a1427954e9..ad77694e01cd 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -120,43 +120,43 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt aBoolean[1] = "1"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("Extension") - ,OUString("Extension of the file format.") + "Extension" + ,"Extension of the file format." ,false - ,OUString(".*") + ,".*" ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ShowDeleted") - ,OUString("Display inactive records.") + "ShowDeleted" + ,"Display inactive records." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EnableSQL92Check") - ,OUString("Use SQL92 naming constraints.") + "EnableSQL92Check" + ,"Use SQL92 naming constraints." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("UseRelativePath") - ,OUString("Handle the connection url as relative path.") + "UseRelativePath" + ,"Handle the connection url as relative path." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("URL") - ,OUString("The URL of the database document which is used to create an absolute path.") + "URL" + ,"The URL of the database document which is used to create an absolute path." ,false ,OUString() ,Sequence< OUString >()) diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 1219f46cf7b8..3eea3918164a 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -88,38 +88,38 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString aBoolean[1] = "1"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("FieldDelimiter") - ,OUString("Field separator.") + "FieldDelimiter" + ,"Field separator." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("HeaderLine") - ,OUString("Text contains headers.") + "HeaderLine" + ,"Text contains headers." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("StringDelimiter") - ,OUString("Text separator.") + "StringDelimiter" + ,"Text separator." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("DecimalDelimiter") - ,OUString("Decimal separator.") + "DecimalDelimiter" + ,"Decimal separator." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ThousandDelimiter") - ,OUString("Thousands separator.") + "ThousandDelimiter" + ,"Thousands separator." ,false - ,OUString("0") + ,"0" ,aBoolean) ); return ::comphelper::concatSequences(OFileDriver::getPropertyInfo(url,info ), diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx index f0ce8151d0b6..5c9782caf24d 100644 --- a/connectivity/source/drivers/flat/ETables.cxx +++ b/connectivity/source/drivers/flat/ETables.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::container; sdbcx::ObjectType OFlatTables::createObject(const OUString& _rName) { OFlatTable* pRet = new OFlatTable(this, static_cast<OFlatConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()), - _rName,OUString("TABLE")); + _rName,"TABLE"); sdbcx::ObjectType xRet = pRet; pRet->construct(); return xRet; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index ba542ff972d0..abcd6d23f301 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -246,7 +246,7 @@ namespace connectivity // security: permitted Java classes NamedValue aPermittedClasses( - OUString( "hsqldb.method_class_names" ), + "hsqldb.method_class_names", makeAny( lcl_getPermittedJavaMethods_nothrow( m_xContext ) ) ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); @@ -410,24 +410,24 @@ namespace connectivity return Sequence< DriverPropertyInfo >(); ::std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( - OUString("Storage") - ,OUString("Defines the storage where the database will be stored.") + "Storage" + ,"Defines the storage where the database will be stored." ,true ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("URL") - ,OUString("Defines the url of the data source.") + "URL" + ,"Defines the url of the data source." ,true ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("AutoRetrievingStatement") - ,OUString("Defines the statement which will be executed to retrieve auto increment values.") + "AutoRetrievingStatement" + ,"Defines the statement which will be executed to retrieve auto increment values." ,false - ,OUString("CALL IDENTITY()") + ,"CALL IDENTITY()" ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); @@ -832,13 +832,13 @@ namespace connectivity Sequence< Any > aArguments(2); // the path to the node to open aArguments[0] <<= PropertyValue( - OUString("nodepath"), 0, + "nodepath", 0, makeAny( OUString("/org.openoffice.Setup/L10N" ) ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - OUString("depth"), 0, + "depth", 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE ); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index bb1d45337318..af83a5c406b1 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -138,92 +138,92 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const aBooleanValues[1] = "true"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("JavaDriverClass") - ,OUString("The JDBC driver class name.") + "JavaDriverClass" + ,"The JDBC driver class name." ,true ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("JavaDriverClassPath") - ,OUString("The class path where to look for the JDBC driver.") + "JavaDriverClassPath" + ,"The class path where to look for the JDBC driver." ,true - ,OUString( "" ) + , "" ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("SystemProperties") - ,OUString("Additional properties to set at java.lang.System before loading the driver.") + "SystemProperties" + ,"Additional properties to set at java.lang.System before loading the driver." ,true - ,OUString( "" ) + , "" ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ParameterNameSubstitution") - ,OUString("Change named parameters with '?'.") + "ParameterNameSubstitution" + ,"Change named parameters with '?'." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("IgnoreDriverPrivileges") - ,OUString("Ignore the privileges from the database driver.") + "IgnoreDriverPrivileges" + ,"Ignore the privileges from the database driver." ,false - ,OUString( "false" ) + , "false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("IsAutoRetrievingEnabled") - ,OUString("Retrieve generated values.") + "IsAutoRetrievingEnabled" + ,"Retrieve generated values." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("AutoRetrievingStatement") - ,OUString("Auto-increment statement.") + "AutoRetrievingStatement" + ,"Auto-increment statement." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("GenerateASBeforeCorrelationName") - ,OUString("Generate AS before table correlation names.") + "GenerateASBeforeCorrelationName" + ,"Generate AS before table correlation names." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("IgnoreCurrency") - ,OUString("Ignore the currency field from the ResultsetMetaData.") + "IgnoreCurrency" + ,"Ignore the currency field from the ResultsetMetaData." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EscapeDateTime") - ,OUString("Escape date time format.") + "EscapeDateTime" + ,"Escape date time format." ,false - ,OUString( "true" ) + ,"true" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("TypeInfoSettings") - ,OUString("Defines how the type info of the database metadata should be manipulated.") + "TypeInfoSettings" + ,"Defines how the type info of the database metadata should be manipulated." ,false ,OUString( ) ,Sequence< OUString > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ImplicitCatalogRestriction") - ,OUString("The catalog which should be used in getTables calls, when the caller passed NULL.") + "ImplicitCatalogRestriction" + ,"The catalog which should be used in getTables calls, when the caller passed NULL." ,false ,OUString( ) ,Sequence< OUString > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ImplicitSchemaRestriction") - ,OUString("The schema which should be used in getTables calls, when the caller passed NULL.") + "ImplicitSchemaRestriction" + ,"The schema which should be used in getTables calls, when the caller passed NULL." ,false ,OUString( ) ,Sequence< OUString > ()) diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 491dd7a0d72e..128bb6daf9c7 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -170,12 +170,12 @@ namespace connectivity if ( _eType == T_DRIVERTYPE::Odbc ) { aProps.push_back( PropertyValue( - OUString("Silent") + "Silent" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - OUString("PreventGetVersionColumns") + "PreventGetVersionColumns" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); @@ -185,7 +185,7 @@ namespace connectivity if (!jdc) { aProps.push_back( PropertyValue( - OUString("JavaDriverClass") + "JavaDriverClass" ,0 ,makeAny(OUString("com.mysql.jdbc.Driver")) ,PropertyState_DIRECT_VALUE) ); @@ -194,23 +194,23 @@ namespace connectivity else { aProps.push_back( PropertyValue( - OUString("PublicConnectionURL") + "PublicConnectionURL" ,0 ,makeAny(_sUrl) ,PropertyState_DIRECT_VALUE) ); } aProps.push_back( PropertyValue( - OUString("IsAutoRetrievingEnabled") + "IsAutoRetrievingEnabled" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - OUString("AutoRetrievingStatement") + "AutoRetrievingStatement" ,0 ,makeAny(OUString("SELECT LAST_INSERT_ID()")) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - OUString("ParameterNameSubstitution") + "ParameterNameSubstitution" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); @@ -335,25 +335,25 @@ namespace connectivity aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("SuppressVersionColumns") - ,OUString("Display version columns (when available).") + "SuppressVersionColumns" + ,"Display version columns (when available)." ,false - ,OUString("0") + ,"0" ,aBoolean) ); const T_DRIVERTYPE eType = lcl_getDriverType( url ); if ( eType == T_DRIVERTYPE::Jdbc ) { aDriverInfo.push_back(DriverPropertyInfo( - OUString("JavaDriverClass") - ,OUString("The JDBC driver class name.") + "JavaDriverClass" + ,"The JDBC driver class name." ,true ,getJavaDriverClass(info) ,Sequence< OUString >()) @@ -362,15 +362,15 @@ namespace connectivity else if ( eType == T_DRIVERTYPE::Native ) { aDriverInfo.push_back(DriverPropertyInfo( - OUString("LocalSocket") - ,OUString("The file path of a socket to connect to a local MySQL server.") + "LocalSocket" + ,"The file path of a socket to connect to a local MySQL server." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("NamedPipe") - ,OUString("The name of a pipe to connect to a local MySQL server.") + "NamedPipe" + ,"The name of a pipe to connect to a local MySQL server." ,false ,OUString() ,Sequence< OUString >()) diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index c22db08d7226..0a166e6b8424 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -124,66 +124,66 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr aBooleanValues[1] = "true"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("UseCatalog") - ,OUString("Use catalog for file-based databases.") + "UseCatalog" + ,"Use catalog for file-based databases." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("SystemDriverSettings") - ,OUString("Driver settings.") + "SystemDriverSettings" + ,"Driver settings." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ParameterNameSubstitution") - ,OUString("Change named parameters with '?'.") + "ParameterNameSubstitution" + ,"Change named parameters with '?'." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("IgnoreDriverPrivileges") - ,OUString("Ignore the privileges from the database driver.") + "IgnoreDriverPrivileges" + ,"Ignore the privileges from the database driver." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("IsAutoRetrievingEnabled") - ,OUString("Retrieve generated values.") + "IsAutoRetrievingEnabled" + ,"Retrieve generated values." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("AutoRetrievingStatement") - ,OUString("Auto-increment statement.") + "AutoRetrievingStatement" + ,"Auto-increment statement." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("GenerateASBeforeCorrelationName") - ,OUString("Generate AS before table correlation names.") + "GenerateASBeforeCorrelationName" + ,"Generate AS before table correlation names." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EscapeDateTime") - ,OUString("Escape date time format.") + "EscapeDateTime" + ,"Escape date time format." ,false - ,OUString( "true" ) + ,"true" ,aBooleanValues) ); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 5336ef24188f..19e03091541c 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -95,25 +95,25 @@ static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper() // Should really share! // At least use for the handles the #define'd values in .hxx file... Property( - OUString("CursorName"), 0, + "CursorName", 0, ::cppu::UnoType<OUString>::get() , 0 ), Property( - OUString("EscapeProcessing"), 1, + "EscapeProcessing", 1, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("FetchDirection"), 2, + "FetchDirection", 2, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("FetchSize"), 3, + "FetchSize", 3, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("IsBookmarkable"), 4, + "IsBookmarkable", 4, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("ResultSetConcurrency"), 5, + "ResultSetConcurrency", 5, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetType"), 6, + "ResultSetType", 6, ::cppu::UnoType<sal_Int32>::get() , 0 ) }; static_assert( SAL_N_ELEMENTS(aTable) == BASERESULTSET_SIZE, "wrong number of elements" ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 563345047368..fac27fdde9e3 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -540,7 +540,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) buf.append( errorMessage ); // HY092 is "Invalid attribute/option identifier." // Just the most likely error; the error might be HY024 "Invalid attribute value". - throw SQLException( buf.makeStringAndClear(), *this, OUString("HY092"), 5, Any() ); + throw SQLException( buf.makeStringAndClear(), *this, "HY092", 5, Any() ); } for ( PQconninfoOption * opt = oOpts.get(); opt->keyword != nullptr; ++opt) diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index ee75cde78e12..1ec3b8073735 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -98,31 +98,31 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString("CursorName"), 0, + "CursorName", 0, ::cppu::UnoType<OUString>::get() , 0 ), Property( - OUString("EscapeProcessing"), 1, + "EscapeProcessing", 1, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("FetchDirection"), 2, + "FetchDirection", 2, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("FetchSize"), 3, + "FetchSize", 3, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxFieldSize"), 4, + "MaxFieldSize", 4, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxRows"), 5, + "MaxRows", 5, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("QueryTimeOut"), 6, + "QueryTimeOut", 6, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetConcurrency"), 7, + "ResultSetConcurrency", 7, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetType"), 8, + "ResultSetType", 8, ::cppu::UnoType<sal_Int32>::get() , 0 ) }; static_assert( SAL_N_ELEMENTS(aTable) == PREPARED_STATEMENT_SIZE, "wrong number of elements" ); diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index 0a0b06bb4e88..5fb50e7e63a9 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -97,7 +97,7 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) // I did not find "IM001" in a specific standard, // but it seems to be used by other systems (such as ODBC) // and some parts of LibreOffice special-case it. - OUString( "IM001" ), 1, Any() ); + "IM001", 1, Any() ); } return m_meta; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 26910e33fc30..51a38056945b 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -116,31 +116,31 @@ static ::cppu::IPropertyArrayHelper & getStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString("CursorName"), 0, + "CursorName", 0, ::cppu::UnoType<OUString>::get() , 0 ), Property( - OUString("EscapeProcessing"), 1, + "EscapeProcessing", 1, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("FetchDirection"), 2, + "FetchDirection", 2, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("FetchSize"), 3, + "FetchSize", 3, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxFieldSize"), 4, + "MaxFieldSize", 4, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxRows"), 5, + "MaxRows", 5, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("QueryTimeOut"), 6, + "QueryTimeOut", 6, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetConcurrency"), 7, + "ResultSetConcurrency", 7, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetType"), 8, + "ResultSetType", 8, ::cppu::UnoType<sal_Int32>::get() , 0 ) }; static_assert( SAL_N_ELEMENTS(aTable) == STATEMENT_SIZE, "wrong number of elements" ); diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index efecdac1fad9..48728f51ca82 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -120,7 +120,7 @@ void bufferEscapeConstant( OUStringBuffer & buf, const OUString & value, Connect // We have no good XInterface Reference to pass here, so just give NULL throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding), nullptr, - OUString("22018"), + "22018", -1, Any()); } @@ -166,7 +166,7 @@ static inline void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString // Implementation-defined SQLACCESS error throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding), nullptr, - OUString("22018"), + "22018", -1, Any()); } diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 8e880557793c..18e53246187f 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1597,8 +1597,8 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN nullptr, false, rTableName, - OUString("Table"), - OUString("New Created Table"), + "Table", + "New Created Table", rSchemaName, rCatalogName ); @@ -1704,7 +1704,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ // did not find a column with this name in any of the tables OParseColumn* pColumn = new OParseColumn( aNewColName, - OUString("VARCHAR"), + "VARCHAR", // TODO: does this match with _nType? // Or should be fill this from the getTypeInfo of the connection? OUString(), diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index c588e2d22ed1..1c237ad4fbee 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1033,10 +1033,10 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) { OUString aEmptyString; OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::set_fct_spec)); - pNewNode->append(new OSQLInternalNode(OUString("{"), SQLNodeType::Punctuation)); + pNewNode->append(new OSQLInternalNode("{", SQLNodeType::Punctuation)); OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec)); pNewNode->append(pDateNode); - pNewNode->append(new OSQLInternalNode(OUString("}"), SQLNodeType::Punctuation)); + pNewNode->append(new OSQLInternalNode("}", SQLNodeType::Punctuation)); switch (nType) { @@ -1493,7 +1493,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode) OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() > 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString("?") ,SQLNodeType::Punctuation,0); + OSQLParseNode* pNewNode = new OSQLParseNode("?" ,SQLNodeType::Punctuation,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); sal_Int32 nChildCount = pChildNode->count(); for(sal_Int32 j=1;j < nChildCount;++j) @@ -1754,7 +1754,7 @@ void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString { OSQLParseNode * pCol = removeAt((sal_uInt32)0); append(new OSQLParseNode(rTableAlias,SQLNodeType::Name)); - append(new OSQLParseNode(OUString("."),SQLNodeType::Punctuation)); + append(new OSQLParseNode(".",SQLNodeType::Punctuation)); append(pCol); } else @@ -1780,7 +1780,7 @@ OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf) { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term)); pNewNode->append(pLeftLeaf); - pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode("AND",SQLNodeType::Keyword,SQL_TOKEN_AND)); pNewNode->append(pRightLeaf); return pNewNode; } @@ -1789,7 +1789,7 @@ OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf) { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pLeftLeaf); - pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode("OR",SQLNodeType::Keyword,SQL_TOKEN_OR)); pNewNode->append(pRightLeaf); return pNewNode; } @@ -1889,7 +1889,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode("AND",SQLNodeType::Keyword,SQL_TOKEN_AND)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1909,7 +1909,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode("OR",SQLNodeType::Keyword,SQL_TOKEN_OR)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1947,7 +1947,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pComparison->getChild(1); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) // no NOT token (empty rule) - pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT); else { assert(SQL_ISTOKEN(pNot,NOT)); @@ -1965,22 +1965,22 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool case SQLNodeType::Equal: assert(pComparison->getNodeType() == SQLNodeType::Equal && "OSQLParseNode::negateSearchCondition: unexpected node type!"); - pNewComparison = new OSQLParseNode(OUString("<>"),SQLNodeType::NotEqual,SQL_NOTEQUAL); + pNewComparison = new OSQLParseNode("<>",SQLNodeType::NotEqual,SQL_NOTEQUAL); break; case SQLNodeType::Less: - pNewComparison = new OSQLParseNode(OUString(">="),SQLNodeType::GreatEq,SQL_GREATEQ); + pNewComparison = new OSQLParseNode(">=",SQLNodeType::GreatEq,SQL_GREATEQ); break; case SQLNodeType::Great: - pNewComparison = new OSQLParseNode(OUString("<="),SQLNodeType::LessEq,SQL_LESSEQ); + pNewComparison = new OSQLParseNode("<=",SQLNodeType::LessEq,SQL_LESSEQ); break; case SQLNodeType::LessEq: - pNewComparison = new OSQLParseNode(OUString(">"),SQLNodeType::Great,SQL_GREAT); + pNewComparison = new OSQLParseNode(">",SQLNodeType::Great,SQL_GREAT); break; case SQLNodeType::GreatEq: - pNewComparison = new OSQLParseNode(OUString("<"),SQLNodeType::Less,SQL_LESS); + pNewComparison = new OSQLParseNode("<",SQLNodeType::Less,SQL_LESS); break; case SQLNodeType::NotEqual: - pNewComparison = new OSQLParseNode(OUString("="),SQLNodeType::Equal,SQL_EQUAL); + pNewComparison = new OSQLParseNode("=",SQLNodeType::Equal,SQL_EQUAL); break; } pSearchCondition->replace(pComparison, pNewComparison); @@ -2000,7 +2000,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pPart2->getChild(nNotPos); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) // no NOT token (empty rule) - pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT); else { assert(SQL_ISTOKEN(pNot,NOT)); @@ -2014,7 +2014,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 ); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) - pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT); else pNotNot = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::sql_not)); pSearchCondition->getChild( 1 )->replace(pNot, pNotNot); @@ -2104,9 +2104,9 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition) OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC); pNewNode = MakeORNode(p1stAnd,p2ndAnd); OSQLParseNode* pNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNode->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNode->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNode->append(pNewNode); - pNode->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNode->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(p1stAnd); OSQLParseNode::eraseBraces(p2ndAnd); replaceAndReset(pSearchCondition,pNode); @@ -2183,9 +2183,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2200,9 +2200,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2217,9 +2217,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2234,9 +2234,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index c481b7707f6a..580cb0b8c271 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -506,7 +506,7 @@ void Test::testExceptions() { aEmptySequence; test::codemaker::cppumaker::TestException1 e11( - rtl::OUString("abc"), nullptr, 1, + "abc", nullptr, 1, css::uno::makeAny(123.0), test::codemaker::cppumaker::HelperEnum_ONE, test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2); @@ -516,7 +516,7 @@ void Test::testExceptions() { e13 = e11; CPPUNIT_ASSERT_EQUAL(e11, e13); test::codemaker::cppumaker::TestException2 e21( - rtl::OUString("abc"), nullptr, 1, + "abc", nullptr, 1, css::uno::makeAny(123.0), test::codemaker::cppumaker::HelperEnum_ONE, test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index e10ecd7ddf4b..0c05e23bf9b0 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1028,9 +1028,7 @@ MenuSaveInData::GetEntries() { if ( pRootEntry == nullptr ) { - pRootEntry = new SvxConfigEntry( - OUString("MainMenus"), - OUString(), true); + pRootEntry = new SvxConfigEntry( "MainMenus", OUString(), true); if ( m_xMenuSettings.is() ) { @@ -3880,9 +3878,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() if ( pRootEntry == nullptr ) { - pRootEntry.reset( new SvxConfigEntry( - OUString("MainToolbars"), - OUString(), true) ); + pRootEntry.reset( new SvxConfigEntry( "MainToolbars", OUString(), true) ); uno::Sequence< uno::Sequence < beans::PropertyValue > > info = GetConfigManager()->getUIElementsInfo( diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 474a74014733..662ce50234f2 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -174,7 +174,7 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const SvxChartOptions::SvxChartOptions() : - ::utl::ConfigItem( OUString("Office.Chart") ), + ::utl::ConfigItem( "Office.Chart" ), mbIsInitialized( false ) { maPropertyNames.realloc( 1 ); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index f8244f5dd5cc..3e14eea080cb 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -469,7 +469,7 @@ CanvasSettings::CanvasSettings() : Any propValue( makeAny( NamedValue( - OUString("nodepath"), + "nodepath", makeAny( OUString("/org.openoffice.Office.Canvas") ) ) ) ); mxForceFlagNameAccess.set( @@ -480,7 +480,7 @@ CanvasSettings::CanvasSettings() : propValue = makeAny( NamedValue( - OUString("nodepath"), + "nodepath", makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ) ) ); Reference<XNameAccess> xNameAccess( @@ -1170,7 +1170,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& Reference< XNameAccess > theNameAccess; // find out which locales are currently installed and add them to the listbox - theArgs[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(OUString(sInstalledLocalesPath)))); + theArgs[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sInstalledLocalesPath)))); theNameAccess.set( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW ); seqInstalledLanguages = theNameAccess->getElementNames(); @@ -1189,7 +1189,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& // find out whether the user has a specific locale specified Sequence< Any > theArgs2(1); - theArgs2[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(OUString(sUserLocalePath)))); + theArgs2[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sUserLocalePath)))); theNameAccess.set( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW ); if (theNameAccess->hasByName(sUserLocaleKey)) @@ -1370,7 +1370,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) css::configuration::theDefaultProvider::get( comphelper::getProcessComponentContext())); Sequence< Any > theArgs(1); - theArgs[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(OUString(sUserLocalePath)))); + theArgs[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sUserLocalePath)))); Reference< XPropertySet >xProp( theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW ); if ( !m_sUserLocaleValue.equals(aLangString)) diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index a9bfaed9291e..eaf355b97c52 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -70,7 +70,7 @@ using namespace svx; #define POSTFIX_USER "_user" #define POSTFIX_WRITABLE "_writable" #define VAR_ONE "%1" -#define IODLG_CONFIGNAME OUString("FilePicker_Save") +#define IODLG_CONFIGNAME "FilePicker_Save" // struct OptPath_Impl --------------------------------------------------- diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index e2f241190067..22b2453c6032 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -342,13 +342,13 @@ bool SfxMacroTabPage::AssignDeleteHdl(Control* pBtn) if( sScriptURI.startsWith( "vnd.sun.star.script:" ) ) { aTbl.Insert( - nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_SF ) ) ); + nEvent, SvxMacro( sScriptURI, SVX_MACRO_LANGUAGE_SF ) ); } else { OSL_ENSURE( false, "SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" ); aTbl.Insert( - nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); + nEvent, SvxMacro( sScriptURI, SVX_MACRO_LANGUAGE_STARBASIC ) ); } } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index a365cf607f0c..df6aad67f5ae 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -156,8 +156,7 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) static vcl::Font& lcl_GetDefaultBulletFont() { static bool bInit = false; - static vcl::Font aDefBulletFont( OUString("StarSymbol"), - OUString(), Size( 0, 14 ) ); + static vcl::Font aDefBulletFont( "StarSymbol", OUString(), Size( 0, 14 ) ); if(!bInit) { aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 4a53e8377dc0..a1010534703c 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -340,13 +340,13 @@ bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _rxMod { Sequence< Any > aWizardArgs(2); aWizardArgs[0] <<= PropertyValue( - OUString("ParentWindow"), + "ParentWindow", 0, makeAny( lcl_getTopMostWindow( m_aContext ) ), PropertyState_DIRECT_VALUE); aWizardArgs[1] <<= PropertyValue( - OUString("InitialSelection"), + "InitialSelection", 0, makeAny( _rxModel ), PropertyState_DIRECT_VALUE); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 027b7eb08a91..72202357a71d 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -119,7 +119,7 @@ void OApplicationController::convertToView(const OUString& _sName) ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, false, ::dbtools::EComposeRule::InTableDefinitions ) ); Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); if ( !xView.is() ) - throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this,OUString( "S1000" ) ,0,Any()); + throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any()); getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView)); } } @@ -175,7 +175,7 @@ void OApplicationController::openDialog( const OUString& _sServiceName ) xWindow = VCLUnoHelper::GetInterface(getView()->Window::GetParent()); } // the parent window - aArgs[nArgPos++] <<= PropertyValue( OUString("ParentWindow"), + aArgs[nArgPos++] <<= PropertyValue( "ParentWindow", 0, makeAny(xWindow), PropertyState_DIRECT_VALUE); @@ -187,7 +187,7 @@ void OApplicationController::openDialog( const OUString& _sServiceName ) if ( !sInitialSelection.isEmpty() ) { aArgs[ nArgPos++ ] <<= PropertyValue( - OUString( "InitialSelection" ), 0, + "InitialSelection", 0, makeAny( sInitialSelection ), PropertyState_DIRECT_VALUE ); } diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 3f0769f462e0..7415e3a10698 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -254,7 +254,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU try { Reference<XInitialization > xIni(xController,UNO_QUERY); - PropertyValue aFrame(OUString("Frame"),0,makeAny(rFrame),PropertyState_DIRECT_VALUE); + PropertyValue aFrame("Frame",0,makeAny(rFrame),PropertyState_DIRECT_VALUE); Sequence< Any > aInitArgs(m_aArgs.getLength()+1); Any* pBegin = aInitArgs.getArray(); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index f13aee4edc59..2ab8bf61b140 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -695,13 +695,13 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm case DataType::BOOLEAN: { aCurrentModelType = "CheckBox"; - aInitialValues.push_back( NamedValue( OUString( "VisualEffect" ), makeAny( VisualEffect::FLAT ) ) ); + aInitialValues.push_back( NamedValue( "VisualEffect", makeAny( VisualEffect::FLAT ) ) ); sDefaultProperty = PROPERTY_DEFAULTSTATE; sal_Int32 nNullable = ColumnValue::NULLABLE_UNKNOWN; OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_ISNULLABLE ) >>= nNullable ); aInitialValues.push_back( NamedValue( - OUString( "TriState" ), + "TriState", makeAny( ColumnValue::NO_NULLS != nNullable ) ) ); if ( ColumnValue::NO_NULLS == nNullable ) @@ -711,7 +711,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm case DataType::LONGVARCHAR: case DataType::CLOB: - aInitialValues.push_back( NamedValue( OUString( "MultiLine" ), makeAny( true ) ) ); + aInitialValues.push_back( NamedValue( "MultiLine", makeAny( true ) ) ); SAL_FALLTHROUGH; case DataType::BINARY: case DataType::VARBINARY: @@ -729,8 +729,8 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm sDefaultProperty = PROPERTY_EFFECTIVEDEFAULT; if ( xSupplier.is() ) - aInitialValues.push_back( NamedValue( OUString("FormatsSupplier"), makeAny( xSupplier ) ) ); - aInitialValues.push_back( NamedValue( OUString("TreatAsNumber"), makeAny( bFormattedIsNumeric ) ) ); + aInitialValues.push_back( NamedValue( "FormatsSupplier", makeAny( xSupplier ) ) ); + aInitialValues.push_back( NamedValue( "TreatAsNumber", makeAny( bFormattedIsNumeric ) ) ); aCopyProperties.push_back( static_cast<const OUString&>(PROPERTY_FORMATKEY) ); break; } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 2490f0eaf31c..357b7e23fc20 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -224,7 +224,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal const SfxStringItem* pUser = m_pItemSetHelper->getOutputSet()->GetItem<SfxStringItem>(DSID_USER); if (pUser && pUser->GetValue().getLength()) aReturn.push_back( - PropertyValue( OUString("user"), 0, + PropertyValue( "user", 0, makeAny(OUString(pUser->GetValue())), PropertyState_DIRECT_VALUE)); // check if the connection type requires a password @@ -310,7 +310,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal if (!sPassword.isEmpty()) aReturn.push_back( - PropertyValue( OUString("password"), 0, + PropertyValue( "password", 0, makeAny(OUString(sPassword)), PropertyState_DIRECT_VALUE)); } @@ -396,8 +396,8 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString catch (const Exception& e) { // wrap the exception into an SQLException - SQLException aSQLWrapper(e.Message, getORB(), OUString("S1000"), 0, Any()); - throw SQLException(sCurrentActionError, getORB(), OUString("S1000"), 0, makeAny(aSQLWrapper)); + SQLException aSQLWrapper(e.Message, getORB(), "S1000", 0, Any()); + throw SQLException(sCurrentActionError, getORB(), "S1000", 0, makeAny(aSQLWrapper)); } Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL); @@ -406,7 +406,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString sCurrentActionError = ModuleRes(STR_NOREGISTEREDDRIVER); sCurrentActionError = sCurrentActionError.replaceFirst("#connurl#", _sURL); // will be caught and translated into an SQLContext exception - throw SQLException(sCurrentActionError, getORB(), OUString("S1000"), 0, Any()); + throw SQLException(sCurrentActionError, getORB(), "S1000", 0, Any()); } return xDriver; } @@ -807,7 +807,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS // here we have a special entry for types from oracle if ( aTypeSettings.getLength() ) { - aRelevantSettings.insert(PropertyValue(OUString("TypeInfoSettings"), 0, makeAny(aTypeSettings), PropertyState_DIRECT_VALUE)); + aRelevantSettings.insert(PropertyValue("TypeInfoSettings", 0, makeAny(aTypeSettings), PropertyState_DIRECT_VALUE)); } // check which values are still left ('cause they were not present in the original sequence, but are to be set) diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index f4224c789eb1..47d9f13bad92 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -102,7 +102,7 @@ namespace dbaui if ( !aMetaData.supportsUserAdministration( getORB() ) ) { OUString sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,nullptr,OUString("S1000") ,0,Any()); + throw SQLException(sError,nullptr, "S1000" ,0,Any()); } } catch(const SQLException&) diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 46e6e45136b0..6fa310360a1b 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -156,7 +156,7 @@ namespace dbaui m_aControlDependencies.enableOnRadioCheck( *m_pNamedPipeRadio, *m_pNamedPipe ); m_aControlDependencies.addController( std::shared_ptr<svt::DialogController>( - new TextResetOperatorController( *m_pHostName, OUString("localhost") ) + new TextResetOperatorController( *m_pHostName, "localhost" ) ) ); // sockets are available on Unix systems only, named pipes only on Windows diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index f840c18b8dd3..8a7d4879d17b 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -435,7 +435,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp }; OSL_ENSURE(SAL_N_ELEMENTS(aItemInfos) == DSID_LAST_ITEM_ID,"Invalid Ids!"); - _rpPool = new SfxItemPool(OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, + _rpPool = new SfxItemPool("DSAItemPool", DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, aItemInfos, _rpDefaults); _rpPool->FreezeIdRanges(); diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 144e86d4b55e..cdd0bc258557 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -717,7 +717,7 @@ namespace dbaui { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, OUString("sdatabase") ); + FileDialogFlags::NONE, "sdatabase" ); std::shared_ptr<const SfxFilter> pFilter = getStandardDatabaseFilter(); if ( pFilter ) { diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index b2aac31dc5db..e006693b208a 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -62,7 +62,7 @@ void ORowSetImportExport::initialize() m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) - throw SQLException(ModuleRes(STR_UNEXPECTED_ERROR),*this,OUString("S1000") ,0,Any()); + throw SQLException(ModuleRes(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any()); sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index d7b3864001d0..0b75d816e81d 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -205,7 +205,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId aTrans.bHtml = SotClipboardFormatId::HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !bOk || !copyTagTable(aTrans,false,_xConnection) ) - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, OUString("S1000"), 0, Any())); + m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } catch(const SQLException&) { @@ -217,7 +217,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId } } else - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, OUString("S1000"), 0, Any())); + m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData @@ -314,7 +314,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc else if ( !_rDesc.bError ) pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection); else - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, OUString("S1000"), 0, Any())); + m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } } // namespace dbaui diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 4c95c57feb74..987a4ea4d0fc 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -818,7 +818,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent, new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO) }; - SfxItemPool* pPool = new SfxItemPool(OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, &pDefaults); + SfxItemPool* pPool = new SfxItemPool("GridBrowserProperties", SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, &pDefaults); pPool->SetDefaultMetric( MapUnit::MapTwip ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -1445,7 +1445,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo { OUString sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); sError = sError.replaceFirst("#",sNewName); - throw SQLException(sError,nullptr,OUString("S1000") ,0,Any()); + throw SQLException(sError,nullptr,"S1000",0,Any()); } try diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index d0b1943ae657..dac50054acb4 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -90,7 +90,7 @@ LimitBoxController::LimitBoxController( const uno::Reference< uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, uno::Reference< frame::XFrame >(), - OUString( ".uno:DBLimit" ) ), + ".uno:DBLimit" ), m_pLimitBox( nullptr ) { } diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 7bbd6a749ee5..7f6c4a6eb5e8 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -159,42 +159,42 @@ namespace dbaui aProps.realloc( nProp + 6 ); aProps[ nProp++ ] = Property( - OUString( "HeaderLine" ), + "HeaderLine", PROPERTY_ID_HEADER_LINE, ::cppu::UnoType< sal_Bool >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - OUString( "FieldDelimiter" ), + "FieldDelimiter", PROPERTY_ID_FIELD_DELIMITER, ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - OUString( "StringDelimiter" ), + "StringDelimiter", PROPERTY_ID_STRING_DELIMITER, ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - OUString( "DecimalDelimiter" ), + "DecimalDelimiter", PROPERTY_ID_DECIMAL_DELIMITER, ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - OUString( "ThousandDelimiter" ), + "ThousandDelimiter", PROPERTY_ID_THOUSAND_DELIMITER, ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - OUString( "CharSet" ), + "CharSet", PROPERTY_ID_ENCODING, ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index f7798d8a55cb..3c18b93a463f 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -320,7 +320,7 @@ static void impl_setNeedsCompatCheck() comphelper::getProcessComponentContext() ) ); Sequence< Any > theArgs(1); - beans::NamedValue v( OUString("nodepath"), + beans::NamedValue v( "nodepath", makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset( @@ -351,7 +351,7 @@ static bool impl_needsCompatCheck() comphelper::getProcessComponentContext() ) ); Sequence< Any > theArgs(1); - beans::NamedValue v( OUString("nodepath"), + beans::NamedValue v( "nodepath", makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset( diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index c2daf59e0227..257dfb0c6a6c 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -63,7 +63,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > & uno::Reference< lang::XMultiServiceFactory > xConfig( configuration::theDefaultProvider::get(xContext)); uno::Any args[1]; - beans::PropertyValue aValue( OUString("nodepath"), 0, uno::Any( OUString("/org.openoffice.Office.OptionsDialog/Nodes") ), + beans::PropertyValue aValue( "nodepath", 0, uno::Any( OUString("/org.openoffice.Office.OptionsDialog/Nodes") ), beans::PropertyState_DIRECT_VALUE ); args[0] <<= aValue; m_xNameAccessNodes.set( @@ -73,7 +73,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > & // get the 'get more extensions here' url uno::Reference< container::XNameAccess > xNameAccessRepositories; - beans::PropertyValue aValue2( OUString("nodepath"), 0, uno::Any( OUString("/org.openoffice.Office.ExtensionManager/ExtensionRepositories") ), + beans::PropertyValue aValue2( "nodepath", 0, uno::Any( OUString("/org.openoffice.Office.ExtensionManager/ExtensionRepositories") ), beans::PropertyState_DIRECT_VALUE ); args[0] <<= aValue2; xNameAccessRepositories.set( diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b0de4b9ae2c2..2dcd59f90495 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1145,7 +1145,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, try { uno::Sequence<css::beans::PropertyValue> aFilterOptions(2); - aFilterOptions[0] = css::beans::PropertyValue( OUString("FilterOptions"), + aFilterOptions[0] = css::beans::PropertyValue( "FilterOptions", 0, uno::makeAny(OUString::createFromAscii(pOptions)), beans::PropertyState_DIRECT_VALUE); diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index f18188349b79..2749da057d6a 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -365,7 +365,7 @@ extern "C" int unopkg_main() if (subcmd_add) { beans::NamedValue nvSuppress( - OUString("SUPPRESS_LICENSE"), option_suppressLicense ? + "SUPPRESS_LICENSE", option_suppressLicense ? makeAny(OUString("1")):makeAny(OUString("0"))); xExtensionManager->addExtension( cmdPackage, Sequence<beans::NamedValue>(&nvSuppress, 1), diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index 93cc3329b2e6..5ca6377bec34 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -100,7 +100,7 @@ namespace drawinglayer #ifdef DBG_UTIL if(bDoSaveForVisualControl) { - SvFileStream aNew(OUString("c:\\test_content.png"), StreamMode::WRITE|StreamMode::TRUNC); + SvFileStream aNew("c:\\test_content.png", StreamMode::WRITE|StreamMode::TRUNC); vcl::PNGWriter aPNGWriter(aContent); aPNGWriter.Write(aNew); } @@ -130,7 +130,7 @@ namespace drawinglayer #ifdef DBG_UTIL if(bDoSaveForVisualControl) { - SvFileStream aNew(OUString("c:\\test_alpha.png"), StreamMode::WRITE|StreamMode::TRUNC); + SvFileStream aNew("c:\\test_alpha.png", StreamMode::WRITE|StreamMode::TRUNC); vcl::PNGWriter aPNGWriter(aAlpha); aPNGWriter.Write(aNew); } @@ -141,7 +141,7 @@ namespace drawinglayer #ifdef DBG_UTIL if(bDoSaveForVisualControl) { - SvFileStream aNew(OUString("c:\\test_combined.png"), StreamMode::WRITE|StreamMode::TRUNC); + SvFileStream aNew("c:\\test_combined.png", StreamMode::WRITE|StreamMode::TRUNC); vcl::PNGWriter aPNGWriter(aRetval); aPNGWriter.Write(aNew); } diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index a2b0ceff9863..f9dd4cd3ec70 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -225,7 +225,7 @@ void SvxBaseAutoCorrCfg::Load(bool bInit) } SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(OUString("Office.Common/AutoCorrect")), + utl::ConfigItem("Office.Common/AutoCorrect"), rParent(rPar) { } @@ -484,7 +484,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit) } SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(OUString("Office.Writer/AutoFunction")), + utl::ConfigItem("Office.Writer/AutoFunction"), rParent(rPar) { } diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 0c779fb2965b..47b07aa2bfd3 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -176,25 +176,25 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal Any aVal; { aVal <<= rFmt.GetNumberingType(); - beans::PropertyValue aAlignProp( OUString(UNO_NAME_NRULE_NUMBERINGTYPE), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aAlignProp( UNO_NAME_NRULE_NUMBERINGTYPE, -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aAlignProp; } { SvxAdjust eAdj = rFmt.GetNumAdjust(); aVal <<= ConvertUnoAdjust(eAdj); - pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_ADJUST), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue( UNO_NAME_NRULE_ADJUST, -1, aVal, beans::PropertyState_DIRECT_VALUE); } { aVal <<= OUString(rFmt.GetPrefix()); - beans::PropertyValue aPrefixProp( OUString(UNO_NAME_NRULE_PREFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aPrefixProp( UNO_NAME_NRULE_PREFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aPrefixProp; } { aVal <<= OUString(rFmt.GetSuffix()); - beans::PropertyValue aSuffixProp( OUString(UNO_NAME_NRULE_SUFFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aSuffixProp( UNO_NAME_NRULE_SUFFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aSuffixProp; } @@ -203,7 +203,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal sal_Unicode nCode = rFmt.GetBulletChar(); OUString aStr( &nCode, 1 ); aVal <<= aStr; - beans::PropertyValue aBulletProp( OUString("BulletChar"), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aBulletProp( "BulletChar", -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aBulletProp; } @@ -212,7 +212,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal awt::FontDescriptor aDesc; SvxUnoFontDescriptor::ConvertFromFont( *rFmt.GetBulletFont(), aDesc ); aVal <<= aDesc; - pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_BULLET_FONT), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue( UNO_NAME_NRULE_BULLET_FONT, -1, aVal, beans::PropertyState_DIRECT_VALUE); } { @@ -225,7 +225,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal RTL_TEXTENCODING_ASCII_US); aVal <<= aURL; - const beans::PropertyValue aGraphicProp( OUString("GraphicURL"), -1, aVal, beans::PropertyState_DIRECT_VALUE); + const beans::PropertyValue aGraphicProp( "GraphicURL", -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aGraphicProp; } } @@ -234,26 +234,26 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal const Size aSize( rFmt.GetGraphicSize() ); const awt::Size aUnoSize( aSize.Width(), aSize.Height() ); aVal <<= aUnoSize; - const beans::PropertyValue aGraphicSizeProp(OUString("GraphicSize"), -1, aVal, beans::PropertyState_DIRECT_VALUE ); + const beans::PropertyValue aGraphicSizeProp("GraphicSize", -1, aVal, beans::PropertyState_DIRECT_VALUE ); pArray[nIdx++] = aGraphicSizeProp; } aVal <<= (sal_Int16)rFmt.GetStart(); - pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_START_WITH), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_START_WITH, -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int32)rFmt.GetAbsLSpace(); - pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_LEFT_MARGIN), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_LEFT_MARGIN, -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int32)rFmt.GetFirstLineOffset(); - pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_FIRST_LINE_OFFSET), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_FIRST_LINE_OFFSET, -1, aVal, beans::PropertyState_DIRECT_VALUE); - pArray[nIdx++] = beans::PropertyValue(OUString("SymbolTextDistance"), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue("SymbolTextDistance", -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int32)rFmt.GetBulletColor().GetColor(); - pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_BULLET_COLOR), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_BULLET_COLOR, -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int16)rFmt.GetBulletRelSize(); - pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_BULLET_RELSIZE), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_BULLET_RELSIZE, -1, aVal, beans::PropertyState_DIRECT_VALUE); DBG_ASSERT( nIdx <= nProps, "FixMe: overflow in Array!!! [CL]" ); Sequence< beans::PropertyValue> aSeq(pArray.get(), nIdx); diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index 8c7217d30256..d5d5ec744600 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -188,8 +188,8 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe throw uno::RuntimeException(); datatransfer::DataFlavor aDataFlavor( - OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), - OUString( "GDIMetaFile" ), + "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", + "GDIMetaFile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); if( xTransferable->isDataFlavorSupported( aDataFlavor )) diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index d06a690c437a..f9b2bcdd4204 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -430,7 +430,7 @@ bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xPar } awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_TOP, - OUString("dockingwindow"), + "dockingwindow", xMyParent, 0, awt::Rectangle(),//aOwnRectangle, diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index bb6bc4cea537..3bd35a7d4ac7 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -289,7 +289,7 @@ bool OleEmbeddedObject::TryToConvertToOOo() { // create the model uno::Sequence< uno::Any > aArguments(1); - aArguments[0] <<= beans::NamedValue( OUString( "EmbeddedObject" ), uno::makeAny( true )); + aArguments[0] <<= beans::NamedValue( "EmbeddedObject", uno::makeAny( true )); uno::Reference< util::XCloseable > xDocument( m_xFactory->createInstanceWithArguments( aDocServiceName, aArguments ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW ); diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 6b197b547d35..03045f3c6ac2 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -55,16 +55,16 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo { // it's a bitmap aVisualRepr.Flavor = datatransfer::DataFlavor( - OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ), - OUString( "Bitmap" ), + "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", + "Bitmap", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); } else { // it's a metafile aVisualRepr.Flavor = datatransfer::DataFlavor( - OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ), - OUString( "Windows Metafile" ), + "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", + "Windows Metafile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); } diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 821b1656ef0d..efd3b6f6265c 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -71,14 +71,14 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent); - *pArguments++ <<= PropertyValue(OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue("ParentWindow", -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE).toString()); - *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue("Title", -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE); // the name of the new data source - *pArguments++ <<= PropertyValue(OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue("InitialSelection", -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); // create the dialog Reference< XExecutableDialog > xDialog; diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index a1fb0295c00d..7dc6ab8de2b5 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -105,7 +105,7 @@ namespace abp Reference<awt::XWindow> xParentWindow; if (aArguments.getLength() == 1 && (aArguments[0] >>= xParentWindow) ) { Sequence< Any > aNewArgs(1); - aNewArgs[0] <<= PropertyValue( OUString("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE ); + aNewArgs[0] <<= PropertyValue( "ParentWindow", 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE ); OGenericUnoDialog::initialize(aNewArgs); } else { OGenericUnoDialog::initialize(aArguments); diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 8b738b8ae1c3..54d60e335c50 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -108,7 +108,7 @@ bool LdapUserProfileBe::readLdapConfiguration( uno::Reference< lang::XMultiServiceFactory > xCfgProvider( css::configuration::theDefaultProvider::get(context)); - css::beans::NamedValue aPath(OUString("nodepath"), uno::makeAny(kComponent) ); + css::beans::NamedValue aPath("nodepath", uno::makeAny(kComponent) ); uno::Sequence< uno::Any > aArgs(1); aArgs[0] <<= aPath; diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 607a0d220766..71f14c60ac9a 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -248,7 +248,7 @@ namespace logging // write access to the "Settings" node (which includes settings for all loggers) Sequence< Any > aArguments(1); aArguments[0] <<= NamedValue( - OUString( "nodepath" ), + "nodepath", makeAny( OUString( "/org.openoffice.Office.Logging/Settings" ) ) ); Reference< XNameContainer > xAllSettings( xConfigProvider->createInstanceWithArguments( diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index e452cbba7343..8ce2ab3b7c16 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -536,7 +536,7 @@ namespace pcr { SID_ATTR_CHAR_FONTLIST, false } }; - _rpPool = new SfxItemPool(OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, + _rpPool = new SfxItemPool("PCRControlFontItemPool", CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, aItemInfos, _rpDefaults); _rpPool->FreezeIdRanges(); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 862621107965..9159e451977d 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2868,7 +2868,7 @@ namespace pcr { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE, - OUString("sdatabase")); + "sdatabase"); OUString sDataSource; OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource ); diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index d9569ec5c54e..c90b99edcd86 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -144,15 +144,15 @@ namespace pcr { Sequence< Any > aNewArguments( 3 ); aNewArguments[0] <<= NamedValue( - OUString( "TabbingModel" ), + "TabbingModel", makeAny( xTabbingModel ) ); aNewArguments[1] <<= NamedValue( - OUString( "ControlContext" ), + "ControlContext", makeAny( xControlContext ) ); aNewArguments[2] <<= NamedValue( - OUString( "ParentWindow" ), + "ParentWindow", makeAny( xParentWindow ) ); OTabOrderDialog_DBase::initialize(aNewArguments); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 11e2b66d4656..5b8915f353fd 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1456,7 +1456,7 @@ namespace pcr { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) + ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) }; xHandlerContext = ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 4009eb583a5e..bf006b994795 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -313,7 +313,7 @@ namespace pcr // instead of calling XCloseable::close directly. The latter method would also close // the frame, but not care for things like shutting down the office when the last // frame is gone ... - const UnoURL aCloseURL( OUString( ".uno:CloseDoc" ), + const UnoURL aCloseURL( ".uno:CloseDoc", Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) ); Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW ); diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 7bd5b4e2c0e8..70da677cf72b 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -461,7 +461,7 @@ namespace pcr IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked, void*, void ) { - ActionEvent aEvent( *this, OUString( "clicked" ) ); + ActionEvent aEvent( *this, "clicked" ); m_aActionListeners.forEach< XActionListener >( [&aEvent] (uno::Reference<awt::XActionListener> const& xListener) { return xListener->actionPerformed(aEvent); }); diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 0e62e5d0cc1d..461bd8618dfb 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -54,8 +54,8 @@ namespace frm static const Locale& getLocale(LocaleType _eType) { - static const Locale s_aEnglishUS( OUString("en"), OUString("us"), OUString() ); - static const Locale s_aGerman( OUString("de"), OUString("DE"), OUString() ); + static const Locale s_aEnglishUS( "en", "us", OUString() ); + static const Locale s_aGerman( "de", "DE", OUString() ); static const OUString s_sEmptyString; static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString ); diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index dc9a857e9395..03801430c773 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -64,9 +64,9 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con // open the stream from the result... // build media descriptor Sequence< PropertyValue > descriptor(2); - descriptor[0] = PropertyValue(OUString("InputStream"), + descriptor[0] = PropertyValue("InputStream", -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE); - descriptor[1] = PropertyValue(OUString("ReadOnly"), + descriptor[1] = PropertyValue("ReadOnly", -1, makeAny(true), PropertyState_DIRECT_VALUE); OUString aURL = m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 25d00008d12a..4792c4b6c69d 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1728,7 +1728,7 @@ void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCod aException.Arguments.realloc( 2 ); aException.Arguments[ 0 ] <<= sDisplayPath; aException.Arguments[ 1 ] <<= PropertyValue( - OUString( "Uri" ), + "Uri", -1, aException.Arguments[ 0 ], PropertyState_DIRECT_VALUE ); // (formerly, it was sufficient to put the URL first parameter. Nowadays, diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 78f4701b9412..86bc5deeb2ee 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -103,9 +103,9 @@ namespace framework{ #define AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA "ExistsSessionData" #define AUTORECOVERY_PROPNAME_ASCII_CRASHED "Crashed" -#define AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA OUString( AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA ) -#define AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA OUString( AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA ) -#define AUTORECOVERY_PROPNAME_CRASHED OUString( AUTORECOVERY_PROPNAME_ASCII_CRASHED ) +#define AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA +#define AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA +#define AUTORECOVERY_PROPNAME_CRASHED AUTORECOVERY_PROPNAME_ASCII_CRASHED #define AUTORECOVERY_PROPHANDLE_EXISTS_RECOVERYDATA 0 #define AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA 1 @@ -126,8 +126,8 @@ namespace framework{ /** properties for tab window (old) */ #define TABWINDOW_PROPNAME_ASCII_PARENTWINDOW "ParentWindow" #define TABWINDOW_PROPNAME_ASCII_TOPWINDOW "TopWindow" -#define TABWINDOW_PROPNAME_PARENTWINDOW OUString( TABWINDOW_PROPNAME_ASCII_PARENTWINDOW ) -#define TABWINDOW_PROPNAME_TOPWINDOW OUString( TABWINDOW_PROPNAME_ASCII_TOPWINDOW ) +#define TABWINDOW_PROPNAME_PARENTWINDOW TABWINDOW_PROPNAME_ASCII_PARENTWINDOW +#define TABWINDOW_PROPNAME_TOPWINDOW TABWINDOW_PROPNAME_ASCII_TOPWINDOW #define TABWINDOW_PROPHANDLE_PARENTWINDOW 0 #define TABWINDOW_PROPHANDLE_TOPWINDOW 1 diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index a35191893a60..0948f63c4c6c 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -124,7 +124,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide if (!xFrame.is()) return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >(); - CloseDispatcher* pCloser = new CloseDispatcher(m_xContext, xFrame, OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! + CloseDispatcher* pCloser = new CloseDispatcher(m_xContext, xFrame, "_self"); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 738a5ac5b1df..40043c1d8e96 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -300,11 +300,11 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr { const Property pActionTriggerPropertys[] = { - Property( OUString( "CommandURL" ), HANDLE_COMMANDURL , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), - Property( OUString( "HelpURL" ), HANDLE_HELPURL , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), - Property( OUString( "Image" ), HANDLE_IMAGE , cppu::UnoType<XBitmap>::get(), PropertyAttribute::TRANSIENT ), - Property( OUString( "SubContainer" ), HANDLE_SUBCONTAINER , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), - Property( OUString( "Text" ), HANDLE_TEXT , cppu::UnoType<XInterface>::get(), PropertyAttribute::TRANSIENT ) + Property( "CommandURL" , HANDLE_COMMANDURL , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), + Property( "HelpURL" , HANDLE_HELPURL , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), + Property( "Image" , HANDLE_IMAGE , cppu::UnoType<XBitmap>::get(), PropertyAttribute::TRANSIENT ), + Property( "SubContainer" , HANDLE_SUBCONTAINER , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), + Property( "Text" , HANDLE_TEXT , cppu::UnoType<XInterface>::get(), PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index 7752d6caa9f6..ca2ec4f88813 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -245,7 +245,7 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp { const Property pActionTriggerPropertys[] = { - Property( OUString( "SeparatorType" ), HANDLE_TYPE, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::TRANSIENT ) + Property( "SeparatorType", HANDLE_TYPE, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index fc11b4e4c803..aa21aac96871 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star; -#define ROOTNODE_ADDONMENU OUString("Office.Addons" ) +#define ROOTNODE_ADDONMENU "Office.Addons" #define PATHDELIMITER OUString("/" ) #define SEPARATOR_URL "private:separator" diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 6a1c6f696433..d386f391ef0f 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -315,9 +315,9 @@ const css::uno::Sequence< css::beans::Property > ConstItemContainer::impl_getSta const css::beans::Property pProperties[] = { - css::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , - cppu::UnoType<OUString>::get(), - css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) + css::beans::Property( PROPNAME_UINAME, PROPHANDLE_UINAME , + cppu::UnoType<OUString>::get(), + css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT ); diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index b6c2a6499aec..b71fa57b4758 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -353,9 +353,9 @@ const css::uno::Sequence< css::beans::Property > RootItemContainer::impl_getStat const css::beans::Property pProperties[] = { - css::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , - cppu::UnoType<OUString>::get(), - css::beans::PropertyAttribute::TRANSIENT ) + css::beans::Property( PROPNAME_UINAME, PROPHANDLE_UINAME , + cppu::UnoType<OUString>::get(), + css::beans::PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT ); diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 0a39baf25164..f7ce2a1e1705 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -432,14 +432,14 @@ const css::uno::Sequence< css::beans::Property > UIConfigElementWrapperBase::imp const css::beans::Property pProperties[] = { - css::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , cppu::UnoType<css::ui::XUIConfigurationManager>::get(), css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<css::frame::XFrame>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , cppu::UnoType<css::awt::XMenuBar>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) + css::beans::Property( UIELEMENT_PROPNAME_CONFIGLISTENER, UIELEMENT_PROPHANDLE_CONFIGLISTENER , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( UIELEMENT_PROPNAME_CONFIGSOURCE, UIELEMENT_PROPHANDLE_CONFIGSOURCE , cppu::UnoType<css::ui::XUIConfigurationManager>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( UIELEMENT_PROPNAME_FRAME, UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<css::frame::XFrame>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( UIELEMENT_PROPNAME_NOCLOSE, UIELEMENT_PROPHANDLE_NOCLOSE , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( UIELEMENT_PROPNAME_PERSISTENT, UIELEMENT_PROPHANDLE_PERSISTENT , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( UIELEMENT_PROPNAME_RESOURCEURL, UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( UIELEMENT_PROPNAME_TYPE, UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( UIELEMENT_PROPNAME_XMENUBAR, UIELEMENT_PROPHANDLE_XMENUBAR , cppu::UnoType<css::awt::XMenuBar>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index cfb48e553f37..d50ce5a32953 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -227,9 +227,9 @@ const css::uno::Sequence< css::beans::Property > UIElementWrapperBase::impl_getS const css::beans::Property pProperties[] = { - css::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<XFrame>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<sal_Int16>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) + css::beans::Property( UIELEMENT_PROPNAME_FRAME, UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<XFrame>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( UIELEMENT_PROPNAME_RESOURCEURL, UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<sal_Int16>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( UIELEMENT_PROPNAME_TYPE, UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 89be517fe071..f9c53947bb4a 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -185,7 +185,7 @@ void SessionListener::StoreSession( bool bAsync ) xDispatch->addStatusListener(this, aURL); Sequence< PropertyValue > args(1); - args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE); + args[0] = PropertyValue("DispatchAsynchron",-1,makeAny(bAsync),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); } catch (const css::uno::Exception& e) { SAL_WARN("fwk.session",e.Message); @@ -213,7 +213,7 @@ void SessionListener::QuitSessionQuietly() xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args(1); - args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(false),PropertyState_DIRECT_VALUE); + args[0] = PropertyValue("DispatchAsynchron",-1,makeAny(false),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); } catch (const css::uno::Exception& e) { SAL_WARN("fwk.session",e.Message); diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 490cd92948be..2578f40bf2dc 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -255,9 +255,7 @@ public: }; PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XComponentContext >& xContext ) : - UIControllerFactory( - xContext, - OUString( "PopupMenu") ) + UIControllerFactory( xContext, "PopupMenu" ) { } @@ -302,9 +300,7 @@ public: }; ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XComponentContext >& xContext ) : - UIControllerFactory( - xContext, - OUString( "ToolBar" )) + UIControllerFactory( xContext, "ToolBar" ) { } @@ -349,9 +345,7 @@ public: }; StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XComponentContext >& xContext ) : - UIControllerFactory( - xContext, - OUString( "StatusBar" ) ) + UIControllerFactory( xContext, "StatusBar" ) { } diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index a95c8676dda5..78fd7457927c 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -187,7 +187,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 { if ( displayIndex == CalendarDisplayIndex::AM_PM ) { // Am/Pm string for Korean Hanja calendar will refer to Japanese locale - css::lang::Locale jaLocale(OUString("ja"), OUString(), OUString()); + css::lang::Locale jaLocale("ja", OUString(), OUString()); if (idx == 0) return LocaleDataImpl::get()->getLocaleItem(jaLocale).timeAM; else if (idx == 1) return LocaleDataImpl::get()->getLocaleItem(jaLocale).timePM; else throw ERROR; diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index cb3c4fb047eb..03566456cd0c 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -179,7 +179,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca return cachedItem->xCI; else if (xUCI.is()) { - lookupTable.push_back( cachedItem = new lookupTableItem( rLocale, OUString("Unicode"), xUCI)); + lookupTable.push_back( cachedItem = new lookupTableItem( rLocale, "Unicode", xUCI)); return cachedItem->xCI; } } diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 7a42587bf6c3..276a2ce15f9c 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -958,7 +958,7 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) return OUString(aSupportedTypes[index].cSymbol, strlen(aSupportedTypes[index].cSymbol), RTL_TEXTENCODING_UTF8); else { OUString result; - Locale aLocale(OUString("en"), OUString(), OUString()); + Locale aLocale("en", OUString(), OUString()); Sequence<beans::PropertyValue> aProperties(2); aProperties[0].Name = "NumberingType"; aProperties[0].Value <<= aSupportedTypes[index].nType; diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index 8db03e04afef..e88cabf47465 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -160,7 +160,7 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry) return OUString(&indexChar, 1); } -#define LOCALE_EN lang::Locale(OUString("en"), OUString(), OUString()) +#define LOCALE_EN lang::Locale("en", OUString(), OUString()) void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) { diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 617ce25267ba..1e6728e864bb 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -630,8 +630,7 @@ Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString& } // Referred locale not found, return name for en_US locale. if (index == cals.getLength()) { - cals = getAllCalendars2( - Locale(OUString("en"), OUString("US"), OUString())); + cals = getAllCalendars2( Locale("en", "US", OUString()) ); if (cals.getLength() > 0) ref_cal = cals[0]; else diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index 0acad9dbe0c9..fba410ca58c5 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -57,9 +57,7 @@ TextConversion_ko::TextConversion_ko( const Reference < XComponentContext >& xCo // get maximum length of word in dictionary if (xCDL.is()) { - Locale loc(OUString("ko"), - OUString("KR"), - OUString()); + Locale loc("ko", "KR", OUString()); maxLeftLength = xCDL->queryMaxCharCount(loc, ConversionDictionaryType::HANGUL_HANJA, ConversionDirection_FROM_LEFT); diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 0233ce053f30..878c0bc464e9 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -273,7 +273,7 @@ public: protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper - : SfxStyleSheetBase(OUString("dummy"), nullptr, SfxStyleFamily::All, 0) + : SfxStyleSheetBase("dummy", nullptr, SfxStyleFamily::All, 0) { assert(false); } diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index 4b42b5446cb9..763fc4c98aee 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -68,11 +68,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith css::uno::Reference< css::uno::XComponentContext > const & xContext ) { sal_Int64 handle = reinterpret_cast< sal_Int64 >( m_vm_access.get() ); - css::uno::Any arg( - css::uno::makeAny( - css::beans::NamedValue( - OUString( "UnoVirtualMachine" ), - css::uno::makeAny( handle ) ) ) ); + css::uno::Any arg( css::beans::NamedValue( "UnoVirtualMachine", css::uno::makeAny( handle ) ) ); return xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "com.sun.star.java.JavaVirtualMachine", css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext ); @@ -111,7 +107,7 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton( { css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) ); ::cppu::ContextEntry_Init entry( - OUString("/singletons/com.sun.star.java.theJavaVirtualMachine"), + "/singletons/com.sun.star.java.theJavaVirtualMachine", css::uno::makeAny( xFac ), true ); return ::cppu::createComponentContext( &entry, 1, xContext ); } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 614f7e30f805..67a76c774c3e 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2696,8 +2696,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe { uno::Sequence< datatransfer::DataFlavor > aRet(1); - aRet[0] = datatransfer::DataFlavor( OUString("image/png"), - OUString("PNG"), + aRet[0] = datatransfer::DataFlavor( "image/png", + "PNG", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); return aRet; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index bf6908f14702..d315e80cf14a 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -484,7 +484,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::UNO_QUERY ); uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY); - aArgs[0] <<= beans::NamedValue(OUString("Storage"),uno::makeAny(xStorage)); + aArgs[0] <<= beans::NamedValue("Storage",uno::makeAny(xStorage)); xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments("com.sun.star.document.ImportEmbeddedObjectResolver",aArgs) , uno::UNO_QUERY); static const char s_sOld[] = "OldFormat"; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 6a720e0fdba5..e957ec2e9d0d 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -94,7 +94,7 @@ void FormulaDialog::dispose() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, HID_RPT_FIELD_SEL_WIN ); aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WindowStateMask::X | WindowStateMask::Y | WindowStateMask::State | WindowStateMask::Minimized)), RTL_TEXTENCODING_ASCII_US)); } @@ -203,7 +203,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = VclPtr<OAddFieldWindow>::Create(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, HID_RPT_FIELD_SEL_WIN ); if ( aDlgOpt.Exists() ) { m_pAddField->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 3456dcad6737..475f7e6d121d 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -702,7 +702,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep 0 }; - SfxItemPool* pPool( new SfxItemPool(OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, &pDefaults) ); + SfxItemPool* pPool( new SfxItemPool("ReportCharProperties", ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, &pDefaults) ); // not needed for font height pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same bool bSuccess = false; diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 122d907281db..a409d5f6f46a 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -139,7 +139,7 @@ void ODesignView::dispose() } if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, UID_RPT_RPT_APP_VIEW ); aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pAddField.disposeAndClear(); @@ -513,7 +513,7 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_pAddField = VclPtr<OAddFieldWindow>::Create(this,xSet); m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, UID_RPT_RPT_APP_VIEW ); if ( aDlgOpt.Exists() ) m_pAddField->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pAddField->Update(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 2a70cde05e63..29ffb27fe61a 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2373,7 +2373,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ SID_ATTR_METRIC,SID_ATTR_METRIC, 0 }; - SfxItemPool* pPool( new SfxItemPool(OUString("ReportPageProperties"), RPTUI_ID_LRSPACE, RPTUI_ID_METRIC, aItemInfos ) ); + SfxItemPool* pPool( new SfxItemPool("ReportPageProperties", RPTUI_ID_LRSPACE, RPTUI_ID_METRIC, aItemInfos ) ); const Graphic aNullGraphic; const ::Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use defined default color @@ -4205,7 +4205,7 @@ void OReportController::openZoomDialog() SID_ATTR_ZOOM,SID_ATTR_ZOOM, 0 }; - SfxItemPool* pPool( new SfxItemPool(OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, &pDefaults) ); + SfxItemPool* pPool( new SfxItemPool("ZoomProperties", SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, &pDefaults) ); pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 7e3bb4529d2e..ad41e4aefbe6 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -117,9 +117,9 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )), - ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )), - ::cppu::ContextEntry_Init( OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ), + ::cppu::ContextEntry_Init( "ContextDocument", makeAny( m_pDesignView->getController().getModel() )), + ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny( VCLUnoHelper::GetInterface ( this ) )), + ::cppu::ContextEntry_Init( "ActiveConnection", makeAny( m_pDesignView->getController().getConnection() ) ), }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 3f619726f90c..95f94d52b81e 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -69,8 +69,8 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent; ScCellRangeObj::ScCellRangeObj(): CalcUnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(OUString("15"), 1), - apitest::XReplaceable(OUString("15"), OUString("35")) + apitest::XSearchable("15", 1), + apitest::XReplaceable("15", "35") { } diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index e41bb4276a8d..f154240d7ee6 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -47,8 +47,8 @@ private: ScTableSheetObj::ScTableSheetObj(): CalcUnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(OUString("test"), 4), - apitest::XReplaceable(OUString("searchReplaceString"), OUString("replaceReplaceString")) + apitest::XSearchable("test", 4), + apitest::XReplaceable("searchReplaceString", "replaceReplaceString") { } diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 6599fe18d31a..439df8af4328 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -530,7 +530,7 @@ ScDocShellRef ScBootstrapFixture::load( bool bReadWrite, std::shared_ptr<const SfxFilter> pFilter(new SfxFilter( rFilter, OUString(), nFilterFlags, nClipboardID, rTypeName, 0, OUString(), - rUserData, OUString("private:factory/scalc"))); + rUserData, "private:factory/scalc")); const_cast<SfxFilter*>(pFilter.get())->SetVersion(nFilterVersion); ScDocShellRef xDocShRef = new ScDocShell; @@ -622,7 +622,7 @@ ScDocShellRef ScBootstrapFixture::saveAndReload( std::shared_ptr<const SfxFilter> pExportFilter(new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString("private:factory/scalc*") )); + rUserData, "private:factory/scalc*" )); const_cast<SfxFilter*>(pExportFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->DoSaveAs( aStoreMedium ); @@ -668,7 +668,7 @@ std::shared_ptr<utl::TempFile> ScBootstrapFixture::exportTo( ScDocShell* pShell, std::shared_ptr<SfxFilter> pExportFilter(new SfxFilter( aFilterName, OUString(), nFormatType, nExportFormat, aFilterType, 0, OUString(), - OUString(), OUString("private:factory/scalc*") )); + OUString(), "private:factory/scalc*" )); pExportFilter.get()->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->DoSaveAs( aStoreMedium ); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index f448ee43fef7..b4cb9856eed7 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -329,7 +329,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt std::shared_ptr<const SfxFilter> pExportFilter(new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString("private:factory/scalc*") )); + rUserData, "private:factory/scalc*" )); const_cast<SfxFilter*>(pExportFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); SfxItemSet* pExportSet = aStoreMedium.GetItemSet(); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 7306a4a9354e..e7b436d90bb1 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1552,7 +1552,7 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) std::shared_ptr<const SfxFilter> pFilter(new SfxFilter( aFilterName, OUString(), getFileFormats()[0].nFormatType, nFormat, aFilterType, 0, OUString(), - OUString(), OUString("private:factory/scalc*") )); + OUString(), "private:factory/scalc*" )); const_cast<SfxFilter*>(pFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ScDocShellRef xDocSh = new ScDocShell; diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index 11c795e165a1..a7c503748f35 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -1251,7 +1251,7 @@ void Test::testPivotTableNumberGrouping() aInfo.mfStart = 30; aInfo.mfEnd = 60; aInfo.mfStep = 10; - ScDPSaveNumGroupDimension aGroup(OUString("Order"), aInfo); + ScDPSaveNumGroupDimension aGroup("Order", aInfo); pDimData->AddNumGroupDimension(aGroup); } diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 037678b8f687..dbac46b55e55 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -185,7 +185,7 @@ static_assert( ScDocumentPool::ScDocumentPool() - : SfxItemPool ( OUString("ScDocumentPool"), + : SfxItemPool ( "ScDocumentPool", ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, nullptr, false/*bLoadRefCounts*/ ), mnCurrentMaxKey(0) @@ -290,8 +290,7 @@ ScDocumentPool::ScDocumentPool() if ( ScGlobal::GetEmptyBrushItem() ) rPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); else - rPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, - OUString(STRING_STANDARD) ); // FIXME: without name? + rPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, STRING_STANDARD ); // FIXME: without name? rPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); rPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 64e7d10a4aa5..92d2c4abed54 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -578,8 +578,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab ) { maTabs.resize(nTab+1, nullptr ); } - maTabs[nTab] = new ScTable(this, nTab, - OUString("baeh")); + maTabs[nTab] = new ScTable(this, nTab, "baeh"); if (nTab < static_cast<SCTAB>(pSourceDoc->maTabs.size()) && pSourceDoc->maTabs[nTab]) maTabs[nTab]->SetLayoutRTL( pSourceDoc->maTabs[nTab]->IsLayoutRTL() ); } diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 595961851267..09a4162da72c 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -88,16 +88,16 @@ static void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataRec { uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString("CellRangeRepresentation"), -1, + "CellRangeRepresentation", -1, uno::makeAny( rRanges ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString("HasCategories"), -1, + "HasCategories", -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString("FirstCellAsLabel"), -1, + "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - OUString("DataRowSource"), -1, + "DataRowSource", -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx index d5a0e244525f..30243fe4cb4f 100644 --- a/sc/source/core/tool/addincfg.cxx +++ b/sc/source/core/tool/addincfg.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; #define CFGPATH_ADDINS "Office.CalcAddIns/AddInInfo" ScAddInCfg::ScAddInCfg() : - ConfigItem( OUString( CFGPATH_ADDINS ) ) + ConfigItem( CFGPATH_ADDINS ) { uno::Sequence<OUString> aNames(1); // one entry: empty string EnableNotification( aNames ); diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 3eaa8155e01b..fdf92456c72e 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -359,7 +359,7 @@ void ScUnoAddInCollection::ReadConfiguration() ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg(); // additional, temporary config item for the compatibility names - ScLinkConfigItem aAllLocalesConfig( OUString(CFGPATH_ADDINS), ConfigItemMode::AllLocales ); + ScLinkConfigItem aAllLocalesConfig( CFGPATH_ADDINS, ConfigItemMode::AllLocales ); // CommitLink is not used (only reading values) const OUString sSlash('/'); diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 6f287307a912..c7cb013de8aa 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -34,13 +34,13 @@ static rtl::Reference<ConfigurationListener> const & getMiscListener() bool ScCalcConfig::isOpenCLEnabled() { - static comphelper::ConfigurationListenerProperty<bool> gOpenCLEnabled(getMiscListener(), OUString("UseOpenCL")); + static comphelper::ConfigurationListenerProperty<bool> gOpenCLEnabled(getMiscListener(), "UseOpenCL"); return gOpenCLEnabled.get(); } bool ScCalcConfig::isSwInterpreterEnabled() { - static comphelper::ConfigurationListenerProperty<bool> gSwInterpreterEnabled(getMiscListener(), OUString("UseSwInterpreter")); + static comphelper::ConfigurationListenerProperty<bool> gSwInterpreterEnabled(getMiscListener(), "UseSwInterpreter"); return gSwInterpreterEnabled.get(); } diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index ceeba4ebbd33..2ae74582030d 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -95,7 +95,7 @@ Sequence<OUString> ScDefaultsCfg::GetPropertyNames() } ScDefaultsCfg::ScDefaultsCfg() : - ConfigItem( OUString( CFGPATH_FORMULA ) ) + ConfigItem( CFGPATH_FORMULA ) { OUString aPrefix; diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index 06ab9010447e..05f112b9a4d2 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -34,7 +34,7 @@ using namespace css::uno; #define SCFILTOPT_WK3 2 ScFilterOptions::ScFilterOptions() : - ConfigItem( OUString( CFGPATH_FILTER ) ), + ConfigItem( CFGPATH_FILTER ), bWK3Flag( false ), fExcelColScale( 0 ), fExcelRowScale( 0 ) diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index beca64e37075..f536cb94686c 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -243,7 +243,7 @@ ScFormulaCfg::PropsToIds ScFormulaCfg::GetPropNamesToId() } ScFormulaCfg::ScFormulaCfg() : - ConfigItem( OUString( CFGPATH_FORMULA ) ) + ConfigItem( CFGPATH_FORMULA ) { Sequence<OUString> aNames = GetPropertyNames(); UpdateFromProperties( aNames ); diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index 3e214e122bca..4337194a425a 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -115,7 +115,7 @@ Sequence<OUString> ScInputCfg::GetPropertyNames() } ScInputCfg::ScInputCfg() : - ConfigItem( OUString( CFGPATH_INPUT ) ) + ConfigItem( CFGPATH_INPUT ) { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 82ced8321859..a42df78042a2 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -109,7 +109,7 @@ Sequence<OUString> ScPrintCfg::GetPropertyNames() } ScPrintCfg::ScPrintCfg() : - ConfigItem( OUString( CFGPATH_PRINT ) ) + ConfigItem( CFGPATH_PRINT ) { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 183185e0d427..8ecd71762587 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -1087,7 +1087,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertDde( // create the leading 'StdDocumentName' EXTERNNAME record if( maNameList.IsEmpty() ) AppendNew( new XclExpExtNameDde( - GetRoot(), OUString("StdDocumentName"), EXC_EXTN_EXPDDE_STDDOC ) ); + GetRoot(), "StdDocumentName", EXC_EXTN_EXPDDE_STDDOC ) ); // try to find DDE result array, but create EXTERNNAME record without them too const ScMatrix* pScMatrix = GetDoc().GetDdeLinkResultMatrix( nPos ); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 44caba742225..aa28b5bc913f 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -279,7 +279,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL aContentType += OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType ) ); pAttributes = xValues.get(); } } @@ -2856,7 +2856,7 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) aContentType += OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType ) ); pAttributes = xValues.get(); } } diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 8555cc811af2..583ba8589701 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -40,7 +40,7 @@ static SfxItemInfo const aMsgItemInfos[] = }; ScMessagePool::ScMessagePool() - : SfxItemPool ( OUString("ScMessagePool"), + : SfxItemPool ( "ScMessagePool", MSGPOOL_START, MSGPOOL_END, aMsgItemInfos, nullptr ), diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index c50435b2935b..d76404bba990 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -832,8 +832,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck return; //! nichts zu tun - Fehlermeldung? // ab hier kein return mehr - ScProgress aProgress( this, OUString("..."), - nNewActionCount, true ); + ScProgress aProgress( this, "...", nNewActionCount, true ); sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber(); // UpdateReference-Undo, gueltige Referenzen fuer den letzten gemeinsamen Zustand diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 41610a0ea11a..a94885005177 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -175,16 +175,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString("CellRangeRepresentation"), -1, + "CellRangeRepresentation", -1, uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString("HasCategories"), -1, + "HasCategories", -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString("FirstCellAsLabel"), -1, + "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - OUString("DataRowSource"), -1, + "DataRowSource", -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 73157ea62805..2a871058e5dd 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -85,7 +85,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB pRet = pDoc->GetAnonymousDBData(nTab); if (!pRet) { - pRet = new ScDBData( OUString(STR_DB_LOCAL_NONAME), nTab, + pRet = new ScDBData( STR_DB_LOCAL_NONAME, nTab, nCol1,nRow1, nCol2,nRow2, true, pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) ); pDoc->SetAnonymousDBData(nTab,pRet); diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 6e42bc44e8c5..d3b7d0070c81 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -283,7 +283,7 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.TableAutoFormatEnumeration"); } // container::XIndexAccess @@ -423,7 +423,7 @@ ScAutoFormatFieldObj* ScAutoFormatObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.TableAutoFormatEnumeration"); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index cdfcba7d8627..b50600bb2736 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -667,7 +667,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.FunctionDescriptionEnumeration"); } // XElementAccess diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index f387325c6faf..6e325a550e56 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4646,7 +4646,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SheetCellRangesEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 4e751b3f6672..d8c03f47dbab 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1919,7 +1919,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( OUString("TableNumberList"), -1, + beans::PropertyValue( "TableNumberList", -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1928,7 +1928,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( OUString("DataRowSource"), -1, + beans::PropertyValue( "DataRowSource", -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1936,7 +1936,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( OUString("HasCategories"), -1, + beans::PropertyValue( "HasCategories", -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1944,7 +1944,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( OUString("FirstCellAsLabel"), -1, + beans::PropertyValue( "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1970,7 +1970,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( OUString("CellRangeRepresentation"), -1, + beans::PropertyValue( "CellRangeRepresentation", -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -2031,7 +2031,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && !aSequenceMappingVector.empty() ) { aResult.push_back( - beans::PropertyValue( OUString("SequenceMapping"), -1, + beans::PropertyValue( "SequenceMapping", -1, uno::makeAny( comphelper::containerToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index b2c5bec2b25c..10d89ce5e6ab 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString("CellRangeRepresentation"), -1, + "CellRangeRepresentation", -1, uno::makeAny( OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString("HasCategories"), -1, + "HasCategories", -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString("FirstCellAsLabel"), -1, + "FirstCellAsLabel", -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - OUString("DataRowSource"), -1, + "DataRowSource", -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -316,7 +316,7 @@ void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.table.TableChartsEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index b5d0bccf66eb..fde3bba62f85 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -452,7 +452,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DataPilotTablesEnumeration"); } // XIndexAccess @@ -1013,7 +1013,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi { if( pSaveData->GetDataLayoutDimension() ) { - ScFieldIdentifier aFieldId( OUString( SC_DATALAYOUT_NAME ), true ); + ScFieldIdentifier aFieldId( SC_DATALAYOUT_NAME, true ); return new ScDataPilotFieldObj( *this, aFieldId ); } } @@ -1669,7 +1669,7 @@ ScDataPilotFieldObj* ScDataPilotFieldsObj::GetObjectByName_Impl(const OUString& Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DataPilotFieldsEnumeration"); } // XIndexAccess @@ -2951,7 +2951,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ); + return new ScIndexEnumeration( this, "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ); } // XElementAccess @@ -3130,7 +3130,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ); + return new ScIndexEnumeration( this, "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ); } // XElementAccess @@ -3269,7 +3269,7 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DataPilotItemsEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index a2a282e56c59..76e888b6e9f2 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -618,7 +618,7 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SubTotalFieldsEnumeration"); } // XIndexAccess @@ -2215,7 +2215,7 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DatabaseRangesEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 757cd8e71a07..fce78332c626 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3370,7 +3370,7 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj: uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SpreadsheetsEnumeration"); } // XIndexAccess @@ -3535,7 +3535,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.table.TableColumnsEnumeration"); } // XIndexAccess @@ -3773,7 +3773,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.table.TableRowsEnumeration"); } // XIndexAccess @@ -4080,7 +4080,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera //! iterate directly (more efficiently)? SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.CellAnnotationsEnumeration"); } // XIndexAccess @@ -4235,7 +4235,7 @@ void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.ScenariosEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index c3e24180a8cd..1ab409416273 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -134,10 +134,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) { uno::Sequence<beans::PropertyValue> aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - OUString("EventType"), -1, + "EventType", -1, uno::makeAny( OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - OUString("Script"), -1, + "Script", -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 178ef7a17996..aa8dce00f17a 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -377,7 +377,7 @@ sal_Bool SAL_CALL ScCellFieldsObj::hasElements() uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.text.TextFieldEnumeration"); } void SAL_CALL ScCellFieldsObj::addContainerListener( @@ -533,7 +533,7 @@ sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.text.TextFieldEnumeration"); } void SAL_CALL ScHeaderFieldsObj::addContainerListener( diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 0a74f29beecf..f6e971408b36 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -359,7 +359,7 @@ void SAL_CALL ScTableConditionalFormat::clear() uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.TableConditionalEntryEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 64528ab62133..831d87eee3c4 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -435,7 +435,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SheetLinksEnumeration"); } // XIndexAccess @@ -945,7 +945,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.CellAreaLinksEnumeration"); } // XIndexAccess @@ -1244,7 +1244,7 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DDELinksEnumeration"); } // XIndexAccess @@ -1579,8 +1579,7 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString( - "com.sun.star.sheet.ExternalDocLink"))); + new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLink")); return aRef; } @@ -1681,8 +1680,7 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString( - "com.sun.star.sheet.ExternalDocLinks"))); + new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLinks")); return aRef; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 5fc43a4c174a..d17763a743bb 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -574,7 +574,7 @@ void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPos uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.NamedRangesEnumeration"); } // container::XIndexAccess @@ -1122,7 +1122,7 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.LabelRangesEnumeration"); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 11a76fcd020e..d7856471bc4f 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -959,7 +959,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SpreadsheetViewPanesEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index e8b93b474614..e7c313d1040f 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -554,7 +554,7 @@ ScVbaChart::Activate() if ( pChartObj ) pChartObj->Activate(); else - throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString( "no ChartObject as parent" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "no ChartObject as parent" ); } void SAL_CALL diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index eec8cdd29c27..d512895f791c 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -99,7 +99,7 @@ ScVbaChartObject::Delete() if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); else - throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString( "Parent is not ChartObjects" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "Parent is not ChartObjects" ); } void @@ -116,7 +116,7 @@ ScVbaChartObject::Activate() } catch (uno::Exception& ) { - throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString( "ChartObject Activate internal error" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "ChartObject Activate internal error" ); } } diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 0d07983d30fc..f9161b979335 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -57,7 +57,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) : ScVbaFormat_BASE( xParent, xContext ), - m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), + m_aDefaultLocale( "en", "US", OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 29072585e656..76877a890ac1 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -302,7 +302,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) try { sfx2::FileDialogHelper aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, OUString("com.sun.star.chart2.ChartDocument")); + FileDialogFlags::NONE, "com.sun.star.chart2.ChartDocument"); if(aDlg.Execute() == ERRCODE_NONE ) { INetURLObject aURLObj( aDlg.GetPath() ); diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 8cdbbb5b4106..f99f60f19423 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -190,7 +190,7 @@ namespace basprov "wrong number of parameters!", Reference< XInterface >(), m_funcName, - OUString( "Basic" ), + "Basic", provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } } diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index bfbb64232454..68a3f220173c 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -130,7 +130,7 @@ protected: OUString::createFromAscii( pFmt->pTypeName ), 0, OUString(), OUString::createFromAscii( pFmt->pUserData ), - OUString("private:factory/simpress*") ); + "private:factory/simpress*" ); pFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); std::shared_ptr<const SfxFilter> pFilt(pFilter); @@ -167,7 +167,7 @@ protected: OUString::createFromAscii(pFormat->pTypeName), 0, OUString(), OUString::createFromAscii(pFormat->pUserData), - OUString("private:factory/simpress*") )); + "private:factory/simpress*" )); const_cast<SfxFilter*>(pExportFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->ConvertTo(aStoreMedium); @@ -186,7 +186,7 @@ protected: OUString::createFromAscii(pFormat->pTypeName), 0, OUString(), OUString::createFromAscii(pFormat->pUserData), - OUString("private:factory/simpress*") )); + "private:factory/simpress*" )); const_cast<SfxFilter*>(pExportFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->DoSaveAs(aStoreMedium); diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index bd4b23235550..4a14713b9e60 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -170,7 +170,7 @@ void PPTWriterBase::exportPPT( const std::vector< css::beans::PropertyValue >& r if ( !InitSOIface() ) return; - FontCollectionEntry aDefaultFontDesc( OUString( "Times New Roman" ), + FontCollectionEntry aDefaultFontDesc( "Times New Roman", ROMAN, awt::FontPitch::VARIABLE, RTL_TEXTENCODING_MS_1252 ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index c7f443c8979c..0679a1e7d61c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -105,7 +105,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SotSt sal_uInt32 nImportFlags = 0; #ifdef DBG_UTIL - PropRead* pSummaryInformation = new PropRead( rStorage, OUString( "\005SummaryInformation" ) ); + PropRead* pSummaryInformation = new PropRead( rStorage, "\005SummaryInformation" ); if ( pSummaryInformation->IsValid() ) { pSummaryInformation->Read(); @@ -254,7 +254,7 @@ bool ImplSdPPTImport::Import() SeekOle( pDocShell, mnFilterOptions ); // hyperlinks - PropRead* pDInfoSec2 = new PropRead( mrStorage, OUString( "\005DocumentSummaryInformation" ) ); + PropRead* pDInfoSec2 = new PropRead( mrStorage, "\005DocumentSummaryInformation" ); if ( pDInfoSec2->IsValid() ) { PropItem aPropItem; diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index f460b87b5679..dd39419bd086 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -296,11 +296,11 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly ) Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxContext ); Sequence< Any > aCreationArguments( 2 ); aCreationArguments[0] = makeAny( PropertyValue( - OUString( "nodepath" ), 0, + "nodepath", 0, makeAny( GetPathToConfigurationRoot() ), PropertyState_DIRECT_VALUE ) ); aCreationArguments[1] = makeAny(beans::PropertyValue( - OUString( "lazywrite" ), 0, makeAny( true ), + "lazywrite", 0, makeAny( true ), PropertyState_DIRECT_VALUE ) ); OUString sAccessService; if ( bReadOnly ) diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 7c5221cc4922..b8ed17b82526 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -714,15 +714,15 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl() uno::UNO_QUERY_THROW ); uno::Sequence<beans::PropertyValue> aSequence(3); - aSequence[0] = beans::PropertyValue( OUString("URL"), + aSequence[0] = beans::PropertyValue( "URL", 0, uno::makeAny(aFileName), beans::PropertyState_DIRECT_VALUE ); - aSequence[1] = beans::PropertyValue( OUString("InputStream"), + aSequence[1] = beans::PropertyValue( "InputStream", 0, uno::makeAny( xDataStream ), beans::PropertyState_DIRECT_VALUE ); - aSequence[2] = beans::PropertyValue( OUString("InputSequence"), + aSequence[2] = beans::PropertyValue( "InputSequence", 0, uno::makeAny(aDataSequence), beans::PropertyState_DIRECT_VALUE ); diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 1a1b206d99b1..8956b644bc1b 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -349,7 +349,7 @@ public: OUString sName ("Presenter Console"); PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode("Presenter/Accessibility/Console/String") >>= sName; @@ -379,7 +379,7 @@ public: { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode("Presenter/Accessibility/Preview/String") >>= sName; @@ -1684,7 +1684,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode("Presenter/Accessibility/Notes/String") >>= sName; diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index e414ad0261af..2efcee7a8a0f 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -352,7 +352,7 @@ void PresenterHelpView::ReadHelpStrings() mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); Reference<container::XNameAccess> xStrings ( aConfiguration.GetConfigurationNode("PresenterScreenSettings/HelpView/HelpStrings"), diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 53d5bcbd1b4f..1739468f360f 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -275,7 +275,7 @@ bool PresenterScreen::isPresenterScreenEnabled(const css::uno::Reference<css::un bool dEnablePresenterScreen=true; PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.Impress/"), + "/org.openoffice.Office.Impress/", PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode("Misc/Start/EnablePresenterScreen") >>= dEnablePresenterScreen; @@ -482,7 +482,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( Reference<XComponentContext> xContext (mxContextWeak); PresenterConfigurationAccess aConfiguration ( xContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( @@ -633,7 +633,7 @@ void PresenterScreen::SetupConfiguration ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("org.openoffice.Office.PresenterScreen"), + "org.openoffice.Office.PresenterScreen", PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration); diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index c245a1978487..86ace6436269 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -1762,7 +1762,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); Reference<container::XHierarchicalNameAccess> xBitmaps ( aConfiguration.GetConfigurationNode( diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 74ff11a83abe..881aa4e12e34 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -281,7 +281,7 @@ std::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme() PresenterConfigurationAccess aConfiguration ( mxContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -369,7 +369,7 @@ std::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyl std::shared_ptr<PresenterConfigurationAccess> pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 97df29c8c03d..bbddbc7150ae 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -606,7 +606,7 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); mpCurrentContainerPart.reset(new ElementContainerPart()); diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 158049d9a24b..2e56f5bdc414 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -505,7 +505,7 @@ void PresenterWindowManager::RestoreViewMode() sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode("Presenter/InitialViewMode") >>= nMode; switch (nMode) @@ -531,7 +531,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.PresenterScreen/"), + "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(OUString("Presenter")); Any aValue; diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 0fa5823fcb4c..4d46add22663 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -194,7 +194,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() css::uno::Reference< css::lang::XMultiServiceFactory > xProvider = css::configuration::theDefaultProvider::get( m_xContext ); css::beans::PropertyValue aArg( - OUString("nodepath"), -1, + "nodepath", -1, css::uno::makeAny( OUString( "/org.openoffice.Office.Common/I18N/InputMethod")), diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index aafde1c0b17b..d0d36941f590 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -220,7 +220,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink ) bool bSysTopic = false; if (!sTopic.equalsIgnoreAsciiCase("SYSTEM")) { - DdeConnection aTmp(sServer, OUString("SYSTEM")); + DdeConnection aTmp(sServer, "SYSTEM"); bSysTopic = !aTmp.GetError(); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index a84a21bb88eb..260573c78cf5 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -107,8 +107,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::cppu; -#define IODLG_CONFIGNAME OUString("FilePicker_Save") -#define IMPGRF_CONFIGNAME OUString("FilePicker_Graph") +#define IODLG_CONFIGNAME "FilePicker_Save" +#define IMPGRF_CONFIGNAME "FilePicker_Graph" #define USERITEM_NAME "UserItem" namespace sfx2 @@ -1046,24 +1046,24 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( else { aInitArguments[0] <<= NamedValue( - OUString( "TemplateDescription" ), + "TemplateDescription", makeAny( nTemplateDescription ) ); aInitArguments[1] <<= NamedValue( - OUString( "StandardDir" ), + "StandardDir", makeAny( sStandardDir ) ); aInitArguments[2] <<= NamedValue( - OUString( "BlackList" ), + "BlackList", makeAny( rBlackList ) ); if ( mpPreferredParentWindow ) aInitArguments[3] <<= NamedValue( - OUString( "ParentWindow" ), + "ParentWindow", makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) ) ); } diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index fb4376e0b38c..1ace335f1648 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -423,10 +423,10 @@ mkException( OUString const & i_rMessage, iaioe.Classification = task::InteractionClassification_ERROR; iaioe.Code = i_ErrorCode; - const beans::PropertyValue uriProp(OUString("Uri"), + const beans::PropertyValue uriProp("Uri", -1, uno::makeAny(i_rUri), static_cast<beans::PropertyState>(0)); const beans::PropertyValue rnProp( - OUString("ResourceName"), + "ResourceName", -1, uno::makeAny(i_rResource), static_cast<beans::PropertyState>(0)); iaioe.Arguments = { uno::makeAny(uriProp), uno::makeAny(rnProp) }; return iaioe; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 76ff7a30ec32..f979407f10b2 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -3171,7 +3171,7 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() OUString aContentType; aAny >>= aContentType; - pImpl->xAttributes->Append( SvKeyValue( OUString("content-type"), aContentType ) ); + pImpl->xAttributes->Append( SvKeyValue( "content-type", aContentType ) ); } catch ( const css::uno::Exception& ) { diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 4077a2ab60f9..e51b987ff49d 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -874,7 +874,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, "UIName", OUString() ); - pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, OUString( "pdf" ), rStandardDir, rBlackList )); + pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, "pdf", rStandardDir, rBlackList )); pFileDlg->SetCurrentFilter( aFilterUIName ); } else diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index ad0520d4ba4d..a46a563acfbd 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3594,8 +3594,8 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat SfxModelGuard aGuard( *this ); datatransfer::DataFlavor aDataFlavor( - OUString("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), - OUString("GDIMetaFile"), + "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", + "GDIMetaFile", cppu::UnoType<Sequence< sal_Int8 >>::get() ); embed::VisualRepresentation aVisualRepresentation; diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 9e0f0003ecf1..adbedece1695 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -251,7 +251,7 @@ void ResourceManager::ReadDeckList() { const utl::OConfigurationTreeRoot aDeckRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/DeckList"), + "org.openoffice.Office.UI.Sidebar/Content/DeckList", false); if (!aDeckRootNode.isValid()) return; @@ -311,7 +311,7 @@ void ResourceManager::SaveDeckSettings(const DeckDescriptor* pDeckDesc) { const utl::OConfigurationTreeRoot aDeckRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/DeckList"), + "org.openoffice.Office.UI.Sidebar/Content/DeckList", true); if (!aDeckRootNode.isValid()) return; @@ -332,7 +332,7 @@ void ResourceManager::SaveDeckSettings(const DeckDescriptor* pDeckDesc) const utl::OConfigurationTreeRoot aPanelRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/PanelList"), + "org.openoffice.Office.UI.Sidebar/Content/PanelList", true); if (!aPanelRootNode.isValid()) @@ -368,7 +368,7 @@ void ResourceManager::ReadPanelList() { const utl::OConfigurationTreeRoot aPanelRootNode( comphelper::getProcessComponentContext(), - OUString("org.openoffice.Office.UI.Sidebar/Content/PanelList"), + "org.openoffice.Office.UI.Sidebar/Content/PanelList", false); if (!aPanelRootNode.isValid()) return; @@ -607,7 +607,7 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XController>& rxC rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle; rDeckDescriptor.mbIsEnabled = true; rDeckDescriptor.mnOrderIndex = 100000 + nReadIndex; - rDeckDescriptor.maContextList.AddContextDescription(Context(sModuleName, OUString("any")), true, OUString()); + rDeckDescriptor.maContextList.AddContextDescription(Context(sModuleName, "any"), true, OUString()); maPanels.push_back(std::make_shared<PanelDescriptor>()); PanelDescriptor& rPanelDescriptor(*maPanels.back()); @@ -622,7 +622,7 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XController>& rxC rPanelDescriptor.mnOrderIndex = 100000 + nReadIndex; rPanelDescriptor.mbShowForReadOnlyDocuments = false; rPanelDescriptor.mbWantsCanvas = false; - rPanelDescriptor.maContextList.AddContextDescription(Context(sModuleName, OUString("any")), true, OUString()); + rPanelDescriptor.maContextList.AddContextDescription(Context(sModuleName, "any"), true, OUString()); } } diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index a1467a5db0e7..7a7f63518c32 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -244,7 +244,7 @@ bool isMainSequenceRootNode_( // detect main sequence root node (need that for // end-of-mainsequence signalling below) beans::NamedValue const aSearchKey( - OUString( "node-type" ), + "node-type", uno::makeAny( presentation::EffectNodeType::MAIN_SEQUENCE ) ); uno::Sequence<beans::NamedValue> const userData(xNode->getUserData()); diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index 6eb1f70b5cdc..50052d807b42 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -311,7 +311,7 @@ namespace internal 1, beans::NamedValue( //xAnimateNode->getAttributeName(), - OUString("visibility"), + "visibility", uno::makeAny( bVisible ) ) ) ) ); break; } diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 1615bd2feda5..077bbb79f4f6 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -94,7 +94,7 @@ void StgInternalStream::Commit() ///////////////////////// class StgCompObjStream StgCompObjStream::StgCompObjStream( BaseStorage& rStg, bool bWr ) - : StgInternalStream( rStg, OUString("\1CompObj"), bWr ) + : StgInternalStream( rStg, "\1CompObj", bWr ) { memset( &m_aClsId, 0, sizeof( ClsId ) ); m_nCbFormat = SotClipboardFormatId::NONE; @@ -163,7 +163,7 @@ bool StgCompObjStream::Store() /////////////////////////// class StgOleStream StgOleStream::StgOleStream( BaseStorage& rStg ) - : StgInternalStream( rStg, OUString("\1Ole"), true ) + : StgInternalStream( rStg, "\1Ole", true ) { } diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 1ea663b8ddb9..b1805760ccea 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -330,7 +330,7 @@ const OUString SmFontFormatList::GetNewFontFormatId() const SmMathConfig::SmMathConfig() : - ConfigItem(OUString("Office.Math")) + ConfigItem("Office.Math") , pFormat() , pOther() , pFontFormatList() diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index b4b9793e4733..ed0adca219b7 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -135,10 +135,10 @@ SmFormat::SmFormat() vFont[FNT_FUNCTION] = vFont[FNT_NUMBER] = vFont[FNT_TEXT] = - vFont[FNT_SERIF] = SmFace(OUString(FNTNAME_TIMES), aBaseSize); - vFont[FNT_SANS] = SmFace(OUString(FNTNAME_HELV), aBaseSize); - vFont[FNT_FIXED] = SmFace(OUString(FNTNAME_COUR), aBaseSize); - vFont[FNT_MATH] = SmFace(OUString(FNTNAME_MATH), aBaseSize); + vFont[FNT_SERIF] = SmFace(FNTNAME_TIMES, aBaseSize); + vFont[FNT_SANS] = SmFace(FNTNAME_HELV, aBaseSize); + vFont[FNT_FIXED] = SmFace(FNTNAME_COUR, aBaseSize); + vFont[FNT_MATH] = SmFace(FNTNAME_MATH, aBaseSize); vFont[FNT_MATH].SetCharSet( RTL_TEXTENCODING_UNICODE ); diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index a30dc3e38da0..7cf4b7384839 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -531,7 +531,7 @@ void SmTableNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) SmTmpDevice aTmpDev (rDev, true); aTmpDev.SetFont(GetFont()); - SmRect aRect = (SmRect(aTmpDev, &rFormat, OUString("a"), + SmRect aRect = (SmRect(aTmpDev, &rFormat, "a", GetFont().GetBorderWidth())); mnFormulaBaseline = GetAlignM(); // move from middle position by constant - distance @@ -590,7 +590,7 @@ void SmLineNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) //! be sure to use a character that has explicitly defined HiAttribut //! line in rect.cxx such as 'a' in order to make 'vec a' look same to //! 'vec {a}'. - SmRect::operator = (SmRect(aTmpDev, &rFormat, OUString("a"), + SmRect::operator = (SmRect(aTmpDev, &rFormat, "a", GetFont().GetBorderWidth())); // make sure that the rectangle occupies (almost) no space SetWidth(1); diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index d7b0c885b676..86eb7cb7ee78 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -1335,13 +1335,13 @@ void JavaVirtualMachine::registerConfigChangesListener() // arguments for ConfigurationAccess css::uno::Sequence< css::uno::Any > aArguments(2); aArguments[0] <<= css::beans::PropertyValue( - OUString("nodepath"), + "nodepath", 0, css::uno::makeAny(OUString("org.openoffice.Inet/Settings")), css::beans::PropertyState_DIRECT_VALUE); // depth: -1 means unlimited aArguments[1] <<= css::beans::PropertyValue( - OUString("depth"), + "depth", 0, css::uno::makeAny( (sal_Int32)-1), css::beans::PropertyState_DIRECT_VALUE); @@ -1358,13 +1358,13 @@ void JavaVirtualMachine::registerConfigChangesListener() // now register as listener to changes in org.openoffice.Java/VirtualMachine css::uno::Sequence< css::uno::Any > aArguments2(2); aArguments2[0] <<= css::beans::PropertyValue( - OUString("nodepath"), + "nodepath", 0, css::uno::makeAny(OUString("org.openoffice.Office.Java/VirtualMachine")), css::beans::PropertyState_DIRECT_VALUE); // depth: -1 means unlimited aArguments2[1] <<= css::beans::PropertyValue( - OUString("depth"), + "depth", 0, css::uno::makeAny( (sal_Int32)-1), css::beans::PropertyState_DIRECT_VALUE); diff --git a/svl/qa/unit/items/test_IndexedStyleSheets.cxx b/svl/qa/unit/items/test_IndexedStyleSheets.cxx index f645733d6aea..da86044d2fe3 100644 --- a/svl/qa/unit/items/test_IndexedStyleSheets.cxx +++ b/svl/qa/unit/items/test_IndexedStyleSheets.cxx @@ -87,7 +87,7 @@ void IndexedStyleSheetsTest::AddedStylesheetsCanBeFoundAndRetrievedByPosition() void IndexedStyleSheetsTest::AddingSameStylesheetTwiceHasNoEffect() { - rtl::Reference<SfxStyleSheetBase> sheet1(new MockedStyleSheet(rtl::OUString("sheet1"))); + rtl::Reference<SfxStyleSheetBase> sheet1(new MockedStyleSheet("sheet1")); IndexedStyleSheets iss; iss.AddStyleSheet(sheet1); CPPUNIT_ASSERT_EQUAL(1u, iss.GetNumberOfStyleSheets()); @@ -111,8 +111,8 @@ void IndexedStyleSheetsTest::RemovedStyleSheetIsNotFound() void IndexedStyleSheetsTest::RemovingStyleSheetWhichIsNotAvailableHasNoEffect() { - rtl::Reference<SfxStyleSheetBase> sheet1(new MockedStyleSheet(rtl::OUString("sheet1"))); - rtl::Reference<SfxStyleSheetBase> sheet2(new MockedStyleSheet(rtl::OUString("sheet2"))); + rtl::Reference<SfxStyleSheetBase> sheet1(new MockedStyleSheet("sheet1")); + rtl::Reference<SfxStyleSheetBase> sheet2(new MockedStyleSheet("sheet2")); IndexedStyleSheets iss; iss.AddStyleSheet(sheet1); CPPUNIT_ASSERT_EQUAL(1u, iss.GetNumberOfStyleSheets()); diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index fe37c3fb33c7..d60f07b6645b 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -103,7 +103,7 @@ static Sequence< OUString > lcl_GetNotifyNames() SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - ConfigItem( OUString(CFG_ROOT_NODE ) ), + ConfigItem( CFG_ROOT_NODE ), m_aSearchOpt ( SearchAlgorithms_ABSOLUTE, SearchFlags::LEV_RELAXED, @@ -209,7 +209,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : SfxPoolItem ( rItem ), - ConfigItem( OUString(CFG_ROOT_NODE ) ), + ConfigItem( CFG_ROOT_NODE ), m_aSearchOpt ( rItem.m_aSearchOpt ), m_eFamily ( rItem.m_eFamily ), diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 6dcd09b0ca62..f79e55e3f240 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -53,7 +53,7 @@ bool DocumentLockFile::m_bAllowInteraction = true; DocumentLockFile::DocumentLockFile( const OUString& aOrigURL ) -: LockFileCommon( aOrigURL, OUString( ".~lock." ) ) +: LockFileCommon( aOrigURL, ".~lock." ) { } diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index 205c4e2b2b26..67445e36c17a 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -52,7 +52,7 @@ namespace svt { ShareControlFile::ShareControlFile( const OUString& aOrigURL ) -: LockFileCommon( aOrigURL, OUString( ".~sharing." ) ) +: LockFileCommon( aOrigURL, ".~sharing." ) { if ( !m_xStream.is() && !m_aURL.isEmpty() ) { diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index f328c8419878..1d7790070e7b 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -379,7 +379,7 @@ PasswordContainer::PasswordContainer( const Reference<XMultiServiceFactory>& xSe mComponent.set( xServiceFactory, UNO_QUERY ); mComponent->addEventListener( this ); - m_pStorageFile = new StorageItem( this, OUString("Office.Common/Passwords") ); + m_pStorageFile = new StorageItem( this, "Office.Common/Passwords" ); if( m_pStorageFile->useStorage() ) m_aContainer = m_pStorageFile->getInfo(); } diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 69df68a5e521..9828f13b7c17 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -26,8 +26,7 @@ using namespace com::sun::star; SysCredentialsConfigItem::SysCredentialsConfigItem( SysCredentialsConfig * pOwner ) -: utl::ConfigItem( OUString("Office.Common/Passwords"), - ConfigItemMode::ImmediateUpdate ), +: utl::ConfigItem( "Office.Common/Passwords", ConfigItemMode::ImmediateUpdate ), m_bInited( false ), m_pOwner( pOwner ) { diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index f25028691f12..7ccfa0f142a9 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; bool SvtTabAppearanceCfg::bInitialized = false; SvtTabAppearanceCfg::SvtTabAppearanceCfg() - :ConfigItem(OUString("Office.Common/View")) + :ConfigItem("Office.Common/View") ,nDragMode ( DEFAULT_DRAGMODE ) ,nSnapMode ( DEFAULT_SNAPMODE ) ,nMiddleMouse ( MouseMiddleButtonAction::AutoScroll ) diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index ac6bce26a9f7..f42a7c038d60 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -194,7 +194,7 @@ OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const bool ExtendedColorConfig_Impl::m_bLockBroadcast = false; bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = false; ExtendedColorConfig_Impl::ExtendedColorConfig_Impl() : - ConfigItem(OUString("Office.ExtendedColorScheme")), + ConfigItem("Office.ExtendedColorScheme"), m_bIsBroadcastEnabled(true) { //try to register on the root node - if possible diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 6785a3ff8497..bb4533f0538d 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -48,7 +48,7 @@ struct SvtFontSubstConfig_Impl }; SvtFontSubstConfig::SvtFontSubstConfig() : - ConfigItem(OUString("Office.Common/Font/Substitution")), + ConfigItem("Office.Common/Font/Substitution"), bIsEnabled(false), pImpl(new SvtFontSubstConfig_Impl) { diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 88787383b06c..b3d93847a7e8 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -122,7 +122,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() } SvtHelpOptions_Impl::SvtHelpOptions_Impl() - : ConfigItem( OUString( "Office.Common/Help" ) ) + : ConfigItem( "Office.Common/Help" ) , bExtendedHelp( false ) , bHelpTips( true ) , bWelcomeScreen( false ) diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index fffce29e0405..e4b9fc05e880 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -36,7 +36,7 @@ using namespace ::utl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -#define ROOTNODE_MENU OUString("Office.Common/View/Menu" ) +#define ROOTNODE_MENU "Office.Common/View/Menu" #define DEFAULT_DONTHIDEDISABLEDENTRIES false #define DEFAULT_FOLLOWMOUSE true #define DEFAULT_MENUICONS TRISTATE_INDET diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 87189f7ef36c..418ae34c7596 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -34,7 +34,7 @@ using namespace ::utl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -#define ROOTNODE_START OUString("Office.Common/Drawinglayer" ) +#define ROOTNODE_START "Office.Common/Drawinglayer" #define DEFAULT_OVERLAYBUFFER true #define DEFAULT_PAINTBUFFER true #define DEFAULT_STRIPE_COLOR_A 0 diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index ab89080b4b9d..fa694c0c73af 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -33,7 +33,7 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -#define ROOTNODE_SLIDESORTERBAR OUString("Office.Impress/MultiPaneGUI/SlideSorterBar/Visible") +#define ROOTNODE_SLIDESORTERBAR "Office.Impress/MultiPaneGUI/SlideSorterBar/Visible" #define PROPERTYNAME_VISIBLE_IMPRESSVIEW OUString("ImpressView") #define PROPERTYHANDLE_VISIBLE_IMPRESSVIEW 0 diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 647037ad154f..82b3ca70b11b 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -38,7 +38,7 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -#define ROOTNODE_TOOLPANEL OUString("Office.Impress/MultiPaneGUI/ToolPanel/Visible") +#define ROOTNODE_TOOLPANEL "Office.Impress/MultiPaneGUI/ToolPanel/Visible" #define PROPERTYNAME_VISIBLE_IMPRESSVIEW OUString("ImpressView") #define PROPERTYHANDLE_VISIBLE_IMPRESSVIEW 0 diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 104317b50141..f7fc478d7254 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -154,7 +154,7 @@ void FilterMatch::createWildCardFilterList(const OUString& _rFilterList,::std::v else { // no filter is given -> match all - _rFilters.push_back( WildCard(OUString("*")) ); + _rFilters.push_back( WildCard("*") ); } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 7d59771ea77d..b07207d88332 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -286,7 +286,7 @@ void AssignmentPersistentData::ImplCommit() AssignmentPersistentData::AssignmentPersistentData() - :ConfigItem( OUString( "Office.DataAccess/AddressBook" )) + :ConfigItem("Office.DataAccess/AddressBook") { Sequence< OUString > aStoredNames = GetNodeNames("Fields"); const OUString* pStoredNames = aStoredNames.getConstArray(); diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index fc8c2ff5cbb6..0ca611f5d45f 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -626,7 +626,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const OUSt { MapMode aMM( MapUnit::MapAppFont ); Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, nullptr ); - vcl::Font aFnt( OUString("Helvetica"), aAppFontSz ); + vcl::Font aFnt( "Helvetica", aAppFontSz ); aFnt.SetTransparent( true ); aFnt.SetColor( Color( COL_LIGHTRED ) ); aFnt.SetWeight( WEIGHT_BOLD ); diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 1138aaa5e7dc..5796b06dc7a6 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -156,14 +156,14 @@ namespace { Sequence< Any > aArguments(5); Any* pArguments = aArguments.getArray(); // the parent window - *pArguments++ <<= PropertyValue(OUString( "ParentWindow" ), -1, makeAny( xParentWindow ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue( "ParentWindow", -1, makeAny( xParentWindow ), PropertyState_DIRECT_VALUE); // the data source to use - *pArguments++ <<= PropertyValue(OUString( "DataSource" ), -1, makeAny( xDataSource ), PropertyState_DIRECT_VALUE); - *pArguments++ <<= PropertyValue(OUString( "DataSourceName" ), -1, makeAny( sDataSourceName ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue( "DataSource", -1, makeAny( xDataSource ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue( "DataSourceName", -1, makeAny( sDataSourceName ), PropertyState_DIRECT_VALUE); // the table to use - *pArguments++ <<= PropertyValue(OUString( "Command" ), -1, makeAny( sCommand ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue( "Command", -1, makeAny( sCommand ), PropertyState_DIRECT_VALUE); // the title - *pArguments++ <<= PropertyValue(OUString( "Title" ), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue( "Title", -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); OGenericUnoDialog::initialize(aArguments); return; } diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index ed0ba4d929de..8f52dca70df2 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -65,7 +65,7 @@ IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XF pItemInfo = new SfxItemInfo[ 1 ]; memset( pItemInfo, 0, sizeof( SfxItemInfo ) ); - pIMapPool = new SfxItemPool( OUString("IMapItemPool"), + pIMapPool = new SfxItemPool( "IMapItemPool", SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, pItemInfo ); pIMapPool->FreezeIdRanges(); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 51137e4be4ac..f9f5202eaabb 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -541,10 +541,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( xDocument ) ), - ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), - ::cppu::ContextEntry_Init( OUString( "ControlContext" ), makeAny( xControlContext ) ), - ::cppu::ContextEntry_Init( OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) + ::cppu::ContextEntry_Init( "ContextDocument", makeAny( xDocument ) ), + ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny( xParentWindow ) ), + ::cppu::ContextEntry_Init( "ControlContext", makeAny( xControlContext ) ), + ::cppu::ContextEntry_Init( "ControlShapeAccess", makeAny( xControlMap ) ) }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 4db230f93b1a..42dfa92c62ce 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -616,7 +616,7 @@ FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) - ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), ConfigItemMode::DelayedUpdate) + ,FmXFormShell_CFGBASE("Office.Common/Misc", ConfigItemMode::DelayedUpdate) ,m_eNavigate( NavigationBarMode_NONE ) ,m_nInvalidationEvent( nullptr ) ,m_nActivationEvent( nullptr ) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 742f256ebdde..5511a633dc67 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -555,8 +555,8 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, m_eULSpaceUnit(), maLRSpaceControl (SID_ATTR_PARA_LRSPACE,*pBindings,*this), maULSpaceControl (SID_ATTR_PARA_ULSPACE, *pBindings,*this), - maDecIndentControl(SID_DEC_INDENT, *pBindings,*this, OUString("DecrementIndent"), rxFrame), - maIncIndentControl(SID_INC_INDENT, *pBindings,*this, OUString("IncrementIndent"), rxFrame), + maDecIndentControl(SID_DEC_INDENT, *pBindings,*this, "DecrementIndent", rxFrame), + maIncIndentControl(SID_INC_INDENT, *pBindings,*this, "IncrementIndent", rxFrame), m_aMetricCtl (SID_ATTR_METRIC, *pBindings,*this), maContext(), mpBindings(pBindings), diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 0eb00d295c9c..c7cabbe2a346 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -232,7 +232,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionDirectionFloater" ) + ".uno:ExtrusionDirectionFloater" ) { } @@ -466,7 +466,7 @@ ExtrusionDepthController::ExtrusionDepthController( ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionDepthFloater" ) + ".uno:ExtrusionDepthFloater" ) { } @@ -730,7 +730,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionDirectionFloater" ) + ".uno:ExtrusionDirectionFloater" ) { } @@ -865,7 +865,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionSurfaceFloater" ) + ".uno:ExtrusionSurfaceFloater" ) { } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index b71e796c3c8d..e9b19cda26d6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -353,7 +353,7 @@ public: FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext ) -: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) +: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), ".uno:FontworkAlignment" ) { } @@ -577,7 +577,7 @@ public: FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Reference< XComponentContext >& rxContext ) -: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) ) +: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), ".uno:FontworkCharacterSpacingFloater" ) { } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 091ede2f2002..3cfd2f61afe2 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -265,7 +265,7 @@ void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, uno::Reference< frame::XFrame >(), - OUString( ".uno:FontHeight" ) ), + ".uno:FontHeight" ), m_pBox( nullptr ) { addStatusListener( ".uno:CharFontName"); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 1f55336da921..e07d9f93a612 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -457,7 +457,7 @@ private: }; FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - : svt::ToolboxController(rxContext, css::uno::Reference< css::frame::XFrame >(), OUString(COMMAND_FINDTEXT)) + : svt::ToolboxController(rxContext, css::uno::Reference< css::frame::XFrame >(), COMMAND_FINDTEXT) , m_pFindTextFieldControl(nullptr) , m_nDownSearchId(0) , m_nUpSearchId(0) @@ -748,7 +748,7 @@ private: MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString(COMMAND_MATCHCASE) ) + COMMAND_MATCHCASE ) , m_pMatchCaseControl(nullptr) { } @@ -868,7 +868,7 @@ private: SearchFormattedToolboxController::SearchFormattedToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString(COMMAND_SEARCHFORMATTED) ) + COMMAND_SEARCHFORMATTED ) , m_pSearchFormattedControl(nullptr) { } @@ -1093,7 +1093,7 @@ public: ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString( ".uno:ExitSearch" ) ) + ".uno:ExitSearch" ) { } @@ -1212,7 +1212,7 @@ public: SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString( ".uno:SearchLabel" ) ) + ".uno:SearchLabel" ) { } diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index b15e23dcae6e..bf657c01926a 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -108,7 +108,7 @@ class SwNoteProps: public utl::ConfigItem public: SwNoteProps() - : ConfigItem(OUString("Office.Writer/Notes")) + : ConfigItem("Office.Writer/Notes") , bIsShowAnchor(false) { const css::uno::Sequence< OUString >& rNames = GetPropertyNames(); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 2792ec32aac1..4a123fc462eb 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -182,7 +182,7 @@ void SwDocTest::testFileNameFields() { //Here's a file name with some chars in it that will be %% encoded, when expanding //SwFileNameFields we want to restore the original readable filename - utl::TempFile aTempFile(OUString("demo [name]")); + utl::TempFile aTempFile("demo [name]"); aTempFile.EnableKillingFile(); INetURLObject aTempFileURL(aTempFile.GetURL()); @@ -190,9 +190,9 @@ void SwDocTest::testFileNameFields() SfxMedium aDstMed(sFileURL, StreamMode::STD_READWRITE); std::shared_ptr<SfxFilter> pFilter(new SfxFilter( - OUString("Text"), + "Text", OUString(), SfxFilterFlags::NONE, SotClipboardFormatId::NONE, OUString(), 0, OUString(), - OUString("TEXT"), OUString() )); + "TEXT", OUString() )); aDstMed.SetFilter(pFilter); m_xDocShRef->DoSaveAs(aDstMed); @@ -574,7 +574,7 @@ void SwDocTest::testSwScanner() //fdo#40449 and fdo#39365 { SwScanner aScanner(*pTextNode, - OUString("Hello World"), + "Hello World", nullptr, ModelToViewHelper(), i18n::WordType::DICTIONARY_WORD, 0, RTL_CONSTASCII_LENGTH("Hello World")); @@ -716,8 +716,8 @@ void SwDocTest::testSwScanner() DateTime aDate(DateTime::SYSTEM); SwPostItField aPostIt( - static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD)), OUString("An Author"), - OUString("Some Text"), OUString("Initials"), OUString("Name"), aDate ); + static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD)), "An Author", + "Some Text", "Initials", "Name", aDate ); m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFormatField(aPostIt)); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "Apple"); diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index ec5d66ca0ee0..8abf06e12a06 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -147,28 +147,28 @@ public: mMMargs.reserve( 15 ); - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_OUTPUT_TYPE ), uno::Any( file ? text::MailMergeType::FILE : text::MailMergeType::SHELL ) ) ); - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_DOCUMENT_URL ), uno::Any( + mMMargs.push_back( beans::NamedValue( UNO_NAME_OUTPUT_TYPE, uno::Any( file ? text::MailMergeType::FILE : text::MailMergeType::SHELL ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_DOCUMENT_URL, uno::Any( ( OUString( m_directories.getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(filename)) ) ) ) ); - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_DATA_SOURCE_NAME ), uno::Any( aDBName ) ) ); - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_OUTPUT_URL ), uno::Any( aWorkDir ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_DATA_SOURCE_NAME, uno::Any( aDBName ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_OUTPUT_URL, uno::Any( aWorkDir ) ) ); if (file) - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_FILE_NAME_PREFIX ), uno::Any( aPrefix )) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_FILE_NAME_PREFIX, uno::Any( aPrefix )) ); if (bPrefixIsColumn) - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_FILE_NAME_FROM_COLUMN ), uno::Any( true ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_FILE_NAME_FROM_COLUMN, uno::Any( true ) ) ); if (tablename) { - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_DAD_COMMAND_TYPE ), uno::Any( sdb::CommandType::TABLE ) ) ); - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_DAD_COMMAND ), uno::Any( OUString::createFromAscii(tablename) ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_DAD_COMMAND_TYPE, uno::Any( sdb::CommandType::TABLE ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_DAD_COMMAND, uno::Any( OUString::createFromAscii(tablename) ) ) ); } if (nDataSets > 0) { mxCurResultSet = getXResultFromDataset( tablename, aDBName ); uno::Reference< sdbcx::XRowLocate > xCurRowLocate( mxCurResultSet, uno::UNO_QUERY ); - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_RESULT_SET ), uno::Any( mxCurResultSet ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_RESULT_SET, uno::Any( mxCurResultSet ) ) ); std::vector< uno::Any > vResult; vResult.reserve( nDataSets ); sal_Int32 i; @@ -176,7 +176,7 @@ public: { vResult.push_back( uno::Any( xCurRowLocate->getBookmark() ) ); } - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_SELECTION ), uno::Any( comphelper::containerToSequence(vResult) ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_SELECTION, uno::Any( comphelper::containerToSequence(vResult) ) ) ); } } @@ -638,7 +638,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf102010, "empty.odt", "10-testing-addresses.od ++aNamedValueIter; } } - mMMargs.push_back( beans::NamedValue( OUString( UNO_NAME_SAVE_AS_SINGLE_FILE ), uno::Any( true ) ) ); + mMMargs.push_back( beans::NamedValue( UNO_NAME_SAVE_AS_SINGLE_FILE, uno::Any( true ) ) ); // Generate correct mail merge result filename executeMailMerge(); diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 217a65102d22..0ddc4397b8a7 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -730,7 +730,7 @@ void SwUiWriterTest::testFdo74981() // create a document with an input field SwDoc* pDoc = createDoc(); SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); - SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFieldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0); + SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFieldType(0, RES_INPUTFLD)), "foo", "bar", 0, 0); pWrtShell->Insert(aField); { @@ -761,10 +761,10 @@ void SwUiWriterTest::testTdf98512() SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); SwInputFieldType *const pType(static_cast<SwInputFieldType*>( pWrtShell->GetFieldType(0, RES_INPUTFLD))); - SwInputField aField1(pType, OUString("foo"), OUString("bar"), INP_TXT, 0); + SwInputField aField1(pType, "foo", "bar", INP_TXT, 0); pWrtShell->Insert(aField1); pWrtShell->SttEndDoc(/*bStt=*/true); - SwInputField aField2(pType, OUString("baz"), OUString("quux"), INP_TXT, 0); + SwInputField aField2(pType, "baz", "quux", INP_TXT, 0); pWrtShell->Insert(aField2); pWrtShell->SttEndDoc(/*bStt=*/true); pWrtShell->SetMark(); @@ -2084,14 +2084,14 @@ void SwUiWriterTest::testTdf77342() //moving cursor to the starting of document pWrtShell->SttDoc(); //inserting reference field 1 - SwGetRefField aField1(pRefType, OUString(""), REF_FOOTNOTE, sal_uInt16(0), REF_CONTENT); + SwGetRefField aField1(pRefType, "", REF_FOOTNOTE, sal_uInt16(0), REF_CONTENT); pWrtShell->Insert(aField1); //inserting second footnote pWrtShell->InsertFootnote(""); pWrtShell->SttDoc(); pCursor->Move(fnMoveForward); //inserting reference field 2 - SwGetRefField aField2(pRefType, OUString(""), REF_FOOTNOTE, sal_uInt16(1), REF_CONTENT); + SwGetRefField aField2(pRefType, "", REF_FOOTNOTE, sal_uInt16(1), REF_CONTENT); pWrtShell->Insert(aField2); //inserting third footnote pWrtShell->InsertFootnote(""); @@ -2099,7 +2099,7 @@ void SwUiWriterTest::testTdf77342() pCursor->Move(fnMoveForward); pCursor->Move(fnMoveForward); //inserting reference field 3 - SwGetRefField aField3(pRefType, OUString(""), REF_FOOTNOTE, sal_uInt16(2), REF_CONTENT); + SwGetRefField aField3(pRefType, "", REF_FOOTNOTE, sal_uInt16(2), REF_CONTENT); pWrtShell->Insert(aField3); //updating the fields IDocumentFieldsAccess& rField(pDoc->getIDocumentFieldsAccess()); @@ -2321,38 +2321,38 @@ void SwUiWriterTest::testTdf63553() SwPaM* pCursor = pDoc->GetEditShell()->GetCursor(); //inserting sequence field 1 SwSetExpFieldType* pSeqType = static_cast<SwSetExpFieldType*>(pWrtShell->GetFieldType(RES_SETEXPFLD, "Illustration")); - SwSetExpField aSetField1(pSeqType, OUString(""), SVX_NUM_ARABIC); + SwSetExpField aSetField1(pSeqType, "", SVX_NUM_ARABIC); pWrtShell->Insert(aSetField1); SwGetRefFieldType* pRefType = static_cast<SwGetRefFieldType*>(pWrtShell->GetFieldType(0, RES_GETREFFLD)); //moving cursor to the starting of document pWrtShell->SttDoc(); //inserting reference field 1 - SwGetRefField aGetField1(pRefType, OUString("Illustration"), REF_SEQUENCEFLD, sal_uInt16(0), REF_CONTENT); + SwGetRefField aGetField1(pRefType, "Illustration", REF_SEQUENCEFLD, sal_uInt16(0), REF_CONTENT); pWrtShell->Insert(aGetField1); //now we have ref1-seq1 //moving the cursor pCursor->Move(fnMoveForward); //inserting sequence field 2 - SwSetExpField aSetField2(pSeqType, OUString(""), SVX_NUM_ARABIC); + SwSetExpField aSetField2(pSeqType, "", SVX_NUM_ARABIC); pWrtShell->Insert(aSetField2); //moving the cursor pWrtShell->SttDoc(); pCursor->Move(fnMoveForward); //inserting reference field 2 - SwGetRefField aGetField2(pRefType, OUString("Illustration"), REF_SEQUENCEFLD, sal_uInt16(1), REF_CONTENT); + SwGetRefField aGetField2(pRefType, "Illustration", REF_SEQUENCEFLD, sal_uInt16(1), REF_CONTENT); pWrtShell->Insert(aGetField2); //now we have ref1-ref2-seq1-seq2 //moving the cursor pCursor->Move(fnMoveForward); pCursor->Move(fnMoveForward); //inserting sequence field 3 - SwSetExpField aSetField3(pSeqType, OUString(""), SVX_NUM_ARABIC); + SwSetExpField aSetField3(pSeqType, "", SVX_NUM_ARABIC); pWrtShell->Insert(aSetField3); pWrtShell->SttDoc(); pCursor->Move(fnMoveForward); pCursor->Move(fnMoveForward); //inserting reference field 3 - SwGetRefField aGetField3(pRefType, OUString("Illustration"), REF_SEQUENCEFLD, sal_uInt16(2), REF_CONTENT); + SwGetRefField aGetField3(pRefType, "Illustration", REF_SEQUENCEFLD, sal_uInt16(2), REF_CONTENT); pWrtShell->Insert(aGetField3); //now after insertion we have ref1-ref2-ref3-seq1-seq2-seq3 //updating the fields diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index 065b305257cd..3cc2dca668dd 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -46,7 +46,7 @@ #include <svx/sdsxyitm.hxx> SwAttrPool::SwAttrPool( SwDoc* pD ) - : SfxItemPool( OUString("SWG"), + : SfxItemPool( "SWG", POOLATTR_BEGIN, POOLATTR_END-1, aSlotTab, &aAttrTab ), m_pDoc( pD ) diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index bb3f7626c590..417a56baba7f 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -232,7 +232,7 @@ namespace sw { namespace mark // TODO: everything else uses MarkBase::GenerateNewName ? NavigatorReminder::NavigatorReminder(const SwPaM& rPaM) - : MarkBase(rPaM, OUString("__NavigatorReminder__")) + : MarkBase(rPaM, "__NavigatorReminder__") { } UnoMark::UnoMark(const SwPaM& aPaM) diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 5db16bb9df50..03f887808836 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1112,7 +1112,7 @@ namespace numfunc } SwDefBulletConfig::SwDefBulletConfig() - : ConfigItem( OUString("Office.Writer/Numbering/DefaultBulletList") ), + : ConfigItem( "Office.Writer/Numbering/DefaultBulletList" ), // default bullet font is now OpenSymbol msFontname( OUString("OpenSymbol") ), mbUserDefinedFontname( false ), @@ -1312,7 +1312,7 @@ namespace numfunc } SwNumberingUIBehaviorConfig::SwNumberingUIBehaviorConfig() - : ConfigItem( OUString("Office.Writer/Numbering/UserInterfaceBehavior") ), + : ConfigItem( "Office.Writer/Numbering/UserInterfaceBehavior" ), mbChangeIndentOnTabAtFirstPosOfFirstListItem( true ) { SetToDefault(); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 6675b6178478..333303daa0a7 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -1087,7 +1087,7 @@ void SwOLEObj::resetBufferedData() } SwOLELRUCache::SwOLELRUCache() - : utl::ConfigItem(OUString("Office.Common/Cache")) + : utl::ConfigItem("Office.Common/Cache") , m_nLRU_InitSize( 20 ) { EnableNotification( GetPropertyNames() ); diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 998f45b592a1..9537e2bb125f 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -488,7 +488,7 @@ void SwXMLTextBlocks::WriteInfo() uno::Reference<xml::sax::XDocumentHandler> xHandler(xWriter, uno::UNO_QUERY); - rtl::Reference<SwXMLBlockListExport> xExp(new SwXMLBlockListExport( xContext, *this, OUString(XMLN_BLOCKLIST), xHandler) ); + rtl::Reference<SwXMLBlockListExport> xExp(new SwXMLBlockListExport( xContext, *this, XMLN_BLOCKLIST, xHandler) ); xExp->exportDoc( XML_BLOCK_LIST ); diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 707ffd3bfba5..333dfa39f876 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -232,11 +232,9 @@ bool StgWriter::IsStgWriter() const { return true; } </FilterFlags> */ -#define FILTER_OPTION_ROOT OUString("Office.Writer/FilterFlags") - SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames, sal_uInt64* pValues ) - : ConfigItem( FILTER_OPTION_ROOT ) + : ConfigItem( "Office.Writer/FilterFlags" ) { GetValues( nCnt, ppNames, pValues ); } diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 420ac67ac3d7..89c42e8af96a 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -840,13 +840,13 @@ sal_uInt16 wwFontHelper::GetId(const wwFont &rFont) void wwFontHelper::InitFontTable(const SwDoc& rDoc) { - GetId(wwFont(OUString("Times New Roman"), PITCH_VARIABLE, + GetId(wwFont("Times New Roman", PITCH_VARIABLE, FAMILY_ROMAN, RTL_TEXTENCODING_MS_1252)); - GetId(wwFont(OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN, + GetId(wwFont("Symbol", PITCH_VARIABLE, FAMILY_ROMAN, RTL_TEXTENCODING_SYMBOL)); - GetId(wwFont(OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS, + GetId(wwFont("Arial", PITCH_VARIABLE, FAMILY_SWISS, RTL_TEXTENCODING_MS_1252)); const SvxFontItem* pFont = static_cast<const SvxFontItem*>(GetDfltAttr(RES_CHRATR_FONT)); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 130808a00789..1a0be1031770 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -408,7 +408,7 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx oox::StorageRef vbaStg = root.openSubStorage( "Macros" , false ); if ( vbaStg.get() ) { - oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), OUString("Writer") ); + oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), "Writer" ); bRet = aVbaPrj.importVbaProject( *vbaStg ); } } @@ -4161,7 +4161,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_aSectionManager(*this) , m_aExtraneousParas(rD) , m_aInsertedTables(rD) - , m_aSectionNameGenerator(rD, OUString("WW")) + , m_aSectionNameGenerator(rD, "WW") , m_pSprmParser(nullptr) , m_aGrfNameGenerator(bNewDoc, OUString('G')) , m_aParaStyleMapper(rD) diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 5d9606392d3d..efe2f0e88d39 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1376,7 +1376,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, OUString& rStr ) eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, OUString& rStr ) { if( !m_pNumFieldType ){ // 1. Mal - SwSetExpFieldType aT( &m_rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ ); + SwSetExpFieldType aT( &m_rDoc, "AutoNr", nsSwGetSetExpType::GSE_SEQ ); m_pNumFieldType = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aT ); } SwSetExpField aField( static_cast<SwSetExpFieldType*>(m_pNumFieldType), OUString(), diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 741af3e66d26..6181fb7f41bd 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -534,7 +534,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLExporter", SvXMLExportFlags::ALL)); } @@ -542,7 +542,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLStylesExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLStylesExporter", SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS)); } @@ -551,7 +551,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLContentExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLContentExporter", SvXMLExportFlags::SCRIPTS | SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS)); } @@ -560,7 +560,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLMetaExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLMetaExporter", SvXMLExportFlags::META)); } @@ -568,7 +568,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLSettingsExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLSettingsExporter", SvXMLExportFlags::SETTINGS)); } @@ -576,7 +576,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLOasisExporter", SvXMLExportFlags::ALL | SvXMLExportFlags::OASIS)); } @@ -584,7 +584,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisStylesExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLOasisStylesExporter", SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } @@ -593,7 +593,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisContentExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLOasisContentExporter", SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } @@ -602,7 +602,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisMetaExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLOasisMetaExporter", SvXMLExportFlags::META | SvXMLExportFlags::OASIS)); } @@ -610,7 +610,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisSettingsExporter"), + return cppu::acquire(new SwXMLExport(context, "com.sun.star.comp.Writer.XMLOasisSettingsExporter", SvXMLExportFlags::SETTINGS | SvXMLExportFlags::OASIS)); } diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index dae5ed530470..949cda588989 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1500,7 +1500,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisImporter"), + return cppu::acquire(new SwXMLImport(context, "com.sun.star.comp.Writer.XMLOasisImporter", SvXMLImportFlags::ALL)); } @@ -1509,7 +1509,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisStylesImporter"), + return cppu::acquire(new SwXMLImport(context, "com.sun.star.comp.Writer.XMLOasisStylesImporter", SvXMLImportFlags::STYLES | SvXMLImportFlags::MASTERSTYLES | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS)); } @@ -1519,7 +1519,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisContentImporter"), + return cppu::acquire(new SwXMLImport(context, "com.sun.star.comp.Writer.XMLOasisContentImporter", SvXMLImportFlags::CONTENT | SvXMLImportFlags::SCRIPTS | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS)); } @@ -1528,7 +1528,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisMetaImporter"), + return cppu::acquire(new SwXMLImport(context, "com.sun.star.comp.Writer.XMLOasisMetaImporter", SvXMLImportFlags::META)); } @@ -1537,7 +1537,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisSettingsImporter"), + return cppu::acquire(new SwXMLImport(context, "com.sun.star.comp.Writer.XMLOasisSettingsImporter", SvXMLImportFlags::SETTINGS)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index c1e6e8a69491..5d5032c27a81 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -323,7 +323,7 @@ void SwTestAccountSettingsDialog::Test() new SwConnectionContext( m_pParent->m_pConfigItem->GetInServerName(), m_pParent->m_pConfigItem->GetInServerPort(), - OUString("Insecure")); + "Insecure"); xInMailService->connect(xConnectionContext, xAuthenticator); } if(m_bStop) diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index d94a6829df32..9b0d039ee667 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -88,9 +88,9 @@ void SwFieldPage::Init() { SwDoc* pDoc = pSh->GetDoc(); pSh->InsertFieldType( SwSetExpFieldType( pDoc, - OUString("HTML_ON"), 1)); + "HTML_ON", 1)); pSh->InsertFieldType( SwSetExpFieldType(pDoc, - OUString("HTML_OFF"), 1)); + "HTML_OFF", 1)); } } } diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 137ceb7ee552..4cd62dbe2b7c 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -255,7 +255,7 @@ IMPL_LINK_NOARG( SwJavaEditDialog, InsertFileHdl, Button *, void ) { pFileDlg = new ::sfx2::FileDialogHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::Insert, OUString("swriter") ); + FileDialogFlags::Insert, "swriter" ); } pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) ); diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 5d6d523dd872..94973d6fe9bd 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -335,8 +335,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) else pSh->SetMark(); // set only the mark - SwSectionData aSect(CONTENT_SECTION, - OUString(MASTER_LABEL)); + SwSectionData aSect(CONTENT_SECTION, MASTER_LABEL); pSh->InsertSection(aSect); } } diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index dc4c2a210583..08153afee6de 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -122,7 +122,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( new SwConnectionContext( rConfigItem.GetInServerName(), rConfigItem.GetInServerPort(), - OUString("Insecure")); + "Insecure"); xInMailService->connect(xConnectionContext, xAuthenticator); rxInMailService = xInMailService; } diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 97df0257a200..5aa6e0d88f15 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -45,7 +45,7 @@ class MMCurrentEntryController : public svt::ToolboxController, public lang::XSe public: explicit MMCurrentEntryController(const uno::Reference<uno::XComponentContext>& rContext) - : svt::ToolboxController(rContext, uno::Reference<frame::XFrame>(), OUString(".uno:MailMergeCurrentEntry")) + : svt::ToolboxController(rContext, uno::Reference<frame::XFrame>(), ".uno:MailMergeCurrentEntry") , m_pCurrentEdit(nullptr) { } @@ -106,7 +106,7 @@ class MMExcludeEntryController : public svt::ToolboxController, public lang::XSe public: explicit MMExcludeEntryController(const uno::Reference<uno::XComponentContext>& rContext) - : svt::ToolboxController(rContext, uno::Reference<frame::XFrame>(), OUString(".uno:MailMergeExcludeEntry")) + : svt::ToolboxController(rContext, uno::Reference<frame::XFrame>(), ".uno:MailMergeExcludeEntry") , m_pExcludeCheckbox(nullptr) { } diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index af57206b04a2..0da405ccf81c 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -305,16 +305,16 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString("CellRangeRepresentation"), -1, + "CellRangeRepresentation", -1, uno::makeAny( rCellRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString("HasCategories"), -1, + "HasCategories", -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString("FirstCellAsLabel"), -1, + "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - OUString("DataRowSource"), -1, + "DataRowSource", -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xDataReceiver->setArguments( aArgs ); } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 76afe40eb09b..33a735a00a13 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -707,8 +707,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const OUString* if ( !pFileName ) { delete pDocInserter; - pDocInserter = new ::sfx2::DocumentInserter( - OUString("swriter"), true ); + pDocInserter = new ::sfx2::DocumentInserter( "swriter", true ); pDocInserter->StartExecuteModal( LINK( this, SwGlobalTree, DialogClosedHdl ) ); } else if ( !pFileName->isEmpty() ) diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index d0c65392b94b..e3e95bfa4b18 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -51,8 +51,8 @@ css::beans::Property* ImplGetProperties( sal_uInt16& rElementCount ) { static css::beans::Property aPropTable[] = { - css::beans::Property( OUString("Orientation"), PROPERTY_Orientation, cppu::UnoType<sal_Int16>::get(), 0 ), - css::beans::Property( OUString("Horizontal"), PROPERTY_Horizontal, cppu::UnoType<bool>::get(), 0 ) + css::beans::Property( "Orientation", PROPERTY_Orientation, cppu::UnoType<sal_Int16>::get(), 0 ), + css::beans::Property( "Horizontal", PROPERTY_Horizontal, cppu::UnoType<bool>::get(), 0 ) }; pProperties = aPropTable; nElements = sizeof( aPropTable ) / sizeof( css::beans::Property ); diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 22734ad82256..988efa3ab0f9 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -214,17 +214,17 @@ CommandProcessorInfo::CommandProcessorInfo() (*m_pInfo)[ 0 ] = ucb::CommandInfo( - OUString( GETCOMMANDINFO_NAME ), // Name + GETCOMMANDINFO_NAME, // Name GETCOMMANDINFO_HANDLE, // Handle cppu::UnoType<void>::get() ); // ArgType (*m_pInfo)[ 1 ] = ucb::CommandInfo( - OUString( GLOBALTRANSFER_NAME ), // Name + GLOBALTRANSFER_NAME, // Name GLOBALTRANSFER_HANDLE, // Handle cppu::UnoType<ucb::GlobalTransferCommandArgument>::get() ); // ArgType (*m_pInfo)[ 2 ] = ucb::CommandInfo( - OUString( CHECKIN_NAME ), // Name + CHECKIN_NAME, // Name CHECKIN_HANDLE, // Handle cppu::UnoType<ucb::CheckinArgument>::get() ); // ArgType } @@ -443,7 +443,7 @@ bool setTitle( aPropValues[ 0 ].Value = uno::makeAny( rNewTitle ); ucb::Command aSetPropsCommand( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, uno::makeAny( aPropValues ) ); @@ -497,7 +497,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -515,7 +515,7 @@ uno::Reference< ucb::XContent > createNew( aPropsToObtain[ 0 ].Handle = -1; ucb::Command aGetPropsCommand( - OUString("getPropertyValues"), + "getPropertyValues", -1, uno::makeAny( aPropsToObtain ) ); @@ -548,7 +548,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -569,7 +569,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString("Folder"), + "Folder", -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -660,7 +660,7 @@ uno::Reference< ucb::XContent > createNew( // First, try it using "CreatabeleContentsInfo" property and // "createNewContent" command -> the "new" way. ucb::Command aCreateNewCommand( - OUString("createNewContent"), + "createNewContent", -1, uno::makeAny( aTypesInfo[ n ] ) ); @@ -680,7 +680,7 @@ uno::Reference< ucb::XContent > createNew( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -706,7 +706,7 @@ void transferProperties( const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorN ) { ucb::Command aGetPropertySetInfoCommand( - OUString("getPropertySetInfo"), + "getPropertySetInfo", -1, uno::Any() ); @@ -718,7 +718,7 @@ void transferProperties( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -734,7 +734,7 @@ void transferProperties( uno::Sequence< beans::Property > aAllProps = xInfo->getProperties(); ucb::Command aGetPropsCommand1( - OUString("getPropertyValues"), + "getPropertyValues", -1, uno::makeAny( aAllProps ) ); @@ -746,7 +746,7 @@ void transferProperties( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -847,7 +847,7 @@ void transferProperties( // Set properties at new object. ucb::Command aSetPropsCommand( - OUString("setPropertyValues"), + "setPropertyValues", -1, uno::makeAny( aPropValues ) ); @@ -879,7 +879,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); // unused ucb::Command aOpenCommand( - OUString("open"), + "open", -1, uno::makeAny( aArg ) ); @@ -913,7 +913,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); ucb::Command aOpenCommand( - OUString("open"), + "open", -1, uno::makeAny( aArg ) ); @@ -956,7 +956,7 @@ uno::Reference< sdbc::XResultSet > getResultSet( aArg.Sink = nullptr; aArg.Properties = aProps; - ucb::Command aOpenCommand( OUString("open"), + ucb::Command aOpenCommand( "open", -1, uno::makeAny( aArg ) ); try @@ -997,7 +997,7 @@ void handleNameClashRename( aProps[ 0 ].Handle = -1; ucb::Command aGetPropsCommand( - OUString("getPropertyValues"), + "getPropertyValues", -1, uno::makeAny( aProps ) ); @@ -1009,7 +1009,7 @@ void handleNameClashRename( uno::Any aProps2 = uno::makeAny( beans::PropertyValue( - OUString( "Uri" ), + "Uri", -1, uno::makeAny( xNew->getIdentifier()->getContentIdentifier() ), @@ -1097,7 +1097,7 @@ void handleNameClashRename( uno::Any aProps2 = uno::makeAny( beans::PropertyValue( - OUString( "Uri" ), + "Uri", -1, uno::makeAny( xNew->getIdentifier()-> @@ -1119,7 +1119,7 @@ void handleNameClashRename( aArg.ReplaceExisting = false; ucb::Command aInsertCommand( - OUString("insert"), + "insert", -1, uno::makeAny( aArg ) ); @@ -1199,7 +1199,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1222,7 +1222,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( xNew->getIdentifier()-> @@ -1245,7 +1245,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1318,7 +1318,7 @@ void globalTransfer_( try { ucb::Command aInsertCommand( - OUString("insert"), + "insert", -1, uno::makeAny( aArg ) ); @@ -1489,7 +1489,7 @@ void globalTransfer_( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1510,7 +1510,7 @@ void globalTransfer_( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1576,7 +1576,7 @@ void globalTransfer_( aAny = xcp->execute( ucb::Command( - OUString("getCommandInfo"), + "getCommandInfo", -1, uno::Any()), 0, @@ -1648,7 +1648,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1671,7 +1671,7 @@ void UniversalContentBroker::globalTransfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1700,7 +1700,7 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - OUString( "transfer" ), // Name + "transfer", // Name -1, // Handle uno::makeAny( aTransferArg ) ); // Argument @@ -1737,7 +1737,7 @@ void UniversalContentBroker::globalTransfer( aTransferArg.MimeType ); ucb::Command aCommand1( - OUString("transfer"), + "transfer", -1, uno::makeAny( aTransferArg1 ) ); @@ -1831,7 +1831,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1850,7 +1850,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1877,7 +1877,7 @@ void UniversalContentBroker::globalTransfer( aProps[ 3 ].Handle = -1; /* unknown */ ucb::Command aGetPropsCommand( - OUString("getPropertyValues"), + "getPropertyValues", -1, uno::makeAny( aProps ) ); @@ -1888,7 +1888,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps2 = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1927,8 +1927,8 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - OUString("delete"), // Name - -1, // Handle + "delete", // Name + -1, // Handle uno::makeAny( true ) ); // Argument xCommandProcessor->execute( aCommand, 0, xLocalEnv ); @@ -1975,7 +1975,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri" ), -1, + "Uri", -1, uno::makeAny( rArg.TargetURL ), beans::PropertyState_DIRECT_VALUE ) ); ucbhelper::cancelCommandExecution( @@ -1994,7 +1994,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri" ), -1, + "Uri", -1, uno::makeAny( rArg.TargetURL ), beans::PropertyState_DIRECT_VALUE ) ); ucbhelper::cancelCommandExecution( @@ -2009,7 +2009,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, try { ucb::Command aCommand( - OUString( "checkin" ), -1, + "checkin", -1, uno::makeAny( rArg ) ); aRet = xCommandProcessor->execute( aCommand, 0, xLocalEnv ); diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 5296e79fa4b8..6818f6d94aaf 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -261,19 +261,19 @@ namespace size_t i = 0; aArguments[i++] <<= beans::PropertyValue( - OUString( "Binding URL" ), + "Binding URL", - 1, uno::makeAny( rURL.getBindingUrl() ), beans::PropertyState_DIRECT_VALUE ); aArguments[i++] <<= beans::PropertyValue( - OUString( "Username" ), + "Username", -1, uno::makeAny( rURL.getUsername() ), beans::PropertyState_DIRECT_VALUE ); aArguments[i++] <<= beans::PropertyValue( - OUString( "Repository Id" ), + "Repository Id", -1, uno::makeAny( rURL.getRepositoryId() ), beans::PropertyState_DIRECT_VALUE ); @@ -1587,52 +1587,52 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( OUString( "IsDocument" ), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsFolder" ), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Title" ), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "ObjectId" ), + beans::Property( "ObjectId", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "TitleOnServer" ), + beans::Property( "TitleOnServer", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsReadOnly" ), + beans::Property( "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateCreated" ), + beans::Property( "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateModified" ), + beans::Property( "DateModified", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Size" ), + beans::Property( "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CreatableContentsInfo" ), + beans::Property( "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "MediaType" ), + beans::Property( "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "CmisProperties" ), + beans::Property( "CmisProperties", -1, cppu::UnoType<uno::Sequence< document::CmisProperty>>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsVersionable" ), + beans::Property( "IsVersionable", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CanCheckOut" ), + beans::Property( "CanCheckOut", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CanCancelCheckOut" ), + beans::Property( "CanCancelCheckOut", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CanCheckIn" ), + beans::Property( "CanCheckIn", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -1648,46 +1648,46 @@ namespace cmis { // Required commands ucb::CommandInfo - ( OUString( "getCommandInfo" ), + ( "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertySetInfo" ), + ( "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertyValues" ), + ( "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( OUString( "setPropertyValues" ), + ( "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( OUString( "delete" ), + ( "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo - ( OUString( "insert" ), + ( "insert", -1, cppu::UnoType<ucb::InsertCommandArgument2>::get() ), ucb::CommandInfo - ( OUString( "open" ), + ( "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), // Mandatory CMIS-only commands - ucb::CommandInfo ( OUString( "checkout" ), -1, cppu::UnoType<void>::get() ), - ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, cppu::UnoType<void>::get() ), - ucb::CommandInfo ( OUString( "checkIn" ), -1, + ucb::CommandInfo ( "checkout", -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( "cancelCheckout", -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( "checkIn", -1, cppu::UnoType<ucb::TransferInfo>::get() ), - ucb::CommandInfo ( OUString( "updateProperties" ), -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( "updateProperties", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getAllVersions" ), + ( "getAllVersions", -1, cppu::UnoType<uno::Sequence< document::CmisVersion >>::get() ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( OUString( "transfer" ), + ( "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo - ( OUString( "createNewContent" ), + ( "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) }; @@ -1997,7 +1997,7 @@ namespace cmis // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index a008c9b92dff..f130b83b054c 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -259,16 +259,16 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( OUString( "IsDocument" ), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsFolder" ), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Title" ), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsReadOnly" ), + beans::Property( "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -284,21 +284,21 @@ namespace cmis { // Required commands ucb::CommandInfo - ( OUString( "getCommandInfo" ), + ( "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertySetInfo" ), + ( "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertyValues" ), + ( "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( OUString( "setPropertyValues" ), + ( "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( OUString( "open" ), + ( "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), }; diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 85a008dee62b..950a953fed99 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -417,22 +417,22 @@ namespace ucb { namespace ucp { namespace ext else { // Append all Core Properties. - xRow->appendString ( Property( OUString("ContentType"), + xRow->appendString ( Property( "ContentType", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), ContentProvider::getArtificialNodeContentType() ); - xRow->appendString ( Property( OUString("Title"), + xRow->appendString ( Property( "Title", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), i_rTitle ); - xRow->appendBoolean( Property( OUString("IsDocument"), + xRow->appendBoolean( Property( "IsDocument", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), false ); - xRow->appendBoolean( Property( OUString("IsFolder"), + xRow->appendBoolean( Property( "IsFolder", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), @@ -536,22 +536,22 @@ namespace ucb { namespace ucp { namespace ext // Mandatory commands CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<Sequence< Property >>::get() ), CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<Sequence< PropertyValue >>::get() ) @@ -559,7 +559,7 @@ namespace ucb { namespace ucp { namespace ext // Optional standard commands , CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<OpenCommandArgument2>::get() ) @@ -574,25 +574,25 @@ namespace ucb { namespace ucp { namespace ext static const Property aProperties[] = { Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 6f45334bc53f..cfd21fda6fe4 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -377,7 +377,7 @@ BaseContent::execute( const Command& aCommand, { Sequence< beans::Property > seq(1); seq[0] = beans::Property( - OUString("CasePreservingURL"), + "CasePreservingURL", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -480,7 +480,7 @@ BaseContent::getContentType() { // Who am I ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -598,7 +598,7 @@ BaseContent::createNewContent( const ContentInfo& Info ) try { Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -1031,7 +1031,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, // Is destination a document or a folder ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -1097,7 +1097,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, bool bDocument = false; Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 9700d66ddbca..32010ebf050e 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -120,25 +120,25 @@ namespace { (bRemoveProperty ? 1 : 0) ); sal_Int32 i = 0; aArguments[i++] - <<= PropertyValue(OUString( "Uri"), + <<= PropertyValue("Uri", -1, makeAny(rPhysicalUrl), PropertyState_DIRECT_VALUE); if (bResourceName) aArguments[i++] - <<= PropertyValue(OUString( "ResourceName"), + <<= PropertyValue("ResourceName", -1, makeAny(aResourceName), PropertyState_DIRECT_VALUE); if (bResourceType) aArguments[i++] - <<= PropertyValue(OUString( "ResourceType"), + <<= PropertyValue("ResourceType", -1, makeAny(aResourceType), PropertyState_DIRECT_VALUE); if (bRemoveProperty) aArguments[i++] - <<= PropertyValue(OUString( "Removable"), + <<= PropertyValue("Removable", -1, makeAny(bRemovable), PropertyState_DIRECT_VALUE); diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 653289b13a5c..9c534b50c6fb 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -965,7 +965,7 @@ TaskManager::setv( const OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); ret[0] <<= beans::PropertyValue( - OUString("Uri"), -1, + "Uri", -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError(IOErrorCode_GENERAL); @@ -1029,7 +1029,7 @@ TaskManager::setv( const OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); names[0] <<= beans::PropertyValue( - OUString("Uri"), -1, + "Uri", -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError; @@ -3048,7 +3048,7 @@ uno::Sequence< ucb::ContentInfo > TaskManager::queryCreatableContentsInfo() uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 5552d016a43b..eeb5c75a1a4b 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -281,17 +281,17 @@ private: XPropertySetInfoImpl2::XPropertySetInfoImpl2() : m_seq( 3 ) { - m_seq[0] = Property( OUString("HostName"), + m_seq[0] = Property( "HostName", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY ); - m_seq[1] = Property( OUString("HomeDirectory"), + m_seq[1] = Property( "HomeDirectory", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY ); - m_seq[2] = Property( OUString("FileSystemNotation"), + m_seq[2] = Property( "FileSystemNotation", -1, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY ); diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 4cde1893879d..6fcea525b790 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -599,7 +599,7 @@ FTPContent::queryCreatableContentsInfo_Static( ) | ContentInfoAttribute::KIND_DOCUMENT; Sequence< Property > props( 1 ); props[0] = Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 2f35f170a302..64dd0e92d5a4 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -41,57 +41,56 @@ uno::Sequence< beans::Property > FTPContent::getProperties( static const beans::Property aPropsInfoTable[] = { beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND // | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Size" ), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "DateCreated" ), + "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsReadOnly" ), + "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -121,42 +120,42 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ), ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 15712d99b170..a6467d548b76 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -1107,7 +1107,7 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); @@ -1213,40 +1213,40 @@ uno::Sequence< beans::Property > Content::getProperties( { static const beans::Property aGenericProperties[] = { - beans::Property( OUString( "IsDocument" ), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsFolder" ), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Title" ), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsReadOnly" ), + beans::Property( "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateCreated" ), + beans::Property( "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateModified" ), + beans::Property( "DateModified", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Size" ), + beans::Property( "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsVolume" ), + beans::Property( "IsVolume", 1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsCompactDisc" ), + beans::Property( "IsCompactDisc", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsRemoveable" ), + beans::Property( "IsRemoveable", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsHidden" ), + beans::Property( "IsHidden", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CreatableContentsInfo" ), + beans::Property( "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) }; @@ -1261,35 +1261,35 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc { // Required commands ucb::CommandInfo - ( OUString( "getCommandInfo" ), + ( "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertySetInfo" ), + ( "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertyValues" ), + ( "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( OUString( "setPropertyValues" ), + ( "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( OUString( "delete" ), + ( "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo - ( OUString( "insert" ), + ( "insert", -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ), ucb::CommandInfo - ( OUString( "open" ), + ( "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( OUString( "transfer" ), + ( "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo - ( OUString( "createNewContent" ), + ( "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) }; diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 114a37df3fe8..db8da992afde 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -462,7 +462,7 @@ uno::Any SAL_CALL HierarchyContent::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -974,28 +974,28 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( OUString("ContentType"), + beans::Property( "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getContentType() ); xRow->appendString ( - beans::Property( OUString("Title"), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), // @@@ Might actually be read-only! beans::PropertyAttribute::BOUND ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( OUString("IsDocument"), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( OUString("IsFolder"), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -1004,7 +1004,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( if ( rData.getIsDocument() ) xRow->appendString( - beans::Property( OUString("TargetURL"), + beans::Property( "TargetURL", -1, cppu::UnoType<OUString>::get(), // @@@ Might actually be read-only! @@ -1012,7 +1012,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( rData.getTargetURL() ); xRow->appendObject( beans::Property( - OUString("CreatableContentsInfo"), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -1322,7 +1322,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1468,7 +1468,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1591,7 +1591,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rInfo.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1630,7 +1630,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(xId->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE)); @@ -1663,7 +1663,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(aId), beans::PropertyState_DIRECT_VALUE)); @@ -1793,7 +1793,7 @@ void HierarchyContent::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( xSource->m_xIdentifier-> @@ -1830,7 +1830,7 @@ HierarchyContentProperties::getCreatableContentsInfo() const uno::Sequence< beans::Property > aFolderProps( 1 ); aFolderProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); @@ -1842,12 +1842,12 @@ HierarchyContentProperties::getCreatableContentsInfo() const uno::Sequence< beans::Property > aLinkProps( 2 ); aLinkProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); aLinkProps.getArray()[ 1 ] = beans::Property( - OUString("TargetURL"), + "TargetURL", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index c8094aef3d35..af317bd18af0 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -97,28 +97,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -128,15 +128,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( "TargetURL" ), + "TargetURL", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -155,28 +154,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -185,14 +184,13 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( "TargetURL" ), + "TargetURL", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -219,28 +217,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -250,8 +248,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -270,28 +267,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -300,8 +297,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -329,28 +325,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -360,8 +356,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -396,22 +391,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ) @@ -432,22 +427,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -455,12 +450,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ) @@ -486,22 +481,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -509,7 +504,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -527,22 +522,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -550,27 +545,27 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -596,22 +591,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -619,7 +614,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -637,22 +632,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -660,17 +655,17 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 7d7285b61d94..2fe01f03aff3 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -102,7 +102,7 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); @@ -555,7 +555,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -627,7 +627,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -887,7 +887,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Core Properties. xRow->appendString ( beans::Property( - OUString("ContentType"), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -895,14 +895,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.aContentType ); xRow->appendString( beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), rData.aTitle ); xRow->appendBoolean( beans::Property( - OUString("IsDocument"), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -910,7 +910,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsDocument ); xRow->appendBoolean( beans::Property( - OUString("IsFolder"), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -918,7 +918,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsFolder ); xRow->appendObject( beans::Property( - OUString("CreatableContentsInfo"), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -927,7 +927,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) ); xRow->appendString( beans::Property( - OUString("MediaType"), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), @@ -938,7 +938,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendLong( beans::Property( - OUString("Size"), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND @@ -947,7 +947,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - OUString("Compressed"), + "Compressed", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), @@ -955,7 +955,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - OUString("Encrypted"), + "Encrypted", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), @@ -968,7 +968,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendBoolean( beans::Property( - OUString("HasEncryptedEntries"), + "HasEncryptedEntries", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -1367,8 +1367,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( - "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1439,8 +1438,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( - "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1498,7 +1496,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1666,7 +1664,7 @@ void Content::insert( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1782,7 +1780,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rInfo.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1821,7 +1819,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(xId->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE)); @@ -1853,7 +1851,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(aId), beans::PropertyState_DIRECT_VALUE)); @@ -2010,7 +2008,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( xSource->m_xIdentifier-> diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index 9e6988e60018..c01201d10a1e 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -98,28 +98,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -129,14 +129,13 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -146,7 +145,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "HasEncryptedEntries" ), + "HasEncryptedEntries", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -168,28 +167,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -198,14 +197,13 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -231,28 +229,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -261,21 +259,20 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( "Size" ), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -285,13 +282,13 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "Compressed" ), + "Compressed", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( "Encrypted" ), + "Encrypted", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -323,22 +320,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -346,17 +343,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ), @@ -364,7 +361,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands ucb::CommandInfo( - OUString( "flush" ), + "flush", -1, cppu::UnoType<void>::get() ) @@ -385,22 +382,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -408,27 +405,27 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ), @@ -436,7 +433,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands ucb::CommandInfo( - OUString( "flush" ), + "flush", -1, cppu::UnoType<void>::get() ) @@ -458,22 +455,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -481,17 +478,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index aae1913dc379..39fec06b4f24 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -525,7 +525,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1003,7 +1003,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( OUString("ContentType"), + beans::Property( "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -1013,7 +1013,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ContentType eType = rData.getType(); xRow->appendString ( - beans::Property( OUString("Title"), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), // Title is read-only for root and documents. @@ -1023,14 +1023,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( : 0 ) ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( OUString("IsDocument"), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( OUString("IsFolder"), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -1038,7 +1038,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getIsFolder() ); xRow->appendObject( beans::Property( - OUString("CreatableContentsInfo"), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -1048,7 +1048,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Storage is only supported by folders. if ( eType == FOLDER ) xRow->appendObject( - beans::Property( OUString("Storage"), + beans::Property( "Storage", -1, cppu::UnoType<embed::XStorage>::get(), beans::PropertyAttribute::BOUND @@ -1058,7 +1058,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // DocumentModel is only supported by documents. if ( eType == DOCUMENT ) xRow->appendObject( - beans::Property( OUString("DocumentModel"), + beans::Property( "DocumentModel", -1, cppu::UnoType<frame::XModel>::get(), beans::PropertyAttribute::BOUND @@ -1339,7 +1339,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1413,7 +1413,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1447,7 +1447,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1507,7 +1507,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1690,7 +1690,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1947,7 +1947,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2026,7 +2026,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2057,7 +2057,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2095,7 +2095,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( aTargetUri ), beans::PropertyState_DIRECT_VALUE)); @@ -2137,7 +2137,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2159,7 +2159,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2178,7 +2178,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2875,7 +2875,7 @@ ContentProperties::getCreatableContentsInfo() const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 9857ec8aefb3..4ebaf91bb0d1 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -103,28 +103,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -133,8 +133,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -159,28 +158,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -189,8 +188,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -200,7 +198,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "Storage" ), + "Storage", -1, cppu::UnoType<embed::XStorage>::get(), beans::PropertyAttribute::BOUND @@ -222,28 +220,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -253,8 +251,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -264,7 +261,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "DocumentModel" ), + "DocumentModel", -1, cppu::UnoType<frame::XModel>::get(), beans::PropertyAttribute::BOUND @@ -288,28 +285,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -319,8 +316,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -359,22 +355,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -382,12 +378,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -408,22 +404,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType< uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -431,17 +427,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -464,22 +460,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -487,27 +483,27 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -530,22 +526,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -553,17 +549,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -588,22 +584,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -611,7 +607,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 1279eaa2a85e..c825798aaa76 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -3574,7 +3574,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - OUString("Uri"), -1, + "Uri", -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index c86938e533af..7f2a381c160b 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -78,7 +78,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -86,7 +86,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -94,7 +94,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -102,7 +102,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ) ); @@ -111,7 +111,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "DateCreated" ), + "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -119,7 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "DateModified" ), + "DateModified", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -127,7 +127,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -135,7 +135,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "Size" ), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND @@ -143,7 +143,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "BaseURI" ), + "BaseURI", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -151,8 +151,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType< uno::Sequence< ucb::ContentInfo >>::get(), @@ -544,22 +543,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ); aCmdInfo[ 3 ] = ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ); @@ -569,17 +568,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ); aCmdInfo[ 6 ] = ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ); @@ -589,17 +588,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - OUString( "post" ), + "post", -1, cppu::UnoType<ucb::PostCommandArgument2>::get() ); aCmdInfo[ 8 ] = ucb::CommandInfo( - OUString( "addProperty" ), + "addProperty", -1, cppu::UnoType<ucb::PropertyCommandArgument>::get() ); aCmdInfo[ 9 ] = ucb::CommandInfo( - OUString( "removeProperty" ), + "removeProperty", -1, cppu::UnoType<rtl::OUString>::get() ); @@ -632,14 +631,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( - "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ); nPos++; @@ -653,13 +651,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "lock" ), + "lock", -1, cppu::UnoType<void>::get() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "unlock" ), + "unlock", -1, cppu::UnoType<void>::get() ); nPos++; diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index b4ba14f7e3f6..291fbff5a029 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -1402,7 +1402,7 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew ) propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - OUString("RowCount"), + "RowCount", false, 1001, uno::makeAny( nOld ), // old value @@ -1418,7 +1418,7 @@ void ResultSet::rowCountFinal() propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - OUString("IsRowCountFinal"), + "IsRowCountFinal", false, 1000, uno:: makeAny( false ), // old value diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index fe99ca33557b..d6a37d041a0f 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -42,7 +42,7 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -#define ROOTNODE_CMDOPTIONS OUString("Office.Commands/Execute") +#define ROOTNODE_CMDOPTIONS "Office.Commands/Execute" #define PATHDELIMITER "/" #define SETNODE_DISABLED "Disabled" diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index b1d713e16347..b13972b683b5 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -36,7 +36,7 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -#define ROOTNODE_OPTIONS OUString( "Office.Compatibility/" ) +#define ROOTNODE_OPTIONS "Office.Compatibility/" #define PATHDELIMITER "/" #define SETNODE_ALLFILEFORMATS "AllFileFormats" diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index c58fbcda72ce..959fc772684d 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -71,7 +71,7 @@ OUString getConfigurationString(OUString const & module, OUString const & path) { css::uno::Sequence< css::uno::Any > args(1); args[0] <<= css::beans::NamedValue( - OUString("nodepath"), + "nodepath", css::uno::makeAny(module)); return css::uno::Reference< css::container::XHierarchicalNameAccess >( @@ -148,11 +148,11 @@ css::uno::Reference< css::container::XHierarchicalNameAccess > utl::ConfigManager::acquireTree(utl::ConfigItem & item) { css::uno::Sequence< css::uno::Any > args(1); args[0] <<= css::beans::NamedValue( - OUString("nodepath"), + "nodepath", css::uno::makeAny("/org.openoffice." + item.GetSubTreeName())); if (item.GetMode() & ConfigItemMode::AllLocales) { args.realloc(2); - args[1] <<= css::beans::NamedValue(OUString("locale"), css::uno::makeAny(OUString("*"))); + args[1] <<= css::beans::NamedValue("locale", css::uno::makeAny(OUString("*"))); } return css::uno::Reference< css::container::XHierarchicalNameAccess >( getConfigurationProvider()->createInstanceWithArguments( diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 5cb168baff63..9b88fdf56ead 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -40,7 +40,7 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -#define ROOTNODE_MENUS OUString("Office.Common/Menus/") +#define ROOTNODE_MENUS "Office.Common/Menus/" #define PATHDELIMITER "/" #define SETNODE_NEWMENU "New" diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index a67aa9570b30..3c8911e3e32b 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -39,7 +39,7 @@ using namespace ::utl; using namespace ::osl; using namespace ::com::sun::star::uno; -#define ROOTNODE_SECURITY OUString("Office.Security") +#define ROOTNODE_SECURITY "Office.Security" #define SECURE_EXTENSIONS_SET OUString("SecureExtensions") #define EXTENSION_PROPNAME OUString("/Extension") diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index b51d4468e832..e373d733ab97 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -31,7 +31,7 @@ using namespace ::utl; using namespace ::osl; using namespace ::com::sun::star::uno; -#define ROOTNODE_FONT OUString("Office.Common/Font") +#define ROOTNODE_FONT "Office.Common/Font" #define PROPERTYNAME_REPLACEMENTTABLE "Substitution/Replacement" #define PROPERTYNAME_FONTHISTORY "View/History" diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 14f4898e1f41..f89ae28b26b9 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -187,7 +187,7 @@ public: }; SvtLinguConfigItem::SvtLinguConfigItem() : - utl::ConfigItem( OUString("Office.Linguistic") ) + utl::ConfigItem( "Office.Linguistic" ) { const uno::Sequence< OUString > &rPropertyNames = GetPropertyNames(); LoadOptions( rPropertyNames ); diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 64c195cb5b0d..c36630c02349 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -73,7 +73,7 @@ public: }; SfxMiscCfg::SfxMiscCfg() : - ConfigItem(OUString("Office.Common") ), + ConfigItem( "Office.Common" ), bPaperSize(false), bPaperOrientation (false), bNotFound (false), diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 00f162ed6e8d..026c2528df8a 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -50,7 +50,7 @@ e.g.: NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ] *//*-*************************************************************************************************************/ -#define ROOTNODE_FACTORIES OUString("Setup/Office/Factories") +#define ROOTNODE_FACTORIES "Setup/Office/Factories" #define PATHSEPARATOR "/" // Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 4634d7e4698d..49363aab3322 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -32,7 +32,7 @@ using namespace ::utl; using namespace ::osl; using namespace ::com::sun::star::uno; -#define ROOTNODE_START OUString("Office.Common/Print") +#define ROOTNODE_START "Office.Common/Print" #define PROPERTYNAME_PAPERSIZE OUString("Warning/PaperSize") #define PROPERTYNAME_PAPERORIENTATION OUString("Warning/PaperOrientation") diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 8999d211b66d..18e3e3922f8b 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -394,7 +394,7 @@ Sequence< OUString > GetPropertyNames() } SvtSaveOptions_Impl::SvtSaveOptions_Impl() - : ConfigItem( OUString("Office.Common/Save") ) + : ConfigItem( "Office.Common/Save" ) , nAutoSaveTime( 0 ) , bUseUserData( false ) , bBackup( false ) @@ -776,7 +776,7 @@ public: const sal_Char cUserDefinedSettings[] = "UserDefinedSettings"; SvtLoadOptions_Impl::SvtLoadOptions_Impl() - : ConfigItem( OUString("Office.Common/Load") ) + : ConfigItem( "Office.Common/Load" ) , bLoadUserDefinedSettings( false ) { Sequence< OUString > aNames { cUserDefinedSettings }; diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 9e799138fb04..f6a0fbffe575 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -67,7 +67,7 @@ public: }; SvtSearchOptions_Impl::SvtSearchOptions_Impl() : - ConfigItem( OUString("Office.Common/SearchOptions") ) + ConfigItem( "Office.Common/SearchOptions" ) { nFlags = 0x0003FFFF; // set all options values to 'true' Load(); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 72e103feb031..aa204f11eafa 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -39,7 +39,7 @@ using namespace ::utl; using namespace ::osl; using namespace ::com::sun::star::uno; -#define ROOTNODE_SECURITY OUString("Office.Common/Security/Scripting") +#define ROOTNODE_SECURITY "Office.Common/Security/Scripting" #define DEFAULT_SECUREURL Sequence< OUString >() #define DEFAULT_TRUSTEDAUTHORS Sequence< SvtSecurityOptions::Certificate >() diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index a5eaae528a0a..eb3cccdae5ea 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -100,7 +100,7 @@ public: const LanguageTag& GetRealUILocale() { return m_aRealUILocale; } }; -#define ROOTNODE_SYSLOCALE OUString("Setup/L10N") +#define ROOTNODE_SYSLOCALE "Setup/L10N" #define PROPERTYNAME_LOCALE "ooSetupSystemLocale" #define PROPERTYNAME_UILOCALE "ooLocale" diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index 35b31fdf7fb5..8259ba4b80d4 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -126,7 +126,7 @@ void BitmapTest::testScale() if (bExportBitmap) { - SvFileStream aStream(OUString("~/scale_before.png"), StreamMode::WRITE | StreamMode::TRUNC); + SvFileStream aStream("~/scale_before.png", StreamMode::WRITE | StreamMode::TRUNC); GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); rFilter.compressAsPNG(aBitmap24Bit, aStream); } @@ -142,7 +142,7 @@ void BitmapTest::testScale() if (bExportBitmap) { - SvFileStream aStream(OUString("~/scale_after.png"), StreamMode::WRITE | StreamMode::TRUNC); + SvFileStream aStream("~/scale_after.png", StreamMode::WRITE | StreamMode::TRUNC); GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); rFilter.compressAsPNG(aBitmap24Bit, aStream); } diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index d4641c6bd98c..bb6d856a7dd2 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -1351,7 +1351,7 @@ bool EnhWMFReader::ReadEnhWMF() if(bDoSaveForVisualControl) { - SvFileStream aNew(OUString("c:\\metafile_content.png"), StreamMode::WRITE|StreamMode::TRUNC); + SvFileStream aNew("c:\\metafile_content.png", StreamMode::WRITE|StreamMode::TRUNC); vcl::PNGWriter aPNGWriter(aBitmapEx); aPNGWriter.Write(aNew); } diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index f90abfa7473c..49082a15ccdb 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -869,7 +869,7 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindFontFamilyOfDefaultFont() co if (!utl::ConfigManager::IsAvoidConfig()) { const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); - LanguageTag aLanguageTag( OUString( "en")); + LanguageTag aLanguageTag("en"); OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE ); pFoundData = FindFontFamilyByTokenNames( aFontname ); @@ -1190,7 +1190,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r // if a target symbol font is not available use a default symbol font if( rFSD.IsSymbolFont() ) { - LanguageTag aDefaultLanguageTag( OUString( "en")); + LanguageTag aDefaultLanguageTag("en"); if (utl::ConfigManager::IsAvoidConfig()) aSearchName = "OpenSymbol"; else diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index 3e0497d81b4b..0fee77e37dfe 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -44,9 +44,7 @@ SettingsConfigItem* SettingsConfigItem::get() } SettingsConfigItem::SettingsConfigItem() - : - ConfigItem( OUString( SETTINGS_CONFIGNODE ), - ConfigItemMode::DelayedUpdate ), + : ConfigItem( SETTINGS_CONFIGNODE, ConfigItemMode::DelayedUpdate ), m_aSettings( 0 ) { getValues(); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 2dd646477ee3..11c0de15ea11 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4224,7 +4224,7 @@ void PDFWriterImpl::createDefaultPushButtonAppearance( PDFWidget& rButton, const // (that is before endRedirect()) OStringBuffer aDA( 256 ); appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetButtonTextColor() ), aDA ); - Font aDummyFont( OUString( "Helvetica" ), aFont.GetFontSize() ); + Font aDummyFont( "Helvetica", aFont.GetFontSize() ); sal_Int32 nDummyBuiltin = getBestBuiltinFont( aDummyFont ); aDA.append( ' ' ); aDA.append( m_aBuiltinFonts[nDummyBuiltin].getNameObject() ); @@ -4455,7 +4455,7 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW OStringBuffer aDA( 256 ); appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ), aDA ); - sal_Int32 nBest = getBestBuiltinFont( Font( OUString( "ZapfDingbats" ), aFont.GetFontSize() ) ); + sal_Int32 nBest = getBestBuiltinFont( Font( "ZapfDingbats", aFont.GetFontSize() ) ); aDA.append( ' ' ); aDA.append( m_aBuiltinFonts[nBest].getNameObject() ); aDA.append( " 0 Tf" ); @@ -4559,7 +4559,7 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P OStringBuffer aDA( 256 ); appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ), aDA ); - sal_Int32 nBest = getBestBuiltinFont( Font( OUString( "ZapfDingbats" ), aFont.GetFontSize() ) ); + sal_Int32 nBest = getBestBuiltinFont( Font( "ZapfDingbats", aFont.GetFontSize() ) ); aDA.append( ' ' ); aDA.append( m_aBuiltinFonts[nBest].getNameObject() ); aDA.append( " 0 Tf" ); @@ -7465,8 +7465,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() // directly with a reader (provided the reader has the feature) we // need to set the name of the destination the same way it will be encoded // in an Internet link - INetURLObject aLocalURL( - OUString( "http://ahost.ax" ) ); //dummy location, won't be used + INetURLObject aLocalURL( "http://ahost.ax" ); //dummy location, won't be used aLocalURL.SetMark( rDest.m_aDestName ); const OUString aName = aLocalURL.GetMark( INetURLObject::DecodeMechanism::NONE ); //same coding as diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index 8f0894fa7512..cbd7d57770ba 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -66,7 +66,7 @@ sal_Int32 SelectionManager::getSelectionTimeout() */ DtransX11ConfigItem::DtransX11ConfigItem() : - ConfigItem( OUString( SETTINGS_CONFIGNODE ), + ConfigItem( SETTINGS_CONFIGNODE, ConfigItemMode::DelayedUpdate ), m_nSelectionTimeout( 3 ) { diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index c0f4b9605ff6..74e4e40e1f85 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -68,7 +68,7 @@ TVFactory::createInstance( { Sequence< Any > seq( 1 ); seq[0] <<= PropertyValue( - OUString( "nodepath" ), + "nodepath", -1, Any( OUString() ), PropertyState_DIRECT_VALUE ); diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index f9e2dab38a91..4ce36805398c 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -594,15 +594,15 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( uno::Sequence< beans::PropertyValue > aArgs( 3 ); aArgs[0] = beans::PropertyValue( - OUString( "CellRangeRepresentation" ), + "CellRangeRepresentation", -1, uno::makeAny( rRectangularRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString( "DataRowSource" ), + "DataRowSource", -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString( "FirstCellAsLabel" ), + "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); @@ -610,7 +610,7 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( - OUString( "SequenceMapping" ), + "SequenceMapping", -1, uno::makeAny( !sColTrans.isEmpty() ? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) : lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ), @@ -636,7 +636,7 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( - OUString( "ChartOleObjectName" ), + "ChartOleObjectName", -1, uno::makeAny( aChartOleObjectName ), beans::PropertyState_DIRECT_VALUE ); } @@ -647,11 +647,11 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( aArgs.realloc( aArgs.getLength() + 2 ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 2 ] = beans::PropertyValue( - OUString( "HasCategories" ), + "HasCategories", -1, uno::makeAny( bHasCateories ), beans::PropertyState_DIRECT_VALUE ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( - OUString("UseCategoriesAsX"), + "UseCategoriesAsX", -1, uno::makeAny( false ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui) beans::PropertyState_DIRECT_VALUE ); diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 542255d7daae..70eda5253150 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -506,7 +506,7 @@ void SchXMLSeries2Context::EndElement() //different handling for different chart types necessary if( bIsScatterChart || ( nDomainCount==1 && !bIsBubbleChart ) ) { - DomainInfo aDomainInfo( OUString( "values-x" ), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; + DomainInfo aDomainInfo( "values-x", m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; bool bCreateXValues = true; if( !maDomainAddresses.empty() ) { @@ -539,7 +539,7 @@ void SchXMLSeries2Context::EndElement() { if( nDomainCount>1 ) { - DomainInfo aDomainInfo( OUString( "values-x" ), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; + DomainInfo aDomainInfo( "values-x", maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; if( m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.isEmpty() ) { //for bubble chart the second domain contains the x values which should become an index smaller than y values for own data table @@ -552,12 +552,12 @@ void SchXMLSeries2Context::EndElement() } else if( !m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.isEmpty() ) { - DomainInfo aDomainInfo( OUString( "values-x" ), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ; + DomainInfo aDomainInfo( "values-x", m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ; aDomainInfos.push_back( aDomainInfo ); } if( nDomainCount>0) { - DomainInfo aDomainInfo( OUString( "values-y" ), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; + DomainInfo aDomainInfo( "values-y", maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; if( m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() ) { m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress = maDomainAddresses.front(); @@ -568,7 +568,7 @@ void SchXMLSeries2Context::EndElement() } else if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() ) { - DomainInfo aDomainInfo( OUString("values-y"), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; + DomainInfo aDomainInfo( "values-y", m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; aDomainInfos.push_back( aDomainInfo ); } } diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 068200dccad8..b2838447e2ca 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -716,10 +716,7 @@ namespace xmloff { // create it for en-US (does not really matter, as we will specify a locale for every // concrete language to use) - Locale aLocale ( OUString("en"), - OUString("US"), - OUString() - ); + Locale aLocale ( "en", "US", OUString() ); xFormatsSupplier = NumberFormatsSupplier::createWithLocale( m_rContext.getComponentContext(), aLocale ); m_xControlNumberFormats = xFormatsSupplier->getNumberFormats(); } diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 1955bd3d5d80..082e6316a69a 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -79,8 +79,7 @@ namespace void SaveODFItem::ImplCommit() {} void SaveODFItem::Notify( const css::uno::Sequence< OUString >& ) {} - SaveODFItem::SaveODFItem(): utl::ConfigItem(OUString( - "Office.Common/Save")), m_nODF(0) + SaveODFItem::SaveODFItem(): utl::ConfigItem("Office.Common/Save"), m_nODF(0) { OUString sDef("ODF/DefaultVersion"); Sequence< css::uno::Any > aValues = GetProperties( Sequence<OUString>(&sDef,1) ); |