summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviews3.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
-rwxr-xr-xsd/source/ui/view/drviews3.cxx56
1 files changed, 28 insertions, 28 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 28f8d909031b..d632929a3f65 100755
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -133,7 +133,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
CheckLineTo (rReq);
// End text edit mode for some requests.
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
switch (nSlot)
{
case SID_OUTPUT_QUALITY_COLOR:
@@ -149,23 +149,23 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
}
- // USHORT nSlot = rReq.GetSlot();
+ // sal_uInt16 nSlot = rReq.GetSlot();
switch (nSlot)
{
case SID_SWITCHPAGE: // BASIC
{
- BOOL bWasBasic = FALSE;
+ sal_Bool bWasBasic = sal_False;
// switch page in running slide show
if(SlideShow::IsRunning(GetViewShellBase()) && rReq.GetArgs())
{
- SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE);
+ SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False);
SlideShow::GetSlideShow(GetViewShellBase())->jumpToPageNumber((sal_Int32)((pWhatPage->GetValue()-1)>>1));
}
else
{
const SfxItemSet *pArgs = rReq.GetArgs ();
- USHORT nSelectedPage = 0;
+ sal_uInt16 nSelectedPage = 0;
if (! pArgs)
{
@@ -173,8 +173,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
else if (pArgs->Count () == 2)
{
- SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE);
- SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, FALSE);
+ SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False);
+ SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False);
sal_Int32 nWhatPage = (sal_Int32)pWhatPage->GetValue ();
sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue ();
@@ -195,7 +195,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
nSelectedPage = (short) nWhatPage;
mePageKind = (PageKind) nWhatKind;
- bWasBasic = TRUE;
+ bWasBasic = sal_True;
}
}
else
@@ -224,11 +224,11 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_SWITCHLAYER: // BASIC
{
const SfxItemSet *pArgs = rReq.GetArgs ();
- USHORT nCurPage = GetLayerTabControl()->GetCurPageId ();
+ sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId ();
if( pArgs && pArgs->Count () == 1)
{
- SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, FALSE);
+ SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False);
if( pWhatLayer )
nCurPage = (short) pWhatLayer->GetValue ();
}
@@ -247,8 +247,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
if ( pArgs && pArgs->Count () == 2)
{
- SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, FALSE);
- SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, FALSE);
+ SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, sal_False);
+ SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False);
sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue ();
if (CHECK_RANGE (PK_STANDARD, nWhatKind, PK_HANDOUT))
@@ -275,8 +275,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
if ( pArgs && pArgs->Count () == 2)
{
- SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, FALSE);
- SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, FALSE);
+ SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, sal_False);
+ SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False);
sal_Int32 nWhatLayer = (sal_Int32)pWhatLayer->GetValue ();
if (CHECK_RANGE (EM_PAGE, nWhatLayer, EM_MASTERPAGE))
@@ -374,7 +374,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_RELOAD:
{
// #83951#
- USHORT nId = Svx3DChildWindow::GetChildWindowId();
+ sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId();
SfxViewFrame* pFrame = GetViewFrame();
try
@@ -425,7 +425,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
{
if( rReq.GetArgs() )
{
- SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, FALSE);
+ SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, sal_False);
if (pBookmark)
{
@@ -468,7 +468,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
{
const SfxPoolItem* pItem;
if (rReq.GetArgs()->GetItemState(
- SID_ATTR_YEAR2000, TRUE, &pItem) == SFX_ITEM_SET)
+ SID_ATTR_YEAR2000, sal_True, &pItem) == SFX_ITEM_SET)
pFormShell->SetY2KState (
static_cast<const SfxUInt16Item*>(pItem)->GetValue());
}
@@ -544,8 +544,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
long nRight = Max(0L, rLRSpace.GetRight() + aPagePos.X() +
aPageSize.Width() - aViewSize.Width());
- USHORT nPageCnt = GetDoc()->GetSdPageCount(mePageKind);
- USHORT i;
+ sal_uInt16 nPageCnt = GetDoc()->GetSdPageCount(mePageKind);
+ sal_uInt16 i;
for ( i = 0; i < nPageCnt; i++)
{
SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind);
@@ -602,8 +602,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
long nLower = Max(0L, rULSpace.GetLower() + aPagePos.Y() +
aPageSize.Height() - aViewSize.Height());
- USHORT nPageCnt = GetDoc()->GetSdPageCount(mePageKind);
- USHORT i;
+ sal_uInt16 nPageCnt = GetDoc()->GetSdPageCount(mePageKind);
+ sal_uInt16 i;
for ( i = 0; i < nPageCnt; i++)
{
SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind);
@@ -685,7 +685,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
{
if( mpDrawView->IsTextEdit() )
{
- USHORT nId = SID_ATTR_PARA_LRSPACE;
+ sal_uInt16 nId = SID_ATTR_PARA_LRSPACE;
const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&)
pArgs->Get( nId );
@@ -778,7 +778,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
//Rectangle aRect = maMarkRect;
const SvxLRSpaceItem& rLRSpaceItem = (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE );
- USHORT nId = SID_ATTR_PARA_LRSPACE;
+ sal_uInt16 nId = SID_ATTR_PARA_LRSPACE;
SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
rLRSpaceItem.GetTxtFirstLineOfst(), nId );
@@ -813,8 +813,8 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rSet.DisableItem( SID_RULER_OBJECT );
// Seitenraender werden gelocked
- aProtect.SetSizeProtect( TRUE );
- aProtect.SetPosProtect( TRUE );
+ aProtect.SetSizeProtect( sal_True );
+ aProtect.SetPosProtect( sal_True );
}
if( aEditAttr.GetItemState( EE_PARA_WRITINGDIR ) >= SFX_ITEM_AVAILABLE )
@@ -829,7 +829,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rSet.DisableItem( EE_PARA_TABS );
rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT );
- if( mpDrawView->IsResizeAllowed(TRUE) )
+ if( mpDrawView->IsResizeAllowed(sal_True) )
{
Rectangle aResizeRect( maMarkRect );
@@ -899,9 +899,9 @@ void DrawViewShell::GetSnapItemState( SfxItemSet &rSet )
{
SdrPageView* pPV;
Point aMPos = GetActiveWindow()->PixelToLogic(maMousePos);
- USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic(
+ sal_uInt16 nHitLog = (sal_uInt16) GetActiveWindow()->PixelToLogic(
Size(FuPoor::HITPIX,0)).Width();
- USHORT nHelpLine;
+ sal_uInt16 nHelpLine;
if ( mpDrawView->PickHelpLine(aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 02:48:42 +0000