[Libreoffice-commits] .: desktop/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 30 02:06:21 PST 2012
desktop/source/migration/migration.cxx | 94 +++++-------
desktop/source/migration/services/basicmigration.cxx | 8 -
desktop/source/migration/services/jvmfwk.cxx | 26 +--
desktop/source/migration/services/oo3extensionmigration.cxx | 28 +--
desktop/source/migration/services/wordbookmigration.cxx | 8 -
5 files changed, 76 insertions(+), 88 deletions(-)
New commits:
commit 99e157ce644ebc86aa9ca778f88df572b90e4e6c
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sun Dec 30 11:04:39 2012 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in desktop/source/migration
removed OUSTR() as well
Change-Id: I420f2e9214db86e1edefae0ed14a6a1faf065cfc
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 1b4115a..d4edf4f 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -126,50 +126,50 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
::rtl::OUString sIdentifier;
if ( sShortName == "StartModule" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule"));
+ sIdentifier = "com.sun.star.frame.StartModule";
else if ( sShortName == "swriter" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
+ sIdentifier = "com.sun.star.text.TextDocument";
else if ( sShortName == "scalc" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"));
+ sIdentifier = "com.sun.star.sheet.SpreadsheetDocument";
else if ( sShortName == "sdraw" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"));
+ sIdentifier = "com.sun.star.drawing.DrawingDocument";
else if ( sShortName == "simpress" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
+ sIdentifier = "com.sun.star.presentation.PresentationDocument";
else if ( sShortName == "smath" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.formula.FormulaProperties"));
+ sIdentifier = "com.sun.star.formula.FormulaProperties";
else if ( sShortName == "schart" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument"));
+ sIdentifier = "com.sun.star.chart2.ChartDocument";
else if ( sShortName == "BasicIDE" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.BasicIDE"));
+ sIdentifier = "com.sun.star.script.BasicIDE";
else if ( sShortName == "dbapp" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"));
+ sIdentifier = "com.sun.star.sdb.OfficeDatabaseDocument";
else if ( sShortName == "sglobal" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument"));
+ sIdentifier = "com.sun.star.text.GlobalDocument";
else if ( sShortName == "sweb" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"));
+ sIdentifier = "com.sun.star.text.WebDocument";
else if ( sShortName == "swxform" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xforms.XMLFormDocument"));
+ sIdentifier = "com.sun.star.xforms.XMLFormDocument";
else if ( sShortName == "sbibliography" )
- sIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography"));
+ sIdentifier = "com.sun.star.frame.Bibliography";
return sIdentifier;
}
bool MigrationImpl::alreadyMigrated()
{
- rtl::OUString MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM("/MIGRATED"));
+ rtl::OUString MIGRATION_STAMP_NAME("/MIGRATED");
rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME;
File aFile(aStr);
// create migration stamp, and/or check its existence
@@ -249,8 +249,8 @@ sal_Bool MigrationImpl::doMigration()
copyFiles();
- const ::rtl::OUString sMenubarResourceURL(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"));
- const ::rtl::OUString sToolbarResourcePre(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/"));
+ const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar");
+ const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/");
for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
{
::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
@@ -258,14 +258,14 @@ sal_Bool MigrationImpl::doMigration()
continue;
uno::Sequence< uno::Any > lArgs(2);
- ::rtl::OUString aOldCfgDataPath = m_aInfo.userdata + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user/config/soffice.cfg/modules/"));
+ ::rtl::OUString aOldCfgDataPath = m_aInfo.userdata + ::rtl::OUString("/user/config/soffice.cfg/modules/");
lArgs[0] <<= aOldCfgDataPath + vModulesInfo[i].sModuleShortName;
lArgs[1] <<= embed::ElementModes::READ;
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
embed::FileSystemStorageFactory::create(comphelper::getComponentContext(m_xFactory)));
uno::Reference< embed::XStorage > xModules(xStorageFactory->createInstanceWithArguments(lArgs), uno::UNO_QUERY);
- uno::Reference< ui::XUIConfigurationManager > xOldCfgManager( m_xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager"))), uno::UNO_QUERY );
+ uno::Reference< ui::XUIConfigurationManager > xOldCfgManager( m_xFactory->createInstance("com.sun.star.ui.UIConfigurationManager"), uno::UNO_QUERY );
uno::Reference< ui::XUIConfigurationStorage > xOldCfgStorage( xOldCfgManager, uno::UNO_QUERY );
uno::Reference< ui::XUIConfigurationPersistence > xOldCfgPersistence( xOldCfgManager, uno::UNO_QUERY );
@@ -342,7 +342,7 @@ void MigrationImpl::setMigrationCompleted()
try
{
uno::Reference< XPropertySet > aPropertySet(getConfigAccess("org.openoffice.Setup/Office", true), uno::UNO_QUERY_THROW);
- aPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("MigrationCompleted")), uno::makeAny(sal_True));
+ aPropertySet->setPropertyValue("MigrationCompleted", uno::makeAny(sal_True));
uno::Reference< XChangesBatch >(aPropertySet, uno::UNO_QUERY_THROW)->commitChanges();
}
catch (...)
@@ -357,8 +357,7 @@ bool MigrationImpl::checkMigrationCompleted()
try {
uno::Reference< XPropertySet > aPropertySet(
getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);
- aPropertySet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("MigrationCompleted"))) >>= bMigrationCompleted;
+ aPropertySet->getPropertyValue("MigrationCompleted") >>= bMigrationCompleted;
if( !bMigrationCompleted && getenv("SAL_DISABLE_USERMIGRATION" ) )
{
@@ -400,8 +399,8 @@ bool MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr
uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW);
uno::Sequence< OUString > seqSupportedVersions = aMigrationAccess->getElementNames();
- const OUString aVersionIdentifiers( RTL_CONSTASCII_USTRINGPARAM( "VersionIdentifiers" ));
- const OUString aPriorityIdentifier( RTL_CONSTASCII_USTRINGPARAM( "Priority" ));
+ const OUString aVersionIdentifiers( "VersionIdentifiers" );
+ const OUString aPriorityIdentifier( "Priority" );
for (sal_Int32 i=0; i<seqSupportedVersions.getLength(); i++)
{
@@ -432,7 +431,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
// get migration description from from org.openoffice.Setup/Migration
// and build vector of migration steps
- OUString aMigrationSteps( RTL_CONSTASCII_USTRINGPARAM( "MigrationSteps" ));
+ OUString aMigrationSteps( "MigrationSteps" );
uno::Reference< XNameAccess > theNameAccess(xMigrationData->getByName(aMigrationSteps), uno::UNO_QUERY_THROW);
uno::Sequence< OUString > seqMigrations = theNameAccess->getElementNames();
uno::Reference< XNameAccess > tmpAccess;
@@ -448,7 +447,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
// read included files from current step description
::rtl::OUString aSeqEntry;
- if (tmpAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IncludedFiles"))) >>= tmpSeq)
+ if (tmpAccess->getByName("IncludedFiles") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
{
@@ -458,35 +457,35 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
}
// exluded files...
- if (tmpAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ExcludedFiles"))) >>= tmpSeq)
+ if (tmpAccess->getByName("ExcludedFiles") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
tmpStep.excludeFiles.push_back(tmpSeq[j]);
}
// included nodes...
- if (tmpAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IncludedNodes"))) >>= tmpSeq)
+ if (tmpAccess->getByName("IncludedNodes") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
tmpStep.includeConfig.push_back(tmpSeq[j]);
}
// excluded nodes...
- if (tmpAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ExcludedNodes"))) >>= tmpSeq)
+ if (tmpAccess->getByName("ExcludedNodes") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
tmpStep.excludeConfig.push_back(tmpSeq[j]);
}
// included extensions...
- if (tmpAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IncludedExtensions"))) >>= tmpSeq)
+ if (tmpAccess->getByName("IncludedExtensions") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
tmpStep.includeExtensions.push_back(tmpSeq[j]);
}
// excluded extensions...
- if (tmpAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ExcludedExtensions"))) >>= tmpSeq)
+ if (tmpAccess->getByName("ExcludedExtensions") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
{
@@ -496,7 +495,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
}
// generic service
- tmpAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("MigrationService"))) >>= tmpStep.service;
+ tmpAccess->getByName("MigrationService") >>= tmpStep.service;
vrMigrations->push_back(tmpStep);
}
@@ -790,7 +789,7 @@ void MigrationImpl::copyConfig() {
// check if the shared registrymodifications.xcu file exists
bool bRegistryModificationsXcuExists = false;
rtl::OUString regFilePath(m_aInfo.userdata);
- regFilePath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user/registrymodifications.xcu"));
+ regFilePath += "/user/registrymodifications.xcu";
File regFile(regFilePath);
::osl::FileBase::RC nError = regFile.open(osl_File_OpenFlag_Read);
if ( nError == ::osl::FileBase::E_None ) {
@@ -805,7 +804,7 @@ void MigrationImpl::copyConfig() {
// the configuration is split in many registry files
// determine the file names from the first element in included paths
rtl::OUStringBuffer buf(m_aInfo.userdata);
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/user/registry/data"));
+ buf.appendAscii("/user/registry/data");
sal_Int32 n = 0;
do {
rtl::OUString seg(i->first.getToken(0, '.', n));
@@ -824,7 +823,7 @@ void MigrationImpl::copyConfig() {
buf.append(sal_Unicode('/'));
buf.append(enc);
} while (n >= 0);
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(".xcu"));
+ buf.appendAscii(".xcu");
regFilePath = buf.toString();
}
configuration::Update::get(
@@ -883,9 +882,9 @@ uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPa
try{
OUString sAccessSrvc;
if (bUpdate)
- sAccessSrvc = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
+ sAccessSrvc = "com.sun.star.configuration.ConfigurationUpdateAccess";
else
- sAccessSrvc = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess"));
+ sAccessSrvc = "com.sun.star.configuration.ConfigurationAccess";
OUString sConfigURL = OUString::createFromAscii(pPath);
@@ -956,11 +955,9 @@ void MigrationImpl::runServices()
{
// Build argument array
uno::Sequence< uno::Any > seqArguments(3);
- seqArguments[0] = uno::makeAny(NamedValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Productname")),
+ seqArguments[0] = uno::makeAny(NamedValue("Productname",
uno::makeAny(m_aInfo.productname)));
- seqArguments[1] = uno::makeAny(NamedValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("UserData")),
+ seqArguments[1] = uno::makeAny(NamedValue("UserData",
uno::makeAny(m_aInfo.userdata)));
@@ -982,8 +979,7 @@ void MigrationImpl::runServices()
if ( nSize > 0 )
seqExtBlackList = comphelper::arrayToSequence< ::rtl::OUString >(
&i_mig->excludeExtensions[0], nSize );
- seqArguments[2] = uno::makeAny(NamedValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ExtensionBlackList")),
+ seqArguments[2] = uno::makeAny(NamedValue("ExtensionBlackList",
uno::makeAny( seqExtBlackList )));
xMigrationJob = uno::Reference< XJob >(m_xFactory->createInstanceWithArguments(
@@ -1016,11 +1012,11 @@ void MigrationImpl::runServices()
::std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules() const
{
::std::vector< MigrationModuleInfo > vModulesInfo;
- const ::rtl::OUString MENUBAR(RTL_CONSTASCII_USTRINGPARAM("menubar"));
- const ::rtl::OUString TOOLBAR(RTL_CONSTASCII_USTRINGPARAM("toolbar"));
+ const ::rtl::OUString MENUBAR("menubar");
+ const ::rtl::OUString TOOLBAR("toolbar");
uno::Sequence< uno::Any > lArgs(2);
- lArgs[0] <<= m_aInfo.userdata + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user/config/soffice.cfg/modules"));
+ lArgs[0] <<= m_aInfo.userdata + "/user/config/soffice.cfg/modules";
lArgs[1] <<= embed::ElementModes::READ;
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
@@ -1056,7 +1052,7 @@ void MigrationImpl::runServices()
uno::Reference< embed::XStorage > xToolbar = xModule->openStorageElement(TOOLBAR, embed::ElementModes::READ);
if (xToolbar.is())
{
- const ::rtl::OUString RESOURCEURL_CUSTOM_ELEMENT(RTL_CONSTASCII_USTRINGPARAM("custom_"));
+ const ::rtl::OUString RESOURCEURL_CUSTOM_ELEMENT("custom_");
sal_Int32 nCustomLen = 7;
uno::Reference< container::XNameAccess > xNameAccess = uno::Reference< container::XNameAccess >(xToolbar, uno::UNO_QUERY);
@@ -1093,7 +1089,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
const uno::Reference< container::XIndexContainer >& xIndexNew,
const ::rtl::OUString& sResourceURL)
{
- const ::rtl::OUString MENU_SEPERATOR(RTL_CONSTASCII_USTRINGPARAM(" | "));
+ const ::rtl::OUString MENU_SEPERATOR(" | ");
::std::vector< MigrationItem > vOldItems;
::std::vector< MigrationItem > vNewItems;
@@ -1366,8 +1362,8 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules
m_lNewVersionMenubarSettingsSeq.realloc(vModulesInfo.size());
m_lNewVersionToolbarSettingsSeq.realloc(vModulesInfo.size());
- const ::rtl::OUString sMenubarResourceURL(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"));
- const ::rtl::OUString sToolbarResourcePre(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/"));
+ const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar");
+ const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/");
uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = ui::ModuleUIConfigurationManagerSupplier::create( ::comphelper::getProcessComponentContext() );
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index f3550da..f153b5f 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -32,8 +32,8 @@ namespace migration
//.........................................................................
- #define sSourceUserBasic ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/user/basic"))
- #define sTargetUserBasic ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/user/__basic_80"))
+ #define sSourceUserBasic ::rtl::OUString( "/user/basic" )
+ #define sTargetUserBasic ::rtl::OUString( "/user/__basic_80" )
// =============================================================================
// component operations
@@ -41,7 +41,7 @@ namespace migration
::rtl::OUString BasicMigration_getImplementationName()
{
- return ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.desktop.migration.Basic"));
+ return ::rtl::OUString("com.sun.star.comp.desktop.migration.Basic");
}
// -----------------------------------------------------------------------------
@@ -49,7 +49,7 @@ namespace migration
Sequence< ::rtl::OUString > BasicMigration_getSupportedServiceNames()
{
Sequence< ::rtl::OUString > aNames(1);
- aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.migration.Basic" ) );
+ aNames.getArray()[0] = "com.sun.star.migration.Basic";
return aNames;
}
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 6a6067f..db87622 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -43,8 +43,6 @@
#include "osl/thread.hxx"
using ::rtl::OUString;
-#define OUSTR(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
-
#define SERVICE_NAME "com.sun.star.migration.Java"
#define IMPL_NAME "com.sun.star.comp.desktop.migration.Java"
@@ -219,12 +217,12 @@ JavaMigration::~JavaMigration()
OUString jvmfwk_getImplementationName()
{
- return OUSTR(IMPL_NAME);
+ return OUString(IMPL_NAME);
}
css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames()
{
- OUString str_name = OUSTR(SERVICE_NAME);
+ OUString str_name = SERVICE_NAME;
return css::uno::Sequence< OUString >( &str_name, 1 );
}
@@ -317,8 +315,8 @@ void JavaMigration::migrateJavarc()
return;
OUString sValue;
- rtl::Bootstrap javaini(m_sUserDir + OUSTR( "/user/config/" SAL_CONFIGFILE("java") ));
- sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue);
+ rtl::Bootstrap javaini(m_sUserDir + "/user/config/" + SAL_CONFIGFILE("java"));
+ sal_Bool bSuccess = javaini.getFrom("Home", sValue);
OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
"] XJob::execute: Could not get Home entry from java.ini/javarc.");
if (bSuccess == sal_True && !sValue.isEmpty())
@@ -430,12 +428,12 @@ void SAL_CALL JavaMigration::setPropertyValue(
sal_Bool val = sal_Bool();
if ((aValue >>= val) == sal_False)
throw MalformedDataException(
- OUSTR("[Service implementation " IMPL_NAME
- "] XLayerHandler::setPropertyValue received wrong type for Enable property"), 0, Any());
+ OUString("[Service implementation ") + IMPL_NAME +
+ "] XLayerHandler::setPropertyValue received wrong type for Enable property", 0, Any());
if (jfw_setEnabled(val) != JFW_E_NONE)
throw WrappedTargetException(
- OUSTR("[Service implementation " IMPL_NAME
- "] XLayerHandler::setPropertyValue: jfw_setEnabled failed."), 0, Any());
+ OUString("[Service implementation ") + IMPL_NAME +
+ "] XLayerHandler::setPropertyValue: jfw_setEnabled failed.", 0, Any());
break;
}
@@ -444,13 +442,13 @@ void SAL_CALL JavaMigration::setPropertyValue(
OUString cp;
if ((aValue >>= cp) == sal_False)
throw MalformedDataException(
- OUSTR("[Service implementation " IMPL_NAME
- "] XLayerHandler::setPropertyValue received wrong type for UserClassPath property"), 0, Any());
+ OUString("[Service implementation ") + IMPL_NAME +
+ "] XLayerHandler::setPropertyValue received wrong type for UserClassPath property", 0, Any());
if (jfw_setUserClassPath(cp.pData) != JFW_E_NONE)
throw WrappedTargetException(
- OUSTR("[Service implementation " IMPL_NAME
- "] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed."), 0, Any());
+ OUString("[Service implementation ") + IMPL_NAME +
+ "] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed.", 0, Any());
break;
}
default:
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index aed03fa..023c480 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -47,10 +47,10 @@ using namespace ::com::sun::star::uno;
namespace migration
{
-static ::rtl::OUString sExtensionSubDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/uno_packages/" ) );
-static ::rtl::OUString sSubDirName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cache" ) );
-static ::rtl::OUString sDescriptionXmlFile = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/description.xml" ) );
-static ::rtl::OUString sExtensionRootSubDirName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/uno_packages" ) );
+static ::rtl::OUString sExtensionSubDir( "/user/uno_packages/" );
+static ::rtl::OUString sSubDirName( "cache" );
+static ::rtl::OUString sDescriptionXmlFile( "/description.xml" );
+static ::rtl::OUString sExtensionRootSubDirName( "/uno_packages" );
// =============================================================================
// component operations
@@ -64,7 +64,7 @@ static ::rtl::OUString sExtensionRootSubDirName = ::rtl::OUString( RTL_CONSTASCI
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pImplName )
{
- static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.desktop.migration.OOo3Extensions" ) );
+ static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" );
pImplName = &aImplName;
}
}
@@ -82,7 +82,7 @@ Sequence< ::rtl::OUString > OO3ExtensionMigration_getSupportedServiceNames()
if ( !pNames )
{
static Sequence< ::rtl::OUString > aNames(1);
- aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.migration.Extensions" ) );
+ aNames.getArray()[0] = "com.sun.star.migration.Extensions";
pNames = &aNames;
}
}
@@ -229,25 +229,19 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
if ( xRoot.is() && xRoot->getTagName() == "description" )
{
uno::Reference< xml::xpath::XXPathAPI > xPath(
- m_ctx->getServiceManager()->createInstanceWithContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.xpath.XPathAPI")),
+ m_ctx->getServiceManager()->createInstanceWithContext( "com.sun.star.xml.xpath.XPathAPI",
m_ctx),
uno::UNO_QUERY);
- xPath->registerNS(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc")),
- xRoot->getNamespaceURI());
- xPath->registerNS(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xlink")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.w3.org/1999/xlink")));
+ xPath->registerNS("desc", xRoot->getNamespaceURI());
+ xPath->registerNS("xlink", "http://www.w3.org/1999/xlink");
try
{
uno::Reference< xml::dom::XNode > xRootNode( xRoot, uno::UNO_QUERY );
uno::Reference< xml::dom::XNode > xNode(
xPath->selectSingleNode(
- xRootNode,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:identifier/@value")) ));
+ xRootNode, "desc:identifier/@value" ));
if ( xNode.is() )
aExtIdentifier = xNode->getNodeValue();
}
@@ -328,7 +322,7 @@ bool OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir
uno::Reference< deployment::XPackage > xPackage =
m_xExtensionManager->addExtension(
sSourceDir, uno::Sequence<beans::NamedValue>(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), xAbortChannel, xCmdEnv );
+ "user", xAbortChannel, xCmdEnv );
if ( xPackage.is() )
return true;
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index d5b9980..e34c550 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -32,8 +32,8 @@ namespace migration
//.........................................................................
- static ::rtl::OUString sSourceSubDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/wordbook" ) );
- static ::rtl::OUString sTargetSubDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/wordbook" ) );
+ static ::rtl::OUString sSourceSubDir( "/user/wordbook" );
+ static ::rtl::OUString sTargetSubDir( "/user/wordbook" );
// =============================================================================
@@ -48,7 +48,7 @@ namespace migration
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pImplName )
{
- static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.desktop.migration.Wordbooks" ) );
+ static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" );
pImplName = &aImplName;
}
}
@@ -66,7 +66,7 @@ namespace migration
if ( !pNames )
{
static Sequence< ::rtl::OUString > aNames(1);
- aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.migration.Wordbooks" ) );
+ aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.migration.Wordbooks" );
pNames = &aNames;
}
}
More information about the Libreoffice-commits
mailing list