summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/fmview.hxx4
-rw-r--r--include/svx/galbrws.hxx2
-rw-r--r--include/svx/svdcrtv.hxx2
-rw-r--r--include/svx/svdedxv.hxx10
-rw-r--r--include/svx/svdmrkv.hxx2
-rw-r--r--include/svx/svdpntv.hxx10
-rw-r--r--include/svx/svdview.hxx10
-rw-r--r--sc/source/ui/drawfunc/fupoor.cxx2
-rw-r--r--svx/source/form/fmview.cxx10
-rw-r--r--svx/source/gallery2/galbrws.cxx4
-rw-r--r--svx/source/svdraw/svdcrtv.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx10
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx4
-rw-r--r--svx/source/svdraw/svdview.cxx30
15 files changed, 52 insertions, 52 deletions
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index bb579635a679..4a714dca690f 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -111,7 +111,7 @@ public:
using E3dView::Paste;
virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0) SAL_OVERRIDE;
- virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) SAL_OVERRIDE;
+ virtual bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) SAL_OVERRIDE;
/** grab the focus to the first form control on the view
@param _bForceSync
@@ -125,7 +125,7 @@ public:
GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
// SdrView
- sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE;
+ bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE;
/// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL"
FmFormPage* GetCurPage();
diff --git a/include/svx/galbrws.hxx b/include/svx/galbrws.hxx
index 169db3dbe52e..206dec1635c2 100644
--- a/include/svx/galbrws.hxx
+++ b/include/svx/galbrws.hxx
@@ -74,7 +74,7 @@ public:
Window* pParent, const ResId& rResId );
virtual ~GalleryBrowser();
- sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+ bool KeyInput( const KeyEvent& rKEvt, Window* pWindow );
};
#endif // INCLUDED_SVX_GALBRWS_HXX
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index f2679a47f804..64130cd3b954 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -82,7 +82,7 @@ public:
virtual void BrkAction() SAL_OVERRIDE;
virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE;
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
void SetMeasureLayer(const OUString& rName) { aMeasureLayer=rName; }
const OUString& GetMeasureLayer() const { return aMeasureLayer; }
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 2d730f4584fa..cd282eeb6ad6 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -214,11 +214,11 @@ public:
const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; }
OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; }
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE;
// #97766# make virtual to change implementation e.g. for SdOutlineView
virtual sal_uInt16 GetScriptType() const;
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 309b6030ebeb..5ffde8c3e3ca 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -147,7 +147,7 @@ protected:
virtual void SetMarkRects(); // Rects at the PageViews
virtual void CheckMarked(); // Scan MarkList after Del and Lock Layer ...
virtual void AddDragModeHdl(SdrDragMode eMode);
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
// add custom handles (used by other apps, e.g. AnchorPos)
virtual void AddCustomHdl();
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 4026b1db0647..95a7738f9185 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -479,12 +479,12 @@ public:
// Default=FALSE. Flag ist nicht persistent.
bool IsSwapAsynchron() const { return bSwapAsynchron; }
void SetSwapAsynchron(bool bJa=true) { bSwapAsynchron=bJa; }
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+ virtual bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
- virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
- virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
- virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
- virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; }
+ virtual bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; }
+ virtual bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; }
+ virtual bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; }
+ virtual bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return false; }
bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 02f3d5495461..a237bc23f8cb 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -194,11 +194,11 @@ public:
void SetMasterPagePaintCaching(bool bOn);
bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; }
- sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
- virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE;
+ bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE;
+ virtual bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE;
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE;
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 775297389339..2a6a00b2b942 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -191,7 +191,7 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt)
OutlinerView* pOutView = pView->GetTextEditOutlinerView();
if ( pOutView )
- return pOutView->HasSelection() ? pView->Command(rCEvt,pWindow) : SC_CMD_NONE;
+ return pOutView->HasSelection() ? (pView->Command(rCEvt,pWindow) ? 1 : 0) : SC_CMD_NONE;
else
return pView->Command(rCEvt,pWindow);
}
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index d9b5acd5f72d..625c9ef79aad 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -490,9 +490,9 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor
}
-sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
{
- sal_Bool bDone = sal_False;
+ bool bDone = false;
const KeyCode& rKeyCode = rKEvt.GetKeyCode();
if ( IsDesignMode()
&& rKeyCode.GetCode() == KEY_RETURN
@@ -518,7 +518,7 @@ sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
SetMoveOutside(true);
//OLMRefreshAllIAOManagers();
xWindow->setFocus();
- bDone = sal_True;
+ bDone = true;
}
}
}
@@ -551,9 +551,9 @@ bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
}
-sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
+bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
{
- sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
+ bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
if ( pFormShell && pFormShell->GetImpl() )
{
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index f939ad3bfd98..bb5c7fb450a1 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -180,10 +180,10 @@ void GalleryBrowser::Resize()
maLastSize = aNewSize;
}
-sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
+bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
{
const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
- sal_Bool bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
+ bool bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
( ( KEY_TAB == nCode ) || ( KEY_F6 == nCode && rKEvt.GetKeyCode().IsMod2() ) ) );
if( bRet )
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 6be494f89ef7..3b3a15c10259 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -319,7 +319,7 @@ void SdrCreateView::HideConnectMarker()
ImpClearConnectMarker();
}
-sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
if(CheckEdgeMode() && pWin)
{
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 91be14d2a146..ea6bb85672dd 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1178,7 +1178,7 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
-sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
{
if(pTextEditOutlinerView)
{
@@ -1201,7 +1201,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
return SdrGlueEditView::KeyInput(rKEvt,pWin);
}
-sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
bool bPostIt=pTextEditOutliner->IsInSelectionMode();
@@ -1236,7 +1236,7 @@ sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
return SdrGlueEditView::MouseButtonDown(rMEvt,pWin);
}
-sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
bool bPostIt=pTextEditOutliner->IsInSelectionMode();
@@ -1267,7 +1267,7 @@ sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
return SdrGlueEditView::MouseButtonUp(rMEvt,pWin);
}
-sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
bool bSelMode=pTextEditOutliner->IsInSelectionMode();
@@ -1299,7 +1299,7 @@ sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
return SdrGlueEditView::MouseMove(rMEvt,pWin);
}
-sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
+bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
{
// as long as OutlinerView returns a sal_Bool, it only gets COMMAND_STARTDRAG
if (pTextEditOutlinerView!=NULL)
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b8ae15db5339..4c2680965844 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1036,7 +1036,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
}
/** handle mouse over effects for handles */
-sal_Bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
if(aHdl.GetHdlCount())
{
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 892f49025ad2..9ef70ea69fbb 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -879,9 +879,9 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const
-sal_Bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
+bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
{
- return sal_False;
+ return false;
}
void SdrPaintView::GlueInvalidate() const
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 9b5fa6f2c989..2c8547a7a294 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -175,12 +175,12 @@ SdrView::~SdrView()
maAccessibilityOptions.RemoveListener(this);
}
-sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
{
SetActualWin(pWin);
- sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin);
+ bool bRet = SdrCreateView::KeyInput(rKEvt,pWin);
if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) {
- bRet=true;
+ bRet = true;
switch (rKEvt.GetKeyCode().GetFullFunction()) {
case KEYFUNC_CUT : Cut(); break;
case KEYFUNC_COPY : Yank(); break;
@@ -218,51 +218,51 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
return bRet;
}
-sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
if (rMEvt.IsLeft()) aDragStat.SetMouseDown(true);
- sal_Bool bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
+ bool bRet = SdrCreateView::MouseButtonDown(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
SdrViewEvent aVEvt;
PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt);
- bRet=DoMouseEvent(aVEvt);
+ bRet = DoMouseEvent(aVEvt);
}
return bRet;
}
-sal_Bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
if (rMEvt.IsLeft()) aDragStat.SetMouseDown(false);
- sal_Bool bAction=IsAction();
- sal_Bool bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
+ bool bAction = IsAction();
+ bool bRet = !bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
SdrViewEvent aVEvt;
PickAnything(rMEvt,SDRMOUSEBUTTONUP,aVEvt);
- bRet=DoMouseEvent(aVEvt);
+ bRet = DoMouseEvent(aVEvt);
}
return bRet;
}
-sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
aDragStat.SetMouseDown(rMEvt.IsLeft());
- sal_Bool bRet=SdrCreateView::MouseMove(rMEvt,pWin);
+ bool bRet = SdrCreateView::MouseMove(rMEvt,pWin);
if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) {
SdrViewEvent aVEvt;
PickAnything(rMEvt,SDRMOUSEMOVE,aVEvt);
- if (DoMouseEvent(aVEvt)) bRet=sal_True;
+ if (DoMouseEvent(aVEvt)) bRet=true;
}
return bRet;
}
-sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
+bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
{
SetActualWin(pWin);
- sal_Bool bRet=SdrCreateView::Command(rCEvt,pWin);
+ bool bRet = SdrCreateView::Command(rCEvt,pWin);
return bRet;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 06:34:08 +0000