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/view/drviewsi.cxx | |
| parent | Removed header reference that no longer exists. (diff) | |
| parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
| download | core-c61cd1a5a26de1d1f62389988b00229c04e36693.tar.gz core-c61cd1a5a26de1d1f62389988b00229c04e36693.zip | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/view/drviewsi.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/view/drviewsi.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index bb011c5af2fb..26054a73e689 100644..100755 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -80,13 +80,13 @@ void DrawViewShell::ExecEffectWin( SfxRequest& rReq ) { CheckLineTo (rReq); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_3D_INIT: { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId ); if( pWindow ) { @@ -119,7 +119,7 @@ void DrawViewShell::ExecEffectWin( SfxRequest& rReq ) \************************************************************************/ void DrawViewShell::Update3DWindow() { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId ); if( pWindow ) { @@ -136,7 +136,7 @@ void DrawViewShell::Update3DWindow() void DrawViewShell::AssignFrom3DWindow() { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWin = GetViewFrame()->GetChildWindow( nId ); if( pWin ) { @@ -158,12 +158,12 @@ void DrawViewShell::AssignFrom3DWindow() // Nur TextAttribute zuweisen SfxItemSet aTextSet( GetDoc()->GetPool(), EE_ITEMS_START, EE_ITEMS_END, 0 ); - aTextSet.Put( aSet, FALSE ); + aTextSet.Put( aSet, sal_False ); GetView()->SetAttributes( aTextSet ); // Text in 3D umwandeln - USHORT nSId = SID_CONVERT_TO_3D; - SfxBoolItem aItem( nSId, TRUE ); + sal_uInt16 nSId = SID_CONVERT_TO_3D; + SfxBoolItem aItem( nSId, sal_True ); GetViewFrame()->GetDispatcher()->Execute( nSId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); |