sc/source/ui/view/prevwsh.cxx | 13 -------------
sc/uiconfig/scalc/ui/notebookbar.ui | 3 ---
2 files changed, 16 deletions(-)
New commits:
commit 6df13f8648baa692910a67d1f9bfe415df3457b4
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Oct 19 02:52:39 2018 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Oct 19 02:52:39 2018 +0200
Revert "Notebookbar: add context-Printpreview to calc tabbed NB"
This reverts commit 3f9c477929c261a8862411c00153e4c7d0d0ae7c.
Breaks the JunitTest_sc_unoapi tests with clang
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 1ad9c412f049..42d6700d0ab5 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -69,9 +69,6 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <scabstdlg.hxx>
-#include <vcl/EnumContext.hxx>
-#include <vcl/notebookbar.hxx>
-
// for mouse wheel
#define MINZOOM_SLIDER 10
#define MAXZOOM_SLIDER 400
@@ -158,13 +155,6 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
{
Construct( &pViewFrame->GetWindow() );
- SfxShell::SetContextBroadcasterEnabled(true);
-
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Printpreview));
- SfxShell::BroadcastContextForActivation(true);
-
- if (auto& pBar =
SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar())
- pBar->ControlListener(true);
-
if ( auto pTabViewShell = dynamic_cast<ScTabViewShell*>( pOldSh) )
{
// store view settings, show table from TabView
@@ -191,9 +181,6 @@ ScPreviewShell::~ScPreviewShell()
if (mpFrameWindow)
mpFrameWindow->SetCloseHdl(Link<SystemWindow&,void>()); // Remove
close handler.
- if (auto& pBar =
SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar())
- pBar->ControlListener(false);
-
// #108333#; notify Accessibility that Shell is dying and before destroy
all
BroadcastAccessibility( SfxHint( SfxHintId::Dying ) );
pAccessibilityBroadcaster.reset();
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 185a2e7fbd86..7f0b9d144572 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -12866,9 +12866,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="CalcNotebookbar|PrintLabel">Print</property>
- <style>
- <class name="context-Printpreview"/>
- </style>
</object>
<packing>
<property name="position">12</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
