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/dlg/diactrl.cxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/dlg/diactrl.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/dlg/diactrl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 43452672cbd3..9549af88162c 100644..100755 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -108,7 +108,7 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) void SdPagesField::Modify() { - SfxUInt16Item aItem( SID_PAGES_PER_ROW, (UINT16) GetValue() ); + SfxUInt16Item aItem( SID_PAGES_PER_ROW, (sal_uInt16) GetValue() ); ::uno::Any a; ::uno::Sequence< ::beans::PropertyValue > aArgs( 1 ); @@ -130,7 +130,7 @@ void SdPagesField::Modify() |* \************************************************************************/ -SdTbxCtlDiaPages::SdTbxCtlDiaPages( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SdTbxCtlDiaPages::SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { } @@ -143,7 +143,7 @@ SdTbxCtlDiaPages::~SdTbxCtlDiaPages() //======================================================================== -void SdTbxCtlDiaPages::StateChanged( USHORT, +void SdTbxCtlDiaPages::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { SdPagesField* pFld = (SdPagesField*) GetToolBox().GetItemWindow( GetId() ); |