Armin Le Grand (collabora)
5519a3d407
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>
91 lines
3.5 KiB
C++
91 lines
3.5 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_CUBE3D_HXX
|
|
#define INCLUDED_SVX_CUBE3D_HXX
|
|
|
|
#include <basegfx/point/b3dpoint.hxx>
|
|
#include <basegfx/vector/b3dvector.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <sal/types.h>
|
|
#include <svx/obj3d.hxx>
|
|
#include <svx/svxdllapi.h>
|
|
|
|
class E3dDefaultAttributes;
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* |
|
|
|* Create a 3D cuboid; aPos: Center or left, bottom, behind |__
|
|
|* (depending on bPosIsCenter) /
|
|
|* nSideFlags indicates, if only some of the cuboid surfaces can
|
|
|* be created; the corresponding bits are defined in the enum.
|
|
|* The flag bDblSided indicates whether the created surfaces are
|
|
|* two-sided (which only makes sense if not all of the surfaces were
|
|
|* created).
|
|
|*
|
|
\************************************************************************/
|
|
|
|
class SAL_WARN_UNUSED E3dCubeObj final : public E3dCompoundObject
|
|
{
|
|
// Parameter
|
|
basegfx::B3DPoint m_aCubePos;
|
|
basegfx::B3DVector m_aCubeSize;
|
|
|
|
// BOOLeans
|
|
bool m_bPosIsCenter : 1;
|
|
|
|
void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
|
|
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
|
|
|
|
// protected destructor - due to final, make private
|
|
virtual ~E3dCubeObj() override;
|
|
|
|
virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override;
|
|
|
|
public:
|
|
SVXCORE_DLLPUBLIC E3dCubeObj(SdrModel& rSdrModel,
|
|
const E3dDefaultAttributes& rDefault,
|
|
const basegfx::B3DPoint& aPos,
|
|
const basegfx::B3DVector& r3DSize);
|
|
E3dCubeObj(SdrModel& rSdrModel, E3dCubeObj const &);
|
|
E3dCubeObj(SdrModel& rSdrModel);
|
|
|
|
virtual SdrObjKind GetObjIdentifier() const override;
|
|
virtual rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
|
|
|
|
// Set local parameters with geometry recreation
|
|
void SetCubePos(const basegfx::B3DPoint& rNew);
|
|
const basegfx::B3DPoint& GetCubePos() const { return m_aCubePos; }
|
|
|
|
void SetCubeSize(const basegfx::B3DVector& rNew);
|
|
const basegfx::B3DVector& GetCubeSize() const { return m_aCubeSize; }
|
|
|
|
void SetPosIsCenter(bool bNew);
|
|
bool GetPosIsCenter() const { return m_bPosIsCenter; }
|
|
|
|
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
|
|
virtual OUString TakeObjNameSingul() const override;
|
|
virtual OUString TakeObjNamePlural() const override;
|
|
};
|
|
|
|
#endif // INCLUDED_SVX_CUBE3D_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|