summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviews4.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/drviews4.cxx')
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews4.cxx66
1 files changed, 33 insertions, 33 deletions
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 88027d360806..0a369bbf7c1f 100644..100755
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -102,7 +102,7 @@ using namespace ::com::sun::star::drawing;
void DrawViewShell::DeleteActualPage()
{
- USHORT nPage = maTabControl.GetCurPageId() - 1;
+ sal_uInt16 nPage = maTabControl.GetCurPageId() - 1;
mpDrawView->SdrEndTextEdit();
@@ -132,13 +132,13 @@ void DrawViewShell::DeleteActualLayer()
String aString(SdResId(STR_ASK_DELETE_LAYER));
// Platzhalter ersetzen
- USHORT nPos = aString.Search(sal_Unicode('$'));
+ sal_uInt16 nPos = aString.Search(sal_Unicode('$'));
aString.Erase(nPos, 1);
aString.Insert(rName, nPos);
if (QueryBox(GetActiveWindow(), WB_YES_NO, aString).Execute() == RET_YES)
{
- const SdrLayer* pLayer = rAdmin.GetLayer(rName, FALSE);
+ const SdrLayer* pLayer = rAdmin.GetLayer(rName, sal_False);
mpDrawView->DeleteLayer( pLayer->GetName() );
// damit TabBar und Window neu gezeichnet werden;
@@ -158,9 +158,9 @@ void DrawViewShell::DeleteActualLayer()
|*
\************************************************************************/
-BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
+sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if ( !IsInputLocked() || ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE ) )
{
@@ -186,7 +186,7 @@ BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
// look for a new candidate, a successor of pOldObj
SdrObjListIter aIter(*pActualPage, IM_DEEPNOGROUPS);
- BOOL bDidVisitOldObject(FALSE);
+ sal_Bool bDidVisitOldObject(sal_False);
while(aIter.IsMore() && !pCandidate)
{
@@ -206,7 +206,7 @@ BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
if(pObj == pOldObj)
{
- bDidVisitOldObject = TRUE;
+ bDidVisitOldObject = sal_True;
}
}
}
@@ -254,13 +254,13 @@ void DrawViewShell::StartRulerDrag (
if ( rRuler.GetExtraRect().IsInside(rMEvt.GetPosPixel()) )
{
mpDrawView->BegSetPageOrg(aWPos);
- mbIsRulerDrag = TRUE;
+ mbIsRulerDrag = sal_True;
}
else
{
// #i34536# if no guide-lines are visible yet, that show them
if( ! mpDrawView->IsHlplVisible())
- mpDrawView->SetHlplVisible( TRUE );
+ mpDrawView->SetHlplVisible( sal_True );
SdrHelpLineKind eKind;
@@ -272,7 +272,7 @@ void DrawViewShell::StartRulerDrag (
eKind = SDRHELPLINE_VERTICAL;
mpDrawView->BegDragHelpLine(aWPos, eKind);
- mbIsRulerDrag = TRUE;
+ mbIsRulerDrag = sal_True;
}
}
@@ -293,7 +293,7 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
// would work on deleted objects or the context menu has no parent anymore)
// See #126086# and #128122#
SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient();
- BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
+ sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
if ( bIsOleActive && PopupMenu::IsInExecute() )
return;
@@ -324,7 +324,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
if ( !aOutputArea.IsInside(rMEvt.GetPosPixel()) )
{
- BOOL bInsideOtherWindow = FALSE;
+ sal_Bool bInsideOtherWindow = sal_False;
if (mpContentWindow.get() != NULL)
{
@@ -333,7 +333,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
Point aPos = mpContentWindow->GetPointerPosPixel();
if ( aOutputArea.IsInside(aPos) )
- bInsideOtherWindow = TRUE;
+ bInsideOtherWindow = sal_True;
}
if (! GetActiveWindow()->HasFocus ())
@@ -422,9 +422,9 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
}
( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )->
- SetColor( Color( (BYTE) ( nRed / fDiv + .5 ),
- (BYTE) ( nGreen / fDiv + .5 ),
- (BYTE) ( nBlue / fDiv + .5 ) ) );
+ SetColor( Color( (sal_uInt8) ( nRed / fDiv + .5 ),
+ (sal_uInt8) ( nGreen / fDiv + .5 ),
+ (sal_uInt8) ( nBlue / fDiv + .5 ) ) );
}
}
}
@@ -467,7 +467,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
}
GetActiveWindow()->ReleaseMouse();
- mbIsRulerDrag = FALSE;
+ mbIsRulerDrag = sal_False;
}
else
ViewShell::MouseButtonUp(rMEvt, pWin);
@@ -488,7 +488,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
// windows and code on the stack.
// For more information, see #126086# and #128122#
SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient();
- BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
+ sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ))
{
// Deactivate OLE object
@@ -516,7 +516,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
if( GetActiveWindow() )
aPos = GetActiveWindow()->PixelToLogic( rCEvt.GetMousePosPixel() );
- if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, FALSE ) )
+ if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, sal_False ) )
{
INetBookmark aINetBookmark( aEmptyStr, aEmptyStr );
@@ -535,18 +535,18 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
else if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bNativeShow &&
pWin != NULL && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() )
{
- USHORT nSdResId = 0; // ResourceID fuer Popup-Menue
- BOOL bGraphicShell = this->ISA(GraphicViewShell);
+ sal_uInt16 nSdResId = 0; // ResourceID fuer Popup-Menue
+ sal_Bool bGraphicShell = this->ISA(GraphicViewShell);
// Ist ein Fangobjekt unter dem Mauszeiger?
SdrPageView* pPV;
Point aMPos = pWin->PixelToLogic( maMousePos );
- USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic(
+ sal_uInt16 nHitLog = (sal_uInt16) GetActiveWindow()->PixelToLogic(
Size(FuPoor::HITPIX, 0 ) ).Width();
- USHORT nHelpLine;
+ sal_uInt16 nHelpLine;
// fuer Klebepunkt
SdrObject* pObj = NULL;
- USHORT nPickId = 0;
+ sal_uInt16 nPickId = 0;
// fuer Feldbefehl
OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView();
const SvxFieldItem* pFldItem = NULL;
@@ -597,10 +597,10 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
//pOLV->DeleteSelected(); <-- fehlt leider !
// Feld selektieren, so dass es beim Insert geloescht wird
ESelection aSel = pOLV->GetSelection();
- BOOL bSel = TRUE;
+ sal_Bool bSel = sal_True;
if( aSel.nStartPos == aSel.nEndPos )
{
- bSel = FALSE;
+ bSel = sal_False;
aSel.nEndPos++;
}
pOLV->SetSelection( aSel );
@@ -672,8 +672,8 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
else
{
- UINT32 nInv = pObj->GetObjInventor();
- UINT16 nId = pObj->GetObjIdentifier();
+ sal_uInt32 nInv = pObj->GetObjInventor();
+ sal_uInt16 nId = pObj->GetObjIdentifier();
if (nInv == SdrInventor)
{
@@ -824,7 +824,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
//open context menu at that point
GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(nSdResId),GetActiveWindow(),&aMenuPos);
}
- mbMousePosFreezed = FALSE;
+ mbMousePosFreezed = sal_False;
}
}
else
@@ -849,7 +849,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
RulerLine pVLines[2];
long nHOffs = 0L;
long nVOffs = 0L;
- USHORT nCnt;
+ sal_uInt16 nCnt;
if (mpHorizontalRuler.get() != NULL)
mpHorizontalRuler->SetLines();
@@ -940,7 +940,7 @@ void DrawViewShell::UnlockInput()
void DrawViewShell::ShowSnapLineContextMenu (
SdrPageView& rPageView,
- const USHORT nSnapLineIndex,
+ const sal_uInt16 nSnapLineIndex,
const Point& rMouseLocation)
{
const SdrHelpLine& rHelpLine (rPageView.GetHelpLines()[nSnapLineIndex]);
@@ -967,9 +967,9 @@ void DrawViewShell::ShowSnapLineContextMenu (
String(SdResId(STR_POPUP_DELETE_SNAPLINE)));
}
- pMenu->RemoveDisabledEntries(FALSE, FALSE);
+ pMenu->RemoveDisabledEntries(sal_False, sal_False);
- const USHORT nResult = pMenu->Execute(
+ const sal_uInt16 nResult = pMenu->Execute(
GetActiveWindow(),
Rectangle(rMouseLocation, Size(10,10)),
POPUPMENU_EXECUTE_DOWN);
generated by cgit (git 2.34.1) at 2024-07-18 12:02:08 +0000