eaf094f7f2
and simplify the destruction - we only ever called ReleaseInterface
on destruction, so no need to bother with that, and risk touching
pointers that might be nullptr
Specifically, the problem is this code
pImpl->pSlotPool.reset();
which triggered the path
~SfxSlotPool -> ~SfxInterface -> SfxGetpApp()->GetAppSlotPool_Impl()
which crashes because the pSlotPool pointer is null at that point
Change-Id: I8577760d09be598926623d6eb5500969e07dd6f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100624
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
74 lines
2.3 KiB
C++
74 lines
2.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#ifndef INCLUDED_SFX2_MSGPOOL_HXX
|
|
#define INCLUDED_SFX2_MSGPOOL_HXX
|
|
|
|
#include <rtl/ustring.hxx>
|
|
#include <sal/config.h>
|
|
#include <sal/types.h>
|
|
#include <sfx2/dllapi.h>
|
|
#include <sfx2/groupid.hxx>
|
|
#include <vector>
|
|
|
|
class SfxInterface;
|
|
class SfxSlot;
|
|
class SfxViewFrame;
|
|
|
|
class SFX2_DLLPUBLIC SfxSlotPool
|
|
{
|
|
std::vector<SfxGroupId> _vGroups;
|
|
SfxSlotPool* _pParentPool;
|
|
std::vector<SfxInterface*> _vInterfaces;
|
|
sal_uInt16 _nCurGroup;
|
|
sal_uInt16 _nCurInterface;
|
|
sal_uInt16 _nCurMsg;
|
|
|
|
private:
|
|
const SfxSlot* SeekSlot( sal_uInt16 nObject );
|
|
|
|
public:
|
|
SfxSlotPool(SfxSlotPool* pParent=nullptr);
|
|
~SfxSlotPool();
|
|
|
|
void RegisterInterface( SfxInterface& rFace );
|
|
|
|
static SfxSlotPool& GetSlotPool( SfxViewFrame *pFrame=nullptr );
|
|
|
|
sal_uInt16 GetGroupCount() const;
|
|
OUString SeekGroup( sal_uInt16 nNo );
|
|
const SfxSlot* FirstSlot();
|
|
const SfxSlot* NextSlot();
|
|
const SfxSlot* GetSlot( sal_uInt16 nId ) const;
|
|
const SfxSlot* GetUnoSlot( const OUString& rUnoName ) const;
|
|
const std::type_info* GetSlotType( sal_uInt16 nSlotId ) const;
|
|
};
|
|
|
|
|
|
// seeks to the first func in the current group
|
|
|
|
inline const SfxSlot* SfxSlotPool::FirstSlot()
|
|
{
|
|
return SeekSlot(0);
|
|
}
|
|
|
|
#define SFX_SLOTPOOL() SfxSlotPool::GetSlotPool()
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|