extras/source/glade/libreoffice-catalog.xml.in | 3
sd/Library_sd.mk | 1
sd/source/ui/animations/CustomAnimationBox.cxx | 81 -------------------------
solenv/clang-format/blacklist | 1
4 files changed, 86 deletions(-)
New commits:
commit 19997cdac6bbb046f3f7dc0b1f57c42bd05fc8c8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 21 17:40:40 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 22 09:48:45 2019 +0100
CustomAnimationBox is unused
since...
commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3
Date: Wed Apr 18 00:04:09 2018 +0200
NB Impress tabbed toolbar big update
Reviewed-on: https://gerrit.libreoffice.org/53072
Change-Id: I45f099d2521db576089e8d555f7ccc8fef6d49bc
Reviewed-on: https://gerrit.libreoffice.org/69535
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 56970ed760c8..b746936d8ecf 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -489,9 +489,6 @@
<glade-widget-class title="Table Design Control" name="sdlo-TableDesignBox"
generic-name="TableDesignBox" parent="GtkImage"
icon-name="widget-gtk-image"/>
- <glade-widget-class title="Animation" name="sdlo-CustomAnimationBox"
- generic-name="CustomAnimationBox" parent="GtkImage"
- icon-name="widget-gtk-image"/>
<glade-widget-class title="Box which can move own content to the popup"
name="sfxlo-DropdownBox"
generic-name="DropdownBox" parent="GtkBox"
icon-name="widget-gtk-box"/>
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 67109b97c960..e0cff8ce0d2c 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -182,7 +182,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/accessibility/AccessibleViewForwarder \
sd/source/ui/accessibility/SdShapeTypes \
sd/source/ui/animations/CategoryListBox \
- sd/source/ui/animations/CustomAnimationBox \
sd/source/ui/animations/CustomAnimationDialog \
sd/source/ui/animations/CustomAnimationList \
sd/source/ui/animations/CustomAnimationPane \
diff --git a/sd/source/ui/animations/CustomAnimationBox.cxx
b/sd/source/ui/animations/CustomAnimationBox.cxx
deleted file mode 100644
index 02487e2a513d..000000000000
--- a/sd/source/ui/animations/CustomAnimationBox.cxx
+++ /dev/null
@@ -1,81 +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 <sfx2/viewfrm.hxx>
-#include "CustomAnimationPane.hxx"
-#include <vcl/builderfactory.hxx>
-#include <vcl/layout.hxx>
-
-namespace sd
-{
-
-class CustomAnimationBox : public VclVBox
-{
- VclPtr<CustomAnimationPane> m_pPane;
- bool m_bIsInitialized;
-
-public:
- explicit CustomAnimationBox(vcl::Window* pParent);
- ~CustomAnimationBox() override;
-
- virtual void dispose() override;
- virtual void StateChanged(StateChangedType nStateChange) override;
-};
-
-VCL_BUILDER_FACTORY(CustomAnimationBox);
-
-CustomAnimationBox::CustomAnimationBox(vcl::Window* pParent)
- : VclVBox(pParent)
- , m_bIsInitialized(false)
-{
-}
-
-CustomAnimationBox::~CustomAnimationBox()
-{
- disposeOnce();
-}
-
-void CustomAnimationBox::dispose()
-{
- m_pPane.disposeAndClear();
- VclVBox::dispose();
-}
-
-void CustomAnimationBox::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;
- m_pPane = VclPtr<CustomAnimationPane>::Create(this, *pBase,
xFrame, true);
- 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 b48cd3acaa3e..2f817031469c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -11868,7 +11868,6 @@ sd/source/ui/accessibility/AccessibleViewForwarder.cxx
sd/source/ui/accessibility/SdShapeTypes.cxx
sd/source/ui/animations/CategoryListBox.cxx
sd/source/ui/animations/CategoryListBox.hxx
-sd/source/ui/animations/CustomAnimationBox.cxx
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/animations/CustomAnimationDialog.hxx
sd/source/ui/animations/CustomAnimationList.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
