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

[Eike Rathke]

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

New commits:
commit 455c12e06ceb729ee2d9b5a420a98a1b8fe68710
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Sep 7 17:04:31 2015 +0200

    TableRef: SAL_WARN only if the fallback to cell lookup was successful
    
    ... which means the internal column names should already had it. An
    unsuccessful cell lookup fallback doesn't necessarily fulfill a warning
    condition.
    
    Change-Id: I973b8edff83fcb47a34cc35fd9bf5163882f7742

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index c882467..b04e651 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3547,7 +3547,6 @@ bool ScCompiler::IsTableRefColumn( const OUString& rName ) const
         return true;
     }
 
-    SAL_WARN("sc.core", "ScCompiler::IsTableRefColumn - falling back to cell lookup");
     if (pDBData->HasHeader())
     {
         // Quite similar to IsColRowName() but limited to one row of headers.
@@ -3569,6 +3568,10 @@ bool ScCompiler::IsTableRefColumn( const OUString& rName ) const
                 OUString aStr = aIter.getString();
                 if (ScGlobal::GetpTransliteration()->isEqual( aStr, aName))
                 {
+                    // If this is successful and the internal column name
+                    // lookup was not, it may be worth a warning.
+                    SAL_WARN("sc.core", "ScCompiler::IsTableRefColumn - falling back to cell lookup");
+
                     /* XXX NOTE: we could init the column as relative so copying a
                      * formula across columns would point to the relative column,
                      * but do it absolute because: