mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify and ensure valid miAutoPosColumn in all cases, fdo#78838 related

Browse Source 
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
This commit is contained in:
Eike Rathke
2014-05-20 11:38:46 +02:00
parent df973e6e95
commit 23e9f36a21
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sc/source/ui/app/inputhdl.cxx
View File

@@ -1409,20 +1409,16 @@ void ScInputHandler::GetColData()
if ( pColumnData ) if ( pColumnData )
pColumnData->clear(); pColumnData->clear();
else else
{
pColumnData = new ScTypedCaseStrSet; pColumnData = new ScTypedCaseStrSet;
miAutoPosColumn = pColumnData->end();
}
std::vector<ScTypedStrData> aEntries; std::vector<ScTypedStrData> aEntries;
pDoc->GetDataEntries( pDoc->GetDataEntries(
aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true, aEntries, true); aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true, aEntries, true);
if (!aEntries.empty()) if (!aEntries.empty())
{
pColumnData->insert(aEntries.begin(), aEntries.end()); pColumnData->insert(aEntries.begin(), aEntries.end());
miAutoPosColumn = pColumnData->end(); miAutoPosColumn = pColumnData->end();
} }
}
} }
void ScInputHandler::UseColData() // When typing void ScInputHandler::UseColData() // When typing