[ooo-build-commit] Branch 'ooo/OOO320' - sc/source

[Jan Holesovsky]

 sc/source/filter/excel/xename.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b9ceadaff891c09511e541f765c8cd8e180263f2
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Oct 29 12:22:30 2009 +0000

    CWS-TOOLING: integrate CWS c07v026_OOO320
    2009-10-19 10:26:11 +0200 mav  r277008 : #b6886425# use standard solution to encode the URL for the Gnome
    2009-10-19 08:38:28 +0200 mav  r276998 : #b6886425# encode the URL correctly for the Gnome
    2009-10-07 12:49:32 +0200 os  r276749 : #b6887668# resize items depending on the item text length
    2009-09-28 18:42:32 +0200 dr  r276499 : #b6883075# shrink print ranges to Excel sheet limits
    2009-09-28 16:50:25 +0200 od  r276497 : #b6882166# method <SwSectionFrm::SimpleFormat(..)>
               - assure notification on position changes, otherwise the layout will not be correct.
    2009-09-15 18:31:37 +0200 dr  r276185 : #b6872823# check cursor before using, patch by aw
    2009-09-09 10:52:52 +0200 od  r275975 : #b6879723# correct handling of new list level attributes regarding paragraph indent values,
    	   especially in case of OOo 2.0 and former hidden compatibility option "Ignore first line
    	   indent on numbering"
    2009-09-08 11:10:31 +0200 od  r275918 : #b6876367# method <lcl_SetTxtFmtColl(..)>
    	   - do not reset list attributes at paragraph, if its applied list style
    	     will not change due to the newly applied paragraph style.
    2009-09-07 12:48:58 +0200 obo  r275890 : Merge from c07v025 into this CWS

diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index ace7a66..004fbfa 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -636,10 +636,13 @@ void XclExpNameManagerImpl::CreateBuiltInNames()
                     // Calc document does not care about sheet index in print ranges
                     aRange.aStart.SetTab( nScTab );
                     aRange.aEnd.SetTab( nScTab );
+                    aRange.Justify();
                     aRangeList.Append( aRange );
                 }
-                GetAddressConverter().ValidateRangeList( aRangeList, true );
-                GetNameManager().InsertBuiltInName( EXC_BUILTIN_PRINTAREA, aRangeList );
+                // create the NAME record (do not warn if ranges are shrunken)
+                GetAddressConverter().ValidateRangeList( aRangeList, false );
+                if( aRangeList.Count() > 0 )
+                    GetNameManager().InsertBuiltInName( EXC_BUILTIN_PRINTAREA, aRangeList );
             }
 
             // *** 2) print titles *** ----------------------------------------
@@ -656,8 +659,9 @@ void XclExpNameManagerImpl::CreateBuiltInNames()
                     0, pRowRange->aStart.Row(), nScTab,
                     GetXclMaxPos().Col(), pRowRange->aEnd.Row(), nScTab ) );
             // create the NAME record
-            GetAddressConverter().ValidateRangeList( aTitleList, true );
-            GetNameManager().InsertBuiltInName( EXC_BUILTIN_PRINTTITLES, aTitleList );
+            GetAddressConverter().ValidateRangeList( aTitleList, false );
+            if( aTitleList.Count() > 0 )
+                GetNameManager().InsertBuiltInName( EXC_BUILTIN_PRINTTITLES, aTitleList );
 
             // *** 3) filter ranges *** ---------------------------------------