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>
193 lines
6.3 KiB
C++
193 lines
6.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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <com/sun/star/frame/XModel.hpp>
|
|
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
|
|
#include <svx/svdouno.hxx>
|
|
|
|
#include <optional>
|
|
|
|
#include <map>
|
|
|
|
namespace basctl
|
|
{
|
|
|
|
typedef std::multimap< sal_Int16, OUString > IndexToNameMap;
|
|
|
|
class DlgEdForm;
|
|
class DlgEditor;
|
|
class DlgEdEvtContListenerImpl;
|
|
class DlgEdPropListenerImpl;
|
|
|
|
// DlgEdObj
|
|
|
|
|
|
class DlgEdObj: public SdrUnoObj
|
|
{
|
|
friend class DlgEditor;
|
|
friend class DlgEdFactory;
|
|
friend class DlgEdPropListenerImpl;
|
|
friend class DlgEdForm;
|
|
|
|
bool bIsListening;
|
|
rtl::Reference<DlgEdForm> pDlgEdForm;
|
|
rtl::Reference<DlgEdPropListenerImpl> m_xPropertyChangeListener;
|
|
rtl::Reference<DlgEdEvtContListenerImpl> m_xContainerListener;
|
|
|
|
DlgEditor& GetDialogEditor ();
|
|
|
|
virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override; // not working yet
|
|
|
|
protected:
|
|
DlgEdObj(SdrModel& rSdrModel);
|
|
// copy constructor
|
|
DlgEdObj(SdrModel& rSdrModel, DlgEdObj const & rSource);
|
|
DlgEdObj(
|
|
SdrModel& rSdrModel,
|
|
const OUString& rModelName,
|
|
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac);
|
|
|
|
// protected destructor
|
|
virtual ~DlgEdObj() override;
|
|
|
|
virtual void NbcMove( const Size& rSize ) override;
|
|
virtual void NbcResize(const Point& rRef, double xFact, double yFact) override;
|
|
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
|
|
|
|
using SfxListener::StartListening;
|
|
void StartListening();
|
|
using SfxListener::EndListening;
|
|
void EndListening(bool bRemoveListener);
|
|
bool isListening() const { return bIsListening; }
|
|
|
|
bool TransformSdrToControlCoordinates(
|
|
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
|
|
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
|
|
bool TransformSdrToFormCoordinates(
|
|
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
|
|
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
|
|
bool TransformControlToSdrCoordinates(
|
|
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
|
|
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
|
|
bool TransformFormToSdrCoordinates(
|
|
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
|
|
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
|
|
|
|
public:
|
|
void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
|
|
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm.get(); }
|
|
|
|
virtual SdrInventor GetObjInventor() const override;
|
|
virtual SdrObjKind GetObjIdentifier() const override;
|
|
|
|
// FullDrag support
|
|
virtual rtl::Reference<SdrObject> getFullDragClone() const override;
|
|
|
|
bool supportsService( OUString const & serviceName ) const;
|
|
OUString GetDefaultName() const;
|
|
OUString GetUniqueName() const;
|
|
|
|
sal_Int32 GetStep() const;
|
|
virtual void UpdateStep();
|
|
|
|
void SetDefaults();
|
|
virtual void SetRectFromProps();
|
|
virtual void SetPropsFromRect();
|
|
|
|
css::uno::Reference< css::awt::XControl > GetControl() const;
|
|
|
|
virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt );
|
|
/// @throws css::container::NoSuchElementException
|
|
/// @throws css::uno::RuntimeException
|
|
void NameChange( const css::beans::PropertyChangeEvent& evt );
|
|
/// @throws css::uno::RuntimeException
|
|
void TabIndexChange( const css::beans::PropertyChangeEvent& evt );
|
|
|
|
// PropertyChangeListener
|
|
/// @throws css::uno::RuntimeException
|
|
void _propertyChange(const css::beans::PropertyChangeEvent& evt);
|
|
|
|
// ContainerListener
|
|
/// @throws css::uno::RuntimeException
|
|
void _elementInserted();
|
|
/// @throws css::uno::RuntimeException
|
|
void _elementReplaced();
|
|
/// @throws css::uno::RuntimeException
|
|
void _elementRemoved();
|
|
|
|
virtual void SetLayer(SdrLayerID nLayer) override;
|
|
void MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel );
|
|
};
|
|
|
|
|
|
// DlgEdForm
|
|
|
|
|
|
class DlgEdForm: public DlgEdObj
|
|
{
|
|
friend class DlgEditor;
|
|
friend class DlgEdFactory;
|
|
|
|
private:
|
|
DlgEditor& rDlgEditor;
|
|
std::vector<DlgEdObj*> pChildren;
|
|
|
|
mutable ::std::optional< css::awt::DeviceInfo > mpDeviceInfo;
|
|
|
|
private:
|
|
explicit DlgEdForm(
|
|
SdrModel& rSdrModel,
|
|
DlgEditor&);
|
|
|
|
protected:
|
|
virtual void NbcMove( const Size& rSize ) override;
|
|
virtual void NbcResize(const Point& rRef, double xFact, double yFact) override;
|
|
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
|
|
|
|
// protected destructor
|
|
virtual ~DlgEdForm() override;
|
|
|
|
public:
|
|
DlgEditor& GetDlgEditor () const { return rDlgEditor; }
|
|
|
|
void AddChild( DlgEdObj* pDlgEdObj );
|
|
void RemoveChild( DlgEdObj* pDlgEdObj );
|
|
std::vector<DlgEdObj*> const& GetChildren() const { return pChildren; }
|
|
|
|
virtual void UpdateStep() override;
|
|
|
|
virtual void SetRectFromProps() override;
|
|
virtual void SetPropsFromRect() override;
|
|
|
|
virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt ) override;
|
|
|
|
void UpdateTabIndices();
|
|
void UpdateTabOrder();
|
|
void UpdateGroups();
|
|
void UpdateTabOrderAndGroups();
|
|
|
|
css::awt::DeviceInfo getDeviceInfo() const;
|
|
};
|
|
|
|
} // namespace basctl
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|