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

[Stephan Bergmann]

 framework/source/services/substitutepathvars.cxx |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 8894f3cfa0c9d39198a1ec18e3f46e40f76a955b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 19 11:20:52 2015 +0200

    Remove redundant check
    
    ...became redundant with previous commit
    d3d7cb989b8d3c7d8e9947511bf78e9aefedc490 "Remove ConvertOSLtoUCBURL."
    
    Change-Id: I08c436dec8ed661eae60a17723fc63e6aafb1f86

diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 8ab3796..ad75eee 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1070,13 +1070,8 @@ throw ( RuntimeException )
         OUString aTemp;
         if ( osl::FileBase::getFileURLFromSystemPath( rURL, aTemp ) == osl::FileBase::E_None )
         {
-            if ( !aTemp.isEmpty() )
-            {
-                aURL = INetURLObject( aTemp ).GetMainURL( INetURLObject::NO_DECODE );
-                if( aURL.isEmpty() )
-                    return rURL;
-            }
-            else
+            aURL = INetURLObject( aTemp ).GetMainURL( INetURLObject::NO_DECODE );
+            if( aURL.isEmpty() )
                 return rURL;
         }
         else