summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/help.cxx19
1 files changed, 13 insertions, 6 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index b7cf9f4d4b6b..784dc3ea86fb 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -573,13 +573,20 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime )
void ImplDestroyHelpWindow(ImplSVHelpData& rHelpData, bool bUpdateHideTime)
{
VclPtr<HelpTextWindow> pHelpWin = rHelpData.mpHelpWin;
- if ( pHelpWin )
+ if( pHelpWin )
{
- vcl::Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
- // find out screen area covered by system help window
- tools::Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow ) );
- if( pHelpWin->IsVisible() )
- pWindow->Invalidate( aInvRect );
+ vcl::Window * pParent = pHelpWin->GetParent();
+ if( pParent )
+ {
+ VclPtr<vcl::Window> pWindow( pParent->ImplGetFrameWindow() );
+ if( pWindow )
+ {
+ // find out screen area covered by system help window
+ tools::Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow ) );
+ if( pHelpWin->IsVisible() )
+ pWindow->Invalidate( aInvRect );
+ }
+ }
rHelpData.mpHelpWin = nullptr;
rHelpData.mbKeyboardHelp = false;
pHelpWin->Hide();
Namara 2011-08-30callcatcher: chop, hack, slayCaolán McNamara 2011-08-30ditch a few moreCaolán McNamara 2011-08-29use standard copy-ctor signatures, assignments, etcCaolán McNamara 2011-08-19icui18n -> icuin on Windows. Now lotuswordpro builds.Kohei Yoshida 2011-08-10prefer makefile-gmake-mode to plain makefile-modeTakeshi Abe 2011-08-05fix up wrong .cxxCaolán McNamara 2011-08-05callcatcher: unused methodsCaolán McNamara 2011-07-30Add consistent Emacs and vim mode linesTor Lillqvist 2011-07-26icu libs are externalDavid Tardon 2011-06-18remove all traces of offuh from makefilesDavid Tardon 2011-04-24keep the linked_libs lists sortedDavid Tardon 2011-04-16I don't think we need iculeCaolán McNamara 2011-04-14remove unused filesDavid Tardon 2011-04-14gbuildize lotuswordproDavid Tardon