summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-07-11 23:15:50 +0200
committerEike Rathke <erack@redhat.com>2014-07-11 23:19:29 +0200
commitdb0a4c2575ffba1c170d74882b0f5a6229ec072f (patch)
treed95a71e89c5136c2320d8f18e68dd173141d3817
parent9af1cbf233620e7c9d3fa9d8f55ab0e05dca6c84 (diff)
resolved fdo#77018 keep external references intact during sort
Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to work. Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60
-rw-r--r--sc/source/core/tool/token.cxx17
1 files changed, 17 insertions, 0 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8f8fe8467c91..73947996ee0a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -522,6 +522,9 @@ bool ScToken::Is3DRef() const
if ( GetSingleRef().IsFlag3D() )
return true;
break;
+ case svExternalSingleRef:
+ case svExternalDoubleRef:
+ return true;
default:
{
// added to avoid warnings
@@ -2236,6 +2239,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