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>
154 lines
3.8 KiB
C++
154 lines
3.8 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 <svx/strings.hrc>
|
|
#include <svx/deflt3d.hxx>
|
|
#include <svx/dialmgr.hxx>
|
|
#include <svx/cube3d.hxx>
|
|
#include <svx/svdobjkind.hxx>
|
|
#include <basegfx/point/b3dpoint.hxx>
|
|
#include <sdr/contact/viewcontactofe3dcube.hxx>
|
|
|
|
|
|
// DrawContact section
|
|
|
|
std::unique_ptr<sdr::contact::ViewContact> E3dCubeObj::CreateObjectSpecificViewContact()
|
|
{
|
|
return std::make_unique<sdr::contact::ViewContactOfE3dCube>(*this);
|
|
}
|
|
|
|
|
|
E3dCubeObj::E3dCubeObj(
|
|
SdrModel& rSdrModel,
|
|
const E3dDefaultAttributes& rDefault,
|
|
const basegfx::B3DPoint& aPos,
|
|
const basegfx::B3DVector& r3DSize)
|
|
: E3dCompoundObject(rSdrModel)
|
|
{
|
|
// Set Defaults
|
|
SetDefaultAttributes(rDefault);
|
|
|
|
// position centre or left, bottom, back (dependent on bPosIsCenter)
|
|
m_aCubePos = aPos;
|
|
m_aCubeSize = r3DSize;
|
|
}
|
|
|
|
E3dCubeObj::E3dCubeObj(SdrModel& rSdrModel)
|
|
: E3dCompoundObject(rSdrModel)
|
|
{
|
|
// Set Defaults
|
|
const E3dDefaultAttributes aDefault;
|
|
|
|
SetDefaultAttributes(aDefault);
|
|
}
|
|
|
|
E3dCubeObj::E3dCubeObj(SdrModel& rSdrModel, E3dCubeObj const & rSource)
|
|
: E3dCompoundObject(rSdrModel, rSource)
|
|
{
|
|
// Set Defaults
|
|
const E3dDefaultAttributes aDefault;
|
|
|
|
SetDefaultAttributes(aDefault);
|
|
|
|
m_aCubePos = rSource.m_aCubePos;
|
|
m_aCubeSize = rSource.m_aCubeSize;
|
|
m_bPosIsCenter = rSource.m_bPosIsCenter;
|
|
}
|
|
|
|
E3dCubeObj::~E3dCubeObj()
|
|
{
|
|
}
|
|
|
|
void E3dCubeObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
|
|
{
|
|
m_aCubePos = rDefault.GetDefaultCubePos();
|
|
m_aCubeSize = rDefault.GetDefaultCubeSize();
|
|
m_bPosIsCenter = rDefault.GetDefaultCubePosIsCenter();
|
|
}
|
|
|
|
SdrObjKind E3dCubeObj::GetObjIdentifier() const
|
|
{
|
|
return SdrObjKind::E3D_Cube;
|
|
}
|
|
|
|
// Convert the object into a group object consisting of 6 polygons
|
|
|
|
rtl::Reference<SdrObject> E3dCubeObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const
|
|
{
|
|
return nullptr;
|
|
}
|
|
|
|
rtl::Reference<SdrObject> E3dCubeObj::implCloneSdrObject(SdrModel& rTargetModel) const
|
|
{
|
|
return new E3dCubeObj(rTargetModel, *this);
|
|
}
|
|
|
|
// Set local parameters with geometry re-creating
|
|
|
|
void E3dCubeObj::SetCubePos(const basegfx::B3DPoint& rNew)
|
|
{
|
|
if(m_aCubePos != rNew)
|
|
{
|
|
m_aCubePos = rNew;
|
|
ActionChanged();
|
|
}
|
|
}
|
|
|
|
void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew)
|
|
{
|
|
if(m_aCubeSize != rNew)
|
|
{
|
|
m_aCubeSize = rNew;
|
|
ActionChanged();
|
|
}
|
|
}
|
|
|
|
void E3dCubeObj::SetPosIsCenter(bool bNew)
|
|
{
|
|
if(m_bPosIsCenter != bNew)
|
|
{
|
|
m_bPosIsCenter = bNew;
|
|
ActionChanged();
|
|
}
|
|
}
|
|
|
|
// Get the name of the object (singular)
|
|
|
|
OUString E3dCubeObj::TakeObjNameSingul() const
|
|
{
|
|
OUString sName = SvxResId(STR_ObjNameSingulCube3d);
|
|
|
|
OUString aName(GetName());
|
|
if (!aName.isEmpty())
|
|
{
|
|
sName += " \'" + aName + "'";
|
|
}
|
|
return sName;
|
|
}
|
|
|
|
// Get the name of the object (plural)
|
|
|
|
OUString E3dCubeObj::TakeObjNamePlural() const
|
|
{
|
|
return SvxResId(STR_ObjNamePluralCube3d);
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|