[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sc/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Sun Nov 30 23:02:24 PST 2014
sc/source/core/tool/token.cxx | 4 ++++
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 3 +++
2 files changed, 7 insertions(+)
New commits:
commit 7ede454ecf9650a4d023e5eccd397f0991061df3
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Mon Dec 1 02:49:59 2014 +0100
For external data sources this variable can be null, fdo#83534
Change-Id: I8c47cf078b4772fcdba0993880740c22114f1b45
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 1d572b8..3d3a191 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -387,6 +387,9 @@ void ScPivotLayoutDialog::ItemInserted(ScItemValue* pItemValue, ScPivotLayoutTre
void ScPivotLayoutDialog::UpdateSourceRange()
{
+ if (!maPivotTableObject.GetSheetDesc())
+ return;
+
ScSheetSourceDesc aSourceSheet = *maPivotTableObject.GetSheetDesc();
if (mpSourceRadioNamedRange->IsChecked())
commit 9eb40f6ab2cd7798a9e9b61cfd6e5b65517123ac
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Mon Dec 1 04:05:46 2014 +0100
avoid modifying range name references that are not affected, fdo#86518
Change-Id: I0822fb96ebcb30326bcdd88f3900e6e01c85bcf5
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 77f7cc2..a2721a2 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3059,6 +3059,10 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
// column range of the reference is not entirely in the deleted column range.
break;
+ if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() || aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+ // wrong tables
+ break;
+
ScRange aDeleted = rCxt.maRange;
aDeleted.aStart.IncRow(rCxt.mnRowDelta);
aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);
More information about the Libreoffice-commits
mailing list