[Libreoffice-commits] core.git: sc/source

[Jochen Nitschke]

 sc/source/filter/oox/sheetdatabuffer.cxx |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit 09a4abf2e1dd3e081d835a537ec913c71aa6c53e
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Tue Feb 2 01:05:28 2016 +0100

    cppcheck: unreadVariable 'bTextWrap'
    
    commit 764752f5d85cb7c86ad21340dfdda4b62754790c
    "better import xlsx heights" left some unused code
    
    Change-Id: I1bc0210f65a1e0c3cb16f86145b874cbca53f151
    Signed-off-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Reviewed-on: https://gerrit.libreoffice.org/22013
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 1c27461..f6f7fb7 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