summaryrefslogtreecommitdiffstats
path: root/sc/source/ui/drawfunc/futext.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/drawfunc/futext.cxx')
-rw-r--r--sc/source/ui/drawfunc/futext.cxx92
1 files changed, 46 insertions, 46 deletions
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index a13cfc61d1c6..99aab320e16d 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -131,13 +131,13 @@ FuText::~FuText()
|*
\************************************************************************/
-BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
if ( pView->MouseButtonDown(rMEvt, pWindow) )
- return (TRUE); // Event von der SdrView ausgewertet
+ return (sal_True); // Event von der SdrView ausgewertet
if ( pView->IsTextEdit() )
{
@@ -152,13 +152,13 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
SdrHdl* pHdl = pView->PickHandle(aMDPos);
- ULONG nHdlNum = pView->GetHdlNum(pHdl);
+ sal_uLong nHdlNum = pView->GetHdlNum(pHdl);
if (pHdl != NULL)
{
if (pView->HasMarkablePoints() && pView->IsPointMarkable(*pHdl))
{
- BOOL bPointMarked=pView->IsPointMarked(*pHdl);
+ sal_Bool bPointMarked=pView->IsPointMarked(*pHdl);
if ( rMEvt.IsShift() )
{
@@ -198,8 +198,8 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
// vertical flag:
// deduced from slot ids only if text object has no content
- USHORT nSlotID = aSfxRequest.GetSlot();
- BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
+ sal_uInt16 nSlotID = aSfxRequest.GetSlot();
+ sal_Bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
if ( pOPO )
bVertical = pOPO->IsVertical(); // content wins
@@ -213,7 +213,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
OutlinerView* pOLV = pView->GetTextEditOutlinerView();
if ( pOLV->MouseButtonDown(rMEvt) )
- return (TRUE); // Event an den Outliner
+ return (sal_True); // Event an den Outliner
}
}
else
@@ -244,7 +244,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- BOOL bMacro = FALSE;
+ sal_Bool bMacro = sal_False;
// if (bMacro && pView->TakeMacroObject(aMDPos,pObj,pPV))
if (bMacro && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) )
@@ -256,7 +256,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
if (pView->IsEditMode())
{
- BOOL bPointMode=pView->HasMarkablePoints();
+ sal_Bool bPointMode=pView->HasMarkablePoints();
if (!rMEvt.IsShift())
{
@@ -276,7 +276,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
pHdl=pView->GetHdl(nHdlNum);
}
- if ( pView->MarkObj(aMDPos, -2, FALSE, rMEvt.IsMod1()) )
+ if ( pView->MarkObj(aMDPos, -2, sal_False, rMEvt.IsMod1()) )
{
aDragTimer.Start();
@@ -333,7 +333,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow ));
// return (bReturn);
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -342,9 +342,9 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
// pViewShell->SetActivePointer(aNewPointer);
@@ -361,7 +361,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
}
if ( pView->MouseMove(rMEvt, pWindow) )
- return (TRUE); // Event von der SdrView ausgewertet
+ return (sal_True); // Event von der SdrView ausgewertet
if ( pView->IsAction() )
{
@@ -386,12 +386,12 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if (aDragTimer.IsActive() )
{
@@ -403,7 +403,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
if ( pView->MouseButtonUp(rMEvt, pWindow) )
- return (TRUE); // Event von der SdrView ausgewertet
+ return (sal_True); // Event von der SdrView ausgewertet
if ( pView->IsDragObj() )
{
@@ -437,20 +437,20 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
SfxItemSet aItemSet( pDrDoc->GetItemPool(),
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
- aItemSet.Put( SdrTextAutoGrowWidthItem( FALSE ) );
- aItemSet.Put( SdrTextAutoGrowHeightItem( FALSE ) );
+ aItemSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
+ aItemSet.Put( SdrTextAutoGrowHeightItem( sal_False ) );
aItemSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) );
aItemSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) );
aItemSet.Put( SdrTextAniCountItem( 1 ) );
aItemSet.Put( SdrTextAniAmountItem(
- (INT16)pWindow->PixelToLogic(Size(2,1)).Width()) );
+ (sal_Int16)pWindow->PixelToLogic(Size(2,1)).Width()) );
pObj->SetMergedItemSetAndBroadcast(aItemSet);
}
}
// #93382# init object different when vertical writing
sal_uInt16 nSlotID(aSfxRequest.GetSlot());
- BOOL bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotID);
+ sal_Bool bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotID);
if(bVertical)
{
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
@@ -462,10 +462,10 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
SdrTextObj* pText = (SdrTextObj*)pObj;
SfxItemSet aSet(pDrDoc->GetItemPool());
- pText->SetVerticalWriting(TRUE);
+ pText->SetVerticalWriting(sal_True);
- aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
- aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
@@ -481,7 +481,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
if ( !pView->AreObjectsMarked() )
{
- pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1());
+ pView->MarkObj(aPnt, -2, sal_False, rMEvt.IsMod1());
SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher();
if ( pView->AreObjectsMarked() )
@@ -501,7 +501,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
if ( !pView->AreObjectsMarked() && rMEvt.GetClicks() < 2 )
{
- pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1());
+ pView->MarkObj(aPnt, -2, sal_False, rMEvt.IsMod1());
SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher();
if ( pView->AreObjectsMarked() )
@@ -574,18 +574,18 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */)
|*
|* Tastaturereignisse bearbeiten
|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
|* FALSE.
|*
\************************************************************************/
-BOOL __EXPORT FuText::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuText::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
if ( pView->KeyInput(rKEvt, pWindow) )
{
- bReturn = TRUE;
+ bReturn = sal_True;
lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() );
}
else
@@ -619,10 +619,10 @@ void FuText::Activate()
/**********************************************************************
* Kein Textobjekt im EditMode, daher CreateMode setzen
**********************************************************************/
- USHORT nObj = OBJ_TEXT;
+ sal_uInt16 nObj = OBJ_TEXT;
-/* UINT16 nIdent;
- UINT32 nInvent;
+/* sal_uInt16 nIdent;
+ sal_uInt32 nInvent;
pView->TakeCurrentObj(nIdent, nInvent);
*/
pView->SetCurrentObj(nObj);
@@ -678,7 +678,7 @@ void FuText::SelectionHasChanged()
SdrMark* pMark = rMarkList.GetMark(0);
SdrObject* pObj = pMark->GetMarkedSdrObj();
- UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+ sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
if (nSdrObjKind == OBJ_TEXT ||
nSdrObjKind == OBJ_TITLETEXT ||
@@ -695,9 +695,9 @@ void FuText::SelectionHasChanged()
/**********************************************************************
* Kein Textobjekt im EditMode, daher CreateMode setzen
**********************************************************************/
- USHORT nObj = OBJ_TEXT;
- UINT16 nIdent;
- UINT32 nInvent;
+ sal_uInt16 nObj = OBJ_TEXT;
+ sal_uInt16 nIdent;
+ sal_uInt32 nInvent;
pView->TakeCurrentObj(nIdent, nInvent);
// if (! pView->IsEditMode() )
@@ -729,7 +729,7 @@ void FuText::SelectionHasChanged()
\************************************************************************/
void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
- BOOL bCursorToEnd, const KeyEvent* pInitialKey)
+ sal_Bool bCursorToEnd, const KeyEvent* pInitialKey)
{
/* It is possible to pass a special (unselected) object in pObj, e.g. the
caption object of a cell note. If pObj is 0, then the selected object
@@ -751,7 +751,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
if ( pObj )
{
- UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+ sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
if (nSdrObjKind == OBJ_TEXT ||
nSdrObjKind == OBJ_TITLETEXT ||
@@ -770,8 +770,8 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
// vertical flag:
// deduced from slot ids only if text object has no content
- USHORT nSlotID = aSfxRequest.GetSlot();
- BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
+ sal_uInt16 nSlotID = aSfxRequest.GetSlot();
+ sal_Bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
if ( pOPO )
bVertical = pOPO->IsVertical(); // content wins
@@ -847,8 +847,8 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
{
SfxItemSet aSet(pDrDoc->GetItemPool());
- aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
- aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
+ aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
@@ -859,12 +859,12 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
{
SfxItemSet aSet(pDrDoc->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
- aSet.Put( SdrTextAutoGrowWidthItem( FALSE ) );
- aSet.Put( SdrTextAutoGrowHeightItem( FALSE ) );
+ aSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
+ aSet.Put( SdrTextAutoGrowHeightItem( sal_False ) );
aSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) );
aSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) );
aSet.Put( SdrTextAniCountItem( 1 ) );
- aSet.Put( SdrTextAniAmountItem( (INT16)pWindow->PixelToLogic(Size(2,1)).Width()) );
+ aSet.Put( SdrTextAniAmountItem( (sal_Int16)pWindow->PixelToLogic(Size(2,1)).Width()) );
pObj->SetMergedItemSetAndBroadcast(aSet);
}