[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/compiler.cxx |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit a4d124e13abb7445f5b7f5f73556bc91ae867ab8
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Sat Oct 1 21:07:20 2016 -0400

    tdf#93894: Get column labels to work with formula groups.
    
    Change-Id: Ia2a09981dceae2e9809c76570300de8ca1927c1b
    Reviewed-on: https://gerrit.libreoffice.org/29514
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-on: https://gerrit.libreoffice.org/29717
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 679e7f2..e5659d5 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5273,10 +5273,8 @@ bool ScCompiler::HandleColRowName()
             {
                 ScSingleRefData aRefData;
                 aRefData.InitAddress( aRange.aStart );
-                if ( bColName )
-                    aRefData.SetColRel( true );
-                else
-                    aRefData.SetRowRel( true );
+                aRefData.SetColRel( true );
+                aRefData.SetRowRel( true );
                 aRefData.SetAddress(aRange.aStart, aPos);
                 pNew->AddSingleReference( aRefData );
             }
@@ -5284,16 +5282,10 @@ bool ScCompiler::HandleColRowName()
             {
                 ScComplexRefData aRefData;
                 aRefData.InitRange( aRange );
-                if ( bColName )
-                {
-                    aRefData.Ref1.SetColRel( true );
-                    aRefData.Ref2.SetColRel( true );
-                }
-                else
-                {
-                    aRefData.Ref1.SetRowRel( true );
-                    aRefData.Ref2.SetRowRel( true );
-                }
+                aRefData.Ref1.SetColRel( true );
+                aRefData.Ref2.SetColRel( true );
+                aRefData.Ref1.SetRowRel( true );
+                aRefData.Ref2.SetRowRel( true );
                 aRefData.SetRange(aRange, aPos);
                 if ( bInList )
                     pNew->AddDoubleReference( aRefData );