[Libreoffice-commits] core.git: desktop/source

[Tor Lillqvist]

 desktop/source/migration/services/oo3extensionmigration.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 01fc64876398fc391ded6ae14300c598518b2d2a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Nov 16 14:22:33 2015 +0200

    Bin some const char arrays used only once
    
    Change-Id: I08c4cc689016708f4c219f36492bf827111bbc30

diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 903e451..f2c1620 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 )