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& 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& rxFrame ); - explicit SlideTransitionPane( - Window * pParent, - ViewShellBase & rBase, - SdDrawDocument* pDoc, - const css::uno::Reference& 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 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 @@ - - - - - - True - False - True - vertical - - - True - False - True - 12 - - - True - False - - - 500 - 75 - True - False - True - - - - - - False - True - 0 - - - - - False - True - 0 - - - - - True - False - 12 - center - - - True - False - end - Duration: - 0 - - - 0 - 1 - - - - - True - False - True - Select the speed of Slide Transition. - True - - - 1 - 1 - - - - - True - False - Variant: - - - 0 - 0 - - - - - True - False - - - 1 - 0 - - - - - True - False - end - Sound: - - - 2 - 0 - - - - - True - False - True - - No sound - Stop previous sound - Other sound... - - - - 3 - 0 - - - - - Loop until next sound - True - True - False - True - 0 - True - - - 3 - 1 - - - - - On mouse click - True - True - False - True - 0 - True - True - rb_auto_after - - - 4 - 0 - 2 - - - - - Automatically after: - True - True - False - True - 0 - True - True - - - 4 - 1 - - - - - True - True - 2 - - - 5 - 1 - - - - - Automatic Preview - True - True - False - True - 0 - True - - - 6 - 1 - - - - - True - False - center - - - Apply Transition to All Slides - True - True - True - center - - - False - True - 0 - - - - - 6 - 0 - 2 - - - - - Play - True - True - True - image1 - right - True - - - 7 - 1 - - - - - - - - False - True - 1 - - - - - True - True - 0 - - - - - True - False - sd/res/playblue_16.png - - 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