summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviewse.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/drviewse.cxx')
-rwxr-xr-xsd/source/ui/view/drviewse.cxx94
1 files changed, 47 insertions, 47 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 6f6f49fdc93c..af6a73776677 100755
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -161,7 +161,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if (SlideShow::IsRunning(GetViewShellBase()))
return;
- USHORT nSId = rReq.GetSlot();
+ sal_uInt16 nSId = rReq.GetSlot();
if( HasCurrentFunction() &&
( nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE ||
@@ -173,7 +173,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if( pFuText )
{
- pFuText->SetPermanent(TRUE);
+ pFuText->SetPermanent(sal_True);
xFunc->ReceiveRequest( rReq );
MapSlot( nSId );
@@ -192,8 +192,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
}
CheckLineTo (rReq);
- USHORT nOldSId = 0;
- BOOL bPermanent = FALSE;
+ sal_uInt16 nOldSId = 0;
+ sal_Bool bPermanent = sal_False;
if( !mpDrawView )
return;
@@ -231,7 +231,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
(nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE ||
nSId == SID_ATTR_CHAR_VERTICAL || nSId == SID_TEXT_FITTOSIZE_VERTICAL )))
{
- bPermanent = TRUE;
+ bPermanent = sal_True;
}
GetCurrentFunction()->Deactivate();
@@ -347,22 +347,22 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
// Implizite Wandlung in Bezier
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->ConvertMarkedToPathObj(FALSE);
+ mpDrawView->ConvertMarkedToPathObj(sal_False);
}
}
}
else if (nSlotId == SID_OBJECT_SHEAR)
{
- ULONG i = 0;
+ sal_uLong i = 0;
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
- ULONG nMarkCnt = rMarkList.GetMarkCount();
- BOOL b3DObjMarked = FALSE;
+ sal_uLong nMarkCnt = rMarkList.GetMarkCount();
+ sal_Bool b3DObjMarked = sal_False;
while (i < nMarkCnt && !b3DObjMarked)
{
if (rMarkList.GetMark(i)->GetMarkedSdrObj()->ISA(E3dObject))
{
- b3DObjMarked = TRUE;
+ b3DObjMarked = sal_True;
}
else
{
@@ -384,7 +384,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
// Implizite Wandlung in Bezier
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->ConvertMarkedToPathObj(FALSE);
+ mpDrawView->ConvertMarkedToPathObj(sal_False);
}
}
}
@@ -548,7 +548,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if(HasOldFunction())
{
- USHORT nSlotId = GetOldFunction()->GetSlotID();
+ sal_uInt16 nSlotId = GetOldFunction()->GetSlotID();
GetOldFunction()->Deactivate();
SetOldFunction(0);
@@ -577,7 +577,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
// select first object
GetView()->UnmarkAllObj();
- GetView()->MarkNextObj(TRUE);
+ GetView()->MarkNextObj(sal_True);
// ...and make it visible
if(GetView()->AreObjectsMarked())
@@ -659,7 +659,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if( !mpDrawView )
return;
- USHORT nSId = rReq.GetSlot();
+ sal_uInt16 nSId = rReq.GetSlot();
// Slot wird evtl. gemapped (ToolboxImages/-Slots)
MapSlot( nSId );
@@ -687,7 +687,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_DRAWTBX_CONNECTORS:
case SID_DRAWTBX_INSERT:
{
- USHORT nMappedSlot = GetMappedSlot( nSId );
+ sal_uInt16 nMappedSlot = GetMappedSlot( nSId );
if( nMappedSlot > 0 )
{
SfxRequest aReq( nMappedSlot, 0, GetDoc()->GetItemPool() );
@@ -763,7 +763,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_CUT:
{
- if ( mpDrawView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) )
+ if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) )
{
::sd::Window* pWindow = GetActiveWindow();
InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute();
@@ -785,7 +785,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_COPY:
{
- if ( mpDrawView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) )
+ if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) )
{
::sd::Window* pWindow = GetActiveWindow();
InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute();
@@ -827,11 +827,11 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
WaitObject aWait( (Window*)GetActiveWindow() );
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( GetActiveWindow() ) );
const SfxItemSet* pReqArgs = rReq.GetArgs();
- UINT32 nFormat = 0;
+ sal_uInt32 nFormat = 0;
if( pReqArgs )
{
- SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, FALSE );
+ SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, sal_False );
nFormat = pIsActive->GetValue();
}
@@ -842,7 +842,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if( !mpDrawView->InsertData( aDataHelper,
GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ),
- nAction, FALSE, nFormat ) )
+ nAction, sal_False, nFormat ) )
{
INetBookmark aINetBookmark( aEmptyStr, aEmptyStr );
@@ -873,7 +873,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
pOLV->PostKeyEvent(aKEvt);
}
}
- else if ( mpDrawView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) )
+ else if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) )
{
::sd::Window* pWindow = GetActiveWindow();
InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute();
@@ -924,7 +924,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if ( pReqArgs )
{
- SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, FALSE);
+ SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, sal_False);
mbIsLayerModeActive = pIsActive->GetValue ();
}
@@ -941,9 +941,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
nSId == SID_SLIDE_MASTERPAGE)
{
// Gibt es eine Seite mit dem AutoLayout "Titel"?
- BOOL bFound = FALSE;
- USHORT i = 0;
- USHORT nCount = GetDoc()->GetSdPageCount(PK_STANDARD);
+ sal_Bool bFound = sal_False;
+ sal_uInt16 i = 0;
+ sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD);
while (i < nCount && !bFound)
{
@@ -951,12 +951,12 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (nSId == SID_TITLE_MASTERPAGE && pPage->GetAutoLayout() == AUTOLAYOUT_TITLE)
{
- bFound = TRUE;
+ bFound = sal_True;
SwitchPage((pPage->GetPageNum() - 1) / 2);
}
else if (nSId == SID_SLIDE_MASTERPAGE && pPage->GetAutoLayout() != AUTOLAYOUT_TITLE)
{
- bFound = TRUE;
+ bFound = sal_True;
SwitchPage((pPage->GetPageNum() - 1) / 2);
}
@@ -1045,17 +1045,17 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
const SfxItemSet* pReqArgs = rReq.GetArgs();
// #97516# Remember old ruler state
- BOOL bOldHasRuler(HasRuler());
+ sal_Bool bOldHasRuler(HasRuler());
if ( pReqArgs )
{
- SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, FALSE);
+ SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, sal_False);
SetRuler (pIsActive->GetValue ());
}
else SetRuler (!HasRuler());
// #97516# Did ruler state change? Tell that to SdOptions, too.
- BOOL bHasRuler(HasRuler());
+ sal_Bool bHasRuler(HasRuler());
if(bOldHasRuler != bHasRuler)
{
@@ -1119,7 +1119,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_SIZE_REAL: // BASIC
{
- mbZoomOnPage = FALSE;
+ mbZoomOnPage = sal_False;
SetZoom( 100 );
Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0),
GetActiveWindow()->GetOutputSizePixel()) );
@@ -1134,7 +1134,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_ZOOM_IN: // BASIC
{
- mbZoomOnPage = FALSE;
+ mbZoomOnPage = sal_False;
SetZoom( Max( (long) ( GetActiveWindow()->GetZoom() / 2 ), (long) GetActiveWindow()->GetMinZoom() ) );
Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0),
GetActiveWindow()->GetOutputSizePixel()) );
@@ -1154,7 +1154,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (aVisAreaSize.Height()!=0 && aVisAreaSize.Width()!=0)
{
- mbZoomOnPage = FALSE;
+ mbZoomOnPage = sal_False;
SetZoomRect(aVisArea);
Invalidate( SID_ZOOM_IN );
Invalidate( SID_ZOOM_OUT );
@@ -1169,7 +1169,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
// --> Wird als Objektzoom im Programm angeboten
case SID_SIZE_OPTIMAL: // BASIC
{
- mbZoomOnPage = FALSE;
+ mbZoomOnPage = sal_False;
if ( mpDrawView->AreObjectsMarked() )
{
maMarkRect = mpDrawView->GetAllMarkedRect();
@@ -1199,7 +1199,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
// --> Wird als Optimal im Programm angeboten
case SID_SIZE_ALL: // BASIC
{
- mbZoomOnPage = FALSE;
+ mbZoomOnPage = sal_False;
SdrPageView* pPageView = mpDrawView->GetSdrPageView();
if( pPageView )
@@ -1298,14 +1298,14 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_AUTOSPELL_CHECK:
{
- BOOL bOnlineSpell = !GetDoc()->GetOnlineSpell();
+ sal_Bool bOnlineSpell = !GetDoc()->GetOnlineSpell();
GetDoc()->SetOnlineSpell(bOnlineSpell);
::Outliner* pOL = mpDrawView->GetTextEditOutliner();
if (pOL)
{
- ULONG nCntrl = pOL->GetControlWord();
+ sal_uLong nCntrl = pOL->GetControlWord();
if (bOnlineSpell)
nCntrl |= EE_CNTRL_ONLINESPELLING;
@@ -1364,7 +1364,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
mpDrawView->BegUndo(String(SdResId(STR_UNDO_COLORRESOLUTION)));
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
- for (ULONG i=0; i<rMarkList.GetMarkCount(); i++)
+ for (sal_uLong i=0; i<rMarkList.GetMarkCount(); i++)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
@@ -1460,13 +1460,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_UNDO :
{
// #96090# moved implementation to BaseClass
- ImpSidUndo(TRUE, rReq);
+ ImpSidUndo(sal_True, rReq);
}
break;
case SID_REDO :
{
// #96090# moved implementation to BaseClass
- ImpSidRedo(TRUE, rReq);
+ ImpSidRedo(sal_True, rReq);
}
break;
@@ -1501,7 +1501,7 @@ void DrawViewShell::InsertURLField(const String& rURL, const String& rText,
{
Outliner* pOutl = GetDoc()->GetInternalOutliner();
pOutl->Init( OUTLINERMODE_TEXTOBJECT );
- USHORT nOutlMode = pOutl->GetMode();
+ sal_uInt16 nOutlMode = pOutl->GetMode();
SvxURLField aURLField(rURL, rText, SVXURLFORMAT_REPR);
aURLField.SetTargetFrame(rTarget);
@@ -1512,9 +1512,9 @@ void DrawViewShell::InsertURLField(const String& rURL, const String& rText,
SdrRectObj* pRectObj = new SdrRectObj(OBJ_TEXT);
pOutl->UpdateFields();
- pOutl->SetUpdateMode( TRUE );
+ pOutl->SetUpdateMode( sal_True );
Size aSize(pOutl->CalcTextSize());
- pOutl->SetUpdateMode( FALSE );
+ pOutl->SetUpdateMode( sal_False );
Point aPos;
@@ -1548,7 +1548,7 @@ void DrawViewShell::InsertURLField(const String& rURL, const String& rText,
void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
const String& rTarget, const Point* pPos)
{
- BOOL bNewObj = TRUE;
+ sal_Bool bNewObj = sal_True;
const OUString sTargetURL( ::URIHelper::SmartRel2Abs( INetURLObject( GetDocSh()->GetMedium()->GetBaseURL() ), rURL, URIHelper::GetMaybeFileHdl(), true, false,
INetURLObject::WAS_ENCODED,
@@ -1561,7 +1561,7 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
// change first marked object
if( (FmFormInventor == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON) )
{
- bNewObj = FALSE;
+ bNewObj = sal_False;
SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( pMarkedObj );
@@ -1584,7 +1584,7 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
else
{
// add url as interaction for first selected shape
- bNewObj = FALSE;
+ bNewObj = sal_False;
SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pMarkedObj, true);
pInfo->meClickAction = presentation::ClickAction_DOCUMENT;
@@ -1632,7 +1632,7 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
aPos.Y() -= aSize.Height() / 2;
pUnoCtrl->SetLogicRect(Rectangle(aPos, aSize));
- ULONG nOptions = SDRINSERT_SETDEFLAYER;
+ sal_uLong nOptions = SDRINSERT_SETDEFLAYER;
OSL_ASSERT (GetViewShell()!=NULL);
SfxInPlaceClient* pIpClient = GetViewShell()->GetIPClient();
generated by cgit (git 2.34.1) at 2024-07-18 09:46:06 +0000