sc/source/ui/app/inputhdl.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
New commits: commit 23e9f36a21f7daa6175f53fd244677b9c2e2a660 Author: Eike Rathke <er...@redhat.com> Date: Tue May 20 11:38:46 2014 +0200 simplify and ensure valid miAutoPosColumn in all cases, fdo#78838 related Unconditionally set miAutoPosColumn at the end of all operations so it is also valid in case of pColumnData->clear() and no entries inserted after pDoc->GetDataEntries(). Change-Id: I689632f696091fd9ce8e93c06d7918e5eaf05ab4 diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index af767b9..b9e1b90 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1409,19 +1409,15 @@ void ScInputHandler::GetColData() if ( pColumnData ) pColumnData->clear(); else - { pColumnData = new ScTypedCaseStrSet; - miAutoPosColumn = pColumnData->end(); - } std::vector<ScTypedStrData> aEntries; pDoc->GetDataEntries( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true, aEntries, true); if (!aEntries.empty()) - { pColumnData->insert(aEntries.begin(), aEntries.end()); - miAutoPosColumn = pColumnData->end(); - } + + miAutoPosColumn = pColumnData->end(); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits