diff options
Diffstat (limited to 'sd/source/ui/controller/slidelayoutcontroller.cxx')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 1a9201af6555..cd09030f7d4c 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -101,9 +101,9 @@ private: struct snewfoil_value_info { - USHORT mnBmpResId; - USHORT mnHCBmpResId; - USHORT mnStrResId; + sal_uInt16 mnBmpResId; + sal_uInt16 mnHCBmpResId; + sal_uInt16 mnStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; }; @@ -169,7 +169,7 @@ static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, co String aText( SdResId( pInfo->mnStrResId ) ); BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) ); - pValue->InsertItem( static_cast<USHORT>(pInfo->maAutoLayout)+1, aBmp, aText ); + pValue->InsertItem( static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, aBmp, aText ); aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); @@ -247,7 +247,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); mpLayoutSet2->SetColCount( 4 ); - mpLayoutSet2->EnableFullItemMode( FALSE ); + mpLayoutSet2->EnableFullItemMode( sal_False ); mpLayoutSet2->SetColor( GetControlBackground() ); fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast ); @@ -273,7 +273,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); else sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); - aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, bHighContrast ); + aSlotImage = ::GetImage( mxFrame, sSlotStr, sal_False, bHighContrast ); String sSlotTitle; if( bInsertPage ) |