sd/source/ui/view/OutlinerIterator.cxx | 1 +
vcl/unx/generic/dtrans/X11_selection.cxx | 2 +-
vcl/unx/generic/dtrans/X11_selection.hxx | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6b6e044e05d272d89095b7f05f863c31da0da784
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 10:24:35 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 17 09:54:55 2022 +0200
cid#1500519 Using a moved object
make this more clear, expected to be null at this point
Change-Id: I0ba06f1b540f53cc2ab70701cb037b9aabbd76fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138383
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/view/OutlinerIterator.cxx
b/sd/source/ui/view/OutlinerIterator.cxx
index c2453b622119..70b1a34222f8 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -675,6 +675,7 @@ void ViewIteratorImpl::Reverse()
// Move iterator to the current object.
::tools::WeakReference<SdrObject> xObject = std::move(maPosition.mxObject);
+ maPosition.mxObject.reset(nullptr);
if (!mpObjectIterator)
return;
commit 3d0f3a1a6fdc677507a8274e5882aca26cf98a22
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 10:19:08 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 17 09:54:42 2022 +0200
cid#1509309 Use of 32-bit time_t
and
cid#1509292 Use of 32-bit time_t
cid#1509217 Use of 32-bit time_t
Change-Id: Icf1b2fa43e706c6d3ff783cf9bcfb5a345b8d50b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138382
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index d35b496bf265..175da5308e08 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -1948,7 +1948,7 @@ bool SelectionManager::handleSendPropertyNotify(
XPropertyEvent const & rNotify
if( it != m_aIncrementals.end() )
{
bHandled = true;
- int nCurrentTime = time( nullptr );
+ time_t nCurrentTime = time( nullptr );
// throw out aborted transfers
std::vector< Atom > aTimeouts;
for (auto const& incrementalTransfer : it->second)
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx
b/vcl/unx/generic/dtrans/X11_selection.hxx
index c0ae171c621e..bbfe07e5f6b9 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -166,7 +166,7 @@ namespace x11 {
Atom m_aProperty;
Atom m_aTarget;
int m_nFormat;
- int m_nTransferStartTime;
+ time_t m_nTransferStartTime;
};
int m_nIncrementalThreshold;
@@ -190,7 +190,7 @@ namespace x11 {
// m_aNativeTypes contains the corresponding original atom
Atom m_aRequestedType;
// m_aRequestedType is only valid while WaitingForResponse and
WaitingFotData
- int m_nLastTimestamp;
+ time_t m_nLastTimestamp;
bool m_bHaveUTF16;
Atom m_aUTF8Type;
bool m_bHaveCompound;
