summaryrefslogtreecommitdiff
path: root/vcl/source/edit
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/edit')
-rw-r--r--vcl/source/edit/texteng.cxx8
-rw-r--r--vcl/source/edit/textview.cxx14
-rw-r--r--vcl/source/edit/vclmedit.cxx6
3 files changed, 14 insertions, 14 deletions
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 5d470d164b97..8d6a54e7cff2 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1607,9 +1607,9 @@ void TextEngine::CreateAndInsertEmptyLine( sal_uInt32 nPara )
aTmpLine.SetEnd( aTmpLine.GetStart() );
if ( ImpGetAlign() == TxtAlign::Center )
- aTmpLine.SetStartX( (short)(mnMaxTextWidth / 2) );
+ aTmpLine.SetStartX( static_cast<short>(mnMaxTextWidth / 2) );
else if ( ImpGetAlign() == TxtAlign::Right )
- aTmpLine.SetStartX( (short)mnMaxTextWidth );
+ aTmpLine.SetStartX( static_cast<short>(mnMaxTextWidth) );
else
aTmpLine.SetStartX( mpDoc->GetLeftMargin() );
@@ -2272,9 +2272,9 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
if ( nSpace > 0 )
{
if ( ImpGetAlign() == TxtAlign::Center )
- pLine->SetStartX( (sal_uInt16)(nSpace / 2) );
+ pLine->SetStartX( static_cast<sal_uInt16>(nSpace / 2) );
else // TxtAlign::Right
- pLine->SetStartX( (sal_uInt16)nSpace );
+ pLine->SetStartX( static_cast<sal_uInt16>(nSpace) );
}
}
else
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 6ba271aecbf3..e080dcdb51a8 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1159,9 +1159,9 @@ TextSelection const & TextView::ImpMoveCursor( const KeyEvent& rKeyEvent )
break;
case KEY_PAGEDOWN: aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM );
break;
- case KEY_LEFT: aPaM = bCtrl ? CursorWordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (sal_uInt16) css::i18n::CharacterIteratorMode::SKIPCHARACTER : (sal_uInt16)css::i18n::CharacterIteratorMode::SKIPCELL );
+ case KEY_LEFT: aPaM = bCtrl ? CursorWordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? sal_uInt16(css::i18n::CharacterIteratorMode::SKIPCHARACTER) : sal_uInt16(css::i18n::CharacterIteratorMode::SKIPCELL) );
break;
- case KEY_RIGHT: aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (sal_uInt16) css::i18n::CharacterIteratorMode::SKIPCHARACTER : (sal_uInt16) css::i18n::CharacterIteratorMode::SKIPCELL );
+ case KEY_RIGHT: aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? sal_uInt16(css::i18n::CharacterIteratorMode::SKIPCHARACTER) : sal_uInt16(css::i18n::CharacterIteratorMode::SKIPCELL) );
break;
case css::awt::Key::SELECT_WORD_FORWARD:
bSelect = true;
@@ -1344,7 +1344,7 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode )
{
if ( nDelMode == DELMODE_SIMPLE )
{
- aEndPaM = CursorLeft( aEndPaM, (sal_uInt16) css::i18n::CharacterIteratorMode::SKIPCHARACTER );
+ aEndPaM = CursorLeft( aEndPaM, sal_uInt16(css::i18n::CharacterIteratorMode::SKIPCHARACTER) );
}
else if ( nDelMode == DELMODE_RESTOFWORD )
{
@@ -1372,7 +1372,7 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode )
{
if ( nDelMode == DELMODE_SIMPLE )
{
- aEndPaM = CursorRight( aEndPaM, (sal_uInt16) css::i18n::CharacterIteratorMode::SKIPCELL );
+ aEndPaM = CursorRight( aEndPaM, sal_uInt16(css::i18n::CharacterIteratorMode::SKIPCELL) );
}
else if ( nDelMode == DELMODE_RESTOFWORD )
{
@@ -1407,7 +1407,7 @@ TextPaM TextView::CursorUp( const TextPaM& rPaM )
if ( mpImpl->mnTravelXPos == TRAVEL_X_DONTKNOW )
{
nX = mpImpl->mpTextEngine->GetEditCursor( rPaM, false ).Left();
- mpImpl->mnTravelXPos = (sal_uInt16)nX+1;
+ mpImpl->mnTravelXPos = static_cast<sal_uInt16>(nX)+1;
}
else
nX = mpImpl->mnTravelXPos;
@@ -1443,7 +1443,7 @@ TextPaM TextView::CursorDown( const TextPaM& rPaM )
if ( mpImpl->mnTravelXPos == TRAVEL_X_DONTKNOW )
{
nX = mpImpl->mpTextEngine->GetEditCursor( rPaM, false ).Left();
- mpImpl->mnTravelXPos = (sal_uInt16)nX+1;
+ mpImpl->mnTravelXPos = static_cast<sal_uInt16>(nX)+1;
}
else
nX = mpImpl->mnTravelXPos;
@@ -1611,7 +1611,7 @@ void TextView::ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bSpec
}
else
{
- TextPaM aNext = CursorRight( TextPaM( aPaM.GetPara(), aPaM.GetIndex() ), (sal_uInt16) css::i18n::CharacterIteratorMode::SKIPCELL );
+ TextPaM aNext = CursorRight( TextPaM( aPaM.GetPara(), aPaM.GetIndex() ), sal_uInt16(css::i18n::CharacterIteratorMode::SKIPCELL) );
aEditCursor.Right() = mpImpl->mpTextEngine->GetEditCursor( aNext, true ).Left();
}
}
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 66fb2b058d72..0bc1ea45589b 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -637,8 +637,8 @@ void ImpVclMEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLi
static const sal_Unicode sampleChar = { 'x' };
Size aOutSz = mpTextWindow->GetOutputSizePixel();
Size aCharSz( mpTextWindow->GetTextWidth( OUString(sampleChar) ), mpTextWindow->GetTextHeight() );
- rnCols = (sal_uInt16) (aOutSz.Width()/aCharSz.Width());
- rnLines = (sal_uInt16) (aOutSz.Height()/aCharSz.Height());
+ rnCols = static_cast<sal_uInt16>(aOutSz.Width()/aCharSz.Width());
+ rnLines = static_cast<sal_uInt16>(aOutSz.Height()/aCharSz.Height());
}
void ImpVclMEdit::Enable( bool bEnable )
@@ -1384,7 +1384,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size&
OUString aText = GetText();
Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() );
- sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height());
+ sal_uLong nLines = static_cast<sal_uLong>(aSize.Height() / aTextSz.Height());
if ( !nLines )
nLines = 1;
aTextSz.Height() = nLines*aTextSz.Height();