diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
| commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
| tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/controller | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/controller')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 569b91fc7b47..01a7390afe63 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -102,8 +102,8 @@ private: struct snewfoil_value_info { - USHORT mnBmpResId; - USHORT mnStrResId; + sal_uInt16 mnBmpResId; + sal_uInt16 mnStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; }; @@ -162,7 +162,7 @@ static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo ) String aText( SdResId( pInfo->mnStrResId ) ); BitmapEx aBmp( SdResId( 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() ); @@ -238,7 +238,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] ); @@ -264,7 +264,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 ); + aSlotImage = ::GetImage( mxFrame, sSlotStr, sal_False ); String sSlotTitle; if( bInsertPage ) |