[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Katarina Machalkova]

 sc/source/core/tool/address.cxx |    2 +-
 sc/source/ui/app/inputwin.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a2198f4880b6586732aa6bbb5f59e63555ae026f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jun 29 21:54:18 2011 +0200

    fix for fdo#36963: name box always selects cell in the first sheet
    
    add the current table number as fallback to the address parser for the
    case that no table is specified
    
    Signed-off-by: Katarina Machalkova <kmachalkova at novell.com>

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 570f8dd..156043b 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1420,7 +1420,7 @@ sal_uInt16 ScRange::ParseAny( const String& r, ScDocument* pDoc,
 
     if ( (nRet & nValid) != nValid )
     {
-        ScAddress aAdr;
+        ScAddress aAdr(aStart);//initialize with currentPos as fallback for table number
         nRet = aAdr.Parse( r, pDoc, rDetails );
         if ( nRet & SCA_VALID )
             aStart = aEnd = aAdr;
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 3907c6d..49c35a4 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1701,7 +1701,7 @@ void ScPosWnd::DoEnter()
                     {
                         // Note that SID_CURRENTCELL always expects address to
                         // be in Calc A1 format.  Convert the text.
-                        ScRange aRange;
+                        ScRange aRange(0,0,pViewData->GetTabNo());
                         aRange.ParseAny(aText, pDoc, pDoc->GetAddressConvention());
                         aRange.Format(aText, SCR_ABS_3D, pDoc, ::formula::FormulaGrammar::CONV_OOO);
                     }