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

[Eike Rathke]

 sc/source/core/tool/token.cxx |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

New commits:
commit 9e83928e4dd65a1cf570f9cea65f456bd089ea33
Author: Eike Rathke <er...@redhat.com>
Date:   Fri Jul 11 23:15:50 2014 +0200

    resolved fdo#77018 keep external references intact during sort
    
    Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to
    work.
    
    Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60
    (cherry picked from commit db0a4c2575ffba1c170d74882b0f5a6229ec072f)
    Reviewed-on: https://gerrit.libreoffice.org/10246
    Reviewed-by: David Tardon <dtar...@redhat.com>
    Reviewed-by: Kohei Yoshida <libreoff...@kohei.us>
    Reviewed-by: Muthu Subramanian K <muthus...@gmail.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8f51a72..ab47bee 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -531,6 +531,9 @@ bool ScToken::Is3DRef() const
             if ( GetSingleRef().IsFlag3D() )
                 return true;
             break;
+        case svExternalSingleRef:
+        case svExternalDoubleRef:
+            return true;
         default:
         {
             // added to avoid warnings
@@ -2251,6 +2254,20 @@ void ScTokenArray::ReadjustRelative3DReferences( const 
ScAddress& rOldPos,
                 }
             }
             break;
+            case svExternalDoubleRef :
+            {
+                ScSingleRefData& rRef2 = 
static_cast<ScToken*>(pCode[j])->GetSingleRef2();
+                ScAddress aAbs = rRef2.toAbs(rOldPos);
+                rRef2.SetAddress(aAbs, rNewPos);
+            }
+            //! fallthru
+            case svExternalSingleRef :
+            {
+                ScSingleRefData& rRef1 = 
static_cast<ScToken*>(pCode[j])->GetSingleRef();
+                ScAddress aAbs = rRef1.toAbs(rOldPos);
+                rRef1.SetAddress(aAbs, rNewPos);
+            }
+            break;
             default:
             {
                 // added to avoid warnings

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits