[Libreoffice-commits] core.git: 32 commits - formula/source include/formula reportdesign/source sc/qa sc/source
Noel Grandin
noel at peralex.com
Tue Feb 18 09:09:23 CET 2014
formula/source/ui/dlg/formula.cxx | 2
include/formula/IFunctionDescription.hxx | 6
reportdesign/source/ui/dlg/Formula.cxx | 6
reportdesign/source/ui/inc/Formula.hxx | 6
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/source/ui/app/drwtrans.cxx | 10 -
sc/source/ui/app/scmod.cxx | 4
sc/source/ui/app/seltrans.cxx | 2
sc/source/ui/cctrl/cbuttonw.cxx | 6
sc/source/ui/cctrl/checklistmenu.cxx | 12 -
sc/source/ui/dbgui/consdlg.cxx | 6
sc/source/ui/dbgui/dbnamdlg.cxx | 8
sc/source/ui/dbgui/foptmgr.cxx | 2
sc/source/ui/docshell/dbdocfun.cxx | 24 +-
sc/source/ui/docshell/docfunc.cxx | 276 ++++++++++++++---------------
sc/source/ui/docshell/docsh.cxx | 16 -
sc/source/ui/docshell/docsh2.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 20 +-
sc/source/ui/docshell/docsh4.cxx | 10 -
sc/source/ui/docshell/docsh5.cxx | 20 +-
sc/source/ui/docshell/docsh6.cxx | 12 -
sc/source/ui/drawfunc/drtxtob1.cxx | 8
sc/source/ui/drawfunc/drtxtob2.cxx | 2
sc/source/ui/drawfunc/fuconarc.cxx | 19 -
sc/source/ui/drawfunc/fuconcustomshape.cxx | 19 -
sc/source/ui/drawfunc/fuconpol.cxx | 29 +--
sc/source/ui/drawfunc/fuconrec.cxx | 17 -
sc/source/ui/drawfunc/fuconstr.cxx | 34 +--
sc/source/ui/drawfunc/fuconuno.cxx | 19 -
sc/source/ui/drawfunc/fudraw.cxx | 50 ++---
sc/source/ui/drawfunc/fumark.cxx | 22 +-
sc/source/ui/drawfunc/fupoor.cxx | 18 -
sc/source/ui/drawfunc/fusel.cxx | 59 ++----
sc/source/ui/drawfunc/fusel2.cxx | 6
sc/source/ui/drawfunc/futext.cxx | 38 +--
sc/source/ui/drawfunc/futext3.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 10 -
sc/source/ui/formdlg/formula.cxx | 12 -
sc/source/ui/inc/areasdlg.hxx | 4
sc/source/ui/inc/autofmt.hxx | 11 -
sc/source/ui/inc/cbutton.hxx | 14 -
sc/source/ui/inc/cellsh.hxx | 2
sc/source/ui/inc/checklistmenu.hxx | 8
sc/source/ui/inc/consdlg.hxx | 10 -
sc/source/ui/inc/content.hxx | 29 +--
sc/source/ui/inc/crnrdlg.hxx | 8
sc/source/ui/inc/dbdocfun.hxx | 14 -
sc/source/ui/inc/dbfunc.hxx | 48 ++---
sc/source/ui/inc/dbnamdlg.hxx | 4
sc/source/ui/inc/delcodlg.hxx | 6
sc/source/ui/inc/docfunc.hxx | 183 +++++++++----------
sc/source/ui/inc/docsh.hxx | 62 +++---
sc/source/ui/inc/drawview.hxx | 12 -
sc/source/ui/inc/drtxtob.hxx | 8
sc/source/ui/inc/drwtrans.hxx | 10 -
sc/source/ui/inc/dwfunctr.hxx | 14 -
sc/source/ui/inc/editsh.hxx | 4
sc/source/ui/inc/foptmgr.hxx | 2
sc/source/ui/inc/formula.hxx | 8
sc/source/ui/inc/fuconarc.hxx | 8
sc/source/ui/inc/fuconcustomshape.hxx | 8
sc/source/ui/inc/fuconpol.hxx | 8
sc/source/ui/inc/fuconrec.hxx | 8
sc/source/ui/inc/fuconstr.hxx | 10 -
sc/source/ui/inc/fuconuno.hxx | 8
sc/source/ui/inc/fudraw.hxx | 12 -
sc/source/ui/inc/fumark.hxx | 12 -
sc/source/ui/inc/fupoor.hxx | 12 -
sc/source/ui/inc/fusel.hxx | 12 -
sc/source/ui/inc/futext.hxx | 12 -
sc/source/ui/miscdlgs/crnrdlg.cxx | 10 -
sc/source/ui/miscdlgs/delcodlg.cxx | 6
sc/source/ui/navipi/content.cxx | 30 +--
sc/source/ui/navipi/navipi.cxx | 4
sc/source/ui/pagedlg/areasdlg.cxx | 12 -
sc/source/ui/undo/undodat.cxx | 16 -
sc/source/ui/undo/undostyl.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 86 ++++-----
sc/source/ui/unoobj/datauno.cxx | 4
sc/source/ui/unoobj/docuno.cxx | 54 ++---
sc/source/ui/unoobj/linkuno.cxx | 4
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/styleuno.cxx | 8
sc/source/ui/vba/vbarange.cxx | 6
sc/source/ui/view/cellsh.cxx | 4
sc/source/ui/view/cellsh1.cxx | 2
sc/source/ui/view/cellsh2.cxx | 10 -
sc/source/ui/view/dbfunc.cxx | 10 -
sc/source/ui/view/dbfunc2.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 58 +++---
sc/source/ui/view/dbfunc4.cxx | 2
sc/source/ui/view/drawvie4.cxx | 14 -
sc/source/ui/view/drawview.cxx | 12 -
sc/source/ui/view/editsh.cxx | 2
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/tabview4.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 2
sc/source/ui/view/viewfun2.cxx | 4
98 files changed, 868 insertions(+), 891 deletions(-)
New commits:
commit 2e71918d4971719f9f06f132a682824d7ec16238
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:55:27 2014 +0200
sal_Bool->bool
Change-Id: I628c1506573c7d5ec182048a20ed996c9ae879c4
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 32a52ed..cb4eedc 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -803,7 +803,7 @@ void FormulaDlg_Impl::FillListboxes()
}
FuncSelHdl(NULL);
- m_pHelper->setDispatcherLock( sal_True );// Activate Modal-Mode
+ m_pHelper->setDispatcherLock( true );// Activate Modal-Mode
aNewTitle = aTitle1;
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index c27a7f5..985da7f 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -154,9 +154,9 @@ namespace formula
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
virtual ::com::sun::star::table::CellAddress getReferencePosition() const = 0;
- virtual void setDispatcherLock( sal_Bool bLock ) = 0;
- virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked) = 0;
- virtual void doClose(sal_Bool _bOk) = 0;
+ virtual void setDispatcherLock( bool bLock ) = 0;
+ virtual void dispatch(bool _bOK, bool _bMartixChecked) = 0;
+ virtual void doClose(bool _bOk) = 0;
virtual void insertEntryToLRUList(const IFunctionDescription* pDesc) = 0;
virtual void showReference(const OUString& _sFormula) = 0;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 4488f7c..f01783e 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -104,7 +104,7 @@ bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResul
rStrResult = rStrExp;
return false;
}
-void FormulaDialog::doClose(sal_Bool _bOk)
+void FormulaDialog::doClose(bool _bOk)
{
EndDialog(_bOk ? RET_OK : RET_CANCEL);
}
@@ -114,10 +114,10 @@ void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc
void FormulaDialog::showReference(const OUString& /*_sFormula*/)
{
}
-void FormulaDialog::dispatch(sal_Bool /*_bOK*/,sal_Bool /*_bMartixChecked*/)
+void FormulaDialog::dispatch(bool /*_bOK*/, bool /*_bMatrixChecked*/)
{
}
-void FormulaDialog::setDispatcherLock( sal_Bool /*bLock*/ )
+void FormulaDialog::setDispatcherLock( bool /*bLock*/ )
{
}
void FormulaDialog::setReferenceInput(const FormEditData* /*_pData*/)
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index beb4461..ae3a939 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -64,11 +64,11 @@ public:
virtual void notifyChange();
virtual void fill();
virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult);
- virtual void doClose(sal_Bool _bOk);
+ virtual void doClose(bool _bOk);
virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc);
virtual void showReference(const OUString& _sFormula);
- virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked);
- virtual void setDispatcherLock( sal_Bool bLock );
+ virtual void dispatch(bool _bOK, bool _bMatrixChecked);
+ virtual void setDispatcherLock( bool bLock );
virtual void setReferenceInput(const formula::FormEditData* _pData);
virtual void deleteFormData();
virtual void clear();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 5ff4aa2..2b0f913 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -484,7 +484,7 @@ void ScFormulaDlg::SaveLRUEntry(const ScFuncDesc* pFuncDescP)
}
}
-void ScFormulaDlg::doClose(sal_Bool /*_bOk*/)
+void ScFormulaDlg::doClose(bool /*_bOk*/)
{
m_aHelper.DoClose( ScFormulaDlgWrapper::GetChildWindowId() );
}
@@ -526,7 +526,7 @@ void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB
{
m_aHelper.ReleaseFocus(pEdit,pButton);
}
-void ScFormulaDlg::dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked)
+void ScFormulaDlg::dispatch(bool _bOK, bool _bMartixChecked)
{
SfxBoolItem aRetItem( SID_DLG_RETOK, _bOK );
SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMartixChecked );
@@ -545,7 +545,7 @@ void ScFormulaDlg::dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked)
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
&aRetItem, &aStrItem, &aMatItem, 0L );
}
-void ScFormulaDlg::setDispatcherLock( sal_Bool bLock )
+void ScFormulaDlg::setDispatcherLock( bool bLock )
{
m_aHelper.SetDispatcherLock( bLock );
}
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index dac5772..c4472cd 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -62,11 +62,11 @@ public:
virtual void notifyChange();
virtual void fill();
virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult);
- virtual void doClose(sal_Bool _bOk);
+ virtual void doClose(bool _bOk);
virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc);
virtual void showReference(const OUString& _sFormula);
- virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked);
- virtual void setDispatcherLock( sal_Bool bLock );
+ virtual void dispatch(bool _bOK, bool _bMartixChecked);
+ virtual void setDispatcherLock( bool bLock );
virtual void setReferenceInput(const formula::FormEditData* _pData);
virtual void deleteFormData();
virtual void clear();
commit da2b9b0fa4140d576340a3df6fbdde94e02e2777
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:49:04 2014 +0200
sal_Bool->bool
Change-Id: I7ebc6d5271321072469665f055f49b1dd2d98b93
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 68aa806..4ded30b 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -205,7 +205,7 @@ static sal_Bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, co
if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI
{
FuText* pText = (FuText*)pPoor;
- pText->SetInEditMode( pObj, NULL, sal_True, pInitialKey );
+ pText->SetInEditMode( pObj, NULL, true, pInitialKey );
//! set cursor to end of text
}
bReturn = sal_True;
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 4f5b2d0..76a3c7c 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -707,7 +707,7 @@ void FuText::SelectionHasChanged()
\************************************************************************/
void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
- sal_Bool bCursorToEnd, const KeyEvent* pInitialKey)
+ 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
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index e2f301b..af833da 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -51,7 +51,7 @@
// bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx).
// ------------------------------------------------------------------------------------
-void FuText::StopEditMode(sal_Bool /*bTextDirection*/)
+void FuText::StopEditMode(bool /*bTextDirection*/)
{
SdrObject* pObject = pView->GetTextEditObject();
if( !pObject ) return;
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index 8125d67..adb3696 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -53,8 +53,8 @@ public:
virtual void SelectionHasChanged();
void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL,
- sal_Bool bCursorToEnd = false, const KeyEvent* pInitialKey = NULL );
- void StopEditMode(sal_Bool bTextDirection = false);
+ bool bCursorToEnd = false, const KeyEvent* pInitialKey = NULL );
+ void StopEditMode(bool bTextDirection = false);
void StopDragMode(SdrObject* pObject);
// Create default drawing objects via keyboard
commit 56be07335d5baa7e50f0ad854b35795732316bb6
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:46:46 2014 +0200
sal_Bool->bool
Change-Id: Iee89a55e2a8d98b1d4afa371695ae25e84288ae7
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index 4286ad9..7d3ac3b 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -48,12 +48,12 @@ inline long Diff( const Point& rP1, const Point& rP2 )
return nX+nY;
}
-sal_Bool FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
+bool FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
{
if (!pPV)
return false;
- sal_Bool bFound = false;
+ bool bFound = false;
SdrObjListIter aIter( *pPV->GetObjList(), IM_FLAT );
SdrObject* pObject = aIter.Next();
while (pObject && !bFound)
@@ -98,7 +98,7 @@ sal_Bool FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
}
pViewShell->MoveCursorRel( nDifX, nDifY, SC_FOLLOW_JUMP, false );
- bFound = sal_True;
+ bFound = true;
}
}
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index dd463f3..5312629 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -45,10 +45,10 @@ public:
void ActivateNoteHandles(SdrObject* pObj);
protected:
- sal_Bool bVCAction;
+ bool bVCAction;
private:
- sal_Bool TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2
+ bool TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2
bool IsNoteCaptionMarked() const;
bool IsNoteCaptionClicked( const Point& rPos ) const;
commit aed46fd7eccd88a928748e61bfab659ca4a1fec9
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:45:18 2014 +0200
sal_Bool->bool
Change-Id: I84c4e3ae602f12a359f699a9c87bec0201b0e0ff
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 43aac61..7752973 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -255,7 +255,7 @@ IMPL_LINK_NOARG(FuPoor, DragHdl)
if ( pHdl==NULL && pView->IsMarkedHit(aMDPos) )
{
pWindow->ReleaseMouse();
- bIsInDragMode = sal_True;
+ bIsInDragMode = true;
// pView->BeginDrag(pWindow, aMDPos);
pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos);
@@ -265,13 +265,13 @@ IMPL_LINK_NOARG(FuPoor, DragHdl)
// Detektiv-Linie
-sal_Bool FuPoor::IsDetectiveHit( const Point& rLogicPos )
+bool FuPoor::IsDetectiveHit( const Point& rLogicPos )
{
SdrPageView* pPV = pView->GetSdrPageView();
if (!pPV)
return false;
- sal_Bool bFound = false;
+ bool bFound = false;
SdrObjListIter aIter( *pPV->GetObjList(), IM_FLAT );
SdrObject* pObject = aIter.Next();
while (pObject && !bFound)
@@ -282,7 +282,7 @@ sal_Bool FuPoor::IsDetectiveHit( const Point& rLogicPos )
Size(pView->GetHitTolerancePixel(),0)).Width();
if(SdrObjectPrimitiveHit(*pObject, rLogicPos, nHitLog, *pPV, 0, false))
{
- bFound = sal_True;
+ bFound = true;
}
}
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 3d31120..3315da5 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -57,7 +57,7 @@ protected:
Timer aDragTimer; // for Drag&Drop
DECL_LINK( DragTimerHdl, void * );
DECL_LINK( DragHdl, void * );
- sal_Bool bIsInDragMode;
+ bool bIsInDragMode;
Point aMDPos; // Position of MouseButtonDown
// member to hold state of the mouse buttons for creation
@@ -99,7 +99,7 @@ public:
sal_uInt16 GetSlotID() const { return( aSfxRequest.GetSlot() ); }
- sal_Bool IsDetectiveHit( const Point& rLogicPos );
+ bool IsDetectiveHit( const Point& rLogicPos );
void StopDragTimer();
commit c73828ecac5159591d20e15347d6cc96badf4e58
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:41:11 2014 +0200
sal_Bool->bool
Change-Id: I630f398abbe929f9f0b035b2410d92496b609528
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index 0b9ea82..0e60007 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -97,7 +97,7 @@ bool FuMarkRect::MouseMove(const MouseEvent& rMEvt)
aZoomRect = aRect;
aZoomRect.Justify();
pViewShell->DrawMarkRect(aZoomRect);
- bVisible = sal_True;
+ bVisible = true;
}
ForcePointer(&rMEvt);
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index e656faf..1f831a9 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -30,8 +30,8 @@ class FuMarkRect : public FuPoor
protected:
Point aBeginPos;
Rectangle aZoomRect;
- sal_Bool bVisible;
- sal_Bool bStartDrag;
+ bool bVisible;
+ bool bStartDrag;
ScRangeListRef aSourceRange;
public:
commit 0e5e60eb5713953b0fa9f72d87958f83d89ade25
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:39:41 2014 +0200
sal_Bool->bool
Change-Id: I87be0ac485f717bfdd3340143fb08a49ed071653
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index c6ecfa2..68aa806 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -777,7 +777,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
}
-sal_Bool FuDraw::IsEditingANote() const
+bool FuDraw::IsEditingANote() const
{
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
sal_Int32 backval=rMarkList.GetMarkCount();
@@ -792,9 +792,9 @@ sal_Bool FuDraw::IsEditingANote() const
return false;
}
-sal_Bool FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const
+bool FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const
{
- sal_Bool bIsSizingOrMoving = false;
+ bool bIsSizingOrMoving = false;
if ( rMEvt.IsLeft() )
{
const SdrMarkList& rNoteMarkList = pView->GetMarkedObjectList();
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index 28a746e..da8650a 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -49,8 +49,8 @@ class FuDraw : public FuPoor
// II
virtual void SelectionHasChanged();
- sal_Bool IsEditingANote() const;
- sal_Bool IsSizingOrMovingNote( const MouseEvent& rMEvt ) const;
+ bool IsEditingANote() const;
+ bool IsSizingOrMovingNote( const MouseEvent& rMEvt ) const;
private:
void DoModifiers(const MouseEvent& rMEvt);
commit da64cbbc535d447d56ac7f8f22d91f4ffbc186dc
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:36:55 2014 +0200
sal_Bool->bool
Change-Id: If9651e839831245119f22d04b241e520a7b757b5
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index df77003..ab70eef 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -263,9 +263,9 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
// SimpleMouseButtonUp - ohne Test auf Doppelklick
-sal_Bool FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
+bool FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
{
- sal_Bool bReturn = sal_True;
+ bool bReturn = true;
if (aDragTimer.IsActive() )
{
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index 174a2a3..7327fa3 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -38,7 +38,7 @@ class FuConstruct : public FuDraw
virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
- sal_Bool SimpleMouseButtonUp(const MouseEvent& rMEvt);
+ bool SimpleMouseButtonUp(const MouseEvent& rMEvt);
virtual void Activate();
virtual void Deactivate();
commit 2ad9585ab8f199ea937401817765d5fc7fd91c3f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:33:39 2014 +0200
sal_Bool->bool
Change-Id: I906c191f2adb50419952993d4cb946e097d4e5f7
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index e22f893..7d602be 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -55,12 +55,12 @@ FuConstArc::~FuConstArc()
|*
\************************************************************************/
-sal_Bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
+bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt );
+ bool bReturn = FuConstruct::MouseButtonDown( rMEvt );
if ( rMEvt.IsLeft() && !pView->IsAction() )
{
@@ -73,7 +73,7 @@ sal_Bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
pWindow->CaptureMouse();
pView->BegCreateObj( aPnt );
pView->GetCreateObj()->SetGridOffset( aGridOff );
- bReturn = sal_True;
+ bReturn = true;
}
return bReturn;
}
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 62526ff..20bd744 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -65,12 +65,12 @@ FuConstCustomShape::~FuConstCustomShape()
|*
\************************************************************************/
-sal_Bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
if ( rMEvt.IsLeft() && !pView->IsAction() )
{
Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
@@ -95,7 +95,7 @@ sal_Bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
pObj->SetGridOffset( aGridOff );
}
- bReturn = sal_True;
+ bReturn = true;
}
return bReturn;
}
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 4a77aaf..a3d0009 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -56,12 +56,12 @@ FuConstPolygon::~FuConstPolygon()
|*
\************************************************************************/
-sal_Bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
SdrViewEvent aVEvt;
(void)pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -77,7 +77,7 @@ sal_Bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
}
if ( pView->MouseButtonDown(rMEvt, pWindow) )
- bReturn = sal_True;
+ bReturn = true;
return bReturn;
}
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 43a0608..222e467 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -63,12 +63,12 @@ FuConstRectangle::~FuConstRectangle()
|*
\************************************************************************/
-sal_Bool FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
if ( rMEvt.IsLeft() && !pView->IsAction() )
{
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index f9bf8c3..df77003 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -112,18 +112,18 @@ Point FuConstruct::CurrentGridSyncOffsetAndPos( Point& rInOutPos )
|*
\************************************************************************/
-sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
+ bool bReturn = FuDraw::MouseButtonDown(rMEvt);
if ( pView->IsAction() )
{
if ( rMEvt.IsRight() )
pView->BckAction();
- return sal_True;
+ return true;
}
aDragTimer.Start();
@@ -139,12 +139,12 @@ sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
if ( pHdl != NULL || pView->IsMarkedHit(aMDPos) )
{
pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, 1);
- bReturn = sal_True;
+ bReturn = true;
}
else if ( pView->AreObjectsMarked() )
{
pView->UnmarkAll();
- bReturn = sal_True;
+ bReturn = true;
}
}
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index d784360..21e89c6 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -57,12 +57,12 @@ FuConstUnoControl::~FuConstUnoControl()
|*
\************************************************************************/
-sal_Bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
+ bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
if ( rMEvt.IsLeft() && !pView->IsAction() )
{
@@ -76,7 +76,7 @@ sal_Bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
pWindow->CaptureMouse();
pView->BegCreateObj(aPnt);
pView->GetCreateObj()->SetGridOffset( aGridOff );
- bReturn = sal_True;
+ bReturn = true;
}
return bReturn;
}
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 09a9615..c6ecfa2 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -131,7 +131,7 @@ void FuDraw::ResetModifiers()
|*
\************************************************************************/
-sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index cdea6a3..0b9ea82 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -63,18 +63,18 @@ FuMarkRect::~FuMarkRect()
|*
\************************************************************************/
-sal_Bool FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
pWindow->CaptureMouse();
pView->UnmarkAll(); // der Einheitlichkeit halber und wegen #50558#
- bStartDrag = sal_True;
+ bStartDrag = true;
aBeginPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
aZoomRect = Rectangle( aBeginPos, Size() );
- return sal_True;
+ return true;
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 2729c25..43aac61 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -150,7 +150,7 @@ bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
}
// moved from inline to *.cxx
-sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 4715a78..3116a15 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -94,7 +94,7 @@ sal_uInt8 FuSelection::Command(const CommandEvent& rCEvt)
|*
\************************************************************************/
-sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -103,13 +103,13 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
if ( bSelectionOnly )
pView->BckAction();
- return sal_True;
+ return true;
}
bVCAction = false;
bIsInDragMode = false; // irgendwo muss es ja zurueckgesetzt werden (#50033#)
- sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
+ bool bReturn = FuDraw::MouseButtonDown(rMEvt);
aMDPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
@@ -147,7 +147,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
aDragTimer.Start();
pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
- bReturn = sal_True;
+ bReturn = true;
}
}
else
@@ -158,7 +158,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( !bAlt && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) )
{
pView->BegMacroObj(aMDPos, pObj, pPV, pWindow);
- bReturn = sal_True;
+ bReturn = true;
}
else
{
@@ -221,7 +221,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
pObjSh->CallXScript( pInfo->GetMacro(),
*pInArgs, aRet, aOutArgsIndex, aOutArgs, true, &aCaller );
pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() );
- return sal_True; // kein CaptureMouse etc.
+ return true; // kein CaptureMouse etc.
}
}
}
@@ -255,13 +255,13 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
ScGlobal::OpenURL( sURL, sTarget );
pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() );
- return sal_True; // kein CaptureMouse etc.
+ return true; // kein CaptureMouse etc.
}
// Is another object being edited in this view?
// (Editing is ended in MarkListHasChanged - test before UnmarkAll)
SfxInPlaceClient* pClient = pViewShell->GetIPClient();
- sal_Bool bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
+ bool bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
// Markieren
@@ -292,11 +292,11 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
pHdl=pView->PickHandle(aMDPos);
pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
- bReturn = sal_True;
+ bReturn = true;
}
else // Objekt am Rand getroffen
if (pViewShell->IsDrawSelMode())
- bReturn = sal_True;
+ bReturn = true;
}
else
{
@@ -308,7 +308,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
//Objekt selektieren
//********************************************************
pView->BegMarkObj(aMDPos);
- bReturn = sal_True;
+ bReturn = true;
}
}
}
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 4a3c681..4f5b2d0 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -133,14 +133,14 @@ FuText::~FuText()
|*
\************************************************************************/
-sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
+bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bStraightEnter = true;
+ bool bStraightEnter = true;
if ( pView->MouseButtonDown(rMEvt, pWindow) )
- return (sal_True); // Event von der SdrView ausgewertet
+ return true; // Event von der SdrView ausgewertet
if ( pView->IsTextEdit() )
{
@@ -228,7 +228,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
OutlinerView* pOLV = pView->GetTextEditOutlinerView();
if ( pOLV->MouseButtonDown(rMEvt) )
- return (sal_True); // Event an den Outliner
+ return true; // Event an den Outliner
}
}
else
@@ -350,7 +350,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
pHdl=pView->PickHandle(aMDPos);
pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
- return(sal_True);
+ return true;
}
}
}
@@ -375,7 +375,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
}
// return (bReturn);
- return sal_True;
+ return true;
}
/*************************************************************************
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index 5a73ec9..2e014eb 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -34,7 +34,7 @@ class FuConstArc : public FuConstruct
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index bb44e71..40b1c65 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -37,7 +37,7 @@ public:
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index 665892a..c64eb63 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -36,7 +36,7 @@ class FuConstPolygon : public FuConstruct
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index 8d4f1b2..048ab2f 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -34,7 +34,7 @@ class FuConstRectangle : public FuConstruct
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index e001e84..174a2a3 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -35,7 +35,7 @@ class FuConstruct : public FuDraw
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
sal_Bool SimpleMouseButtonUp(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index f5d2b94..bb0d325 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -39,7 +39,7 @@ public:
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index fa5b1c5..28a746e 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -44,7 +44,7 @@ class FuDraw : public FuPoor
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
// II
virtual void SelectionHasChanged();
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index 274b997..e656faf 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -48,7 +48,7 @@ class FuMarkRect : public FuPoor
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
};
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index d0905e0..3d31120 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -88,7 +88,7 @@ public:
virtual bool MouseButtonUp(const MouseEvent& rMEvt); // { return FALSE; }
// moved from inline to *.cxx
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); // { return FALSE; }
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt); // { return FALSE; }
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index 7899011..dd463f3 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -36,7 +36,7 @@ public:
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
virtual void Activate();
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index ee7fccf..8125d67 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -43,7 +43,7 @@ public:
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
virtual void Deactivate();
commit db448b707601ea0172b023aa3ae54279f4f1de0d
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:28:10 2014 +0200
sal_Bool->bool
Change-Id: Ifa9fe7e2b24ac74f51341b5a86b5ff241b99459a
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 2e2d120..e22f893 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -95,17 +95,17 @@ bool FuConstArc::MouseMove( const MouseEvent& rMEvt )
|*
\************************************************************************/
-sal_Bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
+bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = false;
+ bool bReturn = false;
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
pView->EndCreateObj( SDRCREATE_NEXTPOINT );
- bReturn = sal_True;
+ bReturn = true;
}
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index ef4d59b..62526ff 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -117,17 +117,17 @@ bool FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = false;
+ bool bReturn = false;
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
pView->EndCreateObj(SDRCREATE_FORCEEND);
- bReturn = sal_True;
+ bReturn = true;
}
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index be8b6f7..4a77aaf 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -100,13 +100,13 @@ bool FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = false;
- sal_Bool bSimple = false;
+ bool bReturn = false;
+ bool bSimple = false;
SdrViewEvent aVEvt;
(void)pView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt);
@@ -115,11 +115,11 @@ sal_Bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
if (aVEvt.eEvent == SDREVENT_ENDCREATE)
{
- bReturn = sal_True;
- bSimple = sal_True; // Doppelklick nicht weiterreichen
+ bReturn = true;
+ bSimple = true; // Doppelklick nicht weiterreichen
}
- sal_Bool bParent;
+ bool bParent;
if (bSimple)
bParent = FuConstruct::SimpleMouseButtonUp(rMEvt);
else
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 0c74e40..43a0608 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -113,12 +113,12 @@ bool FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = false;
+ bool bReturn = false;
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
@@ -141,7 +141,7 @@ sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
}
}
- bReturn = sal_True;
+ bReturn = true;
}
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 96dd640..f9bf8c3 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -212,12 +212,12 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = SimpleMouseButtonUp( rMEvt );
+ bool bReturn = SimpleMouseButtonUp( rMEvt );
// Doppelklick auf Textobjekt? (->fusel)
@@ -250,7 +250,7 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
Point aMousePixel = rMEvt.GetPosPixel();
pText->SetInEditMode( pObj, &aMousePixel );
}
- bReturn = sal_True;
+ bReturn = true;
}
}
}
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 673699e..d784360 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -98,17 +98,17 @@ bool FuConstUnoControl::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = false;
+ bool bReturn = false;
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
pView->EndCreateObj(SDRCREATE_FORCEEND);
- bReturn = sal_True;
+ bReturn = true;
}
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index ca5677f..09a9615 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -162,7 +162,7 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index 3727fd9..cdea6a3 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -111,7 +111,7 @@ bool FuMarkRect::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -149,7 +149,7 @@ sal_Bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
// SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId );
// SC_MOD()->SetRefDialog( nId, pWnd ? sal_False : sal_True );
- return sal_True;
+ return true;
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 7661d65..2729c25 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -141,7 +141,7 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl)
IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer )
// moved from inline to *.cxx
-sal_Bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index f520b3a..4715a78 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -373,13 +373,13 @@ bool FuSelection::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = FuDraw::MouseButtonUp(rMEvt);
- sal_Bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
+ bool bReturn = FuDraw::MouseButtonUp(rMEvt);
+ bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
SdrObject* pObj = NULL;
SdrPageView* pPV = NULL;
@@ -441,7 +441,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
pView->UnmarkAllObj();
pView->MarkObj(pObj,pPV,false,false);
- return (sal_True);
+ return true;
}
}
pView->EndDragObj( rMEvt.IsMod1() );
@@ -456,7 +456,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
FuText* pText = static_cast<FuText*>(pPoor);
pText->StopDragMode(pObj );
}
- bReturn = sal_True;
+ bReturn = true;
}
else if (pView->IsAction() )
{
@@ -465,7 +465,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
pView->EndAction();
if ( pView->AreObjectsMarked() )
{
- bReturn = sal_True;
+ bReturn = true;
/* if multi-selection contains a note caption object, remove
all other objects from selection. */
@@ -560,13 +560,13 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
Point aMousePixel = rMEvt.GetPosPixel();
pText->SetInEditMode( pObj, &aMousePixel );
}
- bReturn = sal_True;
+ bReturn = true;
}
}
}
}
else if ( TestDetective( pView->GetSdrPageView(), aPnt ) )
- bReturn = sal_True;
+ bReturn = true;
}
// Ein VCControl ist aktiv
@@ -600,7 +600,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
}
}
- return (bReturn);
+ return bReturn;
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 2f99181..4a3c681 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -428,12 +428,12 @@ bool FuText::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
+bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- sal_Bool bReturn = false;
+ bool bReturn = false;
if (aDragTimer.IsActive() )
{
@@ -445,7 +445,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
if ( pView->MouseButtonUp(rMEvt, pWindow) )
- return (sal_True); // Event von der SdrView ausgewertet
+ return true; // Event von der SdrView ausgewertet
if ( pView->IsDragObj() )
{
@@ -553,7 +553,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
}
}
- return (bReturn);
+ return bReturn;
}
/*************************************************************************
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index d321395..5a73ec9 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -33,7 +33,7 @@ class FuConstArc : public FuConstruct
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index 2715d2b9..bb44e71 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -36,7 +36,7 @@ public:
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index 527eff5..665892a 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -35,7 +35,7 @@ class FuConstPolygon : public FuConstruct
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index c78adf5..8d4f1b2 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -33,7 +33,7 @@ class FuConstRectangle : public FuConstruct
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index 62ea7bd..e001e84 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -34,7 +34,7 @@ class FuConstruct : public FuDraw
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index 76a8a98..f5d2b94 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -38,7 +38,7 @@ public:
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index e666bdd..fa5b1c5 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -43,7 +43,7 @@ class FuDraw : public FuPoor
virtual void ForcePointer(const MouseEvent* pMEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
// II
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index 73f26d4..274b997 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -47,7 +47,7 @@ class FuMarkRect : public FuPoor
virtual void ForcePointer(const MouseEvent* pMEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
};
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index a65a6db..d0905e0 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -85,7 +85,7 @@ public:
virtual bool MouseMove(const MouseEvent&) { return false; }
// moved from inline to *.cxx
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); // { return FALSE; }
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt); // { return FALSE; }
// moved from inline to *.cxx
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); // { return FALSE; }
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index d754261..7899011 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -35,7 +35,7 @@ public:
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index e47292b..ee7fccf 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -42,7 +42,7 @@ public:
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual void Activate();
commit 27274ebe2375307f2f22bddb6fc38041107e83fc
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:21:10 2014 +0200
sal_Bool->bool
Change-Id: Ief6804e2604618162bd6fc87985dbee474492aff
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 5865067..2e2d120 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -84,7 +84,7 @@ sal_Bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
|*
\************************************************************************/
-sal_Bool FuConstArc::MouseMove( const MouseEvent& rMEvt )
+bool FuConstArc::MouseMove( const MouseEvent& rMEvt )
{
return FuConstruct::MouseMove(rMEvt);
}
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 2bf08a3..ef4d59b 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -106,7 +106,7 @@ sal_Bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
+bool FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index b600d19..be8b6f7 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -88,11 +88,10 @@ sal_Bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
+bool FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
{
pView->MouseMove(rMEvt, pWindow);
- sal_Bool bReturn = FuConstruct::MouseMove(rMEvt);
- return bReturn;
+ return FuConstruct::MouseMove(rMEvt);
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index b6002eb..0c74e40 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -102,7 +102,7 @@ sal_Bool FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
+bool FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 60b6b5d..96dd640 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -159,7 +159,7 @@ sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
+bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
{
FuDraw::MouseMove(rMEvt);
@@ -203,7 +203,7 @@ sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
pViewShell->SetActivePointer( aNewPointer );
}
}
- return sal_True;
+ return true;
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index ff3ed24..673699e 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -87,7 +87,7 @@ sal_Bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstUnoControl::MouseMove(const MouseEvent& rMEvt)
+bool FuConstUnoControl::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 61c4a58..ca5677f 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -146,7 +146,7 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt)
+bool FuDraw::MouseMove(const MouseEvent& rMEvt)
{
// evaluate modifiers only if in a drawing layer action
// (don't interfere with keyboard shortcut handling)
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index f50aa3a..3727fd9 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -83,7 +83,7 @@ sal_Bool FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuMarkRect::MouseMove(const MouseEvent& rMEvt)
+bool FuMarkRect::MouseMove(const MouseEvent& rMEvt)
{
if ( bStartDrag )
{
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 4112928..f520b3a 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -332,9 +332,9 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt)
+bool FuSelection::MouseMove(const MouseEvent& rMEvt)
{
- sal_Bool bReturn = FuDraw::MouseMove(rMEvt);
+ bool bReturn = FuDraw::MouseMove(rMEvt);
if (aDragTimer.IsActive() )
{
@@ -352,7 +352,7 @@ sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt)
ForceScroll(aPix);
pView->MovAction(aPnt);
- bReturn = sal_True;
+ bReturn = true;
}
// Ein VCControl ist aktiv
@@ -364,7 +364,7 @@ sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt)
ForcePointer(&rMEvt);
- return (bReturn);
+ return bReturn;
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 4564748..2f99181 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -384,9 +384,9 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuText::MouseMove(const MouseEvent& rMEvt)
+bool FuText::MouseMove(const MouseEvent& rMEvt)
{
- sal_Bool bReturn = false;
+ bool bReturn = false;
// pViewShell->SetActivePointer(aNewPointer);
@@ -411,7 +411,7 @@ sal_Bool FuText::MouseMove(const MouseEvent& rMEvt)
aPnt -= pView->GetCreateObj()->GetGridOffset();
if ( pView->MouseMove(rMEvt, pWindow) )
- return (sal_True); // Event von der SdrView ausgewertet
+ return true; // Event von der SdrView ausgewertet
if ( pView->IsAction() )
{
@@ -419,7 +419,7 @@ sal_Bool FuText::MouseMove(const MouseEvent& rMEvt)
pView->MovAction(aPnt);
}
- return (bReturn);
+ return bReturn;
}
/*************************************************************************
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index 4386ed5..d321395 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -32,7 +32,7 @@ class FuConstArc : public FuConstruct
virtual ~FuConstArc();
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index 8394124..2715d2b9 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -35,7 +35,7 @@ public:
virtual ~FuConstCustomShape();
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index 57772c5..527eff5 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -34,7 +34,7 @@ class FuConstPolygon : public FuConstruct
virtual ~FuConstPolygon();
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index 6991540..c78adf5 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -32,7 +32,7 @@ class FuConstRectangle : public FuConstruct
virtual ~FuConstRectangle();
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index 7cfa4b4..62ea7bd 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -33,7 +33,7 @@ class FuConstruct : public FuDraw
virtual ~FuConstruct();
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index f815714..76a8a98 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -37,7 +37,7 @@ public:
virtual ~FuConstUnoControl();
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index bdfead3..e666bdd 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -42,7 +42,7 @@ class FuDraw : public FuPoor
virtual void ForcePointer(const MouseEvent* pMEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index f2f6be1..73f26d4 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -46,7 +46,7 @@ class FuMarkRect : public FuPoor
virtual void ForcePointer(const MouseEvent* pMEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index d5de5af..a65a6db 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -82,7 +82,7 @@ public:
// Mouse- & Key-Events; return value=TRUE: Event was processed
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent&) { return false; }
+ virtual bool MouseMove(const MouseEvent&) { return false; }
// moved from inline to *.cxx
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); // { return FALSE; }
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index f71d299..d754261 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -34,7 +34,7 @@ public:
virtual ~FuSelection();
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
virtual sal_uInt8 Command(const CommandEvent& rCEvt);
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index a2532ea..e47292b 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -41,7 +41,7 @@ public:
virtual ~FuText();
virtual bool KeyInput(const KeyEvent& rKEvt);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+ virtual bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
commit c75b8edc8aa273b9e00e4c4ab50a0c4b124ed53b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 15:13:44 2014 +0200
sal_Bool->bool
Change-Id: I98448e4276acbbcd754f0573dcec9a16ef814174
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index c20d234..5865067 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -119,10 +119,9 @@ sal_Bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
|*
\************************************************************************/
-sal_Bool FuConstArc::KeyInput(const KeyEvent& rKEvt)
+bool FuConstArc::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
- return(bReturn);
+ return FuConstruct::KeyInput(rKEvt);
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index ef7df53..2bf08a3 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -141,10 +141,9 @@ sal_Bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstCustomShape::KeyInput(const KeyEvent& rKEvt)
+bool FuConstCustomShape::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
- return(bReturn);
+ return FuConstruct::KeyInput(rKEvt);
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 62dbcf3..b600d19 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -138,11 +138,9 @@ sal_Bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
+bool FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
-
- return(bReturn);
+ return FuConstruct::KeyInput(rKEvt);
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index dcf219e..b6002eb 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -155,10 +155,9 @@ sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstRectangle::KeyInput(const KeyEvent& rKEvt)
+bool FuConstRectangle::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
- return(bReturn);
+ return FuConstruct::KeyInput(rKEvt);
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index c2d7458..60b6b5d 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -310,9 +310,9 @@ sal_Bool FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
+bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = false;
+ bool bReturn = false;
switch ( rKEvt.GetKeyCode().GetCode() )
{
@@ -321,7 +321,7 @@ sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
{
pView->BrkAction();
pWindow->ReleaseMouse();
- bReturn = sal_True;
+ bReturn = true;
}
else // Zeichenmodus beenden
{
@@ -332,7 +332,7 @@ sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
case KEY_DELETE:
pView->DeleteMarked();
- bReturn = sal_True;
+ bReturn = true;
break;
}
@@ -341,7 +341,7 @@ sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
bReturn = FuDraw::KeyInput(rKEvt);
}
- return(bReturn);
+ return bReturn;
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 6b00a91..ff3ed24 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -122,10 +122,9 @@ sal_Bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuConstUnoControl::KeyInput(const KeyEvent& rKEvt)
+bool FuConstUnoControl::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
- return(bReturn);
+ return FuConstruct::KeyInput(rKEvt);
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 4b2f0ef..61c4a58 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -213,9 +213,9 @@ static sal_Bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, co
return bReturn;
}
-sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
+bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = false;
+ bool bReturn = false;
ScViewData& rViewData = *pViewShell->GetViewData();
switch ( rKEvt.GetKeyCode().GetCode() )
@@ -225,13 +225,13 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
// in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus
rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
- bReturn = sal_True;
+ bReturn = true;
}
else if ( pViewShell->IsDrawSelMode() )
{
pView->UnmarkAll();
rViewData.GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
- bReturn = sal_True;
+ bReturn = true;
}
else if ( pView->AreObjectsMarked() )
{
@@ -246,13 +246,13 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
if (!pView->AreObjectsMarked())
pViewShell->SetDrawShell( false );
- bReturn = sal_True;
+ bReturn = true;
}
break;
case KEY_DELETE: //! ueber Accelerator
pView->DeleteMarked();
- bReturn = sal_True;
+ bReturn = true;
break;
case KEY_RETURN:
@@ -271,10 +271,10 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 );
// consumed
- bReturn = sal_True;
+ bReturn = true;
}
else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
- bReturn = sal_True;
+ bReturn = true;
}
}
}
@@ -291,7 +291,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
- bReturn = sal_True;
+ bReturn = true;
}
}
}
@@ -325,7 +325,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
if(pView->AreObjectsMarked())
pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
- bReturn = sal_True;
+ bReturn = true;
}
// handle Mod1 and Mod2 to get travelling running on different systems
@@ -348,7 +348,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
}
// consumed
- bReturn = sal_True;
+ bReturn = true;
}
}
}
@@ -373,7 +373,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
if(pView->AreObjectsMarked())
pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
- bReturn = sal_True;
+ bReturn = true;
}
}
}
@@ -398,7 +398,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
if(pView->AreObjectsMarked())
pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
- bReturn = sal_True;
+ bReturn = true;
}
}
}
@@ -527,7 +527,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
// II
pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
- bReturn = sal_True;
+ bReturn = true;
}
}
else
@@ -568,7 +568,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
Rectangle aVisRect(aEndPoint - Point(100, 100), Size(200, 200));
pView->MakeVisible(aVisRect, *pWindow);
- bReturn = sal_True;
+ bReturn = true;
}
}
}
@@ -635,7 +635,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
}
}
- bReturn = sal_True;
+ bReturn = true;
}
}
}
@@ -659,11 +659,11 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
// start text edit for suitable object, pass key event to OutlinerView
if ( lcl_KeyEditMode( pObj, pViewShell, &rKEvt ) )
- bReturn = sal_True;
+ bReturn = true;
}
}
- return (bReturn);
+ return bReturn;
}
// II
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index 882c307..f50aa3a 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -179,9 +179,9 @@ sal_uInt8 FuMarkRect::Command(const CommandEvent& rCEvt)
|*
\************************************************************************/
-sal_Bool FuMarkRect::KeyInput(const KeyEvent& rKEvt)
+bool FuMarkRect::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = false;
+ bool bReturn = false;
switch ( rKEvt.GetKeyCode().GetCode() )
{
@@ -189,7 +189,7 @@ sal_Bool FuMarkRect::KeyInput(const KeyEvent& rKEvt)
// beenden
pViewShell->GetViewData()->GetDispatcher().
Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
- bReturn = sal_True;
+ bReturn = true;
break;
}
@@ -198,7 +198,7 @@ sal_Bool FuMarkRect::KeyInput(const KeyEvent& rKEvt)
bReturn = FuPoor::KeyInput(rKEvt);
}
- return (bReturn);
+ return bReturn;
}
/*************************************************************************
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index f6d3cd1..7661d65 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -175,11 +175,9 @@ sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuPoor::KeyInput(const KeyEvent& /* rKEvt */)
+bool FuPoor::KeyInput(const KeyEvent& /* rKEvt */)
{
- sal_Bool bReturn = false;
-
- return(bReturn);
+ return false;
}
sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt)
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 13e1d30..4112928 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -612,16 +612,9 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt)
+bool FuSelection::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = false;
-
- if (!bReturn)
- {
- bReturn = FuDraw::KeyInput(rKEvt);
- }
-
- return(bReturn);
+ return FuDraw::KeyInput(rKEvt);
}
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index e20aac8..4564748 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -578,13 +578,13 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */)
|*
\************************************************************************/
-sal_Bool FuText::KeyInput(const KeyEvent& rKEvt)
+bool FuText::KeyInput(const KeyEvent& rKEvt)
{
- sal_Bool bReturn = false;
+ bool bReturn = false;
if ( pView->KeyInput(rKEvt, pWindow) )
{
- bReturn = sal_True;
+ bReturn = true;
lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() );
}
else
@@ -592,7 +592,7 @@ sal_Bool FuText::KeyInput(const KeyEvent& rKEvt)
bReturn = FuDraw::KeyInput(rKEvt);
}
- return (bReturn);
+ return bReturn;
}
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index f51655c..4386ed5 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -31,7 +31,7 @@ class FuConstArc : public FuConstruct
virtual ~FuConstArc();
// Mouse- & Key-Events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index 1a06c4f..8394124 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -34,7 +34,7 @@ public:
virtual ~FuConstCustomShape();
// Mouse- & Key-Events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index b1d9b99..57772c5 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -33,7 +33,7 @@ class FuConstPolygon : public FuConstruct
virtual ~FuConstPolygon();
// Mouse- & Key-Events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index ba2e41a..6991540 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -31,7 +31,7 @@ class FuConstRectangle : public FuConstruct
virtual ~FuConstRectangle();
// Mouse- & Key-Events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index ab24e89..7cfa4b4 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -32,7 +32,7 @@ class FuConstruct : public FuDraw
virtual ~FuConstruct();
// Mouse- & Key-Events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index a367563..f815714 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -36,7 +36,7 @@ public:
virtual ~FuConstUnoControl();
// Mouse- & Key-Events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index 2fba1ae..bdfead3 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -35,7 +35,7 @@ class FuDraw : public FuPoor
SdrModel* pDoc, SfxRequest& rReq);
virtual ~FuDraw();
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index 3b64bc1..f2f6be1 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -39,7 +39,7 @@ class FuMarkRect : public FuPoor
SdrModel* pDoc, SfxRequest& rReq);
virtual ~FuMarkRect();
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual void Activate();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 7997989..d5de5af 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -81,7 +81,7 @@ public:
virtual void DoPaste();
// Mouse- & Key-Events; return value=TRUE: Event was processed
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent&) { return false; }
// moved from inline to *.cxx
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index b1715e7..f71d299 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -33,7 +33,7 @@ public:
virtual ~FuSelection();
// Mouse- & Key-Events
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index 3c6179e..a2532ea 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -40,7 +40,7 @@ public:
virtual ~FuText();
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+ virtual bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
commit e662ffc9d639b8e429155ea35f9e8a6f720be638
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 14:28:01 2014 +0200
sal_Bool->bool
Change-Id: If00756cdecc19f5a0159921833a24490b9d70450
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index e0c4d18..5ff4aa2 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -258,9 +258,9 @@ ScFormulaDlg::~ScFormulaDlg()
} // if (pData) // wird nicht ueber Close zerstoert;
}
-sal_Bool ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl)
+bool ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl)
{
- sal_Bool bAlive = false;
+ bool bAlive = false;
// gehoert der InputHandler zu irgendeiner ViewShell ?
@@ -269,7 +269,7 @@ sal_Bool ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl)
while ( pSh && !bAlive )
{
if (((ScTabViewShell*)pSh)->GetInputHandler() == pHdl)
- bAlive = sal_True;
+ bAlive = true;
pSh = SfxViewShell::GetNext( *pSh, &aScType );
}
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 4850a24..dac5772 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -105,7 +105,7 @@ protected:
virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
void SaveLRUEntry(const ScFuncDesc* pFuncDesc);
- sal_Bool IsInputHdl(ScInputHandler* pHdl);
+ bool IsInputHdl(ScInputHandler* pHdl);
ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh);
};
commit 1bd50b002fc42519cdc34393eede8c9203b65bb6
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 14:24:29 2014 +0200
sal_Bool->bool
Change-Id: I3c91fbe6f7cc383815a3492be72642e968d48327
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 3471246..7fa0993 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -206,7 +206,7 @@ void ScFilterOptionsMgr::Init()
//----------------------------------------------------------------------------
-sal_Bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const
+bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const
{
OUString aPosStr( rPosStr );
sal_Int32 nColonPos = aPosStr.indexOf( ':' );
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index da064eb..59ac707 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -55,7 +55,7 @@ public:
FixedText* refFtDbArea,
const OUString& refStrUndefined );
~ScFilterOptionsMgr();
- sal_Bool VerifyPosStr ( const OUString& rPosStr ) const;
+ bool VerifyPosStr ( const OUString& rPosStr ) const;
private:
ScViewData* pViewData;
commit b9582903ed521f87faf27c40a51e14f48a5e2443
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 14:23:10 2014 +0200
sal_Bool->bool
Change-Id: Ifc854ea58b04c21584b8eb9c00299c8e27f81a1f
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index 1f84d27..69cf69e 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -40,8 +40,8 @@ private:
EditView* pEditView;
ScViewData* pViewData;
TransferableClipboardListener* pClipEvtLstnr;
- sal_Bool bPastePossible;
- sal_Bool bIsInsertMode;
+ bool bPastePossible;
+ bool bIsInsertMode;
const SvxURLField* GetURLField();
ScInputHandler* GetMyInputHdl();
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 67d1841..f497fb4 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -92,7 +92,7 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
pViewData (pData),
pClipEvtLstnr (NULL),
bPastePossible (false),
- bIsInsertMode (sal_True)
+ bIsInsertMode (true)
{
SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() );
SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() );
commit 3e9b6b86ec3f0026f164e2a7325840d2671885a5
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 14:17:21 2014 +0200
sal_Bool->bool, and remove unused parameter
Change-Id: Ibd9ad76c9580496f3ff8ec256656c816a36f0892
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 25fc96e..82cb1c9 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -152,7 +152,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
GetOutputSizePixel().Height()-2*aTxtSize.Height());
aPrivatSplit.SetYRange(aYRange);
SelHdl(&aCatBox);
- bInit=sal_True;
+ bInit = true;
}
/*************************************************************************
@@ -321,7 +321,7 @@ void ScFunctionDockWin::SetLeftRightSize()
{
if(!bSizeFlag)
{
- bSizeFlag=sal_True;
+ bSizeFlag = true;
Size aDiffSize=GetSizePixel();
Size aNewSize=GetOutputSizePixel();
@@ -368,7 +368,7 @@ void ScFunctionDockWin::SetTopBottonSize()
{
if(!bSizeFlag)
{
- bSizeFlag=sal_True;
+ bSizeFlag = true;
Size aDiffSize=GetSizePixel();
Size aNewSize=GetOutputSizePixel();
aDiffSize.Width()-=aNewSize.Width();
@@ -831,7 +831,7 @@ void ScFunctionDockWin::UpdateFunctionList()
#*
#************************************************************************/
-void ScFunctionDockWin::DoEnter(sal_Bool /* bOk */) //@@ ???
+void ScFunctionDockWin::DoEnter()
{
OUString aFirstArgStr;
OUString aArgStr;
@@ -989,7 +989,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl )
if ((ImageButton *)pCtrl == &aInsertButton ||
(ListBox *)pCtrl == &aFuncList)
{
- DoEnter(sal_True); // Uebernimmt die Eingabe
+ DoEnter(); // Uebernimmt die Eingabe
}
//...
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 21a3a05..b5095b8 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -57,13 +57,13 @@ private:
SfxChildAlignment eSfxOldAlignment;
ImageButton aInsertButton;
FixedText aFiFuncDesc;
- sal_uInt16 nLeftSlot;
- sal_uInt16 nRightSlot;
- sal_uLong nMinWidth;
- sal_uLong nMinHeight;
+ sal_uInt16 nLeftSlot;
+ sal_uInt16 nRightSlot;
+ sal_uLong nMinWidth;
+ sal_uLong nMinHeight;
Size aOldSize;
- sal_Bool bSizeFlag;
- sal_Bool bInit;
+ bool bSizeFlag;
+ bool bInit;
short nDockMode;
Point aSplitterInitPos;
const ScFuncDesc* pFuncDesc;
@@ -73,7 +73,7 @@ private:
void UpdateFunctionList();
void UpdateLRUList();
- void DoEnter(sal_Bool bOk); //@@ ???
+ void DoEnter();
void SetDescription();
void SetLeftRightSize();
void SetTopBottonSize();
commit 38344505c779771c87fcae03bde0ecf254b0da5d
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 17 14:13:41 2014 +0200
sal_Bool->bool
Change-Id: I04b1fd1bafdb8760b2fa08813ea21614ddbbf918
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index e4ec105..b46272f 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -120,7 +120,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
{
uno::Reference< embed::XEmbedPersist > xPersObj( ((SdrOle2Obj*)pObject)->GetObjRef(), uno::UNO_QUERY );
if ( xPersObj.is() && xPersObj->hasEntry() )
- bOleObj = sal_True;
+ bOleObj = true;
}
catch( uno::Exception& )
{}
@@ -133,9 +133,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
if (nSdrObjKind == OBJ_GRAF)
{
- bGraphic = sal_True;
+ bGraphic = true;
if ( ((SdrGrafObj*)pObject)->GetGraphic().GetType() == GRAPHIC_BITMAP )
- bGrIsBit = sal_True;
+ bGrIsBit = true;
}
//
@@ -698,7 +698,7 @@ void ScDrawTransferObj::SetDragSourceFlags( sal_uInt16 nFlags )
void ScDrawTransferObj::SetDragWasInternal()
{
- bDragWasInternal = sal_True;
+ bDragWasInternal = true;
}
SdrOle2Obj* ScDrawTransferObj::GetSingleObject()
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 81b7b90..9efef48 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -50,14 +50,14 @@ private:
// extracted from model in ctor:
Size aSrcSize;
INetBookmark* pBookmark;
- sal_Bool bGraphic;
- sal_Bool bGrIsBit;
- sal_Bool bOleObj;
+ bool bGraphic;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list