summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/charmap.cxx12
-rw-r--r--svx/source/dialog/connctrl.cxx4
-rw-r--r--svx/source/dialog/dialcontrol.cxx9
-rw-r--r--svx/source/dialog/dlgctrl.cxx9
-rw-r--r--svx/source/dialog/frmsel.cxx4
-rw-r--r--svx/source/dialog/measctrl.cxx4
6 files changed, 30 insertions, 12 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index c43c1f819651..50e1f5b12544 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -123,7 +123,7 @@ void SvxShowCharSet::LoseFocus()
SelectIndex(nSelectedIndex);
}
-void SvxShowCharSet::MouseButtonDown(const MouseEvent& rMEvt)
+bool SvxShowCharSet::MouseButtonDown(const MouseEvent& rMEvt)
{
if ( rMEvt.IsLeft() )
{
@@ -151,9 +151,11 @@ void SvxShowCharSet::MouseButtonDown(const MouseEvent& rMEvt)
SelectIndex( nIndex, true);
createContextMenu();
}
+
+ return true;
}
-void SvxShowCharSet::MouseButtonUp(const MouseEvent& rMEvt)
+bool SvxShowCharSet::MouseButtonUp(const MouseEvent& rMEvt)
{
if ( bDrag && rMEvt.IsLeft() )
{
@@ -163,9 +165,11 @@ void SvxShowCharSet::MouseButtonUp(const MouseEvent& rMEvt)
ReleaseMouse();
bDrag = false;
}
+
+ return true;
}
-void SvxShowCharSet::MouseMove(const MouseEvent& rMEvt)
+bool SvxShowCharSet::MouseMove(const MouseEvent& rMEvt)
{
if ( rMEvt.IsLeft() && bDrag )
{
@@ -185,6 +189,8 @@ void SvxShowCharSet::MouseMove(const MouseEvent& rMEvt)
// Fire the focus event.
SelectIndex( nIndex, true );
}
+
+ return true;
}
sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos)
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index dd0905875e29..0cc49b19c9dd 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -253,7 +253,7 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount()
return nCount;
}
-void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
+bool SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
{
bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
@@ -305,6 +305,8 @@ void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
Invalidate();
}
}
+
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 72c7aec62853..29aab08d5fde 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -531,7 +531,7 @@ void SvxDialControl::StyleUpdated()
InvalidateControl();
}
-void SvxDialControl::MouseButtonDown(const MouseEvent& rMEvt)
+bool SvxDialControl::MouseButtonDown(const MouseEvent& rMEvt)
{
if( rMEvt.IsLeft() )
{
@@ -540,15 +540,17 @@ void SvxDialControl::MouseButtonDown(const MouseEvent& rMEvt)
mpImpl->mnOldAngle = mpImpl->mnAngle;
HandleMouseEvent( rMEvt.GetPosPixel(), true );
}
+ return true;
}
-void SvxDialControl::MouseMove( const MouseEvent& rMEvt )
+bool SvxDialControl::MouseMove( const MouseEvent& rMEvt )
{
if( IsMouseCaptured() && rMEvt.IsLeft() )
HandleMouseEvent( rMEvt.GetPosPixel(), false );
+ return true;
}
-void SvxDialControl::MouseButtonUp(const MouseEvent&)
+bool SvxDialControl::MouseButtonUp(const MouseEvent&)
{
if( IsMouseCaptured() )
{
@@ -556,6 +558,7 @@ void SvxDialControl::MouseButtonUp(const MouseEvent&)
if( mpImpl->mpLinkField )
mpImpl->mpLinkField->grab_focus();
}
+ return true;
}
bool SvxDialControl::KeyInput( const KeyEvent& rKEvt )
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index e5199dcd4e07..7411da47517d 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -188,7 +188,7 @@ void SvxRectCtl::InitSettings(vcl::RenderContext& rRenderContext)
// The clicked rectangle (3 x 3) is determined and the parent (dialog)
// is notified that the item was changed
-void SvxRectCtl::MouseButtonDown(const MouseEvent& rMEvt)
+bool SvxRectCtl::MouseButtonDown(const MouseEvent& rMEvt)
{
// CompletelyDisabled() added to have a disabled state for SvxRectCtl
if(!IsCompletelyDisabled())
@@ -200,6 +200,7 @@ void SvxRectCtl::MouseButtonDown(const MouseEvent& rMEvt)
if (m_pPage)
m_pPage->PointChanged(GetDrawingArea(), eRP);
}
+ return true;
}
bool SvxRectCtl::KeyInput(const KeyEvent& rKeyEvt)
@@ -668,10 +669,10 @@ void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel )
// The clicked rectangle is identified, to change its color
-void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
+bool SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
{
if (!aRectSize.Width() || !aRectSize.Height())
- return;
+ return true;
//Grab focus when click in window
if (!HasFocus())
@@ -685,6 +686,8 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
{
m_xAccess->NotifyChild(nIndex,true, true);
}
+
+ return true;
}
tools::Rectangle SvxPixelCtl::GetFocusRect()
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 7e94afe8816a..ee747175db6f 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -1065,7 +1065,7 @@ void FrameSelector::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
mxImpl->DrawAllTrackingRects(rRenderContext);
}
-void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt )
+bool FrameSelector::MouseButtonDown( const MouseEvent& rMEvt )
{
/* Mouse handling:
* Click on an unselected frame border:
@@ -1149,6 +1149,8 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt )
GetSelectHdl().Call( nullptr );
}
}
+
+ return true;
}
bool FrameSelector::KeyInput( const KeyEvent& rKEvt )
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index eb9d4011da2d..507f7ff34329 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -94,7 +94,7 @@ void SvxXMeasurePreview::SetAttributes(const SfxItemSet& rInAttrs)
Invalidate();
}
-void SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
+bool SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
{
bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
@@ -147,6 +147,8 @@ void SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
Invalidate();
}
}
+
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */