diff options
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 3 | ||||
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index fadb8db0c56f..c4938eb3f075 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2695,10 +2695,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo pOut->SetTextLineColor( rTextLineColor.GetColor() ); else pOut->SetTextLineColor(); - } - if ( pOut ) - { const SvxOverlineItem& rOverlineColor = pNode->GetContentAttribs().GetItem( EE_CHAR_OVERLINE ); if ( rOverlineColor.GetColor() != COL_TRANSPARENT ) pOut->SetOverlineColor( rOverlineColor.GetColor() ); diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 4dbc1589ca5a..a2b8ddb06ae8 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1464,10 +1464,6 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) ) // in the LZW mode bits are already being inverted bByteSwap = true; nStripsPerPlane = ( nImageLength - 1 ) / nDiv + 1; - } - - if (bStatus) - { bStatus = nSamplesPerPixel != 0; } diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 1fb7740f1b38..7cf51a8e53b5 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -100,10 +100,9 @@ namespace rptui if ( bSet ) sDataField = aFormula.getEqualUndecoratedContent(); } - } - if ( xControlModel.is() ) setPlaceholderText( getVclWindowPeer( xControlModel.get() ), sDataField ); + } } catch (const uno::Exception &) { |