kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fixed crash when setting/resetting bold/italic/underline on empty cells.

Browse Source
This commit is contained in:
Eivind Kvedalen
2015-02-14 13:09:49 +01:00
committed by wmayer
parent e8d7a4d3ad
commit 9eac357945
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Mod/Spreadsheet/Gui/Command.cpp
View File

@@ -576,12 +576,16 @@ void CmdSpreadsheetStyleBold::activated(int iMsg)
bool allBold = true;
for (QModelIndexList::const_iterator it = selection.begin(); it != selection.end(); ++it) {
std::set<std::string> style;
const Cell * cell = sheet->getCell(CellAddress((*it).row(), (*it).column()));
sheet->getCell(CellAddress((*it).row(), (*it).column()))->getStyle(style);
if (style.find("bold") == style.end()) {
allBold = false;
break;
if (cell) {
std::set<std::string> style;
cell->getStyle(style);
if (style.find("bold") == style.end()) {
allBold = false;
break;
}
}
}
@@ -645,12 +649,16 @@ void CmdSpreadsheetStyleItalic::activated(int iMsg)
bool allItalic = true;
for (QModelIndexList::const_iterator it = selection.begin(); it != selection.end(); ++it) {
std::set<std::string> style;
const Cell * cell = sheet->getCell(CellAddress((*it).row(), (*it).column()));
sheet->getCell(CellAddress((*it).row(), (*it).column()))->getStyle(style);
if (style.find("italic") == style.end()) {
allItalic = false;
break;
if (cell) {
std::set<std::string> style;
cell->getStyle(style);
if (style.find("italic") == style.end()) {
allItalic = false;
break;
}
}
}
@@ -714,12 +722,16 @@ void CmdSpreadsheetStyleUnderline::activated(int iMsg)
bool allUnderline = true;
for (QModelIndexList::const_iterator it = selection.begin(); it != selection.end(); ++it) {
std::set<std::string> style;
const Cell * cell = sheet->getCell(CellAddress((*it).row(), (*it).column()));
sheet->getCell(CellAddress((*it).row(), (*it).column()))->getStyle(style);
if (style.find("underline") == style.end()) {
allUnderline = false;
break;
if (cell) {
std::set<std::string> style;
cell->getStyle(style);
if (style.find("underline") == style.end()) {
allUnderline = false;
break;
}
}
}