ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:ostr in unotools

Browse Source 
Change-Id: Ieda6fe806da2cfd17a7891cefa7f55666ee6b728
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167730
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2024-05-16 11:36:10 +02:00
parent bab6d9c44b
commit 49192335f8
31 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unotools/qa/unit/configpaths.cxx
+20 -20
View File
@@ -26,8 +26,8 @@ public:
{
OUString path, last;
CPPUNIT_ASSERT(!utl::splitLastFromConfigurationPath(u"", path, last));
CPPUNIT_ASSERT_EQUAL(OUString(""), path);
CPPUNIT_ASSERT_EQUAL(OUString(""), last);
CPPUNIT_ASSERT_EQUAL(u""_ustr, path);
CPPUNIT_ASSERT_EQUAL(u""_ustr, last);
}
{
// Already prior to 5edefc801fb48559c8064003f23d22d838710ee4 "use more string_view in
@@ -35,8 +35,8 @@ public:
// "@returns <FALSE/>, if the path was a one-level path or an invalid path"):
OUString path, last;
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/", path, last));
CPPUNIT_ASSERT_EQUAL(OUString(""), path);
CPPUNIT_ASSERT_EQUAL(OUString(""), last);
CPPUNIT_ASSERT_EQUAL(u""_ustr, path);
CPPUNIT_ASSERT_EQUAL(u""_ustr, last);
}
{
// Already prior to 5edefc801fb48559c8064003f23d22d838710ee4 "use more string_view in
@@ -44,8 +44,8 @@ public:
// "@returns <FALSE/>, if the path was a one-level path or an invalid path"):
OUString path, last;
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo", path, last));
CPPUNIT_ASSERT_EQUAL(OUString(""), path);
CPPUNIT_ASSERT_EQUAL(OUString("foo"), last);
CPPUNIT_ASSERT_EQUAL(u""_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"foo"_ustr, last);
}
{
// Already prior to 5edefc801fb48559c8064003f23d22d838710ee4 "use more string_view in
@@ -53,14 +53,14 @@ public:
// "@returns <FALSE/>, if the path was a one-level path or an invalid path"):
OUString path, last;
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo/", path, last));
CPPUNIT_ASSERT_EQUAL(OUString(""), path);
CPPUNIT_ASSERT_EQUAL(OUString("foo"), last);
CPPUNIT_ASSERT_EQUAL(u""_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"foo"_ustr, last);
}
{
OUString path, last;
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo/bar/baz", path, last));
CPPUNIT_ASSERT_EQUAL(OUString("/foo/bar"), path);
CPPUNIT_ASSERT_EQUAL(OUString("baz"), last);
CPPUNIT_ASSERT_EQUAL(u"/foo/bar"_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"baz"_ustr, last);
}
{
// Trailing slash accepted for backwards compatibility (cf
@@ -68,21 +68,21 @@ public:
// Data::resolvePathRepresentation, configmgr/source/data.cxx):
OUString path, last;
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo/bar/baz/", path, last));
CPPUNIT_ASSERT_EQUAL(OUString("/foo/bar"), path);
CPPUNIT_ASSERT_EQUAL(OUString("baz"), last);
CPPUNIT_ASSERT_EQUAL(u"/foo/bar"_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"baz"_ustr, last);
}
{
OUString path, last;
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(
u"/foo/bar/baz['abc']/baz['de&amp;f']", path, last));
CPPUNIT_ASSERT_EQUAL(OUString("/foo/bar/baz['abc']"), path);
CPPUNIT_ASSERT_EQUAL(OUString("de&f"), last);
CPPUNIT_ASSERT_EQUAL(u"/foo/bar/baz['abc']"_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"de&f"_ustr, last);
}
{
OUString path, last;
CPPUNIT_ASSERT(!utl::splitLastFromConfigurationPath(u"foo", path, last));
CPPUNIT_ASSERT_EQUAL(OUString(""), path);
CPPUNIT_ASSERT_EQUAL(OUString("foo"), last);
CPPUNIT_ASSERT_EQUAL(u""_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"foo"_ustr, last);
}
{
// In accordance with the documentation, this sets last to "foo/" ("If
@@ -90,15 +90,15 @@ public:
// <var>_sInPath</var>"):
OUString path, last;
CPPUNIT_ASSERT(!utl::splitLastFromConfigurationPath(u"foo/", path, last));
CPPUNIT_ASSERT_EQUAL(OUString(""), path);
CPPUNIT_ASSERT_EQUAL(OUString("foo/"), last);
CPPUNIT_ASSERT_EQUAL(u""_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"foo/"_ustr, last);
}
{
// Some broken input missing a leading slash happens to be considered OK:
OUString path, last;
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"foo/bar/baz", path, last));
CPPUNIT_ASSERT_EQUAL(OUString("foo/bar"), path);
CPPUNIT_ASSERT_EQUAL(OUString("baz"), last);
CPPUNIT_ASSERT_EQUAL(u"foo/bar"_ustr, path);
CPPUNIT_ASSERT_EQUAL(u"baz"_ustr, last);
}
}
unotools/qa/unit/testGetEnglishSearchName.cxx
+10 -10
View File
@@ -28,18 +28,18 @@ void Test::testSingleElement()
{
// lowercase
OUString test1 = GetEnglishSearchFontName( u"SYMBOL" );
CPPUNIT_ASSERT_EQUAL( OUString("symbol"),test1);
CPPUNIT_ASSERT_EQUAL( u"symbol"_ustr,test1);
//trailing whitespaces
test1 = GetEnglishSearchFontName( u"Symbol " );
CPPUNIT_ASSERT_EQUAL(OUString("symbol"),test1);
CPPUNIT_ASSERT_EQUAL(u"symbol"_ustr,test1);
//no longer remove script suffixes
test1 = GetEnglishSearchFontName( u"Symbol(SIP)" );
CPPUNIT_ASSERT_EQUAL(OUString("symbol(sip)"),test1);
CPPUNIT_ASSERT_EQUAL(u"symbol(sip)"_ustr,test1);
test1 = GetEnglishSearchFontName( u"CM Roman CE" );
CPPUNIT_ASSERT_EQUAL( OUString("cmromance"),test1);
CPPUNIT_ASSERT_EQUAL( u"cmromance"_ustr,test1);
//remove special characters; leave semicolon, numbers
test1 = GetEnglishSearchFontName( u"sy;mb?=ol129" );
CPPUNIT_ASSERT_EQUAL( OUString("sy;mbol129"),test1);
CPPUNIT_ASSERT_EQUAL( u"sy;mbol129"_ustr,test1);
//transformation
@@ -47,24 +47,24 @@ void Test::testSingleElement()
// IPAMincho
static constexpr OUStringLiteral aIPAMincho=u"ipa\u660e\u671d";
OUString test_ja_JP1 = GetEnglishSearchFontName(aIPAMincho);
CPPUNIT_ASSERT_EQUAL( OUString("ipamincho"),test_ja_JP1);
CPPUNIT_ASSERT_EQUAL( u"ipamincho"_ustr,test_ja_JP1);
// IPAGothic
static constexpr OUStringLiteral aIPAGothic=u"ipa\u30b4\u30b7\u30c3\u30af";
OUString test_ja_JP2 = GetEnglishSearchFontName(aIPAGothic);
CPPUNIT_ASSERT_EQUAL( OUString("ipagothic"),test_ja_JP2);
CPPUNIT_ASSERT_EQUAL( u"ipagothic"_ustr,test_ja_JP2);
// HiraginoKakuGothic
static constexpr OUStringLiteral aHiraginoKakuGothic=u"\u30D2\u30E9\u30AE\u30CE\u89D2\u30B4\u30B7\u30C3\u30AF";
OUString test_ja_JP3 = GetEnglishSearchFontName(aHiraginoKakuGothic);
CPPUNIT_ASSERT_EQUAL( OUString("hiraginosans"),test_ja_JP3);
CPPUNIT_ASSERT_EQUAL( u"hiraginosans"_ustr,test_ja_JP3);
// HiraginoMincho Pro N
static constexpr OUStringLiteral aHiraginoMinchoProN=u"\u30D2\u30E9\u30AE\u30CE\u660E\u671Dpron";
OUString test_ja_JP4 = GetEnglishSearchFontName(aHiraginoMinchoProN);
CPPUNIT_ASSERT_EQUAL( OUString("hiraginominchopron"),test_ja_JP4);
CPPUNIT_ASSERT_EQUAL( u"hiraginominchopron"_ustr,test_ja_JP4);
// HiraginoMaruGothic Pro N
static constexpr OUStringLiteral aHiraginoMaruGothicProN
=u"\u30D2\u30E9\u30AE\u30CE\u4E38\u30B4pron";
OUString test_ja_JP5 = GetEnglishSearchFontName(aHiraginoMaruGothicProN);
CPPUNIT_ASSERT_EQUAL( OUString("hiraginomarugothicpron"),test_ja_JP5);
CPPUNIT_ASSERT_EQUAL( u"hiraginomarugothicpron"_ustr,test_ja_JP5);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
unotools/source/config/bootstrap.cxx
+3 -3
View File
@@ -60,7 +60,7 @@ namespace utl
static OUString makeImplName()
{
OUString uri;
rtl::Bootstrap::get( "BRAND_BASE_DIR", uri);
rtl::Bootstrap::get( u"BRAND_BASE_DIR"_ustr, uri);
return uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap");
}
@@ -126,7 +126,7 @@ const Bootstrap::Impl& Bootstrap::data()
bool Bootstrap::getProcessWorkingDir(OUString &rUrl)
{
rUrl.clear();
OUString s("$OOO_CWD");
OUString s(u"$OOO_CWD"_ustr);
rtl::Bootstrap::expandMacros(s);
if (s.isEmpty())
{
@@ -549,7 +549,7 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault)
{
// try to open version.ini (versionrc)
OUString uri;
rtl::Bootstrap::get( "BRAND_BASE_DIR", uri);
rtl::Bootstrap::get( u"BRAND_BASE_DIR"_ustr, uri);
rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") );
if ( aData.getHandle() == nullptr )
// version.ini (versionrc) doesn't exist
unotools/source/config/cmdoptions.cxx
+2 -2
View File
@@ -175,7 +175,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
/*TODO: Not used in the moment! see Notify() ...
// Enable notification mechanism of our baseclass.
// We need it to get information about changes outside these class on our used configuration keys! */
Sequence<OUString> aNotifySeq { "Disabled" };
Sequence<OUString> aNotifySeq { u"Disabled"_ustr };
EnableNotification( aNotifySeq, true );
}
@@ -271,7 +271,7 @@ void SvtCommandOptions_Impl::EstablishFrameCallback(const css::uno::Reference< c
Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames()
{
// First get ALL names of current existing list items in configuration!
Sequence< OUString > lDisabledItems = GetNodeNames( SETNODE_DISABLED, utl::ConfigNameFormat::LocalPath );
Sequence< OUString > lDisabledItems = GetNodeNames( u"" SETNODE_DISABLED ""_ustr, utl::ConfigNameFormat::LocalPath );
// Expand all keys
for (OUString& rItem : asNonConstRange(lDisabledItems))
unotools/source/config/configitem.cxx
+1 -1
View File
@@ -670,7 +670,7 @@ static void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFor
else
{
Reference<XServiceInfo> xSVI(_xParentNode, UNO_QUERY);
if (xSVI.is() && xSVI->supportsService("com.sun.star.configuration.SetAccess"))
if (xSVI.is() && xSVI->supportsService(u"com.sun.star.configuration.SetAccess"_ustr))
{
std::transform(std::cbegin(_rNames), std::cend(_rNames), _rNames.getArray(),
[](const OUString& rName) -> OUString { return wrapConfigurationElementName(rName); });
unotools/source/config/configmgr.cxx
+5 -5
View File
@@ -116,15 +116,15 @@ utl::ConfigManager & utl::ConfigManager::getConfigManager() {
css::uno::Reference< css::container::XHierarchicalNameAccess >
utl::ConfigManager::acquireTree(utl::ConfigItem const & item) {
css::uno::Sequence< css::uno::Any > args{ css::uno::Any(css::beans::NamedValue(
"nodepath",
u"nodepath"_ustr,
css::uno::Any("/org.openoffice." + item.GetSubTreeName()))) };
if (item.GetMode() & ConfigItemMode::AllLocales) {
args.realloc(2);
args.getArray()[1] <<= css::beans::NamedValue("locale", css::uno::Any(OUString("*")));
args.getArray()[1] <<= css::beans::NamedValue(u"locale"_ustr, css::uno::Any(u"*"_ustr));
}
return css::uno::Reference< css::container::XHierarchicalNameAccess >(
getConfigurationProvider()->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess",
u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr,
args),
css::uno::UNO_QUERY_THROW);
}
@@ -132,11 +132,11 @@ utl::ConfigManager::acquireTree(utl::ConfigItem const & item) {
css::uno::Reference< css::container::XHierarchicalNameAccess >
utl::ConfigManager::acquireTree(std::u16string_view rSubTreeName) {
css::uno::Sequence< css::uno::Any > args{ css::uno::Any(css::beans::NamedValue(
"nodepath",
u"nodepath"_ustr,
css::uno::Any(OUString::Concat(u"/org.openoffice.") + rSubTreeName))) };
return css::uno::Reference< css::container::XHierarchicalNameAccess >(
getConfigurationProvider()->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess",
u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr,
args),
css::uno::UNO_QUERY_THROW);
}
unotools/source/config/confignode.cxx
+5 -5
View File
@@ -317,7 +317,7 @@ namespace utl
Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY);
if (xSI.is())
{
try { bIsSet = xSI->supportsService("com.sun.star.configuration.SetAccess"); }
try { bIsSet = xSI->supportsService(u"com.sun.star.configuration.SetAccess"_ustr); }
catch(Exception&) { }
}
return bIsSet;
@@ -460,12 +460,12 @@ namespace utl
try
{
::comphelper::NamedValueCollection aArgs;
aArgs.put( "nodepath", i_rNodePath );
aArgs.put( "depth", i_nDepth );
aArgs.put( u"nodepath"_ustr, i_rNodePath );
aArgs.put( u"depth"_ustr, i_nDepth );
OUString sAccessService( i_bUpdatable ?
OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ) :
OUString( "com.sun.star.configuration.ConfigurationAccess" ));
u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr :
u"com.sun.star.configuration.ConfigurationAccess"_ustr);
Reference< XInterface > xRoot(
i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ),
unotools/source/config/configpaths.cxx
+1 -1
View File
@@ -292,7 +292,7 @@ OUString lcl_wrapName(std::u16string_view _sContent, const OUString& _sType)
OUString wrapConfigurationElementName(std::u16string_view _sElementName)
{
return lcl_wrapName(_sElementName, "*" );
return lcl_wrapName(_sElementName, u"*"_ustr );
}
OUString wrapConfigurationElementName(std::u16string_view _sElementName,
unotools/source/config/docinfohelper.cxx
+2 -2
View File
@@ -60,8 +60,8 @@ OUString DocInfoHelper::GetGeneratorString()
}
}
OUString os( "$_OS" );
OUString arch( "$_ARCH" );
OUString os( u"$_OS"_ustr );
OUString arch( u"$_ARCH"_ustr );
::rtl::Bootstrap::expandMacros(os);
::rtl::Bootstrap::expandMacros(arch);
aResult.append( "$" + os + "_" + arch + " " );
unotools/source/config/dynamicmenuoptions.cxx
+1 -1
View File
@@ -80,7 +80,7 @@ struct SvtDynMenu
sal_Int32 nUserCount = static_cast<sal_Int32>(lUserEntries.size());
sal_Int32 nStep = 0;
std::vector< SvtDynMenuEntry > lResult ( nSetupCount+nUserCount );
OUString sSeparator ( "private:separator" );
OUString sSeparator ( u"private:separator"_ustr );
for( const auto& pList : {&lSetupEntries, &lUserEntries} )
{
unotools/source/config/eventcfg.cxx
+7 -7
View File
@@ -124,7 +124,7 @@ public:
GlobalEventConfig_Impl::GlobalEventConfig_Impl()
: ConfigItem( "Office.Events/ApplicationEvents", ConfigItemMode::NONE )
: ConfigItem( u"Office.Events/ApplicationEvents"_ustr, ConfigItemMode::NONE )
{
// the supported event names
for (const GlobalEventId id : o3tl::enumrange<GlobalEventId>())
@@ -135,7 +135,7 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl()
/*TODO: Not used in the moment! see Notify() ...
// Enable notification mechanism of our baseclass.
// We need it to get information about changes outside these class on our used configuration keys! */
Sequence<OUString> aNotifySeq { "Events" };
Sequence<OUString> aNotifySeq { u"Events"_ustr };
EnableNotification( aNotifySeq, true );
}
@@ -167,7 +167,7 @@ void GlobalEventConfig_Impl::ImplCommit()
//DF need to check it this is correct??
SAL_INFO("unotools", "In GlobalEventConfig_Impl::ImplCommit");
// clear the existing nodes
ClearNodeSet( SETNODE_BINDINGS );
ClearNodeSet( u"" SETNODE_BINDINGS ""_ustr );
OUString sNode;
//step through the list of events
for(const auto& rEntry : m_eventBindingHash)
@@ -180,7 +180,7 @@ void GlobalEventConfig_Impl::ImplCommit()
"']" PATHDELIMITER PROPERTYNAME_BINDINGURL;
SAL_INFO("unotools", "writing binding for: " << sNode);
//write the data to the registry
SetSetProperties(SETNODE_BINDINGS,{ comphelper::makePropertyValue(sNode, rEntry.second) });
SetSetProperties(u"" SETNODE_BINDINGS ""_ustr,{ comphelper::makePropertyValue(sNode, rEntry.second) });
}
}
@@ -189,10 +189,10 @@ void GlobalEventConfig_Impl::ImplCommit()
void GlobalEventConfig_Impl::initBindingInfo()
{
// Get ALL names of current existing list items in configuration!
const Sequence< OUString > lEventNames = GetNodeNames( SETNODE_BINDINGS, utl::ConfigNameFormat::LocalPath );
const Sequence< OUString > lEventNames = GetNodeNames( u"" SETNODE_BINDINGS ""_ustr, utl::ConfigNameFormat::LocalPath );
OUString aSetNode = SETNODE_BINDINGS PATHDELIMITER;
OUString aCommandKey = PATHDELIMITER PROPERTYNAME_BINDINGURL;
OUString aSetNode = u"" SETNODE_BINDINGS PATHDELIMITER ""_ustr;
OUString aCommandKey = u"" PATHDELIMITER PROPERTYNAME_BINDINGURL ""_ustr;
// Expand all keys
Sequence< OUString > lMacros(1);
unotools/source/config/fontcfg.cxx
+6 -6
View File
@@ -98,11 +98,11 @@ DefaultFontConfiguration::DefaultFontConfiguration()
m_xConfigProvider = theDefaultProvider::get(comphelper::getProcessComponentContext());
Sequence<Any> aArgs(comphelper::InitAnyPropertySequence(
{
{"nodepath", Any(OUString( "/org.openoffice.VCL/DefaultFonts" ))}
{"nodepath", Any(u"/org.openoffice.VCL/DefaultFonts"_ustr)}
}));
m_xConfigAccess =
Reference< XNameAccess >(
m_xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess",
m_xConfigProvider->createInstanceWithArguments( u"com.sun.star.configuration.ConfigurationAccess"_ustr,
aArgs ),
UNO_QUERY );
if( m_xConfigAccess.is() )
@@ -213,7 +213,7 @@ OUString DefaultFontConfiguration::getDefaultFont( const LanguageTag& rLanguageT
}
if( aRet.isEmpty() )
{
aRet = tryLocale( "en", aType );
aRet = tryLocale( u"en"_ustr, aType );
}
return aRet;
}
@@ -299,7 +299,7 @@ FontSubstConfiguration& FontSubstConfiguration::get()
FontSubstConfiguration::FontSubstConfiguration() :
maSubstHash( 300 ),
maLanguageTag("en")
maLanguageTag(u"en"_ustr)
{
if (comphelper::IsFuzzing())
return;
@@ -311,11 +311,11 @@ FontSubstConfiguration::FontSubstConfiguration() :
m_xConfigProvider = theDefaultProvider::get( xContext );
Sequence<Any> aArgs(comphelper::InitAnyPropertySequence(
{
{"nodepath", Any(OUString( "/org.openoffice.VCL/FontSubstitutions" ))}
{"nodepath", Any(u"/org.openoffice.VCL/FontSubstitutions"_ustr)}
}));
m_xConfigAccess =
Reference< XNameAccess >(
m_xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess",
m_xConfigProvider->createInstanceWithArguments( u"com.sun.star.configuration.ConfigurationAccess"_ustr,
aArgs ),
UNO_QUERY );
if( m_xConfigAccess.is() )
unotools/source/config/historyoptions.cxx
+6 -6
View File
@@ -422,7 +422,7 @@ static uno::Reference<container::XNameAccess> GetConfig()
return uno::Reference<container::XNameAccess>(
::comphelper::ConfigurationHelper::openConfig(
::comphelper::getProcessComponentContext(),
"org.openoffice.Office.Histories/Histories",
u"org.openoffice.Office.Histories/Histories"_ustr,
::comphelper::EConfigurationModes::Standard),
uno::UNO_QUERY_THROW);
}
@@ -432,7 +432,7 @@ static uno::Reference<container::XNameAccess> GetCommonXCU()
return uno::Reference<container::XNameAccess>(
::comphelper::ConfigurationHelper::openConfig(
::comphelper::getProcessComponentContext(),
"org.openoffice.Office.Common/History",
u"org.openoffice.Office.Common/History"_ustr,
::comphelper::EConfigurationModes::Standard),
uno::UNO_QUERY_THROW);
}
@@ -445,11 +445,11 @@ static uno::Reference<container::XNameAccess> GetListAccess(
switch (eHistory)
{
case EHistoryType::PickList:
xCfg->getByName("PickList") >>= xListAccess;
xCfg->getByName(u"PickList"_ustr) >>= xListAccess;
break;
case EHistoryType::HelpBookmarks:
xCfg->getByName("HelpBookmarks") >>= xListAccess;
xCfg->getByName(u"HelpBookmarks"_ustr) >>= xListAccess;
break;
}
return xListAccess;
@@ -596,11 +596,11 @@ static sal_uInt32 GetCapacity(const uno::Reference<container::XNameAccess>& xCom
switch (eHistory)
{
case EHistoryType::PickList:
xListAccess->getPropertyValue("PickListSize") >>= nSize;
xListAccess->getPropertyValue(u"PickListSize"_ustr) >>= nSize;
break;
case EHistoryType::HelpBookmarks:
xListAccess->getPropertyValue("HelpBookmarkSize") >>= nSize;
xListAccess->getPropertyValue(u"HelpBookmarkSize"_ustr) >>= nSize;
break;
}
unotools/source/config/lingucfg.cxx
+23 -23
View File
@@ -191,7 +191,7 @@ public:
};
SvtLinguConfigItem::SvtLinguConfigItem() :
utl::ConfigItem( "Office.Linguistic" )
utl::ConfigItem( u"Office.Linguistic"_ustr )
{
const uno::Sequence< OUString > &rPropertyNames = GetPropertyNames();
LoadOptions( rPropertyNames );
@@ -896,7 +896,7 @@ bool SvtLinguConfig::GetElementNamesFor(
try
{
uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName(u"ServiceManager"_ustr), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( rNodeName ), uno::UNO_QUERY_THROW );
rElementNames = xNA->getElementNames();
bSuccess = true;
@@ -918,10 +918,10 @@ bool SvtLinguConfig::GetSupportedDictionaryFormatsFor(
try
{
uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName(u"ServiceManager"_ustr), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( rSetName ), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( rSetEntry ), uno::UNO_QUERY_THROW );
if (xNA->getByName( "SupportedDictionaryFormats" ) >>= rFormatList)
if (xNA->getByName( u"SupportedDictionaryFormats"_ustr ) >>= rFormatList)
bSuccess = true;
DBG_ASSERT( rFormatList.hasElements(), "supported dictionary format list is empty" );
}
@@ -939,10 +939,10 @@ bool SvtLinguConfig::GetLocaleListFor( const OUString &rSetName, const OUString
try
{
uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName(u"ServiceManager"_ustr), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( rSetName ), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( rSetEntry ), uno::UNO_QUERY_THROW );
if (xNA->getByName( "Locales" ) >>= rLocaleList)
if (xNA->getByName( u"Locales"_ustr ) >>= rLocaleList)
bSuccess = true;
DBG_ASSERT( rLocaleList.hasElements(), "Locale list is empty" );
}
@@ -982,7 +982,7 @@ bool SvtLinguConfig::GetDictionaryEntry(
try
{
uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName(u"ServiceManager"_ustr), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( aG_Dictionaries ), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( rNodeName ), uno::UNO_QUERY_THROW );
@@ -990,9 +990,9 @@ bool SvtLinguConfig::GetDictionaryEntry(
uno::Sequence< OUString > aLocations;
OUString aFormatName;
uno::Sequence< OUString > aLocaleNames;
bSuccess = (xNA->getByName( "Locations" ) >>= aLocations) &&
(xNA->getByName( "Format" ) >>= aFormatName) &&
(xNA->getByName( "Locales" ) >>= aLocaleNames);
bSuccess = (xNA->getByName( u"Locations"_ustr ) >>= aLocations) &&
(xNA->getByName( u"Format"_ustr ) >>= aFormatName) &&
(xNA->getByName( u"Locales"_ustr ) >>= aLocaleNames);
DBG_ASSERT( aLocations.hasElements(), "Dictionary locations not set" );
DBG_ASSERT( !aFormatName.isEmpty(), "Dictionary format name not set" );
DBG_ASSERT( aLocaleNames.hasElements(), "No locales set for the dictionary" );
@@ -1028,8 +1028,8 @@ uno::Sequence< OUString > SvtLinguConfig::GetDisabledDictionaries() const
try
{
uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW );
xNA->getByName( "DisabledDictionaries" ) >>= aResult;
xNA.set( xNA->getByName(u"ServiceManager"_ustr), uno::UNO_QUERY_THROW );
xNA->getByName( u"DisabledDictionaries"_ustr ) >>= aResult;
}
catch (uno::Exception &)
{
@@ -1096,11 +1096,11 @@ uno::Reference< util::XChangesBatch > const & SvtLinguConfig::GetMainUpdateAcces
// get configuration update access
beans::PropertyValue aValue;
aValue.Name = "nodepath";
aValue.Value <<= OUString("org.openoffice.Office.Linguistic");
aValue.Value <<= u"org.openoffice.Office.Linguistic"_ustr;
uno::Sequence< uno::Any > aProps{ uno::Any(aValue) };
m_xMainUpdateAccess.set(
xConfigurationProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess", aProps),
u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr, aProps),
uno::UNO_QUERY_THROW );
}
catch (uno::Exception &)
@@ -1119,16 +1119,16 @@ OUString SvtLinguConfig::GetVendorImageUrl_Impl(
try
{
uno::Reference< container::XNameAccess > xImagesNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
xImagesNA.set( xImagesNA->getByName("Images"), uno::UNO_QUERY_THROW );
xImagesNA.set( xImagesNA->getByName(u"Images"_ustr), uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xNA( xImagesNA->getByName("ServiceNameEntries"), uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xNA( xImagesNA->getByName(u"ServiceNameEntries"_ustr), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( rServiceImplName ), uno::UNO_QUERY_THROW );
uno::Any aAny(xNA->getByName("VendorImagesNode"));
uno::Any aAny(xNA->getByName(u"VendorImagesNode"_ustr));
OUString aVendorImagesNode;
if (aAny >>= aVendorImagesNode)
{
xNA = xImagesNA;
xNA.set( xNA->getByName("VendorImages"), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName(u"VendorImages"_ustr), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName( aVendorImagesNode ), uno::UNO_QUERY_THROW );
aAny = xNA->getByName( rImageName );
OUString aTmp;
@@ -1153,7 +1153,7 @@ OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage(
OUString aRes;
if (!rServiceImplName.isEmpty())
{
aRes = GetVendorImageUrl_Impl( rServiceImplName, "SpellAndGrammarContextMenuSuggestionImage" );
aRes = GetVendorImageUrl_Impl( rServiceImplName, u"SpellAndGrammarContextMenuSuggestionImage"_ustr );
}
return aRes;
}
@@ -1165,7 +1165,7 @@ OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
OUString aRes;
if (!rServiceImplName.isEmpty())
{
aRes = GetVendorImageUrl_Impl( rServiceImplName, "SpellAndGrammarContextMenuDictionaryImage" );
aRes = GetVendorImageUrl_Impl( rServiceImplName, u"SpellAndGrammarContextMenuDictionaryImage"_ustr );
}
return aRes;
}
@@ -1176,7 +1176,7 @@ OUString SvtLinguConfig::GetSynonymsContextImage(
{
OUString aRes;
if (!rServiceImplName.isEmpty())
aRes = GetVendorImageUrl_Impl(rServiceImplName, "SynonymsContextMenuImage");
aRes = GetVendorImageUrl_Impl(rServiceImplName, u"SynonymsContextMenuImage"_ustr);
return aRes;
}
@@ -1187,8 +1187,8 @@ bool SvtLinguConfig::HasGrammarChecker() const
try
{
uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName("GrammarCheckerList"), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName(u"ServiceManager"_ustr), uno::UNO_QUERY_THROW );
xNA.set( xNA->getByName(u"GrammarCheckerList"_ustr), uno::UNO_QUERY_THROW );
uno::Sequence< OUString > aElementNames( xNA->getElementNames() );
bRes = aElementNames.hasElements();
unotools/source/config/moduleoptions.cxx
+17 -17
View File
@@ -921,16 +921,16 @@ OUString SvtModuleOptions::GetModuleName( EModule eModule ) const
{
switch( eModule )
{
case SvtModuleOptions::EModule::WRITER : { return "Writer"; }
case SvtModuleOptions::EModule::WEB : { return "Web"; }
case SvtModuleOptions::EModule::GLOBAL : { return "Global"; }
case SvtModuleOptions::EModule::CALC : { return "Calc"; }
case SvtModuleOptions::EModule::DRAW : { return "Draw"; }
case SvtModuleOptions::EModule::IMPRESS : { return "Impress"; }
case SvtModuleOptions::EModule::MATH : { return "Math"; }
case SvtModuleOptions::EModule::CHART : { return "Chart"; }
case SvtModuleOptions::EModule::BASIC : { return "Basic"; }
case SvtModuleOptions::EModule::DATABASE : { return "Database"; }
case SvtModuleOptions::EModule::WRITER : { return u"Writer"_ustr; }
case SvtModuleOptions::EModule::WEB : { return u"Web"_ustr; }
case SvtModuleOptions::EModule::GLOBAL : { return u"Global"_ustr; }
case SvtModuleOptions::EModule::CALC : { return u"Calc"_ustr; }
case SvtModuleOptions::EModule::DRAW : { return u"Draw"_ustr; }
case SvtModuleOptions::EModule::IMPRESS : { return u"Impress"_ustr; }
case SvtModuleOptions::EModule::MATH : { return u"Math"_ustr; }
case SvtModuleOptions::EModule::CHART : { return u"Chart"_ustr; }
case SvtModuleOptions::EModule::BASIC : { return u"Basic"_ustr; }
case SvtModuleOptions::EModule::DATABASE : { return u"Database"_ustr; }
default:
OSL_FAIL( "unknown module" );
break;
@@ -1003,9 +1003,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const OUString
try
{
xFilterCfg.set(
xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.FilterFactory", xContext), css::uno::UNO_QUERY);
xContext->getServiceManager()->createInstanceWithContext(u"com.sun.star.document.FilterFactory"_ustr, xContext), css::uno::UNO_QUERY);
xTypeCfg.set(
xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext), css::uno::UNO_QUERY);
xContext->getServiceManager()->createInstanceWithContext(u"com.sun.star.document.TypeDetection"_ustr, xContext), css::uno::UNO_QUERY);
}
catch(const css::uno::RuntimeException&)
{ throw; }
@@ -1015,13 +1015,13 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const OUString
::comphelper::SequenceAsHashMap stlDesc(lMediaDescriptor);
// is there already a filter inside the descriptor?
OUString sFilterName = stlDesc.getUnpackedValueOrDefault("FilterName", OUString());
OUString sFilterName = stlDesc.getUnpackedValueOrDefault(u"FilterName"_ustr, OUString());
if (!sFilterName.isEmpty())
{
try
{
::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sFilterName));
OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault("DocumentService", OUString());
OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(u"DocumentService"_ustr, OUString());
SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService);
if (eApp != EFactory::UNKNOWN_FACTORY)
@@ -1034,7 +1034,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const OUString
}
// is there already a type inside the descriptor?
OUString sTypeName = stlDesc.getUnpackedValueOrDefault("TypeName", OUString());
OUString sTypeName = stlDesc.getUnpackedValueOrDefault(u"TypeName"_ustr, OUString());
if (sTypeName.isEmpty())
{
// no :-(
@@ -1051,9 +1051,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const OUString
try
{
::comphelper::SequenceAsHashMap stlTypeProps (xTypeCfg->getByName(sTypeName));
OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault("PreferredFilter", OUString());
OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(u"PreferredFilter"_ustr, OUString());
::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sPreferredFilter));
OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault("DocumentService", OUString());
OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(u"DocumentService"_ustr, OUString());
SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService);
if (eApp != EFactory::UNKNOWN_FACTORY)
unotools/source/config/searchopt.cxx
+1 -1
View File
@@ -64,7 +64,7 @@ public:
};
SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
ConfigItem( "Office.Common/SearchOptions" ),
ConfigItem( u"Office.Common/SearchOptions"_ustr ),
nFlags(0x0003FFFF) // set all options values to 'true'
{
unotools/source/config/securityoptions.cxx
+1 -1
View File
@@ -220,7 +220,7 @@ std::vector< SvtSecurityOptions::Certificate > GetTrustedAuthors()
Sequence< OUString > lAllAuthors( c2 );
auto plAllAuthors = lAllAuthors.getArray();
sal_Int32 i2 = 0;
OUString aSep( "/" );
OUString aSep( u"/"_ustr );
for( const auto& rAuthor : lAuthors )
{
plAllAuthors[ i2 ] = PROPERTYNAME_MACRO_TRUSTEDAUTHORS + aSep + rAuthor + aSep + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
unotools/source/config/useroptions.cxx
+1 -1
View File
@@ -135,7 +135,7 @@ SvtUserOptions::Impl::Impl() :
m_xCfg.set(
comphelper::ConfigurationHelper::openConfig(
comphelper::getProcessComponentContext(),
"org.openoffice.UserProfile/Data",
u"org.openoffice.UserProfile/Data"_ustr,
comphelper::EConfigurationModes::Standard
),
uno::UNO_QUERY
unotools/source/i18n/calendarwrapper.cxx
+2 -2
View File
@@ -45,7 +45,7 @@ void CalendarWrapper::loadDefaultCalendar( const css::lang::Locale& rLocale, boo
try
{
if ( xC.is() )
xC->loadDefaultCalendarTZ( rLocale, (bTimeZoneUTC ? "UTC" : OUString()));
xC->loadDefaultCalendarTZ( rLocale, (bTimeZoneUTC ? u"UTC"_ustr : OUString()));
}
catch (const Exception&)
{
@@ -58,7 +58,7 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const css::lang::
try
{
if ( xC.is() )
xC->loadCalendarTZ( rUniqueID, rLocale, (bTimeZoneUTC ? "UTC" : OUString()));
xC->loadCalendarTZ( rUniqueID, rLocale, (bTimeZoneUTC ? u"UTC"_ustr : OUString()));
}
catch (const Exception&)
{
unotools/source/i18n/resmgr.cxx
+1 -1
View File
@@ -141,7 +141,7 @@ namespace Translate
#if defined(ANDROID) || defined(EMSCRIPTEN)
OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
#else
OUString uri("$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/");
OUString uri(u"$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/"_ustr);
rtl::Bootstrap::expandMacros(uri);
OUString path;
osl::File::getSystemPathFromFileURL(uri, path);
unotools/source/i18n/transliterationwrapper.cxx
+3 -3
View File
@@ -110,17 +110,17 @@ void TransliterationWrapper::loadModuleIfNeeded( LanguageType nLang )
if( nType == TransliterationFlags::SENTENCE_CASE )
{
if( bLoad )
loadModuleByImplName("SENTENCE_CASE", nLang);
loadModuleByImplName(u"SENTENCE_CASE"_ustr, nLang);
}
else if( nType == TransliterationFlags::TITLE_CASE )
{
if( bLoad )
loadModuleByImplName("TITLE_CASE", nLang);
loadModuleByImplName(u"TITLE_CASE"_ustr, nLang);
}
else if( nType == TransliterationFlags::TOGGLE_CASE )
{
if( bLoad )
loadModuleByImplName("TOGGLE_CASE", nLang);
loadModuleByImplName(u"TOGGLE_CASE"_ustr, nLang);
}
else
{
unotools/source/misc/ServiceDocumenter.cxx
+8 -8
View File
@@ -22,9 +22,9 @@ void unotools::misc::ServiceDocumenter::showCoreDocs(const Reference<XServiceInf
if(!xService.is())
return;
auto xMSF(m_xContext->getServiceManager());
Reference<system::XSystemShellExecute> xShell(xMSF->createInstanceWithContext("com.sun.star.system.SystemShellExecute", m_xContext), uno::UNO_QUERY);
Reference<system::XSystemShellExecute> xShell(xMSF->createInstanceWithContext(u"com.sun.star.system.SystemShellExecute"_ustr, m_xContext), uno::UNO_QUERY);
xShell->execute(
m_sCoreBaseUrl + xService->getImplementationName() + ".html", "",
m_sCoreBaseUrl + xService->getImplementationName() + ".html", u""_ustr,
css::system::SystemShellExecuteFlags::URIS_ONLY);
}
@@ -33,7 +33,7 @@ void unotools::misc::ServiceDocumenter::showInterfaceDocs(const Reference<XTypeP
if(!xTypeProvider.is())
return;
auto xMSF(m_xContext->getServiceManager());
Reference<system::XSystemShellExecute> xShell(xMSF->createInstanceWithContext("com.sun.star.system.SystemShellExecute", m_xContext), uno::UNO_QUERY);
Reference<system::XSystemShellExecute> xShell(xMSF->createInstanceWithContext(u"com.sun.star.system.SystemShellExecute"_ustr, m_xContext), uno::UNO_QUERY);
const css::uno::Sequence<css::uno::Type> aTypes = xTypeProvider->getTypes();
for(const auto& aType : aTypes)
{
@@ -42,7 +42,7 @@ void unotools::misc::ServiceDocumenter::showInterfaceDocs(const Reference<XTypeP
while(nIdx != -1)
sUrl = sUrl.replaceFirst(".", "_1_1", &nIdx);
xShell->execute(
m_sServiceBaseUrl + "/interface" + sUrl + ".html", "",
m_sServiceBaseUrl + "/interface" + sUrl + ".html", u""_ustr,
css::system::SystemShellExecuteFlags::URIS_ONLY);
}
}
@@ -52,7 +52,7 @@ void unotools::misc::ServiceDocumenter::showServiceDocs(const Reference<XService
if(!xService.is())
return;
auto xMSF(m_xContext->getServiceManager());
Reference<system::XSystemShellExecute> xShell(xMSF->createInstanceWithContext("com.sun.star.system.SystemShellExecute", m_xContext), uno::UNO_QUERY);
Reference<system::XSystemShellExecute> xShell(xMSF->createInstanceWithContext(u"com.sun.star.system.SystemShellExecute"_ustr, m_xContext), uno::UNO_QUERY);
const css::uno::Sequence<OUString> aServiceNames = xService->getSupportedServiceNames();
for(const auto& sService : aServiceNames)
{
@@ -61,7 +61,7 @@ void unotools::misc::ServiceDocumenter::showServiceDocs(const Reference<XService
while(nIdx != -1)
sUrl = sUrl.replaceFirst(".", "_1_1", &nIdx);
xShell->execute(
m_sServiceBaseUrl + "/service" + sUrl + ".html", "",
m_sServiceBaseUrl + "/service" + sUrl + ".html", u""_ustr,
css::system::SystemShellExecuteFlags::URIS_ONLY);
}
}
@@ -73,11 +73,11 @@ sal_Bool unotools::misc::ServiceDocumenter::supportsService(const OUString& sSer
}
OUString unotools::misc::ServiceDocumenter::getImplementationName()
{
return "com.sun.star.comp.unotools.misc.ServiceDocumenter";
return u"com.sun.star.comp.unotools.misc.ServiceDocumenter"_ustr;
}
css::uno::Sequence< OUString > unotools::misc::ServiceDocumenter::getSupportedServiceNames()
{
return { "com.sun.star.script.ServiceDocumenter" };
return { u"com.sun.star.script.ServiceDocumenter"_ustr };
}
unotools/source/misc/ServiceDocumenter.hxx
+2 -2
View File
@@ -23,8 +23,8 @@ class ServiceDocumenter : public ::cppu::WeakImplHelper<
public:
ServiceDocumenter(css::uno::Reference< css::uno::XComponentContext> xContext)
: m_xContext(std::move(xContext))
, m_sCoreBaseUrl("http://example.com")
, m_sServiceBaseUrl("https://api.libreoffice.org/docs/idl/ref")
, m_sCoreBaseUrl(u"http://example.com"_ustr)
, m_sServiceBaseUrl(u"https://api.libreoffice.org/docs/idl/ref"_ustr)
{};
// XServiceInfo
unotools/source/misc/ZipPackageHelper.cxx
+3 -3
View File
@@ -60,12 +60,12 @@ ZipPackageHelper::ZipPackageHelper(
Sequence< Any > aArguments{
Any(sPackageURL),
// let ZipPackage be used
Any(beans::NamedValue("StorageFormat", Any(ZIP_STORAGE_FORMAT_STRING)))
Any(beans::NamedValue(u"StorageFormat"_ustr, Any(ZIP_STORAGE_FORMAT_STRING)))
};
mxHNameAccess.set(
mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
"com.sun.star.packages.comp.ZipPackage",
u"com.sun.star.packages.comp.ZipPackage"_ustr,
aArguments, mxContext ), UNO_QUERY);
if( !mxHNameAccess.is() )
@@ -74,7 +74,7 @@ ZipPackageHelper::ZipPackageHelper(
mxFactory.set(mxHNameAccess, UNO_QUERY);
// get root zip folder
mxHNameAccess->getByHierarchicalName( "/" ) >>= mxRootFolder;
mxHNameAccess->getByHierarchicalName( u"/"_ustr ) >>= mxRootFolder;
}
static OUString encodeZipUri( const OUString& rURI )
unotools/source/misc/defaultencoding.cxx
+1 -1
View File
@@ -18,7 +18,7 @@
OUString utl_getLocaleForGlobalDefaultEncoding()
{
if (comphelper::IsFuzzing())
return "en-US";
return u"en-US"_ustr;
// First try document default language
OUString result(officecfg::Office::Linguistic::General::DefaultLocale::get());
// Fallback to LO locale
unotools/source/misc/mediadescriptor.cxx
+5 -5
View File
@@ -117,7 +117,7 @@ bool MediaDescriptor::isStreamReadOnly() const
::ucbhelper::Content aContent(xContent,
utl::UCBContentHelper::getDefaultCommandEnvironment(),
comphelper::getProcessComponentContext());
aContent.getPropertyValue("IsReadOnly") >>= bReadOnly;
aContent.getPropertyValue(u"IsReadOnly"_ustr) >>= bReadOnly;
}
}
}
@@ -253,7 +253,7 @@ bool MediaDescriptor::impl_addInputStream( bool bLockFile )
// b) ... or we must get it from the given URL
OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL, OUString());
if (sURL.isEmpty())
throw css::uno::Exception("Found no URL.",
throw css::uno::Exception(u"Found no URL."_ustr,
css::uno::Reference< css::uno::XInterface >());
return impl_openStreamWithURL( removeFragment(sURL), bLockFile );
@@ -268,7 +268,7 @@ bool MediaDescriptor::impl_addInputStream( bool bLockFile )
bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
{
if ( !_rxPostData.is() )
throw css::lang::IllegalArgumentException("Found invalid PostData.",
throw css::lang::IllegalArgumentException(u"Found invalid PostData."_ustr,
css::uno::Reference< css::uno::XInterface >(), 1);
// PostData can't be used in read/write mode!
@@ -311,7 +311,7 @@ bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< cs
aPostArgument.MediaType = sMediaType;
aPostArgument.Referer = getUnpackedValueOrDefault( PROP_REFERRER, OUString() );
aContent.executeCommand( "post", css::uno::Any( aPostArgument ) );
aContent.executeCommand( u"post"_ustr, css::uno::Any( aPostArgument ) );
// get result
xResultStream = xSink->getInputStream();
@@ -449,7 +449,7 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi
else
{
bool bRequestReadOnly = bReadOnly;
aContent.getPropertyValue("IsReadOnly") >>= bReadOnly;
aContent.getPropertyValue(u"IsReadOnly"_ustr) >>= bReadOnly;
if ( bReadOnly && !bRequestReadOnly && bModeRequestedExplicitly )
return false; // the document is explicitly requested with WRITABLE mode
}
unotools/source/ucbhelper/localfilehelper.cxx
+1 -1
View File
@@ -44,7 +44,7 @@ css::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUStri
rFolder, Reference< XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
Reference< css::sdbc::XResultSet > xResultSet;
css::uno::Sequence< OUString > aProps { "Url" };
css::uno::Sequence< OUString > aProps { u"Url"_ustr };
try
{
unotools/source/ucbhelper/ucbhelper.cxx
+7 -7
View File
@@ -82,7 +82,7 @@ std::vector<OUString> getContents(OUString const & url) {
try {
std::vector<OUString> cs;
ucbhelper::Content c(content(url));
css::uno::Sequence<OUString> args { "Title" };
css::uno::Sequence<OUString> args { u"Title"_ustr };
css::uno::Reference<css::sdbc::XResultSet> res( c.createCursor(args), css::uno::UNO_SET_THROW);
css::uno::Reference<css::ucb::XContentAccess> acc( res, css::uno::UNO_QUERY_THROW);
while (res->next()) {
@@ -103,7 +103,7 @@ std::vector<OUString> getContents(OUString const & url) {
OUString getCasePreservingUrl(const INetURLObject& url) {
return
content(url).executeCommand(
"getCasePreservingURL",
u"getCasePreservingURL"_ustr,
css::uno::Any()).
get<OUString>();
}
@@ -177,7 +177,7 @@ bool utl::UCBContentHelper::GetTitle(
{
assert(title != nullptr);
try {
return content(url).getPropertyValue("Title") >>= *title;
return content(url).getPropertyValue(u"Title"_ustr) >>= *title;
} catch (css::uno::RuntimeException const &) {
throw;
} catch (css::ucb::CommandAbortedException const &) {
@@ -192,7 +192,7 @@ bool utl::UCBContentHelper::GetTitle(
bool utl::UCBContentHelper::Kill(OUString const & url) {
try {
content(url).executeCommand(
"delete",
u"delete"_ustr,
css::uno::Any(true));
return true;
} catch (css::uno::RuntimeException const &) {
@@ -225,7 +225,7 @@ bool utl::UCBContentHelper::MakeFolder(
{
continue;
}
if (parent.insertNewContent(rInfo.Type, { "Title" }, { css::uno::Any(title) }, result))
if (parent.insertNewContent(rInfo.Type, { u"Title"_ustr }, { css::uno::Any(title) }, result))
{
return true;
}
@@ -268,11 +268,11 @@ bool utl::UCBContentHelper::IsYounger(
return
convert(
content(younger).getPropertyValue(
"DateModified").
u"DateModified"_ustr).
get<css::util::DateTime>())
> convert(
content(older).getPropertyValue(
"DateModified").
u"DateModified"_ustr).
get<css::util::DateTime>());
} catch (css::uno::RuntimeException const &) {
throw;
unotools/source/ucbhelper/ucblockbytes.cxx
+1 -1
View File
@@ -733,7 +733,7 @@ static bool UCBOpenContentSync(
xContId->getContentIdentifier() :
OUString() );
InteractiveNetworkConnectException aExcep(
"server not responding after five seconds", {},
u"server not responding after five seconds"_ustr, {},
InteractionClassification_ERROR, aURL.GetHost());
Any request;
request <<= aExcep;
unotools/source/ucbhelper/ucbstreamhelper.cxx
+2 -2
View File
@@ -60,7 +60,7 @@ static std::unique_ptr<SvStream> lcl_CreateStream( const OUString& rFileName, St
::ucbhelper::Content aCnt(
rFileName, Reference < XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
aCnt.executeCommand( "delete", css::uno::Any( true ) );
aCnt.executeCommand( u"delete"_ustr, css::uno::Any( true ) );
}
catch ( const CommandAbortedException& )
@@ -92,7 +92,7 @@ static std::unique_ptr<SvStream> lcl_CreateStream( const OUString& rFileName, St
aInsertArg.ReplaceExisting = false;
Any aCmdArg;
aCmdArg <<= aInsertArg;
aContent.executeCommand( "insert", aCmdArg );
aContent.executeCommand( u"insert"_ustr, aCmdArg );
}
// it is NOT an error when the stream already exists and no truncation was desired
unotools/source/ucbhelper/xtempfile.cxx
+12 -12
View File
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL OTempFileService::getRemoveFile()
if ( !mpTempFile )
{
// the stream is already disconnected
throw css::uno::RuntimeException("Not connected to a file.");
throw css::uno::RuntimeException(u"Not connected to a file."_ustr);
}
return mbRemoveFile;
@@ -73,7 +73,7 @@ void SAL_CALL OTempFileService::setRemoveFile( sal_Bool _removefile )
if ( !mpTempFile )
{
// the stream is already disconnected
throw css::uno::RuntimeException("Not connected to a file.");
throw css::uno::RuntimeException(u"Not connected to a file."_ustr);
}
mbRemoveFile = _removefile;
@@ -85,7 +85,7 @@ OUString SAL_CALL OTempFileService::getUri()
if ( !mpTempFile )
{
throw css::uno::RuntimeException("Not connected to a file.");
throw css::uno::RuntimeException(u"Not connected to a file."_ustr);
}
return mpTempFile->GetURL();
@@ -97,7 +97,7 @@ OUString SAL_CALL OTempFileService::getResourceName()
if ( !mpTempFile )
{
throw css::uno::RuntimeException("Not connected to a file.");
throw css::uno::RuntimeException(u"Not connected to a file."_ustr);
}
return mpTempFile->GetFileName();
@@ -322,11 +322,11 @@ void SAL_CALL OTempFileService::truncate()
// attention: properties need to be sorted by name!
static cppu::OPropertyArrayHelper ourPropertyInfo(
{
css::beans::Property( "Uri", PROPERTY_HANDLE_URI, cppu::UnoType<OUString>::get(),
css::beans::Property( u"Uri"_ustr, PROPERTY_HANDLE_URI, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY ),
css::beans::Property( "RemoveFile", PROPERTY_HANDLE_REMOVE_FILE, cppu::UnoType<bool>::get(),
css::beans::Property( u"RemoveFile"_ustr, PROPERTY_HANDLE_REMOVE_FILE, cppu::UnoType<bool>::get(),
0 ),
css::beans::Property( "ResourceName", PROPERTY_HANDLE_RESOURCE_NAME, cppu::UnoType<OUString>::get(),
css::beans::Property( u"ResourceName"_ustr, PROPERTY_HANDLE_RESOURCE_NAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY )
},
true );
@@ -399,9 +399,9 @@ void OTempFileService::setFastPropertyValue( ::sal_Int32 nHandle, const ::css::u
::css::uno::Sequence< ::css::beans::PropertyValue > OTempFileService::getPropertyValues()
{
return {
css::beans::PropertyValue("Uri", PROPERTY_HANDLE_URI, css::uno::Any(getUri()), css::beans::PropertyState_DEFAULT_VALUE),
css::beans::PropertyValue("RemoveFile", PROPERTY_HANDLE_REMOVE_FILE, css::uno::Any(getRemoveFile()), css::beans::PropertyState_DEFAULT_VALUE),
css::beans::PropertyValue("ResourceName", PROPERTY_HANDLE_RESOURCE_NAME, css::uno::Any(getResourceName()), css::beans::PropertyState_DEFAULT_VALUE)
css::beans::PropertyValue(u"Uri"_ustr, PROPERTY_HANDLE_URI, css::uno::Any(getUri()), css::beans::PropertyState_DEFAULT_VALUE),
css::beans::PropertyValue(u"RemoveFile"_ustr, PROPERTY_HANDLE_REMOVE_FILE, css::uno::Any(getRemoveFile()), css::beans::PropertyState_DEFAULT_VALUE),
css::beans::PropertyValue(u"ResourceName"_ustr, PROPERTY_HANDLE_RESOURCE_NAME, css::uno::Any(getResourceName()), css::beans::PropertyState_DEFAULT_VALUE)
};
}
void OTempFileService::setPropertyValues( const ::css::uno::Sequence< ::css::beans::PropertyValue >& aProps )
@@ -417,11 +417,11 @@ sal_Bool OTempFileService::supportsService(const OUString& sServiceName)
}
OUString OTempFileService::getImplementationName()
{
return "com.sun.star.io.comp.TempFile";
return u"com.sun.star.io.comp.TempFile"_ustr;
}
css::uno::Sequence< OUString > OTempFileService::getSupportedServiceNames()
{
return { "com.sun.star.io.TempFile" };
return { u"com.sun.star.io.TempFile"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*