diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 14:45:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 14:45:20 +0000 |
| commit | 5d3d1213714e28ce2501654978668cabd1c682a2 (patch) | |
| tree | 6c01d61abb34a62e3021d43064fa7c6c040273f1 | |
| parent | 949c578bdfe6bea9fa1f784d337d6ad39164ef20 (diff) | |
WaE: gcc 4.6.0 various warnings
| -rw-r--r-- | sw/source/core/text/itrpaint.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/uiview/view.cxx | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index d32534e7ee..a8cac07b83 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -242,7 +242,6 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, } // Alignment: - sal_Bool bPlus = sal_False; OutputDevice* pOut = GetInfo().GetOut(); Point aPnt1( nTmpLeft, GetInfo().GetPos().Y() ); if ( aPnt1.X() < rPaint.Left() ) @@ -254,10 +253,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, if ( aPnt2.X() > rPaint.Right() ) aPnt2.X() = rPaint.Right(); if ( aPnt2.Y() > rPaint.Bottom() ) - { aPnt2.Y() = rPaint.Bottom(); - bPlus = sal_True; - } const SwRect aLineRect( aPnt1, aPnt2 ); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 2ec78179d2..6364d5d065 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -178,7 +178,7 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData) Link aEditModifyLink = LINK(this, SwAddressControl_Impl, EditModifyHdl_Impl); Edit* pLastEdit = 0; sal_Int32 nVisibleLines = 0; - sal_Int32 nLines = 0; + sal_uIntPtr nLines = 0; for(aHeaderIter = m_pData->aDBColumnHeaders.begin(); aHeaderIter != m_pData->aDBColumnHeaders.end(); ++aHeaderIter, nEDYPos += m_nLineHeight, nFTYPos += m_nLineHeight, nLines++) diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 48e2982da7..3ecabc729f 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -1158,9 +1158,9 @@ void SwEditWin::ChangeDrawing( BYTE nDir ) { // Check if object is anchored as character and move direction BOOL bDummy; - const bool bVertAnchor = rSh.IsFrmVertical( TRUE, bDummy ); - const bool bHoriMove = !bVertAnchor == !( nDir % 2 ); - const bool bMoveAllowed = + bool bVertAnchor = rSh.IsFrmVertical( TRUE, bDummy ); + bool bHoriMove = !bVertAnchor == !( nDir % 2 ); + bool bMoveAllowed = !bHoriMove || (rSh.GetAnchorId() != FLY_AS_CHAR); if ( bMoveAllowed ) { diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 5258cb7541..63be548245 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1319,7 +1319,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns(); sal_Bool bSelectedFrame = ( pWrtShell->GetSelFrmType() != FRMTYPE_NONE ), - bGotViewLeft = sal_False, bGotViewTop = sal_False, bGotVisibleLeft = sal_False, + bGotVisibleLeft = sal_False, bGotVisibleTop = sal_False, bGotVisibleRight = sal_False, bGotVisibleBottom = sal_False, bGotZoomType = sal_False, bGotZoomFactor = sal_False, bGotIsSelectedFrame = sal_False, @@ -1331,13 +1331,11 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > { pValue->Value >>= nX; nX = MM100_TO_TWIP( nX ); - bGotViewLeft = sal_True; } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ViewTop" ) ) ) { pValue->Value >>= nY; nY = MM100_TO_TWIP( nY ); - bGotViewTop = sal_True; } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VisibleLeft" ) ) ) { |