[Libreoffice-commits] .: Branch 'libreoffice-3-4' - comphelper/source

[Petr Mladek]

 comphelper/source/officeinstdir/officeinstallationdirectories.cxx |   18 +++++-----
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 43ee921d23fb9ec6c589ac6ae1072ae874848d7b
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Apr 28 16:11:06 2011 +0200

    normalize-template-paths-fix.diff: allow to install templates from extensions
    
    expand path placeholders early in template dialog (bnc#512146)

diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index de63619..caff618 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -162,9 +162,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
         if ( nIndex  != -1 )
         {
             return rtl::OUString(
-                URL.replaceAt( nIndex,
-                               m_pOfficeBrandDir->getLength(),
-                               m_aOfficeBrandDirMacro ) );
+                aCanonicalURL.replaceAt( nIndex,
+                                         m_pOfficeBrandDir->getLength(),
+                                         m_aOfficeBrandDirMacro ) );
         }
         else
         {
@@ -172,9 +172,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
             if ( nIndex  != -1 )
             {
                 return rtl::OUString(
-                    URL.replaceAt( nIndex,
-                                   m_pOfficeBaseDir->getLength(),
-                                   m_aOfficeBaseDirMacro ) );
+                    aCanonicalURL.replaceAt( nIndex,
+                                             m_pOfficeBaseDir->getLength(),
+                                             m_aOfficeBaseDirMacro ) );
             }
             else
             {
@@ -182,9 +182,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
                 if ( nIndex  != -1 )
                 {
                     return rtl::OUString(
-                        URL.replaceAt( nIndex,
-                                       m_pUserDir->getLength(),
-                                       m_aUserDirMacro ) );
+                        aCanonicalURL.replaceAt( nIndex,
+                                                 m_pUserDir->getLength(),
+                                                 m_aUserDirMacro ) );
                 }
             }
         }