summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/func')
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/bulmaper.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuarea.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fubullet.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuchar.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fucon3d.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconarc.cxx44
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconbez.cxx44
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconcs.cxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconrec.cxx54
-rw-r--r--sd/source/ui/func/fuconstr.cxx156
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconuno.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fucopy.cxx64
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fucushow.cxx4
-rw-r--r--sd/source/ui/func/fudraw.cxx186
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fudspord.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuediglu.cxx56
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuexpand.cxx51
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuformatpaintbrush.cxx46
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuhhconv.cxx20
-rw-r--r--sd/source/ui/func/fuinsert.cxx23
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuinsfil.cxx100
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuline.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fulinend.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fumorph.cxx30
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuoaprms.cxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuolbull.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuoltext.cxx28
-rw-r--r--sd/source/ui/func/fuoutl.cxx6
-rw-r--r--sd/source/ui/func/fupage.cxx99
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuparagr.cxx4
-rw-r--r--sd/source/ui/func/fupoor.cxx102
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuprlout.cxx36
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuprobjs.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuscale.cxx12
-rw-r--r--sd/source/ui/func/fusearch.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusel.cxx214
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusldlg.cxx10
-rw-r--r--sd/source/ui/func/fusnapln.cxx22
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusumry.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futempl.cxx54
-rw-r--r--sd/source/ui/func/futext.cxx201
-rw-r--r--sd/source/ui/func/futransf.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futxtatt.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuzoom.cxx30
-rw-r--r--sd/source/ui/func/sdundogr.cxx16
-rw-r--r--sd/source/ui/func/smarttag.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/unprlout.cxx8
47 files changed, 1053 insertions, 993 deletions
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 7eeaa63cb38a..de4c7968fbe3 100644..100755
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -62,8 +62,8 @@
void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& rSet )
{
- const USHORT nCount = aNumRule.GetLevelCount();
- for( USHORT nLevel = 0; nLevel < nCount; nLevel++ )
+ const sal_uInt16 nCount = aNumRule.GetLevelCount();
+ for( sal_uInt16 nLevel = 0; nLevel < nCount; nLevel++ )
{
const SvxNumberFormat& rSrcLevel = aNumRule.GetLevel(nLevel);
SvxNumberFormat aNewLevel( rSrcLevel );
@@ -97,22 +97,22 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet&
Font aMyFont;
const SvxFontItem& rFItem =
- (SvxFontItem&)rSet.Get(GetWhich( (USHORT)nFontID ));
+ (SvxFontItem&)rSet.Get(GetWhich( (sal_uInt16)nFontID ));
aMyFont.SetFamily(rFItem.GetFamily());
aMyFont.SetName(rFItem.GetFamilyName());
aMyFont.SetCharSet(rFItem.GetCharSet());
aMyFont.SetPitch(rFItem.GetPitch());
const SvxFontHeightItem& rFHItem =
- (SvxFontHeightItem&)rSet.Get(GetWhich( (USHORT)nFontHeightID ));
+ (SvxFontHeightItem&)rSet.Get(GetWhich( (sal_uInt16)nFontHeightID ));
aMyFont.SetSize(Size(0, rFHItem.GetHeight()));
const SvxWeightItem& rWItem =
- (SvxWeightItem&)rSet.Get(GetWhich( (USHORT)nWeightID ));
+ (SvxWeightItem&)rSet.Get(GetWhich( (sal_uInt16)nWeightID ));
aMyFont.SetWeight(rWItem.GetWeight());
const SvxPostureItem& rPItem =
- (SvxPostureItem&)rSet.Get(GetWhich( (USHORT)nPostureID ));
+ (SvxPostureItem&)rSet.Get(GetWhich( (sal_uInt16)nPostureID ));
aMyFont.SetItalic(rPItem.GetPosture());
const SvxUnderlineItem& rUItem = (SvxUnderlineItem&)rSet.Get(GetWhich(SID_ATTR_CHAR_UNDERLINE));
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index cdfb1364dd8a..e01efa652e6a 100644..100755
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -90,7 +90,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
}
// Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden
- static USHORT SidArray[] = {
+ static sal_uInt16 SidArray[] = {
SID_ATTR_FILL_STYLE,
SID_ATTR_FILL_COLOR,
SID_ATTR_FILL_GRADIENT,
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 37161bca901e..3ccb81334dbc 100644..100755
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -139,19 +139,19 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
{
// prevent flickering
pOV->HideCursor();
- pOL->SetUpdateMode(FALSE);
+ pOL->SetUpdateMode(sal_False);
// remove old selected text
pOV->InsertText( aEmptyStr );
// prepare undo
- SfxUndoManager& rUndoMgr = pOL->GetUndoManager();
+ ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
rUndoMgr.EnterListAction(String(SdResId(STR_UNDO_INSERT_SPECCHAR)),
aEmptyStr );
// insert given text
String aStr( cMark );
- pOV->InsertText( cMark, TRUE);
+ pOV->InsertText( cMark, sal_True);
ESelection aSel = pOV->GetSelection();
aSel.nStartPara = aSel.nEndPara;
@@ -161,7 +161,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
rUndoMgr.LeaveListAction();
// restart repainting
- pOL->SetUpdateMode(TRUE);
+ pOL->SetUpdateMode(sal_True);
pOV->ShowCursor();
}
}
@@ -171,7 +171,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if( pArgs )
- pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
+ pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem);
String aChars, aFontName;
Font aFont;
@@ -179,7 +179,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
{
aChars = ((const SfxStringItem*)pItem)->GetValue();
const SfxPoolItem* pFtItem = NULL;
- pArgs->GetItemState( mpDoc->GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
+ pArgs->GetItemState( mpDoc->GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
{
@@ -199,7 +199,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
if (!aChars.Len() )
{
SfxAllItemSet aSet( mpDoc->GetPool() );
- aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
+ aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
SfxItemSet aFontAttr( mpDoc->GetPool() );
mpView->GetAttributes( aFontAttr );
@@ -217,11 +217,11 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
// Wenn Zeichen selektiert ist kann es angezeigt werden
// pDLg->SetFont( );
// pDlg->SetChar( );
- USHORT nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
if( nResult == RET_OK )
{
- SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, FALSE );
- SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
+ SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False );
+ SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False );
if ( pFItem )
{
aFont.SetName( pFItem->GetFamilyName() );
@@ -263,7 +263,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
{
// nicht flackern
pOV->HideCursor();
- pOL->SetUpdateMode(FALSE);
+ pOL->SetUpdateMode(sal_False);
// alte Attributierung merken;
// dazu vorher selektierten Bereich loeschen, denn der muss eh weg
@@ -275,10 +275,10 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
SfxItemSet aOldSet( mpDoc->GetPool(), EE_CHAR_FONTINFO, EE_CHAR_FONTINFO, 0 );
aOldSet.Put( pOV->GetAttribs() );
- SfxUndoManager& rUndoMgr = pOL->GetUndoManager();
+ ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
rUndoMgr.EnterListAction(String(SdResId(STR_UNDO_INSERT_SPECCHAR)),
aEmptyStr );
- pOV->InsertText(aChars, TRUE);
+ pOV->InsertText(aChars, sal_True);
// attributieren (Font setzen)
SfxItemSet aSet(pOL->GetEmptyItemSet());
@@ -302,7 +302,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
rUndoMgr.LeaveListAction();
// ab jetzt wieder anzeigen
- pOL->SetUpdateMode(TRUE);
+ pOL->SetUpdateMode(sal_True);
pOV->ShowCursor();
}
}
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 9c3d1855303a..3840bd5fa492 100644..100755
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -86,13 +86,13 @@ void FuChar::DoExecute( SfxRequest& rReq )
SfxItemSet aNewAttr( mpViewShell->GetPool(),
EE_ITEMS_START, EE_ITEMS_END );
- aNewAttr.Put( aEditAttr, FALSE );
+ aNewAttr.Put( aEditAttr, sal_False );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0;
if( pDlg )
{
- USHORT nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
if( nResult == RET_OK )
{
@@ -111,7 +111,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
mpView->SetAttributes(*pArgs);
// invalidieren der Slots, die in der DrTxtObjBar auftauchen
- static USHORT SidArray[] = {
+ static sal_uInt16 SidArray[] = {
SID_ATTR_CHAR_FONT,
SID_ATTR_CHAR_POSTURE,
SID_ATTR_CHAR_WEIGHT,
@@ -127,9 +127,9 @@ void FuChar::DoExecute( SfxRequest& rReq )
if( mpDoc->GetOnlineSpell() )
{
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE, FALSE, &pItem ) ||
- SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CJK, FALSE, &pItem ) ||
- SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CTL, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE, sal_False, &pItem ) ||
+ SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CJK, sal_False, &pItem ) ||
+ SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CTL, sal_False, &pItem ) )
{
mpDoc->StopOnlineSpelling();
mpDoc->StartOnlineSpelling();
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 649621ba8b2b..7f956f23e00e 100644..100755
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -130,7 +130,7 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
case SID_3D_SHELL:
{
- XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, FALSE);
+ XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False);
aXPoly.Scale(5.0, 5.0);
::basegfx::B2DPolygon aB2DPolygon(aXPoly.getB2DPolygon());
@@ -142,13 +142,13 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
// Dies ist ein offenes Objekt, muss daher defaultmaessig
// doppelseitig behandelt werden
- p3DObj->SetMergedItem(Svx3DDoubleSidedItem(TRUE));
+ p3DObj->SetMergedItem(Svx3DDoubleSidedItem(sal_True));
break;
}
case SID_3D_HALF_SPHERE:
{
- XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, FALSE);
+ XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False);
aXPoly.Scale(5.0, 5.0);
aXPoly.Insert(0, Point (2400*5, 1250*5), XPOLY_NORMAL);
@@ -321,16 +321,16 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
pScene->SetMergedItemSetAndBroadcast(aAttr);
}
-BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
if ( rMEvt.IsLeft() && !mpView->IsAction() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpWindow->CaptureMouse();
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
E3dCompoundObject* p3DObj = NULL;
@@ -365,7 +365,7 @@ BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -376,15 +376,15 @@ BOOL FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpView->EndCreateObj(SDRCREATE_FORCEEND);
- bReturn = TRUE;
+ bReturn = sal_True;
}
bReturn = FuConstruct::MouseButtonUp(rMEvt) || bReturn;
@@ -399,12 +399,12 @@ BOOL FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt)
{
return( FuConstruct::KeyInput(rKEvt) );
}
@@ -451,7 +451,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
// copied code from E3dView::InitScene
double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0));
Camera3D aCam(pScene->GetCamera());
- aCam.SetAutoAdjustProjection(FALSE);
+ aCam.SetAutoAdjustProjection(sal_False);
aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
::basegfx::B3DPoint aLookAt;
double fDefaultCamPosZ = mpView->GetDefaultCamPosZ();
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 7f2d1a03f57b..7810ae9dcb33 100644..100755
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -95,12 +95,12 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
if (pArgs)
{
- SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE);
- SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE);
- SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE);
- SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE);
- SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, FALSE);
- SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, FALSE);
+ SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False);
+ SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False);
+ SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False);
+ SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False);
+ SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, sal_False);
+ SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, sal_False);
Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2,
pCenterY->GetValue () - pAxisY->GetValue () / 2,
@@ -125,15 +125,15 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
|*
\************************************************************************/
-BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
{
- BOOL bReturn = FuConstruct::MouseButtonDown( rMEvt );
+ sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt );
if ( rMEvt.IsLeft() && !mpView->IsAction() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpWindow->CaptureMouse();
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog);
SdrObject* pObj = mpView->GetCreateObj();
@@ -146,7 +146,7 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
pObj->SetMergedItemSet(aAttr);
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
return bReturn;
}
@@ -157,7 +157,7 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
|*
\************************************************************************/
-BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt )
+sal_Bool FuConstructArc::MouseMove( const MouseEvent& rMEvt )
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -168,26 +168,26 @@ BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt )
|*
\************************************************************************/
-BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
+sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
{
- BOOL bReturn = FALSE;
- BOOL bCreated = FALSE;
+ sal_Bool bReturn = sal_False;
+ sal_Bool bCreated = sal_False;
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
+ sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
if (mpView->EndCreateObj(SDRCREATE_NEXTPOINT) )
{
if (nCount != mpView->GetSdrPageView()->GetObjList()->GetObjCount())
{
- bCreated = TRUE;
+ bCreated = sal_True;
}
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn;
@@ -202,14 +202,14 @@ BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuConstructArc::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstructArc::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+ sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
@@ -257,7 +257,7 @@ void FuConstructArc::Activate()
break;
}
- mpView->SetCurrentObj((UINT16)aObjKind);
+ mpView->SetCurrentObj((sal_uInt16)aObjKind);
FuConstruct::Activate();
}
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 2b046c4de795..4b8d24c63792 100644..100755
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -99,7 +99,7 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq )
if( pArgs )
{
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, sal_True, &pPoolItem ) )
maTargets = ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue();
}
}
@@ -110,9 +110,9 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq )
|*
\************************************************************************/
-BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -130,11 +130,11 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
// Texteingabe hier nicht zulassen
aVEvt.eEvent = SDREVENT_BEGDRAGOBJ;
- mpView->EnableExtendedMouseEventDispatcher(FALSE);
+ mpView->EnableExtendedMouseEventDispatcher(sal_False);
}
else
{
- mpView->EnableExtendedMouseEventDispatcher(TRUE);
+ mpView->EnableExtendedMouseEventDispatcher(sal_True);
}
if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
@@ -167,9 +167,9 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuConstruct::MouseMove(rMEvt);
+ sal_Bool bReturn = FuConstruct::MouseMove(rMEvt);
return(bReturn);
}
@@ -179,15 +179,15 @@ BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
+sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
{
- BOOL bReturn = FALSE;
- BOOL bCreated = FALSE;
+ sal_Bool bReturn = sal_False;
+ sal_Bool bCreated = sal_False;
SdrViewEvent aVEvt;
mpView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt);
- ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
+ sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
if (mpView->IsInsObjPoint())
{
@@ -200,15 +200,15 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
if (aVEvt.eEvent == SDREVENT_ENDCREATE)
{
- bReturn = TRUE;
+ bReturn = sal_True;
if (nCount == (mpView->GetSdrPageView()->GetObjList()->GetObjCount() - 1))
{
- bCreated = TRUE;
+ bCreated = sal_True;
}
// Trick, um FuDraw::DoubleClick nicht auszuloesen
- bMBDown = FALSE;
+ bMBDown = sal_False;
}
@@ -261,14 +261,14 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+ sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
@@ -281,7 +281,7 @@ BOOL FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
void FuConstructBezierPolygon::Activate()
{
- mpView->EnableExtendedMouseEventDispatcher(TRUE);
+ mpView->EnableExtendedMouseEventDispatcher(sal_True);
SdrObjKind eKind;
@@ -332,7 +332,7 @@ void FuConstructBezierPolygon::Activate()
break;
}
- mpView->SetCurrentObj((UINT16)eKind);
+ mpView->SetCurrentObj((sal_uInt16)eKind);
FuConstruct::Activate();
}
@@ -345,7 +345,7 @@ void FuConstructBezierPolygon::Activate()
void FuConstructBezierPolygon::Deactivate()
{
- mpView->EnableExtendedMouseEventDispatcher(FALSE);
+ mpView->EnableExtendedMouseEventDispatcher(sal_False);
FuConstruct::Deactivate();
}
@@ -374,7 +374,7 @@ void FuConstructBezierPolygon::SelectionHasChanged()
|*
\************************************************************************/
-void FuConstructBezierPolygon::SetEditMode(USHORT nMode)
+void FuConstructBezierPolygon::SetEditMode(sal_uInt16 nMode)
{
nEditMode = nMode;
ForcePointer();
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 56df5e65e9be..5a36179eab84 100644..100755
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -131,16 +131,16 @@ void FuConstructCustomShape::DoExecute( SfxRequest& rReq )
|*
\************************************************************************/
-BOOL FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
if ( rMEvt.IsLeft() && !mpView->IsAction() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpWindow->CaptureMouse();
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog);
@@ -170,7 +170,7 @@ BOOL FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -181,7 +181,7 @@ BOOL FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
{
sal_Bool bReturn(sal_False);
@@ -205,14 +205,14 @@ BOOL FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+ sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index d8b0b23abd89..85cd8cc5945a 100644..100755
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -120,10 +120,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
{
case SID_DRAW_ELLIPSE :
{
- SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE);
- SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE);
- SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE);
- SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE);
+ SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False);
+ SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False);
+ SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False);
+ SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False);
Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2,
pCenterY->GetValue () - pAxisY->GetValue () / 2,
@@ -138,10 +138,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
case SID_DRAW_RECT :
{
- SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, FALSE);
- SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, FALSE);
- SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, FALSE);
- SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, FALSE);
+ SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, sal_False);
+ SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, sal_False);
+ SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, sal_False);
+ SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, sal_False);
Rectangle aNewRectangle (pMouseStartX->GetValue (),
pMouseStartY->GetValue (),
@@ -202,16 +202,16 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
|*
\************************************************************************/
-BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
if ( rMEvt.IsLeft() && !mpView->IsAction() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpWindow->CaptureMouse();
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
if (mpView->GetCurrentObjIdentifier() == OBJ_CAPTION)
{
@@ -235,7 +235,7 @@ BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
pObj->SetMergedItemSet(aAttr);
if( nSlotId == SID_DRAW_CAPTION_VERTICAL )
- ( (SdrTextObj*) pObj)->SetVerticalWriting( TRUE );
+ ( (SdrTextObj*) pObj)->SetVerticalWriting( sal_True );
}
}
return bReturn;
@@ -247,7 +247,7 @@ BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstructRectangle::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -258,7 +258,7 @@ BOOL FuConstructRectangle::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
sal_Bool bReturn(sal_False);
@@ -272,7 +272,7 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
String aStr(SdResId(STR_LAYER_MEASURELINES));
- pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE));
+ pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False));
}
// init text position when vertica caption object is created
@@ -308,14 +308,14 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuConstructRectangle::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+ sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
@@ -421,7 +421,7 @@ void FuConstructRectangle::Activate()
break;
}
- mpView->SetCurrentObj((UINT16)aObjKind);
+ mpView->SetCurrentObj((sal_uInt16)aObjKind);
FuConstruct::Activate();
}
@@ -470,7 +470,7 @@ void FuConstructRectangle::Deactivate()
nSlotId == SID_LINE_ARROW_SQUARE ||
nSlotId == SID_LINE_SQUARE_ARROW )
{
- mpView->SetGlueVisible( FALSE );
+ mpView->SetGlueVisible( sal_False );
}
FuConstruct::Deactivate();
}
@@ -541,8 +541,8 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
Size aSize(pObj->GetLogicRect().GetSize());
rAttr.Put( SdrTextMinFrameHeightItem( aSize.Height() ) );
rAttr.Put( SdrTextMinFrameWidthItem( aSize.Width() ) );
- rAttr.Put( SdrTextAutoGrowHeightItem( TRUE ) );
- rAttr.Put( SdrTextAutoGrowWidthItem( TRUE ) );
+ rAttr.Put( SdrTextAutoGrowHeightItem( sal_True ) );
+ rAttr.Put( SdrTextAutoGrowWidthItem( sal_True ) );
// Support full with for vertical caption objects, too
if(SID_DRAW_CAPTION == nSlotId)
@@ -570,12 +570,12 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
if (pSheet)
{
- pObj->SetStyleSheet(pSheet, FALSE);
+ pObj->SetStyleSheet(pSheet, sal_False);
}
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
String aStr(SdResId(STR_LAYER_MEASURELINES));
- pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE));
+ pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False));
}
else if (nSlotId == OBJ_CUSTOMSHAPE )
{
@@ -956,8 +956,8 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const
{
if(pObj->ISA(SdrEdgeObj))
{
- ((SdrEdgeObj*)pObj)->SetTailPoint(FALSE, aStart);
- ((SdrEdgeObj*)pObj)->SetTailPoint(TRUE, aEnd);
+ ((SdrEdgeObj*)pObj)->SetTailPoint(sal_False, aStart);
+ ((SdrEdgeObj*)pObj)->SetTailPoint(sal_True, aEnd);
}
else
{
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index a89e4b28f653..e67d3bf0ad69 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -69,7 +69,7 @@ FuConstruct::FuConstruct (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuDraw(pViewSh, pWin, pView, pDoc, rReq),
- bSelectionChanged(FALSE)
+ bSelectionChanged(sal_False)
{
}
@@ -84,23 +84,23 @@ void FuConstruct::DoExecute( SfxRequest& rReq )
|*
\************************************************************************/
-BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
- bMBDown = TRUE;
- bSelectionChanged = FALSE;
+ bMBDown = sal_True;
+ bSelectionChanged = sal_False;
if ( mpView->IsAction() )
{
- return TRUE;
+ return sal_True;
}
- bFirstMouseMove = TRUE;
+ bFirstMouseMove = sal_True;
aDragTimer.Start();
aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
- USHORT nHitLog = USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width());
+ sal_uInt16 nHitLog = sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width());
if (rMEvt.IsLeft() && mpView->IsExtendedMouseEventDispatcherEnabled())
{
@@ -110,14 +110,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
if ( pHdl != NULL || mpView->IsMarkedHit(aMDPos, nHitLog) )
{
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
- bReturn = TRUE;
+ bReturn = sal_True;
}
else if ( mpView->AreObjectsMarked() )
{
mpView->UnmarkAll();
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
@@ -130,14 +130,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
{
FuDraw::MouseMove(rMEvt);
if (aDragTimer.IsActive() )
{
if( bFirstMouseMove )
- bFirstMouseMove = FALSE;
+ bFirstMouseMove = sal_False;
else
aDragTimer.Stop();
}
@@ -151,7 +151,7 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt)
mpView->MovAction(aPnt);
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -160,14 +160,14 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = TRUE;
+ sal_Bool bReturn = sal_True;
if (aDragTimer.IsActive() )
{
aDragTimer.Stop();
- bIsInDragMode = FALSE;
+ bIsInDragMode = sal_False;
}
FuDraw::MouseButtonUp(rMEvt);
@@ -177,11 +177,11 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
if ( mpView && mpView->IsDragObj() )
{
FrameView* pFrameView = mpViewShell->GetFrameView();
- BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
+ sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE);
+ bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -193,19 +193,19 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
}
else
{
- bReturn = FALSE;
+ bReturn = sal_False;
}
if ( mpView && !mpView->IsAction() )
{
mpWindow->ReleaseMouse();
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
if ( !mpView->AreObjectsMarked() )
{
SdrObject* pObj;
SdrPageView* pPV;
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
if (!mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV))
{
@@ -223,7 +223,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
* Toggle zw. Selektion und Rotation
**************************************************************/
SdrObject* pSingleObj = NULL;
- ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
+ sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
if (nMarkCount==1)
{
@@ -243,14 +243,14 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
}
}
- USHORT nClicks = rMEvt.GetClicks();
+ sal_uInt16 nClicks = rMEvt.GetClicks();
if (nClicks == 2 && rMEvt.IsLeft() && bMBDown &&
!rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsShift() )
{
DoubleClick(rMEvt);
}
- bMBDown = FALSE;
+ bMBDown = sal_False;
return bReturn;
}
@@ -259,14 +259,14 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuConstruct::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if ( !bReturn )
bReturn = FuDraw::KeyInput(rKEvt);
@@ -309,40 +309,74 @@ void FuConstruct::SetStyleSheet(SfxItemSet& rAttr, SdrObject* pObj)
sal_Bool bUseFillStyle, bUseNoFillStyle;
bUseFillStyle = bUseNoFillStyle = sal_False;
- if (nSlotId == SID_DRAW_RECT || // Rechteck
- nSlotId == SID_DRAW_RECT_ROUND || // Rechteck, rund
- nSlotId == SID_DRAW_SQUARE || // Quadrat
- nSlotId == SID_DRAW_SQUARE_ROUND || // Quadrat, rund
- nSlotId == SID_DRAW_ELLIPSE || // Ellipse
- nSlotId == SID_DRAW_PIE || // Ellipsensegment
- nSlotId == SID_DRAW_ELLIPSECUT || // Ellipsenabschnitt
- nSlotId == SID_DRAW_CIRCLE || // Kreis
- nSlotId == SID_DRAW_CIRCLEPIE || // Kreissegment
- nSlotId == SID_DRAW_CIRCLECUT || // Ellipsenabschnitt
- nSlotId == SID_DRAW_POLYGON || // Polygon
- nSlotId == SID_DRAW_XPOLYGON || // 45ø-Polygon
- nSlotId == SID_DRAW_FREELINE || // Freihandlinie
- nSlotId == SID_DRAW_BEZIER_FILL) // Bezier
+ switch( nSlotId )
+ {
+ case SID_DRAW_RECT:
+ case SID_DRAW_RECT_ROUND:
+ case SID_DRAW_SQUARE:
+ case SID_DRAW_SQUARE_ROUND:
+ case SID_DRAW_ELLIPSE:
+ case SID_DRAW_PIE:
+ case SID_DRAW_ELLIPSECUT:
+ case SID_DRAW_CIRCLE:
+ case SID_DRAW_CIRCLEPIE:
+ case SID_DRAW_CIRCLECUT:
+ case SID_DRAW_POLYGON:
+ case SID_DRAW_XPOLYGON:
+ case SID_DRAW_FREELINE:
+ case SID_DRAW_BEZIER_FILL:
{
bUseFillStyle = sal_True;
+ break;
}
- else if
- (nSlotId == SID_DRAW_RECT_NOFILL || // Rechteck
- nSlotId == SID_DRAW_RECT_ROUND_NOFILL || // Rechteck, rund
- nSlotId == SID_DRAW_SQUARE_NOFILL || // Quadrat
- nSlotId == SID_DRAW_SQUARE_ROUND_NOFILL || // Quadrat, rund
- nSlotId == SID_DRAW_ELLIPSE_NOFILL || // Ellipse
- nSlotId == SID_DRAW_PIE_NOFILL || // Ellipsensegment
- nSlotId == SID_DRAW_ELLIPSECUT_NOFILL || // Ellipsenabschnitt
- nSlotId == SID_DRAW_CIRCLE_NOFILL || // Kreis
- nSlotId == SID_DRAW_CIRCLEPIE_NOFILL || // Kreissegment
- nSlotId == SID_DRAW_CIRCLECUT_NOFILL || // Ellipsenabschnitt
- nSlotId == SID_DRAW_POLYGON_NOFILL || // Polygon
- nSlotId == SID_DRAW_XPOLYGON_NOFILL || // 45ø-Polygon
- nSlotId == SID_DRAW_FREELINE_NOFILL || // Freihandlinie
- nSlotId == SID_DRAW_BEZIER_NOFILL) // Bezier
+ case SID_DRAW_RECT_NOFILL:
+ case SID_DRAW_RECT_ROUND_NOFILL:
+ case SID_DRAW_SQUARE_NOFILL:
+ case SID_DRAW_SQUARE_ROUND_NOFILL:
+ case SID_DRAW_ELLIPSE_NOFILL:
+ case SID_DRAW_PIE_NOFILL:
+ case SID_DRAW_ELLIPSECUT_NOFILL:
+ case SID_DRAW_CIRCLE_NOFILL:
+ case SID_DRAW_CIRCLEPIE_NOFILL:
+ case SID_DRAW_CIRCLECUT_NOFILL:
+ case SID_DRAW_POLYGON_NOFILL:
+ case SID_DRAW_XPOLYGON_NOFILL:
+ case SID_DRAW_FREELINE_NOFILL:
+ case SID_DRAW_LINE:
+ case SID_DRAW_XLINE:
+ case SID_CONNECTOR_ARROW_START:
+ case SID_CONNECTOR_ARROW_END:
+ case SID_CONNECTOR_ARROWS:
+ case SID_CONNECTOR_CIRCLE_START:
+ case SID_CONNECTOR_CIRCLE_END:
+ case SID_CONNECTOR_CIRCLES:
+ case SID_CONNECTOR_LINE:
+ case SID_CONNECTOR_LINE_ARROW_START:
+ case SID_CONNECTOR_LINE_ARROW_END:
+ case SID_CONNECTOR_LINE_ARROWS:
+ case SID_CONNECTOR_LINE_CIRCLE_START:
+ case SID_CONNECTOR_LINE_CIRCLE_END:
+ case SID_CONNECTOR_LINE_CIRCLES:
+ case SID_CONNECTOR_CURVE:
+ case SID_CONNECTOR_CURVE_ARROW_START:
+ case SID_CONNECTOR_CURVE_ARROW_END:
+ case SID_CONNECTOR_CURVE_ARROWS:
+ case SID_CONNECTOR_CURVE_CIRCLE_START:
+ case SID_CONNECTOR_CURVE_CIRCLE_END:
+ case SID_CONNECTOR_CURVE_CIRCLES:
+ case SID_CONNECTOR_LINES:
+ case SID_CONNECTOR_LINES_ARROW_START:
+ case SID_CONNECTOR_LINES_ARROW_END:
+ case SID_CONNECTOR_LINES_ARROWS:
+ case SID_CONNECTOR_LINES_CIRCLE_START:
+ case SID_CONNECTOR_LINES_CIRCLE_END:
+ case SID_CONNECTOR_LINES_CIRCLES:
+ case SID_DRAW_BEZIER_NOFILL:
+ case SID_LINE_ARROW_END:
{
bUseNoFillStyle = sal_True;
+ break;
+ }
}
SetStyleSheet( rAttr, pObj, bUseFillStyle, bUseNoFillStyle );
}
@@ -359,7 +393,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
***********************************************/
String aName( pPage->GetLayoutName() );
String aSep = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) );
- USHORT n = aName.Search(aSep);
+ sal_uInt16 n = aName.Search(aSep);
n = n + aSep.Len();
aName.Erase(n);
aName.Append( String ( SdResId( STR_LAYOUT_BACKGROUNDOBJECTS ) ) );
@@ -370,7 +404,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
if (pSheet)
{
// applying style sheet for background objects
- pObj->SetStyleSheet(pSheet, FALSE);
+ pObj->SetStyleSheet(pSheet, sal_False);
SfxItemSet& rSet = pSheet->GetItemSet();
const XFillStyleItem& rFillStyle = (const XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE);
if ( bForceFillStyle )
@@ -399,7 +433,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
DBG_ASSERT(pSheet, "Objektvorlage nicht gefunden");
if (pSheet)
{
- pObj->SetStyleSheet(pSheet, FALSE);
+ pObj->SetStyleSheet(pSheet, sal_False);
SfxItemSet aAttr(*mpView->GetDefaultAttr().Clone());
aAttr.Put(pSheet->GetItemSet().Get(XATTR_FILLSTYLE));
pObj->SetMergedItemSet(aAttr);
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index f8aa53af34db..c98d8deb4ea2 100644..100755
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -88,8 +88,8 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq )
{
FuConstruct::DoExecute( rReq );
- SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, FALSE );
- SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, FALSE );
+ SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, sal_False );
+ SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, sal_False );
if( pInventorItem )
nInventor = pInventorItem->GetValue();
if( pIdentifierItem )
@@ -105,17 +105,17 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq )
|* MouseButtonDown-event
|*
\************************************************************************/
-BOOL FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
if ( rMEvt.IsLeft() && !mpView->IsAction() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpWindow->CaptureMouse();
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog);
- bReturn = TRUE;
+ bReturn = sal_True;
}
return bReturn;
}
@@ -125,7 +125,7 @@ BOOL FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
|* MouseMove-event
|*
\************************************************************************/
-BOOL FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -135,15 +135,15 @@ BOOL FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt)
|* MouseButtonUp-event
|*
\************************************************************************/
-BOOL FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpView->EndCreateObj(SDRCREATE_FORCEEND);
- bReturn = TRUE;
+ bReturn = sal_True;
}
bReturn = (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
@@ -158,13 +158,13 @@ BOOL FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+ sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 858081dad195..ee83ece60cc9 100644..100755
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -101,12 +101,12 @@ void FuCopy::DoExecute( SfxRequest& rReq )
mpView->GetAttributes( aAttr );
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, sal_True, &pPoolItem ) )
{
XFillStyle eStyle = ( ( const XFillStyleItem* ) pPoolItem )->GetValue();
if( eStyle == XFILL_SOLID &&
- SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, TRUE, &pPoolItem ) )
+ SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, sal_True, &pPoolItem ) )
{
const XFillColorItem* pItem = ( const XFillColorItem* ) pPoolItem;
XColorItem aXColorItem( ATTR_COPY_START_COLOR, pItem->GetName(),
@@ -122,7 +122,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorTable(), mpView );
if( pDlg )
{
- USHORT nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
switch( nResult )
{
@@ -145,50 +145,50 @@ void FuCopy::DoExecute( SfxRequest& rReq )
}
Rectangle aRect;
- INT32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L;
- UINT16 nNumber = 0;
+ sal_Int32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L;
+ sal_uInt16 nNumber = 0;
Color aStartColor, aEndColor;
- BOOL bColor = FALSE;
+ sal_Bool bColor = sal_False;
const SfxPoolItem* pPoolItem = NULL;
// Anzahl
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_NUMBER, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_NUMBER, sal_True, &pPoolItem ) )
nNumber = ( ( const SfxUInt16Item* ) pPoolItem )->GetValue();
// Verschiebung
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_X, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_X, sal_True, &pPoolItem ) )
lSizeX = ( ( const SfxInt32Item* ) pPoolItem )->GetValue();
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_Y, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_Y, sal_True, &pPoolItem ) )
lSizeY = ( ( const SfxInt32Item* ) pPoolItem )->GetValue();
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_ANGLE, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_ANGLE, sal_True, &pPoolItem ) )
lAngle = ( ( const SfxInt32Item* )pPoolItem )->GetValue();
// Verrgroesserung / Verkleinerung
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_WIDTH, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_WIDTH, sal_True, &pPoolItem ) )
lWidth = ( ( const SfxInt32Item* ) pPoolItem )->GetValue();
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_HEIGHT, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_HEIGHT, sal_True, &pPoolItem ) )
lHeight = ( ( const SfxInt32Item* ) pPoolItem )->GetValue();
// Startfarbe / Endfarbe
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) )
{
aStartColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
- bColor = TRUE;
+ bColor = sal_True;
}
- if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_END_COLOR, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_END_COLOR, sal_True, &pPoolItem ) )
{
aEndColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
if( aStartColor == aEndColor )
- bColor = FALSE;
+ bColor = sal_False;
}
else
- bColor = FALSE;
+ bColor = sal_False;
// Handles wegnehmen
//HMHmpView->HideMarkHdl();
SfxProgress* pProgress = NULL;
- BOOL bWaiting = FALSE;
+ sal_Bool bWaiting = sal_False;
if( nNumber > 1 )
{
@@ -197,12 +197,12 @@ void FuCopy::DoExecute( SfxRequest& rReq )
aStr.Append( String( SdResId( STR_UNDO_COPYOBJECTS ) ) );
pProgress = new SfxProgress( mpDocSh, aStr, nNumber );
- mpDocSh->SetWaitCursor( TRUE );
- bWaiting = TRUE;
+ mpDocSh->SetWaitCursor( sal_True );
+ bWaiting = sal_True;
}
const SdrMarkList aMarkList( mpView->GetMarkedObjectList() );
- const ULONG nMarkCount = aMarkList.GetMarkCount();
+ const sal_uLong nMarkCount = aMarkList.GetMarkCount();
SdrObject* pObj = NULL;
// Anzahl moeglicher Kopien berechnen
@@ -211,16 +211,16 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( lWidth < 0L )
{
long nTmp = ( aRect.Right() - aRect.Left() ) / -lWidth;
- nNumber = (UINT16) Min( nTmp, (long)nNumber );
+ nNumber = (sal_uInt16) Min( nTmp, (long)nNumber );
}
if( lHeight < 0L )
{
long nTmp = ( aRect.Bottom() - aRect.Top() ) / -lHeight;
- nNumber = (UINT16) Min( nTmp, (long)nNumber );
+ nNumber = (sal_uInt16) Min( nTmp, (long)nNumber );
}
- for( USHORT i = 1; i <= nNumber; i++ )
+ for( sal_uInt16 i = 1; i <= nNumber; i++ )
{
if( pProgress )
pProgress->SetState( i );
@@ -240,7 +240,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
// get newly selected objects
SdrMarkList aCopyMarkList( mpView->GetMarkedObjectList() );
- ULONG j, nCopyMarkCount = aMarkList.GetMarkCount();
+ sal_uLong j, nCopyMarkCount = aMarkList.GetMarkCount();
// set protection flags at marked copies to null
for( j = 0; j < nCopyMarkCount; j++ )
@@ -249,8 +249,8 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( pObj )
{
- pObj->SetMoveProtect( FALSE );
- pObj->SetResizeProtect( FALSE );
+ pObj->SetMoveProtect( sal_False );
+ pObj->SetResizeProtect( sal_False );
}
}
@@ -288,9 +288,9 @@ void FuCopy::DoExecute( SfxRequest& rReq )
{
// Koennte man sicher noch optimieren, wuerde aber u.U.
// zu Rundungsfehlern fuehren
- BYTE nRed = aStartColor.GetRed() + (BYTE) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber );
- BYTE nGreen = aStartColor.GetGreen() + (BYTE) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) * (long) i / (long) nNumber );
- BYTE nBlue = aStartColor.GetBlue() + (BYTE) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber );
+ sal_uInt8 nRed = aStartColor.GetRed() + (sal_uInt8) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber );
+ sal_uInt8 nGreen = aStartColor.GetGreen() + (sal_uInt8) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) * (long) i / (long) nNumber );
+ sal_uInt8 nBlue = aStartColor.GetBlue() + (sal_uInt8) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber );
Color aNewColor( nRed, nGreen, nBlue );
SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L );
aNewSet.Put( XFillStyleItem( XFILL_SOLID ) );
@@ -303,10 +303,10 @@ void FuCopy::DoExecute( SfxRequest& rReq )
delete pProgress;
if ( bWaiting )
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
// Handles zeigen
- mpView->AdjustMarkHdl(); //HMH TRUE );
+ mpView->AdjustMarkHdl(); //HMH sal_True );
//HMHpView->ShowMarkHdl();
mpView->EndUndo();
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 3000aaa8553c..d3333725e60e 100644..100755
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -78,10 +78,10 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
AbstractSdCustomShowDlg* pDlg = pFact ? pFact->CreateSdCustomShowDlg( NULL, *mpDoc ) : 0;
if( pDlg )
{
- USHORT nRet = pDlg->Execute();
+ sal_uInt16 nRet = pDlg->Execute();
if( pDlg->IsModified() )
{
- mpDoc->SetChanged( TRUE );
+ mpDoc->SetChanged( sal_True );
sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings();
rSettings.mbCustomShow = pDlg->IsCustomShow();
}
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 3401b8d15134..b073a4820fda 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -92,9 +92,9 @@ TYPEINIT1( FuDraw, FuPoor );
FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq) :
FuPoor(pViewSh, pWin, pView, pDoc, rReq),
- bMBDown(FALSE),
- bDragHelpLine(FALSE),
- bPermanent(FALSE)
+ bMBDown(sal_False),
+ bDragHelpLine(sal_False),
+ bPermanent(sal_False)
{
}
@@ -115,14 +115,14 @@ FuDraw::~FuDraw()
|*
\************************************************************************/
-BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
- bDragHelpLine = FALSE;
+ bDragHelpLine = sal_False;
aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
@@ -130,9 +130,9 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
{
FrameView* pFrameView = mpViewShell->GetFrameView();
- bool bOrtho = FALSE;
+ bool bOrtho = sal_False;
- BOOL bRestricted = TRUE;
+ sal_Bool bRestricted = sal_True;
if (mpView->IsDragObj())
{
@@ -142,7 +142,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl()))
{
// Move
- bRestricted = FALSE;
+ bRestricted = sal_False;
}
}
@@ -159,46 +159,46 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
}
if (!mpView->IsSnapEnabled())
- mpView->SetSnapEnabled(TRUE);
- BOOL bCntrl = rMEvt.IsMod1();
+ mpView->SetSnapEnabled(sal_True);
+ sal_Bool bSnapModPressed = rMEvt.IsMod1();
- BOOL bGridSnap = pFrameView->IsGridSnap();
- bGridSnap = (bCntrl != bGridSnap);
+ sal_Bool bGridSnap = pFrameView->IsGridSnap();
+ bGridSnap = (bSnapModPressed != bGridSnap);
if (mpView->IsGridSnap() != bGridSnap)
mpView->SetGridSnap(bGridSnap);
- BOOL bBordSnap = pFrameView->IsBordSnap();
- bBordSnap = (bCntrl != bBordSnap);
+ sal_Bool bBordSnap = pFrameView->IsBordSnap();
+ bBordSnap = (bSnapModPressed != bBordSnap);
if (mpView->IsBordSnap() != bBordSnap)
mpView->SetBordSnap(bBordSnap);
- BOOL bHlplSnap = pFrameView->IsHlplSnap();
- bHlplSnap = (bCntrl != bHlplSnap);
+ sal_Bool bHlplSnap = pFrameView->IsHlplSnap();
+ bHlplSnap = (bSnapModPressed != bHlplSnap);
if (mpView->IsHlplSnap() != bHlplSnap)
mpView->SetHlplSnap(bHlplSnap);
- BOOL bOFrmSnap = pFrameView->IsOFrmSnap();
- bOFrmSnap = (bCntrl != bOFrmSnap);
+ sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap();
+ bOFrmSnap = (bSnapModPressed != bOFrmSnap);
if (mpView->IsOFrmSnap() != bOFrmSnap)
mpView->SetOFrmSnap(bOFrmSnap);
- BOOL bOPntSnap = pFrameView->IsOPntSnap();
- bOPntSnap = (bCntrl != bOPntSnap);
+ sal_Bool bOPntSnap = pFrameView->IsOPntSnap();
+ bOPntSnap = (bSnapModPressed != bOPntSnap);
if (mpView->IsOPntSnap() != bOPntSnap)
mpView->SetOPntSnap(bOPntSnap);
- BOOL bOConSnap = pFrameView->IsOConSnap();
- bOConSnap = (bCntrl != bOConSnap);
+ sal_Bool bOConSnap = pFrameView->IsOConSnap();
+ bOConSnap = (bSnapModPressed != bOConSnap);
if (mpView->IsOConSnap() != bOConSnap)
mpView->SetOConSnap(bOConSnap);
- BOOL bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
+ sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
if (mpView->IsAngleSnapEnabled() != bAngleSnap)
mpView->SetAngleSnapEnabled(bAngleSnap);
@@ -206,7 +206,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
if (mpView->IsOrtho() != bOrtho)
mpView->SetOrtho(bOrtho);
- BOOL bCenter = rMEvt.IsMod2();
+ sal_Bool bCenter = rMEvt.IsMod2();
if ( mpView->IsCreate1stPointAsCenter() != bCenter ||
mpView->IsResizeAtCenter() != bCenter )
@@ -216,22 +216,22 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
}
SdrPageView* pPV = 0;
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
// look only for HelpLines when they are visible (!)
- BOOL bHelpLine(FALSE);
+ sal_Bool bHelpLine(sal_False);
if(mpView->IsHlplVisible())
bHelpLine = mpView->PickHelpLine(aMDPos, nHitLog, *mpWindow, nHelpLine, pPV);
- BOOL bHitHdl = (mpView->PickHandle(aMDPos) != NULL);
+ sal_Bool bHitHdl = (mpView->PickHandle(aMDPos) != NULL);
if ( bHelpLine
&& !mpView->IsCreateObj()
- && ((mpView->GetEditMode() == SDREDITMODE_EDIT && !bHitHdl) || (rMEvt.IsShift() && bCntrl)) )
+ && ((mpView->GetEditMode() == SDREDITMODE_EDIT && !bHitHdl) || (rMEvt.IsShift() && bSnapModPressed)) )
{
mpWindow->CaptureMouse();
mpView->BegDragHelpLine(nHelpLine, pPV);
bDragHelpLine = mpView->IsDragHelpLine();
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
ForcePointer(&rMEvt);
@@ -245,14 +245,14 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt)
{
FrameView* pFrameView = mpViewShell->GetFrameView();
Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
- bool bOrtho = FALSE;
+ bool bOrtho = sal_False;
- BOOL bRestricted = TRUE;
+ sal_Bool bRestricted = sal_True;
if (mpView->IsDragObj())
{
@@ -262,7 +262,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl()))
{
// Move
- bRestricted = FALSE;
+ bRestricted = sal_False;
}
}
@@ -280,46 +280,46 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
bOrtho = rMEvt.IsShift() != pFrameView->IsOrtho();
}
- BOOL bCntrl = rMEvt.IsMod1();
+ sal_Bool bSnapModPressed = rMEvt.IsMod2();
mpView->SetDragWithCopy(rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
- BOOL bGridSnap = pFrameView->IsGridSnap();
- bGridSnap = (bCntrl != bGridSnap);
+ sal_Bool bGridSnap = pFrameView->IsGridSnap();
+ bGridSnap = (bSnapModPressed != bGridSnap);
if (mpView->IsGridSnap() != bGridSnap)
mpView->SetGridSnap(bGridSnap);
- BOOL bBordSnap = pFrameView->IsBordSnap();
- bBordSnap = (bCntrl != bBordSnap);
+ sal_Bool bBordSnap = pFrameView->IsBordSnap();
+ bBordSnap = (bSnapModPressed != bBordSnap);
if (mpView->IsBordSnap() != bBordSnap)
mpView->SetBordSnap(bBordSnap);
- BOOL bHlplSnap = pFrameView->IsHlplSnap();
- bHlplSnap = (bCntrl != bHlplSnap);
+ sal_Bool bHlplSnap = pFrameView->IsHlplSnap();
+ bHlplSnap = (bSnapModPressed != bHlplSnap);
if (mpView->IsHlplSnap() != bHlplSnap)
mpView->SetHlplSnap(bHlplSnap);
- BOOL bOFrmSnap = pFrameView->IsOFrmSnap();
- bOFrmSnap = (bCntrl != bOFrmSnap);
+ sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap();
+ bOFrmSnap = (bSnapModPressed != bOFrmSnap);
if (mpView->IsOFrmSnap() != bOFrmSnap)
mpView->SetOFrmSnap(bOFrmSnap);
- BOOL bOPntSnap = pFrameView->IsOPntSnap();
- bOPntSnap = (bCntrl != bOPntSnap);
+ sal_Bool bOPntSnap = pFrameView->IsOPntSnap();
+ bOPntSnap = (bSnapModPressed != bOPntSnap);
if (mpView->IsOPntSnap() != bOPntSnap)
mpView->SetOPntSnap(bOPntSnap);
- BOOL bOConSnap = pFrameView->IsOConSnap();
- bOConSnap = (bCntrl != bOConSnap);
+ sal_Bool bOConSnap = pFrameView->IsOConSnap();
+ bOConSnap = (bSnapModPressed != bOConSnap);
if (mpView->IsOConSnap() != bOConSnap)
mpView->SetOConSnap(bOConSnap);
- BOOL bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
+ sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
if (mpView->IsAngleSnapEnabled() != bAngleSnap)
mpView->SetAngleSnapEnabled(bAngleSnap);
@@ -327,7 +327,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
if (mpView->IsOrtho() != bOrtho)
mpView->SetOrtho(bOrtho);
- BOOL bCenter = rMEvt.IsMod2();
+ sal_Bool bCenter = rMEvt.IsMod2();
if ( mpView->IsCreate1stPointAsCenter() != bCenter ||
mpView->IsResizeAtCenter() != bCenter )
@@ -340,7 +340,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
mpView->MovDragHelpLine(aPos);
}
- BOOL bReturn = mpView->MouseMove(rMEvt, mpWindow);
+ sal_Bool bReturn = mpView->MouseMove(rMEvt, mpWindow);
if (mpView->IsAction())
{
@@ -360,7 +360,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
{
if ( mpView->IsDragHelpLine() )
mpView->EndDragHelpLine();
@@ -378,9 +378,9 @@ BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
FrameView* pFrameView = mpViewShell->GetFrameView();
mpView->SetOrtho( pFrameView->IsOrtho() );
mpView->SetAngleSnapEnabled( pFrameView->IsAngleSnapEnabled() );
- mpView->SetSnapEnabled(TRUE);
- mpView->SetCreate1stPointAsCenter(FALSE);
- mpView->SetResizeAtCenter(FALSE);
+ mpView->SetSnapEnabled(sal_True);
+ mpView->SetCreate1stPointAsCenter(sal_False);
+ mpView->SetResizeAtCenter(sal_False);
mpView->SetDragWithCopy(pFrameView->IsDragWithCopy());
mpView->SetGridSnap(pFrameView->IsGridSnap());
mpView->SetBordSnap(pFrameView->IsBordSnap());
@@ -389,24 +389,24 @@ BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
mpView->SetOPntSnap(pFrameView->IsOPntSnap());
mpView->SetOConSnap(pFrameView->IsOConSnap());
- bIsInDragMode = FALSE;
+ bIsInDragMode = sal_False;
ForcePointer(&rMEvt);
FuPoor::MouseButtonUp(rMEvt);
- return FALSE;
+ return sal_False;
}
/*************************************************************************
|*
|* Process keyboard-events
|*
-|* When processing a KeyEvent the returnvalue is TRUE, otherwise FALSE.
+|* When processing a KeyEvent the returnvalue is sal_True, otherwise sal_False.
|*
\************************************************************************/
-BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
switch ( rKEvt.GetKeyCode().GetCode() )
{
@@ -421,7 +421,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
{
if (!mpDocSh->IsReadOnly())
{
- if ( mpView && mpView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) )
+ if ( mpView && mpView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) )
{
InfoBox(mpWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute();
}
@@ -447,7 +447,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
mpView->DeleteMarked();
}
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
break;
@@ -478,7 +478,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -491,12 +491,12 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
{
// mark last object
mpView->UnmarkAllObj();
- mpView->MarkNextObj(FALSE);
+ mpView->MarkNextObj(sal_False);
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -509,12 +509,12 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
{
// mark first object
mpView->UnmarkAllObj();
- mpView->MarkNextObj(TRUE);
+ mpView->MarkNextObj(sal_True);
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -588,9 +588,9 @@ void FuDraw::Deactivate()
void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
Point aPnt;
- USHORT nModifier = 0;
- BOOL bLeftDown = FALSE;
- BOOL bDefPointer = TRUE;
+ sal_uInt16 nModifier = 0;
+ sal_Bool bLeftDown = sal_False;
+ sal_Bool bDefPointer = sal_True;
if (pMEvt)
{
@@ -610,7 +610,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
/******************************************************************
* Giesskannenmodus
******************************************************************/
- bDefPointer = FALSE;
+ bDefPointer = sal_False;
mpWindow->SetPointer(Pointer(POINTER_FILL));
}
}
@@ -623,7 +623,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
/******************************************************************
* Giesskannenmodus
******************************************************************/
- bDefPointer = FALSE;
+ bDefPointer = sal_False;
mpWindow->SetPointer(Pointer(POINTER_FILL));
}
else if (!pHdl &&
@@ -636,7 +636,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if (pMask && pMask->IsEyedropping())
{
- bDefPointer = FALSE;
+ bDefPointer = sal_False;
mpWindow->SetPointer(Pointer(POINTER_REFHAND));
}
}
@@ -664,7 +664,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if ((pObject->ISA(E3dObject)) && (rMarkList.GetMarkCount() == 1))
{
mpWindow->SetPointer(Pointer(POINTER_ROTATE));
- bDefPointer = FALSE; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again
+ bDefPointer = sal_False; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again
}
}
@@ -679,7 +679,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
else if (eHit == SDRHIT_TEXTEDITOBJ && this->ISA(FuSelection))
{
- UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
+ sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
if ( nSdrObjKind != OBJ_TEXT &&
nSdrObjKind != OBJ_TITLETEXT &&
@@ -687,7 +687,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
aVEvt.pObj->IsEmptyPresObj() )
{
pObj = NULL;
- bDefPointer = FALSE;
+ bDefPointer = sal_False;
mpWindow->SetPointer(Pointer(POINTER_ARROW));
}
}
@@ -720,22 +720,22 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
|*
\************************************************************************/
-BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
+sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
{
- BOOL bSet = FALSE;
+ sal_Bool bSet = sal_False;
- BOOL bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) &&
- mpDoc->GetAnimationInfo(pObj)) ? TRUE:FALSE;
+ sal_Bool bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) &&
+ mpDoc->GetAnimationInfo(pObj)) ? sal_True:sal_False;
- BOOL bImageMapInfo = FALSE;
+ sal_Bool bImageMapInfo = sal_False;
if (!bAnimationInfo)
- bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? TRUE:FALSE;
+ bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? sal_True:sal_False;
if (bAnimationInfo || bImageMapInfo)
{
const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers();
- USHORT nHitLog(USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()));
+ sal_uInt16 nHitLog(sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()));
long n2HitLog(nHitLog * 2);
Point aHitPosR(rPos);
Point aHitPosL(rPos);
@@ -786,7 +786,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
pInfo->meTextEffect != presentation::AnimationEffect_NONE )))))
{
// Animations-Objekt
- bSet = TRUE;
+ bSet = sal_True;
mpWindow->SetPointer(Pointer(POINTER_REFHAND));
}
}
@@ -796,7 +796,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
/******************************************************
* ImageMap
******************************************************/
- bSet = TRUE;
+ bSet = sal_True;
mpWindow->SetPointer(Pointer(POINTER_REFHAND));
}
}
@@ -815,7 +815,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
void FuDraw::DoubleClick(const MouseEvent& rMEvt)
{
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
if ( mpView->AreObjectsMarked() )
{
@@ -826,8 +826,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
SdrMark* pMark = rMarkList.GetMark(0);
SdrObject* pObj = pMark->GetMarkedSdrObj();
- UINT32 nInv = pObj->GetObjInventor();
- UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+ sal_uInt32 nInv = pObj->GetObjInventor();
+ sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2)
{
@@ -861,7 +861,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
{
// hit group -> select subobject
mpView->UnMarkAll();
- mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), TRUE);
+ mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_True);
}
}
}
@@ -875,9 +875,9 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuDraw::RequestHelp(const HelpEvent& rHEvt)
+sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if (Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled())
{
@@ -924,9 +924,9 @@ BOOL FuDraw::RequestHelp(const HelpEvent& rHEvt)
|*
\************************************************************************/
-BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt)
+sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt)
{
- BOOL bSet = FALSE;
+ sal_Bool bSet = sal_False;
String aHelpText;
Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel)));
@@ -1065,7 +1065,7 @@ BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
if (aHelpText.Len())
{
- bSet = TRUE;
+ bSet = sal_True;
Rectangle aLogicPix = mpWindow->LogicToPixel(pObj->GetLogicRect());
Rectangle aScreenRect(mpWindow->OutputToScreenPixel(aLogicPix.TopLeft()),
mpWindow->OutputToScreenPixel(aLogicPix.BottomRight()));
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index d06777942e69..5ca4c327a242 100644..100755
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -92,12 +92,12 @@ FunctionReference FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* pWin
|*
\************************************************************************/
-BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -106,7 +106,7 @@ BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
{
SdrObject* pPickObj;
SdrPageView* pPV;
@@ -132,7 +132,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
implClearOverlay();
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -141,7 +141,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -163,7 +163,7 @@ BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
mpViewShell->Cancel();
- return TRUE;
+ return sal_True;
}
/*************************************************************************
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 24fb5dfd2e9b..a6d9981040eb 100644..100755
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -79,7 +79,7 @@ FunctionReference FuEditGluePoints::Create( ViewShell* pViewSh, ::sd::Window* pW
void FuEditGluePoints::DoExecute( SfxRequest& rReq )
{
FuDraw::DoExecute( rReq );
- mpView->SetInsGluePointMode(FALSE);
+ mpView->SetInsGluePointMode(sal_False);
mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBar(
ToolBarManager::TBG_FUNCTION,
ToolBarManager::msGluePointsToolBar);
@@ -95,7 +95,7 @@ FuEditGluePoints::~FuEditGluePoints()
{
mpView->BrkAction();
mpView->UnmarkAllGluePoints();
- mpView->SetInsGluePointMode(FALSE);
+ mpView->SetInsGluePointMode(sal_False);
}
/*************************************************************************
@@ -104,25 +104,25 @@ FuEditGluePoints::~FuEditGluePoints()
|*
\************************************************************************/
-BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
{
mpView->SetActualWin( mpWindow );
- BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
if (mpView->IsAction())
{
if (rMEvt.IsRight())
mpView->BckAction();
- return TRUE;
+ return sal_True;
}
if (rMEvt.IsLeft())
{
- bReturn = TRUE;
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ bReturn = sal_True;
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpWindow->CaptureMouse();
SdrViewEvent aVEvt;
@@ -197,7 +197,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
mpView->UnmarkAllObj();
}
- BOOL bMarked = FALSE;
+ sal_Bool bMarked = sal_False;
if (!rMEvt.IsMod1())
{
@@ -248,7 +248,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
{
mpView->SetActualWin( mpWindow );
@@ -264,7 +264,7 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
ForcePointer(&rMEvt);
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -273,21 +273,21 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
{
mpView->SetActualWin( mpWindow );
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if (mpView->IsAction())
{
- bReturn = TRUE;
+ bReturn = sal_True;
mpView->EndAction();
}
FuDraw::MouseButtonUp(rMEvt);
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
if (Abs(aMDPos.X() - aPos.X()) < nDrgLog &&
@@ -313,16 +313,16 @@ BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
{
mpView->SetActualWin( mpWindow );
- BOOL bReturn = FuDraw::KeyInput(rKEvt);
+ sal_Bool bReturn = FuDraw::KeyInput(rKEvt);
return bReturn;
}
@@ -333,7 +333,7 @@ BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
|*
\************************************************************************/
-BOOL FuEditGluePoints::Command(const CommandEvent& rCEvt)
+sal_Bool FuEditGluePoints::Command(const CommandEvent& rCEvt)
{
mpView->SetActualWin( mpWindow );
return FuPoor::Command( rCEvt );
@@ -359,7 +359,7 @@ void FuEditGluePoints::Activate()
void FuEditGluePoints::Deactivate()
{
- mpView->SetGluePointEditMode( FALSE );
+ mpView->SetGluePointEditMode( sal_False );
FuDraw::Deactivate();
}
@@ -411,44 +411,44 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq)
{
const SfxItemSet* pSet = rReq.GetArgs();
const SfxPoolItem& rItem = pSet->Get(SID_GLUE_PERCENT);
- BOOL bPercent = ((const SfxBoolItem&) rItem).GetValue();
+ sal_Bool bPercent = ((const SfxBoolItem&) rItem).GetValue();
mpView->SetMarkedGluePointsPercent(bPercent);
}
break;
case SID_GLUE_HORZALIGN_CENTER:
{
- mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_CENTER);
+ mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_CENTER);
}
break;
case SID_GLUE_HORZALIGN_LEFT:
{
- mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_LEFT);
+ mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_LEFT);
}
break;
case SID_GLUE_HORZALIGN_RIGHT:
{
- mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_RIGHT);
+ mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_RIGHT);
}
break;
case SID_GLUE_VERTALIGN_CENTER:
{
- mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_CENTER);
+ mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_CENTER);
}
break;
case SID_GLUE_VERTALIGN_TOP:
{
- mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_TOP);
+ mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_TOP);
}
break;
case SID_GLUE_VERTALIGN_BOTTOM:
{
- mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_BOTTOM);
+ mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_BOTTOM);
}
break;
}
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index fe428393be74..3184bcc7f9ce 100644..100755
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -85,10 +85,13 @@ FunctionReference FuExpandPage::Create( ViewShell* pViewSh, ::sd::Window* pWin,
void FuExpandPage::DoExecute( SfxRequest& )
{
+ if ( mpView && mpView->IsTextEdit() )
+ mpView->SdrEndTextEdit();
+
// Selektierte Seite finden (nur Standard-Seiten)
SdPage* pActualPage = NULL;
- USHORT i = 0;
- USHORT nCount = mpDoc->GetSdPageCount(PK_STANDARD);
+ sal_uInt16 i = 0;
+ sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD);
while (!pActualPage && i < nCount)
{
@@ -104,8 +107,8 @@ void FuExpandPage::DoExecute( SfxRequest& )
{
::sd::Outliner* pOutl =
new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT );
- pOutl->SetUpdateMode(FALSE);
- pOutl->EnableUndo(FALSE);
+ pOutl->SetUpdateMode(sal_False);
+ pOutl->EnableUndo(sal_False);
if (mpDocSh)
pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
@@ -114,7 +117,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
pOutl->SetStyleSheetPool((SfxStyleSheetPool*) mpDoc->GetStyleSheetPool());
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
- USHORT nActualPageNum = pActualPage->GetPageNum();
+ sal_uInt16 nActualPageNum = pActualPage->GetPageNum();
SdPage* pActualNotesPage = (SdPage*) mpDoc->GetPage(nActualPageNum + 1);
SdrTextObj* pActualOutline = (SdrTextObj*) pActualPage->GetPresObj(PRESOBJ_OUTLINE);
@@ -131,25 +134,25 @@ void FuExpandPage::DoExecute( SfxRequest& )
// Harte Absatz- und Zeichenattribute entfernen
SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END);
- ULONG nParaCount1 = pOutl->GetParagraphCount();
+ sal_uLong nParaCount1 = pOutl->GetParagraphCount();
- for (USHORT nPara = 0; nPara < nParaCount1; nPara++)
+ for (sal_uInt16 nPara = 0; nPara < nParaCount1; nPara++)
{
pOutl->QuickRemoveCharAttribs(nPara);
pOutl->SetParaAttribs(nPara, aEmptyEEAttr);
}
- USHORT nPos = 2;
+ sal_uInt16 nPos = 2;
Paragraph* pPara = pOutl->GetParagraph( 0 );
while (pPara)
{
- ULONG nParaPos = pOutl->GetAbsPos( pPara );
- sal_Int16 nDepth = pOutl->GetDepth( (USHORT) nParaPos );
+ sal_uLong nParaPos = pOutl->GetAbsPos( pPara );
+ sal_Int16 nDepth = pOutl->GetDepth( (sal_uInt16) nParaPos );
if ( nDepth == 0 )
{
// Seite mit Titel & Gliederung!
- SdPage* pPage = (SdPage*) mpDoc->AllocPage(FALSE);
+ SdPage* pPage = (SdPage*) mpDoc->AllocPage(sal_False);
pPage->SetSize(pActualPage->GetSize() );
pPage->SetBorder(pActualPage->GetLftBorder(),
pActualPage->GetUppBorder(),
@@ -167,11 +170,11 @@ void FuExpandPage::DoExecute( SfxRequest& )
// MasterPage der aktuellen Seite verwenden
pPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage());
pPage->SetLayoutName(pActualPage->GetLayoutName());
- pPage->SetAutoLayout(AUTOLAYOUT_ENUM, TRUE);
+ pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
// Notiz-Seite
- SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(FALSE);
+ SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False);
pNotesPage->SetSize(pActualNotesPage->GetSize());
pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(),
pActualNotesPage->GetUppBorder(),
@@ -190,13 +193,13 @@ void FuExpandPage::DoExecute( SfxRequest& )
// MasterPage der aktuellen Seite verwenden
pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage());
pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName());
- pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), TRUE);
+ pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True);
pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
// Title-Textobjekt erstellen
SdrTextObj* pTextObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_TITLE);
- OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (USHORT) nParaPos, 1);
+ OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (sal_uInt16) nParaPos, 1);
pOutlinerParaObject->SetOutlinerMode(OUTLINERMODE_TITLEOBJECT);
if( pOutlinerParaObject->GetDepth(0) != -1 )
@@ -215,12 +218,12 @@ void FuExpandPage::DoExecute( SfxRequest& )
pTextObj->SetOutlinerParaObject(pOutlinerParaObject);
- pTextObj->SetEmptyPresObj(FALSE);
+ pTextObj->SetEmptyPresObj(sal_False);
SfxStyleSheet* pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_TITLE);
- pTextObj->NbcSetStyleSheet(pSheet, FALSE);
+ pTextObj->NbcSetStyleSheet(pSheet, sal_False);
- ULONG nChildCount = pOutl->GetChildCount(pPara);
+ sal_uLong nChildCount = pOutl->GetChildCount(pPara);
if (nChildCount > 0)
{
@@ -228,18 +231,18 @@ void FuExpandPage::DoExecute( SfxRequest& )
SdrTextObj* pOutlineObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_OUTLINE);
pPara = pOutl->GetParagraph( ++nParaPos );
- OutlinerParaObject* pOPO = pOutl->CreateParaObject( (USHORT) nParaPos, (USHORT) nChildCount);
+ OutlinerParaObject* pOPO = pOutl->CreateParaObject( (sal_uInt16) nParaPos, (sal_uInt16) nChildCount);
SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc );
pTempOutl->SetText( *pOPO );
- ULONG nParaCount2 = pTempOutl->GetParagraphCount();
- ULONG nPara;
+ sal_uLong nParaCount2 = pTempOutl->GetParagraphCount();
+ sal_uLong nPara;
for( nPara = 0; nPara < nParaCount2; nPara++ )
{
pTempOutl->SetDepth (
pTempOutl->GetParagraph( nPara ),
- pTempOutl->GetDepth((USHORT) nPara ) - 1);
+ pTempOutl->GetDepth((sal_uInt16) nPara ) - 1);
}
delete pOPO;
@@ -247,9 +250,9 @@ void FuExpandPage::DoExecute( SfxRequest& )
delete pTempOutl;
pOutlineObj->SetOutlinerParaObject( pOPO );
- pOutlineObj->SetEmptyPresObj(FALSE);
+ pOutlineObj->SetEmptyPresObj(sal_False);
- // Harte Attribute entfernen (Flag auf TRUE)
+ // Harte Attribute entfernen (Flag auf sal_True)
SfxItemSet aAttr(mpDoc->GetPool());
aAttr.Put(XLineStyleItem(XLINE_NONE));
aAttr.Put(XFillStyleItem(XFILL_NONE));
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index ce189dd459ab..77908a5335e8 100644..100755
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -104,7 +104,7 @@ static void unmarkimpl( SdrView* pView )
pView->UnMarkAll();
}
-BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
{
if(mpView&&mpWindow)
{
@@ -115,7 +115,7 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
{
SdrObject* pPickObj=0;
SdrPageView* pPV=0;
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pPickObj, pPV, SDRSEARCH_PICKMARKABLE);
if( (pPickObj != 0) && !pPickObj->IsEmptyPresObj() )
@@ -151,18 +151,18 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
if( aVEvt.pObj )
{
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
- BOOL bToggle = FALSE;
- mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE);
- return TRUE;
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_Bool bToggle = sal_False;
+ mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, sal_False);
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
-BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if( mpWindow && mpView )
{
if ( mpView->IsTextEdit() )
@@ -172,10 +172,10 @@ BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
}
else
{
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
SdrObject* pObj=0;
SdrPageView* pPV=0;
- BOOL bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE);
+ sal_Bool bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE);
if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
mpWindow->SetPointer(Pointer(POINTER_FILL));
@@ -186,7 +186,7 @@ BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
return bReturn;
}
-BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt)
{
if( mpItemSet.get() && mpView && mpView->AreObjectsMarked() )
{
@@ -208,19 +208,19 @@ BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt)
mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
if( mbPermanent )
- return TRUE;
+ return sal_True;
}
implcancel();
- return TRUE;
+ return sal_True;
}
-BOOL FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt)
{
if( (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) && mpViewShell )
{
implcancel();
- return TRUE;
+ return sal_True;
}
return FuPoor::KeyInput(rKEvt);
}
@@ -230,8 +230,8 @@ void FuFormatPaintBrush::Activate()
mbOldIsQuickTextEditMode = mpViewShell->GetFrameView()->IsQuickEdit();
if( !mbOldIsQuickTextEditMode )
{
- mpViewShell->GetFrameView()->SetQuickEdit(TRUE);
- mpView->SetQuickTextEditMode(TRUE);
+ mpViewShell->GetFrameView()->SetQuickEdit(sal_True);
+ mpView->SetQuickTextEditMode(sal_True);
}
}
@@ -239,12 +239,12 @@ void FuFormatPaintBrush::Deactivate()
{
if( !mbOldIsQuickTextEditMode )
{
- mpViewShell->GetFrameView()->SetQuickEdit(FALSE);
- mpView->SetQuickTextEditMode(FALSE);
+ mpViewShell->GetFrameView()->SetQuickEdit(sal_False);
+ mpView->SetQuickTextEditMode(sal_False);
}
}
-bool FuFormatPaintBrush::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const
+bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const
{
if( mpItemSet.get() == 0 )
return false;
@@ -264,7 +264,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
{
String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) );
mpDoc->BegUndo( sLabel );
- mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,TRUE));
+ mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,sal_True));
}
mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats );
@@ -279,7 +279,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
/* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet )
{
const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList();
- const ULONG nMarkCount = rMarkList.GetMarkCount();
+ const sal_uLong nMarkCount = rMarkList.GetMarkCount();
if( nMarkCount == 1 )
{
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index f6751059a28c..7af85364efad 100644..100755
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -80,16 +80,16 @@ FuHangulHanjaConversion::FuHangulHanjaConversion (
SfxRequest& rReq )
: FuPoor(pViewSh, pWin, pView, pDocument, rReq),
pSdOutliner(NULL),
- bOwnOutliner(FALSE)
+ bOwnOutliner(sal_False)
{
if ( mpViewShell->ISA(DrawViewShell) )
{
- bOwnOutliner = TRUE;
+ bOwnOutliner = sal_True;
pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
}
else if ( mpViewShell->ISA(OutlineViewShell) )
{
- bOwnOutliner = FALSE;
+ bOwnOutliner = sal_False;
pSdOutliner = mpDoc->GetOutliner();
}
@@ -126,8 +126,8 @@ FunctionReference FuHangulHanjaConversion::Create( ViewShell* pViewSh, ::sd::Win
|*
\************************************************************************/
-void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage,
- const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive )
+void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
+ const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive )
{
String aString( SdResId(STR_UNDO_HANGULHANJACONVERSION) );
@@ -143,7 +143,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar
{
pSdOutliner->EndConversion();
- bOwnOutliner = TRUE;
+ bOwnOutliner = sal_True;
pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
pSdOutliner->BeginConversion();
}
@@ -152,7 +152,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar
pSdOutliner->EndConversion();
delete pSdOutliner;
- bOwnOutliner = FALSE;
+ bOwnOutliner = sal_False;
pSdOutliner = mpDoc->GetOutliner();
pSdOutliner->BeginConversion();
}
@@ -180,7 +180,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar
}
-void FuHangulHanjaConversion::ConvertStyles( INT16 nTargetLanguage, const Font *pTargetFont )
+void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont )
{
if( !mpDoc )
return;
@@ -196,11 +196,11 @@ void FuHangulHanjaConversion::ConvertStyles( INT16 nTargetLanguage, const Font *
const bool bHasParent = pStyle->GetParent().Len() != 0;
- if( !bHasParent || rSet.GetItemState( EE_CHAR_LANGUAGE_CJK, FALSE ) == SFX_ITEM_SET )
+ if( !bHasParent || rSet.GetItemState( EE_CHAR_LANGUAGE_CJK, sal_False ) == SFX_ITEM_SET )
rSet.Put( SvxLanguageItem( nTargetLanguage, EE_CHAR_LANGUAGE_CJK ) );
if( pTargetFont &&
- ( !bHasParent || rSet.GetItemState( EE_CHAR_FONTINFO_CJK, FALSE ) == SFX_ITEM_SET ) )
+ ( !bHasParent || rSet.GetItemState( EE_CHAR_FONTINFO_CJK, sal_False ) == SFX_ITEM_SET ) )
{
// set new font attribute
SvxFontItem aFontItem( (SvxFontItem&) rSet.Get( EE_CHAR_FONTINFO_CJK ) );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index a46fbbee3e4d..757858364555 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -43,7 +43,7 @@
#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
-
+#include <sfx2/msgpool.hxx>
#include <svtools/sores.hxx>
#include <svtools/insdlg.hxx>
#include <sfx2/request.hxx>
@@ -169,7 +169,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& )
}
else
{
- SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError );
+ SdGRFFilter::HandleGraphicFilterError( (sal_uInt16)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError );
}
}
}
@@ -204,7 +204,7 @@ FunctionReference FuInsertClipboard::Create( ViewShell* pViewSh, ::sd::Window* p
void FuInsertClipboard::DoExecute( SfxRequest& )
{
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) );
- ULONG nFormatId;
+ sal_uLong nFormatId;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() );
@@ -233,7 +233,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
if( !mpView->InsertData( aDataHelper,
mpWindow->PixelToLogic( Rectangle( Point(), mpWindow->GetOutputSizePixel() ).Center() ),
- nAction, FALSE, nFormatId ) &&
+ nAction, sal_False, nFormatId ) &&
( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) )
{
DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell);
@@ -374,7 +374,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
bool bRet = true;
if( pPickObj )
- mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, TRUE );
+ mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, sal_True );
else
bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER);
@@ -422,7 +422,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
* Objekt einfuegen
**********************************************************************/
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
- BOOL bCreateNew = FALSE;
+ sal_Bool bCreateNew = sal_False;
uno::Reference < embed::XEmbeddedObject > xObj;
uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage();
SvObjectServerList aServerLst;
@@ -457,12 +457,11 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
// intentionally no break!
}
case SID_INSERT_PLUGIN :
- case SID_INSERT_APPLET :
case SID_INSERT_FLOATINGFRAME :
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractInsertObjectDialog* pDlg =
- pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), nSlotId,
+ pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(),
xStorage, &aServerLst );
if ( pDlg )
{
@@ -531,9 +530,9 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
{
//TODO/LATER: needs status for RESIZEONPRINTERCHANGE
//if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->getStatus( nAspect ) )
- // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(FALSE) );
+ // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(sal_False) );
- BOOL bInsertNewObject = TRUE;
+ sal_Bool bInsertNewObject = sal_True;
Size aSize;
MapUnit aMapUnit = MAP_100TH_MM;
@@ -588,8 +587,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
/**************************************************
* Das leere OLE-Objekt bekommt ein neues IPObj
**************************************************/
- bInsertNewObject = FALSE;
- pObj->SetEmptyPresObj(FALSE);
+ bInsertNewObject = sal_False;
+ pObj->SetEmptyPresObj(sal_False);
( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL);
( (SdrOle2Obj*) pObj)->SetObjRef(xObj);
( (SdrOle2Obj*) pObj)->SetPersistName(aName);
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index a090f74f85bc..13f8420b52e9 100644..100755
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -85,9 +85,9 @@ namespace sd {
TYPEINIT1( FuInsertFile, FuPoor );
-#define POOL_BUFFER_SIZE (USHORT)32768
-#define BASIC_BUFFER_SIZE (USHORT)8192
-#define DOCUMENT_BUFFER_SIZE (USHORT)32768
+#define POOL_BUFFER_SIZE (sal_uInt16)32768
+#define BASIC_BUFFER_SIZE (sal_uInt16)8192
+#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768
/*************************************************************************
|*
@@ -258,8 +258,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
}
else
{
- SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, FALSE);
- SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, FALSE);
+ SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, sal_False);
+ SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, sal_False);
aFile = pFileName->GetValue ();
@@ -267,15 +267,15 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
aFilterName = pFilterName->GetValue ();
}
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
- SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, FALSE );
+ SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, sal_False );
const SfxFilter* pFilter = NULL;
SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
- BOOL bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell);
- BOOL bInserted = FALSE;
+ sal_Bool bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell);
+ sal_Bool bInserted = sal_False;
if( pFilter )
{
@@ -295,19 +295,19 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
InsSDDinOlMode( pMedium );
// don't delete Medium here, ownership of pMedium has changed in this case
- bInserted = TRUE;
+ bInserted = sal_True;
}
}
else
{
- BOOL bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() );
+ sal_Bool bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() );
if( !bFound &&
( aFilterName.SearchAscii( "Text" ) != STRING_NOTFOUND ||
aFilterName.SearchAscii( "Rich" ) != STRING_NOTFOUND ||
aFilterName.SearchAscii( "RTF" ) != STRING_NOTFOUND ||
aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) )
{
- bFound = TRUE;
+ bFound = sal_True;
}
if( bFound )
@@ -317,13 +317,13 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
else
InsTextOrRTFinOlMode(pMedium);
- bInserted = TRUE;
+ bInserted = sal_True;
delete pMedium;
}
}
}
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
if( !bInserted )
{
@@ -335,37 +335,37 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
// -----------------------------------------------------------------------------
-BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
+sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
{
- BOOL bOK = FALSE;
+ sal_Bool bOK = sal_False;
// Liste mit Seitennamen (wenn NULL, dann alle Seiten)
List* pBookmarkList = NULL;
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
AbstractSdInsertPagesObjsDlg* pDlg = pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0;
if( !pDlg )
- return FALSE;
+ return sal_False;
// Ev. wird eine QueryBox geoeffnet ("Links aktualisieren?"),
// daher wird der Dialog der aktuelle DefModalDialogParent
::Window* pDefParent = GetpApp()->GetDefDialogParent();
GetpApp()->SetDefDialogParent(pDlg->GetWindow());
- USHORT nRet = pDlg->Execute();
+ sal_uInt16 nRet = pDlg->Execute();
GetpApp()->SetDefDialogParent(pDefParent);
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
if( nRet == RET_OK )
{
// Zuerst Seiten einfuegen
pBookmarkList = pDlg->GetList( 1 ); // Seiten
- BOOL bLink = pDlg->IsLink();
- BOOL bReplace = FALSE;
+ sal_Bool bLink = pDlg->IsLink();
+ sal_Bool bReplace = sal_False;
SdPage* pPage = NULL;
::sd::View* pView = mpViewShell->GetView();
@@ -378,7 +378,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
pPage = static_cast<SdPage*>(pView->GetSdrPageView()->GetPage());
}
- USHORT nPos = 0xFFFF;
+ sal_uInt16 nPos = 0xFFFF;
if (pPage && !pPage->IsMasterPage())
{
@@ -392,7 +392,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
}
}
- BOOL bNameOK;
+ sal_Bool bNameOK;
List* pObjectBookmarkList = pDlg->GetList( 2 ); // Objekte
List* pExchangeList = NULL;
@@ -403,13 +403,13 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
// Um zu gewaehrleisten, dass alle Seitennamen eindeutig sind, werden
// die einzufuegenden geprueft und gegebenenfalls in einer Ersatzliste
// aufgenommen
- // bNameOK == FALSE -> Benutzer hat abgebrochen
+ // bNameOK == sal_False -> Benutzer hat abgebrochen
bNameOK = mpView->GetExchangeList( pExchangeList, pBookmarkList, 0 );
if( bNameOK )
bOK = mpDoc->InsertBookmarkAsPage( pBookmarkList, pExchangeList,
bLink, bReplace, nPos,
- FALSE, NULL, TRUE, TRUE, FALSE );
+ sal_False, NULL, sal_True, sal_True, sal_False );
// delete the BookmarkList
if( pBookmarkList )
@@ -489,15 +489,15 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
if( !pDlg )
return;
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
- USHORT nRet = pDlg->Execute();
- mpDocSh->SetWaitCursor( TRUE );
+ sal_uInt16 nRet = pDlg->Execute();
+ mpDocSh->SetWaitCursor( sal_True );
if( nRet == RET_OK )
{
// gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text)
- USHORT nFormat = EE_FORMAT_TEXT;
+ sal_uInt16 nFormat = EE_FORMAT_TEXT;
if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND )
nFormat = EE_FORMAT_RTF;
@@ -526,7 +526,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
DBG_ASSERT( pStream, "Kein InStream!" );
pStream->Seek( 0 );
- ULONG nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() );
+ sal_uLong nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() );
if (nErr || !pOutliner->GetEditEngine().GetText().Len())
{
@@ -559,9 +559,9 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
while ( pOutliner->GetParagraphCount() > 1 )
{
Paragraph* pPara = pOutliner->GetParagraph( 0 );
- ULONG nLen = pOutliner->GetText( pPara, 1 ).Len();
- pOutliner->QuickDelete( ESelection( 0, (USHORT) nLen, 1, 0 ) );
- pOutliner->QuickInsertLineBreak( ESelection( 0, (USHORT) nLen, 0, (USHORT) nLen ) );
+ sal_uLong nLen = pOutliner->GetText( pPara, 1 ).Len();
+ pOutliner->QuickDelete( ESelection( 0, (sal_uInt16) nLen, 1, 0 ) );
+ pOutliner->QuickInsertLineBreak( ESelection( 0, (sal_uInt16) nLen, 0, (sal_uInt16) nLen ) );
}
}
}
@@ -622,7 +622,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
{
// gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text)
- USHORT nFormat = EE_FORMAT_TEXT;
+ sal_uInt16 nFormat = EE_FORMAT_TEXT;
if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND )
nFormat = EE_FORMAT_RTF;
@@ -638,14 +638,14 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
{
pPara = pDocliner->GetParent(pPara);
}
- ULONG nTargetPos = pDocliner->GetAbsPos(pPara) + 1;
+ sal_uLong nTargetPos = pDocliner->GetAbsPos(pPara) + 1;
// Layout der Vorgaengerseite uebernehmen
- USHORT nPage = 0;
+ sal_uInt16 nPage = 0;
pPara = pDocliner->GetParagraph( pDocliner->GetAbsPos( pPara ) - 1 );
while (pPara)
{
- ULONG nPos = pDocliner->GetAbsPos( pPara );
+ sal_uLong nPos = pDocliner->GetAbsPos( pPara );
if ( pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
nPage++;
pPara = pDocliner->GetParagraph( nPos - 1 );
@@ -672,7 +672,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
DBG_ASSERT( pStream, "Kein InStream!" );
pStream->Seek( 0 );
- ULONG nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes());
+ sal_uLong nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes());
if (nErr || !pOutliner->GetEditEngine().GetText().Len())
{
@@ -682,20 +682,20 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
}
else
{
- ULONG nParaCount = pOutliner->GetParagraphCount();
+ sal_uLong nParaCount = pOutliner->GetParagraphCount();
// fuer Fortschrittsanzeige: Anzahl der Ebene-0-Absaetze
- USHORT nNewPages = 0;
+ sal_uInt16 nNewPages = 0;
pPara = pOutliner->GetParagraph( 0 );
while (pPara)
{
- ULONG nPos = pOutliner->GetAbsPos( pPara );
+ sal_uLong nPos = pOutliner->GetAbsPos( pPara );
if( pOutliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
nNewPages++;
pPara = pOutliner->GetParagraph( ++nPos );
}
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
SfxProgress* pProgress = new SfxProgress( mpDocSh, String( SdResId(STR_CREATE_PAGES)), nNewPages);
if( pProgress )
@@ -706,13 +706,13 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
pDocliner->GetUndoManager().EnterListAction(
String(SdResId(STR_UNDO_INSERT_FILE)), String() );
- ULONG nSourcePos = 0;
+ sal_uLong nSourcePos = 0;
SfxStyleSheet* pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE );
Paragraph* pSourcePara = pOutliner->GetParagraph( 0 );
while (pSourcePara)
{
- ULONG nPos = pOutliner->GetAbsPos( pSourcePara );
- sal_Int16 nDepth = pOutliner->GetDepth( (USHORT) nPos );
+ sal_uLong nPos = pOutliner->GetAbsPos( pSourcePara );
+ sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nPos );
// den letzte Absatz nur uebernehmen, wenn er gefuellt ist
if (nSourcePos < nParaCount - 1 ||
@@ -744,7 +744,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
if( pProgress )
delete pProgress;
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
}
delete pOutliner;
@@ -752,7 +752,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
// -----------------------------------------------------------------------------
-BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
+sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
{
OutlineView* pOlView = static_cast<OutlineView*>(mpView);
@@ -790,10 +790,10 @@ BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
pOutliner->SetEndMovingHdl(aOldEndMovingHdl);
pOutliner->SetStatusEventHdl(aOldStatusEventHdl);
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------------
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index e8191a9ee5d3..ea611035074d 100644..100755
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -79,7 +79,7 @@ FunctionReference FuLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::
void FuLine::DoExecute( SfxRequest& rReq )
{
- BOOL bHasMarked = mpView->AreObjectsMarked();
+ sal_Bool bHasMarked = mpView->AreObjectsMarked();
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -101,7 +101,7 @@ void FuLine::DoExecute( SfxRequest& rReq )
}
// Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden
- static USHORT SidArray[] = {
+ static sal_uInt16 SidArray[] = {
SID_ATTR_LINE_STYLE,
SID_ATTR_LINE_DASH,
SID_ATTR_LINE_WIDTH,
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index a89bd4253ad7..b3086c316e21 100644..100755
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -94,10 +94,10 @@ void FuLineEnd::DoExecute( SfxRequest& )
if( aInfoRec.bCanConvToPath &&
pObj->GetObjInventor() == SdrInventor &&
pObj->GetObjIdentifier() != OBJ_GRUP )
- // bCanConvToPath ist bei Gruppenobjekten TRUE,
+ // bCanConvToPath ist bei Gruppenobjekten sal_True,
// stuerzt aber bei ConvertToPathObj() ab !
{
- pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( TRUE, FALSE );
+ pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( sal_True, sal_False );
if( !pNewObj || !pNewObj->ISA( SdrPathObj ) )
return; // Abbruch, zusaetzliche Sicherheit, die bei
@@ -120,18 +120,18 @@ void FuLineEnd::DoExecute( SfxRequest& )
long nCount = pLineEndList->Count();
long j = 1;
- BOOL bDifferent = FALSE;
+ sal_Bool bDifferent = sal_False;
while( !bDifferent )
{
aName = aNewName;
aName.Append( sal_Unicode(' ') );
aName.Append( UniString::CreateFromInt32( j++ ) );
- bDifferent = TRUE;
+ bDifferent = sal_True;
for( long i = 0; i < nCount && bDifferent; i++ )
{
if( aName == pLineEndList->GetLineEnd( i )->GetName() )
- bDifferent = FALSE;
+ bDifferent = sal_False;
}
}
@@ -145,12 +145,12 @@ void FuLineEnd::DoExecute( SfxRequest& )
if( pDlg->Execute() == RET_OK )
{
pDlg->GetName( aName );
- bDifferent = TRUE;
+ bDifferent = sal_True;
for( long i = 0; i < nCount && bDifferent; i++ )
{
if( aName == pLineEndList->GetLineEnd( i )->GetName() )
- bDifferent = FALSE;
+ bDifferent = sal_False;
}
if( bDifferent )
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index e15c9adf3500..256b54c236f2 100644..100755
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -100,8 +100,8 @@ void FuMorph::DoExecute( SfxRequest& )
pCloneObj2->SetOutlinerParaObject(NULL);
// Path-Objekte erzeugen
- SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(FALSE, FALSE);
- SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(FALSE, FALSE);
+ SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(sal_False, sal_False);
+ SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(sal_False, sal_False);
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
AbstractMorphDlg* pDlg = pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0;
if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK))
@@ -332,7 +332,7 @@ void FuMorph::ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx::
//////////////////////////////////////////////////////////////////////////////
// create group object with morphed polygons
//
-void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade,
+void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, sal_Bool bAttributeFade,
const SdrObject* pObj1, const SdrObject* pObj2)
{
Color aStartFillCol;
@@ -345,11 +345,11 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade,
SfxItemPool* pPool = pObj1->GetObjectItemPool();
SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 );
SfxItemSet aSet2( aSet1 );
- BOOL bLineColor = FALSE;
- BOOL bFillColor = FALSE;
- BOOL bLineWidth = FALSE;
- BOOL bIgnoreLine = FALSE;
- BOOL bIgnoreFill = FALSE;
+ sal_Bool bLineColor = sal_False;
+ sal_Bool bFillColor = sal_False;
+ sal_Bool bLineWidth = sal_False;
+ sal_Bool bIgnoreLine = sal_False;
+ sal_Bool bIgnoreFill = sal_False;
aSet1.Put(pObj1->GetMergedItemSet());
aSet2.Put(pObj2->GetMergedItemSet());
@@ -363,7 +363,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade,
{
if ( ( eLineStyle1 != XLINE_NONE ) && ( eLineStyle2 != XLINE_NONE ) )
{
- bLineWidth = bLineColor = TRUE;
+ bLineWidth = bLineColor = sal_True;
aStartLineCol = static_cast< XLineColorItem const & >(
aSet1.Get(XATTR_LINECOLOR)).GetColorValue();
@@ -374,18 +374,18 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade,
nEndLineWidth = ITEMVALUE( aSet2, XATTR_LINEWIDTH, XLineWidthItem );
}
else if ( ( eLineStyle1 == XLINE_NONE ) && ( eLineStyle2 == XLINE_NONE ) )
- bIgnoreLine = TRUE;
+ bIgnoreLine = sal_True;
if ( ( eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_SOLID ) )
{
- bFillColor = TRUE;
+ bFillColor = sal_True;
aStartFillCol = static_cast< XFillColorItem const & >(
aSet1.Get(XATTR_FILLCOLOR)).GetColorValue();
aEndFillCol = static_cast< XFillColorItem const & >(
aSet2.Get(XATTR_FILLCOLOR)).GetColorValue();
}
else if ( ( eFillStyle1 == XFILL_NONE ) && ( eFillStyle2 == XFILL_NONE ) )
- bIgnoreFill = TRUE;
+ bIgnoreFill = sal_True;
}
if ( pPageView )
@@ -393,7 +393,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade,
SfxItemSet aSet( aSet1 );
SdrObjGroup* pObjGroup = new SdrObjGroup;
SdrObjList* pObjList = pObjGroup->GetSubList();
- const ULONG nCount = rPolyPolyList3D.Count();
+ const sal_uLong nCount = rPolyPolyList3D.Count();
const double fStep = 1. / ( nCount + 1 );
const double fDelta = nEndLineWidth - nStartLineWidth;
double fFactor = fStep;
@@ -401,7 +401,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade,
aSet.Put( XLineStyleItem( XLINE_SOLID ) );
aSet.Put( XFillStyleItem( XFILL_SOLID ) );
- for ( ULONG i = 0; i < nCount; i++, fFactor += fStep )
+ for ( sal_uLong i = 0; i < nCount; i++, fFactor += fStep )
{
const ::basegfx::B2DPolyPolygon& rPolyPoly3D = *(::basegfx::B2DPolyPolygon*)rPolyPolyList3D.GetObject(i);
SdrPathObj* pNewObj = new SdrPathObj(OBJ_POLY, rPolyPoly3D);
@@ -507,7 +507,7 @@ sal_Bool FuMorph::ImpMorphPolygons(
rPolyPolyList3D.Insert(pNewPolyPoly2D, LIST_APPEND);
}
}
- return TRUE;
+ return sal_True;
}
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index bba8f71f3274..2c1ccfd8ba6a 100644..100755
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -93,11 +93,11 @@ FunctionReference FuObjectAnimationParameters::Create( ViewShell* pViewSh, ::sd:
void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
{
- SfxUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager();
+ ::svl::IUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager();
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount();
- ULONG nObject = 0;
+ sal_uLong nCount = rMarkList.GetMarkCount();
+ sal_uLong nObject = 0;
short nAnimationSet = ATTR_MISSING;
short nEffectSet = ATTR_MISSING;
@@ -121,20 +121,20 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE;
presentation::AnimationEffect eTextEffect = presentation::AnimationEffect_NONE;
presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_MEDIUM;
- BOOL bActive = FALSE;
- BOOL bFadeOut = FALSE;
+ sal_Bool bActive = sal_False;
+ sal_Bool bFadeOut = sal_False;
Color aFadeColor = COL_LIGHTGRAY;
- BOOL bInvisible = FALSE;
- BOOL bSoundOn = FALSE;
+ sal_Bool bInvisible = sal_False;
+ sal_Bool bSoundOn = sal_False;
String aSound;
- BOOL bPlayFull = FALSE;
+ sal_Bool bPlayFull = sal_False;
presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
String aBookmark;
presentation::AnimationEffect eSecondEffect = presentation::AnimationEffect_NONE;
presentation::AnimationSpeed eSecondSpeed = presentation::AnimationSpeed_MEDIUM;
- BOOL bSecondSoundOn = FALSE;
- BOOL bSecondPlayFull = FALSE;
+ sal_Bool bSecondSoundOn = sal_False;
+ sal_Bool bSecondPlayFull = sal_False;
SdAnimationInfo* pInfo;
@@ -252,7 +252,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
}
else
{
- if (nAnimationSet == ATTR_SET && bActive == TRUE)
+ if (nAnimationSet == ATTR_SET && bActive == sal_True)
nAnimationSet = ATTR_MIXED;
if (nEffectSet == ATTR_SET && eEffect != presentation::AnimationEffect_NONE)
@@ -264,22 +264,22 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
if (nSpeedSet == ATTR_SET)
nSpeedSet = ATTR_MIXED;
- if (nFadeOutSet == ATTR_SET && bFadeOut == TRUE)
+ if (nFadeOutSet == ATTR_SET && bFadeOut == sal_True)
nFadeOutSet = ATTR_MIXED;
if (nFadeColorSet == ATTR_SET)
nFadeColorSet = ATTR_MIXED;
- if (nInvisibleSet == ATTR_SET && bInvisible == TRUE)
+ if (nInvisibleSet == ATTR_SET && bInvisible == sal_True)
nInvisibleSet = ATTR_MIXED;
- if (nSoundOnSet == ATTR_SET && bSoundOn == TRUE)
+ if (nSoundOnSet == ATTR_SET && bSoundOn == sal_True)
nSoundOnSet = ATTR_MIXED;
if (nSoundFileSet == ATTR_SET)
nSoundFileSet = ATTR_MIXED;
- if (nPlayFullSet == ATTR_SET && bPlayFull == TRUE)
+ if (nPlayFullSet == ATTR_SET && bPlayFull == sal_True)
nPlayFullSet = ATTR_MIXED;
if (nClickActionSet == ATTR_SET && eClickAction != presentation::ClickAction_NONE)
@@ -294,10 +294,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
if (nSecondSpeedSet == ATTR_SET)
nSecondSpeedSet = ATTR_MIXED;
- if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn == TRUE)
+ if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn == sal_True)
nSecondSoundOnSet = ATTR_MIXED;
- if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull == TRUE)
+ if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull == sal_True)
nSecondPlayFullSet = ATTR_MIXED;
}
}
@@ -366,24 +366,24 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
else if (nAnimationSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ANIMATION_ACTIVE);
else
- aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, FALSE));
+ aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, sal_False));
if (nEffectSet == ATTR_SET)
- aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, (USHORT)eEffect));
+ aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, (sal_uInt16)eEffect));
else if (nEffectSet == ATTR_MIXED)
aSet.InvalidateItem( ATTR_ANIMATION_EFFECT );
else
aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, presentation::AnimationEffect_NONE));
if (nTextEffectSet == ATTR_SET)
- aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, (USHORT)eTextEffect));
+ aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, (sal_uInt16)eTextEffect));
else if (nTextEffectSet == ATTR_MIXED)
aSet.InvalidateItem( ATTR_ANIMATION_TEXTEFFECT );
else
aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, presentation::AnimationEffect_NONE));
if (nSpeedSet == ATTR_SET)
- aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_SPEED, (USHORT)eSpeed));
+ aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_SPEED, (sal_uInt16)eSpeed));
else
aSet.InvalidateItem(ATTR_ANIMATION_SPEED);
@@ -392,7 +392,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
else if (nFadeOutSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ANIMATION_FADEOUT);
else
- aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, FALSE));
+ aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, sal_False));
if (nFadeColorSet == ATTR_SET)
aSet.Put(SvxColorItem(aFadeColor, ATTR_ANIMATION_COLOR));
@@ -406,14 +406,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
else if (nInvisibleSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ANIMATION_INVISIBLE);
else
- aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, FALSE));
+ aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, sal_False));
if (nSoundOnSet == ATTR_SET)
aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, bSoundOn));
else if (nSoundOnSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ANIMATION_SOUNDON);
else
- aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, FALSE));
+ aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, sal_False));
if (nSoundFileSet == ATTR_SET)
aSet.Put(SfxStringItem(ATTR_ANIMATION_SOUNDFILE, aSound));
@@ -425,10 +425,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
else if (nPlayFullSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ANIMATION_PLAYFULL);
else
- aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, FALSE));
+ aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, sal_False));
if (nClickActionSet == ATTR_SET)
- aSet.Put(SfxAllEnumItem(ATTR_ACTION, (USHORT)eClickAction));
+ aSet.Put(SfxAllEnumItem(ATTR_ACTION, (sal_uInt16)eClickAction));
else if (nClickActionSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ACTION);
else
@@ -440,14 +440,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
aSet.InvalidateItem(ATTR_ACTION_FILENAME);
if (nSecondEffectSet == ATTR_SET)
- aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, (USHORT)eSecondEffect));
+ aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, (sal_uInt16)eSecondEffect));
else if (nSecondEffectSet == ATTR_MIXED)
aSet.InvalidateItem( ATTR_ACTION_EFFECT );
else
aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, presentation::AnimationEffect_NONE));
if (nSecondSpeedSet == ATTR_SET)
- aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECTSPEED, (USHORT)eSecondSpeed));
+ aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECTSPEED, (sal_uInt16)eSecondSpeed));
else
aSet.InvalidateItem(ATTR_ACTION_EFFECTSPEED);
@@ -456,19 +456,19 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
else if (nSecondSoundOnSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ACTION_SOUNDON);
else
- aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, FALSE));
+ aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, sal_False));
if (nSecondPlayFullSet == ATTR_SET)
aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, bSecondPlayFull));
else if (nPlayFullSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ACTION_PLAYFULL);
else
- aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, FALSE));
+ aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, sal_False));
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
SfxAbstractDialog* pDlg = pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0;
- USHORT nResult = pDlg ? pDlg->Execute() : RET_CANCEL;
+ sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL;
if( nResult == RET_OK )
{
@@ -701,11 +701,11 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pInfo = mpDoc->GetAnimationInfo(pObject);
- BOOL bCreated = FALSE;
+ sal_Bool bCreated = sal_False;
if( !pInfo )
{
pInfo = SdDrawDocument::GetShapeUserData(*pObject,true);
- bCreated = TRUE;
+ bCreated = sal_True;
}
// das Pfadobjekt fuer 'an Kurve entlang'?
@@ -752,7 +752,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pAction->SetPathObj(pInfo->mpPathObj, pPath);
pAction->SetClickAction(pInfo->meClickAction, eClickAction);
pAction->SetBookmark(pInfo->GetBookmark(), aBookmark);
- pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() );
+ pAction->SetVerb(pInfo->mnVerb, (sal_uInt16)pInfo->GetBookmark().ToInt32() );
pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect);
pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed);
pAction->SetSecondSoundOn(pInfo->mbSecondSoundOn, bSecondSoundOn);
@@ -809,7 +809,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pInfo->mbSecondPlayFull = bSecondPlayFull;
if (eClickAction == presentation::ClickAction_VERB)
- pInfo->mnVerb = (USHORT)aBookmark.ToInt32();
+ pInfo->mnVerb = (sal_uInt16)aBookmark.ToInt32();
}
}
// Set the Undo Group in of the Undo Manager
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index c6388e788620..8f379123dde2 100644..100755
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -83,14 +83,14 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
SfxItemSet aNewAttr( mpViewShell->GetPool(),
EE_ITEMS_START, EE_ITEMS_END );
- aNewAttr.Put( aEditAttr, FALSE );
+ aNewAttr.Put( aEditAttr, sal_False );
// Dialog hochfahren und ausfuehren
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0;
if( pDlg )
{
- USHORT nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
switch( nResult )
{
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index f3c146184c20..ee9b4ce97c75 100644..100755
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -52,7 +52,7 @@
namespace sd {
-static USHORT SidArray[] = {
+static sal_uInt16 SidArray[] = {
SID_STYLE_FAMILY2,
SID_STYLE_FAMILY3,
SID_STYLE_FAMILY5,
@@ -117,9 +117,9 @@ FunctionReference FuOutlineText::Create( ViewShell* pViewSh, ::sd::Window* pWin,
|*
\************************************************************************/
-BOOL FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
mpWindow->GrabFocus();
@@ -144,9 +144,9 @@ BOOL FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuOutlineText::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseMove(rMEvt);
@@ -180,9 +180,9 @@ BOOL FuOutlineText::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonUp(rMEvt);
@@ -200,11 +200,11 @@ BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt)
if( pField && pField->ISA( SvxURLField ) )
{
- bReturn = TRUE;
+ bReturn = sal_True;
mpWindow->ReleaseMouse();
SfxStringItem aStrItem( SID_FILE_NAME, ( (SvxURLField*) pField)->GetURL() );
SfxStringItem aReferer( SID_REFERER, mpDocSh->GetMedium()->GetName() );
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
if ( rMEvt.IsMod1() )
@@ -234,16 +234,16 @@ BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuOutlineText::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
- USHORT nKeyGroup = rKEvt.GetKeyCode().GetGroup();
+ sal_uInt16 nKeyGroup = rKEvt.GetKeyCode().GetGroup();
if( !mpDocSh->IsReadOnly() || nKeyGroup == KEYGROUP_CURSOR )
{
mpWindow->GrabFocus();
diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx
index d1d65291c4c6..b5b831cf21e0 100644
--- a/sd/source/ui/func/fuoutl.cxx
+++ b/sd/source/ui/func/fuoutl.cxx
@@ -65,9 +65,9 @@ FuOutline::FuOutline (
|*
\************************************************************************/
-BOOL FuOutline::Command(const CommandEvent& rCEvt)
+sal_Bool FuOutline::Command(const CommandEvent& rCEvt)
{
- BOOL bResult = FALSE;
+ sal_Bool bResult = sal_False;
OutlinerView* pOlView =
static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow);
@@ -76,7 +76,7 @@ BOOL FuOutline::Command(const CommandEvent& rCEvt)
if (pOlView)
{
pOlView->Command(rCEvt); // liefert leider keinen Returnwert
- bResult = TRUE;
+ bResult = sal_True;
}
return bResult;
}
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 9196c2803249..242b34ba8b9d 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -96,8 +96,8 @@ TYPEINIT1( FuPage, FuPoor );
void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource )
{
- const USHORT* pPtr = rSource.GetRanges();
- USHORT p1, p2;
+ const sal_uInt16* pPtr = rSource.GetRanges();
+ sal_uInt16 p1, p2;
while( *pPtr )
{
p1 = pPtr[0];
@@ -213,7 +213,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
SvxPageItem aPageItem( SID_ATTR_PAGE );
aPageItem.SetDescName( mpPage->GetName() );
aPageItem.SetPageUsage( (SvxPageUsage) SVX_PAGE_ALL );
- aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? TRUE: FALSE );
+ aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? sal_True: sal_False );
aPageItem.SetNumType( mpDoc->GetPageNumType() );
aNewAttr.Put( aPageItem );
@@ -227,20 +227,20 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
aNewAttr.Put( aMaxSizeItem );
// paperbin
- SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (const BYTE)mpPage->GetPaperBin() );
+ SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (const sal_uInt8)mpPage->GetPaperBin() );
aNewAttr.Put( aPaperBinItem );
- SvxLRSpaceItem aLRSpaceItem( (USHORT)mpPage->GetLftBorder(), (USHORT)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE));
+ SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLftBorder(), (sal_uInt16)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE));
aNewAttr.Put( aLRSpaceItem );
- SvxULSpaceItem aULSpaceItem( (USHORT)mpPage->GetUppBorder(), (USHORT)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE));
+ SvxULSpaceItem aULSpaceItem( (sal_uInt16)mpPage->GetUppBorder(), (sal_uInt16)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE));
aNewAttr.Put( aULSpaceItem );
// Applikation
bool bScale = mpDoc->GetDocumentType() != DOCUMENT_TYPE_DRAW;
- aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? TRUE : FALSE ) );
+ aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? sal_True : sal_False ) );
- BOOL bFullSize = mpPage->IsMasterPage() ?
+ sal_Bool bFullSize = mpPage->IsMasterPage() ?
mpPage->IsBackgroundFullSize() : ((SdPage&)mpPage->TRG_GetMasterPage()).IsBackgroundFullSize();
aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT2, bFullSize ) );
@@ -248,8 +248,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
///////////////////////////////////////////////////////////////////////
// Merge ItemSet for dialog
- const USHORT* pPtr = aNewAttr.GetRanges();
- USHORT p1 = pPtr[0], p2 = pPtr[1];
+ const sal_uInt16* pPtr = aNewAttr.GetRanges();
+ sal_uInt16 p1 = pPtr[0], p2 = pPtr[1];
while(pPtr[2] && (pPtr[2] - p2 == 1))
{
p2 = pPtr[3];
@@ -313,9 +313,14 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
pTempSet.reset( new SfxItemSet( mpDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0) );
pTempSet->Put( XFillStyleItem( XFILL_BITMAP ) );
- pTempSet->Put( XFillBitmapItem( String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic) ) );
- pTempSet->Put( XFillBmpStretchItem( TRUE ));
- pTempSet->Put( XFillBmpTileItem( FALSE ));
+
+ // MigrateItemSet makes sure the XFillBitmapItem will have a unique name
+ SfxItemSet aMigrateSet( mpDoc->GetPool(), XATTR_FILLBITMAP, XATTR_FILLBITMAP );
+ aMigrateSet.Put( XFillBitmapItem( String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic) ) );
+ mpDoc->MigrateItemSet( &aMigrateSet, pTempSet.get(), NULL );
+
+ pTempSet->Put( XFillBmpStretchItem( sal_True ));
+ pTempSet->Put( XFillBmpTileItem( sal_False ));
}
}
}
@@ -336,8 +341,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
{
// if some fillstyle-items are not set in the dialog, then
// try to use the items before
- BOOL bChanges = FALSE;
- for( USHORT i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ )
+ sal_Bool bChanges = sal_False;
+ for( sal_uInt16 i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ )
{
if( aMergedAttr.GetItemState( i ) != SFX_ITEM_DEFAULT )
{
@@ -345,7 +350,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
pTempSet->Put( aMergedAttr.Get( i ) );
else
if( aMergedAttr.GetItem( i ) != pTempSet->GetItem( i ) )
- bChanges = TRUE;
+ bChanges = sal_True;
}
}
@@ -353,7 +358,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ||
( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT ) &&
( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) )
- mbPageBckgrdDeleted = TRUE;
+ mbPageBckgrdDeleted = sal_True;
bool bSetToAllPages = false;
@@ -404,14 +409,14 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
else if( bSetToAllPages )
{
String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
- SfxUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
+ ::svl::IUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
pUndoMgr->EnterListAction(aComment, aComment);
SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
pUndoGroup->SetComment(aComment);
//Set background on all master pages
- USHORT nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind);
- for (USHORT i = 0; i < nMasterPageCount; ++i)
+ sal_uInt16 nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind);
+ for (sal_uInt16 i = 0; i < nMasterPageCount; ++i)
{
SdPage *pMasterPage = mpDoc->GetMasterSdPage(i, ePageKind);
SdStyleSheet *pStyle =
@@ -424,8 +429,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
}
//Remove background from all pages to reset to the master bg
- USHORT nPageCount(mpDoc->GetSdPageCount(ePageKind));
- for(USHORT i=0; i<nPageCount; ++i)
+ sal_uInt16 nPageCount(mpDoc->GetSdPageCount(ePageKind));
+ for(sal_uInt16 i=0; i<nPageCount; ++i)
{
SdPage *pPage = mpDoc->GetSdPage(i, ePageKind);
@@ -447,7 +452,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
// if background filling is set to master pages then clear from page set
if( mbMasterPage || bSetToAllPages )
{
- for( USHORT nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ )
+ for( sal_uInt16 nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ )
{
pTempSet->ClearItem( nWhich );
}
@@ -461,7 +466,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
mpDoc->SetDefaultWritingMode( nVal == FRMDIR_HORI_RIGHT_TOP ? ::com::sun::star::text::WritingMode_RL_TB : ::com::sun::star::text::WritingMode_LR_TB );
}
- mpDoc->SetChanged(TRUE);
+ mpDoc->SetChanged(sal_True);
// BackgroundFill of Masterpage: no hard attributes allowed
SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage();
@@ -491,16 +496,16 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
// Set new page-attributes
PageKind ePageKind = mpDrawViewShell->GetPageKind();
const SfxPoolItem* pPoolItem;
- BOOL bSetPageSizeAndBorder = FALSE;
+ sal_Bool bSetPageSizeAndBorder = sal_False;
Size aNewSize(maSize);
- INT32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1;
- BOOL bScaleAll = TRUE;
+ sal_Int32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1;
+ sal_Bool bScaleAll = sal_True;
Orientation eOrientation = mpPage->GetOrientation();
SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage());
- BOOL bFullSize = pMasterPage->IsBackgroundFullSize();
- USHORT nPaperBin = mpPage->GetPaperBin();
+ sal_Bool bFullSize = pMasterPage->IsBackgroundFullSize();
+ sal_uInt16 nPaperBin = mpPage->GetPaperBin();
- if( pArgs->GetItemState(SID_ATTR_PAGE, TRUE, &pPoolItem) == SFX_ITEM_SET )
+ if( pArgs->GetItemState(SID_ATTR_PAGE, sal_True, &pPoolItem) == SFX_ITEM_SET )
{
mpDoc->SetPageNumType(((const SvxPageItem*) pPoolItem)->GetNumType());
@@ -508,71 +513,71 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT;
if( mpPage->GetOrientation() != eOrientation )
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
mpDrawViewShell->ResetActualPage();
}
- if( pArgs->GetItemState(SID_ATTR_PAGE_SIZE, TRUE, &pPoolItem) == SFX_ITEM_SET )
+ if( pArgs->GetItemState(SID_ATTR_PAGE_SIZE, sal_True, &pPoolItem) == SFX_ITEM_SET )
{
aNewSize = ((const SvxSizeItem*) pPoolItem)->GetSize();
if( mpPage->GetSize() != aNewSize )
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
}
if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE),
- TRUE, &pPoolItem) == SFX_ITEM_SET )
+ sal_True, &pPoolItem) == SFX_ITEM_SET )
{
nLeft = ((const SvxLRSpaceItem*) pPoolItem)->GetLeft();
nRight = ((const SvxLRSpaceItem*) pPoolItem)->GetRight();
if( mpPage->GetLftBorder() != nLeft || mpPage->GetRgtBorder() != nRight )
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
}
if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE),
- TRUE, &pPoolItem) == SFX_ITEM_SET )
+ sal_True, &pPoolItem) == SFX_ITEM_SET )
{
nUpper = ((const SvxULSpaceItem*) pPoolItem)->GetUpper();
nLower = ((const SvxULSpaceItem*) pPoolItem)->GetLower();
if( mpPage->GetUppBorder() != nUpper || mpPage->GetLwrBorder() != nLower )
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
}
- if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT1), TRUE, &pPoolItem) == SFX_ITEM_SET )
+ if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT1), sal_True, &pPoolItem) == SFX_ITEM_SET )
{
bScaleAll = ((const SfxBoolItem*) pPoolItem)->GetValue();
}
- if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT2), TRUE, &pPoolItem) == SFX_ITEM_SET )
+ if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT2), sal_True, &pPoolItem) == SFX_ITEM_SET )
{
bFullSize = ((const SfxBoolItem*) pPoolItem)->GetValue();
if(pMasterPage->IsBackgroundFullSize() != bFullSize )
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
}
// Papierschacht (PaperBin)
- if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_PAPERBIN), TRUE, &pPoolItem) == SFX_ITEM_SET )
+ if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_PAPERBIN), sal_True, &pPoolItem) == SFX_ITEM_SET )
{
nPaperBin = ((const SvxPaperBinItem*) pPoolItem)->GetValue();
if( mpPage->GetPaperBin() != nPaperBin )
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
}
if (nLeft == -1 && nUpper != -1)
{
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
nLeft = mpPage->GetLftBorder();
nRight = mpPage->GetRgtBorder();
}
else if (nLeft != -1 && nUpper == -1)
{
- bSetPageSizeAndBorder = TRUE;
+ bSetPageSizeAndBorder = sal_True;
nUpper = mpPage->GetUppBorder();
nLower = mpPage->GetLwrBorder();
}
@@ -582,8 +587,8 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
////////////////////////////////////////////////////////////////////////////////
//
- // if bMasterPage==FALSE then create a background-object for this page with the
- // properties set in the dialog before, but if mbPageBckgrdDeleted==TRUE then
+ // if bMasterPage==sal_False then create a background-object for this page with the
+ // properties set in the dialog before, but if mbPageBckgrdDeleted==sal_True then
// the background of this page was set to invisible, so it would be a mistake
// to create a new background-object for this page !
//
@@ -605,7 +610,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
if( mpBackgroundObjUndoAction )
{
// set merge flag, because a SdUndoGroupAction could have been inserted before
- mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, TRUE );
+ mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, sal_True );
mpBackgroundObjUndoAction = 0;
}
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index e18240c6ca2e..2ebb4064a79c 100644..100755
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -113,7 +113,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdParagraphTabDlg(NULL, &aNewAttr ) : 0;
if( pDlg )
{
- USHORT nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
switch( nResult )
{
@@ -155,7 +155,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
}
// invalidieren der Slots
- static USHORT SidArray[] = {
+ static sal_uInt16 SidArray[] = {
SID_ATTR_TABSTOP,
SID_ATTR_PARA_ADJUST_LEFT,
SID_ATTR_PARA_ADJUST_RIGHT,
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index ff53735f32e9..ff938d1c3820 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -95,11 +95,11 @@ FuPoor::FuPoor (
nSlotId( rReq.GetSlot() ),
nSlotValue(0),
pDialog(NULL),
- bIsInDragMode(FALSE),
- bNoScrollUntilInside (TRUE),
- bScrollable (FALSE),
- bDelayActive (FALSE),
- bFirstMouseMove (FALSE),
+ bIsInDragMode(sal_False),
+ bNoScrollUntilInside (sal_True),
+ bScrollable (sal_False),
+ bDelayActive (sal_False),
+ bFirstMouseMove (sal_False),
// remember MouseButton state
mnCode(0)
{
@@ -157,7 +157,7 @@ void FuPoor::Deactivate()
aScrollTimer.Stop();
aDelayToScrollTimer.Stop ();
bScrollable =
- bDelayActive = FALSE;
+ bDelayActive = sal_False;
if (pDialog)
{
@@ -195,7 +195,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
if ( bNoScrollUntilInside )
{
if ( rRect.IsInside(aPos) )
- bNoScrollUntilInside = FALSE;
+ bNoScrollUntilInside = sal_False;
}
else
{
@@ -244,16 +244,16 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer )
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt)
{
- USHORT nCode = rKEvt.GetKeyCode().GetCode();
- BOOL bReturn = FALSE;
- BOOL bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() );
+ sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
+ sal_Bool bReturn = sal_False;
+ sal_Bool bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() );
switch (nCode)
{
@@ -306,7 +306,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
// consumed
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
else
@@ -334,7 +334,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
// consumed
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
}
@@ -362,7 +362,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
// consumed
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -382,9 +382,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
if (mpViewShell->ISA(DrawViewShell))
static_cast<DrawViewShell*>(mpViewShell)
- ->SetZoomOnPage(FALSE);
+ ->SetZoomOnPage(sal_False);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -398,9 +398,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
if (mpViewShell->ISA(DrawViewShell))
static_cast<DrawViewShell*>(mpViewShell)
- ->SetZoomOnPage(FALSE);
+ ->SetZoomOnPage(sal_False);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -412,7 +412,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
// Zoom auf Seite
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -424,7 +424,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
// Zoom auf selektierte Objekte
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_SIZE_OPTIMAL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -437,7 +437,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
{
// Naechstes ZoomRect einstellen
mpViewShell->SetZoomRect(pZoomList->GetNextZoomRect());
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -450,7 +450,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
{
// Vorheriges ZoomRect einstellen
mpViewShell->SetZoomRect(pZoomList->GetPreviousZoomRect());
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -463,7 +463,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
{
// Sprung zu erster Seite
static_cast<DrawViewShell*>(mpViewShell)->SwitchPage(0);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -480,7 +480,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
static_cast<DrawViewShell*>(mpViewShell)
->SwitchPage(mpDoc->GetSdPageCount(
pPage->GetPageKind()) - 1);
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -501,9 +501,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
mpView->SdrEndTextEdit();
// Previous page.
- bReturn = TRUE;
+ bReturn = sal_True;
SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage();
- USHORT nSdPage = (pPage->GetPageNum() - 1) / 2;
+ sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2;
if (nSdPage > 0)
{
@@ -547,9 +547,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
mpView->SdrEndTextEdit();
// Next page.
- bReturn = TRUE;
+ bReturn = sal_True;
SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage();
- USHORT nSdPage = (pPage->GetPageNum() - 1) / 2;
+ sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2;
if (nSdPage < mpDoc->GetSdPageCount(pPage->GetPageKind()) - 1)
{
@@ -634,7 +634,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
}
@@ -809,13 +809,13 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
if(mpView->IsDragObj())
{
bool bWasNoSnap = rDragStat.IsNoSnap();
- BOOL bWasSnapEnabled = mpView->IsSnapEnabled();
+ sal_Bool bWasSnapEnabled = mpView->IsSnapEnabled();
// switch snapping off
if(!bWasNoSnap)
- ((SdrDragStat&)rDragStat).SetNoSnap(TRUE);
+ ((SdrDragStat&)rDragStat).SetNoSnap(sal_True);
if(bWasSnapEnabled)
- mpView->SetSnapEnabled(FALSE);
+ mpView->SetSnapEnabled(sal_False);
mpView->MovAction(aEndPoint);
mpView->EndDragObj();
@@ -847,7 +847,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
ScrollEnd();
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
break;
@@ -888,7 +888,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
0L);
// consumed
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
}
@@ -939,7 +939,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
0L);
// consumed
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
}
@@ -949,9 +949,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
return(bReturn);
}
-BOOL FuPoor::MouseMove(const MouseEvent& )
+sal_Bool FuPoor::MouseMove(const MouseEvent& )
{
- return FALSE;
+ return sal_False;
}
void FuPoor::SelectionHasChanged()
@@ -1012,14 +1012,14 @@ IMPL_LINK( FuPoor, DragHdl, Timer *, EMPTYARG )
{
if( mpView )
{
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
SdrHdl* pHdl = mpView->PickHandle(aMDPos);
if ( pHdl==NULL && mpView->IsMarkedHit(aMDPos, nHitLog)
- && !mpView->IsPresObjSelected(FALSE, TRUE) )
+ && !mpView->IsPresObjSelected(sal_False, sal_True) )
{
mpWindow->ReleaseMouse();
- bIsInDragMode = TRUE;
+ bIsInDragMode = sal_True;
mpView->StartDrag( aMDPos, mpWindow );
}
}
@@ -1032,7 +1032,7 @@ IMPL_LINK( FuPoor, DragHdl, Timer *, EMPTYARG )
|*
\************************************************************************/
-BOOL FuPoor::Command(const CommandEvent& rCEvt)
+sal_Bool FuPoor::Command(const CommandEvent& rCEvt)
{
return( mpView->Command(rCEvt,mpWindow) );
}
@@ -1046,7 +1046,7 @@ BOOL FuPoor::Command(const CommandEvent& rCEvt)
IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG )
{
aDelayToScrollTimer.Stop ();
- bScrollable = TRUE;
+ bScrollable = sal_True;
Point aPnt(mpWindow->GetPointerPosPixel());
@@ -1064,22 +1064,22 @@ IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer )
|*
\************************************************************************/
-BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
+sal_Bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
aDelayToScrollTimer.Stop ();
return bScrollable =
- bDelayActive = FALSE;
+ bDelayActive = sal_False;
}
-BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -1090,7 +1090,7 @@ BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
void FuPoor::StartDelayToScrollTimer ()
{
- bDelayActive = TRUE;
+ bDelayActive = sal_True;
aDelayToScrollTimer.Start ();
}
@@ -1100,9 +1100,9 @@ void FuPoor::StartDelayToScrollTimer ()
|*
\************************************************************************/
-BOOL FuPoor::RequestHelp(const HelpEvent& rHEvt)
+sal_Bool FuPoor::RequestHelp(const HelpEvent& rHEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
SdrPageView* pPV = mpView->GetSdrPageView();
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 7f6011005939..35cf5d46e253 100644..100755
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -75,8 +75,8 @@ SO2_DECL_REF(SvStorage)
TYPEINIT1( FuPresentationLayout, FuPoor );
-#define POOL_BUFFER_SIZE (USHORT)32768
-#define DOCUMENT_BUFFER_SIZE (USHORT)32768
+#define POOL_BUFFER_SIZE (sal_uInt16)32768
+#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768
#define DOCUMENT_TOKEN (sal_Unicode('#'))
/*************************************************************************
@@ -113,11 +113,11 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
mpView->UnmarkAll();
}
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
// die aktive Seite ermitteln
- USHORT nSelectedPage = SDRPAGE_NOTFOUND;
- for (USHORT nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++)
+ sal_uInt16 nSelectedPage = SDRPAGE_NOTFOUND;
+ for (sal_uInt16 nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++)
{
if (mpDoc->GetSdPage(nPage, PK_STANDARD)->IsSelected())
{
@@ -134,19 +134,19 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
// wenn wir auf einer Masterpage sind, gelten die Aenderungen fuer alle
// Seiten und Notizseiten, die das betreffende Layout benutzen
- BOOL bOnMaster = FALSE;
+ sal_Bool bOnMaster = sal_False;
if( mpViewShell && mpViewShell->ISA(DrawViewShell))
{
EditMode eEditMode =
static_cast<DrawViewShell*>(mpViewShell)->GetEditMode();
if (eEditMode == EM_MASTERPAGE)
- bOnMaster = TRUE;
+ bOnMaster = sal_True;
}
- BOOL bMasterPage = bOnMaster;
- BOOL bCheckMasters = FALSE;
+ sal_Bool bMasterPage = bOnMaster;
+ sal_Bool bCheckMasters = sal_False;
// Dialog aufrufen
- BOOL bLoad = FALSE; // tauchen neue Masterpages auf?
+ sal_Bool bLoad = sal_False; // tauchen neue Masterpages auf?
String aFile;
SfxItemSet aSet(mpDoc->GetPool(), ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END);
@@ -176,7 +176,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, mpViewShell, NULL, aSet ) : 0;
- USHORT nResult = pDlg ? pDlg->Execute() : RET_CANCEL;
+ sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL;
switch (nResult)
{
@@ -195,14 +195,14 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
break;
default:
- bError = TRUE;
+ bError = sal_True;
}
delete pDlg;
}
if (!bError)
{
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
// Hier werden nur Masterpages ausgewechselt, d.h. die aktuelle Seite
// bleibt aktuell. Damit beim Ein- und Ausfuegen der Masterpages nicht
@@ -212,7 +212,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
// removing a masterpage, it's possible that you are removing the
// current masterpage. So you have to call ResetActualPage !
if( mpViewShell->ISA(DrawViewShell) && !bCheckMasters )
- static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(TRUE);
+ static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_True);
if (bLoad)
{
@@ -237,7 +237,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
// Blockade wieder aufheben
if (mpViewShell->ISA(DrawViewShell) && !bCheckMasters )
- static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(FALSE);
+ static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_False);
/*************************************************************************
|* Falls dargestellte Masterpage sichtbar war, neu darstellen
@@ -250,7 +250,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
{
::sd::View* pView =
static_cast<DrawViewShell*>(mpViewShell)->GetView();
- USHORT nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum();
+ sal_uInt16 nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum();
if (static_cast<DrawViewShell*>(mpViewShell)->GetPageKind() == PK_NOTES)
nPgNum++;
@@ -274,12 +274,12 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
DrawViewShell* pDrawViewSh =
static_cast<DrawViewShell*>(mpViewShell);
EditMode eMode = pDrawViewSh->GetEditMode();
- BOOL bLayer = pDrawViewSh->IsLayerModeActive();
+ sal_Bool bLayer = pDrawViewSh->IsLayerModeActive();
pDrawViewSh->ChangeEditMode( eMode, !bLayer );
pDrawViewSh->ChangeEditMode( eMode, bLayer );
}
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
}
}
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 1e67a409fb40..fdbd0cb35b09 100644..100755
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -94,32 +94,32 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
String aLayoutName = (((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue());
DBG_ASSERT(aLayoutName.Len(), "Layout unbestimmt");
- BOOL bUnique = FALSE;
+ sal_Bool bUnique = sal_False;
sal_Int16 nDepth, nTmp;
OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView());
OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow );
::Outliner* pOutl = pOutlinerView->GetOutliner();
List* pList = pOutlinerView->CreateSelectionList();
Paragraph* pPara = (Paragraph*)pList->First();
- nDepth = pOutl->GetDepth((USHORT)pOutl->GetAbsPos( pPara ) );
+ nDepth = pOutl->GetDepth((sal_uInt16)pOutl->GetAbsPos( pPara ) );
bool bPage = pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE );
while( pPara )
{
- nTmp = pOutl->GetDepth((USHORT) pOutl->GetAbsPos( pPara ) );
+ nTmp = pOutl->GetDepth((sal_uInt16) pOutl->GetAbsPos( pPara ) );
if( nDepth != nTmp )
{
- bUnique = FALSE;
+ bUnique = sal_False;
break;
}
if( pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) != bPage )
{
- bUnique = FALSE;
+ bUnique = sal_False;
break;
}
- bUnique = TRUE;
+ bUnique = sal_True;
pPara = (Paragraph*) pList->Next();
}
@@ -128,7 +128,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
{
String aStyleName = aLayoutName;
aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) );
- USHORT nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
+ sal_uInt16 nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
PresentationObjects ePO;
if( bPage )
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index ab6ac2434d0a..1475659b57b9 100644..100755
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -83,7 +83,7 @@ FunctionReference FuScale::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:
void FuScale::DoExecute( SfxRequest& rReq )
{
- INT16 nValue;
+ sal_Int16 nValue;
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -91,9 +91,9 @@ void FuScale::DoExecute( SfxRequest& rReq )
{
SfxItemSet aNewAttr( mpDoc->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
SvxZoomItem* pZoomItem;
- USHORT nZoomValues = SVX_ZOOM_ENABLE_ALL;
+ sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL;
- nValue = (INT16) mpWindow->GetZoom();
+ nValue = (sal_Int16) mpWindow->GetZoom();
// Zoom auf Seitengroesse ?
if( mpViewShell && mpViewShell->ISA( DrawViewShell ) &&
@@ -138,8 +138,8 @@ void FuScale::DoExecute( SfxRequest& rReq )
if( pDlg )
{
- pDlg->SetLimits( (USHORT)mpWindow->GetMinZoom(), (USHORT)mpWindow->GetMaxZoom() );
- USHORT nResult = pDlg->Execute();
+ pDlg->SetLimits( (sal_uInt16)mpWindow->GetMinZoom(), (sal_uInt16)mpWindow->GetMaxZoom() );
+ sal_uInt16 nResult = pDlg->Execute();
switch( nResult )
{
case RET_CANCEL:
@@ -202,7 +202,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
}
else if(mpViewShell && (pArgs->Count () == 1))
{
- SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, FALSE);
+ SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, sal_False);
mpViewShell->SetZoom (pScale->GetValue ());
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom );
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index f5e65b8a1e8a..88766bc38e2b 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -53,7 +53,7 @@ class SfxRequest;
namespace sd {
-static USHORT SidArraySpell[] = {
+static sal_uInt16 SidArraySpell[] = {
SID_DRAWINGMODE,
SID_OUTLINEMODE,
SID_DIAMODE,
@@ -77,7 +77,7 @@ FuSearch::FuSearch (
SfxRequest& rReq )
: FuPoor(pViewSh, pWin, pView, pDoc, rReq),
pSdOutliner(NULL),
- bOwnOutliner(FALSE)
+ bOwnOutliner(sal_False)
{
}
@@ -94,12 +94,12 @@ void FuSearch::DoExecute( SfxRequest& )
if ( mpViewShell->ISA(DrawViewShell) )
{
- bOwnOutliner = TRUE;
+ bOwnOutliner = sal_True;
pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
}
else if ( mpViewShell->ISA(OutlineViewShell) )
{
- bOwnOutliner = FALSE;
+ bOwnOutliner = sal_False;
pSdOutliner = mpDoc->GetOutliner();
}
@@ -145,7 +145,7 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem )
{
pSdOutliner->EndSpelling();
- bOwnOutliner = TRUE;
+ bOwnOutliner = sal_True;
pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
pSdOutliner->PrepareSpelling();
}
@@ -154,14 +154,14 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem )
pSdOutliner->EndSpelling();
delete pSdOutliner;
- bOwnOutliner = FALSE;
+ bOwnOutliner = sal_False;
pSdOutliner = mpDoc->GetOutliner();
pSdOutliner->PrepareSpelling();
}
if (pSdOutliner)
{
- BOOL bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem);
+ sal_Bool bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem);
if (bEndSpelling)
{
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index a2836ae0661a..48d81f5388fa 100644..100755
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -104,12 +104,12 @@ FuSelection::FuSelection (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuDraw(pViewSh, pWin, pView, pDoc, rReq),
- bTempRotation(FALSE),
- bSelectionChanged(FALSE),
- bHideAndAnimate(FALSE),
+ bTempRotation(sal_False),
+ bSelectionChanged(sal_False),
+ bHideAndAnimate(sal_False),
pHdl(NULL),
- bSuppressChangesOfSelection(FALSE),
- bMirrorSide0(FALSE),
+ bSuppressChangesOfSelection(sal_False),
+ bMirrorSide0(sal_False),
nEditMode(SID_BEZIER_MOVE),
pWaterCanCandidate(NULL)
{
@@ -153,38 +153,38 @@ FuSelection::~FuSelection()
|*
\************************************************************************/
-BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
// Hack fuer #?????#
- bHideAndAnimate = FALSE;
+ bHideAndAnimate = sal_False;
pHdl = NULL;
- BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
- BOOL bWaterCan = SD_MOD()->GetWaterCan();
+ sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
+ sal_Bool bWaterCan = SD_MOD()->GetWaterCan();
const bool bReadOnly = mpDocSh->IsReadOnly();
// When the right mouse button is pressed then only select objects
// (and deselect others) as a preparation for showing the context
// menu.
const bool bSelectionOnly = rMEvt.IsRight();
- bMBDown = TRUE;
- bSelectionChanged = FALSE;
+ bMBDown = sal_True;
+ bSelectionChanged = sal_False;
if ( mpView->IsAction() )
{
if ( rMEvt.IsRight() )
mpView->BckAction();
- return TRUE;
+ return sal_True;
}
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
// The following code is executed for right clicks as well as for left
// clicks in order to modify the selection for the right button as a
// preparation for the context menu. The functions BegMarkObject() and
// BegDragObject(), however, are not called for right clicks because a)
- // it makes no sense and b) to have IsAction() return FALSE when called
+ // it makes no sense and b) to have IsAction() return sal_False when called
// from Command() which is a prerequisite for the context menu.
if ((rMEvt.IsLeft() || rMEvt.IsRight())
&& !mpView->IsAction()
@@ -201,7 +201,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
long nAngle0 = GetAngle(aMDPos - mpView->GetRef1());
nAngle0 -= 27000;
nAngle0 = NormAngle360(nAngle0);
- bMirrorSide0 = BOOL (nAngle0 < 18000L);
+ bMirrorSide0 = sal_Bool (nAngle0 < 18000L);
if (!pHdl && mpView->Is3DRotationCreationActive())
{
@@ -209,23 +209,23 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
* Wenn 3D-Rotationskoerper erstellt werden sollen, jetzt
* die Erstellung beenden
******************************************************************/
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
if(mpWindow)
mpWindow->EnterWait();
mpView->End3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
mpView->ResetCreationActive();
if(mpWindow)
mpWindow->LeaveWait();
}
- BOOL bTextEdit = FALSE;
+ sal_Bool bTextEdit = sal_False;
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) )
{
- bTextEdit = TRUE;
+ bTextEdit = sal_True;
}
if(!bTextEdit
@@ -248,24 +248,24 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
else
{
// Handle oder markiertes Objekt getroffen
- bFirstMouseMove = TRUE;
+ bFirstMouseMove = sal_True;
aDragTimer.Start();
}
if ( ! rMEvt.IsRight())
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
- bReturn = TRUE;
+ bReturn = sal_True;
}
else
{
if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO))
{
mpView->BegMacroObj(aMDPos, nHitLog, pObj, pPV, mpWindow);
- bReturn = TRUE;
+ bReturn = sal_True;
}
else if ( bTextEdit )
{
- UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
+ sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
if (aVEvt.pObj->GetObjInventor() == SdrInventor &&
(nSdrObjKind == OBJ_TEXT ||
@@ -290,7 +290,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
mpWindow->ReleaseMouse();
SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL());
SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
mpWindow->ReleaseMouse();
@@ -308,7 +308,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
&aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
else if(!rMEvt.IsMod2()
&& mpViewShell->ISA(DrawViewShell)
@@ -348,7 +348,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
// New: double click on empty space/on obj on MasterPage, leave group
mpView->LeaveOneGroup();
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
}
@@ -367,8 +367,8 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- bReturn = TRUE;
- BOOL bDeactivateOLE = FALSE;
+ bReturn = sal_True;
+ sal_Bool bDeactivateOLE = sal_False;
if ( !rMEvt.IsShift() && !rMEvt.IsMod2() )
{
@@ -379,13 +379,13 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if (pIPClient && pIPClient->IsObjectInPlaceActive())
{
// OLE-Objekt wird im nachfolgenden UnmarkAll() deaktiviert
- bDeactivateOLE = TRUE;
+ bDeactivateOLE = sal_True;
}
mpView->UnmarkAll();
}
- BOOL bMarked = FALSE;
+ sal_Bool bMarked = sal_False;
if ( !rMEvt.IsMod1() && !bDeactivateOLE)
{
@@ -395,15 +395,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- BOOL bToggle = FALSE;
+ sal_Bool bToggle = sal_False;
if (rMEvt.IsShift() && mpView->GetMarkedObjectList().GetMarkCount() > 1)
{
// Bei Einfachselektion kein Toggle
- bToggle = TRUE;
+ bToggle = sal_True;
}
- bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, FALSE);
+ bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, sal_False);
}
}
@@ -431,6 +431,12 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
mpView->BegMarkObj(aMDPos);
}
}
+
+ if( bMarked && bTempRotation && (nSlotId == SID_OBJECT_ROTATE) && !rMEvt.IsShift() && (rMEvt.GetClicks() != 2) )
+ {
+ nSlotId = SID_OBJECT_SELECT;
+ Activate();
+ }
}
}
}
@@ -532,7 +538,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
mpView->UnmarkAllObj();
}
- BOOL bMarked = FALSE;
+ sal_Bool bMarked = sal_False;
if (!rMEvt.IsMod1())
{
@@ -542,7 +548,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), FALSE);
+ bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_False);
}
}
@@ -591,15 +597,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuSelection::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuDraw::MouseMove(rMEvt);
+ sal_Bool bReturn = FuDraw::MouseMove(rMEvt);
if (aDragTimer.IsActive())
{
if(bFirstMouseMove)
{
- bFirstMouseMove = FALSE;
+ bFirstMouseMove = sal_False;
}
else
{
@@ -635,9 +641,9 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
// When the right mouse button is pressed then only select objects
// (and deselect others) as a preparation for showing the context
// menu.
@@ -646,24 +652,24 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if (bHideAndAnimate)
{
// Animation laeuft noch -> sofort returnieren
- bHideAndAnimate = FALSE;
+ bHideAndAnimate = sal_False;
pHdl = NULL;
mpWindow->ReleaseMouse();
- return(TRUE);
+ return(sal_True);
}
if (aDragTimer.IsActive() )
{
aDragTimer.Stop();
- bIsInDragMode = FALSE;
+ bIsInDragMode = sal_False;
}
if( !mpView )
- return (FALSE);
+ return (sal_False);
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
if (mpView->IsFrameDragSingles() || !mpView->HasMarkablePoints())
{
@@ -676,11 +682,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
* Objekt wurde verschoben
******************************************************************/
FrameView* pFrameView = mpViewShell->GetFrameView();
- BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
+ sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE);
+ bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -697,7 +703,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
* Toggle zw. Selektion und Rotation
**************************************************************/
SdrObject* pSingleObj = NULL;
- ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
+ sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
if (nMarkCount==1)
{
@@ -706,13 +712,15 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if (nSlotId == SID_OBJECT_SELECT
&& mpView->IsRotateAllowed()
+
+ && (rMEvt.GetClicks() != 2)
&& (mpViewShell->GetFrameView()->IsClickChangeRotation()
|| (pSingleObj
&& pSingleObj->GetObjInventor()==E3dInventor))
&& ! bSelectionOnly)
{
- bTempRotation = TRUE;
+ bTempRotation = sal_True;
nSlotId = SID_OBJECT_ROTATE;
Activate();
}
@@ -726,9 +734,9 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
if (!pHdl)
{
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
mpView->Start3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
}
else if (pHdl->GetKind() != HDL_MIRX &&
pHdl->GetKind() != HDL_REF1 &&
@@ -741,15 +749,15 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
long nAngle1 = GetAngle(aPnt - mpView->GetRef1());
nAngle1 -= 27000;
nAngle1 = NormAngle360(nAngle1);
- BOOL bMirrorSide1 = BOOL (nAngle1 < 18000L);
+ sal_Bool bMirrorSide1 = sal_Bool (nAngle1 < 18000L);
if (bMirrorSide0 != bMirrorSide1)
{
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
if(mpWindow)
mpWindow->EnterWait();
mpView->End3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
nSlotId = SID_OBJECT_SELECT;
if(mpWindow)
mpWindow->LeaveWait();
@@ -799,7 +807,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoGeoObject(*pWaterCanCandidate));
mpView->AddUndo(pUndoAttr);
- pWaterCanCandidate->SetStyleSheet (pStyleSheet, FALSE);
+ pWaterCanCandidate->SetStyleSheet (pStyleSheet, sal_False);
mpView->EndUndo();
}
@@ -811,7 +819,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
// one now.
}
- USHORT nClicks = rMEvt.GetClicks();
+ sal_uInt16 nClicks = rMEvt.GetClicks();
if (nClicks == 2 && rMEvt.IsLeft() && bMBDown &&
!rMEvt.IsMod1() && !rMEvt.IsShift() )
@@ -819,13 +827,13 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
DoubleClick(rMEvt);
}
- bMBDown = FALSE;
+ bMBDown = sal_False;
ForcePointer(&rMEvt);
pHdl = NULL;
mpWindow->ReleaseMouse();
SdrObject* pSingleObj = NULL;
- ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
+ sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
if (nMarkCount==1)
{
@@ -841,7 +849,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
(pSingleObj->GetObjInventor() != SdrInventor ||
pSingleObj->GetObjIdentifier() == OBJ_MEASURE) ) )
{
- bReturn = TRUE;
+ bReturn = sal_True;
ForcePointer(&rMEvt);
pHdl = NULL;
mpWindow->ReleaseMouse();
@@ -866,11 +874,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
else if ( mpView->IsDragObj() )
{
FrameView* pFrameView = mpViewShell->GetFrameView();
- BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
+ sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE);
+ bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -880,7 +888,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
mpView->EndAction();
- USHORT nDrgLog2 = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog2 = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
if (Abs(aMDPos.X() - aPos.X()) < nDrgLog2 &&
@@ -903,7 +911,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog)
{
// Gruppe betreten
- mpView->MarkObj(aPnt, nHitLog, FALSE, rMEvt.IsMod1());
+ mpView->MarkObj(aPnt, nHitLog, sal_False, rMEvt.IsMod1());
}
@@ -921,14 +929,14 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuSelection::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
switch (rKEvt.GetKeyCode().GetCode())
{
@@ -975,7 +983,7 @@ void FuSelection::Activate()
// (gemapter) Slot wird explizit auf Rotate gesetzt
if( mpViewShell->ISA(DrawViewShell) )
{
- USHORT* pSlotArray =
+ sal_uInt16* pSlotArray =
static_cast<DrawViewShell*>(mpViewShell)->GetSlotArray();
pSlotArray[ 1 ] = SID_OBJECT_ROTATE;
}
@@ -1071,7 +1079,7 @@ void FuSelection::Activate()
case SID_CONVERT_TO_3D_LATHE:
{
eMode = SDRDRAG_MIRROR;
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
if ( mpView->GetDragMode() != eMode )
mpView->SetDragMode(eMode);
@@ -1079,7 +1087,7 @@ void FuSelection::Activate()
if (!mpView->Is3DRotationCreationActive())
mpView->Start3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
}
break;
@@ -1095,7 +1103,7 @@ void FuSelection::Activate()
if (nSlotId != SID_OBJECT_ROTATE)
{
- bTempRotation = FALSE;
+ bTempRotation = sal_False;
}
FuDraw::Activate();
@@ -1123,7 +1131,7 @@ void FuSelection::Deactivate()
void FuSelection::SelectionHasChanged()
{
- bSelectionChanged = TRUE;
+ bSelectionChanged = sal_True;
FuDraw::SelectionHasChanged();
@@ -1146,17 +1154,17 @@ void FuSelection::SelectionHasChanged()
|*
\************************************************************************/
-void FuSelection::SetEditMode(USHORT nMode)
+void FuSelection::SetEditMode(sal_uInt16 nMode)
{
nEditMode = nMode;
if (nEditMode == SID_BEZIER_INSERT)
{
- mpView->SetInsObjPointMode(TRUE);
+ mpView->SetInsObjPointMode(sal_True);
}
else
{
- mpView->SetInsObjPointMode(FALSE);
+ mpView->SetInsObjPointMode(sal_False);
}
ForcePointer();
@@ -1172,11 +1180,11 @@ void FuSelection::SetEditMode(USHORT nMode)
|*
\************************************************************************/
-BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
+sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
- BOOL bAnimated = FALSE;
- BOOL bClosed = pObj->IsClosedObj();
- BOOL bFilled = FALSE;
+ sal_Bool bAnimated = sal_False;
+ sal_Bool bClosed = pObj->IsClosedObj();
+ sal_Bool bFilled = sal_False;
if (bClosed)
{
@@ -1189,7 +1197,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
}
const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers();
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
const long n2HitLog = nHitLog * 2;
Point aHitPosR(rPos);
Point aHitPosL(rPos);
@@ -1220,13 +1228,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
mpWindow->ReleaseMouse();
pFrame->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
&aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
}
else if (!mpDocSh->ISA(GraphicDocShell) &&
@@ -1248,7 +1256,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark());
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1262,13 +1270,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
SfxStringItem aStrItem(SID_FILE_NAME, sBookmark);
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
pFrame->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
&aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
}
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1279,7 +1287,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1290,7 +1298,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1301,7 +1309,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1312,7 +1320,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1327,7 +1335,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
(void)e;
}
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1335,9 +1343,9 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
// Verb zuweisen
mpView->UnmarkAll();
- mpView->MarkObj(pObj, mpView->GetSdrPageView(), FALSE, FALSE);
+ mpView->MarkObj(pObj, mpView->GetSdrPageView(), sal_False, sal_False);
pDrViewSh->DoVerb((sal_Int16)pInfo->mnVerb);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1351,7 +1359,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
if( INET_PROT_FILE == aURL.GetProtocol() )
{
SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
- SfxBoolItem aBrowsing( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowsing( SID_BROWSE, sal_True );
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if (pViewFrm)
@@ -1362,7 +1370,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
0L );
}
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1383,17 +1391,17 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
*pInArgs, aRet, aOutArgsIndex, aOutArgs);
// Check the return value from the script
- BOOL bTmp = sal_False;
+ sal_Bool bTmp = sal_False;
if ( eErr == ERRCODE_NONE &&
aRet.getValueType() == getCppuBooleanType() &&
sal_True == ( aRet >>= bTmp ) &&
- bTmp == TRUE )
+ bTmp == sal_True )
{
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
else
{
- bAnimated = FALSE;
+ bAnimated = sal_False;
}
}
else
@@ -1422,7 +1430,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
default:
{
- bAnimated = FALSE;
+ bAnimated = sal_False;
}
break;
}
@@ -1446,7 +1454,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
break;
default:
- bAnimated = FALSE;
+ bAnimated = sal_False;
break;
}
}
@@ -1484,7 +1492,7 @@ SdrObject* FuSelection::pickObject (const Point& rTestPoint)
{
SdrObject* pObject = NULL;
SdrPageView* pPageView;
- USHORT nHitLog = USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width());
+ sal_uInt16 nHitLog = sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width());
mpView->PickObj (rTestPoint, nHitLog, pObject, pPageView, SDRSEARCH_PICKMARKABLE);
return pObject;
}
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 4859e09f13f8..0111a9d2c9b9 100644..100755
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -90,7 +90,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
for( nPage = mpDoc->GetSdPageCount( PK_STANDARD ) - 1L; nPage >= 0L; nPage-- )
{
- pPage = mpDoc->GetSdPage( (USHORT) nPage, PK_STANDARD );
+ pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PK_STANDARD );
String* pStr = new String( pPage->GetName() );
if ( !pStr->Len() )
@@ -99,7 +99,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
(*pStr).Append( UniString::CreateFromInt32( nPage + 1 ) );
}
- aPageNameList.Insert( pStr, (ULONG) 0 );
+ aPageNameList.Insert( pStr, (sal_uLong) 0 );
// ist dies unsere (vorhandene) erste Seite?
if ( rPresPage == *pStr )
@@ -109,7 +109,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
}
List* pCustomShowList = mpDoc->GetCustomShowList(); // No Create
- BOOL bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage();
+ sal_Bool bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage();
/* change in behaviour, even when always start with current page is enabled, range settings are
still used
if( bStartWithActualPage )
@@ -147,7 +147,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
rtl::OUString aPage;
long nValue32;
sal_Bool bValue;
- bool bValuesChanged = FALSE;
+ bool bValuesChanged = sal_False;
pDlg->GetAttr( aDlgSet );
@@ -253,7 +253,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
// wenn sich etwas geaendert hat, setzen wir das Modified-Flag,
if ( bValuesChanged )
- mpDoc->SetChanged( TRUE );
+ mpDoc->SetChanged( sal_True );
}
delete pDlg;
// Strings aus Liste loeschen
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 015e72193d7e..8004421d7708 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -74,14 +74,14 @@ FunctionReference FuSnapLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::
void FuSnapLine::DoExecute( SfxRequest& rReq )
{
const SfxItemSet* pArgs = rReq.GetArgs();
- USHORT nHelpLine = 0;
- BOOL bCreateNew = TRUE;
+ sal_uInt16 nHelpLine = 0;
+ sal_Bool bCreateNew = sal_True;
// Get index of snap line or snap point from the request.
- SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, FALSE);
+ SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, sal_False);
if (pHelpLineIndex != NULL)
{
- nHelpLine = static_cast<USHORT>(pHelpLineIndex->GetValue());
+ nHelpLine = static_cast<sal_uInt16>(pHelpLineIndex->GetValue());
// Reset the argument pointer to trigger the display of the dialog.
pArgs = NULL;
}
@@ -100,13 +100,13 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
// request. Determine it from the mouse position.
aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos();
- static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( FALSE );
+ static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( sal_False );
if ( aLinePos.X() >= 0 )
{
aLinePos = mpWindow->PixelToLogic(aLinePos);
- USHORT nHitLog = (USHORT) mpWindow->PixelToLogic(Size(HITPIX,0)).Width();
+ sal_uInt16 nHitLog = (sal_uInt16) mpWindow->PixelToLogic(Size(HITPIX,0)).Width();
bLineExist = mpView->PickHelpLine(aLinePos, nHitLog, *mpWindow, nHelpLine, pPV);
if ( bLineExist )
aLinePos = (pPV->GetHelpLines())[nHelpLine].GetPos();
@@ -143,23 +143,23 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
if ( rHelpLine.GetKind() == SDRHELPLINE_POINT )
{
pDlg->SetText(String(SdResId(STR_SNAPDLG_SETPOINT)));
- pDlg->SetInputFields(TRUE, TRUE);
+ pDlg->SetInputFields(sal_True, sal_True);
}
else
{
pDlg->SetText(String(SdResId(STR_SNAPDLG_SETLINE)));
if ( rHelpLine.GetKind() == SDRHELPLINE_VERTICAL )
- pDlg->SetInputFields(TRUE, FALSE);
+ pDlg->SetInputFields(sal_True, sal_False);
else
- pDlg->SetInputFields(FALSE, TRUE);
+ pDlg->SetInputFields(sal_False, sal_True);
}
- bCreateNew = FALSE;
+ bCreateNew = sal_False;
}
else
pDlg->HideDeleteBtn();
- USHORT nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
pDlg->GetAttr(aNewAttr);
delete pDlg;
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index ace7e51524b2..00e845d42e65 100644..100755
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -81,10 +81,10 @@ void FuSummaryPage::DoExecute( SfxRequest& )
{
::sd::Outliner* pOutl = NULL;
SdPage* pSummaryPage = NULL;
- USHORT i = 0;
- USHORT nFirstPage = SDRPAGE_NOTFOUND;
- USHORT nSelectedPages = 0;
- USHORT nCount = mpDoc->GetSdPageCount(PK_STANDARD);
+ sal_uInt16 i = 0;
+ sal_uInt16 nFirstPage = SDRPAGE_NOTFOUND;
+ sal_uInt16 nSelectedPages = 0;
+ sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD);
while (i < nCount && nSelectedPages <= 1)
{
@@ -139,7 +139,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
// Seite mit Titel & Gliederung!
- pSummaryPage = (SdPage*) mpDoc->AllocPage(FALSE);
+ pSummaryPage = (SdPage*) mpDoc->AllocPage(sal_False);
pSummaryPage->SetSize(pActualPage->GetSize() );
pSummaryPage->SetBorder(pActualPage->GetLftBorder(),
pActualPage->GetUppBorder(),
@@ -154,12 +154,12 @@ void FuSummaryPage::DoExecute( SfxRequest& )
// MasterPage der aktuellen Seite verwenden
pSummaryPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage());
pSummaryPage->SetLayoutName(pActualPage->GetLayoutName());
- pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, TRUE);
+ pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True);
pSummaryPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings());
// Notiz-Seite
- SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(FALSE);
+ SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False);
pNotesPage->SetSize(pActualNotesPage->GetSize());
pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(),
pActualNotesPage->GetUppBorder(),
@@ -176,13 +176,13 @@ void FuSummaryPage::DoExecute( SfxRequest& )
// MasterPage der aktuellen Seite verwenden
pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage());
pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName());
- pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), TRUE);
+ pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True);
pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
pNotesPage->setHeaderFooterSettings(pActualNotesPage->getHeaderFooterSettings());
pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT );
- pOutl->SetUpdateMode(FALSE);
- pOutl->EnableUndo(FALSE);
+ pOutl->SetUpdateMode(sal_False);
+ pOutl->EnableUndo(sal_False);
if (mpDocSh)
pOutl->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh ));
@@ -209,9 +209,9 @@ void FuSummaryPage::DoExecute( SfxRequest& )
// Harte Absatz- und Zeichenattribute entfernen
SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END);
- ULONG nParaCount = pOutl->GetParagraphCount();
+ sal_uLong nParaCount = pOutl->GetParagraphCount();
- for (USHORT nPara = 0; nPara < nParaCount; nPara++)
+ for (sal_uInt16 nPara = 0; nPara < nParaCount; nPara++)
{
pOutl->SetStyleSheet( nPara, pStyle );
pOutl->QuickRemoveCharAttribs(nPara);
@@ -220,9 +220,9 @@ void FuSummaryPage::DoExecute( SfxRequest& )
}
pTextObj->SetOutlinerParaObject( pOutl->CreateParaObject() );
- pTextObj->SetEmptyPresObj(FALSE);
+ pTextObj->SetEmptyPresObj(sal_False);
- // Harte Attribute entfernen (Flag auf TRUE)
+ // Harte Attribute entfernen (Flag auf sal_True)
SfxItemSet aAttr(mpDoc->GetPool());
aAttr.Put(XLineStyleItem(XLINE_NONE));
aAttr.Put(XFillStyleItem(XFILL_NONE));
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 79d7b8e1f9aa..ed7e848dc734 100644..100755
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -55,7 +55,7 @@
#include <svx/xlndsit.hxx>
#include <svx/xlnstit.hxx>
#include <svx/xlnedit.hxx>
-
+#include "app.hrc"
#include "stlsheet.hxx"
#include "sdpage.hxx"
#include "stlpool.hxx"
@@ -115,22 +115,22 @@ FunctionReference FuTemplate::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::
void FuTemplate::DoExecute( SfxRequest& rReq )
{
const SfxItemSet* pArgs = rReq.GetArgs();
- USHORT nSId = rReq.GetSlot();
+ sal_uInt16 nSId = rReq.GetSlot();
// StyleSheet-Parameter holen
SfxStyleSheetBasePool* pSSPool = mpDoc->GetDocSh()->GetStyleSheetPool();
SfxStyleSheetBase* pStyleSheet = NULL;
const SfxPoolItem* pItem;
- USHORT nFamily = USHRT_MAX;
+ sal_uInt16 nFamily = USHRT_MAX;
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY,
- FALSE, &pItem ))
+ sal_False, &pItem ))
{
nFamily = ( (const SfxUInt16Item &) pArgs->Get( SID_STYLE_FAMILY ) ).GetValue();
}
else
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME,
- FALSE, &pItem ))
+ sal_False, &pItem ))
{
String sFamily = ( (const SfxStringItem &) pArgs->Get( SID_STYLE_FAMILYNAME ) ).GetValue();
if (sFamily.CompareToAscii("graphics") == COMPARE_EQUAL)
@@ -140,7 +140,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
String aStyleName;
- USHORT nRetMask = 0xffff;
+ sal_uInt16 nRetMask = 0xffff;
switch( nSId )
{
@@ -204,7 +204,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
// Z.Z. geht immer noch der Dialog auf, um den Namen
// der Vorlage einzugeben.
- if( mpView->AreObjectsMarked() || TRUE )
+ if( mpView->AreObjectsMarked() || sal_True )
{
SfxStyleSheetBase *p = pSSPool->Find(aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_ALL );
if(p)
@@ -227,12 +227,12 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( pStyleSheet )
{
pSSPool->Remove( pStyleSheet );
- nRetMask = TRUE;
- mpDoc->SetChanged(TRUE);
+ nRetMask = sal_True;
+ mpDoc->SetChanged(sal_True);
}
else
{
- nRetMask = FALSE;
+ nRetMask = sal_False;
}
break;
@@ -259,7 +259,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
(pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) )
{
mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet);
- mpDoc->SetChanged(TRUE);
+ mpDoc->SetChanged(sal_True);
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
@@ -275,7 +275,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( pArgs->GetItemState( nSId ) == SFX_ITEM_SET )
{
aStyleName = ( ( (const SfxStringItem &) pArgs->Get( nSId ) ).GetValue() );
- SD_MOD()->SetWaterCan( TRUE );
+ SD_MOD()->SetWaterCan( sal_True );
pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily);
}
// keine Praesentationsobjektvorlagen, die werden nur
@@ -290,11 +290,11 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
else
- SD_MOD()->SetWaterCan( FALSE );
+ SD_MOD()->SetWaterCan( sal_False );
}
else
{
- SD_MOD()->SetWaterCan( FALSE );
+ SD_MOD()->SetWaterCan( sal_False );
// Werkzeugleiste muss wieder enabled werden
mpViewShell->Invalidate();
}
@@ -317,7 +317,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
SfxAbstractTabDialog* pStdDlg = NULL;
SfxAbstractTabDialog* pPresDlg = NULL;
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- BOOL bOldDocInOtherLanguage = FALSE;
+ sal_Bool bOldDocInOtherLanguage = sal_False;
SfxItemSet aOriSet( pStyleSheet->GetItemSet() );
SfxStyleFamily eFamily = pStyleSheet->GetFamily();
@@ -329,7 +329,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
else if (eFamily == SD_STYLE_FAMILY_PSEUDO)
{
String aName(pStyleSheet->GetName());
- USHORT nDlgId = 0;
+ sal_uInt16 nDlgId = 0;
if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE)))
{
@@ -368,7 +368,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
// die Nummer ermitteln; ein Leerzeichen zwischen
// Name und Nummer beachten
String aNumStr(aName.Copy(aOutlineStr.Len() + 1));
- USHORT nLevel = (USHORT)aNumStr.ToInt32();
+ sal_uInt16 nLevel = (sal_uInt16)aNumStr.ToInt32();
switch (nLevel)
{
case 1: ePO = PO_OUTLINE_1; break;
@@ -385,7 +385,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
else
{
OSL_FAIL("Vorlage aus aelterer anderssprachiger Version");
- bOldDocInOtherLanguage = TRUE;
+ bOldDocInOtherLanguage = sal_True;
}
if( !bOldDocInOtherLanguage )
@@ -397,7 +397,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
}
- USHORT nResult = RET_CANCEL;
+ sal_uInt16 nResult = RET_CANCEL;
const SfxItemSet* pOutSet = NULL;
if (pStdDlg)
{
@@ -458,7 +458,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) )
{
- for( USHORT n = (USHORT)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ )
+ for( sal_uInt16 n = (sal_uInt16)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ )
{
String aName( sStyleName );
aName.Append( String::CreateFromInt32( (sal_Int32) n ));
@@ -622,16 +622,16 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( mpDoc->GetOnlineSpell() )
{
const SfxPoolItem* pTempItem;
- if( SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE, FALSE, &pTempItem ) ||
- SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CJK, FALSE, &pTempItem ) ||
- SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CTL, FALSE, &pTempItem ) )
+ if( SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE, sal_False, &pTempItem ) ||
+ SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CJK, sal_False, &pTempItem ) ||
+ SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CTL, sal_False, &pTempItem ) )
{
mpDoc->StopOnlineSpelling();
mpDoc->StartOnlineSpelling();
}
}
- mpDoc->SetChanged(TRUE);
+ mpDoc->SetChanged(sal_True);
}
break;
@@ -656,7 +656,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
nRetMask = pStyleSheet->GetMask();
SfxItemSet aCoreSet( mpDoc->GetPool() );
- mpView->GetAttributes( aCoreSet, TRUE );
+ mpView->GetAttributes( aCoreSet, sal_True );
// wenn das Objekt eine Vorlage hatte, wird diese Parent
// der neuen Vorlage
@@ -682,7 +682,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
- mpDoc->SetChanged(TRUE);
+ mpDoc->SetChanged(sal_True);
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
@@ -709,7 +709,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet);
( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
- mpDoc->SetChanged(TRUE);
+ mpDoc->SetChanged(sal_True);
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 688b93887ffe..05ae15a565a3 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -88,7 +88,7 @@ using namespace ::com::sun::star::linguistic2;
namespace sd {
-static USHORT SidArray[] = {
+static sal_uInt16 SidArray[] = {
SID_STYLE_FAMILY2, // 5542
SID_STYLE_FAMILY5, // 5545
SID_CUT, // 5710
@@ -129,7 +129,7 @@ static USHORT SidArray[] = {
TYPEINIT1( FuText, FuConstruct );
-static BOOL bTestText = 0;
+static sal_Bool bTestText = 0;
/*************************************************************************
|*
@@ -139,7 +139,7 @@ static BOOL bTestText = 0;
FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
: FuConstruct(pViewSh, pWin, pView, pDoc, rReq)
-, bFirstObjCreated(FALSE)
+, bFirstObjCreated(sal_False)
, rRequest (rReq)
{
}
@@ -160,7 +160,7 @@ void FuText::disposing()
{
if(mpView)
{
- if(mpView->SdrEndTextEdit(FALSE) == SDRENDTEXTEDIT_DELETED)
+ if(mpView->SdrEndTextEdit(sal_False) == SDRENDTEXTEDIT_DELETED)
mxTextObj.reset( 0 );
// die RequestHandler der benutzten Outliner zuruecksetzen auf den
@@ -233,7 +233,7 @@ void FuText::DoExecute( SfxRequest& )
}
}
- BOOL bQuickDrag = TRUE;
+ sal_Bool bQuickDrag = sal_True;
const SfxItemSet* pArgs = rRequest.GetArgs();
@@ -243,10 +243,10 @@ void FuText::DoExecute( SfxRequest& )
&& SID_TEXTEDIT == nSlotId
&& SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT)
- && (UINT16)((SfxUInt16Item&)pArgs->Get(SID_TEXTEDIT)).GetValue() == 2)
+ && (sal_uInt16)((SfxUInt16Item&)pArgs->Get(SID_TEXTEDIT)).GetValue() == 2)
{
// Selection by doubleclick -> don't allow QuickDrag
- bQuickDrag = FALSE;
+ bQuickDrag = sal_False;
}
SetInEditMode(aMEvt, bQuickDrag);
@@ -258,13 +258,13 @@ void FuText::DoExecute( SfxRequest& )
|*
\************************************************************************/
-BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
- bMBDown = TRUE;
+ bMBDown = sal_True;
- BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
+ sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
- mpView->SetMarkHdlWhenTextEdit(TRUE);
+ mpView->SetMarkHdlWhenTextEdit(sal_True);
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -272,7 +272,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
// Text getroffen -> Event von SdrView auswerten lassen
if (mpView->MouseButtonDown(rMEvt, mpWindow))
- return (TRUE);
+ return (sal_True);
}
if (rMEvt.GetClicks() == 1)
@@ -306,16 +306,16 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
if (eHit == SDRHIT_TEXTEDIT)
{
- SetInEditMode(rMEvt, FALSE);
+ SetInEditMode(rMEvt, sal_False);
}
else
{
- BOOL bMacro = FALSE;
+ sal_Bool bMacro = sal_False;
if (bMacro && mpView->PickObj(aMDPos,mpView->getHitTolLog(),pObj,pPV,SDRSEARCH_PICKMACRO))
{
// Makro
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
mpView->BegMacroObj(aMDPos,nHitLog,pObj,pPV,mpWindow);
}
else
@@ -353,7 +353,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
mxTextObj.reset( static_cast<SdrTextObj*>(aVEvt.pObj) );
}
- SetInEditMode(rMEvt, TRUE);
+ SetInEditMode(rMEvt, sal_True);
}
else if (aVEvt.eEvent == SDREVENT_EXECUTEURL && !rMEvt.IsMod2())
{
@@ -363,7 +363,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
mpWindow->ReleaseMouse();
SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL());
SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
mpWindow->ReleaseMouse();
@@ -421,7 +421,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
}
// Drag object
- bFirstMouseMove = TRUE;
+ bFirstMouseMove = sal_True;
aDragTimer.Start();
}
@@ -432,7 +432,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) )
{
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog);
}
}
@@ -447,7 +447,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
**********************************************************/
mpView->SetCurrentObj(OBJ_TEXT);
mpView->SetEditMode(SDREDITMODE_CREATE);
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog);
}
else
@@ -467,7 +467,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
else if ( rMEvt.GetClicks() == 2 && !mpView->IsTextEdit() )
{
MouseEvent aMEvt( mpWindow->GetPointerPosPixel() );
- SetInEditMode( aMEvt, FALSE );
+ SetInEditMode( aMEvt, sal_False );
}
if (!bIsInDragMode)
@@ -485,14 +485,14 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuText::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuText::MouseMove(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuDraw::MouseMove(rMEvt);
+ sal_Bool bReturn = FuDraw::MouseMove(rMEvt);
if (aDragTimer.IsActive() )
{
if( bFirstMouseMove )
- bFirstMouseMove = FALSE;
+ bFirstMouseMove = sal_False;
else
aDragTimer.Stop();
}
@@ -528,8 +528,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
// Hoehe bekommt (sonst wird zuviel gepainted)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(FALSE));
- aSet.Put(SdrTextAutoGrowHeightItem(TRUE));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
aSet.Put(SdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
@@ -539,8 +539,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
{
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
- aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
// Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
@@ -557,8 +557,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
// draw text object, needs to be initialized when vertical text is used
SfxItemSet aSet(mpViewShell->GetPool());
- aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
- aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
// Set defaults for vertical klick-n'drag text object, pool defaults are:
// SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
@@ -578,8 +578,8 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH);
SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL;
aSet.Put(SdrTextFitToSizeTypeItem(eFTS));
- aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
- aSet.Put(SdrTextAutoGrowWidthItem(FALSE));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
}
@@ -590,8 +590,8 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH);
SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL;
aSet.Put(SdrTextFitToSizeTypeItem(eFTS));
- aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
- aSet.Put(SdrTextAutoGrowWidthItem(FALSE));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
}
@@ -607,8 +607,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextMaxFrameHeightItem(0));
- aSet.Put(SdrTextAutoGrowHeightItem(TRUE));
- aSet.Put(SdrTextAutoGrowWidthItem(FALSE));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
pTxtObj->SetMergedItemSet(aSet);
}
else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
@@ -616,8 +616,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameWidthItem(0));
aSet.Put(SdrTextMaxFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
- aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
pTxtObj->SetMergedItemSet(aSet);
}
@@ -625,14 +625,14 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
}
}
-BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if (aDragTimer.IsActive())
{
aDragTimer.Stop();
- bIsInDragMode = FALSE;
+ bIsInDragMode = sal_False;
}
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
@@ -640,9 +640,9 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
if( (mpView && mpView->MouseButtonUp(rMEvt, mpWindow)) || rMEvt.GetClicks() == 2 )
- return (TRUE); // Event von der SdrView ausgewertet
+ return (sal_True); // Event von der SdrView ausgewertet
- BOOL bEmptyTextObj = FALSE;
+ sal_Bool bEmptyTextObj = sal_False;
if (mxTextObj.is())
{
@@ -652,9 +652,9 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
&& ( rMarkList.GetMark(0)->GetMarkedSdrObj() == mxTextObj.get()) )
{
if( mxTextObj.is() && !GetTextObj()->GetOutlinerParaObject() )
- bEmptyTextObj = TRUE;
+ bEmptyTextObj = sal_True;
else
- bFirstObjCreated = TRUE;
+ bFirstObjCreated = sal_True;
}
else
{
@@ -668,17 +668,28 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
* Objekt wurde verschoben
**********************************************************************/
FrameView* pFrameView = mpViewShell->GetFrameView();
- BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
+ sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE);
+ bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True);
}
mpView->SetDragWithCopy(bDragWithCopy);
mpView->EndDragObj( mpView->IsDragWithCopy() );
mpView->ForceMarkedToAnotherPage();
mpView->SetCurrentObj(OBJ_TEXT);
+
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+
+ if ( mpView->IsRotateAllowed() && mpViewShell->GetFrameView()->IsClickChangeRotation() && (rMEvt.GetClicks() != 2) &&
+ !rMEvt.IsShift() && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsRight() &&
+ Abs(aPnt.X() - aMDPos.X()) < nDrgLog &&
+ Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog)
+ {
+ // toggle to rotation mode
+ mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_ROTATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+ }
}
else if( mpView && mpView->IsCreateObj() && rMEvt.IsLeft())
{
@@ -694,7 +705,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
// vertical when there was a vertical one used last time.
OutlinerParaObject* pOPO = GetTextObj()->GetOutlinerParaObject();
SdrOutliner& rOutl = mxTextObj->GetModel()->GetDrawOutliner(GetTextObj());
- BOOL bVertical((pOPO && pOPO->IsVertical())
+ sal_Bool bVertical((pOPO && pOPO->IsVertical())
|| nSlotId == SID_ATTR_CHAR_VERTICAL
|| nSlotId == SID_TEXT_FITTOSIZE_VERTICAL);
rOutl.SetVertical(bVertical);
@@ -729,13 +740,13 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
{
ImpSetAttributesFitToSize(GetTextObj());
- SetInEditMode(rMEvt, FALSE);
+ SetInEditMode(rMEvt, sal_False);
}
else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL )
{
ImpSetAttributesFitToSizeVertical(GetTextObj());
- SetInEditMode(rMEvt, FALSE);
+ SetInEditMode(rMEvt, sal_False);
}
else
{
@@ -744,7 +755,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
// Damit die Handles und der graue Rahmen stimmen
mpView->AdjustMarkHdl();
mpView->PickHandle(aPnt);
- SetInEditMode(rMEvt, FALSE);
+ SetInEditMode(rMEvt, sal_False);
}
}
else if ( mpView && mpView->IsAction())
@@ -754,7 +765,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
ForcePointer(&rMEvt);
mpWindow->ReleaseMouse();
- USHORT nDrgLog1 = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog1 = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
if ( mpView && !mpView->AreObjectsMarked() &&
Abs(aMDPos.X() - aPnt.X()) < nDrgLog1 &&
@@ -779,13 +790,13 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
**********************************************************************/
mpView->SetCurrentObj(OBJ_TEXT);
mpView->SetEditMode(SDREDITMODE_CREATE);
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog);
- BOOL bSnapEnabled = mpView->IsSnapEnabled();
+ sal_Bool bSnapEnabled = mpView->IsSnapEnabled();
if (bSnapEnabled)
- mpView->SetSnapEnabled(FALSE);
+ mpView->SetSnapEnabled(sal_False);
aPnt.X() += nDrgLog + nDrgLog;
aPnt.Y() += nDrgLog + nDrgLog;
@@ -795,7 +806,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
if(mxTextObj.is())
{
- GetTextObj()->SetDisableAutoWidthOnDragging(TRUE);
+ GetTextObj()->SetDisableAutoWidthOnDragging(sal_True);
}
if(!mpView->EndCreateObj(SDRCREATE_FORCEEND))
@@ -811,8 +822,8 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowHeightItem(TRUE));
- aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
if(nSlotId == SID_ATTR_CHAR_VERTICAL)
{
@@ -880,11 +891,11 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
}
GetTextObj()->SetMergedItemSet(aSet);
- GetTextObj()->SetDisableAutoWidthOnDragging(TRUE);
- SetInEditMode(rMEvt, FALSE);
+ GetTextObj()->SetDisableAutoWidthOnDragging(sal_True);
+ SetInEditMode(rMEvt, sal_False);
}
- bFirstObjCreated = TRUE;
+ bFirstObjCreated = sal_True;
}
else
{
@@ -899,7 +910,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
}
}
- bMBDown = FALSE;
+ bMBDown = sal_False;
FuConstruct::MouseButtonUp(rMEvt);
return (bReturn);
}
@@ -908,18 +919,18 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
|*
\************************************************************************/
-BOOL FuText::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuText::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FALSE;
- mpView->SetMarkHdlWhenTextEdit(TRUE);
+ sal_Bool bReturn = sal_False;
+ mpView->SetMarkHdlWhenTextEdit(sal_True);
KeyCode nCode = rKEvt.GetKeyCode();
- BOOL bShift = nCode.IsShift();
+ sal_Bool bShift = nCode.IsShift();
if(mxTextObj.is())
{
@@ -942,14 +953,14 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt)
if ( mxTextObj.is() && mxTextObj->GetObjInventor() == SdrInventor && mxTextObj->GetObjIdentifier() == OBJ_TITLETEXT && rKEvt.GetKeyCode().GetCode() == KEY_RETURN )
{
// Titeltext-Objekt: immer "weiche" Umbrueche
- bShift = TRUE;
+ bShift = sal_True;
}
- USHORT nKey = nCode.GetCode();
+ sal_uInt16 nKey = nCode.GetCode();
KeyCode aKeyCode (nKey, bShift, nCode.IsMod1(), nCode.IsMod2(), nCode.IsMod3() );
KeyEvent aKEvt(rKEvt.GetCharCode(), aKeyCode);
- BOOL bOK = TRUE;
+ sal_Bool bOK = sal_True;
if (mpDocSh->IsReadOnly())
{
@@ -957,12 +968,12 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt)
}
if( aKeyCode.GetCode() == KEY_PAGEUP || aKeyCode.GetCode() == KEY_PAGEDOWN )
{
- bOK = FALSE; // default handling in base class
+ bOK = sal_False; // default handling in base class
}
if (bOK && mpView->KeyInput(aKEvt, mpWindow) )
{
- bReturn = TRUE;
+ bReturn = sal_True;
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
@@ -1039,7 +1050,7 @@ void FuText::Deactivate()
|*
\************************************************************************/
-void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
+void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag)
{
SdrPageView* pPV = mpView->GetSdrPageView();
if( mxTextObj.is() && (mxTextObj->GetPage() == pPV->GetPage()) )
@@ -1051,12 +1062,12 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
else
mpView->SetEditMode(SDREDITMODE_EDIT);
- BOOL bEmptyOutliner = FALSE;
+ sal_Bool bEmptyOutliner = sal_False;
if (!GetTextObj()->GetOutlinerParaObject() && mpView->GetTextEditOutliner())
{
::Outliner* pOutl = mpView->GetTextEditOutliner();
- ULONG nParaAnz = pOutl->GetParagraphCount();
+ sal_uLong nParaAnz = pOutl->GetParagraphCount();
Paragraph* p1stPara = pOutl->GetParagraph( 0 );
if (nParaAnz==1 && p1stPara)
@@ -1064,15 +1075,15 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
// Bei nur einem Pararaph
if (pOutl->GetText(p1stPara).Len() == 0)
{
- bEmptyOutliner = TRUE;
+ bEmptyOutliner = sal_True;
}
}
}
if (GetTextObj() != mpView->GetTextEditObject() || bEmptyOutliner)
{
- UINT32 nInv = mxTextObj->GetObjInventor();
- UINT16 nSdrObjKind = mxTextObj->GetObjIdentifier();
+ sal_uInt32 nInv = mxTextObj->GetObjInventor();
+ sal_uInt16 nSdrObjKind = mxTextObj->GetObjIdentifier();
if (nInv == SdrInventor && GetTextObj()->HasTextEdit() &&
(nSdrObjKind == OBJ_TEXT ||
@@ -1090,7 +1101,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
{
OutlinerParaObject* pOPO = pTextObj->GetOutlinerParaObject();
if( ( pOPO && pOPO->IsVertical() ) || (nSlotId == SID_ATTR_CHAR_VERTICAL) || (nSlotId == SID_TEXT_FITTOSIZE_VERTICAL) )
- pOutl->SetVertical( TRUE );
+ pOutl->SetVertical( sal_True );
if( pTextObj->getTextCount() > 1 )
{
@@ -1101,7 +1112,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, sal_True, pOutl) && mxTextObj->GetObjInventor() == SdrInventor)
{
- bFirstObjCreated = TRUE;
+ bFirstObjCreated = sal_True;
DeleteDefaultText();
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
@@ -1158,9 +1169,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
|*
\************************************************************************/
-BOOL FuText::DeleteDefaultText()
+sal_Bool FuText::DeleteDefaultText()
{
- BOOL bDeleted = FALSE;
+ sal_Bool bDeleted = sal_False;
if ( mxTextObj.is() && mxTextObj->IsEmptyPresObj() )
{
@@ -1179,21 +1190,21 @@ BOOL FuText::DeleteDefaultText()
{
::Outliner* pOutliner = mpView->GetTextEditOutliner();
SfxStyleSheet* pSheet = pOutliner->GetStyleSheet( 0 );
- BOOL bIsUndoEnabled = pOutliner->IsUndoEnabled();
+ sal_Bool bIsUndoEnabled = pOutliner->IsUndoEnabled();
if( bIsUndoEnabled )
- pOutliner->EnableUndo(FALSE);
+ pOutliner->EnableUndo(sal_False);
pOutliner->SetText( String(), pOutliner->GetParagraph( 0 ) );
if( bIsUndoEnabled )
- pOutliner->EnableUndo(TRUE);
+ pOutliner->EnableUndo(sal_True);
if (pSheet &&
(ePresObjKind == PRESOBJ_NOTES || ePresObjKind == PRESOBJ_TEXT))
pOutliner->SetStyleSheet(0, pSheet);
- mxTextObj->SetEmptyPresObj(TRUE);
- bDeleted = TRUE;
+ mxTextObj->SetEmptyPresObj(sal_True);
+ bDeleted = sal_True;
}
}
}
@@ -1207,7 +1218,7 @@ BOOL FuText::DeleteDefaultText()
|*
\************************************************************************/
-BOOL FuText::Command(const CommandEvent& rCEvt)
+sal_Bool FuText::Command(const CommandEvent& rCEvt)
{
return( FuPoor::Command(rCEvt) );
}
@@ -1218,9 +1229,9 @@ BOOL FuText::Command(const CommandEvent& rCEvt)
|*
\************************************************************************/
-BOOL FuText::RequestHelp(const HelpEvent& rHEvt)
+sal_Bool FuText::RequestHelp(const HelpEvent& rHEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
@@ -1317,7 +1328,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
}
}
- BOOL bQuickDrag = TRUE;
+ sal_Bool bQuickDrag = sal_True;
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -1327,10 +1338,10 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
&& SID_TEXTEDIT == nSlotId
&& SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT)
- && (UINT16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2)
+ && (sal_uInt16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2)
{
// Anwahl per Doppelklick -> kein QuickDrag zulassen
- bQuickDrag = FALSE;
+ bQuickDrag = sal_False;
}
SetInEditMode(aMEvt, bQuickDrag);
@@ -1347,7 +1358,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
IMPL_LINK( FuText, SpellError, void *, nLang )
{
- String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(ULONG)nLang ) );
+ String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) );
ErrorHandler::HandleError(* new StringErrorInfo(
ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) );
return 0;
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 58f88594dbda..59d495a5d95c 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -94,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
{
std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
- const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
+ const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
aCombSet.Put( aNewAttr );
aCombSet.Put( aSet );
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index d49825760570..625fd84d2e5a 100644..100755
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -79,7 +79,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView );
- USHORT nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
switch( nResult )
{
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index b01594039423..e93210ea4a5f 100644..100755
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -47,7 +47,7 @@
namespace sd {
-USHORT SidArrayZoom[] = {
+sal_uInt16 SidArrayZoom[] = {
SID_ATTR_ZOOM,
SID_ZOOM_OUT,
SID_ZOOM_IN,
@@ -68,8 +68,8 @@ FuZoom::FuZoom(
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq),
- bVisible(FALSE),
- bStartDrag(FALSE)
+ bVisible(sal_False),
+ bStartDrag(sal_False)
{
}
@@ -86,8 +86,8 @@ FuZoom::~FuZoom()
// Hide ZoomRect
mpViewShell->DrawMarkRect(aZoomRect);
- bVisible = FALSE;
- bStartDrag = FALSE;
+ bVisible = sal_False;
+ bStartDrag = sal_False;
}
}
@@ -103,18 +103,18 @@ FunctionReference FuZoom::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::
|*
\************************************************************************/
-BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
mpWindow->CaptureMouse();
- bStartDrag = TRUE;
+ bStartDrag = sal_True;
aBeginPosPix = rMEvt.GetPosPixel();
aBeginPos = mpWindow->PixelToLogic(aBeginPosPix);
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -123,7 +123,7 @@ BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuZoom::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt)
{
if (bStartDrag)
{
@@ -166,7 +166,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt)
mpViewShell->DrawMarkRect(aZoomRect);
}
- bVisible = TRUE;
+ bVisible = sal_True;
}
return bStartDrag;
@@ -178,7 +178,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -187,7 +187,7 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
{
// Hide ZoomRect
mpViewShell->DrawMarkRect(aZoomRect);
- bVisible = FALSE;
+ bVisible = sal_False;
}
Point aPosPix = rMEvt.GetPosPixel();
@@ -196,7 +196,7 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
{
// Zoom
Size aZoomSizePixel = mpWindow->LogicToPixel(aZoomRect).GetSize();
- ULONG nTol = DRGPIX + DRGPIX;
+ sal_uLong nTol = DRGPIX + DRGPIX;
if ( aZoomSizePixel.Width() < (long) nTol && aZoomSizePixel.Height() < (long) nTol )
{
@@ -218,11 +218,11 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
mpWindow->GetOutputSizePixel()));
mpViewShell->GetZoomList()->InsertZoomRect(aVisAreaWin);
- bStartDrag = FALSE;
+ bStartDrag = sal_False;
mpWindow->ReleaseMouse();
mpViewShell->Cancel();
- return TRUE;
+ return sal_True;
}
/*************************************************************************
diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx
index 6d3550965a7c..99c3b73cfab1 100644
--- a/sd/source/ui/func/sdundogr.cxx
+++ b/sd/source/ui/func/sdundogr.cxx
@@ -43,8 +43,8 @@ TYPEINIT1(SdUndoGroup, SdUndoAction);
SdUndoGroup::~SdUndoGroup()
{
- ULONG nLast = aCtn.Count();
- for (ULONG nAction = 0; nAction < nLast; nAction++)
+ sal_uLong nLast = aCtn.Count();
+ for (sal_uLong nAction = 0; nAction < nLast; nAction++)
{
delete (SdUndoAction*) aCtn.GetObject(nAction);
}
@@ -57,9 +57,9 @@ SdUndoGroup::~SdUndoGroup()
|*
\************************************************************************/
-BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction )
+sal_Bool SdUndoGroup::Merge( SfxUndoAction* pNextAction )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pNextAction && pNextAction->ISA( SdUndoAction ) )
{
@@ -68,7 +68,7 @@ BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction )
if( pClone )
{
AddAction( pClone );
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -86,7 +86,7 @@ void SdUndoGroup::Undo()
long nLast = aCtn.Count();
for (long nAction = nLast - 1; nAction >= 0; nAction--)
{
- ((SdUndoAction*)aCtn.GetObject((ULONG)nAction))->Undo();
+ ((SdUndoAction*)aCtn.GetObject((sal_uLong)nAction))->Undo();
}
}
@@ -99,8 +99,8 @@ void SdUndoGroup::Undo()
void SdUndoGroup::Redo()
{
- ULONG nLast = aCtn.Count();
- for (ULONG nAction = 0; nAction < nLast; nAction++)
+ sal_uLong nLast = aCtn.Count();
+ for (sal_uLong nAction = 0; nAction < nLast; nAction++)
{
((SdUndoAction*)aCtn.GetObject(nAction))->Redo();
}
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx
index 7743bbec6f10..586c77a0c88a 100644
--- a/sd/source/ui/func/smarttag.cxx
+++ b/sd/source/ui/func/smarttag.cxx
@@ -122,30 +122,30 @@ bool SmartTag::getContext( SdrViewContext& /*rContext*/ )
// --------------------------------------------------------------------
-ULONG SmartTag::GetMarkablePointCount() const
+sal_uLong SmartTag::GetMarkablePointCount() const
{
return 0;
}
// --------------------------------------------------------------------
-ULONG SmartTag::GetMarkedPointCount() const
+sal_uLong SmartTag::GetMarkedPointCount() const
{
return 0;
}
// --------------------------------------------------------------------
-BOOL SmartTag::MarkPoint(SdrHdl& /*rHdl*/, BOOL /*bUnmark*/ )
+sal_Bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ )
{
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
-BOOL SmartTag::MarkPoints(const Rectangle* /*pRect*/, BOOL /*bUnmark*/ )
+sal_Bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ )
{
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
@@ -369,14 +369,14 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const
// support point editing
// --------------------------------------------------------------------
-BOOL SmartTagSet::HasMarkablePoints() const
+sal_Bool SmartTagSet::HasMarkablePoints() const
{
- return GetMarkablePointCount() != 0 ? TRUE : FALSE;
+ return GetMarkablePointCount() != 0 ? sal_True : sal_False;
}
// --------------------------------------------------------------------
-ULONG SmartTagSet::GetMarkablePointCount() const
+sal_uLong SmartTagSet::GetMarkablePointCount() const
{
if( mxSelectedTag.is() )
return mxSelectedTag->GetMarkablePointCount();
@@ -385,14 +385,14 @@ ULONG SmartTagSet::GetMarkablePointCount() const
// --------------------------------------------------------------------
-BOOL SmartTagSet::HasMarkedPoints() const
+sal_Bool SmartTagSet::HasMarkedPoints() const
{
- return GetMarkedPointCount() != 0 ? TRUE : FALSE;
+ return GetMarkedPointCount() != 0 ? sal_True : sal_False;
}
// --------------------------------------------------------------------
-ULONG SmartTagSet::GetMarkedPointCount() const
+sal_uLong SmartTagSet::GetMarkedPointCount() const
{
if( mxSelectedTag.is() )
return mxSelectedTag->GetMarkedPointCount();
@@ -402,7 +402,7 @@ ULONG SmartTagSet::GetMarkedPointCount() const
// --------------------------------------------------------------------
-BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const
+sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const
{
const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl );
@@ -411,21 +411,21 @@ BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const
// --------------------------------------------------------------------
-BOOL SmartTagSet::MarkPoint(SdrHdl& rHdl, BOOL bUnmark )
+sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark )
{
if( mxSelectedTag.is() )
return mxSelectedTag->MarkPoint( rHdl, bUnmark );
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
-BOOL SmartTagSet::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
+sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
{
if( mxSelectedTag.is() )
return mxSelectedTag->MarkPoints( pRect, bUnmark );
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 059fc04751e2..7446be80bb7c 100644..100755
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -54,7 +54,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
String aTheNewLayoutName,
AutoLayout eTheOldAutoLayout,
AutoLayout eTheNewAutoLayout,
- BOOL bSet,
+ sal_Bool bSet,
SdPage* pThePage):
SdUndoAction(pTheDoc)
{
@@ -77,9 +77,9 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
void SdPresentationLayoutUndoAction::Undo()
{
- pPage->SetPresentationLayout(aOldLayoutName, TRUE, TRUE, TRUE);
+ pPage->SetPresentationLayout(aOldLayoutName, sal_True, sal_True, sal_True);
if (bSetAutoLayout)
- pPage->SetAutoLayout(eOldAutoLayout, TRUE);
+ pPage->SetAutoLayout(eOldAutoLayout, sal_True);
}
/*************************************************************************
@@ -92,7 +92,7 @@ void SdPresentationLayoutUndoAction::Redo()
{
pPage->SetPresentationLayout(aNewLayoutName);
if (bSetAutoLayout)
- pPage->SetAutoLayout(eNewAutoLayout, TRUE);
+ pPage->SetAutoLayout(eNewAutoLayout, sal_True);
}
/*************************************************************************