[Libreoffice-commits] .: 9 commits - basic/source desktop/source extensions/source fileaccess/source odk/examples svx/source sw/source unodevtools/source unoxml/source writerfilter/unocomponent
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 2 15:57:24 PDT 2012
basic/source/classes/errobject.cxx | 4
basic/source/classes/sbunoobj.cxx | 68 +--
basic/source/classes/sbxmod.cxx | 44 +-
basic/source/runtime/iosys.cxx | 6
basic/source/runtime/methods.cxx | 14
basic/source/runtime/methods1.cxx | 30 -
basic/source/uno/scriptcont.cxx | 44 +-
desktop/source/app/app.cxx | 183 ++++------
desktop/source/app/appfirststart.cxx | 12
desktop/source/app/appinit.cxx | 23 -
desktop/source/app/check_ext_deps.cxx | 18
desktop/source/app/cmdlineargs.cxx | 6
desktop/source/app/officeipcthread.cxx | 18
desktop/source/app/userinstall.cxx | 2
desktop/source/deployment/registry/help/dp_help.cxx | 26 -
desktop/source/deployment/registry/package/dp_package.cxx | 6
desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx | 2
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 2
desktop/source/offacc/acceptor.cxx | 16
extensions/source/scanner/sane.cxx | 6
fileaccess/source/FileAccess.cxx | 41 --
odk/examples/cpp/complextoolbarcontrols/exports.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/gallery2/gallery1.cxx | 12
svx/source/gallery2/galmisc.cxx | 12
svx/source/gallery2/galtheme.cxx | 4
svx/source/stbctrls/modctrl.cxx | 2
svx/source/tbxctrls/layctrl.cxx | 10
sw/source/ui/docvw/AnnotationWin.cxx | 10
sw/source/ui/fldui/fldmgr.cxx | 6
sw/source/ui/uno/swdetect.cxx | 26 -
sw/source/ui/uno/unomod.cxx | 9
sw/source/ui/vba/vbalisthelper.cxx | 74 ++--
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 26 -
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 14
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 17
unoxml/source/rdf/CBlankNode.cxx | 18
unoxml/source/rdf/CLiteral.cxx | 30 -
unoxml/source/rdf/CURI.cxx | 39 +-
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx | 6
40 files changed, 434 insertions(+), 458 deletions(-)
New commits:
commit bcce59d5ffa3c3b17f0894347d7138e126782952
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 17:55:00 2012 -0500
targeted string re-work
Change-Id: Ic547a05d2540a9fb70a38b3717cb4e87726a74a5
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 0a93718..0f296cd 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -101,15 +101,15 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star:
{
if (aArguments.getLength() != 1) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CBlankNode::initialize: "
- "must give exactly 1 argument")), *this, 1);
+ ::rtl::OUString("CBlankNode::initialize: "
+ "must give exactly 1 argument"), *this, 1);
}
::rtl::OUString arg;
if (!(aArguments[0] >>= arg)) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CBlankNode::initialize: "
- "argument must be string")), *this, 0);
+ ::rtl::OUString("CBlankNode::initialize: "
+ "argument must be string"), *this, 0);
}
//FIXME: what is legal?
@@ -117,8 +117,8 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star:
m_NodeID = arg;
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CBlankNode::initialize: "
- "argument is not valid blank node ID")), *this, 0);
+ ::rtl::OUString("CBlankNode::initialize: "
+ "argument is not valid blank node ID"), *this, 0);
}
}
@@ -136,15 +136,13 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star:
namespace comp_CBlankNode {
::rtl::OUString SAL_CALL _getImplementationName() {
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "CBlankNode"));
+ return ::rtl::OUString( "CBlankNode");
}
css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.rdf.BlankNode"));
+ s[0] = ::rtl::OUString( "com.sun.star.rdf.BlankNode");
return s;
}
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 38e585f..16dbff3 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -111,23 +111,23 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u
const sal_Int32 len( aArguments.getLength() );
if (len < 1 || len > 2) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
- "must give 1 or 2 argument(s)")), *this, 2);
+ ::rtl::OUString("CLiteral::initialize: "
+ "must give 1 or 2 argument(s)"), *this, 2);
}
::rtl::OUString arg0;
if (!(aArguments[0] >>= arg0)) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
- "argument must be string")), *this, 0);
+ ::rtl::OUString("CLiteral::initialize: "
+ "argument must be string"), *this, 0);
}
//FIXME: what is legal?
if (true) {
m_Value = arg0;
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
- "argument is not valid literal value")), *this, 0);
+ ::rtl::OUString("CLiteral::initialize: "
+ "argument is not valid literal value"), *this, 0);
}
if (len > 1) {
@@ -138,21 +138,21 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u
m_Language = arg1;
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
- "argument is not valid language")), *this, 1);
+ ::rtl::OUString("CLiteral::initialize: "
+ "argument is not valid language"), *this, 1);
}
} else if ((aArguments[1] >>= xURI)) {
if (xURI.is()) {
m_xDatatype = xURI;
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
- "argument is null")), *this, 1);
+ ::rtl::OUString("CLiteral::initialize: "
+ "argument is null"), *this, 1);
}
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
- "argument must be string or URI")), *this, 1);
+ ::rtl::OUString("CLiteral::initialize: "
+ "argument must be string or URI"), *this, 1);
}
}
}
@@ -199,15 +199,13 @@ css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (cs
namespace comp_CLiteral {
::rtl::OUString SAL_CALL _getImplementationName() {
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "CLiteral"));
+ return ::rtl::OUString( "CLiteral");
}
css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.rdf.Literal"));
+ s[0] = ::rtl::OUString( "com.sun.star.rdf.Literal");
return s;
}
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index fe40ddb..f657f73 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -738,8 +738,8 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant)
default:
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "invalid URIs constant argument")), *this, 0);
+ ::rtl::OUString("CURI::initialize: "
+ "invalid URIs constant argument"), *this, 0);
}
m_Namespace = ::rtl::OUString::createFromAscii(ns).intern();
m_LocalName = ::rtl::OUString::createFromAscii(ln).intern();
@@ -752,8 +752,8 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
sal_Int32 len = aArguments.getLength();
if ((len < 1) || (len > 2)) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "must give 1 or 2 argument(s)")), *this, 2);
+ ::rtl::OUString("CURI::initialize: "
+ "must give 1 or 2 argument(s)"), *this, 2);
}
sal_Int16 arg(0);
@@ -763,22 +763,22 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
// integer argument: constant from rdf::URIs
if (len != 1) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "must give 1 int argument")), *this, 1);
+ ::rtl::OUString("CURI::initialize: "
+ "must give 1 int argument"), *this, 1);
}
initFromConstant(arg);
return;
}
if (!(aArguments[0] >>= arg0)) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "argument must be string or short")), *this, 0);
+ ::rtl::OUString("CURI::initialize: "
+ "argument must be string or short"), *this, 0);
}
if (len > 1) {
if (!(aArguments[1] >>= arg1)) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "argument must be string")), *this, 1);
+ ::rtl::OUString("CURI::initialize: "
+ "argument must be string"), *this, 1);
}
// just append the parameters and then split them again; seems simplest
arg0 = arg0 + arg1;
@@ -798,8 +798,8 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
}
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "argument not splittable: no separator [#/:]")), *this, 0);
+ ::rtl::OUString("CURI::initialize: "
+ "argument not splittable: no separator [#/:]"), *this, 0);
}
//FIXME: what is legal?
@@ -807,16 +807,16 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
m_Namespace = arg0;
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "argument is not valid namespace")), *this, 0);
+ ::rtl::OUString("CURI::initialize: "
+ "argument is not valid namespace"), *this, 0);
}
//FIXME: what is legal?
if (true) {
m_LocalName = arg1;
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
- "argument is not valid local name")), *this, 1);
+ ::rtl::OUString("CURI::initialize: "
+ "argument is not valid local name"), *this, 1);
}
}
@@ -845,15 +845,14 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
namespace comp_CURI {
::rtl::OUString SAL_CALL _getImplementationName() {
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "CURI"));
+ return ::rtl::OUString(
+ "CURI");
}
css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.rdf.URI"));
+ s[0] = ::rtl::OUString( "com.sun.star.rdf.URI");
return s;
}
commit 11ccf6b59c4db4673718ca2b3b24d4623ac5e406
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 17:48:23 2012 -0500
targeted string re-work
Change-Id: I9d0b124450af7743991c5f0b80de68383b814345
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index d61c058..632bb9d 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -299,15 +299,14 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource,
{
xPropSet->getPropertyValue(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) )
+ "DefaultContext" ) )
>>= xCtx;
}
Reference< XMacroExpander > xExpander;
xCtx->getValueByName(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "/singletons/com.sun.star.util.theMacroExpander" ) ) )
+ rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) )
>>= xExpander;
OSL_ENSURE( xExpander.is(),
@@ -319,10 +318,8 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource,
catch ( Exception const & )
{
throw RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "OFileAccess::transferrImpl - Unable to obtain "
- "destination folder URL!" ) ),
+ rtl::OUString( "OFileAccess::transferrImpl - Unable to obtain "
+ "destination folder URL!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -331,10 +328,8 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource,
}
throw RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "OFileAccess::transferrImpl - Unable to obtain "
- "destination folder URL!" ) ),
+ rtl::OUString( "OFileAccess::transferrImpl - Unable to obtain "
+ "destination folder URL!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -377,7 +372,7 @@ void OFileAccess::kill( const rtl::OUString& FileURL )
ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
try
{
- aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "delete" )), makeAny( sal_Bool( sal_True ) ) );
+ aCnt.executeCommand( rtl::OUString("delete" ), makeAny( sal_Bool( sal_True ) ) );
}
catch ( ::com::sun::star::ucb::CommandFailedException const & )
{
@@ -404,7 +399,7 @@ sal_Bool OFileAccess::isReadOnly( const rtl::OUString& FileURL )
{
INetURLObject aURLObj( FileURL, INET_PROT_FILE );
ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
- Any aRetAny = aCnt.getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ) );
+ Any aRetAny = aCnt.getPropertyValue( rtl::OUString( "IsReadOnly" ) );
sal_Bool bRet = sal_False;
aRetAny >>= bRet;
return bRet;
@@ -417,7 +412,7 @@ void OFileAccess::setReadOnly( const rtl::OUString& FileURL, sal_Bool bReadOnly
ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
Any aAny;
aAny <<= bReadOnly;
- aCnt.setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ), aAny );
+ aCnt.setPropertyValue( rtl::OUString( "IsReadOnly" ), aAny );
}
void OFileAccess::createFolder( const rtl::OUString& NewFolderURL )
@@ -466,7 +461,7 @@ void OFileAccess::createFolder( const rtl::OUString& NewFolderURL )
Sequence<rtl::OUString> aNames(1);
rtl::OUString* pNames = aNames.getArray();
- pNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
+ pNames[0] = rtl::OUString( "Title" );
Sequence< Any > aValues(1);
Any* pValues = aValues.getArray();
pValues[0] = makeAny( rtl::OUString( aTitle ) );
@@ -497,7 +492,7 @@ sal_Int32 OFileAccess::getSize( const rtl::OUString& FileURL )
sal_Int64 nTemp = 0;
INetURLObject aObj( FileURL, INET_PROT_FILE );
ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
- aCnt.getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )) ) >>= nTemp;
+ aCnt.getPropertyValue( rtl::OUString("Size" ) ) >>= nTemp;
nSize = (sal_Int32)nTemp;
return nSize;
}
@@ -521,7 +516,7 @@ DateTime OFileAccess::getDateTimeModified( const rtl::OUString& FileURL )
Reference< XCommandEnvironment > aCmdEnv;
ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
- aYoung.getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDateTime;
+ aYoung.getPropertyValue( rtl::OUString("DateModified" ) ) >>= aDateTime;
return aDateTime;
}
@@ -663,7 +658,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const rtl::OUString& FileUR
try
{
- aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "open" )), aCmdArg );
+ aCnt.executeCommand( rtl::OUString("open" ), aCmdArg );
}
catch ( InteractiveIOException const & e )
{
@@ -681,7 +676,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const rtl::OUString& FileUR
aInsertArg.ReplaceExisting = sal_False;
aCmdArg <<= aInsertArg;
- aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "insert" )), aCmdArg );
+ aCnt.executeCommand( rtl::OUString("insert" ), aCmdArg );
// Retry...
return openFileReadWrite( FileURL );
@@ -740,7 +735,7 @@ bool OFileAccess::createNewFile( const rtl::OUString & rParentURL,
Sequence<rtl::OUString> aNames(1);
rtl::OUString* pNames = aNames.getArray();
pNames[0] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
+ "Title" );
Sequence< Any > aValues(1);
Any* pValues = aValues.getArray();
pValues[0] = makeAny( rtl::OUString( rTitle ) );
@@ -821,7 +816,7 @@ sal_Bool OFileAccess::isHidden( const ::rtl::OUString& FileURL )
{
INetURLObject aURLObj( FileURL, INET_PROT_FILE );
ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
- Any aRetAny = aCnt.getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ) );
+ Any aRetAny = aCnt.getPropertyValue( rtl::OUString( "IsHidden" ) );
sal_Bool bRet = sal_False;
aRetAny >>= bRet;
return bRet;
@@ -834,7 +829,7 @@ void OFileAccess::setHidden( const ::rtl::OUString& FileURL, sal_Bool bHidden )
ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
Any aAny;
aAny <<= bHidden;
- aCnt.setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ), aAny );
+ aCnt.setPropertyValue( rtl::OUString( "IsHidden" ), aAny );
}
//==================================================================================================
@@ -850,7 +845,7 @@ Reference< XInterface > SAL_CALL FileAccess_CreateInstance( const Reference< XMu
Sequence< rtl::OUString > FileAccess_getSupportedServiceNames()
{
Sequence< rtl::OUString > seqNames(1);
- seqNames.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ));
+ seqNames.getArray()[0] = rtl::OUString(SERVICE_NAME );
return seqNames;
}
commit aca92397245389e93de25a779bfdc6bb7f03ceee
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 17:46:27 2012 -0500
targeted string re-work
Change-Id: Ia651a93951da514105183775a5f49d031a192937
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index b3c06df..f6736ae 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -165,7 +165,7 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any
::rtl::OUString SAL_CALL
ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException)
{
- static rtl::OUString sDfltPropName( RTL_CONSTASCII_USTRINGPARAM("Number") );
+ static rtl::OUString sDfltPropName( "Number" );
return sDfltPropName;
}
@@ -173,7 +173,7 @@ void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const u
throw (uno::RuntimeException)
{
if ( !Number.hasValue() )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Missing Required Paramater")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Missing Required Paramater"), uno::Reference< uno::XInterface >() );
Number >>= m_nNumber;
Description >>= m_sDescription;
Source >>= m_sSource;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 2fe5d8b..1a38e04 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -182,7 +182,7 @@ Reference< XComponentContext > getComponentContext_Impl( void )
if (xProps.is())
{
xProps->getPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext;
+ ::rtl::OUString( "DefaultContext" ) ) >>= xContext;
OSL_ASSERT( xContext.is() );
}
}
@@ -201,14 +201,14 @@ Reference< XIdlReflection > getCoreReflection_Impl( void )
if( xContext.is() )
{
xContext->getValueByName(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection") ) )
+ ::rtl::OUString( "/singletons/com.sun.star.reflection.theCoreReflection" ) )
>>= xCoreReflection;
OSL_ENSURE( xCoreReflection.is(), "### CoreReflection singleton not accessable!?" );
}
if( !xCoreReflection.is() )
{
throw DeploymentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessable") ),
+ ::rtl::OUString( "/singletons/com.sun.star.reflection.theCoreReflection singleton not accessable" ),
Reference< XInterface >() );
}
}
@@ -244,7 +244,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void )
if( xContext.is() )
{
xContext->getValueByName(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theTypeDescriptionManager") ) )
+ ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) )
>>= xAccess;
OSL_ENSURE( xAccess.is(), "### TypeDescriptionManager singleton not accessable!?" );
}
@@ -273,7 +273,7 @@ Reference< XTypeConverter > getTypeConverter_Impl( void )
Reference<XMultiComponentFactory> xSMgr = xContext->getServiceManager();
xTypeConverter = Reference<XTypeConverter>(
xSMgr->createInstanceWithContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")),
+ ::rtl::OUString( "com.sun.star.script.Converter"),
xContext ), UNO_QUERY );
}
if( !xTypeConverter.is() )
@@ -304,7 +304,7 @@ SbUnoObject* createOLEObject_Impl( const ::rtl::OUString& aType )
Reference<XMultiComponentFactory> xSMgr = xContext->getServiceManager();
xOLEFactory = Reference<XMultiServiceFactory>(
xSMgr->createInstanceWithContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.OleObjectFactory")),
+ ::rtl::OUString( "com.sun.star.bridge.OleObjectFactory"),
xContext ), UNO_QUERY );
}
}
@@ -315,7 +315,7 @@ SbUnoObject* createOLEObject_Impl( const ::rtl::OUString& aType )
// some type names available in VBA can not be directly used in COM
::rtl::OUString aOLEType = aType;
if ( aOLEType == "SAXXMLReader30" )
- aOLEType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Msxml2.SAXXMLReader.3.0" ) );
+ aOLEType = ::rtl::OUString( "Msxml2.SAXXMLReader.3.0" );
Reference< XInterface > xOLEObject = xOLEFactory->createInstance( aOLEType );
if( xOLEObject.is() )
@@ -390,7 +390,7 @@ Any convertAny( const Any& rVal, const Type& aDestType )
catch( const CannotConvertException& e2 )
{
::rtl::OUString aCannotConvertExceptionName
- ( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.IllegalArgumentException" ) );
+ ( "com.sun.star.lang.IllegalArgumentException" );
StarBASIC::Error( ERRCODE_BASIC_EXCEPTION,
implGetExceptionMsg( e2, aCannotConvertExceptionName ) );
return aConvertedVal;
@@ -1709,7 +1709,7 @@ rtl::OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Ref
{
::rtl::OUString aName = getDbgObjectNameImpl( pUnoObj );
if( aName.isEmpty() )
- aName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown"));
+ aName += ::rtl::OUString("Unknown");
::rtl::OUStringBuffer aRet;
if( aName.getLength() > 20 )
@@ -1786,7 +1786,7 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass )
if ( xInv.is() )
{
rtl::OUString sTypeName;
- xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sTypeName;
+ xInv->getValue( rtl::OUString( "$GetTypeName" ) ) >>= sTypeName;
if ( sTypeName.isEmpty() || sTypeName == "IDispatch" )
// can't check type, leave it pass
result = true;
@@ -2349,8 +2349,8 @@ SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ )
static Reference< XIntrospection > xIntrospection;
// beat out again the default properties of Sbx
- Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Name") ), SbxCLASS_DONTCARE );
- Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Parent") ), SbxCLASS_DONTCARE );
+ Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Name")), SbxCLASS_DONTCARE );
+ Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Parent")), SbxCLASS_DONTCARE );
// check the type of the ojekts
TypeClass eType = aUnoObj_.getValueType().getTypeClass();
@@ -2448,7 +2448,7 @@ void SbUnoObject::doIntrospection( void )
Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
if ( xFactory.is() )
{
- Reference< XInterface > xI = xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) );
+ Reference< XInterface > xI = xFactory->createInstance( rtl::OUString("com.sun.star.beans.Introspection") );
if (xI.is())
xIntrospection = Reference< XIntrospection >::query( xI );
}
@@ -2802,15 +2802,15 @@ void SbUnoObject::implCreateDbgProperties( void )
Property aProp;
// Id == -1: display the implemented interfaces corresponding the ClassProvider
- SbxVariableRef xVarRef = new SbUnoProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_SUPPORTEDINTERFACES)), SbxSTRING, SbxSTRING, aProp, -1, false );
+ SbxVariableRef xVarRef = new SbUnoProperty( ::rtl::OUString(ID_DBG_SUPPORTEDINTERFACES), SbxSTRING, SbxSTRING, aProp, -1, false );
QuickInsert( (SbxVariable*)xVarRef );
// Id == -2: output the properties
- xVarRef = new SbUnoProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_PROPERTIES)), SbxSTRING, SbxSTRING, aProp, -2, false );
+ xVarRef = new SbUnoProperty( ::rtl::OUString(ID_DBG_PROPERTIES), SbxSTRING, SbxSTRING, aProp, -2, false );
QuickInsert( (SbxVariable*)xVarRef );
// Id == -3: output the Methods
- xVarRef = new SbUnoProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_METHODS)), SbxSTRING, SbxSTRING, aProp, -3, false );
+ xVarRef = new SbUnoProperty( ::rtl::OUString(ID_DBG_METHODS), SbxSTRING, SbxSTRING, aProp, -3, false );
QuickInsert( (SbxVariable*)xVarRef );
}
@@ -3108,7 +3108,7 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_B
aAny <<= xFactory;
// Create a SbUnoObject out of it and return it
- SbUnoObjectRef xUnoObj = new SbUnoObject( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProcessServiceManager") ), aAny );
+ SbUnoObjectRef xUnoObj = new SbUnoObject( ::rtl::OUString( "ProcessServiceManager" ), aAny );
refVar->PutObject( (SbUnoObject*)xUnoObj );
}
else
@@ -3428,7 +3428,7 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t )
{
// expand fully qualified name
::rtl::OUString aNewName = GetName();
- aNewName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
+ aNewName += ::rtl::OUString(".");
aNewName += rName;
// get CoreReflection
@@ -3569,7 +3569,7 @@ SbxVariable* SbUnoService::Find( const String& rName, SbxClassType )
if( aName.isEmpty() )
{
if( xCtor->isDefaultConstructor() )
- aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("create"));
+ aName = ::rtl::OUString("create");
}
if( !aName.isEmpty() )
@@ -3707,7 +3707,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
else
{
Reference < XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- xContext.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) ), UNO_QUERY_THROW );
+ xContext.set( xProps->getPropertyValue( rtl::OUString( "DefaultContext" ) ), UNO_QUERY_THROW );
}
Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() );
@@ -3813,7 +3813,7 @@ SbUnoSingleton::SbUnoSingleton( const ::rtl::OUString& aName_,
, m_xSingletonTypeDesc( xSingletonTypeDesc )
{
SbxVariableRef xGetMethodRef =
- new SbxMethod( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "get" ) ), SbxOBJECT );
+ new SbxMethod( ::rtl::OUString( "get" ), SbxOBJECT );
QuickInsert( (SbxVariable*)xGetMethodRef );
}
@@ -3841,7 +3841,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( !xContextToUse.is() )
{
Reference < XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- xContextToUse.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) ), UNO_QUERY_THROW );
+ xContextToUse.set( xProps->getPropertyValue( rtl::OUString( "DefaultContext" ) ), UNO_QUERY_THROW );
--nAllowedParamCount;
}
@@ -3854,7 +3854,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
Any aRetAny;
if( xContextToUse.is() )
{
- ::rtl::OUString aSingletonName( RTL_CONSTASCII_USTRINGPARAM("/singletons/") );
+ ::rtl::OUString aSingletonName( "/singletons/" );
aSingletonName += GetName();
Reference < XInterface > xRet;
xContextToUse->getValueByName( aSingletonName ) >>= xRet;
@@ -4172,7 +4172,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite
// From 1999-11-30: get the InvocationAdapterFactory
Reference< XInvocationAdapterFactory > xInvocationAdapterFactory = Reference< XInvocationAdapterFactory >(
- xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ), UNO_QUERY );
+ xFactory->createInstance( rtl::OUString("com.sun.star.script.InvocationAdapterFactory") ), UNO_QUERY );
BasicAllListener_Impl * p;
Reference< XAllListener > xAllLst = p = new BasicAllListener_Impl( aPrefixName );
@@ -4215,10 +4215,10 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWr
if( xPSMPropertySet.is() )
{
Any aContextAny = xPSMPropertySet->getPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) );
+ ::rtl::OUString( "DefaultContext" ) );
SbUnoObjectRef xUnoObj = new SbUnoObject
- ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ),
+ ( ::rtl::OUString( "DefaultContext" ),
aContextAny );
refVar->PutObject( (SbUnoObject*)xUnoObj );
}
@@ -4236,7 +4236,7 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite
(void)pBasic;
(void)bWrite;
- static rtl::OUString aTypeTypeString( RTL_CONSTASCII_USTRINGPARAM("type") );
+ static rtl::OUString aTypeTypeString( "type" );
// 2 parameters needed
if ( rPar.Count() != 3 )
@@ -4294,7 +4294,7 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite
catch( const NoSuchElementException& e1 )
{
::rtl::OUString aNoSuchElementExceptionName
- ( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.NoSuchElementException" ) );
+ ( "com.sun.star.container.NoSuchElementException" );
StarBASIC::Error( ERRCODE_BASIC_EXCEPTION,
implGetExceptionMsg( e1, aNoSuchElementExceptionName ) );
return;
@@ -4364,7 +4364,7 @@ public:
};
ModuleInvocationProxy::ModuleInvocationProxy( const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj )
- : m_aPrefix( aPrefix + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") ) )
+ : m_aPrefix( aPrefix + ::rtl::OUString( "_" ) )
, m_xScopeObj( xScopeObj )
, m_aListeners( m_aMutex )
{
@@ -4383,7 +4383,7 @@ void SAL_CALL ModuleInvocationProxy::setValue( const ::rtl::OUString& rProperty,
SolarMutexGuard guard;
- ::rtl::OUString aPropertyFunctionName( RTL_CONSTASCII_USTRINGPARAM( "Property Set ") );
+ ::rtl::OUString aPropertyFunctionName( "Property Set " );
aPropertyFunctionName += m_aPrefix;
aPropertyFunctionName += rProperty;
@@ -4421,7 +4421,7 @@ Any SAL_CALL ModuleInvocationProxy::getValue( const ::rtl::OUString& rProperty )
SolarMutexGuard guard;
- ::rtl::OUString aPropertyFunctionName( RTL_CONSTASCII_USTRINGPARAM( "Property Get ") );
+ ::rtl::OUString aPropertyFunctionName( "Property Get " );
aPropertyFunctionName += m_aPrefix;
aPropertyFunctionName += rProperty;
@@ -4562,7 +4562,7 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
try
{
xRet = xServiceMgr->createInstanceWithArgumentsAndContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.custom.UnoComListener")),
+ ::rtl::OUString( "com.sun.star.custom.UnoComListener"),
args, xContext );
}
catch( const Exception& )
@@ -4675,7 +4675,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
Reference< XSingleServiceFactory > xComImplementsFactory
(
xServiceMgr->createInstanceWithContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.custom.ComImplementsFactory")), xContext ),
+ ::rtl::OUString( "com.sun.star.custom.ComImplementsFactory"), xContext ),
UNO_QUERY
);
if( !xComImplementsFactory.is() )
@@ -4757,7 +4757,7 @@ bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal )
// Only for native COM objects
if( pUnoObj->isNativeCOMObject() )
{
- SbxVariableRef pMeth = pObj->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "toString" ) ), SbxCLASS_METHOD );
+ SbxVariableRef pMeth = pObj->Find( ::rtl::OUString( "toString" ), SbxCLASS_METHOD );
if ( pMeth.Is() )
{
SbxValues aRes;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 87928cf..a676fc8 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -172,7 +172,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV
Reference< XComponentContext > xCtx;
xPSMPropertySet->getPropertyValue(
String( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xCtx;
- Reference< XProxyFactory > xProxyFac( xMFac->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.reflection.ProxyFactory" ) ), xCtx ), UNO_QUERY_THROW );
+ Reference< XProxyFactory > xProxyFac( xMFac->createInstanceWithContext( rtl::OUString( "com.sun.star.reflection.ProxyFactory" ), xCtx ), UNO_QUERY_THROW );
m_xAggProxy = xProxyFac->createProxy( xIf );
}
catch(const Exception& )
@@ -273,7 +273,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
sal_Int32 nSbxCount = n - 1;
if ( nParamsCount < nSbxCount - nSbxOptional )
{
- throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "wrong number of parameters!" ) ), Reference< XInterface >() );
+ throw RuntimeException( ::rtl::OUString( "wrong number of parameters!" ), Reference< XInterface >() );
}
}
// set parameters
@@ -458,7 +458,7 @@ uno::Reference< vba::XVBACompatibility > getVBACompatibility( const uno::Referen
try
{
uno::Reference< beans::XPropertySet > xModelProps( rxModel, uno::UNO_QUERY_THROW );
- xVBACompat.set( xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicLibraries" ) ) ), uno::UNO_QUERY );
+ xVBACompat.set( xModelProps->getPropertyValue( ::rtl::OUString( "BasicLibraries" ) ), uno::UNO_QUERY );
}
catch(const uno::Exception& )
{
@@ -488,7 +488,7 @@ public:
uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
if ( xFactory.is() )
{
- uno::Reference< frame::XDesktop > xDeskTop( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ) ), uno::UNO_QUERY );
+ uno::Reference< frame::XDesktop > xDeskTop( xFactory->createInstance( rtl::OUString( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY );
if ( xDeskTop.is() )
xDeskTop->terminate();
}
@@ -506,7 +506,7 @@ void VBAUnlockDocuments( StarBASIC* pBasic )
{
if ( pBasic && pBasic->IsDocBasic() )
{
- SbUnoObject* pGlobs = dynamic_cast< SbUnoObject* >( pBasic->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) ), SbxCLASS_DONTCARE ) );
+ SbUnoObject* pGlobs = dynamic_cast< SbUnoObject* >( pBasic->Find( ::rtl::OUString( "ThisComponent" ), SbxCLASS_DONTCARE ) );
if ( pGlobs )
{
uno::Reference< frame::XModel > xModel( pGlobs->getUnoAny(), uno::UNO_QUERY );
@@ -2191,7 +2191,7 @@ SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::Mod
SetModuleType( mInfo.ModuleType );
if ( mInfo.ModuleType == script::ModuleType::FORM )
{
- SetClassName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Form" )) );
+ SetClassName( rtl::OUString("Form" ) );
}
else if ( mInfo.ModuleObject.is() )
SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
@@ -2210,13 +2210,13 @@ SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException
pDocObject = new SbUnoObject( GetName(), uno::makeAny( aObj ) );
com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW );
- if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Worksheet" )) ) )
+ if( xServiceInfo->supportsService( rtl::OUString("ooo.vba.excel.Worksheet" ) ) )
{
- SetClassName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Worksheet" )) );
+ SetClassName( rtl::OUString("Worksheet" ) );
}
- else if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Workbook" )) ) )
+ else if( xServiceInfo->supportsService( rtl::OUString("ooo.vba.excel.Workbook" ) ) )
{
- SetClassName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Workbook" )) );
+ SetClassName( rtl::OUString("Workbook" ) );
}
}
@@ -2361,9 +2361,9 @@ public:
aParams[0] <<= nCancel;
aParams[1] <<= nCloseMode;
- mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ),
+ mpUserForm->triggerMethod( rtl::OUString("Userform_QueryClose" ),
aParams);
- xVbaMethodParameter->setVbaMethodParameter( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cancel")), aParams[0]);
+ xVbaMethodParameter->setVbaMethodParameter( rtl::OUString( "Cancel"), aParams[0]);
// If we don't cancel then we want to make sure the dialog
// really is gone to make sure when we attempt to raise it again
// it will actually generate an initialise event
@@ -2378,7 +2378,7 @@ public:
}
}
- mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ) );
+ mpUserForm->triggerMethod( rtl::OUString("Userform_QueryClose" ) );
}
@@ -2533,14 +2533,14 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
void SbUserFormModule::triggerActivateEvent( void )
{
OSL_TRACE("**** entering SbUserFormModule::triggerActivate");
- triggerMethod( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserForm_Activate") ) );
+ triggerMethod( rtl::OUString( "UserForm_Activate" ) );
OSL_TRACE("**** leaving SbUserFormModule::triggerActivate");
}
void SbUserFormModule::triggerDeactivateEvent( void )
{
OSL_TRACE("**** SbUserFormModule::triggerDeactivate");
- triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_Deactivate") ) );
+ triggerMethod( rtl::OUString("Userform_Deactivate" ) );
}
void SbUserFormModule::triggerInitializeEvent( void )
@@ -2621,7 +2621,7 @@ void SbUserFormModule::Unload()
aParams[0] <<= nCancel;
aParams[1] <<= nCloseMode;
- triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ), aParams);
+ triggerMethod( rtl::OUString("Userform_QueryClose" ), aParams);
aParams[0] >>= nCancel;
// basic boolean ( and what the user might use ) can be ambiguous ( e.g. basic true = -1 )
@@ -2678,20 +2678,20 @@ void SbUserFormModule::InitObject()
uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
uno::Sequence< uno::Any > aArgs(1);
aArgs[ 0 ] <<= m_xModel;
- rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) );
- rtl::OUString sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
+ rtl::OUString sDialogUrl( "vnd.sun.star.script:" );
+ rtl::OUString sProjectName( "Standard" );
try
{
Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW );
- uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW );
sProjectName = xVBAMode->getProjectName();
}
catch(const Exception& ) {}
- sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
+ sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( "?location=document" ) );
- uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs ), uno::UNO_QUERY_THROW );
+ uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( "com.sun.star.awt.DialogProvider"), aArgs ), uno::UNO_QUERY_THROW );
m_xDialog = xProvider->createDialog( sDialogUrl );
// create vba api object
@@ -2700,7 +2700,7 @@ void SbUserFormModule::InitObject()
aArgs[ 1 ] <<= m_xDialog;
aArgs[ 2 ] <<= m_xModel;
aArgs[ 3 ] <<= sProjectName;
- pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs ) ) );
+ pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( "ooo.vba.msforms.UserForm"), aArgs ) ) );
uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW );
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 9ffb643..07ba8c0 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -224,7 +224,7 @@ sal_Bool needSecurityRestrictions( void )
if( !xSMgr.is() )
return sal_True;
Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance
- ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )) ), UNO_QUERY );
+ ( ::rtl::OUString("com.sun.star.bridge.BridgeFactory" ) ), UNO_QUERY );
Sequence< Reference< XBridge > > aBridgeSeq;
sal_Int32 nBridgeCount = 0;
@@ -294,7 +294,7 @@ sal_Bool hasUno( void )
Reference< XContentProviderManager > xManager( xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
( "com.sun.star.ucb.UniversalContentBroker" )) ), UNO_QUERY );
- if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///" )) ).is() ) )
+ if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString("file:///" ) ).is() ) )
{
// No UCB
bRetVal = sal_False;
@@ -560,7 +560,7 @@ SbError SbiStream::Open
if( xSMgr.is() )
{
Reference< XSimpleFileAccess >
- xSFI( xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
+ xSFI( xSMgr->createInstance( ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
if( xSFI.is() )
{
try
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index fa7d7a1..9a5bb7d 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -199,7 +199,7 @@ static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void
if( xSMgr.is() )
{
xSFI = com::sun::star::uno::Reference< XSimpleFileAccess3 >( xSMgr->createInstance
- ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
+ ( ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
}
}
return xSFI;
@@ -2585,11 +2585,11 @@ RTLFUNC(Dir)
{
if( pRTLData->nCurDirPos == -2 )
{
- aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "." ));
+ aPath = ::rtl::OUString("." );
}
else if( pRTLData->nCurDirPos == -1 )
{
- aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".." ));
+ aPath = ::rtl::OUString(".." );
}
pRTLData->nCurDirPos++;
}
@@ -2692,11 +2692,11 @@ RTLFUNC(Dir)
{
if( pRTLData->nCurDirPos == -2 )
{
- aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "." ));
+ aPath = ::rtl::OUString("." );
}
else if( pRTLData->nCurDirPos == -1 )
{
- aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".." ));
+ aPath = ::rtl::OUString(".." );
}
pRTLData->nCurDirPos++;
}
@@ -3388,7 +3388,7 @@ rtl::OUString getBasicTypeName( SbxDataType eType )
String getObjectTypeName( SbxVariable* pVar )
{
- rtl::OUString sRet( RTL_CONSTASCII_USTRINGPARAM("Object") );
+ rtl::OUString sRet( "Object" );
if ( pVar )
{
SbxBase* pObj = pVar->GetObject();
@@ -3428,7 +3428,7 @@ String getObjectTypeName( SbxVariable* pVar )
{
try
{
- xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sRet;
+ xInv->getValue( rtl::OUString( "$GetTypeName" ) ) >>= sRet;
}
catch(const Exception& )
{
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 936328a..4e5788a 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -76,7 +76,7 @@ static Reference< XCalendar3 > getLocaleCalendar( void )
if( xSMgr.is() )
{
xCalendar = Reference< XCalendar3 >( xSMgr->createInstance
- ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.LocaleCalendar" )) ), UNO_QUERY );
+ ( ::rtl::OUString("com.sun.star.i18n.LocaleCalendar" ) ), UNO_QUERY );
}
}
@@ -2575,7 +2575,7 @@ void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const rtl::OUStri
Reference< XMultiServiceFactory > xFactory( getProcessServiceFactory() );
if( xFactory.is() )
{
- xFunc.set( xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FunctionAccess"))), UNO_QUERY_THROW);
+ xFunc.set( xFactory->createInstance(::rtl::OUString("com.sun.star.sheet.FunctionAccess")), UNO_QUERY_THROW);
}
}
Any aRet = xFunc->callFunction( sFuncName, aArgs );
@@ -2610,7 +2610,7 @@ RTLFUNC(SYD)
aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
aParams[ 3 ] <<= makeAny( rPar.Get(4)->GetDouble() );
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYD") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "SYD" ), rPar.Get( 0 ) );
}
RTLFUNC(SLN)
@@ -2633,7 +2633,7 @@ RTLFUNC(SLN)
aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SLN") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "SLN" ), rPar.Get( 0 ) );
}
RTLFUNC(Pmt)
@@ -2678,7 +2678,7 @@ RTLFUNC(Pmt)
aParams[ 3 ] <<= fv;
aParams[ 4 ] <<= type;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Pmt") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "Pmt" ), rPar.Get( 0 ) );
}
RTLFUNC(PPmt)
@@ -2725,7 +2725,7 @@ RTLFUNC(PPmt)
aParams[ 4 ] <<= fv;
aParams[ 5 ] <<= type;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PPmt") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "PPmt" ), rPar.Get( 0 ) );
}
RTLFUNC(PV)
@@ -2770,7 +2770,7 @@ RTLFUNC(PV)
aParams[ 3 ] <<= fv;
aParams[ 4 ] <<= type;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PV") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "PV" ), rPar.Get( 0 ) );
}
RTLFUNC(NPV)
@@ -2798,7 +2798,7 @@ RTLFUNC(NPV)
aParams[ 1 ] <<= aValues;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NPV") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "NPV" ), rPar.Get( 0 ) );
}
RTLFUNC(NPer)
@@ -2843,7 +2843,7 @@ RTLFUNC(NPer)
aParams[ 3 ] <<= fv;
aParams[ 4 ] <<= type;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NPer") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "NPer" ), rPar.Get( 0 ) );
}
RTLFUNC(MIRR)
@@ -2874,7 +2874,7 @@ RTLFUNC(MIRR)
aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MIRR") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "MIRR" ), rPar.Get( 0 ) );
}
RTLFUNC(IRR)
@@ -2911,7 +2911,7 @@ RTLFUNC(IRR)
aParams[ 0 ] <<= aValues;
aParams[ 1 ] <<= guess;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IRR") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "IRR" ), rPar.Get( 0 ) );
}
RTLFUNC(IPmt)
@@ -2958,7 +2958,7 @@ RTLFUNC(IPmt)
aParams[ 4 ] <<= fv;
aParams[ 5 ] <<= type;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IPmt") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "IPmt" ), rPar.Get( 0 ) );
}
RTLFUNC(FV)
@@ -3003,7 +3003,7 @@ RTLFUNC(FV)
aParams[ 3 ] <<= pv;
aParams[ 4 ] <<= type;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FV") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "FV" ), rPar.Get( 0 ) );
}
RTLFUNC(DDB)
@@ -3042,7 +3042,7 @@ RTLFUNC(DDB)
aParams[ 3 ] <<= period;
aParams[ 4 ] <<= factor;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DDB") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "DDB" ), rPar.Get( 0 ) );
}
RTLFUNC(Rate)
@@ -3101,7 +3101,7 @@ RTLFUNC(Rate)
aParams[ 4 ] <<= type;
aParams[ 5 ] <<= guess;
- CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Rate") ), rPar.Get( 0 ) );
+ CallFunctionAccessFunction( aParams, rtl::OUString( "Rate" ), rPar.Get( 0 ) );
}
RTLFUNC(StrReverse)
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index fff3a33..7e3aee2 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -136,14 +136,14 @@ sal_Bool SfxScriptLibraryContainer::hasLibraryPassword( const String& rLibraryNa
// Ctor for service
SfxScriptLibraryContainer::SfxScriptLibraryContainer( void )
- :maScriptLanguage( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) )
+ :maScriptLanguage( "StarBasic" )
{
// all initialisation has to be done
// by calling XInitialization::initialize
}
SfxScriptLibraryContainer::SfxScriptLibraryContainer( const uno::Reference< embed::XStorage >& xStorage )
- :maScriptLanguage( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) )
+ :maScriptLanguage( "StarBasic" )
{
init( OUString(), xStorage );
}
@@ -191,7 +191,7 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement
// Create sax writer
Reference< XExtendedDocumentHandler > xHandler(
mxMSF->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer") ) ), UNO_QUERY );
+ OUString( "com.sun.star.xml.sax.Writer" ) ), UNO_QUERY );
if( !xHandler.is() )
{
OSL_FAIL( "### couldn't create sax-writer component\n" );
@@ -219,16 +219,16 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement
switch( aModInfo.ModuleType )
{
case ModuleType::NORMAL:
- aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("normal") );
+ aMod.aModuleType = OUString( "normal" );
break;
case ModuleType::CLASS:
- aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("class") );
+ aMod.aModuleType = OUString( "class" );
break;
case ModuleType::FORM:
- aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("form") );
+ aMod.aModuleType = OUString( "form" );
break;
case ModuleType::DOCUMENT:
- aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("document") );
+ aMod.aModuleType = OUString( "document" );
break;
case ModuleType::UNKNOWN:
// nothing
@@ -248,7 +248,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
Any aRetAny;
Reference< XParser > xParser( mxMSF->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY );
+ OUString( "com.sun.star.xml.sax.Parser" ) ), UNO_QUERY );
if( !xParser.is() )
{
OSL_FAIL( "### couldn't create sax parser component\n" );
@@ -318,7 +318,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
{
Reference< frame::XModel > xModel( mxOwnerDocument ); // weak-ref -> ref
Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
- xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+ xFactory->createInstance( ::rtl::OUString( "ooo.vba.VBAGlobals" ) );
}
catch(const Exception& )
{
@@ -348,7 +348,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
{
Reference<frame::XModel > xModel( mxOwnerDocument );
Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY_THROW );
- mxCodeNameAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider" ) ) ), UNO_QUERY );
+ mxCodeNameAccess.set( xSF->createInstance( rtl::OUString("ooo.vba.VBAObjectModuleObjectProvider" ) ), UNO_QUERY );
}
catch(const Exception& ) {}
@@ -555,7 +555,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
if( bKillUncryptedFiles )
aElementInetObj.setExtension( maLibElementFileExtension );
else
- aElementInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("pba") ) );
+ aElementInetObj.setExtension( OUString( "pba" ) );
String aElementPath( aElementInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
if( mxSFI->exists( aElementPath ) )
@@ -689,7 +689,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
throw uno::RuntimeException();
String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
+ OUString aMime( "text/xml" );
xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
// Set encryption key
@@ -745,7 +745,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
INetURLObject aElementInetObj( aLibDirPath );
aElementInetObj.insertName( aElementName, sal_False,
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
- aElementInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("pba") ) );
+ aElementInetObj.setExtension( OUString( "pba" ) );
String aElementPath = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
@@ -773,7 +773,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
SbModule* pMod = pBasicLib->FindModule( aElementName );
if( pMod )
{
- OUString aCodeStreamName( RTL_CONSTASCII_USTRINGPARAM("code.bin") );
+ OUString aCodeStreamName( "code.bin" );
uno::Reference< io::XStream > xCodeStream = xElementRootStorage->openStreamElement(
aCodeStreamName,
@@ -796,7 +796,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
}
// Write encrypted source stream
- OUString aSourceStreamName( RTL_CONSTASCII_USTRINGPARAM("source.xml") );
+ OUString aSourceStreamName( "source.xml" );
uno::Reference< io::XStream > xSourceStream;
try
@@ -825,7 +825,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
if ( !xProps.is() )
throw uno::RuntimeException();
String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
+ OUString aMime( "text/xml" );
xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
Reference< XOutputStream > xOut = xSourceStream->getOutputStream();
@@ -1023,7 +1023,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
INetURLObject aElementInetObj( aLibDirPath );
aElementInetObj.insertName( aElementName, sal_False,
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
- aElementInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("pba") ) );
+ aElementInetObj.setExtension( OUString( "pba" ) );
String aElementPath = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
uno::Reference< embed::XStorage > xElementRootStorage;
@@ -1049,7 +1049,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
}
try {
- OUString aCodeStreamName( RTL_CONSTASCII_USTRINGPARAM("code.bin") );
+ OUString aCodeStreamName( "code.bin" );
uno::Reference< io::XStream > xCodeStream = xElementRootStorage->openStreamElement(
aCodeStreamName,
embed::ElementModes::READ );
@@ -1079,7 +1079,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
if( bLoadSource || bVerifyPasswordOnly )
{
// Access encrypted source stream
- OUString aSourceStreamName( RTL_CONSTASCII_USTRINGPARAM("source.xml") );
+ OUString aSourceStreamName( "source.xml" );
try {
uno::Reference< io::XStream > xSourceStream = xElementRootStorage->openEncryptedStreamElement(
aSourceStreamName,
@@ -1165,9 +1165,9 @@ Sequence< ::rtl::OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServ
Sequence< OUString > SfxScriptLibraryContainer::getSupportedServiceNames_static()
{
Sequence< OUString > aServiceNames( 2 );
- aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DocumentScriptLibraryContainer" ));
+ aServiceNames[0] = OUString("com.sun.star.script.DocumentScriptLibraryContainer" );
// plus, for compatibility:
- aServiceNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.ScriptLibraryContainer" ));
+ aServiceNames[1] = OUString("com.sun.star.script.ScriptLibraryContainer" );
return aServiceNames;
}
@@ -1179,7 +1179,7 @@ OUString SfxScriptLibraryContainer::getImplementationName_static()
MutexGuard aGuard( Mutex::getGlobalMutex() );
if( bNeedsInit )
{
- aImplName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.ScriptLibraryContainer" ));
+ aImplName = OUString("com.sun.star.comp.sfx2.ScriptLibraryContainer" );
bNeedsInit = sal_False;
}
return aImplName;
commit e4b6a8e0e942c170ff18b886817e0b696dc712e7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 17:35:25 2012 -0500
targeted string re-work
Change-Id: I6099879387480356b6623db6224a39eaec5ecb26
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 0e0ff64..0bc0231 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -185,17 +185,17 @@ Sane::~Sane()
void Sane::Init()
{
- ::rtl::OUString sSaneLibName( RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ) );
+ ::rtl::OUString sSaneLibName( "libsane" SAL_DLLEXTENSION );
pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
if( ! pSaneLib )
{
- sSaneLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ".1" ));
+ sSaneLibName = ::rtl::OUString("libsane" SAL_DLLEXTENSION ".1" );
pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
}
// try reasonable places that might not be in the library search path
if( ! pSaneLib )
{
- ::rtl::OUString sSaneLibSystemPath( RTL_CONSTASCII_USTRINGPARAM( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) );
+ ::rtl::OUString sSaneLibSystemPath( "/usr/local/lib/libsane" SAL_DLLEXTENSION );
osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData );
pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
}
commit 056f1611060ed14f31f5c88c6db752bac2358c86
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 17:24:31 2012 -0500
targeted string re-work
Change-Id: I8256b300bd50e0aed8bee364ebe518087969d184
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9a5b5bb..13c8f3e 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1464,7 +1464,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
// retrieve the datebase of the Numberformatter
try
{
- xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString("NullDate")) >>= m_aNullDate;
}
catch(Exception&)
{
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index a9d3ad6..b00d02a 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -63,7 +63,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin
{
INetURLObject aURL( rBaseURL );
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
- String aFileName( String( RTL_CONSTASCII_USTRINGPARAM( "sg" ) ) );
+ String aFileName( String( "sg" ) );
aURL.Append( ( aFileName += String::CreateFromInt32( nFileNumber ) ) += String( RTL_CONSTASCII_USTRINGPARAM( ".thm" ) ) );
aThmURL = ImplGetURLIgnoreCase( aURL );
@@ -270,7 +270,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
::ucbhelper::Content aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
uno::Sequence< OUString > aProps( 1 );
- aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
+ aProps.getArray()[ 0 ] = OUString("Url");
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
@@ -312,10 +312,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
if( xContentAccess.is() )
{
- static const ::rtl::OUString s_sTitle(RTL_CONSTASCII_USTRINGPARAM("Title"));
- static const ::rtl::OUString s_sIsReadOnly(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly"));
- static const ::rtl::OUString s_sSDG_EXT(RTL_CONSTASCII_USTRINGPARAM("sdg"));
- static const ::rtl::OUString s_sSDV_EXT(RTL_CONSTASCII_USTRINGPARAM("sdv"));
+ static const ::rtl::OUString s_sTitle("Title");
+ static const ::rtl::OUString s_sIsReadOnly("IsReadOnly");
+ static const ::rtl::OUString s_sSDG_EXT("sdg");
+ static const ::rtl::OUString s_sSDV_EXT("sdv");
while( xResultSet->next() )
{
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 5927b43..00ee9b7 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -283,7 +283,7 @@ sal_Bool FileExists( const INetURLObject& rURL )
::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
OUString aTitle;
- aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle;
+ aCnt.getPropertyValue( OUString("Title") ) >>= aTitle;
bRet = ( !aTitle.isEmpty() );
}
catch( const ucb::ContentCreationException& )
@@ -317,11 +317,11 @@ sal_Bool CreateDir( const INetURLObject& rURL )
uno::Sequence< OUString > aProps( 1 );
uno::Sequence< uno::Any > aValues( 1 );
- aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ aProps.getArray()[ 0 ] = OUString("Title");
aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) );
::ucbhelper::Content aContent( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
- bRet = aParent.insertNewContent( OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder")), aProps, aValues, aContent );
+ bRet = aParent.insertNewContent( OUString("application/vnd.sun.staroffice.fsys-folder"), aProps, aValues, aContent );
}
catch( const ucb::ContentCreationException& )
{
@@ -347,7 +347,7 @@ sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
{
::ucbhelper::Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
- aDestPath.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
+ aDestPath.executeCommand( OUString("transfer"),
uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ),
rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) );
bRet = sal_True;
@@ -376,7 +376,7 @@ sal_Bool KillFile( const INetURLObject& rURL )
try
{
::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
- aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) );
+ aCnt.executeCommand( OUString("delete"), uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( const ucb::ContentCreationException& )
{
@@ -407,7 +407,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
if( xMgr.is() )
{
uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.XProgressMonitor")) ),
+ ::rtl::OUString("com.sun.star.awt.XProgressMonitor") ),
uno::UNO_QUERY );
if ( xMonitor.is() )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index d0e2ac8..27caa5f 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1183,12 +1183,12 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s
::ucbhelper::Content aCnt( rFileOrDirURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
sal_Bool bFolder = false;
- aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ) >>= bFolder;
+ aCnt.getPropertyValue( OUString("IsFolder") ) >>= bFolder;
if( bFolder )
{
uno::Sequence< OUString > aProps( 1 );
- aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
+ aProps.getArray()[ 0 ] = OUString("Url");
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
if( xContentAccess.is() )
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 3ca080c..6b62bc0 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -185,7 +185,7 @@ void SvxModifyControl::DoubleClick()
return;
Sequence<PropertyValue> aArgs;
- execute(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")), aArgs);
+ execute(OUString(".uno:Save"), aArgs);
}
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 13c6894..b723139 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -336,9 +336,9 @@ void TableWindow::PopupModeEnd()
if ( !IsPopupModeCanceled() && nCol && nLine )
{
Sequence< PropertyValue > aArgs( 2 );
- aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" ));
+ aArgs[0].Name = ::rtl::OUString( "Columns" );
aArgs[0].Value = makeAny( sal_Int16( nCol ));
- aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Rows" ));
+ aArgs[1].Name = ::rtl::OUString( "Rows" );
aArgs[1].Value = makeAny( sal_Int16( nLine ));
TableDialog( aArgs );
@@ -378,7 +378,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
{
com::sun::star::util::URL aTargetURL;
Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+ rtl::OUString("com.sun.star.util.URLTransformer")),
UNO_QUERY );
aTargetURL.Complete = maCommand;
xTrans->parseStrict( aTargetURL );
@@ -698,9 +698,9 @@ void ColumnsWindow::PopupModeEnd()
pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
Sequence< PropertyValue > aArgs( 2 );
- aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" ));
+ aArgs[0].Name = ::rtl::OUString( "Columns" );
aArgs[0].Value = makeAny( sal_Int16( nCol ));
- aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Modifier" ));
+ aArgs[1].Name = ::rtl::OUString( "Modifier" );
aArgs[1].Value = makeAny( sal_Int16( m_bMod1 ? KEY_MOD1 : 0 ));
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
commit aef7a9ad9136cb14ca1158262cee130621975b07
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 17:17:56 2012 -0500
targeted string re-work
Change-Id: I67db5b5685872ef148bf4833330c02ea2b18c32e
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
index c4bc24c..7fb1b94 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
@@ -91,8 +91,7 @@ public:
{
uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess
(xFactory->createInstanceWithContext
- (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
- ("com.sun.star.ucb.SimpleFileAccess")),
+ (::rtl::OUString( "com.sun.star.ucb.SimpleFileAccess"),
xContext), uno::UNO_QUERY_THROW);
xInputStream = xFileAccess->openFileRead(absFileUrl) ;
@@ -182,8 +181,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
{
uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess
(xFactory->createInstanceWithContext
- (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
- ("com.sun.star.ucb.SimpleFileAccess")),
+ (::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
xContext), uno::UNO_QUERY_THROW );
rtl::OString aStr;
commit 5611d3bcf585d5ae8070892dc96d5e21d12c1d9a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 17:13:51 2012 -0500
targeted string re-work
Change-Id: Ia9fe54a5198811d648bb32a2ebb3ab7f9cde77c7
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b24f94f..7f037c1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -425,7 +425,7 @@ static bool needsSynchronization(
static ::rtl::OUString getBrandSharePreregBundledPathURL()
{
::rtl::OUString url(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/prereg/bundled"));
+ "$BRAND_BASE_DIR/share/prereg/bundled");
::rtl::Bootstrap::expandMacros(url);
return url;
@@ -433,7 +433,7 @@ static ::rtl::OUString getBrandSharePreregBundledPathURL()
static ::rtl::OUString getUserBundledExtPathURL()
{
- ::rtl::OUString folder( RTL_CONSTASCII_USTRINGPARAM( "$BUNDLED_EXTENSIONS_USER" ));
+ ::rtl::OUString folder( "$BUNDLED_EXTENSIONS_USER" );
::rtl::Bootstrap::expandMacros(folder);
return folder;
@@ -575,7 +575,7 @@ throw()
}
if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 )
- newDstUnqPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ newDstUnqPath += rtl::OUString("/");
newDstUnqPath += tit;
@@ -754,7 +754,7 @@ sal_Bool Desktop::QueryExit()
const sal_Char SUSPEND_QUICKSTARTVETO[] = "SuspendQuickstartVeto";
Reference< ::com::sun::star::frame::XDesktop >
- xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ),
+ xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.frame.Desktop") ),
UNO_QUERY );
Reference < ::com::sun::star::beans::XPropertySet > xPropertySet( xDesktop, UNO_QUERY );
@@ -762,7 +762,7 @@ sal_Bool Desktop::QueryExit()
{
Any a;
a <<= (sal_Bool)sal_True;
- xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
+ xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), a );
}
sal_Bool bExit = ( !xDesktop.is() || xDesktop->terminate() );
@@ -772,7 +772,7 @@ sal_Bool Desktop::QueryExit()
{
Any a;
a <<= (sal_Bool)sal_False;
- xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
+ xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), a );
}
else
{
@@ -836,7 +836,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
case ::utl::Bootstrap::MISSING_INSTALL_DIRECTORY:
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_PATH_INVALID,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The installation path is not available." )) );
+ OUString( "The installation path is not available." ) );
bFileInfo = sal_False;
}
break;
@@ -845,7 +845,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE:
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The configuration file \"$1\" is missing." )) );
+ OUString( "The configuration file \"$1\" is missing." ) );
}
break;
@@ -855,7 +855,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
case ::utl::Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY:
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_CORRUPT,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The configuration file \"$1\" is corrupt." )) );
+ OUString( "The configuration file \"$1\" is corrupt." ) );
}
break;
@@ -863,7 +863,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
case ::utl::Bootstrap::MISSING_VERSION_FILE:
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The configuration file \"$1\" is missing." )) );
+ OUString( "The configuration file \"$1\" is missing." ) );
}
break;
@@ -871,7 +871,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY:
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_SUPPORT,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The main configuration file \"$1\" does not support the current version." )) );
+ OUString( "The main configuration file \"$1\" does not support the current version." ) );
}
break;
@@ -879,7 +879,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
case ::utl::Bootstrap::MISSING_USER_DIRECTORY:
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_DIR_MISSING,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The configuration directory \"$1\" is missing." )) );
+ OUString( "The configuration directory \"$1\" is missing." ) );
}
break;
@@ -887,7 +887,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
case ::utl::Bootstrap::INVALID_BOOTSTRAP_DATA:
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "An internal failure occurred." )) );
+ OUString( "An internal failure occurred." ) );
bFileInfo = sal_False;
}
break;
@@ -896,7 +896,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
{
// This needs to be improved, see #i67575#:
aMsg = OUString(
- RTL_CONSTASCII_USTRINGPARAM( "Invalid version file entry" ) );
+ "Invalid version file entry" );
bFileInfo = sal_False;
}
break;
@@ -1021,10 +1021,10 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
if ( aBootstrapError == BE_UNO_SERVICEMANAGER )
aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_SERVICE,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The service manager is not available." )) );
+ OUString( "The service manager is not available." ) );
else
aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_CFG_SERVICE,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "The configuration service is not available." )) );
+ OUString( "The configuration service is not available." ) );
aDiagnosticMessage.append( aErrorMsg );
aDiagnosticMessage.appendAscii( "\n" );
@@ -1034,7 +1034,7 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
// we have to ask the user to start the setup on CD/installation directory manually!!
OUString aStartSetupManually( GetMsgString(
STR_ASK_START_SETUP_MANUALLY,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "Start setup application to repair the installation from CD, or the folder containing the installation packages." )) ));
+ OUString( "Start setup application to repair the installation from CD, or the folder containing the installation packages." ) ));
aDiagnosticMessage.append( aStartSetupManually );
aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() );
@@ -1047,7 +1047,7 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
OUStringBuffer aDiagnosticMessage( 100 );
OUString aErrorMsg;
aErrorMsg = GetMsgString( STR_CONFIG_ERR_ACCESS_GENERAL,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "A general error occurred while accessing your central configuration." )) );
+ OUString( "A general error occurred while accessing your central configuration." ) );
aDiagnosticMessage.append( aErrorMsg );
aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() );
FatalError(aMessage);
@@ -1058,7 +1058,7 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
OUStringBuffer aDiagnosticMessage( 100 );
OUString aErrorMsg;
aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "User installation could not be completed" )) );
+ OUString( "User installation could not be completed" ) );
aDiagnosticMessage.append( aErrorMsg );
aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() );
FatalError(aMessage);
@@ -1071,8 +1071,7 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
aErrorMsg = GetMsgString(
//@@@ FIXME: should use an own resource string => #i36213#
STR_BOOTSTRAP_ERR_LANGUAGE_MISSING,
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Language could not be determined." )) );
+ OUString( "Language could not be determined." ) );
aDiagnosticMessage.append( aErrorMsg );
aMessage = MakeStartupErrorMessage(
aDiagnosticMessage.makeStringAndClear() );
@@ -1092,13 +1091,11 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
if ( aBootstrapError == BE_USERINSTALL_NOTENOUGHDISKSPACE )
aErrorMsg = GetMsgString(
STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE,
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "User installation could not be completed due to insufficient free disk space." )) );
+ OUString( "User installation could not be completed due to insufficient free disk space." ) );
else
aErrorMsg = GetMsgString(
STR_BOOSTRAP_ERR_NOACCESSRIGHTS,
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "User installation could not be processed due to missing access rights." )) );
+ OUString( "User installation could not be processed due to missing access rights." ) );
osl::File::getSystemPathFromFileURL( aUserInstallationURL, aUserInstallationPath );
@@ -1155,10 +1152,10 @@ void impl_checkRecoveryState(sal_Bool& bCrashed ,
sal_Bool& bRecoveryDataExists,
sal_Bool& bSessionDataExists )
{
- static const ::rtl::OUString SERVICENAME_RECOVERYCORE(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.AutoRecovery"));
- static const ::rtl::OUString PROP_CRASHED(RTL_CONSTASCII_USTRINGPARAM("Crashed"));
- static const ::rtl::OUString PROP_EXISTSRECOVERY(RTL_CONSTASCII_USTRINGPARAM("ExistsRecoveryData"));
- static const ::rtl::OUString PROP_EXISTSSESSION(RTL_CONSTASCII_USTRINGPARAM("ExistsSessionData"));
+ static const ::rtl::OUString SERVICENAME_RECOVERYCORE("com.sun.star.frame.AutoRecovery");
+ static const ::rtl::OUString PROP_CRASHED("Crashed");
+ static const ::rtl::OUString PROP_EXISTSRECOVERY("ExistsRecoveryData");
+ static const ::rtl::OUString PROP_EXISTSSESSION("ExistsSessionData");
bCrashed = sal_False;
bRecoveryDataExists = sal_False;
@@ -1188,11 +1185,11 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
sal_Bool bCrashed ,
sal_Bool bExistsRecoveryData)
{
- static ::rtl::OUString SERVICENAME_RECOVERYUI(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svx.RecoveryUI"));
- static ::rtl::OUString SERVICENAME_URLPARSER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"));
- static ::rtl::OUString COMMAND_EMERGENCYSAVE(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doEmergencySave"));
- static ::rtl::OUString COMMAND_RECOVERY(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doAutoRecovery"));
- static ::rtl::OUString COMMAND_CRASHREPORT(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doCrashReport"));
+ static ::rtl::OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI");
+ static ::rtl::OUString SERVICENAME_URLPARSER("com.sun.star.util.URLTransformer");
+ static ::rtl::OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave");
+ static ::rtl::OUString COMMAND_RECOVERY("vnd.sun.star.autorecovery:/doAutoRecovery");
+ static ::rtl::OUString COMMAND_CRASHREPORT("vnd.sun.star.autorecovery:/doCrashReport");
css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
@@ -1562,7 +1559,7 @@ int Desktop::Main()
#ifdef DBG_UTIL
//include version ID in non product builds
- ::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
+ ::rtl::OUString aDefault("development");
aTitle += rtl::OUString(" [");
String aVerId( utl::Bootstrap::getProductSource(aDefault));
aTitle += aVerId;
@@ -1589,7 +1586,7 @@ int Desktop::Main()
}
xDesktop = Reference<XDesktop>( xSMgr->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
+ OUString( "com.sun.star.frame.Desktop" )), UNO_QUERY );
// create service for loadin SFX (still needed in startup)
pExecGlobals->xGlobalBroadcaster = Reference < css::document::XEventListener >
@@ -1618,7 +1615,7 @@ int Desktop::Main()
{
::comphelper::ComponentContext aContext( xSMgr );
- xRestartManager.set( aContext.getSingleton( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.OfficeRestartManager" ) ) ), UNO_QUERY );
+ xRestartManager.set( aContext.getSingleton( ::rtl::OUString( "com.sun.star.task.OfficeRestartManager" ) ), UNO_QUERY );
}
// check whether the shutdown is caused by restart
@@ -1636,7 +1633,7 @@ int Desktop::Main()
if (pExecGlobals->xGlobalBroadcaster.is())
{
css::document::EventObject aEvent;
- aEvent.EventName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnStartApp"));
+ aEvent.EventName = ::rtl::OUString("OnStartApp");
pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
}
@@ -1653,7 +1650,7 @@ int Desktop::Main()
{
::comphelper::ComponentContext aContext( xSMgr );
- xRestartManager.set( aContext.getSingleton( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.OfficeRestartManager" ) ) ), UNO_QUERY );
+ xRestartManager.set( aContext.getSingleton( ::rtl::OUString( "com.sun.star.task.OfficeRestartManager" ) ), UNO_QUERY );
}
// check whether the shutdown is caused by restart
@@ -1685,7 +1682,7 @@ int Desktop::Main()
Reference< XFrame > xBackingFrame;
Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
- xBackingFrame = xDesktopFrame->findFrame(OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0);
+ xBackingFrame = xDesktopFrame->findFrame(OUString( "_blank" ), 0);
if (xBackingFrame.is())
xContainerWindow = xBackingFrame->getContainerWindow();
if (xContainerWindow.is())
@@ -1696,7 +1693,7 @@ int Desktop::Main()
lArgs[0] <<= xContainerWindow;
Reference< XController > xBackingComp(
- xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs), UNO_QUERY);
+ xSMgr->createInstanceWithArguments(OUString( "com.sun.star.frame.StartModule" ), lArgs), UNO_QUERY);
if (xBackingComp.is())
{
Reference< ::com::sun::star::awt::XWindow > xBackingWin(xBackingComp, UNO_QUERY);
@@ -1839,7 +1836,7 @@ int Desktop::doShutdown()
if (pExecGlobals->xGlobalBroadcaster.is())
{
css::document::EventObject aEvent;
- aEvent.EventName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnCloseApp"));
+ aEvent.EventName = ::rtl::OUString("OnCloseApp");
pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
}
@@ -2095,7 +2092,7 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl)
if (getenv ("OOO_EXIT_POST_STARTUP"))
new ExitTimer();
} catch (const ::com::sun::star::uno::Exception &e) {
- String a( RTL_CONSTASCII_USTRINGPARAM( "UNO exception during client open:\n" ) );
+ String a( "UNO exception during client open:\n" );
Application::Abort( a + e.Message );
}
return 0;
@@ -2125,10 +2122,10 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
Reference< XMultiServiceFactory > rFactory = ::comphelper::getProcessServiceFactory();
Sequence < com::sun::star::beans::PropertyValue > args(1);
- args[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
+ args[0].Name = ::rtl::OUString("Hidden");
args[0].Value <<= sal_True;
Reference < XComponentLoader > xLoader( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
+ ::rtl::OUString("com.sun.star.frame.Desktop") ), UNO_QUERY );
if ( !xLoader.is() )
return;
@@ -2138,7 +2135,7 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
try
{
Reference < ::com::sun::star::util::XCloseable > xDoc( xLoader->loadComponentFromURL( rtl::OUString("private:factory/swriter"),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args ), UNO_QUERY_THROW );
+ ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const com::sun::star::uno::Exception& )
@@ -2150,7 +2147,7 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
try
{
Reference < ::com::sun::star::util::XCloseable > xDoc( xLoader->loadComponentFromURL( rtl::OUString("private:factory/scalc"),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args ), UNO_QUERY_THROW );
+ ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const com::sun::star::uno::Exception& )
@@ -2162,7 +2159,7 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
try
{
Reference < ::com::sun::star::util::XCloseable > xDoc( xLoader->loadComponentFromURL( rtl::OUString("private:factory/sdraw"),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args ), UNO_QUERY_THROW );
+ ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const com::sun::star::uno::Exception& )
@@ -2174,7 +2171,7 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
try
{
Reference < ::com::sun::star::util::XCloseable > xDoc( xLoader->loadComponentFromURL( rtl::OUString("private:factory/simpress"),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args ), UNO_QUERY_THROW );
+ ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const com::sun::star::uno::Exception& )
@@ -2189,10 +2186,10 @@ void Desktop::PreloadConfigurationData()
Reference< XNameAccess > xNameAccess( rFactory->createInstance(
rtl::OUString( "com.sun.star.frame.UICommandDescription" )), UNO_QUERY );
- rtl::OUString aWriterDoc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
- rtl::OUString aCalcDoc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
- rtl::OUString aDrawDoc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
- rtl::OUString aImpressDoc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
+ rtl::OUString aWriterDoc( "com.sun.star.text.TextDocument" );
+ rtl::OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" );
+ rtl::OUString aDrawDoc( "com.sun.star.drawing.DrawingDocument" );
+ rtl::OUString aImpressDoc( "com.sun.star.presentation.PresentationDocument" );
// preload commands configuration
if ( xNameAccess.is() )
@@ -2414,20 +2411,20 @@ void Desktop::OpenClients()
if ( lastIndex > 0 )
{
aIniName = aIniName.copy( 0, lastIndex+1 );
- aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "perftune" ));
+ aIniName += OUString( "perftune" );
#if defined(WNT)
- aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" ));
+ aIniName += OUString( ".ini" );
#else
- aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" ));
+ aIniName += OUString( "rc" );
#endif
}
rtl::Bootstrap aPerfTuneIniFile( aIniName );
- OUString aDefault( RTL_CONSTASCII_USTRINGPARAM( "0" ));
+ OUString aDefault( "0" );
OUString aPreloadData;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list