unotools/source/config/configitem.cxx | 3 ++-
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 8c48dd5ac555e37a1ee50f70edcb678d723e62f4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 26 13:51:09 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 26 19:28:45 2021 +0200
cid#1485150 silence Uncaught exception
Change-Id: I123efe9921716dda386d78bdbcf22f9299732b9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119505
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/unotools/source/config/configitem.cxx
b/unotools/source/config/configitem.cxx
index bb77ac3d40b1..152730cec0b1 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
+#include <o3tl/deleter.hxx>
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
#include <comphelper/solarmutex.hxx>
@@ -155,7 +156,7 @@ ConfigItem::ConfigItem(const OUString &rSubTree,
ConfigItemMode nSetMode ) :
ConfigItem::~ConfigItem()
{
- RemoveChangesListener();
+ suppress_fun_call_w_exception(RemoveChangesListener());
ConfigManager::getConfigManager().removeConfigItem(*this);
}
commit 682df20a542e5d113eaa3111db5ff28026987861
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 26 13:46:34 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 26 19:28:32 2021 +0200
cid#1489422 Improper use of negative value
Change-Id: Iffa2f90724ebd84bfa00238e6148daf8b31259c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119503
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index ef90297c5b97..a2e492936b96 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -147,20 +147,20 @@ public:
return;
if ( !sMoved.isEmpty() )
- m_aMoved.end()[-1] = sMoved;
+ m_aMoved[m_aMoved.size() - 1] = sMoved;
else if ( m_aMoved.size() >= 2 )
// next table rows weren't moved
- m_aMoved.end()[-2] = "";
+ m_aMoved[m_aMoved.size() - 2] = "";
else
- m_aMoved.end()[-1] = "";
+ m_aMoved[m_aMoved.size() - 1] = "";
}
OUString getMoved() const
{
- if ( m_aMoved.size() >= 2 && !m_aMoved.end()[-2].isEmpty() )
- return m_aMoved.end()[-2];
+ if ( m_aMoved.size() >= 2 && !m_aMoved[m_aMoved.size() - 2].isEmpty() )
+ return m_aMoved[m_aMoved.size() - 2];
else if ( !m_aMoved.empty() )
- return m_aMoved.end()[-1];
+ return m_aMoved[m_aMoved.size() -1 ];
return OUString();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
