summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-02-02 01:05:28 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-02-11 11:58:15 +0000
commit09a4abf2e1dd3e081d835a537ec913c71aa6c53e (patch)
tree64f5219cc7e8b381dd2ed1cd5306995e4b919ef8 /sc
parent5c5ad2e2decb9af6005419a34db2bd0f4e9bcfd3 (diff)
cppcheck: unreadVariable 'bTextWrap'
commit 764752f5d85cb7c86ad21340dfdda4b62754790c "better import xlsx heights" left some unused code Change-Id: I1bc0210f65a1e0c3cb16f86145b874cbca53f151 Signed-off-by: Jochen Nitschke <j.nitschke+logerrit@ok.de> Reviewed-on: https://gerrit.libreoffice.org/22013 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/sheetdatabuffer.cxx10
1 files changed, 0 insertions, 10 deletions
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 1c27461635cc..f6f7fb70a200 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -753,16 +753,6 @@ void SheetDataBuffer::applyCellMerging( const CellRangeAddress& rRange )
// do merge
if( bMultiCol || bMultiRow )
rDoc.DoMerge( getSheetIndex(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() );
- // #i93609# merged range in a single row: test if manual row height is needed
- if( !bMultiRow )
- {
- bool bTextWrap = static_cast< const SfxBoolItem* >( rDoc.GetAttr( rStart.Col(), rStart.Row(), rStart.Tab(), ATTR_LINEBREAK ) )->GetValue();
- if( !bTextWrap && (rDoc.GetCellType( rStart ) == CELLTYPE_EDIT) )
- {
- if (const EditTextObject* pEditObj = rDoc.GetEditText(rStart))
- bTextWrap = pEditObj->GetParagraphCount() > 1;
- }
- }
}
} // namespace xls