helpcompiler/source/HelpLinker.cxx | 2 +-
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 6 +++---
sd/source/ui/unoidl/DrawController.cxx | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit bc401b98501ef10955ba2eb35ee29d2cf5b0e758
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jul 18 10:09:30 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jul 18 16:20:00 2019 +0200
cid#703974 Unchecked return value
Change-Id: I833175e7687df88719d4d946cf97181158187c67
Reviewed-on: https://gerrit.libreoffice.org/75840
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index fc5894b080ad..b5a488f3dbc0 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -910,7 +910,7 @@ bool compileExtensionHelp
sal_uInt64 ret, len = aFileStatus.getFileSize();
std::unique_ptr<char[]> s(new char[ int(len) ]); // the buffer to
hold the installed files
osl::File aFile( aTreeFileURL );
- aFile.open( osl_File_OpenFlag_Read );
+ (void)aFile.open( osl_File_OpenFlag_Read );
aFile.read( s.get(), len, ret );
aFile.close();
commit 36d27bb2aec2c2375342d1652501b8874e750a2f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jul 18 10:13:35 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jul 18 16:19:43 2019 +0200
cid#1311945 Uncaught exception
Change-Id: I1f3c2d3e644c4cbb4e38740c05a623864219313e
Reviewed-on: https://gerrit.libreoffice.org/75843
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/unoidl/DrawController.cxx
b/sd/source/ui/unoidl/DrawController.cxx
index 44ae57e10545..0024a1a568b3 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -429,7 +429,7 @@ void DrawController::FireSwitchCurrentPage (SdPage*
pNewCurrentPage) throw()
}
catch (const uno::Exception&)
{
- css::uno::Any ex( cppu::getCaughtException() );
+ css::uno::Any ex(DbgGetCaughtException());
SAL_WARN("sd", "sd::SdUnoDrawView::FireSwitchCurrentPage(), exception
caught: " << exceptionToString(ex));
}
}
commit 6944f42bbbf555a6aa23fe9f37439a803762d4ce
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jul 18 10:19:07 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jul 18 16:19:28 2019 +0200
cid#1424266 Uncaught exception
Change-Id: I5e7373dbaef52184327596d029ab63baf57764d9
Reviewed-on: https://gerrit.libreoffice.org/75844
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 8b36fbb7604e..e544b75eba10 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -333,7 +333,7 @@ bool SlideSorterController::Command (
else
aPopupId = "pagepanenoselmaster";
- std::unique_ptr<InsertionIndicatorHandler::ForceShowContext>
pContext;
+ std::unique_ptr<InsertionIndicatorHandler::ForceShowContext,
o3tl::default_delete<InsertionIndicatorHandler::ForceShowContext>> xContext;
if (pPage == nullptr)
{
// When there is no selection, then we show the insertion
@@ -344,7 +344,7 @@ bool SlideSorterController::Command (
mpInsertionIndicatorHandler->UpdatePosition(
pWindow->PixelToLogic(rEvent.GetMousePosPixel()),
InsertionIndicatorHandler::MoveMode);
- pContext.reset(new InsertionIndicatorHandler::ForceShowContext(
+ xContext.reset(new InsertionIndicatorHandler::ForceShowContext(
mpInsertionIndicatorHandler));
}
@@ -389,7 +389,7 @@ bool SlideSorterController::Command (
GetSelectionManager()->SetInsertionPosition(
GetInsertionIndicatorHandler()->GetInsertionPageIndex());
}
- pContext.reset();
+ xContext.reset();
bEventHasBeenHandled = true;
}
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
