first condition is always true

Change-Id: Ie3934201d99c5dbd3107d6b184a1d575fa38d5c9

first condition is always true
Change-Id: Ie3934201d99c5dbd3107d6b184a1d575fa38d5c9
4bdde3af · Caolán McNamara · df6d0af6 · 4bdde3af
Kaydet (Commit) 4bdde3af authored May 14, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 22 deletions

imagemgr.cxx svtools/source/misc/imagemgr.cxx +20 -22

No files found.
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -533,33 +533,31 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
    if ( !bFolder )
    {
        bool bDetected = false;
-        if ( !bDetected )
+        if ( rObject.GetProtocol() == INetProtocol::PrivSoffice )
        {
-            if ( rObject.GetProtocol() == INetProtocol::PrivSoffice )
+            OUString aURLPath = sURL.copy( URL_PREFIX_PRIV_SOFFICE_LEN );
+            OUString aType = aURLPath.getToken( 0, '/' );
+            if ( aType == "factory" )
            {
-                OUString aURLPath = sURL.copy( URL_PREFIX_PRIV_SOFFICE_LEN );
+                sDescription = GetDescriptionByFactory_Impl( aURLPath.copy( aURLPath.indexOf( '/' ) + 1 ) );
-                OUString aType = aURLPath.getToken( 0, '/' );
+                bDetected = true;
-                if ( aType == "factory" )
-                {
-                    sDescription = GetDescriptionByFactory_Impl( aURLPath.copy( aURLPath.indexOf( '/' ) + 1 ) );
-                    bDetected = true;
-                }
            }
+        }
-            if ( !bDetected )
+        if (!bDetected)
+        {
+            // search a description by extension
+            bool bExt = !sExtension.isEmpty();
+            if ( bExt )
            {
-                // search a description by extension
+                sExtension = sExtension.toAsciiLowerCase();
-                bool bExt = !sExtension.isEmpty();
+                nResId = GetDescriptionId_Impl( sExtension, bShowExt );
-                if ( bExt )
+            }
-                {
+            if ( !nResId )
-                    sExtension = sExtension.toAsciiLowerCase();
+            {
-                    nResId = GetDescriptionId_Impl( sExtension, bShowExt );
+                nResId = STR_DESCRIPTION_FILE;
-                }
+                bOnlyFile = bExt;
-                if ( !nResId )
-                {
-                    nResId = STR_DESCRIPTION_FILE;
-                    bOnlyFile = bExt;
-                }
            }
        }
    }