[Libreoffice-commits] .: comphelper/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 28 04:16:20 PST 2013
comphelper/source/misc/anytostring.cxx | 59 +++++++++++--------------
comphelper/source/misc/componentcontext.cxx | 4 -
comphelper/source/misc/configurationhelper.cxx | 14 ++---
comphelper/source/misc/docpasswordhelper.cxx | 10 ++--
comphelper/source/misc/documentiologring.cxx | 14 ++---
comphelper/source/misc/ihwrapnofilter.cxx | 10 ++--
comphelper/source/misc/instancelocker.cxx | 19 +++-----
comphelper/source/misc/logging.cxx | 12 ++---
comphelper/source/misc/mediadescriptor.cxx | 52 +++++++++++-----------
9 files changed, 95 insertions(+), 99 deletions(-)
New commits:
commit 69bb1336bfbbc9fbdc08027490b0174c904eee0f
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Mon Jan 28 10:16:20 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in comphelper
Change-Id: I36bb19c123c1de54e04ba2e6c30b1cb0f7353047
diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index c0513ba..030ca27 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.cxx
@@ -32,18 +32,17 @@ namespace {
void appendTypeError(
rtl::OUStringBuffer & buf, typelib_TypeDescriptionReference * typeRef )
{
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("<cannot get type description of type ") );
- buf.append( rtl::OUString::unacquired( &typeRef->pTypeName ) );
+ buf.append( "<cannot get type description of type " );
+ buf.append( OUString::unacquired( &typeRef->pTypeName ) );
buf.append( static_cast< sal_Unicode >('>') );
}
inline void appendChar( rtl::OUStringBuffer & buf, sal_Unicode c )
{
if (c < ' ' || c > '~') {
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\\X") );
- rtl::OUString const s(
- rtl::OUString::valueOf( static_cast< sal_Int32 >(c), 16 ) );
+ buf.append( "\\X" );
+ OUString const s(
+ OUString::valueOf( static_cast< sal_Int32 >(c), 16 ) );
for ( sal_Int32 f = 4 - s.getLength(); f > 0; --f )
buf.append( static_cast< sal_Unicode >('0') );
buf.append( s );
@@ -59,7 +58,7 @@ void appendValue( rtl::OUStringBuffer & buf,
bool prependType )
{
if (typeRef->eTypeClass == typelib_TypeClass_VOID) {
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("void") );
+ buf.append( "void" );
return;
}
OSL_ASSERT( val != 0 );
@@ -70,8 +69,8 @@ void appendValue( rtl::OUStringBuffer & buf,
typeRef->eTypeClass != typelib_TypeClass_BOOLEAN)
{
buf.append( static_cast< sal_Unicode >('(') );
- buf.append( rtl::OUString::unacquired( &typeRef->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(") ") );
+ buf.append( OUString::unacquired( &typeRef->pTypeName ) );
+ buf.append( ") " );
}
switch (typeRef->eTypeClass) {
@@ -83,16 +82,15 @@ void appendValue( rtl::OUStringBuffer & buf,
*static_cast< uno::XInterface * const * >(val),
uno::UNO_QUERY );
if (xServiceInfo.is()) {
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
- " (ImplementationName = \"") );
+ buf.append( " (ImplementationName = \"" );
buf.append( xServiceInfo->getImplementationName() );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\")") );
+ buf.append( "\")" );
}
break;
}
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION: {
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
+ buf.append( "{ " );
typelib_TypeDescription * typeDescr = 0;
typelib_typedescriptionreference_getDescription( &typeDescr, typeRef );
if (typeDescr == 0 || !typelib_typedescription_complete( &typeDescr )) {
@@ -110,7 +108,7 @@ void appendValue( rtl::OUStringBuffer & buf,
typelib_TypeDescription * >(
compType->pBaseTypeDescription)->pWeakRef, false );
if (nDescr > 0)
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") );
+ buf.append( ", " );
}
typelib_TypeDescriptionReference ** ppTypeRefs =
@@ -121,7 +119,7 @@ void appendValue( rtl::OUStringBuffer & buf,
for ( sal_Int32 nPos = 0; nPos < nDescr; ++nPos )
{
buf.append( ppMemberNames[ nPos ] );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" = ") );
+ buf.append( " = " );
typelib_TypeDescription * memberType = 0;
TYPELIB_DANGER_GET( &memberType, ppTypeRefs[ nPos ] );
if (memberType == 0) {
@@ -135,10 +133,10 @@ void appendValue( rtl::OUStringBuffer & buf,
TYPELIB_DANGER_RELEASE( memberType );
}
if (nPos < (nDescr - 1))
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") );
+ buf.append( ", " );
}
}
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
+ buf.append( " }" );
if (typeDescr != 0)
typelib_typedescription_release( typeDescr );
break;
@@ -168,7 +166,7 @@ void appendValue( rtl::OUStringBuffer & buf,
if (nElements > 0)
{
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
+ buf.append( "{ " );
char const * pElements = seq->elements;
for ( sal_Int32 nPos = 0; nPos < nElements; ++nPos )
{
@@ -176,13 +174,13 @@ void appendValue( rtl::OUStringBuffer & buf,
buf, pElements + (nElementSize * nPos),
elementTypeDescr->pWeakRef, false );
if (nPos < (nElements - 1))
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") );
+ buf.append( ", " );
}
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
+ buf.append( " }" );
}
else
{
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{}") );
+ buf.append( "{}" );
}
TYPELIB_DANGER_RELEASE( elementTypeDescr );
}
@@ -191,10 +189,10 @@ void appendValue( rtl::OUStringBuffer & buf,
break;
}
case typelib_TypeClass_ANY: {
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
+ buf.append( "{ " );
uno_Any const * pAny = static_cast< uno_Any const * >(val);
appendValue( buf, pAny->pData, pAny->pType, true );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
+ buf.append( " }" );
break;
}
case typelib_TypeClass_TYPE:
@@ -211,9 +209,9 @@ void appendValue( rtl::OUStringBuffer & buf,
{
sal_Unicode c = str[ pos ];
if (c == '\"')
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\\\"") );
+ buf.append( "\\\"" );
else if (c == '\\')
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\\\\") );
+ buf.append( "\\\\" );
else
appendChar( buf, c );
}
@@ -245,8 +243,7 @@ void appendValue( rtl::OUStringBuffer & buf,
}
else
{
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("?unknown enum value?") );
+ buf.append( "?unknown enum value?" );
}
}
if (typeDescr != 0)
@@ -255,17 +252,17 @@ void appendValue( rtl::OUStringBuffer & buf,
}
case typelib_TypeClass_BOOLEAN:
if (*static_cast< sal_Bool const * >(val) != sal_False)
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("true") );
+ buf.append( "true" );
else
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("false") );
+ buf.append( "false" );
break;
case typelib_TypeClass_CHAR: {
buf.append( static_cast< sal_Unicode >('\'') );
sal_Unicode c = *static_cast< sal_Unicode const * >(val);
if (c == '\'')
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\\\'") );
+ buf.append( "\\\'" );
else if (c == '\\')
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\\\\") );
+ buf.append( "\\\\" );
else
appendChar( buf, c );
buf.append( static_cast< sal_Unicode >('\'') );
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index 8ec65d3..b0d7b8a 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.cxx
@@ -103,9 +103,9 @@ namespace comphelper
}
//------------------------------------------------------------------------
- Reference< XInterface > ComponentContext::getSingleton( const ::rtl::OUString& _rInstanceName ) const
+ Reference< XInterface > ComponentContext::getSingleton( const OUString& _rInstanceName ) const
{
- ::rtl::OUString sKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/" ) ) );
+ OUString sKey( "/singletons/" );
sKey += _rInstanceName;
return Reference< XInterface >( getContextValueByName( sKey ), UNO_QUERY );
}
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index add324b..e42a324 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -30,7 +30,7 @@ namespace comphelper{
//-----------------------------------------------
css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sPackage,
+ const OUString& sPackage,
sal_Int32 eMode )
{
css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
@@ -40,21 +40,21 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
css::beans::PropertyValue aParam ;
// set root path
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+ aParam.Name = "nodepath";
aParam.Value <<= sPackage;
lParams.push_back(css::uno::makeAny(aParam));
// enable all locales mode
if ((eMode & ConfigurationHelper::E_ALL_LOCALES)==ConfigurationHelper::E_ALL_LOCALES)
{
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("locale"));
- aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
+ aParam.Name = "locale";
+ aParam.Value <<= OUString("*");
lParams.push_back(css::uno::makeAny(aParam));
}
// enable lazy writing
sal_Bool bLazy = ((eMode & ConfigurationHelper::E_LAZY_WRITE)==ConfigurationHelper::E_LAZY_WRITE);
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite"));
+ aParam.Name = "lazywrite";
aParam.Value = css::uno::makeAny(bLazy);
lParams.push_back(css::uno::makeAny(aParam));
@@ -64,11 +64,11 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
sal_Bool bReadOnly = ((eMode & ConfigurationHelper::E_READONLY)==ConfigurationHelper::E_READONLY);
if (bReadOnly)
xCFG = xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
+ OUString("com.sun.star.configuration.ConfigurationAccess"),
lParams.getAsConstList());
else
xCFG = xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")),
+ OUString("com.sun.star.configuration.ConfigurationUpdateAccess"),
lParams.getAsConstList());
return xCFG;
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 3e349a7..7ab4865 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -82,13 +82,13 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
if ( aNewHash.getLength() )
{
aResult.realloc( 4 );
- aResult[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "algorithm-name" ) );
- aResult[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PBKDF2" ) );
- aResult[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "salt" ) );
+ aResult[0].Name = "algorithm-name";
+ aResult[0].Value <<= OUString( "PBKDF2" );
+ aResult[1].Name = "salt";
aResult[1].Value <<= aSalt;
- aResult[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iteration-count" ) );
+ aResult[2].Name = "iteration-count";
aResult[2].Value <<= nCount;
- aResult[3].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hash" ) );
+ aResult[3].Name = "hash";
aResult[3].Value <<= aNewHash;
}
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index ac9ba8d..e9429b4 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -53,21 +53,21 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNam
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName_static()
+OUString SAL_CALL OSimpleLogRing::getImplementationName_static()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.logging.SimpleLogRing" ) );
+ return OUString( "com.sun.star.comp.logging.SimpleLogRing" );
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::getSingletonName_static()
+OUString SAL_CALL OSimpleLogRing::getSingletonName_static()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.DocumentIOLogRing" ) );
+ return OUString( "com.sun.star.logging.DocumentIOLogRing" );
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::getServiceName_static()
+OUString SAL_CALL OSimpleLogRing::getServiceName_static()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.SimpleLogRing" ) );
+ return OUString( "com.sun.star.logging.SimpleLogRing" );
}
// ----------------------------------------------------------
@@ -127,7 +127,7 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
m_aMessages.realloc( nLen );
else
throw lang::IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Nonnull size is expected as the first argument!" ) ),
+ OUString( "Nonnull size is expected as the first argument!" ),
uno::Reference< uno::XInterface >(),
0 );
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx
index 57c55d8..150da2b 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.cxx
@@ -39,16 +39,16 @@ namespace comphelper
}
//----------------------------------------------------------------------------------------------------
- uno::Sequence< ::rtl::OUString > SAL_CALL OIHWrapNoFilterDialog::impl_staticGetSupportedServiceNames()
+ uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::impl_staticGetSupportedServiceNames()
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandlerWrapper"));
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = "com.sun.star.task.InteractionHandlerWrapper";
return aRet;
}
- ::rtl::OUString SAL_CALL OIHWrapNoFilterDialog::impl_staticGetImplementationName()
+ OUString SAL_CALL OIHWrapNoFilterDialog::impl_staticGetImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.task.InteractionHandlerWrapper"));
+ return OUString("com.sun.star.comp.task.InteractionHandlerWrapper");
}
//----------------------------------------------------------------------------------------------------
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index b33ffe6..50ca694 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -141,13 +141,13 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
sal_Int32 nLen = aArguments.getLength();
if ( nLen < 2 || nLen > 3 )
throw lang::IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Wrong count of parameters!" ) ),
+ OUString( "Wrong count of parameters!" ),
uno::Reference< uno::XInterface >(),
0 );
if ( !( aArguments[0] >>= xInstance ) || !xInstance.is() )
throw lang::IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Nonempty reference is expected as the first argument!" ) ),
+ OUString( "Nonempty reference is expected as the first argument!" ),
uno::Reference< uno::XInterface >(),
0 );
@@ -160,15 +160,14 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
)
{
throw lang::IllegalArgumentException(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("The correct modes set is expected as the second argument!" ) ),
+ OUString("The correct modes set is expected as the second argument!"),
uno::Reference< uno::XInterface >(),
0 );
}
if ( nLen == 3 && !( aArguments[2] >>= xApproval ) )
throw lang::IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("If the third argument is provided, it must be XActionsApproval implementation!" ) ),
+ OUString( "If the third argument is provided, it must be XActionsApproval implementation!" ),
uno::Reference< uno::XInterface >(),
0 );
@@ -219,16 +218,16 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OInstanceLocker::getSupportedServiceNa
// Static methods
// --------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames_static()
+uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames_static()
{
- const rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.InstanceLocker" ) );
- return uno::Sequence< rtl::OUString >( &aServiceName, 1 );
+ const OUString aServiceName( "com.sun.star.embed.InstanceLocker" );
+ return uno::Sequence< OUString >( &aServiceName, 1 );
}
// --------------------------------------------------------
-::rtl::OUString SAL_CALL OInstanceLocker::getImplementationName_static()
+OUString SAL_CALL OInstanceLocker::getImplementationName_static()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.InstanceLocker" ) );
+ return OUString( "com.sun.star.comp.embed.InstanceLocker" );
}
// --------------------------------------------------------
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index d5c4656..9d23dee 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -150,12 +150,12 @@ namespace comphelper
const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const
{
// (if ::rtl::OUString had an indexOfAscii, we could save those ugly statics ...)
- static ::rtl::OUString sPH1( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$1$" ) ) );
- static ::rtl::OUString sPH2( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$2$" ) ) );
- static ::rtl::OUString sPH3( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$3$" ) ) );
- static ::rtl::OUString sPH4( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$4$" ) ) );
- static ::rtl::OUString sPH5( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$5$" ) ) );
- static ::rtl::OUString sPH6( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$6$" ) ) );
+ static ::rtl::OUString sPH1( "$1$" );
+ static ::rtl::OUString sPH2( "$2$" );
+ static ::rtl::OUString sPH3( "$3$" );
+ static ::rtl::OUString sPH4( "$4$" );
+ static ::rtl::OUString sPH5( "$5$" );
+ static ::rtl::OUString sPH6( "$6$" );
::rtl::OUString sMessage( _rMessage );
if ( !!_rArgument1 )
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 1957ab6..5bf5201 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -52,43 +52,43 @@ namespace comphelper{
const ::rtl::OUString& MediaDescriptor::PROP_ABORTED()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Aborted"));
+ static const ::rtl::OUString sProp("Aborted");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_ASTEMPLATE()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
+ static const ::rtl::OUString sProp("AsTemplate");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_COMPONENTDATA()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("ComponentData"));
+ static const ::rtl::OUString sProp("ComponentData");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTSERVICE()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("DocumentService"));
+ static const ::rtl::OUString sProp("DocumentService");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_ENCRYPTIONDATA()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("EncryptionData"));
+ static const ::rtl::OUString sProp("EncryptionData");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_FILENAME()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("FileName"));
+ static const ::rtl::OUString sProp("FileName");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_FILTERNAME()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
+ static const ::rtl::OUString sProp("FilterName");
return sProp;
}
@@ -100,55 +100,55 @@ const OUString& MediaDescriptor::PROP_FILTERPROVIDER()
const ::rtl::OUString& MediaDescriptor::PROP_FILTEROPTIONS()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("FilterOptions"));
+ static const ::rtl::OUString sProp("FilterOptions");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_FRAME()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Frame"));
+ static const ::rtl::OUString sProp("Frame");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_FRAMENAME()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("FrameName"));
+ static const ::rtl::OUString sProp("FrameName");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_HIDDEN()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
+ static const ::rtl::OUString sProp("Hidden");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_INPUTSTREAM()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
+ static const ::rtl::OUString sProp("InputStream");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_INTERACTIONHANDLER()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler"));
+ static const ::rtl::OUString sProp("InteractionHandler");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_JUMPMARK()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("JumpMark"));
+ static const ::rtl::OUString sProp("JumpMark");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_MACROEXECUTIONMODE()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode"));
+ static const ::rtl::OUString sProp("MacroExecutionMode");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_MEDIATYPE()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
+ static const ::rtl::OUString sProp("MediaType");
return sProp;
}
@@ -160,31 +160,31 @@ const ::rtl::OUString& MediaDescriptor::PROP_MINIMIZED()
const ::rtl::OUString& MediaDescriptor::PROP_NOAUTOSAVE()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("NoAutoSave"));
+ static const ::rtl::OUString sProp("NoAutoSave");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_OPENNEWVIEW()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("OpenNewView"));
+ static const ::rtl::OUString sProp("OpenNewView");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_OUTPUTSTREAM()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("OutputStream"));
+ static const ::rtl::OUString sProp("OutputStream");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_POSTDATA()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("PostData"));
+ static const ::rtl::OUString sProp("PostData");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_PREVIEW()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Preview"));
+ static const ::rtl::OUString sProp("Preview");
return sProp;
}
@@ -196,31 +196,31 @@ const ::rtl::OUString& MediaDescriptor::PROP_READONLY()
const ::rtl::OUString& MediaDescriptor::PROP_REFERRER()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ static const ::rtl::OUString sProp("Referer");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_STATUSINDICATOR()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator"));
+ static const ::rtl::OUString sProp("StatusIndicator");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_STREAM()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Stream"));
+ static const ::rtl::OUString sProp("Stream");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_STREAMFOROUTPUT()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("StreamForOutput"));
+ static const ::rtl::OUString sProp("StreamForOutput");
return sProp;
}
const ::rtl::OUString& MediaDescriptor::PROP_TEMPLATENAME()
{
- static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("TemplateName"));
+ static const ::rtl::OUString sProp("TemplateName");
return sProp;
}
More information about the Libreoffice-commits
mailing list