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

[Tor Lillqvist]

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

New commits:
commit a6ac84192876e0b72f4ea42367b986d67d6018e0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:38:45 2011 +0300

    Make svtools-unsort-template-dialogentries.diff apply again

diff --git a/patches/dev300/svtools-unsort-template-dialogentries.diff b/patches/dev300/svtools-unsort-template-dialogentries.diff
index 15d4c95..497f17a 100644
--- a/patches/dev300/svtools-unsort-template-dialogentries.diff
+++ b/patches/dev300/svtools-unsort-template-dialogentries.diff
@@ -1,5 +1,5 @@
---- svtools/inc/fileview.hxx.old	2010-07-22 13:49:22.000000000 +0200
-+++ svtools/inc/fileview.hxx	2010-07-29 16:28:07.000000000 +0200
+--- svtools/inc/svtools/fileview.hxx
++++ svtools/inc/svtools/fileview.hxx
 @@ -48,6 +48,7 @@
  #define FILEVIEW_SHOW_SIZE			0x0020
  #define FILEVIEW_SHOW_DATE			0x0040
@@ -25,11 +25,11 @@
  
      /** initialize the view with the content of a folder given by URL, and aply an immediate filter
  
---- svtools/source/contnr/fileview.cxx.old	2010-07-22 13:49:22.000000000 +0200
-+++ svtools/source/contnr/fileview.cxx	2010-07-29 16:28:07.000000000 +0200
+--- svtools/source/contnr/fileview.cxx
++++ svtools/source/contnr/fileview.cxx
 @@ -103,6 +103,8 @@ using ::rtl::OUString;
- 
- DECLARE_LIST( StringList_Impl, OUString* )
+ #define COLUMN_SIZE         3
+ #define COLUMN_DATE         4
  
 +#define aSeparatorStr  "----------------------------------"
 +
@@ -104,18 +104,18 @@
  
          // detect the image
 -        INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
--        pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE );
+-        pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False );
 -
 +        if( aValue != rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(aSeparatorStr) ) )
 +        {
 +            INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
-+            pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE );
++            pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False );
 +        }
          maContent.push_back( pEntry );
      }
  }
---- svtools/source/contnr/templwin.cxx.old	2010-07-29 16:27:36.000000000 +0200
-+++ svtools/source/contnr/templwin.cxx	2010-07-29 16:28:07.000000000 +0200
+--- svtools/source/contnr/templwin.cxx
++++ svtools/source/contnr/templwin.cxx
 @@ -106,6 +106,7 @@ using namespace ::com::sun::star::view;
  using namespace svtools;