summaryrefslogtreecommitdiff
path: root/basctl/source/dlged
diff options
context:
space:
mode:
Diffstat (limited to 'basctl/source/dlged')
-rw-r--r--basctl/source/dlged/dlged.cxx88
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx92
-rw-r--r--basctl/source/dlged/dlgedobj.cxx32
-rw-r--r--basctl/source/dlged/dlgedpage.cxx2
-rw-r--r--basctl/source/dlged/dlgedview.cxx4
-rw-r--r--basctl/source/dlged/managelang.cxx36
6 files changed, 127 insertions, 127 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 326098976d87..328bb94d7cc2 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -175,30 +175,30 @@ void DlgEditor::ShowDialog()
//----------------------------------------------------------------------------
-BOOL DlgEditor::UnmarkDialog()
+sal_Bool DlgEditor::UnmarkDialog()
{
SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0);
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
- BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj );
+ sal_Bool bWasMarked = pDlgEdView->IsObjMarked( pDlgObj );
if( bWasMarked )
- pDlgEdView->MarkObj( pDlgObj, pPgView, TRUE );
+ pDlgEdView->MarkObj( pDlgObj, pPgView, sal_True );
return bWasMarked;
}
//----------------------------------------------------------------------------
-BOOL DlgEditor::RemarkDialog()
+sal_Bool DlgEditor::RemarkDialog()
{
SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0);
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
- BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj );
+ sal_Bool bWasMarked = pDlgEdView->IsObjMarked( pDlgObj );
if( !bWasMarked )
- pDlgEdView->MarkObj( pDlgObj, pPgView, FALSE );
+ pDlgEdView->MarkObj( pDlgObj, pPgView, sal_False );
return bWasMarked;
}
@@ -220,12 +220,12 @@ DlgEditor::DlgEditor()
,pFunc(NULL)
,eMode( DLGED_SELECT )
,eActObj( OBJ_DLG_PUSHBUTTON )
- ,bFirstDraw(FALSE)
+ ,bFirstDraw(sal_False)
,aGridSize( 100, 100 ) // 100TH_MM
- ,bGridVisible(FALSE)
- ,bGridSnap(TRUE)
- ,bCreateOK(TRUE)
- ,bDialogModelChanged(FALSE)
+ ,bGridVisible(sal_False)
+ ,bGridSnap(sal_True)
+ ,bCreateOK(sal_True)
+ ,bDialogModelChanged(sal_False)
,mnPaintGuard(0)
{
pDlgEdModel = new DlgEdModel();
@@ -294,17 +294,17 @@ void DlgEditor::SetWindow( Window* pWindow_ )
pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this );
pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0));
- pDlgEdView->SetLayerVisible( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), FALSE );
- pDlgEdView->SetMoveSnapOnlyTopLeft( TRUE );
+ pDlgEdView->SetLayerVisible( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), sal_False );
+ pDlgEdView->SetMoveSnapOnlyTopLeft( sal_True );
pDlgEdView->SetWorkArea( Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
pDlgEdView->SetGridCoarse( aGridSize );
pDlgEdView->SetSnapGridWidth(Fraction(aGridSize.Width(), 1), Fraction(aGridSize.Height(), 1));
pDlgEdView->SetGridSnap( bGridSnap );
pDlgEdView->SetGridVisible( bGridVisible );
- pDlgEdView->SetDragStripes( FALSE );
+ pDlgEdView->SetDragStripes( sal_False );
- pDlgEdView->SetDesignMode( TRUE );
+ pDlgEdView->SetDesignMode( sal_True );
::comphelper::disposeComponent( m_xControlContainer );
}
@@ -333,8 +333,8 @@ void DlgEditor::InitScrollBars()
pHScroll->SetRange( Range( 0, aPgSize.Width() ));
pVScroll->SetRange( Range( 0, aPgSize.Height() ));
- pHScroll->SetVisibleSize( (ULONG)aOutSize.Width() );
- pVScroll->SetVisibleSize( (ULONG)aOutSize.Height() );
+ pHScroll->SetVisibleSize( (sal_uLong)aOutSize.Width() );
+ pVScroll->SetVisibleSize( (sal_uLong)aOutSize.Height() );
pHScroll->SetLineSize( aOutSize.Width() / 10 );
pVScroll->SetLineSize( aOutSize.Height() / 10 );
@@ -464,9 +464,9 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr
}
}
- bFirstDraw = TRUE;
+ bFirstDraw = sal_True;
- pDlgEdModel->SetChanged( FALSE );
+ pDlgEdModel->SetChanged( sal_False );
}
void DlgEditor::ResetDialog( void )
@@ -474,13 +474,13 @@ void DlgEditor::ResetDialog( void )
DlgEdForm* pOldDlgEdForm = pDlgEdForm;
DlgEdPage* pPage = (DlgEdPage*)pDlgEdModel->GetPage(0);
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
- BOOL bWasMarked = pDlgEdView->IsObjMarked( pOldDlgEdForm );
+ sal_Bool bWasMarked = pDlgEdView->IsObjMarked( pOldDlgEdForm );
pDlgEdView->UnmarkAll();
pPage->Clear();
pPage->SetDlgEdForm( NULL );
SetDialog( m_xUnoControlDialogModel );
if( bWasMarked )
- pDlgEdView->MarkObj( pDlgEdForm, pPgView, FALSE );
+ pDlgEdView->MarkObj( pDlgEdForm, pPgView, sal_False );
}
@@ -516,7 +516,7 @@ void DlgEditor::MouseButtonDown( const MouseEvent& rMEvt )
void DlgEditor::MouseButtonUp( const MouseEvent& rMEvt )
{
- BOOL bRet = pFunc->MouseButtonUp( rMEvt );
+ sal_Bool bRet = pFunc->MouseButtonUp( rMEvt );
if( (eMode == DLGED_INSERT) )
bCreateOK = bRet;
@@ -531,7 +531,7 @@ void DlgEditor::MouseMove( const MouseEvent& rMEvt )
//----------------------------------------------------------------------------
-BOOL DlgEditor::KeyInput( const KeyEvent& rKEvt )
+sal_Bool DlgEditor::KeyInput( const KeyEvent& rKEvt )
{
return pFunc->KeyInput( rKEvt );
}
@@ -558,7 +558,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
pWindow->IsVisible() &&
(pWindow->GetOutputSize() != aMacSize) )
{
- bFirstDraw = FALSE;
+ bFirstDraw = sal_False;
// get property set
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet(pDlgEdForm->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY);
@@ -601,14 +601,14 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
pDlgEdForm->SetSnapRect( Rectangle( aPos, aSize ) );
pDlgEdForm->EndListening(sal_False);
pDlgEdForm->SetPropsFromRect();
- pDlgEdForm->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ pDlgEdForm->GetDlgEditor()->SetDialogModelChanged(sal_True);
pDlgEdForm->StartListening();
// set position and size of controls
- ULONG nObjCount;
+ sal_uLong nObjCount;
if ( pDlgEdPage && ( ( nObjCount = pDlgEdPage->GetObjCount() ) > 0 ) )
{
- for ( ULONG i = 0 ; i < nObjCount ; i++ )
+ for ( sal_uLong i = 0 ; i < nObjCount ; i++ )
{
SdrObject* pObj = pDlgEdPage->GetObj(i);
DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pObj);
@@ -686,9 +686,9 @@ void DlgEditor::SetMode( DlgEdMode eNewMode )
pFunc = new DlgEdFuncSelect( this );
if ( eNewMode == DLGED_READONLY )
- pDlgEdModel->SetReadOnly( TRUE );
+ pDlgEdModel->SetReadOnly( sal_True );
else
- pDlgEdModel->SetReadOnly( FALSE );
+ pDlgEdModel->SetReadOnly( sal_False );
}
if ( eNewMode == DLGED_TEST )
@@ -699,7 +699,7 @@ void DlgEditor::SetMode( DlgEdMode eNewMode )
//----------------------------------------------------------------------------
-void DlgEditor::SetInsertObj( USHORT eObj )
+void DlgEditor::SetInsertObj( sal_uInt16 eObj )
{
eActObj = eObj;
@@ -709,7 +709,7 @@ void DlgEditor::SetInsertObj( USHORT eObj )
//----------------------------------------------------------------------------
-USHORT DlgEditor::GetInsertObj() const
+sal_uInt16 DlgEditor::GetInsertObj() const
{
return eActObj;
}
@@ -797,8 +797,8 @@ void DlgEditor::Copy()
}
// insert control models of marked objects into clipboard dialog model
- ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();
- for( ULONG i = 0; i < nMark; i++ )
+ sal_uLong nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();
+ for( sal_uLong i = 0; i < nMark; i++ )
{
SdrObject* pObj = pDlgEdView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj();
DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pObj);
@@ -1095,7 +1095,7 @@ void DlgEditor::Paste()
// mark object
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
- pDlgEdView->MarkObj( pCtrlObj, pPgView, FALSE, TRUE);
+ pDlgEdView->MarkObj( pCtrlObj, pPgView, sal_False, sal_True);
}
// center marked objects in dialog editor form
@@ -1107,7 +1107,7 @@ void DlgEditor::Paste()
pDlgEdView->MarkListHasChanged();
// dialog model changed
- SetDialogModelChanged(TRUE);
+ SetDialogModelChanged(sal_True);
}
}
}
@@ -1122,9 +1122,9 @@ void DlgEditor::Delete()
return;
// remove control models of marked objects from dialog model
- ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();
+ sal_uLong nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();
- for( ULONG i = 0; i < nMark; i++ )
+ for( sal_uLong i = 0; i < nMark; i++ )
{
SdrObject* pObj = pDlgEdView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj();
DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pObj);
@@ -1165,7 +1165,7 @@ void DlgEditor::Delete()
pDlgEdView->BrkAction();
- BOOL bDlgMarked = UnmarkDialog();
+ sal_Bool bDlgMarked = UnmarkDialog();
pDlgEdView->DeleteMarked();
if( bDlgMarked )
RemarkDialog();
@@ -1173,9 +1173,9 @@ void DlgEditor::Delete()
//----------------------------------------------------------------------------
-BOOL DlgEditor::IsPasteAllowed()
+sal_Bool DlgEditor::IsPasteAllowed()
{
- BOOL bPaste = FALSE;
+ sal_Bool bPaste = sal_False;
// get clipboard
Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard();
@@ -1189,7 +1189,7 @@ BOOL DlgEditor::IsPasteAllowed()
{
if ( xTransf->isDataFlavorSupported( m_ClipboardDataFlavors[0] ) )
{
- bPaste = TRUE;
+ bPaste = sal_True;
}
}
}
@@ -1216,7 +1216,7 @@ void DlgEditor::UpdatePropertyBrowserDelayed()
//----------------------------------------------------------------------------
-BOOL DlgEditor::IsModified() const
+sal_Bool DlgEditor::IsModified() const
{
return pDlgEdModel->IsChanged() || bDialogModelChanged;
}
@@ -1225,8 +1225,8 @@ BOOL DlgEditor::IsModified() const
void DlgEditor::ClearModifyFlag()
{
- pDlgEdModel->SetChanged( FALSE );
- bDialogModelChanged = FALSE;
+ pDlgEdModel->SetChanged( sal_False );
+ bDialogModelChanged = sal_False;
}
//----------------------------------------------------------------------------
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 576fd4cab99d..d15a1798467f 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -110,37 +110,37 @@ DlgEdFunc::~DlgEdFunc()
//----------------------------------------------------------------------------
-BOOL DlgEdFunc::MouseButtonDown( const MouseEvent& )
+sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& )
{
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
-BOOL DlgEdFunc::MouseButtonUp( const MouseEvent& )
+sal_Bool DlgEdFunc::MouseButtonUp( const MouseEvent& )
{
aScrollTimer.Stop();
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
-BOOL DlgEdFunc::MouseMove( const MouseEvent& )
+sal_Bool DlgEdFunc::MouseMove( const MouseEvent& )
{
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
-BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
+sal_Bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
SdrView* pView = pParent->GetView();
Window* pWindow = pParent->GetWindow();
KeyCode aCode = rKEvt.GetKeyCode();
- USHORT nCode = aCode.GetCode();
+ sal_uInt16 nCode = aCode.GetCode();
switch ( nCode )
{
@@ -149,7 +149,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
if ( pView->IsAction() )
{
pView->BrkAction();
- bReturn = TRUE;
+ bReturn = sal_True;
}
else if ( pView->AreObjectsMarked() )
{
@@ -160,7 +160,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
else
pView->UnmarkAll();
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -179,7 +179,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
if ( pView->AreObjectsMarked() )
pView->MakeVisible( pView->GetAllMarkedRect(), *pWindow );
- bReturn = TRUE;
+ bReturn = sal_True;
}
else if ( aCode.IsMod1() )
{
@@ -196,7 +196,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
pView->MakeVisible( aVisRect, *pWindow );
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -303,13 +303,13 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
if ( pView->IsDragObj() )
{
FASTBOOL bWasNoSnap = rDragStat.IsNoSnap();
- BOOL bWasSnapEnabled = pView->IsSnapEnabled();
+ sal_Bool bWasSnapEnabled = pView->IsSnapEnabled();
// switch snapping off
if ( !bWasNoSnap )
- ((SdrDragStat&)rDragStat).SetNoSnap( TRUE );
+ ((SdrDragStat&)rDragStat).SetNoSnap( sal_True );
if ( bWasSnapEnabled )
- pView->SetSnapEnabled( FALSE );
+ pView->SetSnapEnabled( sal_False );
pView->MovAction( aEndPoint );
pView->EndDragObj();
@@ -345,7 +345,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
}
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
break;
default:
@@ -365,30 +365,30 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
DlgEdFuncInsert::DlgEdFuncInsert( DlgEditor* pParent_ ) :
DlgEdFunc( pParent_ )
{
- pParent_->GetView()->SetCreateMode( TRUE );
+ pParent_->GetView()->SetCreateMode( sal_True );
}
//----------------------------------------------------------------------------
DlgEdFuncInsert::~DlgEdFuncInsert()
{
- pParent->GetView()->SetEditMode( TRUE );
+ pParent->GetView()->SetEditMode( sal_True );
}
//----------------------------------------------------------------------------
-BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
{
if( !rMEvt.IsLeft() )
- return TRUE;
+ return sal_True;
SdrView* pView = pParent->GetView();
Window* pWindow= pParent->GetWindow();
pView->SetActualWin( pWindow );
Point aPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
- USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
- USHORT nDrgLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
pWindow->CaptureMouse();
@@ -413,12 +413,12 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
pParent->ShowProperties();
}
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
-BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
+sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
{
DlgEdFunc::MouseButtonUp( rMEvt );
@@ -435,34 +435,34 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
if ( !pView->AreObjectsMarked() )
{
- USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
Point aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
pView->MarkObj(aPos, nHitLog);
}
if( pView->AreObjectsMarked() )
- return TRUE;
+ return sal_True;
else
- return FALSE;
+ return sal_False;
}
else
{
if ( pView->IsDragObj() )
pView->EndDragObj( rMEvt.IsMod1() );
- return TRUE;
+ return sal_True;
}
}
//----------------------------------------------------------------------------
-BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
+sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
{
SdrView* pView = pParent->GetView();
Window* pWindow= pParent->GetWindow();
pView->SetActualWin( pWindow );
Point aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
if ( pView->IsAction() )
{
@@ -472,14 +472,14 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
pWindow->SetPointer( pView->GetPreferedPointer( aPos, pWindow, nHitLog ) );
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
DlgEdFuncSelect::DlgEdFuncSelect( DlgEditor* pParent_ ) :
DlgEdFunc( pParent_ ),
- bMarkAction(FALSE)
+ bMarkAction(sal_False)
{
}
@@ -491,15 +491,15 @@ DlgEdFuncSelect::~DlgEdFuncSelect()
//----------------------------------------------------------------------------
-BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
{
// get view from parent
SdrView* pView = pParent->GetView();
Window* pWindow = pParent->GetWindow();
pView->SetActualWin( pWindow );
- USHORT nDrgLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
- USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
Point aMDPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
if ( rMEvt.IsLeft() && rMEvt.GetClicks() == 1 )
@@ -539,7 +539,7 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
{
// select object
pView->BegMarkObj(aMDPos);
- bMarkAction = TRUE;
+ bMarkAction = sal_True;
}
}
}
@@ -550,12 +550,12 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
pParent->ShowProperties();
}
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
-BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
+sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
{
DlgEdFunc::MouseButtonUp( rMEvt );
@@ -565,7 +565,7 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
pView->SetActualWin( pWindow );
Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
if ( rMEvt.IsLeft() )
{
@@ -584,7 +584,7 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
}
}
-// USHORT nClicks = rMEvt.GetClicks();
+// sal_uInt16 nClicks = rMEvt.GetClicks();
// if (nClicks == 2)
// {
// if ( pView->AreObjectsMarked() )
@@ -601,24 +601,24 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
// }
// }
- bMarkAction = FALSE;
+ bMarkAction = sal_False;
pWindow->SetPointer( pView->GetPreferedPointer( aPnt, pWindow, nHitLog ) );
pWindow->ReleaseMouse();
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
-BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
+sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
{
SdrView* pView = pParent->GetView();
Window* pWindow= pParent->GetWindow();
pView->SetActualWin( pWindow );
Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( pWindow->PixelToLogic(Size(3,0)).Width() );
if ( pView->IsAction() )
{
@@ -631,7 +631,7 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
pWindow->SetPointer( pView->GetPreferedPointer( aPnt, pWindow, nHitLog ) );
- return TRUE;
+ return sal_True;
}
//----------------------------------------------------------------------------
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 5af7519f85f0..45b41c831769 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -578,7 +578,7 @@ void DlgEdObj::UpdateStep()
sal_Int32 nStep = GetStep();
SdrLayerAdmin& rLayerAdmin = GetModel()->GetLayerAdmin();
- SdrLayerID nHiddenLayerId = rLayerAdmin.GetLayerID( String( RTL_CONSTASCII_USTRINGPARAM( "HiddenLayer" ) ), FALSE );
+ SdrLayerID nHiddenLayerId = rLayerAdmin.GetLayerID( String( RTL_CONSTASCII_USTRINGPARAM( "HiddenLayer" ) ), sal_False );
SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
if( nCurStep )
@@ -1027,7 +1027,7 @@ void DlgEdObj::NbcMove( const Size& rSize )
StartListening();
// dialog model changed
- GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
//----------------------------------------------------------------------------
@@ -1046,7 +1046,7 @@ void DlgEdObj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
StartListening();
// dialog model changed
- GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
//----------------------------------------------------------------------------
@@ -1145,7 +1145,7 @@ void DlgEdObj::SetDefaults()
}
// dialog model changed
- pDlgEdForm->GetDlgEditor()->SetDialogModelChanged( TRUE );
+ pDlgEdForm->GetDlgEditor()->SetDialogModelChanged( sal_True );
}
}
@@ -1252,7 +1252,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::Propert
return;
// dialog model changed
- pDlgEditor->SetDialogModelChanged(TRUE);
+ pDlgEditor->SetDialogModelChanged(sal_True);
// update position and size
if ( evt.PropertyName == DLGED_PROP_POSITIONX || evt.PropertyName == DLGED_PROP_POSITIONY ||
@@ -1302,11 +1302,11 @@ void SAL_CALL DlgEdObj::_elementInserted(const ::com::sun::star::container::Cont
// dialog model changed
if ( ISA(DlgEdForm) )
{
- ((DlgEdForm*)this)->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ ((DlgEdForm*)this)->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
else
{
- GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
}
}
@@ -1320,11 +1320,11 @@ void SAL_CALL DlgEdObj::_elementReplaced(const ::com::sun::star::container::Cont
// dialog model changed
if ( ISA(DlgEdForm) )
{
- ((DlgEdForm*)this)->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ ((DlgEdForm*)this)->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
else
{
- GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
}
}
@@ -1338,11 +1338,11 @@ void SAL_CALL DlgEdObj::_elementRemoved(const ::com::sun::star::container::Conta
// dialog model changed
if ( ISA(DlgEdForm) )
{
- ((DlgEdForm*)this)->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ ((DlgEdForm*)this)->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
else
{
- GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEdForm()->GetDlgEditor()->SetDialogModelChanged(sal_True);
}
}
}
@@ -1600,12 +1600,12 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
void DlgEdForm::UpdateStep()
{
- ULONG nObjCount;
+ sal_uLong nObjCount;
SdrPage* pSdrPage = GetPage();
if ( pSdrPage && ( ( nObjCount = pSdrPage->GetObjCount() ) > 0 ) )
{
- for ( ULONG i = 0 ; i < nObjCount ; i++ )
+ for ( sal_uLong i = 0 ; i < nObjCount ; i++ )
{
SdrObject* pObj = pSdrPage->GetObj(i);
DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pObj);
@@ -1798,7 +1798,7 @@ void DlgEdForm::NbcMove( const Size& rSize )
}
// dialog model changed
- GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEditor()->SetDialogModelChanged(sal_True);
}
//----------------------------------------------------------------------------
@@ -1822,7 +1822,7 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract
}
// dialog model changed
- GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEditor()->SetDialogModelChanged(sal_True);
}
//----------------------------------------------------------------------------
@@ -1838,7 +1838,7 @@ FASTBOOL DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
SetPropsFromRect();
// dialog model changed
- GetDlgEditor()->SetDialogModelChanged(TRUE);
+ GetDlgEditor()->SetDialogModelChanged(sal_True);
// start listening
StartListening();
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index eaabbfef0ff2..a2cd7dfbc364 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -68,7 +68,7 @@ SdrPage* DlgEdPage::Clone() const
//----------------------------------------------------------------------------
-SdrObject* DlgEdPage::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
+SdrObject* DlgEdPage::SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum)
{
SdrObject* pObj = SdrPage::SetObjectOrdNum( nOldObjNum, nNewObjNum );
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index da8bbc638a1e..e57abbcaeaea 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -149,7 +149,7 @@ void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
//----------------------------------------------------------------------------
-SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT nTol)
+SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt16 nTol)
{
DlgEdObj* pDlgEdObj = dynamic_cast< DlgEdObj* >(pRetval);
@@ -198,7 +198,7 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT n
return pRetval;
}
-SdrObject* DlgEdView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
+SdrObject* DlgEdView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const
{
// call parent
SdrObject* pRetval = SdrView::CheckSingleSdrObjectHit(rPnt, nTol, pObj, pPV, nOptions, pMVisLay);
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 41c86699203b..085191370425 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -86,8 +86,8 @@ namespace {
{
nStartPos = aBoundary.endPos;
String sWord( rText.Copy(
- (USHORT)aBoundary.startPos,
- (USHORT)aBoundary.endPos - (USHORT)aBoundary.startPos ) );
+ (sal_uInt16)aBoundary.startPos,
+ (sal_uInt16)aBoundary.endPos - (sal_uInt16)aBoundary.startPos ) );
long nTemp = rWin.GetCtrlTextWidth( sWord );
if ( nTemp > nWidth )
nWidth = nTemp;
@@ -145,7 +145,7 @@ void ManageLanguageDialog::Init()
m_aMakeDefPB.SetClickHdl( LINK( this, ManageLanguageDialog, MakeDefHdl ) );
m_aLanguageLB.SetSelectHdl( LINK( this, ManageLanguageDialog, SelectHdl ) );
- m_aLanguageLB.EnableMultiSelection( TRUE );
+ m_aLanguageLB.EnableMultiSelection( sal_True );
CalcInfoSize();
}
@@ -188,7 +188,7 @@ void ManageLanguageDialog::FillLanguageBox()
Locale aDefaultLocale = m_pLocalizationMgr->getStringResourceManager()->getDefaultLocale();
Sequence< Locale > aLocaleSeq = m_pLocalizationMgr->getStringResourceManager()->getLocales();
const Locale* pLocale = aLocaleSeq.getConstArray();
- INT32 i, nCount = aLocaleSeq.getLength();
+ sal_Int32 i, nCount = aLocaleSeq.getLength();
for ( i = 0; i < nCount; ++i )
{
bool bIsDefault = localesAreEqual( aDefaultLocale, pLocale[i] );
@@ -199,7 +199,7 @@ void ManageLanguageDialog::FillLanguageBox()
sLanguage += ' ';
sLanguage += m_sDefLangStr;
}
- USHORT nPos = m_aLanguageLB.InsertEntry( sLanguage );
+ sal_uInt16 nPos = m_aLanguageLB.InsertEntry( sLanguage );
m_aLanguageLB.SetEntryData( nPos, new LanguageEntry( sLanguage, pLocale[i], bIsDefault ) );
}
}
@@ -209,7 +209,7 @@ void ManageLanguageDialog::FillLanguageBox()
void ManageLanguageDialog::ClearLanguageBox()
{
- USHORT i, nCount = m_aLanguageLB.GetEntryCount();
+ sal_uInt16 i, nCount = m_aLanguageLB.GetEntryCount();
for ( i = 0; i < nCount; ++i )
{
LanguageEntry* pEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData(i) );
@@ -244,13 +244,13 @@ IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG )
aQBox.SetButtonText( RET_OK, m_sDeleteStr );
if ( aQBox.Execute() == RET_OK )
{
- USHORT i, nCount = m_aLanguageLB.GetSelectEntryCount();
- USHORT nPos = m_aLanguageLB.GetSelectEntryPos();
+ sal_uInt16 i, nCount = m_aLanguageLB.GetSelectEntryCount();
+ sal_uInt16 nPos = m_aLanguageLB.GetSelectEntryPos();
// remove locales
Sequence< Locale > aLocaleSeq( nCount );
for ( i = 0; i < nCount; ++i )
{
- USHORT nSelPos = m_aLanguageLB.GetSelectEntryPos(i);
+ sal_uInt16 nSelPos = m_aLanguageLB.GetSelectEntryPos(i);
LanguageEntry* pEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData( nSelPos ) );
if ( pEntry )
aLocaleSeq[i] = pEntry->m_aLocale;
@@ -271,7 +271,7 @@ IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG )
IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG )
{
- USHORT nPos = m_aLanguageLB.GetSelectEntryPos();
+ sal_uInt16 nPos = m_aLanguageLB.GetSelectEntryPos();
LanguageEntry* pSelectEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData( nPos ) );
if ( pSelectEntry && !pSelectEntry->m_bIsDefault )
{
@@ -290,7 +290,7 @@ IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG )
IMPL_LINK( ManageLanguageDialog, SelectHdl, ListBox *, EMPTYARG )
{
- USHORT nCount = m_aLanguageLB.GetEntryCount();
+ sal_uInt16 nCount = m_aLanguageLB.GetEntryCount();
bool bEmpty = ( !nCount ||
m_aLanguageLB.GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND );
bool bSelect = ( m_aLanguageLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND );
@@ -345,18 +345,18 @@ SetDefaultLanguageDialog::~SetDefaultLanguageDialog()
void SetDefaultLanguageDialog::FillLanguageBox()
{
// fill list with all languages
- m_pLanguageLB->SetLanguageList( LANG_LIST_ALL, FALSE );
+ m_pLanguageLB->SetLanguageList( LANG_LIST_ALL, sal_False );
// remove the already localized languages
Sequence< Locale > aLocaleSeq = m_pLocalizationMgr->getStringResourceManager()->getLocales();
const Locale* pLocale = aLocaleSeq.getConstArray();
- INT32 i, nCount = aLocaleSeq.getLength();
+ sal_Int32 i, nCount = aLocaleSeq.getLength();
for ( i = 0; i < nCount; ++i )
m_pLanguageLB->RemoveLanguage( SvxLocaleToLanguage( pLocale[i] ) );
// fill checklistbox if not in default mode
if ( m_pLocalizationMgr->isLibraryLocalized() )
{
- USHORT j, nCount_ = m_pLanguageLB->GetEntryCount();
+ sal_uInt16 j, nCount_ = m_pLanguageLB->GetEntryCount();
for ( j = 0; j < nCount_; ++j )
{
m_pCheckLangLB->InsertEntry(
@@ -401,7 +401,7 @@ void SetDefaultLanguageDialog::CalcInfoSize()
Sequence< Locale > SetDefaultLanguageDialog::GetLocales() const
{
bool bNotLocalized = !m_pLocalizationMgr->isLibraryLocalized();
- INT32 nSize = bNotLocalized ? 1 : m_pCheckLangLB->GetCheckedEntryCount();
+ sal_Int32 nSize = bNotLocalized ? 1 : m_pCheckLangLB->GetCheckedEntryCount();
Sequence< Locale > aLocaleSeq( nSize );
if ( bNotLocalized )
{
@@ -411,13 +411,13 @@ Sequence< Locale > SetDefaultLanguageDialog::GetLocales() const
}
else
{
- USHORT i, nCount = static_cast< USHORT >( m_pCheckLangLB->GetEntryCount() );
- INT32 j = 0;
+ sal_uInt16 i, nCount = static_cast< sal_uInt16 >( m_pCheckLangLB->GetEntryCount() );
+ sal_Int32 j = 0;
for ( i = 0; i < nCount; ++i )
{
if ( m_pCheckLangLB->IsChecked(i) )
{
- LanguageType eType = LanguageType( (ULONG)m_pCheckLangLB->GetEntryData(i) );
+ LanguageType eType = LanguageType( (sal_uLong)m_pCheckLangLB->GetEntryData(i) );
Locale aLocale;
SvxLanguageToLocale( aLocale, eType );
aLocaleSeq[j++] = aLocale;
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 13:06:55 +0000