8611f6e259
Which means we can get rid of the majestic hack of ScCaptionPtr Previously, SdrObject was manually managed, and the ownership passed around in very complicated fashion. Notes: (*) SvxShape has a strong reference to SdrObject, where previously it had a weak reference. It is now strong since otherwise the SdrObject will go away very eagerly. (*) SdrObject still has a weak reference to SvxShape (*) In the existing places that an SdrObject is being deleted, we now just clear the reference (*) instead of SwVirtFlyDrawObj removing itself from the page that contains inside it's destructor, make the call site do the removing from the page. (*) Needed to take the SolarMutex in UndoManagerHelper_Impl::impl_clear because this can be called from UNO (e.g. sfx2_complex JUnit test) and the SdrObjects need the SolarMutex when destructing. (*) handle a tricky situation with SwDrawVirtObj in the SwDrawModel destructor because the existing code wants mpDrawObj in SwAnchoredObject to be sometimes owning, sometimes not, which results in a cycle with the new code. Change-Id: I4d79df1660e386388e5d51030653755bca02a163 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138837 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
87 lines
3.2 KiB
C++
87 lines
3.2 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_REPORTDESIGN_INC_RPTPAGE_HXX
|
|
#define INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
|
|
|
|
#include "dllapi.h"
|
|
#include <svx/svdpage.hxx>
|
|
#include <com/sun/star/report/XReportComponent.hpp>
|
|
#include <com/sun/star/report/XSection.hpp>
|
|
|
|
namespace rptui
|
|
{
|
|
|
|
// OReportPage
|
|
|
|
|
|
class OReportModel;
|
|
|
|
class REPORTDESIGN_DLLPUBLIC OReportPage final : public SdrPage
|
|
{
|
|
OReportPage& operator=(const OReportPage&) = delete;
|
|
OReportPage(const OReportPage&) = delete;
|
|
|
|
OReportModel& rModel;
|
|
css::uno::Reference< css::report::XSection > m_xSection;
|
|
bool m_bSpecialInsertMode;
|
|
std::vector<SdrObject*> m_aTemporaryObjectList;
|
|
|
|
// method to remove temporary objects, created by 'special mode'
|
|
// (BegDragObj)
|
|
void removeTempObject(SdrObject const *_pToRemoveObj);
|
|
|
|
virtual ~OReportPage() override;
|
|
|
|
virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
|
|
public:
|
|
|
|
OReportPage( OReportModel& rModel
|
|
,css::uno::Reference< css::report::XSection > _xSection );
|
|
|
|
virtual rtl::Reference<SdrPage> CloneSdrPage(SdrModel& rTargetModel) const override;
|
|
|
|
virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override;
|
|
virtual rtl::Reference<SdrObject> RemoveObject(size_t nObjNum) override;
|
|
|
|
/** returns the index inside the object list which belongs to the report component.
|
|
@param _xObject the report component
|
|
*/
|
|
size_t getIndexOf(const css::uno::Reference< css::report::XReportComponent >& _xObject);
|
|
|
|
/** removes the SdrObject which belongs to the report component.
|
|
@param _xObject the report component
|
|
*/
|
|
void removeSdrObject(const css::uno::Reference< css::report::XReportComponent >& _xObject);
|
|
|
|
void setSpecialMode() {m_bSpecialInsertMode = true;}
|
|
bool getSpecialMode() const {return m_bSpecialInsertMode;}
|
|
// all temporary objects will remove and destroy
|
|
void resetSpecialMode();
|
|
|
|
/** insert a new SdrObject which belongs to the report component.
|
|
@param _xObject the report component
|
|
*/
|
|
void insertObject(const css::uno::Reference< css::report::XReportComponent >& _xObject);
|
|
|
|
const css::uno::Reference< css::report::XSection >& getSection() const { return m_xSection;}
|
|
};
|
|
}
|
|
#endif // INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|