[Libreoffice-commits] core.git: 2 commits - extras/source sd/Library_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk solenv/clang-format solenv/sanitizers
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sat Dec 21 14:40:52 UTC 2019
extras/source/glade/libreoffice-catalog.xml.in | 3
sd/Library_sd.mk | 1
sd/UIConfig_simpress.mk | 1
sd/source/ui/animations/SlideTransitionBox.cxx | 87 ----
sd/source/ui/animations/SlideTransitionPane.cxx | 25 -
sd/source/ui/inc/SlideTransitionPane.hxx | 7
sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui | 264 -------------
solenv/clang-format/blacklist | 1
solenv/sanitizers/ui/modules/simpress.suppr | 6
9 files changed, 1 insertion(+), 394 deletions(-)
New commits:
commit c1ed2a821234b02529bf949214d0dd26aaa4330c
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Dec 21 12:49:24 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Dec 21 15:39:32 2019 +0100
so horizontal SlideTransitionPane is also unused
since...
commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3
Date: Wed Apr 18 00:04:09 2018 +0200
NB Impress tabbed toolbar big update
Change-Id: Icfe7201caea8337dca051c188c071809e8eb0670
Reviewed-on: https://gerrit.libreoffice.org/85655
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index aecdecff39ed..c5526412d883 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -149,7 +149,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/slidecontextmenu \
sd/uiconfig/simpress/ui/slidedesigndialog \
sd/uiconfig/simpress/ui/slidetransitionspanel \
- sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal \
sd/uiconfig/simpress/ui/tabledesignpanel \
sd/uiconfig/simpress/ui/templatedialog \
))
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 18da6d42a124..abe300766881 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -405,26 +405,6 @@ SlideTransitionPane::SlideTransitionPane(
mbHasSelection( false ),
mbUpdatingControls( false ),
mbIsMainViewChangePending( false ),
- mbHorizontalLayout( false ),
- maLateInitTimer()
-{
- Initialize(pDoc);
-}
-
-SlideTransitionPane::SlideTransitionPane(
- Window * pParent,
- ViewShellBase & rBase,
- SdDrawDocument* pDoc,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
- bool /*bHorizontalLayout*/ ) :
- PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanelhorizontal.ui", rxFrame, true ),
-
- mrBase( rBase ),
- mpDrawDoc( pDoc ),
- mbHasSelection( false ),
- mbUpdatingControls( false ),
- mbIsMainViewChangePending( false ),
- mbHorizontalLayout( true ),
maLateInitTimer()
{
Initialize(pDoc);
@@ -535,10 +515,7 @@ void SlideTransitionPane::DataChanged (const DataChangedEvent&)
void SlideTransitionPane::UpdateLook()
{
- if( mbHorizontalLayout )
- SetBackground(Wallpaper());
- else
- SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
+ SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
}
void SlideTransitionPane::onSelectionChanged()
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx
index 7b0d52a9cff3..1b506b39bb48 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -53,12 +53,6 @@ public:
ViewShellBase & rBase,
SdDrawDocument* pDoc,
const css::uno::Reference<css::frame::XFrame>& rxFrame );
- explicit SlideTransitionPane(
- Window * pParent,
- ViewShellBase & rBase,
- SdDrawDocument* pDoc,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
- bool bHorizontalLayout );
virtual ~SlideTransitionPane() override;
virtual void dispose() override;
@@ -130,7 +124,6 @@ private:
bool mbHasSelection;
bool mbUpdatingControls;
bool mbIsMainViewChangePending;
- bool const mbHorizontalLayout;
std::vector<OUString> maSoundList;
mutable OUString maCurrentSoundFile;
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
deleted file mode 100644
index fbf0c161fd75..000000000000
--- a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface domain="sd">
- <requires lib="gtk+" version="3.18"/>
- <object class="GtkBox" id="SlideTransitionsPanel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkAlignment" id="transitions_icons">
- <property name="width_request">500</property>
- <property name="height_request">75</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <property name="valign">center</property>
- <child>
- <object class="GtkLabel" id="duration_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|duration_label">Duration:</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="VclComboBoxNumeric" id="transition_duration:0.00sec">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="slidetransitionspanelhorizontal|transition_duration|tooltip_text">Select the speed of Slide Transition.</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="variant_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|variant_label">Variant:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="variant_list">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="sound_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|sound_label">Sound:</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="sound_list">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">No sound</item>
- <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Stop previous sound</item>
- <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Other sound...</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="loop_sound">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|loop_sound">Loop until next sound</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="rb_mouse_click">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_mouse_click">On mouse click</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">rb_auto_after</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="rb_auto_after">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_auto_after">Automatically after:</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="auto_after_value:0sec">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">5</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="auto_preview">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|auto_preview">Automatic Preview</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">6</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButtonBox" id="buttonbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">center</property>
- <child>
- <object class="GtkButton" id="apply_to_all">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|apply_to_all">Apply Transition to All Slides</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">center</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">6</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="play">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|play">Play</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image1</property>
- <property name="image_position">right</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="left_attach">7</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">sd/res/playblue_16.png</property>
- </object>
-</interface>
diff --git a/solenv/sanitizers/ui/modules/simpress.suppr b/solenv/sanitizers/ui/modules/simpress.suppr
index 22b2c753ffc2..0198d032789d 100644
--- a/solenv/sanitizers/ui/modules/simpress.suppr
+++ b/solenv/sanitizers/ui/modules/simpress.suppr
@@ -36,9 +36,3 @@ sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='masterlabel']
sd/uiconfig/simpress/ui/sidebarslidebackground.ui://svxlo-SvxFillAttrBox[@id='fillattr1'] no-labelled-by
sd/uiconfig/simpress/ui/sidebarslidebackground.ui://svxcorelo-SvxColorListBox[@id='fillattr2'] no-labelled-by
sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='customlabel'] orphan-label
-sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui://GtkLabel[@id='duration_label'] orphan-label
-sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui://GtkLabel[@id='variant_label'] orphan-label
-sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui://GtkComboBox[@id='variant_list'] no-labelled-by
-sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui://GtkLabel[@id='sound_label'] orphan-label
-sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui://GtkComboBoxText[@id='sound_list'] no-labelled-by
-sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui://GtkSpinButton[@id='auto_after_value:0sec'] no-labelled-by
commit d46f0bc1458f7f2094bd554a372c4651fe9e7a6d
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Dec 21 12:46:54 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Dec 21 15:39:03 2019 +0100
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
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
More information about the Libreoffice-commits
mailing list