diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-24 17:22:01 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-24 17:22:01 +0100 |
| commit | c64664f9e281980106741fc759d2faa190009b22 (patch) | |
| tree | dea4470bbab7ae657903bba49327672dd81bcf6c /sd | |
| parent | 6e9afe9627d0aa7156c8f01f69180b8ae3dccbda (diff) | |
removetooltypes01: adjust rebase for Linux
Diffstat (limited to 'sd')
| -rwxr-xr-x | sd/source/core/stlpool.cxx | 2 | ||||
| -rwxr-xr-x | sd/source/ui/func/futext.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 576a17e464c4..52b9723bc178 100755 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1029,7 +1029,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetStart(1); aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT); - SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , FALSE); + SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False); for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ ) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index cf4738be4b54..559437f5a2b5 100755 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -703,7 +703,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) mpView->ForceMarkedToAnotherPage(); mpView->SetCurrentObj(OBJ_TEXT); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if ( mpView->IsRotateAllowed() && mpViewShell->GetFrameView()->IsClickChangeRotation() && (rMEvt.GetClicks() != 2) && !rMEvt.IsShift() && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsRight() && |