Kaydet (Commit) 01fc6487 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Bin some const char arrays used only once

Change-Id: I08c4cc689016708f4c219f36492bf827111bbc30
üst 311b5b69
...@@ -50,12 +50,6 @@ using namespace ::com::sun::star::uno; ...@@ -50,12 +50,6 @@ using namespace ::com::sun::star::uno;
namespace migration 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 // component operations
...@@ -168,7 +162,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co ...@@ -168,7 +162,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co
else else
{ {
aDirEntryURL = fs.getFileURL(); aDirEntryURL = fs.getFileURL();
if ( aDirEntryURL.indexOf( sDescriptionXmlFile ) > 0 ) if ( aDirEntryURL.indexOf( "/description.xml" ) > 0 )
aResult = scanDescriptionXml( aDirEntryURL ) ? SCANRESULT_MIGRATE_EXTENSION : SCANRESULT_DONTMIGRATE_EXTENSION; aResult = scanDescriptionXml( aDirEntryURL ) ? SCANRESULT_MIGRATE_EXTENSION : SCANRESULT_DONTMIGRATE_EXTENSION;
} }
} }
...@@ -369,9 +363,7 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& ) ...@@ -369,9 +363,7 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
{ {
// copy all extensions // copy all extensions
OUString sSourceDir( m_sSourceDir ); OUString sSourceDir( m_sSourceDir );
sSourceDir += sExtensionSubDir; sSourceDir += "/user/uno_packages/cache/uno_packages";
sSourceDir += sSubDirName;
sSourceDir += sExtensionRootSubDirName;
TStringVector aExtensionToMigrate; TStringVector aExtensionToMigrate;
scanUserExtensions( sSourceDir, aExtensionToMigrate ); scanUserExtensions( sSourceDir, aExtensionToMigrate );
if ( aExtensionToMigrate.size() > 0 ) if ( aExtensionToMigrate.size() > 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment