[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

Kalman "" Szalai kami911 at kemper.freedesktop.org
Sat Dec 4 06:11:18 PST 2010


 patches/dev300/svtools-unsort-template-dialogentries.diff |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7ac185c845dbefcebbb71f80f55d222cd0168b73
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sat Dec 4 15:10:41 2010 +0100

    Make svtools-unsort-template-dialogentries.diff apply again
    
    after high contrast patchset

diff --git a/patches/dev300/svtools-unsort-template-dialogentries.diff b/patches/dev300/svtools-unsort-template-dialogentries.diff
index e9e82cf..15d4c95 100644
--- a/patches/dev300/svtools-unsort-template-dialogentries.diff
+++ b/patches/dev300/svtools-unsort-template-dialogentries.diff
@@ -104,12 +104,12 @@
  
          // detect the image
 -        INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
--        pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE, isHighContrast( mpView ) );
+-        pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE );
 -
 +        if( aValue != rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(aSeparatorStr) ) )
 +        {
 +            INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
-+            pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE, isHighContrast( mpView ) );
++            pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE );
 +        }
          maContent.push_back( pEntry );
      }


More information about the Libreoffice-commits mailing list