diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-12-21 12:46:54 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-21 15:39:03 +0100 |
commit | d46f0bc1458f7f2094bd554a372c4651fe9e7a6d (patch) | |
tree | cd35345a1d76c7c79790939e7e35b18bd840ffee | |
parent | 12c72066c2a0b4cf0ab6c936c4b1bda81a0a1b6a (diff) |
SlideTransitionBox is unused
since...
commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3
Date: Wed Apr 18 00:04:09 2018 +0200
NB Impress tabbed toolbar big update
Change-Id: I599e84f4bec66eff301ab1a92cc1206a47068e02
Reviewed-on: https://gerrit.libreoffice.org/85654
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 3 | ||||
-rw-r--r-- | sd/Library_sd.mk | 1 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionBox.cxx | 87 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 1 |
4 files changed, 0 insertions, 92 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 0b645e40484a..304c7d6dfb04 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -166,9 +166,6 @@ <glade-widget-class title="Notebook switching tabs depending on context" name="sfxlo-NotebookbarTabControl" generic-name="NotebookbarTabControl" parent="GtkNotebook" icon-name="widget-gtk-notebook"/> - <glade-widget-class title="Slide Transition Pane" name="sdlo-SlideTransitionBox" - generic-name="ShowText" parent="GtkToolButton" - icon-name="widget-gtk-toolbutton"/> <glade-widget-class title="Horizontal box hiding children depending on its priorities" name="sfxlo-PriorityHBox" generic-name="PriorityHBox" parent="GtkBox" icon-name="widget-gtk-box"/> diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 410f3c782b29..4b7eefa86669 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -189,7 +189,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/animations/CustomAnimationPane \ sd/source/ui/animations/STLPropertySet \ sd/source/ui/animations/SlideTransitionPane \ - sd/source/ui/animations/SlideTransitionBox \ sd/source/ui/animations/motionpathtag \ sd/source/ui/annotations/annotationmanager \ sd/source/ui/annotations/annotationtag \ diff --git a/sd/source/ui/animations/SlideTransitionBox.cxx b/sd/source/ui/animations/SlideTransitionBox.cxx deleted file mode 100644 index c4ebe697f529..000000000000 --- a/sd/source/ui/animations/SlideTransitionBox.cxx +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <ViewShellBase.hxx> -#include <DrawDocShell.hxx> -#include <sfx2/viewfrm.hxx> -#include <SlideTransitionPane.hxx> -#include <vcl/builderfactory.hxx> -#include <vcl/layout.hxx> - -namespace sd -{ - -namespace { - -class SlideTransitionBox : public VclVBox -{ - VclPtr<SlideTransitionPane> m_pPane; - bool m_bIsInitialized; - -public: - explicit SlideTransitionBox(vcl::Window* pParent); - ~SlideTransitionBox() override; - - virtual void dispose() override; - virtual void StateChanged(StateChangedType nStateChange) override; -}; - -} - -VCL_BUILDER_FACTORY(SlideTransitionBox); - -SlideTransitionBox::SlideTransitionBox(vcl::Window* pParent) - : VclVBox(pParent) - , m_bIsInitialized(false) -{ -} - -SlideTransitionBox::~SlideTransitionBox() -{ - disposeOnce(); -} - -void SlideTransitionBox::dispose() -{ - m_pPane.disposeAndClear(); - VclVBox::dispose(); -} - -void SlideTransitionBox::StateChanged(StateChangedType nStateChange) -{ - if(SfxViewFrame::Current() && !m_bIsInitialized) - { - ViewShellBase* pBase = ViewShellBase::GetViewShellBase(SfxViewFrame::Current()); - - if(pBase && pBase->GetDocShell()) - { - css::uno::Reference<css::frame::XFrame> xFrame; - SdDrawDocument* pDoc = pBase->GetDocShell()->GetDoc(); - m_pPane = VclPtr<SlideTransitionPane>::Create(this, *pBase, pDoc, xFrame, false); - m_pPane->Show(); - m_pPane->SetSizePixel(GetSizePixel()); - m_bIsInitialized = true; - } - } - VclVBox::StateChanged(nStateChange); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 8e63bd2d3087..971fea1bca10 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -11696,7 +11696,6 @@ sd/source/ui/animations/CustomAnimationPane.cxx sd/source/ui/animations/CustomAnimationPane.hxx sd/source/ui/animations/STLPropertySet.cxx sd/source/ui/animations/STLPropertySet.hxx -sd/source/ui/animations/SlideTransitionBox.cxx sd/source/ui/animations/SlideTransitionPane.cxx sd/source/ui/animations/motionpathtag.cxx sd/source/ui/animations/motionpathtag.hxx |