forked from amazingfate/loongoffice
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>
69 lines
2.4 KiB
C++
69 lines
2.4 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_SVX_CONNCTRL_HXX
|
|
#define INCLUDED_SVX_CONNCTRL_HXX
|
|
|
|
#include <sal/types.h>
|
|
#include <svx/svxdllapi.h>
|
|
#include <vcl/customweld.hxx>
|
|
#include <vcl/outdev.hxx>
|
|
|
|
class SfxItemSet;
|
|
class SdrEdgeObj;
|
|
class SdrView;
|
|
class SdrPage;
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* SvxXConnectionPreview
|
|
|*
|
|
\************************************************************************/
|
|
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXConnectionPreview final : public weld::CustomWidgetController
|
|
{
|
|
friend class SvxConnectionPage;
|
|
|
|
private:
|
|
MapMode aNewMapMode;
|
|
rtl::Reference<SdrEdgeObj> pEdgeObj;
|
|
rtl::Reference<SdrPage> mxSdrPage;
|
|
const SdrView* pView;
|
|
|
|
SVX_DLLPRIVATE void AdaptSize();
|
|
SVX_DLLPRIVATE void SetMapMode(const MapMode& rNewMapMode) { aNewMapMode = rNewMapMode; }
|
|
SVX_DLLPRIVATE const MapMode& GetMapMode() const { return aNewMapMode; }
|
|
public:
|
|
SvxXConnectionPreview();
|
|
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
|
|
virtual ~SvxXConnectionPreview() override;
|
|
|
|
virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
|
|
virtual void Resize() override;
|
|
virtual bool MouseButtonDown(const MouseEvent& rMEvt) override;
|
|
|
|
void SetAttributes( const SfxItemSet& rInAttrs );
|
|
sal_uInt16 GetLineDeltaCount() const;
|
|
|
|
void Construct();
|
|
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
|
|
};
|
|
|
|
#endif // INCLUDED_SVX_CONNCTRL_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|