diff options
Diffstat (limited to 'sd/source/filter/ppt/pptin.cxx')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index dae80f480de8..0b64546358d7 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -487,7 +487,7 @@ bool ImplSdPPTImport::Import() sal_Int32 nNumber = aStringAry[ nToken ].toInt32(); if ( ( nNumber & ~0xff ) == 0 ) { - nPageNumber = (sal_uInt32)nNumber - 1; + nPageNumber = static_cast<sal_uInt32>(nNumber) - 1; bDocInternalSubAddress = true; break; } @@ -501,7 +501,7 @@ bool ImplSdPPTImport::Import() pHyperlink->aConvSubString = maSlideNameList[ nPageNumber ]; if ( pHyperlink->aConvSubString.isEmpty() ) { - pHyperlink->aConvSubString = SdResId( STR_PAGE ) + " " + ( mpDoc->CreatePageNumValue( (sal_uInt16)nPageNumber + 1 ) ); + pHyperlink->aConvSubString = SdResId( STR_PAGE ) + " " + ( mpDoc->CreatePageNumValue( static_cast<sal_uInt16>(nPageNumber) + 1 ) ); } } else { // if sub address is given but not internal, use it as it is @@ -634,7 +634,7 @@ bool ImplSdPPTImport::Import() if ( ePgKind == PageKind::Standard ) { // standard page: create new presentation layout aLayoutName = SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME ); - aLayoutName += OUString::number( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) ); + aLayoutName += OUString::number( static_cast<sal_Int32>( ( nMasterNum + 1 ) / 2 - 1 ) ); static_cast<SdStyleSheetPool*>( mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName ); } else // note page: use presentation layout of standard page @@ -2484,8 +2484,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj std::abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || std::abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || aOutlineSize.Width() == 0 || - (double)aLogicSize.Width() / aOutlineSize.Width() < 0.48 || - (double)aLogicSize.Width() / aOutlineSize.Width() > 0.5) + static_cast<double>(aLogicSize.Width()) / aOutlineSize.Width() < 0.48 || + static_cast<double>(aLogicSize.Width()) / aOutlineSize.Width() > 0.5) { pPresObj->SetUserCall(nullptr); } @@ -2515,8 +2515,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj std::abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || std::abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || aOutlineSize.Width() == 0 || - (double)aLogicSize.Width() / aOutlineSize.Width() < 0.48 || - (double)aLogicSize.Width() / aOutlineSize.Width() > 0.5) + static_cast<double>(aLogicSize.Width()) / aOutlineSize.Width() < 0.48 || + static_cast<double>(aLogicSize.Width()) / aOutlineSize.Width() > 0.5) { pPresObj->SetUserCall( nullptr ); } |