summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-11-16 14:22:33 +0200
committerTor Lillqvist <tml@collabora.com>2015-11-16 14:28:13 +0200
commit01fc64876398fc391ded6ae14300c598518b2d2a (patch)
treeeb2c20983c78a8d503e05d08fd7a58995022ac99 /desktop
parent311b5b69f032134457184255920ff1083c9afed2 (diff)
Bin some const char arrays used only once
Change-Id: I08c4cc689016708f4c219f36492bf827111bbc30
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 903e451a9541..f2c162052c29 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -50,12 +50,6 @@ using namespace ::com::sun::star::uno;
namespace migration
{
-static const char sExtensionSubDir[] = "/user/uno_packages/";
-static const char sSubDirName[] = "cache";
-static const char sDescriptionXmlFile[] = "/description.xml";
-static const char sExtensionRootSubDirName[] = "/uno_packages";
-
-
// component operations
@@ -168,7 +162,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co
else
{
aDirEntryURL = fs.getFileURL();
- if ( aDirEntryURL.indexOf( sDescriptionXmlFile ) > 0 )
+ if ( aDirEntryURL.indexOf( "/description.xml" ) > 0 )
aResult = scanDescriptionXml( aDirEntryURL ) ? SCANRESULT_MIGRATE_EXTENSION : SCANRESULT_DONTMIGRATE_EXTENSION;
}
}
@@ -369,9 +363,7 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
{
// copy all extensions
OUString sSourceDir( m_sSourceDir );
- sSourceDir += sExtensionSubDir;
- sSourceDir += sSubDirName;
- sSourceDir += sExtensionRootSubDirName;
+ sSourceDir += "/user/uno_packages/cache/uno_packages";
TStringVector aExtensionToMigrate;
scanUserExtensions( sSourceDir, aExtensionToMigrate );
if ( aExtensionToMigrate.size() > 0 )