Switch transition selection pane to use an icon-based ValueSet.

Also enlarge the (rather ugly) sample icons.

Change-Id: I6d64613b71ee015bf775a7c720c5b9a4ea464bab
Reviewed-on: https://gerrit.libreoffice.org/19892Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

include/svtools/valueset.hxx

@@ -89,7 +89,7 @@ WB_NONEFIELD        There is a NoSelection field which can be selected if
                     is selected. This field shows the text which is specified
                     by SetText() respectively no one, if no text was set. With
                     SetNoSelection() the selection can be disabled.
-WB_VSCROLL          A scroolbar will be always shown. The visible number of
+WB_VSCROLL          A scrollbar will be always shown. The visible number of
                     lines have to be specified with SetLineCount() if this
                     flag is set.
 WB_BORDER           A border will be drawn around the window.

sd/source/ui/animations/SlideTransitionPane.hxx

@@ -29,6 +29,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
+#include <svtools/valueset.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <com/sun/star/drawing/XDrawView.hpp>
@@ -69,6 +70,8 @@ public:
 private:
     void updateControls();
     void updateControlState();
+    void updateVariants(size_t nPresetOffset);
+    size_t getPresetOffset(const impl::TransitionEffect &rEffect);
 
     void updateSoundList();
     void openSoundFileDialog();
@@ -90,20 +93,20 @@ private:
     DECL_LINK_TYPED( PlayButtonClicked, Button*, void );
     DECL_LINK_TYPED( AutoPreviewClicked, Button*, void );
 
-    DECL_LINK_TYPED( TransitionSelected, ListBox&, void );
+    DECL_LINK_TYPED( TransitionSelected, ValueSet *, void );
     DECL_LINK_TYPED( AdvanceSlideRadioButtonToggled, RadioButton&, void );
     DECL_LINK_TYPED( AdvanceTimeModified, Edit&, void );
     DECL_LINK_TYPED( VariantListBoxSelected, ListBox&, void );
     DECL_LINK_TYPED( SpeedListBoxSelected, ListBox&, void );
     DECL_LINK_TYPED( SoundListBoxSelected, ListBox&, void );
     DECL_LINK_TYPED( LoopSoundBoxChecked, Button*, void );
-    DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK_TYPED( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
     DECL_LINK_TYPED(LateInitCallback, Timer *, void);
 
     ViewShellBase &   mrBase;
     SdDrawDocument *  mpDrawDoc;
 
-    VclPtr<ListBox>      mpLB_SLIDE_TRANSITIONS;
+    VclPtr<ValueSet>     mpVS_TRANSITION_ICONS;
     VclPtr<FixedText>    mpFT_VARIANT;
     VclPtr<ListBox>      mpLB_VARIANT;
     VclPtr<FixedText>    mpFT_SPEED;
@@ -129,12 +132,6 @@ private:
     tSoundListType  maSoundList;
     mutable OUString maCurrentSoundFile;
 
-    // Map from TransitionSets (as in Effects.xcu) to mpLB_SLIDE_TRANSITIONS entry index.
-    std::map< OUString, int > m_aSetToTransitionLBIndex;
-
-    // The reverse mapping: TransitionSets id of each entry in mpLB_SLIDE_TRANSITIONS.
-    std::vector< OUString > m_aTransitionLBToSet;
-
     // How many variants each transition set has
     std::map< OUString, int > m_aNumVariants;
 

sd/uiconfig/simpress/ui/slidetransitionspanel.ui

@@ -25,21 +25,12 @@
             <property name="can_focus">False</property>
             <property name="vexpand">True</property>
             <child>
-              <object class="GtkAlignment" id="alignment3">
+              <object class="GtkAlignment" id="transitions_icons">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <child>
-                  <object class="GtkTreeView" id="transitions_list:border">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="vexpand">True</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection"/>
-                    </child>
-                  </object>
-                </child>
+                <child/>
               </object>
               <packing>
                 <property name="expand">False</property>