ucbhelper/source/client/content.cxx | 20 ++++++++++----------
ucbhelper/source/client/proxydecider.cxx | 2 +-
ucbhelper/source/provider/resultset.cxx | 6 +++---
ucbhelper/source/provider/resultsethelper.cxx | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit f4c7ffc8edf83529550eb3897024792cbb6e48e0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 16 09:28:47 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 16 14:49:15 2024 +0200
loplugin:ostr in ucbhelper
Change-Id: Ic0513708b208ec4cba54eedc15e308410eef8d98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167731
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/ucbhelper/source/client/content.cxx
b/ucbhelper/source/client/content.cxx
index 8feab846baee..cc5fe291febe 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -223,7 +223,7 @@ static Reference< XContentIdentifier >
getContentIdentifierThrow(
ensureContentProviderForURL( rBroker, rURL );
throw ContentCreationException(
- "Unable to create Content Identifier!",
+ u"Unable to create Content Identifier!"_ustr,
Reference< XInterface >(),
ContentCreationError_IDENTIFIER_CREATION_FAILED );
}
@@ -513,8 +513,8 @@ Sequence< Any > Content::setPropertyValues(
{
ucbhelper::cancelCommandExecution(
Any( IllegalArgumentException(
- "Length of property names sequence and value "
- "sequence are unequal!",
+ u"Length of property names sequence and value "
+ "sequence are unequal!"_ustr,
get(),
-1 ) ),
m_xImpl->getEnvironment() );
@@ -851,7 +851,7 @@ Sequence< ContentInfo >
Content::queryCreatableContentsInfo()
// First, try it using "CreatableContentsInfo" property -> the "new" way.
Sequence< ContentInfo > aInfo;
if ( getPropertyValue(
- "CreatableContentsInfo" )
+ u"CreatableContentsInfo"_ustr )
>>= aInfo )
return aInfo;
@@ -930,7 +930,7 @@ bool Content::insertNewContent( const OUString&
rContentType,
Content aNewContent(
xNew, m_xImpl->getEnvironment(), m_xImpl->getComponentContext() );
aNewContent.setPropertyValues( rPropertyNames, rPropertyValues );
- aNewContent.executeCommand( "insert",
+ aNewContent.executeCommand( u"insert"_ustr,
Any(
InsertCommandArgument(
rData.is() ? rData : new
EmptyInputStream,
@@ -958,7 +958,7 @@ void Content::transferContent( const Content&
rSourceContent,
// Execute command "globalTransfer" at UCB.
TransferCommandOperation eTransOp = TransferCommandOperation();
- OUString sCommand( "globalTransfer" );
+ OUString sCommand( u"globalTransfer"_ustr );
bool bCheckIn = false;
switch ( eOperation )
{
@@ -1008,13 +1008,13 @@ void Content::transferContent( const Content&
rSourceContent,
bool Content::isFolder()
{
bool bFolder = false;
- if ( getPropertyValue("IsFolder")
+ if ( getPropertyValue(u"IsFolder"_ustr)
>>= bFolder )
return bFolder;
ucbhelper::cancelCommandExecution(
Any( UnknownPropertyException(
- "Unable to retrieve value of property 'IsFolder'!",
+ u"Unable to retrieve value of property 'IsFolder'!"_ustr,
get() ) ),
m_xImpl->getEnvironment() );
@@ -1025,13 +1025,13 @@ bool Content::isFolder()
bool Content::isDocument()
{
bool bDoc = false;
- if ( getPropertyValue("IsDocument")
+ if ( getPropertyValue(u"IsDocument"_ustr)
>>= bDoc )
return bDoc;
ucbhelper::cancelCommandExecution(
Any( UnknownPropertyException(
- "Unable to retrieve value of property 'IsDocument'!",
+ u"Unable to retrieve value of property 'IsDocument'!"_ustr,
get() ) ),
m_xImpl->getEnvironment() );
diff --git a/ucbhelper/source/client/proxydecider.cxx
b/ucbhelper/source/client/proxydecider.cxx
index 6313937ab19d..cfc10080529e 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -303,7 +303,7 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
uno::Sequence< uno::Any > aArguments{ uno::Any(CONFIG_ROOT_KEY) };
uno::Reference< uno::XInterface > xInterface(
xConfigProv->createInstanceWithArguments(
- "com.sun.star.configuration.ConfigurationAccess",
+ u"com.sun.star.configuration.ConfigurationAccess"_ustr,
aArguments ) );
OSL_ENSURE( xInterface.is(),
diff --git a/ucbhelper/source/provider/resultset.cxx
b/ucbhelper/source/provider/resultset.cxx
index b15430b9099a..71fad0e8381c 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -209,7 +209,7 @@ ResultSet::~ResultSet()
OUString SAL_CALL ResultSet::getImplementationName()
{
- return "ResultSet";
+ return u"ResultSet"_ustr;
}
sal_Bool SAL_CALL ResultSet::supportsService( const OUString& ServiceName )
@@ -1330,7 +1330,7 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld,
sal_uInt32 nNew )
propertyChanged(
beans::PropertyChangeEvent(
getXWeak(),
- "RowCount",
+ u"RowCount"_ustr,
false,
1001,
uno::Any( nOld ), // old value
@@ -1346,7 +1346,7 @@ void ResultSet::rowCountFinal()
propertyChanged(
beans::PropertyChangeEvent(
getXWeak(),
- "IsRowCountFinal",
+ u"IsRowCountFinal"_ustr,
false,
1000,
uno:: Any( false ), // old value
diff --git a/ucbhelper/source/provider/resultsethelper.cxx
b/ucbhelper/source/provider/resultsethelper.cxx
index 788e6811a100..f4e1154f0bce 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -65,7 +65,7 @@ ResultSetImplHelper::~ResultSetImplHelper()
OUString SAL_CALL ResultSetImplHelper::getImplementationName()
{
- return "ResultSetImplHelper";
+ return u"ResultSetImplHelper"_ustr;
}
sal_Bool SAL_CALL ResultSetImplHelper::supportsService( const OUString&
ServiceName )
