dbaccess/qa/extras/dialog-save.cxx | 2 +-
dbaccess/qa/extras/empty-stdlib-save.cxx | 2 +-
dbaccess/qa/extras/nolib-save.cxx | 2 +-
dbaccess/qa/unit/embeddeddb_performancetest.cxx | 4 ++--
dbaccess/source/core/api/FilteredContainer.cxx | 8 ++++----
dbaccess/source/core/api/KeySet.cxx | 2 +-
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 10 +++++-----
dbaccess/source/core/dataaccess/databasedocument.cxx | 2 +-
dbaccess/source/core/dataaccess/datasource.cxx | 2 +-
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2 +-
dbaccess/source/core/recovery/dbdocrecovery.cxx | 4 ++--
dbaccess/source/core/recovery/storagetextstream.cxx | 2 +-
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 6 +++---
dbaccess/source/filter/hsqldb/hsqlimport.cxx | 2 +-
dbaccess/source/filter/hsqldb/parseschema.cxx | 6 +++---
dbaccess/source/filter/xml/xmlExport.cxx | 2 +-
dbaccess/source/ui/app/AppControllerGen.cxx | 2 +-
dbaccess/source/ui/dlg/dbadmin.cxx | 2 +-
dbaccess/source/ui/dlg/dbfindex.cxx | 2 +-
dbaccess/source/ui/dlg/queryfilter.cxx | 4 ++--
dbaccess/source/ui/dlg/tablespage.cxx | 2 +-
dbaccess/source/ui/misc/indexcollection.cxx | 2 +-
dbaccess/source/ui/querydesign/querycontroller.cxx | 4 ++--
23 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 7eda35a36c8837c620722e5c26c90324ae9b48e9
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 19 10:30:10 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Oct 19 18:49:53 2023 +0200
Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: dbaccess
Change-Id: I5f92e390ef57ae8f2aba43782c11ca5ee31dba93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158187
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/dbaccess/qa/extras/dialog-save.cxx
b/dbaccess/qa/extras/dialog-save.cxx
index 4b07eebff459..04c12b1c5e8b 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -56,7 +56,7 @@ void DialogSaveTest::test()
uno::Reference< script::XStorageBasedLibraryContainer >
xStorDlgLib(xDocScr->getDialogLibraries());
CPPUNIT_ASSERT(xStorDlgLib.is());
uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib,
UNO_QUERY_THROW);
- static constexpr OUStringLiteral sStandard(u"Standard");
+ static constexpr OUString sStandard(u"Standard"_ustr);
xBasLib->loadLibrary(sStandard);
CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
// the whole point of this test is to test the "save" operation
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx
b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 41074d909c89..5c3b5d028d8c 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -54,7 +54,7 @@ void DialogSaveTest::test()
uno::Reference< script::XStorageBasedLibraryContainer >
xStorDlgLib(xDocScr->getDialogLibraries());
CPPUNIT_ASSERT(xStorDlgLib.is());
uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib,
UNO_QUERY_THROW);
- static constexpr OUStringLiteral sStandard(u"Standard");
+ static constexpr OUString sStandard(u"Standard"_ustr);
xBasLib->loadLibrary(sStandard);
xDlgLib->loadLibrary(sStandard);
CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/qa/extras/nolib-save.cxx
b/dbaccess/qa/extras/nolib-save.cxx
index 054ad9a369ca..614c4f03794a 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -54,7 +54,7 @@ void DialogSaveTest::test()
uno::Reference< script::XStorageBasedLibraryContainer >
xStorDlgLib(xDocScr->getDialogLibraries());
CPPUNIT_ASSERT(xStorDlgLib.is());
uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib,
UNO_QUERY_THROW);
- static constexpr OUStringLiteral sStandard(u"Standard");
+ static constexpr OUString sStandard(u"Standard"_ustr);
xBasLib->loadLibrary(sStandard);
xDlgLib->loadLibrary(sStandard);
CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index 921fc9977d98..184ef0831ad1 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -82,7 +82,7 @@ class EmbeddedDBPerformanceTest
: public DBTestBase
{
private:
- static constexpr OUStringLiteral our_sEnableTestEnvVar = u"DBA_PERFTEST";
+ static constexpr OUString our_sEnableTestEnvVar = u"DBA_PERFTEST"_ustr;
// We store the results and print them at the end due to the amount of
warning
@@ -145,7 +145,7 @@ void EmbeddedDBPerformanceTest::printTimes(
void EmbeddedDBPerformanceTest::testPerformance()
{
OUString sEnabled;
- osl_getEnvironment(OUString(our_sEnableTestEnvVar).pData, &sEnabled.pData);
+ osl_getEnvironment(our_sEnableTestEnvVar.pData, &sEnabled.pData);
if (sEnabled.isEmpty())
return;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx
b/dbaccess/source/core/api/FilteredContainer.cxx
index 1a565103d710..c39c3c2c10bc 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -341,7 +341,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >&
_rTableFilter, std::
}
}
- static constexpr OUStringLiteral sAll = u"%";
+ static constexpr OUString sAll = u"%"_ustr;
Reference< XResultSet > xTables = m_xMetaData->getTables( Any(),
sAll, sAll, aTableTypeFilter );
Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW );
@@ -430,9 +430,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >&
_rTableFilter, std::
OSL_VERIFY( aFilterModeSetting >>= nFilterMode );
}
- static constexpr OUStringLiteral sAll( u"%" );
- static constexpr OUStringLiteral sView( u"VIEW" );
- static constexpr OUStringLiteral sTable( u"TABLE" );
+ static constexpr OUString sAll( u"%"_ustr );
+ static constexpr OUString sView( u"VIEW"_ustr );
+ static constexpr OUString sTable( u"TABLE"_ustr );
switch ( nFilterMode )
{
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 789ecf18ee9c..d075dea04985 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -447,7 +447,7 @@ void OKeySet::updateRow(const ORowSetRow& _rInsertRow
,const ORowSetRow& _rOrigi
// list all columns that should be set
constexpr OUStringLiteral aPara(u" = ?,");
OUString aQuote = getIdentifierQuoteString();
- constexpr OUStringLiteral aAnd(u" AND ");
+ constexpr OUString aAnd(u" AND "_ustr);
OUString sIsNull(" IS NULL");
OUString sParam(" = ?");
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 895657475f25..688e755936a6 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -80,15 +80,15 @@ namespace BooleanComparisonMode =
::com::sun::star::sdb::BooleanComparisonMode;
constexpr OUStringLiteral STR_SELECT = u"SELECT ";
constexpr OUStringLiteral STR_FROM = u" FROM ";
-constexpr OUStringLiteral STR_WHERE = u" WHERE ";
+constexpr OUString STR_WHERE = u" WHERE "_ustr;
constexpr OUStringLiteral STR_GROUP_BY = u" GROUP BY ";
constexpr OUStringLiteral STR_HAVING = u" HAVING ";
constexpr OUStringLiteral STR_ORDER_BY = u" ORDER BY ";
-constexpr OUStringLiteral STR_AND = u" AND ";
-constexpr OUStringLiteral STR_OR = u" OR ";
+constexpr OUString STR_AND = u" AND "_ustr;
+constexpr OUString STR_OR = u" OR "_ustr;
constexpr OUStringLiteral STR_LIKE = u" LIKE ";
-constexpr OUStringLiteral L_BRACKET = u"(";
-constexpr OUStringLiteral R_BRACKET = u")";
+constexpr OUString L_BRACKET = u"("_ustr;
+constexpr OUString R_BRACKET = u")"_ustr;
constexpr OUStringLiteral COMMA = u",";
namespace
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 57970d2dd8ad..204c73dc11c2 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -300,7 +300,7 @@ namespace
}
}
-constexpr OUStringLiteral sPictures = u"Pictures";
+constexpr OUString sPictures = u"Pictures"_ustr;
// base documents seem to have a different behaviour to other documents, the
// root storage contents at least seem to be re-used over different saves,
thus if there is a
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index eaa580a3a66d..180ecff77766 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -578,7 +578,7 @@ Reference< XConnection >
ODatabaseSource::buildLowLevelConnection(const OUString
if (bNeedMigration)
{
// back up content xml file if migration was successful
- static constexpr OUStringLiteral BACKUP_XML_NAME =
u"content_before_migration.xml";
+ static constexpr OUString BACKUP_XML_NAME =
u"content_before_migration.xml"_ustr;
try
{
if(xRootStorage->isStreamElement(BACKUP_XML_NAME))
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 90b808712042..d2aa735fa8ba 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -264,7 +264,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL
DatabaseDataProvider::cre
osl::MutexGuard g(m_aMutex);
uno::Reference< chart2::data::XDataSequence > xData =
m_xInternal->createDataSequenceByRangeRepresentation(_sRangeRepresentation);
uno::Reference<beans::XPropertySet> xProp(xData,uno::UNO_QUERY);
- static constexpr OUStringLiteral s_sNumberFormatKey = u"NumberFormatKey";
+ static constexpr OUString s_sNumberFormatKey = u"NumberFormatKey"_ustr;
if ( xProp.is() &&
xProp->getPropertySetInfo()->hasPropertyByName(s_sNumberFormatKey) )
{
xProp->setPropertyValue(s_sNumberFormatKey,impl_getNumberFormatKey_nothrow(_sRangeRepresentation));
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx
b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index b2b868386304..eead0c2c7910 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -87,9 +87,9 @@ namespace dbaccess
return true;
}
- constexpr OUStringLiteral sRecoveryDataSubStorageName = u"recovery";
+ constexpr OUString sRecoveryDataSubStorageName = u"recovery"_ustr;
- constexpr OUStringLiteral sObjectMapStreamName =
u"storage-component-map.ini";
+ constexpr OUString sObjectMapStreamName =
u"storage-component-map.ini"_ustr;
void lcl_writeObjectMap_throw( const Reference<XComponentContext> &
i_rContext, const Reference< XStorage >& i_rStorage,
const MapStringToCompDesc& i_mapStorageToCompDesc )
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx
b/dbaccess/source/core/recovery/storagetextstream.cxx
index 3d5a6a12bff3..a60890fa8555 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -29,7 +29,7 @@ namespace dbaccess
using ::com::sun::star::embed::XStorage;
using ::com::sun::star::io::TextOutputStream;
- constexpr OUStringLiteral sLineFeed = u"\n";
+ constexpr OUString sLineFeed = u"\n"_ustr;
// StorageTextOutputStream
StorageTextOutputStream::StorageTextOutputStream( const
Reference<XComponentContext>& i_rContext,
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index ec5783ded992..3a7a30d016f0 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -158,8 +158,8 @@ namespace dbaccess
return xCommandProcessor;
}
- constexpr OUStringLiteral sSettingsStreamName = u"settings.xml";
- constexpr OUStringLiteral sCurrentQueryDesignName =
u"ooo:current-query-design";
+ constexpr OUString sSettingsStreamName = u"settings.xml"_ustr;
+ constexpr OUString sCurrentQueryDesignName =
u"ooo:current-query-design"_ustr;
}
namespace {
@@ -478,7 +478,7 @@ namespace dbaccess
StorageXMLOutputStream aDesignOutput( m_rContext, i_rObjectStorage,
sSettingsStreamName );
SettingsExportContext aSettingsExportContext( m_rContext,
aDesignOutput );
- static constexpr OUStringLiteral sWhitespace( u" " );
+ static constexpr OUString sWhitespace( u" "_ustr );
aDesignOutput.startElement( "office:settings" );
aDesignOutput.ignorableWhitespace( sWhitespace );
diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
index af9b637cb862..918397da620f 100644
--- a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
@@ -263,7 +263,7 @@ void HsqlImporter::parseTableRows(const
std::vector<sal_Int32>& rIndexes,
const std::vector<ColumnDefinition>&
rColTypes,
const OUString& sTableName)
{
- static constexpr OUStringLiteral BINARY_FILENAME = u"data";
+ static constexpr OUString BINARY_FILENAME = u"data"_ustr;
if (!m_xStorage->hasByName(BINARY_FILENAME))
{
diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx
b/dbaccess/source/filter/hsqldb/parseschema.cxx
index b3cc30ce21b3..5e512f067920 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -118,7 +118,7 @@ void SchemaParser::parseSchema()
{
assert(m_rStorage);
- static constexpr OUStringLiteral SCHEMA_FILENAME = u"script";
+ static constexpr OUString SCHEMA_FILENAME = u"script"_ustr;
if (!m_rStorage->hasByName(SCHEMA_FILENAME))
{
SAL_WARN("dbaccess", "script file does not exist in storage during
hsqldb import");
@@ -182,8 +182,8 @@ std::vector<ColumnDefinition>
SchemaParser::getTableColumnTypes(const OUString&
{
if (m_ColumnTypes.count(sTableName) < 1)
{
- static constexpr OUStringLiteral NOT_EXIST
- = u"Internal error while getting column information of table";
+ static constexpr OUString NOT_EXIST
+ = u"Internal error while getting column information of table"_ustr;
SAL_WARN("dbaccess", NOT_EXIST << ". Table name is: " << sTableName);
dbtools::throwGenericSQLException(NOT_EXIST,
::comphelper::getProcessComponentContext());
}
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index 5bbee1c4ccd1..ab6257f7f9a6 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -561,7 +561,7 @@ void ODBExport::exportConnectionData()
Reference< XPropertySetInfo > xSettingsInfo(
xDataSourceSettings->getPropertySetInfo(), UNO_SET_THROW );
- static constexpr OUStringLiteral sPropertyName =
u"LocalSocket";
+ static constexpr OUString sPropertyName =
u"LocalSocket"_ustr;
if ( xSettingsInfo->hasPropertyByName( sPropertyName )
)
{
OUString sPropertyValue;
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx
b/dbaccess/source/ui/app/AppControllerGen.cxx
index b14b9c891540..8712f6386879 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -639,7 +639,7 @@ void OApplicationController::onLoadedMenu(const Reference<
css::frame::XLayoutMa
if ( !_xLayoutManager.is() )
return;
- static constexpr OUStringLiteral s_sStatusbar =
u"private:resource/statusbar/statusbar";
+ static constexpr OUString s_sStatusbar =
u"private:resource/statusbar/statusbar"_ustr;
_xLayoutManager->createElement( s_sStatusbar );
_xLayoutManager->requestElement( s_sStatusbar );
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx
b/dbaccess/source/ui/dlg/dbadmin.cxx
index 105f9ab6b286..95bc34e11443 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -271,7 +271,7 @@ void
ODbAdminDialog::createItemSet(std::unique_ptr<SfxItemSet>& _rpSet, rtl::Ref
_rpPool = nullptr;
_rpDefaults = nullptr;
- static constexpr OUStringLiteral sFilterAll( u"%" );
+ static constexpr OUString sFilterAll( u"%"_ustr );
// create and initialize the defaults
_rpDefaults = new std::vector<SfxPoolItem*>(DSID_LAST_ITEM_ID -
DSID_FIRST_ITEM_ID + 1);
SfxPoolItem** pCounter = _rpDefaults->data(); // want to modify this
without affecting the out param _rppDefaults
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx
b/dbaccess/source/ui/dlg/dbfindex.cxx
index d0a03b5b238c..521a7934e052 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::svt;
-constexpr OStringLiteral aGroupIdent("dBase III");
+constexpr OString aGroupIdent("dBase III"_ostr);
ODbaseIndexDialog::ODbaseIndexDialog(weld::Window * pParent, OUString
aDataSrcName)
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx
b/dbaccess/source/ui/dlg/queryfilter.cxx
index d678ae154fac..dcfa811c28ac 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -301,10 +301,10 @@ bool DlgFilterCrit::getCondition(const weld::ComboBox&
_rField,const weld::Combo
}
}
xColumn->getPropertyValue(PROPERTY_REALNAME) >>=
_rFilter.Name;
- static constexpr OUStringLiteral sAgg = u"AggregateFunction";
+ static constexpr OUString sAgg = u"AggregateFunction"_ustr;
if ( xInfo->hasPropertyByName(sAgg) )
xColumn->getPropertyValue(sAgg) >>= bHaving;
- static constexpr OUStringLiteral sFunction = u"Function";
+ static constexpr OUString sFunction = u"Function"_ustr;
if ( xInfo->hasPropertyByName(sFunction) )
xColumn->getPropertyValue(sFunction) >>= bFunction;
}
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx
b/dbaccess/source/ui/dlg/tablespage.cxx
index 15aa99426c9c..aeba434ab86d 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -335,7 +335,7 @@ namespace dbaui
Sequence< OUString > OTableSubscriptionPage::collectDetailedSelection()
const
{
Sequence< OUString > aTableFilter;
- constexpr OUStringLiteral sWildcard = u"%";
+ constexpr OUString sWildcard = u"%"_ustr;
std::unique_ptr<weld::TreeIter>
xAllObjectsEntry(m_xTablesList->getAllObjectsEntry());
if (!xAllObjectsEntry)
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx
b/dbaccess/source/ui/misc/indexcollection.cxx
index bdcdaad09a7f..169512ce723b 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -122,7 +122,7 @@ namespace dbaui
}
// set the properties
- static constexpr OUStringLiteral s_sNamePropertyName = u"Name";
+ static constexpr OUString s_sNamePropertyName = u"Name"_ustr;
// the index' own props
xIndexDescriptor->setPropertyValue("IsUnique",
css::uno::Any(_rPos->bUnique));
xIndexDescriptor->setPropertyValue(s_sNamePropertyName,
Any(_rPos->sName));
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 49f1b4e02be5..08a1ade4cea7 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -151,8 +151,8 @@ namespace
return;
xLayoutManager->lock();
- static constexpr OUStringLiteral s_sDesignToolbar =
u"private:resource/toolbar/designobjectbar";
- static constexpr OUStringLiteral s_sSqlToolbar =
u"private:resource/toolbar/sqlobjectbar";
+ static constexpr OUString s_sDesignToolbar =
u"private:resource/toolbar/designobjectbar"_ustr;
+ static constexpr OUString s_sSqlToolbar =
u"private:resource/toolbar/sqlobjectbar"_ustr;
if ( _bDesign )
{
xLayoutManager->destroyElement( s_sSqlToolbar );
