diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-05 21:01:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-19 12:09:25 +0100 |
| commit | 97bbffc917deba872090667e9dc096ecec99d557 (patch) | |
| tree | 672bff54843461ff30270a11b726c1a48eea50cd /sd | |
| parent | 5b3592a42cc88a225237efadcc4d110be307303e (diff) | |
weld TreeView
a) use GtkTreeStores for GtkTreeViews
b) ironically can't store GtkTreeStore contents in .ui apparently
c) set show_expanders for all non-trees and unconverted cases
d) on-demand subtrees
Change-Id: I3c1036a222daba2c129b1a22ffeb3fe35005ae31
Reviewed-on: https://gerrit.libreoffice.org/63336
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/customslideshows.ui | 2 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/definecustomslideshow.ui | 4 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/interactionpage.ui | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/photoalbum.ui | 2 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/publishingdialog.ui | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 55edc022eb73..6475a933cfb0 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -551,7 +551,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(getSdrModelFromSdrPage().GetStyleSheetPool()->Find(aName, SfxStyleFamily::Page)); DBG_ASSERT(pSheet, "StyleSheet for outline object not found"); if (pSheet) - pSdrObj->StartListening(*pSheet); + pSdrObj->StartListening(*pSheet, DuplicateHandling::Allow); } } diff --git a/sd/uiconfig/simpress/ui/customslideshows.ui b/sd/uiconfig/simpress/ui/customslideshows.ui index 8397a5856c09..e40a0bd83b67 100644 --- a/sd/uiconfig/simpress/ui/customslideshows.ui +++ b/sd/uiconfig/simpress/ui/customslideshows.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.4 --> <interface domain="sd"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/sd/uiconfig/simpress/ui/definecustomslideshow.ui b/sd/uiconfig/simpress/ui/definecustomslideshow.ui index e6dbd8981910..2bb4e3adc726 100644 --- a/sd/uiconfig/simpress/ui/definecustomslideshow.ui +++ b/sd/uiconfig/simpress/ui/definecustomslideshow.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.4 --> <interface domain="sd"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> @@ -10,7 +10,7 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="liststore2"> + <object class="GtkTreeStore" id="liststore2"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/sd/uiconfig/simpress/ui/interactionpage.ui b/sd/uiconfig/simpress/ui/interactionpage.ui index 0c7135f6820e..6c921d03afc9 100644 --- a/sd/uiconfig/simpress/ui/interactionpage.ui +++ b/sd/uiconfig/simpress/ui/interactionpage.ui @@ -116,6 +116,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index 9ef2c289d5be..9a5ed9618702 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.4 --> <interface domain="sd"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui b/sd/uiconfig/simpress/ui/publishingdialog.ui index 71c351f137cd..2d372a7ba5d6 100644 --- a/sd/uiconfig/simpress/ui/publishingdialog.ui +++ b/sd/uiconfig/simpress/ui/publishingdialog.ui @@ -93,6 +93,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection"/> </child> |