diff options
Diffstat (limited to 'svx/source/dialog/frmsel.cxx')
-rw-r--r-- | svx/source/dialog/frmsel.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 16bc17976aa4..d25473f32570 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -111,7 +111,7 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder ) } /** Converts an SvxBorderLine line width (in twips) to a pixel line width. */ -inline sal_uInt16 lclGetPixel( USHORT nWidth ) +inline sal_uInt16 lclGetPixel( sal_uInt16 nWidth ) { // convert all core styles expect 0 to a visible UI style (at least 1 pixel), map 1pt to 1pixel return nWidth ? std::min< sal_uInt16 >( std::max< sal_uInt16 >( (nWidth + 5) / 20, 1 ), FRAMESEL_GEOM_WIDTH ) : 0; @@ -219,7 +219,7 @@ void FrameBorder::SetKeyboardNeighbors( meKeyBottom = eBottom; } -FrameBorderType FrameBorder::GetKeyboardNeighbor( USHORT nKeyCode ) const +FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const { FrameBorderType eBorder = FRAMEBORDER_NONE; switch( nKeyCode ) @@ -426,7 +426,7 @@ void FrameSelectorImpl::InitBorderGeometry() aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) ); aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() + mnFocusOffs ) ); aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) ); - maTLBR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); + maTLBR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); aFocusVec.clear(); aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Top() + nDiagFocusOffsY ) ); @@ -435,7 +435,7 @@ void FrameSelectorImpl::InitBorderGeometry() aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) ); aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() + mnFocusOffs ) ); aFocusVec.push_back( Point( aRect.Left() + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) ); - maBLTR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); + maBLTR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); } } @@ -577,7 +577,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder ) long nTLPos = 0; long nBRPos = mnCtrlSize - mnArrowSize; Point aPos1, aPos2; - USHORT nImgId1 = 0, nImgId2 = 0; + sal_uInt16 nImgId1 = 0, nImgId2 = 0; switch( rBorder.GetType() ) { case FRAMEBORDER_LEFT: @@ -606,7 +606,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder ) } // Arrow or marker? Do not draw arrows into disabled control. - USHORT nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8; + sal_uInt16 nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8; maVirDev.DrawImage( aPos1, maILArrows.GetImage( nImgId1 + nSelectAdd ) ); maVirDev.DrawImage( aPos2, maILArrows.GetImage( nImgId2 + nSelectAdd ) ); } @@ -680,7 +680,7 @@ void FrameSelectorImpl::DrawAllTrackingRects() aPPoly.Insert( Polygon( Rectangle( maVirDevPos, maVirDev.GetOutputSizePixel() ) ) ); aPPoly.Optimize( POLY_OPTIMIZE_CLOSE ); - for( USHORT nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx ) + for( sal_uInt16 nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx ) mrFrameSel.InvertTracking( aPPoly.GetObject( nIdx ), SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); } @@ -862,7 +862,7 @@ void FrameSelector::HideAllBorders() mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE ); } -bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSecn ) const +bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn ) const { VisFrameBorderCIter aIt( mxImpl->maEnabBorders ); if( !aIt.Is() ) @@ -941,7 +941,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect ) mxImpl->SelectBorder( **aIt, bSelect ); } -void FrameSelector::SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSecn ) +void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn ) { mxImpl->maCurrStyle.SetOutWidth( nPrim ); mxImpl->maCurrStyle.SetDistance( nDist ); @@ -1111,7 +1111,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt ) KeyCode aKeyCode = rKEvt.GetKeyCode(); if( !aKeyCode.GetModifier() ) { - USHORT nCode = aKeyCode.GetCode(); + sal_uInt16 nCode = aKeyCode.GetCode(); switch( nCode ) { case KEY_SPACE: |