[ooo-build-commit] .: patches/dev300

[Muthu Subramanian]

 patches/dev300/sc-xml-with-xls-ext.diff |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

New commits:
commit b8c86188d6ea0c993d832e68148d88fe137f43e5
Author: Muthu Subramanian K <sumuthu at novell.com>
Date:   Tue Sep 21 21:06:46 2010 +0530

    Updating for n#631993 (from ooo-build-3-2-1 branch)
    
    * patches/dev300/sc-xml-with-xls-ext.diff

diff --git a/patches/dev300/sc-xml-with-xls-ext.diff b/patches/dev300/sc-xml-with-xls-ext.diff
index b6d2539..5d1b225 100644
--- a/patches/dev300/sc-xml-with-xls-ext.diff
+++ b/patches/dev300/sc-xml-with-xls-ext.diff
@@ -1,5 +1,5 @@
---- sc/source/ui/unoobj/scdetect.cxx	2010-08-26 15:57:06.000000000 +0530
-+++ sc/source/ui/unoobj/scdetect.cxx	2010-08-26 15:56:30.000000000 +0530
+--- sc/source/ui/unoobj/scdetect.cxx	2010-08-02 15:35:29.000000000 +0530
++++ sc/source/ui/unoobj/scdetect.cxx	2010-09-21 20:49:13.000000000 +0530
 @@ -117,6 +117,7 @@ static const sal_Char __FAR_DATA pFilter
  static const sal_Char __FAR_DATA pFilterEx95Temp[]	= "MS Excel 95 Vorlage/Template";
  static const sal_Char __FAR_DATA pFilterExcel97[]	= "MS Excel 97";
@@ -8,7 +8,17 @@
  static const sal_Char __FAR_DATA pFilterDBase[]		= "dBase";
  static const sal_Char __FAR_DATA pFilterDif[]		= "DIF";
  static const sal_Char __FAR_DATA pFilterSylk[]		= "SYLK";
-@@ -723,52 +724,51 @@ static BOOL lcl_IsAnyXMLFilter( const Sf
+@@ -440,7 +441,8 @@ static BOOL lcl_IsAnyXMLFilter( const Sf
+                 bool bIsXLS = false;
+                 SvStream* pStream = aMedium.GetInStream();
+                 const SfxFilter* pPreselectedFilter = pFilter;
+-                if ( pPreselectedFilter && pPreselectedFilter->GetName().SearchAscii("Excel") != STRING_NOTFOUND )
++                if ( ( pPreselectedFilter && pPreselectedFilter->GetName().SearchAscii("Excel") != STRING_NOTFOUND ) ||
++                    ( !aPreselectedFilterName.Len() && pPreselectedFilter->GetFilterName().EqualsAscii( pFilterAscii ) ) )
+                     bIsXLS = true;
+                 pFilter = 0;
+                 if ( pStream )
+@@ -723,52 +725,51 @@ static BOOL lcl_IsAnyXMLFilter( const Sf
                              // without the preselection other filters (Writer) take precedence
                              // DBase can't be detected reliably, so it also needs preselection
                              bool bMaybeText = lcl_MayBeAscii( rStr );
@@ -68,6 +78,11 @@
 -                                else if ( bIsXLS && bMaybeText )
 -                                {
 +                            }
++                            else if ( aHeader.CompareTo( "{\\rtf", 5 ) == COMPARE_EQUAL )
++                            {
++                                // test for RTF
++                                pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterRtf) );
++                            }
 +                            else if ( bIsXLS && bMaybeText )
 +                            {
 +                                aHeader.EraseLeadingChars();
@@ -85,11 +100,6 @@
 -                                else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) )
 -                                    pFilter = pPreselectedFilter;
 +                                bFakeXLS = true;
-+                            }
-+                            else if ( aHeader.CompareTo( "{\\rtf", 5 ) == COMPARE_EQUAL )
-+                            {
-+                                // test for RTF
-+                                pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterRtf) );
                              }
 +                            else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) )
 +                                pFilter = pPreselectedFilter;