summaryrefslogtreecommitdiff
path: root/desktop/source/migration
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/migration')
-rw-r--r--desktop/source/migration/migration.cxx158
-rw-r--r--desktop/source/migration/migration_impl.hxx62
-rw-r--r--desktop/source/migration/services/basicmigration.cxx30
-rw-r--r--desktop/source/migration/services/basicmigration.hxx14
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx35
-rw-r--r--desktop/source/migration/services/jvmfwk.hxx4
-rw-r--r--desktop/source/migration/services/misc.hxx2
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx44
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx22
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx38
-rw-r--r--desktop/source/migration/services/wordbookmigration.hxx14
11 files changed, 210 insertions, 213 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index cc4eb29f9463..9e9ba16d04a6 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -70,8 +70,6 @@ using namespace com::sun::star::container;
using com::sun::star::uno::Exception;
using namespace com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OString;
namespace desktop {
@@ -79,9 +77,9 @@ static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer";
static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
-::rtl::OUString retrieveLabelFromCommand(const ::rtl::OUString& sCommand, const ::rtl::OUString& sModuleIdentifier)
+OUString retrieveLabelFromCommand(const OUString& sCommand, const OUString& sModuleIdentifier)
{
- ::rtl::OUString sLabel;
+ OUString sLabel;
uno::Reference< container::XNameAccess > xUICommands;
uno::Reference< container::XNameAccess > const xNameAccess(
@@ -92,7 +90,7 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
{
if ( !sCommand.isEmpty() )
{
- rtl::OUString aStr;
+ OUString aStr;
::uno::Sequence< beans::PropertyValue > aPropSeq;
try
{
@@ -125,9 +123,9 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
return sLabel;
}
-::rtl::OUString mapModuleShortNameToIdentifier(const ::rtl::OUString& sShortName)
+OUString mapModuleShortNameToIdentifier(const OUString& sShortName)
{
- ::rtl::OUString sIdentifier;
+ OUString sIdentifier;
if ( sShortName == "StartModule" )
sIdentifier = "com.sun.star.frame.StartModule";
@@ -173,13 +171,13 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
bool MigrationImpl::alreadyMigrated()
{
- rtl::OUString MIGRATION_STAMP_NAME("/MIGRATED4");
- rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME;
+ OUString MIGRATION_STAMP_NAME("/MIGRATED4");
+ OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME;
File aFile(aStr);
// create migration stamp, and/or check its existence
bool bRet = aFile.open (osl_File_OpenFlag_Write | osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock) == FileBase::E_EXIST;
OSL_TRACE( "File '%s' exists? %d\n",
- rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US).getStr(),
+ OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US).getStr(),
bRet );
return bRet;
}
@@ -252,16 +250,16 @@ sal_Bool MigrationImpl::doMigration()
copyFiles();
- const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar");
- const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/");
+ const OUString sMenubarResourceURL("private:resource/menubar/menubar");
+ const OUString sToolbarResourcePre("private:resource/toolbar/");
for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
{
- ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
+ OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
if (sModuleIdentifier.isEmpty())
continue;
uno::Sequence< uno::Any > lArgs(2);
- ::rtl::OUString aOldCfgDataPath = m_aInfo.userdata + ::rtl::OUString("/user/config/soffice.cfg/modules/");
+ OUString aOldCfgDataPath = m_aInfo.userdata + OUString("/user/config/soffice.cfg/modules/");
lArgs[0] <<= aOldCfgDataPath + vModulesInfo[i].sModuleShortName;
lArgs[1] <<= embed::ElementModes::READ;
@@ -282,7 +280,7 @@ sal_Bool MigrationImpl::doMigration()
{
uno::Reference< container::XIndexContainer > xOldVersionMenuSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sMenubarResourceURL, sal_True), uno::UNO_QUERY);
uno::Reference< container::XIndexContainer > xNewVersionMenuSettings = aNewVersionUIInfo.getNewMenubarSettings(vModulesInfo[i].sModuleShortName);
- ::rtl::OUString sParent;
+ OUString sParent;
compareOldAndNewConfig(sParent, xOldVersionMenuSettings, xNewVersionMenuSettings, sMenubarResourceURL);
mergeOldToNewVersion(xCfgManager, xNewVersionMenuSettings, sModuleIdentifier, sMenubarResourceURL);
}
@@ -292,12 +290,12 @@ sal_Bool MigrationImpl::doMigration()
{
for (sal_Int32 j=0; j<nToolbars; ++j)
{
- ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
- ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
+ OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
+ OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
uno::Reference< container::XIndexContainer > xOldVersionToolbarSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sToolbarResourceURL, sal_True), uno::UNO_QUERY);
uno::Reference< container::XIndexContainer > xNewVersionToolbarSettings = aNewVersionUIInfo.getNewToolbarSettings(vModulesInfo[i].sModuleShortName, sToolbarName);
- ::rtl::OUString sParent;
+ OUString sParent;
compareOldAndNewConfig(sParent, xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL);
mergeOldToNewVersion(xCfgManager, xNewVersionToolbarSettings, sModuleIdentifier, sToolbarResourceURL);
}
@@ -418,13 +416,13 @@ bool MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr
aSupportedMigration.supported_versions.push_back(seqVersions[j].trim());
insertSorted( rAvailableMigrations, aSupportedMigration );
OSL_TRACE( " available migration '%s'\n",
- rtl::OUStringToOString( aSupportedMigration.name, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OUStringToOString( aSupportedMigration.name, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
return true;
}
-migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigrationName)
+migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName)
{
// get migration access
uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW);
@@ -447,7 +445,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
tmpStep.name = seqMigrations[i];
// read included files from current step description
- ::rtl::OUString aSeqEntry;
+ OUString aSeqEntry;
if (tmpAccess->getByName("IncludedFiles") >>= tmpSeq)
{
for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
@@ -551,10 +549,10 @@ OUString MigrationImpl::preXDGConfigDir(const OUString& rConfigDir)
void MigrationImpl::setInstallInfoIfExist(
install_info& aInfo,
- const ::rtl::OUString& rConfigDir,
- const ::rtl::OUString& rVersion)
+ const OUString& rConfigDir,
+ const OUString& rVersion)
{
- rtl::OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::NO_DECODE));
+ OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::NO_DECODE));
osl::DirectoryItem item;
osl::FileStatus stat(osl_FileStatus_Mask_Type);
@@ -583,7 +581,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions)
strings_v::const_iterator i_ver = rVersions.begin();
while (i_ver != rVersions.end())
{
- ::rtl::OUString aVersion, aProfileName;
+ OUString aVersion, aProfileName;
sal_Int32 nSeparatorIndex = (*i_ver).indexOf('=');
if ( nSeparatorIndex != -1 )
{
@@ -629,9 +627,9 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available
}
OSL_TRACE( " preferred migration is from product '%s'\n",
- rtl::OUStringToOString( m_aInfo.productname, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OUStringToOString( m_aInfo.productname, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( " and settings directory '%s'\n",
- rtl::OUStringToOString( m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OUStringToOString( m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US ).getStr() );
return nIndex;
}
@@ -744,19 +742,19 @@ strings_vr MigrationImpl::compileFileList()
namespace {
struct componentParts {
- std::set< rtl::OUString > includedPaths;
- std::set< rtl::OUString > excludedPaths;
+ std::set< OUString > includedPaths;
+ std::set< OUString > excludedPaths;
};
-typedef std::map< rtl::OUString, componentParts > Components;
+typedef std::map< OUString, componentParts > Components;
-bool getComponent(rtl::OUString const & path, rtl::OUString * component) {
+bool getComponent(OUString const & path, OUString * component) {
OSL_ASSERT(component != 0);
if (path.isEmpty() || path[0] != '/') {
OSL_TRACE(
("configuration migration in/exclude path %s ignored (does not"
" start with slash)"),
- rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr());
return false;
}
sal_Int32 i = path.indexOf('/', 1);
@@ -764,14 +762,14 @@ bool getComponent(rtl::OUString const & path, rtl::OUString * component) {
return true;
}
-uno::Sequence< rtl::OUString > setToSeq(std::set< rtl::OUString > const & set) {
- std::set< rtl::OUString >::size_type n = set.size();
+uno::Sequence< OUString > setToSeq(std::set< OUString > const & set) {
+ std::set< OUString >::size_type n = set.size();
if (n > SAL_MAX_INT32) {
throw std::bad_alloc();
}
- uno::Sequence< rtl::OUString > seq(static_cast< sal_Int32 >(n));
+ uno::Sequence< OUString > seq(static_cast< sal_Int32 >(n));
sal_Int32 i = 0;
- for (std::set< rtl::OUString >::const_iterator j(set.begin());
+ for (std::set< OUString >::const_iterator j(set.begin());
j != set.end(); ++j)
{
seq[i++] = *j;
@@ -789,7 +787,7 @@ void MigrationImpl::copyConfig() {
for (strings_v::const_iterator j(i->includeConfig.begin());
j != i->includeConfig.end(); ++j)
{
- rtl::OUString comp;
+ OUString comp;
if (getComponent(*j, &comp)) {
comps[comp].includedPaths.insert(*j);
}
@@ -797,7 +795,7 @@ void MigrationImpl::copyConfig() {
for (strings_v::const_iterator j(i->excludeConfig.begin());
j != i->excludeConfig.end(); ++j)
{
- rtl::OUString comp;
+ OUString comp;
if (getComponent(*j, &comp)) {
comps[comp].excludedPaths.insert(*j);
}
@@ -806,7 +804,7 @@ void MigrationImpl::copyConfig() {
// check if the shared registrymodifications.xcu file exists
bool bRegistryModificationsXcuExists = false;
- rtl::OUString regFilePath(m_aInfo.userdata);
+ OUString regFilePath(m_aInfo.userdata);
regFilePath += "/user/registrymodifications.xcu";
File regFile(regFilePath);
::osl::FileBase::RC nError = regFile.open(osl_File_OpenFlag_Read);
@@ -821,12 +819,12 @@ void MigrationImpl::copyConfig() {
// shared registrymodifications.xcu does not exists
// 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);
+ OUStringBuffer buf(m_aInfo.userdata);
buf.appendAscii("/user/registry/data");
sal_Int32 n = 0;
do {
- rtl::OUString seg(i->first.getToken(0, '.', n));
- rtl::OUString enc(
+ OUString seg(i->first.getToken(0, '.', n));
+ OUString enc(
rtl::Uri::encode(
seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
RTL_TEXTENCODING_UTF8));
@@ -834,7 +832,7 @@ void MigrationImpl::copyConfig() {
OSL_TRACE(
("configuration migration component %s ignored (cannot"
" be encoded as file path)"),
- rtl::OUStringToOString(
+ OUStringToOString(
i->first, RTL_TEXTENCODING_UTF8).getStr());
goto next;
}
@@ -853,7 +851,7 @@ void MigrationImpl::copyConfig() {
OSL_TRACE(
("configuration migration component %s ignored (only excludes,"
" no includes)"),
- rtl::OUStringToOString(
+ OUStringToOString(
i->first, RTL_TEXTENCODING_UTF8).getStr());
}
next:;
@@ -959,10 +957,10 @@ void MigrationImpl::runServices()
try
{
// set black list for extension migration
- uno::Sequence< rtl::OUString > seqExtBlackList;
+ uno::Sequence< OUString > seqExtBlackList;
sal_uInt32 nSize = i_mig->excludeExtensions.size();
if ( nSize > 0 )
- seqExtBlackList = comphelper::arrayToSequence< ::rtl::OUString >(
+ seqExtBlackList = comphelper::arrayToSequence< OUString >(
&i_mig->excludeExtensions[0], nSize );
seqArguments[2] = uno::makeAny(NamedValue("ExtensionBlackList",
uno::makeAny( seqExtBlackList )));
@@ -998,8 +996,8 @@ void MigrationImpl::runServices()
::std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules() const
{
::std::vector< MigrationModuleInfo > vModulesInfo;
- const ::rtl::OUString MENUBAR("menubar");
- const ::rtl::OUString TOOLBAR("toolbar");
+ const OUString MENUBAR("menubar");
+ const OUString TOOLBAR("toolbar");
uno::Sequence< uno::Any > lArgs(2);
lArgs[0] <<= m_aInfo.userdata + "/user/config/soffice.cfg/modules";
@@ -1014,11 +1012,11 @@ void MigrationImpl::runServices()
return vModulesInfo;
uno::Reference< container::XNameAccess > xAccess = uno::Reference< container::XNameAccess >(xModules, uno::UNO_QUERY);
- uno::Sequence< ::rtl::OUString > lNames = xAccess->getElementNames();
+ uno::Sequence< OUString > lNames = xAccess->getElementNames();
sal_Int32 nLength = lNames.getLength();
for (sal_Int32 i=0; i<nLength; ++i)
{
- ::rtl::OUString sModuleShortName = lNames[i];
+ OUString sModuleShortName = lNames[i];
uno::Reference< embed::XStorage > xModule = xModules->openStorageElement(sModuleShortName, embed::ElementModes::READ);
if (xModule.is())
{
@@ -1038,14 +1036,14 @@ void MigrationImpl::runServices()
uno::Reference< embed::XStorage > xToolbar = xModule->openStorageElement(TOOLBAR, embed::ElementModes::READ);
if (xToolbar.is())
{
- const ::rtl::OUString RESOURCEURL_CUSTOM_ELEMENT("custom_");
+ const OUString RESOURCEURL_CUSTOM_ELEMENT("custom_");
sal_Int32 nCustomLen = 7;
uno::Reference< container::XNameAccess > xNameAccess = uno::Reference< container::XNameAccess >(xToolbar, uno::UNO_QUERY);
- ::uno::Sequence< ::rtl::OUString > lToolbars = xNameAccess->getElementNames();
+ ::uno::Sequence< OUString > lToolbars = xNameAccess->getElementNames();
for (sal_Int32 j=0; j<lToolbars.getLength(); ++j)
{
- ::rtl::OUString sToolbarName = lToolbars[j];
+ OUString sToolbarName = lToolbars[j];
if (sToolbarName.getLength()>=nCustomLen &&
sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT))
continue;
@@ -1054,8 +1052,8 @@ void MigrationImpl::runServices()
sal_Int32 nIndex = sToolbarName.lastIndexOf('.');
if (nIndex > 0)
{
- ::rtl::OUString sExtension(sToolbarName.copy(nIndex));
- ::rtl::OUString sToolbarResourceName(sToolbarName.copy(0, nIndex));
+ OUString sExtension(sToolbarName.copy(nIndex));
+ OUString sToolbarResourceName(sToolbarName.copy(0, nIndex));
if (!sToolbarResourceName.isEmpty() && sExtension.equalsAsciiL(".xml", 4))
aModuleInfo.m_vToolbars.push_back(sToolbarResourceName);
}
@@ -1070,12 +1068,12 @@ void MigrationImpl::runServices()
return vModulesInfo;
}
-void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
+void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
const uno::Reference< container::XIndexContainer >& xIndexOld,
const uno::Reference< container::XIndexContainer >& xIndexNew,
- const ::rtl::OUString& sResourceURL)
+ const OUString& sResourceURL)
{
- const ::rtl::OUString MENU_SEPERATOR(" | ");
+ const OUString MENU_SEPERATOR(" | ");
::std::vector< MigrationItem > vOldItems;
::std::vector< MigrationItem > vNewItems;
@@ -1121,13 +1119,13 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
::std::vector< MigrationItem >::iterator it;
- ::rtl::OUString sSibling;
+ OUString sSibling;
for (it = vOldItems.begin(); it!=vOldItems.end(); ++it)
{
::std::vector< MigrationItem >::iterator pFound = ::std::find(vNewItems.begin(), vNewItems.end(), *it);
if (pFound != vNewItems.end() && it->m_xPopupMenu.is())
{
- ::rtl::OUString sName;
+ OUString sName;
if (!sParent.isEmpty())
sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
else
@@ -1159,7 +1157,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
::std::vector< MigrationItem >::iterator pFound = ::std::find(vOldItems.begin(), vOldItems.end(), *it);
if (pFound != vOldItems.end() && it->m_xPopupMenu.is())
{
- ::rtl::OUString sName;
+ OUString sName;
if (!sParent.isEmpty())
sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
else
@@ -1186,8 +1184,8 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager,
const uno::Reference< container::XIndexContainer>& xIndexContainer,
- const ::rtl::OUString& sModuleIdentifier,
- const ::rtl::OUString& sResourceURL)
+ const OUString& sModuleIdentifier,
+ const OUString& sResourceURL)
{
MigrationHashMap::iterator pFound = m_aOldVersionItemsHashMap.find(sResourceURL);
if (pFound==m_aOldVersionItemsHashMap.end())
@@ -1198,26 +1196,26 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
{
uno::Reference< container::XIndexContainer > xTemp = xIndexContainer;
- ::rtl::OUString sParentNodeName = it->m_sParentNodeName;
+ OUString sParentNodeName = it->m_sParentNodeName;
sal_Int32 nIndex = 0;
do
{
- ::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim();
+ OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim();
if (sToken.isEmpty())
break;
sal_Int32 nCount = xTemp->getCount();
for (sal_Int32 i=0; i<nCount; ++i)
{
- ::rtl::OUString sCommandURL;
- ::rtl::OUString sLabel;
+ OUString sCommandURL;
+ OUString sLabel;
uno::Reference< container::XIndexContainer > xChild;
uno::Sequence< beans::PropertyValue > aPropSeq;
xTemp->getByIndex(i) >>= aPropSeq;
for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j)
{
- ::rtl::OUString sPropName = aPropSeq[j].Name;
+ OUString sPropName = aPropSeq[j].Name;
if ( sPropName == ITEM_DESCRIPTOR_COMMANDURL )
aPropSeq[j].Value >>= sCommandURL;
else if ( sPropName == ITEM_DESCRIPTOR_LABEL )
@@ -1239,11 +1237,11 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
{
uno::Sequence< beans::PropertyValue > aPropSeq(3);
- aPropSeq[0].Name = rtl::OUString(ITEM_DESCRIPTOR_COMMANDURL);
+ aPropSeq[0].Name = OUString(ITEM_DESCRIPTOR_COMMANDURL);
aPropSeq[0].Value <<= it->m_sCommandURL;
- aPropSeq[1].Name = rtl::OUString(ITEM_DESCRIPTOR_LABEL);
+ aPropSeq[1].Name = OUString(ITEM_DESCRIPTOR_LABEL);
aPropSeq[1].Value <<= retrieveLabelFromCommand(it->m_sCommandURL, sModuleIdentifier);
- aPropSeq[2].Name = rtl::OUString(ITEM_DESCRIPTOR_CONTAINER);
+ aPropSeq[2].Name = OUString(ITEM_DESCRIPTOR_CONTAINER);
aPropSeq[2].Value <<= it->m_xPopupMenu;
if (it->m_sPrevSibling.isEmpty())
@@ -1254,7 +1252,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
sal_Int32 i = 0;
for (; i<nCount; ++i)
{
- ::rtl::OUString sCmd;
+ OUString sCmd;
uno::Sequence< beans::PropertyValue > aTempPropSeq;
xTemp->getByIndex(i) >>= aTempPropSeq;
for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j)
@@ -1284,7 +1282,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
xUIConfigurationPersistence->store();
}
-uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const ::rtl::OUString& sModuleShortName) const
+uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const OUString& sModuleShortName) const
{
uno::Reference< ui::XUIConfigurationManager > xCfgManager;
@@ -1300,7 +1298,7 @@ uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager
return xCfgManager;
}
-uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const
+uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSettings(const OUString& sModuleShortName) const
{
uno::Reference< container::XIndexContainer > xNewMenuSettings;
@@ -1316,7 +1314,7 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSett
return xNewMenuSettings;
}
-uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const
+uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSettings(const OUString& sModuleShortName, const OUString& sToolbarName) const
{
uno::Reference< container::XIndexContainer > xNewToolbarSettings;
@@ -1348,14 +1346,14 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules
m_lNewVersionMenubarSettingsSeq.realloc(vModulesInfo.size());
m_lNewVersionToolbarSettingsSeq.realloc(vModulesInfo.size());
- const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar");
- const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/");
+ const OUString sMenubarResourceURL("private:resource/menubar/menubar");
+ const OUString sToolbarResourcePre("private:resource/toolbar/");
uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = ui::ModuleUIConfigurationManagerSupplier::create( ::comphelper::getProcessComponentContext() );
for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
{
- ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
+ OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
if (!sModuleIdentifier.isEmpty())
{
uno::Reference< ui::XUIConfigurationManager > xCfgManager = xModuleCfgSupplier->getUIConfigurationManager(sModuleIdentifier);
@@ -1374,8 +1372,8 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules
uno::Sequence< beans::PropertyValue > lPropSeq(nToolbars);
for (sal_Int32 j=0; j<nToolbars; ++j)
{
- ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
- ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
+ OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
+ OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
lPropSeq[j].Name = sToolbarName;
lPropSeq[j].Value <<= xCfgManager->getSettings(sToolbarResourceURL, sal_True);
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 714a7e485ce5..a92de8546f02 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -46,28 +46,28 @@ namespace desktop
struct install_info
{
- rtl::OUString productname; // human readeable product name
- rtl::OUString userdata; // file: url for user installation
+ OUString productname; // human readeable product name
+ OUString userdata; // file: url for user installation
};
-typedef std::vector< rtl::OUString > strings_v;
+typedef std::vector< OUString > strings_v;
typedef std::auto_ptr< strings_v > strings_vr;
struct migration_step
{
- rtl::OUString name;
+ OUString name;
strings_v includeFiles;
strings_v excludeFiles;
strings_v includeConfig;
strings_v excludeConfig;
strings_v includeExtensions;
strings_v excludeExtensions;
- rtl::OUString service;
+ OUString service;
};
struct supported_migration
{
- rtl::OUString name;
+ OUString name;
sal_Int32 nPriority;
strings_v supported_versions;
};
@@ -83,9 +83,9 @@ typedef std::vector< supported_migration > migrations_available;
*/
struct MigrationItem
{
- ::rtl::OUString m_sParentNodeName;
- ::rtl::OUString m_sPrevSibling;
- ::rtl::OUString m_sCommandURL;
+ OUString m_sParentNodeName;
+ OUString m_sPrevSibling;
+ OUString m_sCommandURL;
css::uno::Reference< css::container::XIndexContainer > m_xPopupMenu;
MigrationItem()
@@ -93,9 +93,9 @@ struct MigrationItem
{
}
- MigrationItem(const ::rtl::OUString& sParentNodeName,
- const ::rtl::OUString& sPrevSibling,
- const ::rtl::OUString& sCommandURL,
+ MigrationItem(const OUString& sParentNodeName,
+ const OUString& sPrevSibling,
+ const OUString& sCommandURL,
const css::uno::Reference< css::container::XIndexContainer > xPopupMenu)
{
m_sParentNodeName = sParentNodeName;
@@ -122,22 +122,22 @@ struct MigrationItem
aMigrationItem.m_xPopupMenu.is() == m_xPopupMenu.is() );
}
- ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; }
+ OUString GetPrevSibling() const { return m_sPrevSibling; }
};
-typedef ::boost::unordered_map< ::rtl::OUString,
+typedef ::boost::unordered_map< OUString,
::std::vector< MigrationItem >,
- ::rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > MigrationHashMap;
+ OUStringHash,
+ ::std::equal_to< OUString > > MigrationHashMap;
struct MigrationItemInfo
{
- ::rtl::OUString m_sResourceURL;
+ OUString m_sResourceURL;
MigrationItem m_aMigrationItem;
MigrationItemInfo(){}
- MigrationItemInfo(const ::rtl::OUString& sResourceURL, const MigrationItem& aMigrationItem)
+ MigrationItemInfo(const OUString& sResourceURL, const MigrationItem& aMigrationItem)
: m_sResourceURL(sResourceURL), m_aMigrationItem(aMigrationItem)
{
}
@@ -149,9 +149,9 @@ struct MigrationItemInfo
*/
struct MigrationModuleInfo
{
- ::rtl::OUString sModuleShortName;
+ OUString sModuleShortName;
sal_Bool bHasMenubar;
- ::std::vector< ::rtl::OUString > m_vToolbars;
+ ::std::vector< OUString > m_vToolbars;
MigrationModuleInfo():bHasMenubar(sal_False){};
};
@@ -164,9 +164,9 @@ class NewVersionUIInfo
{
public:
- css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const ::rtl::OUString& sModuleShortName) const;
- css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const;
- css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const;
+ css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const OUString& sModuleShortName) const;
+ css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const OUString& sModuleShortName) const;
+ css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const OUString& sModuleShortName, const OUString& sToolbarName) const;
void init(const ::std::vector< MigrationModuleInfo >& vModulesInfo);
private:
@@ -188,12 +188,12 @@ private:
strings_vr m_vrFileList; // final list of files to be copied
MigrationHashMap m_aOldVersionItemsHashMap;
MigrationHashMap m_aNewVersionItemsHashMap;
- ::rtl::OUString m_sModuleIdentifier;
+ OUString m_sModuleIdentifier;
// functions to control the migration process
bool readAvailableMigrations(migrations_available&);
bool alreadyMigrated();
- migrations_vr readMigrationSteps(const ::rtl::OUString& rMigrationName);
+ migrations_vr readMigrationSteps(const OUString& rMigrationName);
sal_Int32 findPreferedMigrationProcess(const migrations_available&);
#if defined UNX && ! defined MACOSX
OUString preXDGConfigDir(const OUString& rConfigDir);
@@ -203,19 +203,19 @@ private:
strings_vr compileFileList();
// helpers
- strings_vr getAllFiles(const rtl::OUString& baseURL) const;
+ strings_vr getAllFiles(const OUString& baseURL) const;
strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False);
::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
- void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName,
+ void compareOldAndNewConfig(const OUString& sParentNodeName,
const css::uno::Reference< css::container::XIndexContainer >& xOldIndexContainer,
const css::uno::Reference< css::container::XIndexContainer >& xNewIndexContainer,
- const ::rtl::OUString& sToolbarName);
+ const OUString& sToolbarName);
void mergeOldToNewVersion(const css::uno::Reference< css::ui::XUIConfigurationManager >& xCfgManager,
const css::uno::Reference< css::container::XIndexContainer>& xIndexContainer,
- const ::rtl::OUString& sModuleIdentifier,
- const ::rtl::OUString& sResourceURL);
+ const OUString& sModuleIdentifier,
+ const OUString& sResourceURL);
// actual processing function that perform the migration steps
void copyFiles();
@@ -231,7 +231,7 @@ public:
~MigrationImpl();
bool initializeMigration();
sal_Bool doMigration();
- rtl::OUString getOldVersionName();
+ OUString getOldVersionName();
};
}
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 99bbe7687da0..c35a167e8a94 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -33,23 +33,23 @@ namespace migration
//.........................................................................
- #define sSourceUserBasic ::rtl::OUString( "/user/basic" )
- #define sTargetUserBasic ::rtl::OUString( "/user/__basic_80" )
+ #define sSourceUserBasic OUString( "/user/basic" )
+ #define sTargetUserBasic OUString( "/user/__basic_80" )
// =============================================================================
// component operations
// =============================================================================
- ::rtl::OUString BasicMigration_getImplementationName()
+ OUString BasicMigration_getImplementationName()
{
- return ::rtl::OUString("com.sun.star.comp.desktop.migration.Basic");
+ return OUString("com.sun.star.comp.desktop.migration.Basic");
}
// -----------------------------------------------------------------------------
- Sequence< ::rtl::OUString > BasicMigration_getSupportedServiceNames()
+ Sequence< OUString > BasicMigration_getSupportedServiceNames()
{
- Sequence< ::rtl::OUString > aNames(1);
+ Sequence< OUString > aNames(1);
aNames.getArray()[0] = "com.sun.star.migration.Basic";
return aNames;
}
@@ -70,7 +70,7 @@ namespace migration
// -----------------------------------------------------------------------------
- TStringVectorPtr BasicMigration::getFiles( const ::rtl::OUString& rBaseURL ) const
+ TStringVectorPtr BasicMigration::getFiles( const OUString& rBaseURL ) const
{
TStringVectorPtr aResult( new TStringVector );
::osl::Directory aDir( rBaseURL);
@@ -127,7 +127,7 @@ namespace migration
void BasicMigration::copyFiles()
{
- ::rtl::OUString sTargetDir;
+ OUString sTargetDir;
::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( sTargetDir );
if ( aStatus == ::utl::Bootstrap::PATH_EXISTS )
{
@@ -136,17 +136,17 @@ namespace migration
TStringVector::const_iterator aI = aFileList->begin();
while ( aI != aFileList->end() )
{
- ::rtl::OUString sLocalName = aI->copy( m_sSourceDir.getLength() );
- ::rtl::OUString sTargetName = sTargetDir + sLocalName;
+ OUString sLocalName = aI->copy( m_sSourceDir.getLength() );
+ OUString sTargetName = sTargetDir + sLocalName;
INetURLObject aURL( sTargetName );
aURL.removeSegment();
checkAndCreateDirectory( aURL );
::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName );
if ( aResult != ::osl::FileBase::E_None )
{
- ::rtl::OString aMsg( "BasicMigration::copyFiles: cannot copy " );
- aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
- + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
+ OString aMsg( "BasicMigration::copyFiles: cannot copy " );
+ aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
+ + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
OSL_FAIL( aMsg.getStr() );
}
++aI;
@@ -162,7 +162,7 @@ namespace migration
// XServiceInfo
// -----------------------------------------------------------------------------
- ::rtl::OUString BasicMigration::getImplementationName() throw (RuntimeException)
+ OUString BasicMigration::getImplementationName() throw (RuntimeException)
{
return BasicMigration_getImplementationName();
}
@@ -177,7 +177,7 @@ namespace migration
// -----------------------------------------------------------------------------
- Sequence< ::rtl::OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException)
+ Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException)
{
return BasicMigration_getSupportedServiceNames();
}
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index cf7e4ddf1985..56f3c7130008 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -38,8 +38,8 @@ namespace migration
{
//.........................................................................
- ::rtl::OUString SAL_CALL BasicMigration_getImplementationName();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BasicMigration_getSupportedServiceNames();
+ OUString SAL_CALL BasicMigration_getImplementationName();
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL BasicMigration_create(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext )
SAL_THROW( (::com::sun::star::uno::Exception) );
@@ -58,9 +58,9 @@ namespace migration
{
private:
::osl::Mutex m_aMutex;
- ::rtl::OUString m_sSourceDir;
+ OUString m_sSourceDir;
- TStringVectorPtr getFiles( const ::rtl::OUString& rBaseURL ) const;
+ TStringVectorPtr getFiles( const OUString& rBaseURL ) const;
::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL );
void copyFiles();
@@ -69,11 +69,11 @@ namespace migration
virtual ~BasicMigration();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// XInitialization
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 0cab008bf575..d45012a76742 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -42,7 +42,6 @@
#include <stdio.h>
#include "osl/thread.hxx"
-using ::rtl::OUString;
#define SERVICE_NAME "com.sun.star.migration.Java"
#define IMPL_NAME "com.sun.star.comp.desktop.migration.Java"
@@ -119,7 +118,7 @@ public:
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL overrideNode(
- const rtl::OUString& aName,
+ const OUString& aName,
sal_Int16 aAttributes,
sal_Bool bClear)
throw(
@@ -127,14 +126,14 @@ public:
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL addOrReplaceNode(
- const rtl::OUString& aName,
+ const OUString& aName,
sal_Int16 aAttributes)
throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL addOrReplaceNodeFromTemplate(
- const rtl::OUString& aName,
+ const OUString& aName,
const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate,
sal_Int16 aAttributes )
throw(
@@ -147,13 +146,13 @@ public:
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL dropNode(
- const rtl::OUString& aName )
+ const OUString& aName )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL overrideProperty(
- const rtl::OUString& aName,
+ const OUString& aName,
sal_Int16 aAttributes,
const css::uno::Type& aType,
sal_Bool bClear )
@@ -169,7 +168,7 @@ public:
virtual void SAL_CALL setPropertyValueForLocale(
const css::uno::Any& aValue,
- const rtl::OUString& aLocale )
+ const OUString& aLocale )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
@@ -180,7 +179,7 @@ public:
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL addProperty(
- const rtl::OUString& aName,
+ const OUString& aName,
sal_Int16 aAttributes,
const css::uno::Type& aType )
throw(
@@ -188,7 +187,7 @@ public:
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL addPropertyWithValue(
- const rtl::OUString& aName,
+ const OUString& aName,
sal_Int16 aAttributes,
const css::uno::Any& aValue )
throw(
@@ -205,7 +204,7 @@ private:
css::uno::Reference< css::configuration::backend::XLayer> m_xLayer;
void migrateJavarc();
- typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType;
+ typedef ::std::pair< OUString, sal_Int16> TElementType;
typedef ::std::stack< TElementType > TElementStack;
TElementStack m_aStack;
@@ -352,7 +351,7 @@ void SAL_CALL JavaMigration::endLayer()
// -----------------------------------------------------------------------------
void SAL_CALL JavaMigration::overrideNode(
- const ::rtl::OUString&,
+ const OUString&,
sal_Int16,
sal_Bool)
throw(
@@ -365,7 +364,7 @@ void SAL_CALL JavaMigration::overrideNode(
// -----------------------------------------------------------------------------
void SAL_CALL JavaMigration::addOrReplaceNode(
- const ::rtl::OUString&,
+ const OUString&,
sal_Int16)
throw(
MalformedDataException,
@@ -382,7 +381,7 @@ void SAL_CALL JavaMigration::endNode()
// -----------------------------------------------------------------------------
void SAL_CALL JavaMigration::dropNode(
- const ::rtl::OUString& )
+ const OUString& )
throw(
MalformedDataException,
WrappedTargetException )
@@ -391,7 +390,7 @@ void SAL_CALL JavaMigration::dropNode(
// -----------------------------------------------------------------------------
void SAL_CALL JavaMigration::overrideProperty(
- const ::rtl::OUString& aName,
+ const OUString& aName,
sal_Int16,
const Type&,
sal_Bool )
@@ -453,7 +452,7 @@ void SAL_CALL JavaMigration::setPropertyValue(
void SAL_CALL JavaMigration::setPropertyValueForLocale(
const Any&,
- const ::rtl::OUString& )
+ const OUString& )
throw(
MalformedDataException,
WrappedTargetException )
@@ -472,7 +471,7 @@ void SAL_CALL JavaMigration::endProperty()
// -----------------------------------------------------------------------------
void SAL_CALL JavaMigration::addProperty(
- const rtl::OUString&,
+ const OUString&,
sal_Int16,
const Type& )
throw(
@@ -483,7 +482,7 @@ void SAL_CALL JavaMigration::addProperty(
// -----------------------------------------------------------------------------
void SAL_CALL JavaMigration::addPropertyWithValue(
- const rtl::OUString&,
+ const OUString&,
sal_Int16,
const Any& )
throw(
@@ -493,7 +492,7 @@ void SAL_CALL JavaMigration::addPropertyWithValue(
}
void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate(
- const rtl::OUString&,
+ const OUString&,
const TemplateIdentifier&,
sal_Int16 )
throw(
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 0cd512e539e5..752d9b3f7264 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -32,9 +32,9 @@
namespace migration
{
-rtl::OUString jvmfwk_getImplementationName();
+OUString jvmfwk_getImplementationName();
-css::uno::Sequence< rtl::OUString > jvmfwk_getSupportedServiceNames();
+css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames();
} //end blind namespace
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index e538fc3000e4..af69cb969981 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -30,7 +30,7 @@ namespace migration
{
//.........................................................................
- typedef ::std::vector< ::rtl::OUString > TStringVector;
+ typedef ::std::vector< OUString > TStringVector;
typedef ::std::auto_ptr< TStringVector > TStringVectorPtr;
//.........................................................................
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 4448ac389da0..75590a806f81 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -49,24 +49,24 @@ using namespace ::com::sun::star::uno;
namespace migration
{
-static ::rtl::OUString sExtensionSubDir( "/user/uno_packages/" );
-static ::rtl::OUString sSubDirName( "cache" );
-static ::rtl::OUString sDescriptionXmlFile( "/description.xml" );
-static ::rtl::OUString sExtensionRootSubDirName( "/uno_packages" );
+static OUString sExtensionSubDir( "/user/uno_packages/" );
+static OUString sSubDirName( "cache" );
+static OUString sDescriptionXmlFile( "/description.xml" );
+static OUString sExtensionRootSubDirName( "/uno_packages" );
// =============================================================================
// component operations
// =============================================================================
-::rtl::OUString OO3ExtensionMigration_getImplementationName()
+OUString OO3ExtensionMigration_getImplementationName()
{
- static ::rtl::OUString* pImplName = 0;
+ static OUString* pImplName = 0;
if ( !pImplName )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pImplName )
{
- static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" );
+ static OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" );
pImplName = &aImplName;
}
}
@@ -75,15 +75,15 @@ static ::rtl::OUString sExtensionRootSubDirName( "/uno_packages" );
// -----------------------------------------------------------------------------
-Sequence< ::rtl::OUString > OO3ExtensionMigration_getSupportedServiceNames()
+Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames()
{
- static Sequence< ::rtl::OUString >* pNames = 0;
+ static Sequence< OUString >* pNames = 0;
if ( !pNames )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pNames )
{
- static Sequence< ::rtl::OUString > aNames(1);
+ static Sequence< OUString > aNames(1);
aNames.getArray()[0] = "com.sun.star.migration.Extensions";
pNames = &aNames;
}
@@ -122,7 +122,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration()
}
}
-void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions )
+void OO3ExtensionMigration::scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions )
{
osl::Directory aScanRootDir( sSourceDir );
osl::FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL);
@@ -137,7 +137,7 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi
( fs.getFileType() == osl::FileStatus::Directory ))
{
//Check next folder as the "real" extension folder is below a temp folder!
- ::rtl::OUString sExtensionFolderURL = fs.getFileURL();
+ OUString sExtensionFolderURL = fs.getFileURL();
osl::Directory aExtensionRootDir( sExtensionFolderURL );
@@ -165,7 +165,7 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi
}
}
-OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( const ::rtl::OUString& sExtFolder )
+OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( const OUString& sExtFolder )
{
ScanResult aResult = SCANRESULT_NOTFOUND;
osl::Directory aDir(sExtFolder);
@@ -182,7 +182,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co
{
if (item.getFileStatus(fs) == osl::FileBase::E_None)
{
- ::rtl::OUString aDirEntryURL;
+ OUString aDirEntryURL;
if (fs.getFileType() == osl::FileStatus::Directory)
aDirectories.push_back( fs.getFileURL() );
else
@@ -204,7 +204,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co
return aResult;
}
-bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlURL )
+bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlURL )
{
if ( !m_xDocBuilder.is() )
{
@@ -216,7 +216,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
m_xSimpleFileAccess = ucb::SimpleFileAccess::create(m_ctx);
}
- ::rtl::OUString aExtIdentifier;
+ OUString aExtIdentifier;
try
{
uno::Reference< io::XInputStream > xIn =
@@ -297,7 +297,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
return true;
}
-void OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir )
+void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir )
{
css::uno::Reference< css::deployment::XExtensionManager > extMgr(
deployment::ExtensionManager::get( m_ctx ) );
@@ -326,7 +326,7 @@ void OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir
// XServiceInfo
// -----------------------------------------------------------------------------
-::rtl::OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException)
+OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException)
{
return OO3ExtensionMigration_getImplementationName();
}
@@ -341,7 +341,7 @@ sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName)
// -----------------------------------------------------------------------------
-Sequence< ::rtl::OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException)
+Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException)
{
return OO3ExtensionMigration_getSupportedServiceNames();
}
@@ -369,11 +369,11 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro
}
else if ( aValue.Name == "ExtensionBlackList" )
{
- Sequence< ::rtl::OUString > aBlackList;
+ Sequence< OUString > aBlackList;
if ( (aValue.Value >>= aBlackList ) && ( aBlackList.getLength() > 0 ))
{
m_aBlackList.resize( aBlackList.getLength() );
- ::comphelper::sequenceToArray< ::rtl::OUString >( &m_aBlackList[0], aBlackList );
+ ::comphelper::sequenceToArray< OUString >( &m_aBlackList[0], aBlackList );
}
}
}
@@ -388,7 +388,7 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
if ( aStatus == ::utl::Bootstrap::PATH_EXISTS )
{
// copy all extensions
- ::rtl::OUString sSourceDir( m_sSourceDir );
+ OUString sSourceDir( m_sSourceDir );
sSourceDir += sExtensionSubDir;
sSourceDir += sSubDirName;
sSourceDir += sExtensionRootSubDirName;
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 96a8b2290443..bcbc90638cf4 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -47,8 +47,8 @@ class INetURLObject;
namespace migration
{
- ::rtl::OUString SAL_CALL OO3ExtensionMigration_getImplementationName();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames();
+ OUString SAL_CALL OO3ExtensionMigration_getImplementationName();
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OO3ExtensionMigration_create(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext )
SAL_THROW( (::com::sun::star::uno::Exception) );
@@ -70,8 +70,8 @@ namespace migration
::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XDocumentBuilder > m_xDocBuilder;
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > m_xSimpleFileAccess;
::osl::Mutex m_aMutex;
- ::rtl::OUString m_sSourceDir;
- ::rtl::OUString m_sTargetDir;
+ OUString m_sSourceDir;
+ OUString m_sTargetDir;
TStringVector m_aBlackList;
enum ScanResult
@@ -82,10 +82,10 @@ namespace migration
};
::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL );
- ScanResult scanExtensionFolder( const ::rtl::OUString& sExtFolder );
- void scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions );
- bool scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlFilePath );
- void migrateExtension( const ::rtl::OUString& sSourceDir );
+ ScanResult scanExtensionFolder( const OUString& sExtFolder );
+ void scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions );
+ bool scanDescriptionXml( const OUString& sDescriptionXmlFilePath );
+ void migrateExtension( const OUString& sSourceDir );
public:
OO3ExtensionMigration(::com::sun::star::uno::Reference<
@@ -93,11 +93,11 @@ namespace migration
virtual ~OO3ExtensionMigration();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// XInitialization
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 717d6ac257e6..fd3a33511a68 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -33,23 +33,23 @@ namespace migration
//.........................................................................
- static ::rtl::OUString sSourceSubDir( "/user/wordbook" );
- static ::rtl::OUString sTargetSubDir( "/user/wordbook" );
+ static OUString sSourceSubDir( "/user/wordbook" );
+ static OUString sTargetSubDir( "/user/wordbook" );
// =============================================================================
// component operations
// =============================================================================
- ::rtl::OUString WordbookMigration_getImplementationName()
+ OUString WordbookMigration_getImplementationName()
{
- static ::rtl::OUString* pImplName = 0;
+ static OUString* pImplName = 0;
if ( !pImplName )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pImplName )
{
- static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" );
+ static OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" );
pImplName = &aImplName;
}
}
@@ -58,16 +58,16 @@ namespace migration
// -----------------------------------------------------------------------------
- Sequence< ::rtl::OUString > WordbookMigration_getSupportedServiceNames()
+ Sequence< OUString > WordbookMigration_getSupportedServiceNames()
{
- static Sequence< ::rtl::OUString >* pNames = 0;
+ static Sequence< OUString >* pNames = 0;
if ( !pNames )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pNames )
{
- static Sequence< ::rtl::OUString > aNames(1);
- aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.migration.Wordbooks" );
+ static Sequence< OUString > aNames(1);
+ aNames.getArray()[0] = OUString( "com.sun.star.migration.Wordbooks" );
pNames = &aNames;
}
}
@@ -90,7 +90,7 @@ namespace migration
// -----------------------------------------------------------------------------
- TStringVectorPtr WordbookMigration::getFiles( const ::rtl::OUString& rBaseURL ) const
+ TStringVectorPtr WordbookMigration::getFiles( const OUString& rBaseURL ) const
{
TStringVectorPtr aResult( new TStringVector );
::osl::Directory aDir( rBaseURL);
@@ -144,7 +144,7 @@ namespace migration
}
#define MAX_HEADER_LENGTH 16
-bool IsUserWordbook( const ::rtl::OUString& rFile )
+bool IsUserWordbook( const OUString& rFile )
{
static const sal_Char* pVerStr2 = "WBSWG2";
static const sal_Char* pVerStr5 = "WBSWG5";
@@ -190,7 +190,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
void WordbookMigration::copyFiles()
{
- ::rtl::OUString sTargetDir;
+ OUString sTargetDir;
::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( sTargetDir );
if ( aStatus == ::utl::Bootstrap::PATH_EXISTS )
{
@@ -201,17 +201,17 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
{
if (IsUserWordbook(*aI) )
{
- ::rtl::OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() );
- ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName;
+ OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() );
+ OUString sTargetName = sTargetDir + sSourceLocalName;
INetURLObject aURL( sTargetName );
aURL.removeSegment();
checkAndCreateDirectory( aURL );
::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName );
if ( aResult != ::osl::FileBase::E_None )
{
- ::rtl::OString aMsg( "WordbookMigration::copyFiles: cannot copy " );
- aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
- + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
+ OString aMsg( "WordbookMigration::copyFiles: cannot copy " );
+ aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
+ + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
OSL_FAIL( aMsg.getStr() );
}
}
@@ -228,7 +228,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
// XServiceInfo
// -----------------------------------------------------------------------------
- ::rtl::OUString WordbookMigration::getImplementationName() throw (RuntimeException)
+ OUString WordbookMigration::getImplementationName() throw (RuntimeException)
{
return WordbookMigration_getImplementationName();
}
@@ -243,7 +243,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
// -----------------------------------------------------------------------------
- Sequence< ::rtl::OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException)
+ Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException)
{
return WordbookMigration_getSupportedServiceNames();
}
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 9a150c980183..140800931ed8 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -38,8 +38,8 @@ namespace migration
{
//.........................................................................
- ::rtl::OUString SAL_CALL WordbookMigration_getImplementationName();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WordbookMigration_getSupportedServiceNames();
+ OUString SAL_CALL WordbookMigration_getImplementationName();
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL WordbookMigration_create(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext )
SAL_THROW( (::com::sun::star::uno::Exception) );
@@ -58,9 +58,9 @@ namespace migration
{
private:
::osl::Mutex m_aMutex;
- ::rtl::OUString m_sSourceDir;
+ OUString m_sSourceDir;
- TStringVectorPtr getFiles( const ::rtl::OUString& rBaseURL ) const;
+ TStringVectorPtr getFiles( const OUString& rBaseURL ) const;
::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL );
void copyFiles();
@@ -69,11 +69,11 @@ namespace migration
virtual ~WordbookMigration();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// XInitialization
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 16:36:37 +0000