summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 0c4ed113f6c7..2232c7b8d4cd 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -44,7 +44,6 @@
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <vcl/canvastools.hxx>
-#include <vcl/menu.hxx>
#include <vcl/metric.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -274,14 +273,11 @@ void SwHeaderFooterWin::ShowAll(bool bShow)
m_xMenuButton->set_visible(!bIsEmptyHeaderFooter);
m_xPushButton->set_visible(bIsEmptyHeaderFooter);
- if (!PopupMenu::IsInExecute())
- {
- m_bIsAppearing = bShow;
+ m_bIsAppearing = bShow;
- if (m_aFadeTimer.IsActive())
- m_aFadeTimer.Stop();
- m_aFadeTimer.Start();
- }
+ if (m_aFadeTimer.IsActive())
+ m_aFadeTimer.Stop();
+ m_aFadeTimer.Start();
}
bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const