Until now the 'local' StyleSheet got set, but that may not be the same as the original. It was/gets identified just by searching by name and type, not comparing content. What to do? We could... (a) the Style-Friendly way: - check if StyleSheet is identical - if not, create a new in-between StyleSheet hosting missing Items - if yes, use, done. (b) the pragmatic/practical way: - Just hard-attribute the Items that are detected as different similar to what BurnInStyleSheetAttributes does/did, but only for a view differing Items (b) is the most simple for now, but will lead to more hard attributes. The other possibilities will be better in the long term. For now, I will use (b). Note that there are more cases in that VERY complex and grown stuff emerging from SdDrawDocument::PasteBookmarkAsPage. More things will need to be fixed, see this as a 1st step. Needed to adapt postProcessAfterCloneToDifferentModel due to UT testTdf96206 failing, see comment there for details. That 1st implementation showed weaknesses with those Items critical and only on MasterPages, so decided to give up on that and implement ContentCompare to SdPage::Equals. That was easier than thought: No parameter needed, only used by InsertBookmarkAsPage_FindDuplicateLayouts::operator(). Thus, SdPage::Equals needs no change, just SdrObject::Equals. Due to still problems with Items corrected in Objects on MasterPages I will for now exclude this. Could now isolate remaining problems, these are defaults and/or PresObj things on MasterPages. Important is that I can completely correct all Items for all Objects in postProcessAfterCloneToDifferentModel. I can react to these false-positives in the ContentCompare in SdrObject::Equals. Signed-off-by: Armin Le Grand (collabora) <Armin.LeGrand@collabora.com> Change-Id: I10e17c8d6a893dbe92ab716182f07bafce1f3284 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/6595 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Armin Le Grand <armin.legrand@collabora.com> (cherry picked from commit 92ffaeac04c5c8586006b026f29ce12fba3674f1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211729 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
142 lines
5.9 KiB
C++
142 lines
5.9 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <com/sun/star/awt/XControlModel.hpp>
|
|
#include <com/sun/star/awt/XControl.hpp>
|
|
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
#include <com/sun/star/awt/XControlContainer.hpp>
|
|
#include <svx/svxdllapi.h>
|
|
#include <svx/svdorect.hxx>
|
|
#include <memory>
|
|
|
|
|
|
// Forward declaration
|
|
class SdrView;
|
|
|
|
namespace sdr::contact {
|
|
class ViewContactOfUnoControl;
|
|
}
|
|
|
|
|
|
// SdrUnoObj
|
|
struct SdrUnoObjDataHolder;
|
|
class SVXCORE_DLLPUBLIC SdrUnoObj : public SdrRectObj
|
|
{
|
|
friend class SdrPageView;
|
|
friend class SdrControlEventListenerImpl;
|
|
|
|
std::unique_ptr<SdrUnoObjDataHolder> m_pImpl;
|
|
|
|
OUString m_aUnoControlModelTypeName;
|
|
OUString m_aUnoControlTypeName;
|
|
|
|
virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override;
|
|
|
|
protected:
|
|
css::uno::Reference< css::awt::XControlModel > m_xUnoControlModel; // Can also be set from outside
|
|
|
|
private:
|
|
SVX_DLLPRIVATE void CreateUnoControlModel(const OUString& rModelName);
|
|
SVX_DLLPRIVATE void CreateUnoControlModel(const OUString& rModelName,
|
|
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac );
|
|
|
|
public:
|
|
explicit SdrUnoObj(
|
|
SdrModel& rSdrModel,
|
|
const OUString& rModelName);
|
|
// Copy constructor
|
|
SdrUnoObj(SdrModel& rSdrModel, SdrUnoObj const & rSource);
|
|
SdrUnoObj(
|
|
SdrModel& rSdrModel,
|
|
const OUString& rModelName,
|
|
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac);
|
|
virtual ~SdrUnoObj() override;
|
|
|
|
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
|
|
virtual SdrObjKind GetObjIdentifier() const override;
|
|
|
|
virtual void NbcResize(const Point& rRef, double xFact, double yFact) override;
|
|
virtual void NbcSetLayer(SdrLayerID nLayer) override;
|
|
|
|
// SpecialDrag support
|
|
virtual bool hasSpecialDrag() const override;
|
|
|
|
virtual OUString TakeObjNameSingul() const override;
|
|
virtual OUString TakeObjNamePlural() const override;
|
|
|
|
virtual void SetContextWritingMode( const sal_Int16 _nContextWritingMode ) override;
|
|
|
|
const css::uno::Reference< css::awt::XControlModel >& GetUnoControlModel() const {return m_xUnoControlModel;}
|
|
css::uno::Reference< css::awt::XControl > GetUnoControl(const SdrView& _rView, const OutputDevice& _rOut) const;
|
|
|
|
/** Retrieves a temporary XControl instance for a given output device
|
|
|
|
The method GetUnoControl, used to retrieve the XControl whose parent is a given device, only works
|
|
if the SdrUnoObj has already been painted at least once onto this device. However, there are valid
|
|
scenarios where you need certain information on how a control is painted onto a window, without
|
|
actually painting it. For example, you might be interested in the DeviceInfo of a UNO control.
|
|
|
|
For those cases, you can contain an XControl which behaves as the control which *would* be used to
|
|
paint onto a window.
|
|
|
|
@param _rWindow
|
|
the window for which should act as parent for the temporary control
|
|
@param _inout_ControlContainer
|
|
the control container belonging to the window, necessary as context
|
|
for the newly created control. A control container is usually created by calling
|
|
VCLUnoHelper::CreateControlContainer.
|
|
If _inout_ControlContainer is <NULL/>, it will be created internally, and passed to the caller.
|
|
In this case, the caller also takes ownership of the control container, and is responsible for
|
|
disposing it when not needed anymore.
|
|
@return
|
|
The requested control. This control is temporary only, and the caller is responsible for it.
|
|
In particular, the caller is required to dispose it when it's not needed anymore.
|
|
|
|
*/
|
|
css::uno::Reference< css::awt::XControl >
|
|
GetTemporaryControlForWindow(
|
|
const vcl::Window& _rWindow,
|
|
css::uno::Reference< css::awt::XControlContainer >& _inout_ControlContainer
|
|
) const;
|
|
|
|
const OUString& GetUnoControlTypeName() const { return m_aUnoControlTypeName; }
|
|
const OUString& getUnoControlModelTypeName() const { return m_aUnoControlModelTypeName; }
|
|
|
|
virtual void SetUnoControlModel( const css::uno::Reference< css::awt::XControlModel >& xModel );
|
|
|
|
protected:
|
|
// SdrObject overridables
|
|
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
|
|
|
|
private:
|
|
/** Retrieves the typed ViewContact for the object
|
|
@param _out_rpContact
|
|
Upon successful return, ->_out_rpContact contains the ViewContact.
|
|
@return
|
|
<TRUE/> if and only if the contact was successfully retrieved. In this case,
|
|
->_out_rpContact contains a pointer to this contact.
|
|
A failure to retrieve the contact object fires an assertion in non-product builds.
|
|
*/
|
|
SVX_DLLPRIVATE bool impl_getViewContact( sdr::contact::ViewContactOfUnoControl*& _out_rpContact ) const;
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|