diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-05-29 00:10:42 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-05-29 00:11:30 +0900 |
| commit | 3ac9b7af766f166a9cd8089ec49e54a48b31194b (patch) | |
| tree | 8b2c68df4980e520d4463c9d2725e19ea3879a6a /sw | |
| parent | 1a5aae96bdb20e36a17d77ec60da874037544628 (diff) | |
removed dead code
Change-Id: Ic70d66befc90450aeb276d53f6da7e81aef85478
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/rtf/rtftbl.cxx | 21 | ||||
| -rw-r--r-- | sw/source/filter/ww1/w1filter.cxx | 19 |
2 files changed, 0 insertions, 40 deletions
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index 86c315424dea..1aa7071765e0 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -70,7 +70,6 @@ struct Row static void SetRowBorder(SfxItemSet& rSet, const Row &rRow) { -#if 1 SvxBoxItem aBox((const SvxBoxItem&)rSet.Get(RES_BOX, false)); aBox.SetDistance( static_cast< sal_uInt16 >(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist), BOX_LINE_LEFT); @@ -85,26 +84,6 @@ static void SetRowBorder(SfxItemSet& rSet, const Row &rRow) BOX_LINE_BOTTOM); rSet.Put(aBox); -#else - const SfxPoolItem* pItem; - if (SFX_ITEM_SET == rSet.GetItemState(RES_BOX, sal_False, &pItem)) - { - SvxBoxItem aBox( *(SvxBoxItem*)pItem ); - aBox.SetDistance(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist, - BOX_LINE_LEFT); - - aBox.SetDistance(rRow.mbUseRightRowPad ? rRow.mnRightRowPad : rRow.mnBrdDist, - BOX_LINE_RIGHT); - - aBox.SetDistance(rRow.mbUseTopRowPad ? rRow.mnTopRowPad : 0, - BOX_LINE_TOP); - - aBox.SetDistance(rRow.mbUseBottomRowPad ? rRow.mnBottomRowPad : 0, - BOX_LINE_BOTTOM); - - rSet.Put(aBox); - } -#endif } void rtfSections::PrependedInlineNode(const SwPosition &rPos, diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 0cd32f4cc85d..0a7af7d57800 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -1842,7 +1842,6 @@ void Ww1Picture::WriteBmp(SvStream& rOut) } OSL_ENSURE(padx*maxy/2==nSize, "Ww1Picture"); sal_uInt16 j; -#if 1 { sal_uInt8* pBuf = new sal_uInt8[padx]; for (j=0;nSize>0&&j<maxy;j++) @@ -1868,24 +1867,6 @@ void Ww1Picture::WriteBmp(SvStream& rOut) } delete [] pBuf; } -#else - for (j=0;nSize>0&&j<maxy;j++) - { - for (i=0;nSize>0&&i<maxx;i+=2) - { - wByte(*p>>4); - wByte(*p&0xf); - p++; - nSize -= sizeof(sal_uInt8); - } - for (;i<padx;i+=2) - { - wByte(0); - p++; - nSize -= sizeof(sal_uInt8); - } - } -#endif OSL_ENSURE(nSize==0, "Ww1Picture"); #undef wLong #undef wShort |