[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sc/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 18 08:57:24 UTC 2019
cui/uiconfig/ui/hyperlinkdocpage.ui | 13 +++++++++----
cui/uiconfig/ui/hyperlinkinternetpage.ui | 10 ++++++++--
cui/uiconfig/ui/hyperlinkmailpage.ui | 13 +++++++++----
cui/uiconfig/ui/hyperlinknewdocpage.ui | 12 ++++++++----
sc/source/ui/drawfunc/fuins1.cxx | 4 ++--
5 files changed, 36 insertions(+), 16 deletions(-)
New commits:
commit e031303dc72560ca8aa0ad99e632ec25372628ea
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 17 20:39:05 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 18 10:56:24 2019 +0200
cid#1448339 Use after free
Change-Id: I3259e0fe9ebaba819d529af2fdb003ce9a297961
Reviewed-on: https://gerrit.libreoffice.org/75813
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index dbd403fe0573..11e2290d08ff 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -198,12 +198,12 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
// don't select if from (dispatch) API, to allow subsequent cell operations
SdrInsertFlags nInsOptions = bApi ? SdrInsertFlags::DONTMARK : SdrInsertFlags::NONE;
- pView->InsertObjectAtView( pObj, *pPV, nInsOptions );
+ bool bSuccess = pView->InsertObjectAtView( pObj, *pPV, nInsOptions );
// SetGraphicLink has to be used after inserting the object,
// otherwise an empty graphic is swapped in and the contact stuff crashes.
// See #i37444#.
- if ( bAsLink )
+ if (bSuccess && bAsLink)
pObj->SetGraphicLink( rFileName, ""/*TODO?*/, rFilterName );
}
commit 2e649291ef4146131eb0dd5592258f11cf9184e6
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 17 21:37:47 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 18 10:56:09 2019 +0200
Resolves: tdf#126448 set activates_default and correct focus settings
Change-Id: Ia857c37b7f5947e7339ba5f80aad54112ff2c3f7
Reviewed-on: https://gerrit.libreoffice.org/75818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui
index 45d8af5cd189..a58d2038476e 100644
--- a/cui/uiconfig/ui/hyperlinkdocpage.ui
+++ b/cui/uiconfig/ui/hyperlinkdocpage.ui
@@ -72,12 +72,13 @@
<child>
<object class="GtkComboBoxText" id="path">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
@@ -172,6 +173,7 @@
<object class="GtkEntry" id="target">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -284,6 +286,7 @@
<object class="GtkEntry" id="indication">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -294,6 +297,7 @@
<object class="GtkEntry" id="name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -324,7 +328,7 @@
<child>
<object class="GtkComboBoxText" id="form">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
@@ -353,7 +357,8 @@
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index f7efdce50f52..5eb3fd60da6d 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -126,6 +126,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -137,6 +138,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -161,12 +163,13 @@
<child>
<object class="GtkComboBoxText" id="target">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
@@ -271,6 +274,7 @@
<object class="GtkEntry" id="indication">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -281,6 +285,7 @@
<object class="GtkEntry" id="name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -311,7 +316,7 @@
<child>
<object class="GtkComboBoxText" id="form">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
@@ -341,6 +346,7 @@
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui
index 89c2c84472e2..d690b54a2cae 100644
--- a/cui/uiconfig/ui/hyperlinkmailpage.ui
+++ b/cui/uiconfig/ui/hyperlinkmailpage.ui
@@ -85,6 +85,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -94,12 +95,13 @@
<child>
<object class="GtkComboBoxText" id="receiver">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
@@ -210,6 +212,7 @@
<object class="GtkEntry" id="indication">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -220,6 +223,7 @@
<object class="GtkEntry" id="name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -250,7 +254,7 @@
<child>
<object class="GtkComboBoxText" id="form">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
@@ -279,7 +283,8 @@
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
diff --git a/cui/uiconfig/ui/hyperlinknewdocpage.ui b/cui/uiconfig/ui/hyperlinknewdocpage.ui
index d31411da48af..107287220d8c 100644
--- a/cui/uiconfig/ui/hyperlinknewdocpage.ui
+++ b/cui/uiconfig/ui/hyperlinknewdocpage.ui
@@ -140,12 +140,13 @@
<child>
<object class="GtkComboBoxText" id="path">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
@@ -290,6 +291,7 @@
<object class="GtkEntry" id="indication">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -300,6 +302,7 @@
<object class="GtkEntry" id="name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -329,7 +332,7 @@
<child>
<object class="GtkComboBoxText" id="form">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
@@ -358,7 +361,8 @@
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
More information about the Libreoffice-commits
mailing list