sc/source/filter/excel/xlformula.cxx | 14 +++++++-------
solenv/sanitizers/ui/modules/swriter.suppr | 2 --
sw/uiconfig/swriter/ui/alreadyexistsdialog.ui | 6 ++----
3 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit e9f17767845c84f629cafa08392b55602f241b95
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Sep 12 21:46:10 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Sep 13 15:19:11 2020 +0200
fix alreadyexistsdialog mnemonics
Change-Id: Id9c326d28cf7049e692108cdeccef6714c142e2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102540
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr
b/solenv/sanitizers/ui/modules/swriter.suppr
index 8c82a6673a99..b2cad09ff4bc 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -1,7 +1,5 @@
sw/uiconfig/swriter/ui/abstractdialog.ui://GtkLabel[@id='label4'] orphan-label
sw/uiconfig/swriter/ui/addentrydialog.ui://GtkEntry[@id='entry'] no-labelled-by
-sw/uiconfig/swriter/ui/alreadyexistsdialog.ui://GtkEntry[@id='edit1']
no-labelled-by
-sw/uiconfig/swriter/ui/alreadyexistsdialog.ui://GtkLabel[@id='label2']
orphan-label
sw/uiconfig/swriter/ui/asciifilterdialog.ui://GtkLabel[@id='label5']
orphan-label
sw/uiconfig/swriter/ui/attachnamedialog.ui://GtkEntry[@id='edit1']
no-labelled-by
sw/uiconfig/swriter/ui/attachnamedialog.ui://GtkLabel[@id='label2']
orphan-label
diff --git a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
index cd112ebc4313..c8240a16afac 100644
--- a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
+++ b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.36.0 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkMessageDialog" id="AlreadyExistsDialog">
@@ -80,6 +80,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="alreadyexistsdialog|label1">Subject:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">edit1</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -100,8 +101,5 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-5">ok</action-widget>
</action-widgets>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
commit 3cbc46f95f600e1247727383ae9fc1c26683ad46
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Sep 12 16:59:17 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Sep 13 15:18:58 2020 +0200
lclGetAddress is never passed a null ScDocument*
Change-Id: Id35446e25eb9b685849ff6be703acd56a65d2013
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102532
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index adafca569352..ad2f384234ff 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -924,14 +924,14 @@ void XclTokenArrayHelper::ConvertStringToList(
namespace {
-bool lclGetAddress( const ScDocument* pDoc, ScAddress& rAddress, const
FormulaToken& rToken, const ScAddress& rPos )
+bool lclGetAddress( const ScDocument& rDoc, ScAddress& rAddress, const
FormulaToken& rToken, const ScAddress& rPos )
{
OpCode eOpCode = rToken.GetOpCode();
bool bIsSingleRef = (eOpCode == ocPush) && (rToken.GetType() ==
svSingleRef);
if( bIsSingleRef )
{
const ScSingleRefData& rRef = *rToken.GetSingleRef();
- rAddress = rRef.toAbs(*pDoc, rPos);
+ rAddress = rRef.toAbs(rDoc, rPos);
bIsSingleRef = !rRef.IsDeleted();
}
return bIsSingleRef;
@@ -963,32 +963,32 @@ bool XclTokenArrayHelper::GetMultipleOpRefs(
eState = (eOpCode == ocOpen) ? stOpen : stError;
break;
case stOpen:
- eState = lclGetAddress(&rDoc, rRefs.maFmlaScPos, *aIt, rScPos)
? stFormula : stError;
+ eState = lclGetAddress(rDoc, rRefs.maFmlaScPos, *aIt, rScPos)
? stFormula : stError;
break;
case stFormula:
eState = bIsSep ? stFormulaSep : stError;
break;
case stFormulaSep:
- eState = lclGetAddress(&rDoc, rRefs.maColFirstScPos, *aIt,
rScPos) ? stColFirst : stError;
+ eState = lclGetAddress(rDoc, rRefs.maColFirstScPos, *aIt,
rScPos) ? stColFirst : stError;
break;
case stColFirst:
eState = bIsSep ? stColFirstSep : stError;
break;
case stColFirstSep:
- eState = lclGetAddress(&rDoc, rRefs.maColRelScPos, *aIt,
rScPos) ? stColRel : stError;
+ eState = lclGetAddress(rDoc, rRefs.maColRelScPos, *aIt,
rScPos) ? stColRel : stError;
break;
case stColRel:
eState = bIsSep ? stColRelSep : ((eOpCode == ocClose) ?
stClose : stError);
break;
case stColRelSep:
- eState = lclGetAddress(&rDoc, rRefs.maRowFirstScPos, *aIt,
rScPos) ? stRowFirst : stError;
+ eState = lclGetAddress(rDoc, rRefs.maRowFirstScPos, *aIt,
rScPos) ? stRowFirst : stError;
rRefs.mbDblRefMode = true;
break;
case stRowFirst:
eState = bIsSep ? stRowFirstSep : stError;
break;
case stRowFirstSep:
- eState = lclGetAddress(&rDoc, rRefs.maRowRelScPos, *aIt,
rScPos) ? stRowRel : stError;
+ eState = lclGetAddress(rDoc, rRefs.maRowRelScPos, *aIt,
rScPos) ? stRowRel : stError;
break;
case stRowRel:
eState = (eOpCode == ocClose) ? stClose : stError;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
