Kaydet (Commit) eaf3c9e5 authored tarafından Noel Grandin's avatar Noel Grandin

tdf#123439 Assert wrt PointerStyle fails when moving cursor over toolbar

regression from
    commit a2b687a8
    Date:   Tue Feb 12 10:12:03 2019 +0200
    Pointer is pointless

Change-Id: I727e68c71f4ebacb9adae83f1f9b43ce999d5374
Reviewed-on: https://gerrit.libreoffice.org/67803Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 29b27aec
......@@ -75,6 +75,8 @@ namespace sd {
FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq)
, aNewPointer(PointerStyle::Arrow)
, aOldPointer(PointerStyle::Arrow)
, bMBDown(false)
, bDragHelpLine(false)
, nHelpLine(0)
......
......@@ -34,6 +34,7 @@ namespace sd {
FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq)
, maPtr(PointerStyle::Arrow)
, mpRefObj(nullptr)
{
}
......
......@@ -50,7 +50,8 @@ FuZoom::FuZoom(
SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq),
bVisible(false),
bStartDrag(false)
bStartDrag(false),
aPtr(PointerStyle::Arrow)
{
}
......
......@@ -434,6 +434,7 @@ SvResizeWindow::SvResizeWindow
VCLXHatchWindow* pWrapper
)
: Window( pParent, WB_CLIPCHILDREN )
, m_aOldPointer(PointerStyle::Arrow)
, m_nMoveGrab( -1 )
, m_bActive( false )
, m_pWrapper( pWrapper )
......
......@@ -198,7 +198,8 @@ SdrCreateView::SdrCreateView(
SdrModel& rSdrModel,
OutputDevice* pOut)
: SdrDragView(rSdrModel, pOut),
mpCreateViewExtraData(new ImpSdrCreateViewExtraData())
mpCreateViewExtraData(new ImpSdrCreateViewExtraData()),
aCurrentCreatePointer(PointerStyle::Arrow)
{
ImpClearVars();
}
......
......@@ -22,7 +22,7 @@
#include <toolkit/helper/macros.hxx>
#include <cppuhelper/supportsservice.hxx>
VCLXPointer::VCLXPointer()
VCLXPointer::VCLXPointer() : maPointer(PointerStyle::Arrow)
{
}
......
......@@ -36,6 +36,7 @@ using namespace css;
FixedHyperlink::FixedHyperlink(vcl::Window* pParent, WinBits nWinStyle)
: FixedText(pParent, nWinStyle)
, m_nTextLen(0)
, m_aOldPointer(PointerStyle::Arrow)
{
Initialize();
}
......
......@@ -44,6 +44,7 @@
#include <vcl/virdev.hxx>
#include <vcl/settings.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/ptrstyle.hxx>
#include <vcl/IDialogRenderable.hxx>
#include <vcl/uitest/uiobject.hxx>
......@@ -612,6 +613,7 @@ WindowImpl::WindowImpl( WindowType nType )
mnEventListenersIteratingCount = 0;
mnChildEventListenersIteratingCount = 0;
mpCursor = nullptr; // cursor
maPointer = PointerStyle::Arrow;
mpVCLXWindow = nullptr;
mpAccessibleInfos = nullptr;
maControlForeground = COL_TRANSPARENT; // no foreground set
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment