Kaydet (Commit) 8203e556 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1401328 Uncaught exception

Change-Id: I08c91c9c84d53f567332e5780b14173b8c8e5fb1
Reviewed-on: https://gerrit.libreoffice.org/57462
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 9882778b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX #define INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX
#include <ooo/vba/excel/XWorkbook.hpp> #include <ooo/vba/excel/XWorkbook.hpp>
#include <o3tl/deleter.hxx>
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx> #include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx> #include <sfx2/sfxmodelfactory.hxx>
...@@ -113,7 +114,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener ...@@ -113,7 +114,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
std::unique_ptr<ScSheetSaveData> m_pSheetSaveData; std::unique_ptr<ScSheetSaveData> m_pSheetSaveData;
std::unique_ptr<ScFormatSaveData> m_pFormatSaveData; std::unique_ptr<ScFormatSaveData> m_pFormatSaveData;
std::unique_ptr<ScDocShellModificator> m_pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading) std::unique_ptr<ScDocShellModificator, o3tl::default_delete<ScDocShellModificator>> m_pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
css::uno::Reference< ooo::vba::excel::XWorkbook> mxAutomationWorkbookObject; css::uno::Reference< ooo::vba::excel::XWorkbook> mxAutomationWorkbookObject;
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
*/ */
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX #define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
#include <o3tl/deleter.hxx>
#include "atrhndl.hxx" #include "atrhndl.hxx"
#include <swtypes.hxx> #include <swtypes.hxx>
#include <swfont.hxx> #include <swfont.hxx>
#include "porlay.hxx" #include "porlay.hxx"
...@@ -49,7 +49,7 @@ private: ...@@ -49,7 +49,7 @@ private:
VclPtr<OutputDevice> m_pLastOut; VclPtr<OutputDevice> m_pLastOut;
/// count currently open hints, redlines, ext-input /// count currently open hints, redlines, ext-input
short m_nChgCnt; short m_nChgCnt;
std::unique_ptr<SwRedlineItr> m_pRedline; std::unique_ptr<SwRedlineItr, o3tl::default_delete<SwRedlineItr>> m_pRedline;
/// current iteration index in HintStarts /// current iteration index in HintStarts
size_t m_nStartIndex; size_t m_nStartIndex;
/// current iteration index in HintEnds /// current iteration index in HintEnds
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment