summaryrefslogtreecommitdiffstats
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-17 11:56:18 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-17 12:49:10 +0000
commit681294d55b6b4edcdef08982596cb4bcee32e635 (patch)
treee156116c560a9d989ef4ad0b8e43d17847e6b811 /svtools
parentsfx2 infobar: allow setting the back/foreground color (diff)
downloadcore-681294d55b6b4edcdef08982596cb4bcee32e635.tar.gz
core-681294d55b6b4edcdef08982596cb4bcee32e635.zip
gtk3: use native GtkPopover for calc formula prompt, etc
Change-Id: I9aa7e977228780b6273daa03be5e872342414437
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/datwin.cxx11
-rw-r--r--svtools/source/brwbox/datwin.hxx2
-rw-r--r--svtools/source/table/tabledatawindow.cxx16
-rw-r--r--svtools/source/table/tabledatawindow.hxx1
4 files changed, 4 insertions, 26 deletions
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 03b5bc97e0a0..7df9e0ed5a66 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -713,24 +713,17 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt )
aTip += OUString::number(GetRangeMax());
Rectangle aRect(GetPointerPosPixel(), Size(GetTextWidth(aTip), GetTextHeight()));
- if ( _nTip )
- Help::UpdateTip( _nTip, this, aRect, aTip );
- else
- _nTip = Help::ShowTip( this, aRect, aTip );
+ Help::ShowQuickHelp(this, aRect, aTip);
_nLastPos = nPos;
}
ScrollBar::Tracking( rTEvt );
}
-
void BrowserScrollBar::EndScroll()
{
- if ( _nTip )
- Help::HideTip( _nTip );
- _nTip = 0;
+ Help::HideBalloonAndQuickHelp();
ScrollBar::EndScroll();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 3eb884e6b9d5..7a218617902a 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -178,7 +178,6 @@ protected:
class BrowserScrollBar: public ScrollBar
{
- sal_uLong _nTip;
sal_uLong _nLastPos;
VclPtr<BrowserDataWin> _pDataWin;
@@ -186,7 +185,6 @@ public:
BrowserScrollBar( vcl::Window* pParent, WinBits nStyle,
BrowserDataWin *pDataWin )
: ScrollBar( pParent, nStyle ),
- _nTip( 0 ),
_nLastPos( ULONG_MAX ),
_pDataWin( pDataWin )
{}
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 79ee86c71ac8..8240f5fdae45 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -33,7 +33,6 @@ namespace svt { namespace table
TableDataWindow::TableDataWindow( TableControl_Impl& _rTableControl )
:Window( &_rTableControl.getAntiImpl() )
,m_rTableControl( _rTableControl )
- ,m_nTipWindowHandle( 0 )
{
// by default, use the background as determined by the style settings
const Color aWindowColor( GetSettings().GetStyleSettings().GetFieldColor() );
@@ -123,12 +122,7 @@ namespace svt { namespace table
GetOutputSizePixel()
);
- if ( m_nTipWindowHandle )
- {
- Help::UpdateTip( m_nTipWindowHandle, this, aControlScreenRect, sHelpText );
- }
- else
- m_nTipWindowHandle = Help::ShowTip( this, aControlScreenRect, sHelpText, nHelpStyle );
+ Help::ShowQuickHelp(this, aControlScreenRect, sHelpText, nHelpStyle);
}
else
{
@@ -137,17 +131,11 @@ namespace svt { namespace table
}
}
-
void TableDataWindow::impl_hideTipWindow()
{
- if ( m_nTipWindowHandle != 0 )
- {
- Help::HideTip( m_nTipWindowHandle );
- m_nTipWindowHandle = 0;
- }
+ Help::HideBalloonAndQuickHelp();
}
-
void TableDataWindow::MouseMove( const MouseEvent& rMEvt )
{
if ( rMEvt.IsLeaveWindow() )
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 6507147ac4d4..708d5092523a 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -38,7 +38,6 @@ namespace svt { namespace table
private:
TableControl_Impl& m_rTableControl;
Link<LinkParamNone*,void> m_aSelectHdl;
- sal_uLong m_nTipWindowHandle;
public:
explicit TableDataWindow( TableControl_Impl& _rTableControl );