[Libreoffice-commits] core.git: 2 commits - sc/source

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7cc4cdc5ef6dff279e072af725c2d7fc1e5da0e8
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 1 16:52:53 2015 +0200

    TableRef: anywhere in ScDBData area, geez..
    
    ... bStartOnly is not the header row but only the top left cell.
    
    Change-Id: I8d93aeafa8d55b59defd4476b5bcc19b0e026e70

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 3eaff19..a166a41 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4705,7 +4705,7 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu
         if (aStr.isEmpty())
         {
             // Hope that there's still the original column name available.
-            const ScDBData* pData = pDoc->GetDBAtCursor( aAbs.Col(), aAbs.Row(), aAbs.Tab(), true);
+            const ScDBData* pData = pDoc->GetDBAtCursor( aAbs.Col(), aAbs.Row(), aAbs.Tab());
             if (pData)
                 aStr = pData->GetTableColumnName( aAbs.Col());
         }
commit f8512ed179958339fb5cb7500836bb2da5d8dabf
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 1 16:45:41 2015 +0200

    TableRef: of course ScDBData at the referenced pos, not the formula pos
    
    Change-Id: I6166293cfa0704ef96df917b7af1940d5efbdb14

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 5aa34b3..3eaff19 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4705,9 +4705,9 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu
         if (aStr.isEmpty())
         {
             // Hope that there's still the original column name available.
-            const ScDBData* pData = pDoc->GetDBAtCursor( aPos.Col(), aPos.Row(), aPos.Tab(), true);
+            const ScDBData* pData = pDoc->GetDBAtCursor( aAbs.Col(), aAbs.Row(), aAbs.Tab(), true);
             if (pData)
-                aStr = pData->GetTableColumnName( aPos.Col());
+                aStr = pData->GetTableColumnName( aAbs.Col());
         }
         escapeTableRefColumnSpecifier( aStr);
         rBuffer.append(aStr);