[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sc/source

Kohei Yoshida kohei.yoshida at collabora.com
Tue Oct 11 21:06:57 UTC 2016


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

New commits:
commit 79bf2fd7d6b740fbf2919d33165cb99434bdd550
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>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b51c8f4..595059d 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5137,10 +5137,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 );
             }
@@ -5148,16 +5146,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 );


More information about the Libreoffice-commits mailing list