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>
154 lines
4.2 KiB
C++
154 lines
4.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 .
|
|
*/
|
|
|
|
#include <fuconarc.hxx>
|
|
#include <tabvwsh.hxx>
|
|
#include <drawview.hxx>
|
|
|
|
// Create default drawing objects via keyboard
|
|
#include <svx/svdocirc.hxx>
|
|
#include <svx/svxids.hrc>
|
|
#include <svx/sxciaitm.hxx>
|
|
#include <osl/diagnose.h>
|
|
|
|
FuConstArc::FuConstArc(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
|
|
SdrModel* pDoc, const SfxRequest& rReq)
|
|
: FuConstruct(rViewSh, pWin, pViewP, pDoc, rReq)
|
|
{
|
|
}
|
|
|
|
FuConstArc::~FuConstArc()
|
|
{
|
|
}
|
|
|
|
bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
|
|
{
|
|
// remember button state for creation of own MouseEvents
|
|
SetMouseButtonCode(rMEvt.GetButtons());
|
|
|
|
bool bReturn = FuConstruct::MouseButtonDown( rMEvt );
|
|
|
|
if ( rMEvt.IsLeft() && !pView->IsAction() )
|
|
{
|
|
Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
|
|
pWindow->CaptureMouse();
|
|
pView->BegCreateObj( aPnt );
|
|
bReturn = true;
|
|
}
|
|
return bReturn;
|
|
}
|
|
|
|
bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
|
|
{
|
|
// remember button state for creation of own MouseEvents
|
|
SetMouseButtonCode(rMEvt.GetButtons());
|
|
|
|
bool bReturn = false;
|
|
|
|
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
|
|
{
|
|
pView->EndCreateObj( SdrCreateCmd::NextPoint );
|
|
bReturn = true;
|
|
}
|
|
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
|
|
}
|
|
|
|
void FuConstArc::Activate()
|
|
{
|
|
SdrObjKind aObjKind;
|
|
|
|
switch (aSfxRequest.GetSlot() )
|
|
{
|
|
case SID_DRAW_ARC:
|
|
aNewPointer = PointerStyle::DrawArc;
|
|
aObjKind = SdrObjKind::CircleArc;
|
|
break;
|
|
|
|
case SID_DRAW_PIE:
|
|
aNewPointer = PointerStyle::DrawPie;
|
|
aObjKind = SdrObjKind::CircleSection;
|
|
break;
|
|
|
|
case SID_DRAW_CIRCLECUT:
|
|
aNewPointer = PointerStyle::DrawCircleCut;
|
|
aObjKind = SdrObjKind::CircleCut;
|
|
break;
|
|
|
|
default:
|
|
aNewPointer = PointerStyle::Cross;
|
|
aObjKind = SdrObjKind::CircleArc;
|
|
break;
|
|
}
|
|
|
|
pView->SetCurrentObj(aObjKind);
|
|
|
|
aOldPointer = pWindow->GetPointer();
|
|
rViewShell.SetActivePointer( aNewPointer );
|
|
|
|
FuDraw::Activate();
|
|
}
|
|
|
|
void FuConstArc::Deactivate()
|
|
{
|
|
FuDraw::Deactivate();
|
|
rViewShell.SetActivePointer( aOldPointer );
|
|
}
|
|
|
|
// Create default drawing objects via keyboard
|
|
rtl::Reference<SdrObject> FuConstArc::CreateDefaultObject(const sal_uInt16 nID, const tools::Rectangle& rRectangle)
|
|
{
|
|
// case SID_DRAW_ARC:
|
|
// case SID_DRAW_PIE:
|
|
// case SID_DRAW_CIRCLECUT:
|
|
|
|
rtl::Reference<SdrObject> pObj(SdrObjFactory::MakeNewObject(
|
|
*pDrDoc,
|
|
pView->GetCurrentObjInventor(),
|
|
pView->GetCurrentObjIdentifier()));
|
|
|
|
if(pObj)
|
|
{
|
|
if(dynamic_cast<const SdrCircObj*>( pObj.get() ) != nullptr)
|
|
{
|
|
tools::Rectangle aRect(rRectangle);
|
|
|
|
if(SID_DRAW_ARC == nID || SID_DRAW_CIRCLECUT == nID)
|
|
{
|
|
// force quadratic
|
|
ImpForceQuadratic(aRect);
|
|
}
|
|
|
|
pObj->SetLogicRect(aRect);
|
|
|
|
SfxItemSet aAttr(pDrDoc->GetItemPool());
|
|
aAttr.Put(makeSdrCircStartAngleItem(9000_deg100));
|
|
aAttr.Put(makeSdrCircEndAngleItem(0_deg100));
|
|
|
|
pObj->SetMergedItemSet(aAttr);
|
|
}
|
|
else
|
|
{
|
|
OSL_FAIL("Object is NO circle object");
|
|
}
|
|
}
|
|
|
|
return pObj;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|