Skip to content

C
core
Kaydet (Commit) e8eab43e authored tarafından Philipp Riemer's avatar Philipp Riemer
Dosyalara gözat
Seçenekler

cleanup whitespaces due to RTL_CONSTASCII_USTRINGPARAM removal 

In e2e2cc61 the method was removed
automatically leaving several line breaks etc. as visual noise.
üst cb33531f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 106 deletions
cppuhelper/source/unourl.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -78,8 +78,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
case STATE_NAME0:
if (bEnd || !isAlphanum(c))
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL contains bad descriptor name"));
rtl::OUString("UNO URL contains bad descriptor name"));
nStart = i;
eState = STATE_NAME;
break;
......@@ -93,15 +92,13 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
}
else if (!isAlphanum(c))
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL contains bad descriptor name"));
rtl::OUString("UNO URL contains bad descriptor name"));
break;
case STATE_KEY0:
if (bEnd || !isAlphanum(c))
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL contains bad parameter key"));
rtl::OUString("UNO URL contains bad parameter key"));
nStart = i;
eState = STATE_KEY;
break;
......@@ -115,8 +112,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
}
else if (bEnd || !isAlphanum(c))
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL contains bad parameter key"));
rtl::OUString("UNO URL contains bad parameter key"));
break;
case STATE_VALUE:
......@@ -130,8 +126,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
rtl_UriDecodeWithCharset,
RTL_TEXTENCODING_UTF8))).second)
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL contains duplicated parameter"));
rtl::OUString("UNO URL contains duplicated parameter"));
eState = STATE_KEY0;
}
break;
......@@ -216,14 +211,12 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
{
if (!rUrl.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("uno:"), 0))
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL does not start with \"uno:\""));
rtl::OUString("UNO URL does not start with \"uno:\""));
sal_Int32 i = RTL_CONSTASCII_LENGTH("uno:");
sal_Int32 j = rUrl.indexOf(';', i);
if (j < 0)
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL has too few semicolons"));
rtl::OUString("UNO URL has too few semicolons"));
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< UnoUrlDescriptor::Impl >
xConnection(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i)));
......@@ -232,8 +225,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
j = rUrl.indexOf(0x3B, i); // ';'
if (j < 0)
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL has too few semicolons"));
rtl::OUString("UNO URL has too few semicolons"));
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< UnoUrlDescriptor::Impl >
xProtocol(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i)));
......@@ -241,8 +233,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
i = j + 1;
if (i == rUrl.getLength())
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL contains empty ObjectName"));
rtl::OUString("UNO URL contains empty ObjectName"));
for (j = i; j < rUrl.getLength(); ++j)
{
sal_Unicode c = rUrl.getStr()[j];
......@@ -254,8 +245,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
&& c != 0x3F && c != 0x40 && c != 0x5F // '?', '@', '_'
&& c != 0x7E) // '~'
throw rtl::MalformedUriException(
rtl::OUString(
"UNO URL contains invalid ObjectName"));
rtl::OUString("UNO URL contains invalid ObjectName"));
}
return new Impl(xConnection, xProtocol, rUrl.copy(i));
}
......
cpputools/source/unoexe/unoexe.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -535,14 +535,11 @@ SAL_IMPLEMENT_MAIN()
if (! aUnoUrl.endsWithIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(";uno.ComponentContext") ))
throw RuntimeException(
OUString(
"expected UNO-URL with instance name "
"uno.ComponentContext!" ),
OUString("expected UNO-URL with instance name uno.ComponentContext!" ),
Reference<XInterface>() );
if (bSingleInstance)
throw RuntimeException(
OUString(
"unexpected option --singleinstance!"),
OUString("unexpected option --singleinstance!"),
Reference<XInterface>() );
}
if (!aImplName.isEmpty() && aLocation.isEmpty())
......
javaunohelper/source/vm.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -77,8 +77,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
OUString( "UnoVirtualMachine" ),
css::uno::makeAny( handle ) ) ) );
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
OUString(
"com.sun.star.java.JavaVirtualMachine"),
OUString("com.sun.star.java.JavaVirtualMachine"),
css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext );
}
......@@ -87,8 +86,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
throw (css::uno::Exception)
{
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
OUString(
"com.sun.star.java.JavaVirtualMachine"),
OUString("com.sun.star.java.JavaVirtualMachine"),
args, xContext );
}
......@@ -108,9 +106,7 @@ namespace javaunohelper {
loader );
} catch ( ::jvmaccess::UnoVirtualMachine::CreationException & ) {
throw css::uno::RuntimeException(
OUString(
"jmvaccess::UnoVirtualMachine::CreationException"
" occurred" ),
OUString("jmvaccess::UnoVirtualMachine::CreationException occurred" ),
css::uno::Reference< css::uno::XInterface >() );
}
}
......@@ -121,8 +117,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"),
OUString("/singletons/com.sun.star.java.theJavaVirtualMachine"),
css::uno::makeAny( xFac ), true );
return ::cppu::createComponentContext( &entry, 1, xContext );
}
......
jvmfwk/source/fwkbase.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -322,9 +322,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
for (sal_Int32 i = 1; ; i++)
{
OUString sName =
OUString(UNO_JAVA_JFW_PARAMETER) +
OUString::valueOf(i);
OUString sName = OUString(UNO_JAVA_JFW_PARAMETER) + OUString::valueOf(i);
OUString sValue;
if (Bootstrap::get()->getFrom(sName, sValue) == sal_True)
{
......@@ -361,8 +359,7 @@ OString BootParams::getClasspath()
OUString(UNO_JAVA_JFW_CLASSPATH),
sCP) == sal_True)
{
sClassPath = OUStringToOString(
sCP, osl_getThreadTextEncoding());
sClassPath = OUStringToOString(sCP, osl_getThreadTextEncoding());
#if OSL_DEBUG_LEVEL >=2
fprintf(stderr,"[Java framework] Using bootstrap parameter "
UNO_JAVA_JFW_CLASSPATH " = %s.\n", sClassPath.getStr());
......@@ -517,20 +514,16 @@ JFW_MODE getMode()
bool bDirectMode = true;
OUString sValue;
const rtl::Bootstrap * aBoot = Bootstrap::get();
OUString sJREHome(
UNO_JAVA_JFW_JREHOME);
OUString sJREHome(UNO_JAVA_JFW_JREHOME);
if (aBoot->getFrom(sJREHome, sValue) == sal_False)
{
OUString sEnvJRE(
UNO_JAVA_JFW_ENV_JREHOME);
OUString sEnvJRE(UNO_JAVA_JFW_ENV_JREHOME);
if (aBoot->getFrom(sEnvJRE, sValue) == sal_False)
{
OUString sClasspath(
UNO_JAVA_JFW_CLASSPATH);
OUString sClasspath(UNO_JAVA_JFW_CLASSPATH);
if (aBoot->getFrom(sClasspath, sValue) == sal_False)
{
OUString sEnvClasspath(
UNO_JAVA_JFW_ENV_CLASSPATH);
OUString sEnvClasspath(UNO_JAVA_JFW_ENV_CLASSPATH);
if (aBoot->getFrom(sEnvClasspath, sValue) == sal_False)
{
OUString sParams = OUString(
......
sc/source/ui/docshell/docsh8.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -336,20 +336,16 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet
uno::Any aAny;
aAny <<= xConnection;
xRowProp->setPropertyValue(
OUString(SC_DBPROP_ACTIVECONNECTION), aAny );
xRowProp->setPropertyValue( OUString(SC_DBPROP_ACTIVECONNECTION), aAny );
aAny <<= nType;
xRowProp->setPropertyValue(
OUString(SC_DBPROP_COMMANDTYPE), aAny );
xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMANDTYPE), aAny );
aAny <<= OUString( aTabName );
xRowProp->setPropertyValue(
OUString(SC_DBPROP_COMMAND), aAny );
xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMAND), aAny );
aAny <<= false;
xRowProp->setPropertyValue(
OUString(SC_DBPROP_PROPCHANGE_NOTIFY), aAny );
xRowProp->setPropertyValue( OUString(SC_DBPROP_PROPCHANGE_NOTIFY), aAny );
xRowSet->execute();
......@@ -934,16 +930,13 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS
if (!xRowProp.is()) return SCERR_EXPORT_CONNECT;
aAny <<= xConnection;
xRowProp->setPropertyValue(
OUString(SC_DBPROP_ACTIVECONNECTION), aAny );
xRowProp->setPropertyValue( OUString(SC_DBPROP_ACTIVECONNECTION), aAny );
aAny <<= (sal_Int32) sdb::CommandType::TABLE;
xRowProp->setPropertyValue(
OUString(SC_DBPROP_COMMANDTYPE), aAny );
xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMANDTYPE), aAny );
aAny <<= OUString( aTabName );
xRowProp->setPropertyValue(
OUString(SC_DBPROP_COMMAND), aAny );
xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMAND), aAny );
xRowSet->execute();
......
scripting/source/inc/util/scriptingconstants.hxx
Dosyayı görüntüle @ e8eab43e
......@@ -54,11 +54,9 @@ private:
ScriptingConstantsPool& operator = ( const ScriptingConstantsPool & );
ScriptingConstantsPool()
: DOC_REF( "SCRIPTING_DOC_REF" ),
DOC_STORAGE_ID(
"SCRIPTING_DOC_STORAGE_ID" ),
DOC_STORAGE_ID( "SCRIPTING_DOC_STORAGE_ID" ),
DOC_URI( "SCRIPTING_DOC_URI" ),
RESOLVED_STORAGE_ID(
"SCRIPTING_RESOLVED_STORAGE_ID" ),
RESOLVED_STORAGE_ID( "SCRIPTING_RESOLVED_STORAGE_ID" ),
SCRIPT_INFO( "SCRIPT_INFO" ),
SCRIPTSTORAGEMANAGER_SERVICE(
"/singletons/com.sun.star.script.framework.storage.theScriptStorageManager" ),
......
stoc/source/javavm/javavm.cxx
Dosyayı görüntüle @ e8eab43e
This diff is collapsed.
stoc/source/registry_tdprovider/tdservice.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -337,8 +337,7 @@ ServiceTypeDescriptionImpl::getConstructors() throw (RuntimeException) {
|| reader.getMethodExceptionCount(i) != 0)))
{
throw RuntimeException(
OUString(
"Service has bad constructors"),
OUString("Service has bad constructors"),
static_cast< OWeakObject * >(this));
}
(*ctors)[i] = new Constructor(
......@@ -364,8 +363,7 @@ void ServiceTypeDescriptionImpl::getReferences()
sal_uInt16 superTypes = aReader.getSuperTypeCount();
if (superTypes > 1) {
throw RuntimeException(
OUString(
"Service has more than one supertype"),
OUString("Service has more than one supertype"),
static_cast< OWeakObject * >(this));
}
if (superTypes == 1) {
......@@ -373,9 +371,8 @@ void ServiceTypeDescriptionImpl::getReferences()
if ( aReader.getReferenceCount() != 0
|| aReader.getFieldCount() != 0 )
throw RuntimeException(
OUString(
"Service is single-interface--based but also has"
" references and/or properties" ),
OUString("Service is single-interface--based but also has"
" references and/or properties" ),
static_cast< OWeakObject * >( this ) );
Reference< XTypeDescription > ifc;
try
......@@ -385,17 +382,15 @@ void ServiceTypeDescriptionImpl::getReferences()
catch ( NoSuchElementException const & e )
{
throw RuntimeException(
OUString(
"com.sun.star.container.NoSuchElementException: " )
OUString("com.sun.star.container.NoSuchElementException: " )
+ e.Message,
static_cast< OWeakObject * >( this ) );
}
OSL_ASSERT(ifc.is());
if (resolveTypedefs(ifc)->getTypeClass() != TypeClass_INTERFACE) {
throw RuntimeException(
OUString(
"Single-interface--based service is not based on"
" interface type" ),
OUString("Single-interface--based service is not based on"
" interface type" ),
static_cast< OWeakObject * >( this ) );
}
MutexGuard guard(getMutex());
......@@ -437,9 +432,7 @@ void ServiceTypeDescriptionImpl::getReferences()
catch ( NoSuchElementException const & e )
{
throw RuntimeException(
OUString(
"com.sun.star.container."
"NoSuchElementException: " )
OUString("com.sun.star.container.NoSuchElementException: " )
+ e.Message,
static_cast< OWeakObject * >( this ) );
}
......@@ -450,8 +443,7 @@ void ServiceTypeDescriptionImpl::getReferences()
// optional service
if ( !( aTypeDesc >>= aOptionalServices[ nOS ] ) )
throw RuntimeException(
OUString(
"Service 'export' is not a service" ),
OUString("Service 'export' is not a service" ),
static_cast< OWeakObject * >( this ) );
nOS++;
}
......@@ -460,8 +452,7 @@ void ServiceTypeDescriptionImpl::getReferences()
// mandatory service
if ( !( aTypeDesc >>= aMandatoryServices[ nMS ] ) )
throw RuntimeException(
OUString(
"Service 'export' is not a service" ),
OUString("Service 'export' is not a service" ),
static_cast< OWeakObject * >( this ) );
nMS++;
}
......@@ -479,9 +470,7 @@ void ServiceTypeDescriptionImpl::getReferences()
catch ( NoSuchElementException const & e )
{
throw RuntimeException(
OUString(
"com.sun.star.container."
"NoSuchElementException: " )
OUString("com.sun.star.container.NoSuchElementException: " )
+ e.Message,
static_cast< OWeakObject * >( this ) );
}
......@@ -492,9 +481,8 @@ void ServiceTypeDescriptionImpl::getReferences()
// optional interface
if ( !( aTypeDesc >>= aOptionalInterfaces[ nOI ] ) )
throw RuntimeException(
OUString(
"Service 'supports' is not an"
" interface" ),
OUString("Service 'supports' is not an"
" interface" ),
static_cast< OWeakObject * >( this ) );
nOI++;
}
......@@ -503,9 +491,8 @@ void ServiceTypeDescriptionImpl::getReferences()
// mandatory interface
if ( !( aTypeDesc >>= aMandatoryInterfaces[ nMI ] ) )
throw RuntimeException(
OUString(
"Service 'supports' is not an"
" interface" ),
OUString("Service 'supports' is not an"
" interface" ),
static_cast< OWeakObject * >( this ) );
nMI++;
}
......
sw/source/ui/vba/vbarows.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -260,9 +260,8 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
if ((nNewWidth <= 0) || (nWidth <= 0))
{
throw uno::RuntimeException(
OUString(
"Pb with width, in SwVbaRows::setIndentWithAdjustProportional (nNewWidth <= 0) || (nWidth <= 0)"
),
OUString("Pb with width, in SwVbaRows::setIndentWithAdjustProportional "
"(nNewWidth <= 0) || (nWidth <= 0)"),
uno::Reference< uno::XInterface >()
);
}
......
xmlreader/source/xmlreader.cxx
Dosyayı görüntüle @ e8eab43e
This diff is collapsed.
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -99,14 +99,14 @@ void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {
m_nODF = nTmp;
else
throw uno::RuntimeException(
OUString(
"[xmlsecurity]SaveODFItem::SaveODFItem(): Wrong Type!"), 0 );
OUString("[xmlsecurity]SaveODFItem::SaveODFItem(): Wrong Type!"),
0 );
}
else
throw uno::RuntimeException(
OUString(
"[xmlsecurity] Could not open property Office.Common/Save/ODF/DefaultVersion"), 0);
OUString("[xmlsecurity] Could not open property Office.Common/Save/ODF/DefaultVersion"),
0);
}
}
......
xmlsecurity/source/framework/encryptionengine.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -112,8 +112,7 @@ void EncryptionEngine::tryToPerform( )
{
if (checkReady())
{
const OUString sEncryptionTemplate (
ENCRYPTION_TEMPLATE );
const OUString sEncryptionTemplate ( ENCRYPTION_TEMPLATE );
cssu::Reference < cssxc::XXMLEncryptionTemplate > xEncryptionTemplate(
mxMSF->createInstance( sEncryptionTemplate ), cssu::UNO_QUERY );
......
xmlsecurity/source/framework/signatureengine.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -113,8 +113,7 @@ void SignatureEngine::tryToPerform( )
{
if (checkReady())
{
const OUString ouSignatureTemplate (
SIGNATURE_TEMPLATE );
const OUString ouSignatureTemplate ( SIGNATURE_TEMPLATE );
cssu::Reference < cssxc::XXMLSignatureTemplate >
xSignatureTemplate( mxMSF->createInstance( ouSignatureTemplate ), cssu::UNO_QUERY );
......
xmlsecurity/source/framework/signatureverifierimpl.cxx
Dosyayı görüntüle @ e8eab43e
......@@ -173,8 +173,7 @@ void SAL_CALL SignatureVerifierImpl::initialize(
OUString SignatureVerifierImpl_getImplementationName ()
throw (cssu::RuntimeException)
{
return OUString(
IMPLEMENTATION_NAME );
return OUString( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment