summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviewsa.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/drviewsa.cxx')
-rwxr-xr-xsd/source/ui/view/drviewsa.cxx58
1 files changed, 29 insertions, 29 deletions
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 36e5d96c97ff..dfef973faeb8 100755
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -95,7 +95,7 @@ static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME(
namespace sd {
-BOOL DrawViewShell::mbPipette = FALSE;
+sal_Bool DrawViewShell::mbPipette = sal_False;
// ------------------------
// - ScannerEventListener -
@@ -168,7 +168,7 @@ DrawViewShell::~DrawViewShell()
// #96642# Remove references to items within Svx3DWin
// (maybe do a listening sometime in Svx3DWin)
- USHORT nId = Svx3DChildWindow::GetChildWindowId();
+ sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId();
SfxChildWindow* pWindow = GetViewFrame() ? GetViewFrame()->GetChildWindow(nId) : NULL;
if(pWindow)
{
@@ -186,25 +186,25 @@ DrawViewShell::~DrawViewShell()
DisposeFunctions();
SdPage* pPage;
- USHORT aPageCnt = GetDoc()->GetSdPageCount(mePageKind);
+ sal_uInt16 aPageCnt = GetDoc()->GetSdPageCount(mePageKind);
- for (USHORT i = 0; i < aPageCnt; i++)
+ for (sal_uInt16 i = 0; i < aPageCnt; i++)
{
pPage = GetDoc()->GetSdPage(i, mePageKind);
if (pPage == mpActualPage)
{
- GetDoc()->SetSelected(pPage, TRUE);
+ GetDoc()->SetSelected(pPage, sal_True);
}
else
{
- GetDoc()->SetSelected(pPage, FALSE);
+ GetDoc()->SetSelected(pPage, sal_False);
}
}
if ( mpClipEvtLstnr )
{
- mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE );
+ mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_False );
mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting
mpClipEvtLstnr->release();
}
@@ -227,11 +227,11 @@ DrawViewShell::~DrawViewShell()
void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
mpActualPage = 0;
- mbMousePosFreezed = FALSE;
+ mbMousePosFreezed = sal_False;
mbReadOnly = GetDocSh()->IsReadOnly();
mpSlotArray = 0;
mpClipEvtLstnr = 0;
- mbPastePossible = FALSE;
+ mbPastePossible = sal_False;
mbIsLayerModeActive = false;
mpFrameView->Connect();
@@ -243,7 +243,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
// Ungerader Eintrag: gemappter Slot
// Achtung: Anpassen von GetIdBySubId() !!!
// Reihenfolge (insbesondere Zoom) darf nicht geaendert werden !!!
- mpSlotArray = new USHORT[ SLOTARRAY_COUNT ];
+ mpSlotArray = new sal_uInt16[ SLOTARRAY_COUNT ];
mpSlotArray[ 0 ] = SID_OBJECT_CHOOSE_MODE;
mpSlotArray[ 1 ] = SID_OBJECT_ROTATE;
mpSlotArray[ 2 ] = SID_OBJECT_ALIGN;
@@ -275,7 +275,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
mpDrawView = new DrawView(pDocSh, GetActiveWindow(), this);
mpView = mpDrawView; // Pointer der Basisklasse ViewShell
- mpDrawView->SetSwapAsynchron(TRUE); // Asynchrones Laden von Graphiken
+ mpDrawView->SetSwapAsynchron(sal_True); // Asynchrones Laden von Graphiken
// We do not read the page kind from the frame view anymore so we have
// to set it in order to resync frame view and this view.
@@ -369,18 +369,18 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
// Selektionsfunktion starten
SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool());
FuPermanent(aReq);
- mpDrawView->SetFrameDragSingles(TRUE);
+ mpDrawView->SetFrameDragSingles(sal_True);
if (pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)
{
- mbZoomOnPage = FALSE;
+ mbZoomOnPage = sal_False;
}
else
{
- mbZoomOnPage = TRUE;
+ mbZoomOnPage = sal_True;
}
- mbIsRulerDrag = FALSE;
+ mbIsRulerDrag = sal_False;
String aName( RTL_CONSTASCII_USTRINGPARAM("DrawViewShell"));
SetName (aName);
@@ -512,12 +512,12 @@ void DrawViewShell::SetupPage (Size &rSize,
long nRight,
long nUpper,
long nLower,
- BOOL bSize,
- BOOL bMargin,
- BOOL bScaleAll)
+ sal_Bool bSize,
+ sal_Bool bMargin,
+ sal_Bool bScaleAll)
{
- USHORT nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind);
- USHORT i;
+ sal_uInt16 nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind);
+ sal_uInt16 i;
for (i = 0; i < nPageCnt; i++)
{
@@ -590,7 +590,7 @@ void DrawViewShell::SetupPage (Size &rSize,
if ( mePageKind == PK_STANDARD )
{
SdPage* pHandoutPage = GetDoc()->GetSdPage(0, PK_HANDOUT);
- pHandoutPage->CreateTitleAndLayout(TRUE);
+ pHandoutPage->CreateTitleAndLayout(sal_True);
}
long nWidth = mpActualPage->GetSize().Width();
@@ -599,7 +599,7 @@ void DrawViewShell::SetupPage (Size &rSize,
Point aPageOrg(nWidth, nHeight / 2);
Size aSize( nWidth * 3, nHeight * 2);
- InitWindows(aPageOrg, aSize, Point(-1, -1), TRUE);
+ InitWindows(aPageOrg, aSize, Point(-1, -1), sal_True);
Point aVisAreaPos;
@@ -642,7 +642,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
else
{
SvxZoomItem* pZoomItem;
- UINT16 nZoom = (UINT16) GetActiveWindow()->GetZoom();
+ sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
if( mbZoomOnPage )
pZoomItem = new SvxZoomItem( SVX_ZOOM_WHOLEPAGE, nZoom );
@@ -650,7 +650,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
pZoomItem = new SvxZoomItem( SVX_ZOOM_PERCENT, nZoom );
// Bereich einschraenken
- USHORT nZoomValues = SVX_ZOOM_ENABLE_ALL;
+ sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL;
SdrPageView* pPageView = mpDrawView->GetSdrPageView();
if( ( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) )
@@ -674,7 +674,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
else
{
sd::Window * pActiveWindow = GetActiveWindow();
- SvxZoomSliderItem aZoomItem( (UINT16) pActiveWindow->GetZoom(), (USHORT)pActiveWindow->GetMinZoom(), (USHORT)pActiveWindow->GetMaxZoom() ) ;
+ SvxZoomSliderItem aZoomItem( (sal_uInt16) pActiveWindow->GetZoom(), (sal_uInt16)pActiveWindow->GetMinZoom(), (sal_uInt16)pActiveWindow->GetMaxZoom() ) ;
SdrPageView* pPageView = mpDrawView->GetSdrPageView();
if( pPageView )
@@ -771,13 +771,13 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
SdrLayer* pLayer = NULL;
SdrObject* pObj = NULL;
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
- ULONG nMarkCount = rMarkList.GetMarkCount();
- FASTBOOL bOneLayer = TRUE;
+ sal_uLong nMarkCount = rMarkList.GetMarkCount();
+ FASTBOOL bOneLayer = sal_True;
// Use the first ten selected shapes as a (hopefully
// representative) sample of all shapes of the current page.
// Detect whether they belong to the same layer.
- for( ULONG j = 0; j < nMarkCount && bOneLayer && j < 10; j++ )
+ for( sal_uLong j = 0; j < nMarkCount && bOneLayer && j < 10; j++ )
{
pObj = rMarkList.GetMark( j )->GetMarkedSdrObj();
if( pObj )
@@ -785,7 +785,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
nLayer = pObj->GetLayer();
if( j != 0 && nLayer != nOldLayer )
- bOneLayer = FALSE;
+ bOneLayer = sal_False;
nOldLayer = nLayer;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 23:11:34 +0000