diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-07-22 19:57:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-07-23 11:53:27 +0200 |
| commit | 7e355206fe882b01fff676ab572feed595a94ff8 (patch) | |
| tree | 3e2c4f49875f405438f937bdf4c3707585b6659a /sd | |
| parent | d6f6bcec4dbfa30c199cb5f4db7bea88ebbeb85d (diff) | |
cid#1538306 Uncaught exception
and
cid#1538308 Uncaught exception
Change-Id: Ifd274b71e9fc1d744799451f460fdcb0ee1ca91d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154791
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index eba78ce17fb7..008c9459e1c4 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -397,7 +397,7 @@ private: OUString aNames[SdLinkTargetType::Count]; public: - SdDocLinkTargets( SdXImpressDocument& rMyModel ) noexcept; + SdDocLinkTargets(SdXImpressDocument& rMyModel); virtual ~SdDocLinkTargets() noexcept override; // XNameAccess @@ -429,7 +429,7 @@ class SdDocLinkTargetType final : public ::cppu::WeakImplHelper< css::document:: OUString maName; public: - SdDocLinkTargetType(SdXImpressDocument* pModel, sal_uInt16 nT) noexcept; + SdDocLinkTargetType(SdXImpressDocument* pModel, sal_uInt16 nT); // css::document::XLinkTargetSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() override; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 3350da8b92e5..9f906dc404a0 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -3390,9 +3390,8 @@ uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames return { "com.sun.star.drawing.MasterPages" }; } - -SdDocLinkTargets::SdDocLinkTargets( SdXImpressDocument& rMyModel ) noexcept -: mpModel( &rMyModel ) +SdDocLinkTargets::SdDocLinkTargets(SdXImpressDocument& rMyModel) + : mpModel(&rMyModel) { for (sal_uInt16 i=0; i < SdLinkTargetType::Count; i++) aNames[i] = SdResId(aTypeResIds[i]); @@ -3508,7 +3507,7 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames() return { "com.sun.star.document.LinkTargets" }; } -SdDocLinkTargetType::SdDocLinkTargetType(SdXImpressDocument* pModel, sal_uInt16 nT) noexcept +SdDocLinkTargetType::SdDocLinkTargetType(SdXImpressDocument* pModel, sal_uInt16 nT) : mpModel(pModel) , mnType(nT) { |