mirror of
https://github.com/LibreOffice/core.git
synced 2025-07-26 15:45:26 +00:00
9304f13db6
ItemType is useful and faster than RTTI. Until now it was implemented by a 16-bit member in the base class, plus (potentially) all constructors having to hand a value in at item construction type (of type SfxItemType) to get that member set correctly. This works, but there is no reliable way to guarantee coverage, and there have already been cases with missing SfxItemType - these fallback to '0' and thus all Items with ItemType() == 0 are assumed equal and might be static_cast'ed to the wrong classes. Note that I identified *35* Items that had no correct ItemType set/implemented actually. It also uses 16-bit per incarnated Item at runtime. I thought and realized now a more systematic approach to do that with a pure virtual function at the Item itself. That can also be secured by a clang compiler plugin in the future to keep it working. It uses one virtual function per derived class, no longer space in incarnated Items. Also the constructors will get more simple again. But the main aspect is security - we cannot afford Items potentially being held as equal if they are not. Unfortunately C++ does not offer something like a 'strict pure virtual function' that would force to be overloaded in every derivation, but the used methotology and adding a clang test is reasonably safe. Have now done the cleanup of previous method. Change-Id: I04768285f1e9b73d64b0bb87df401944b5d35678 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180017 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
123 lines
3.7 KiB
C++
123 lines
3.7 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/numinf.hxx>
|
|
#include <utility>
|
|
|
|
|
|
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
|
|
const TypedWhichId<SvxNumberInfoItem> nId ) :
|
|
SfxPoolItem ( nId ),
|
|
pFormatter ( pNumFormatter ),
|
|
eValueType ( SvxNumberValueType::Undefined ),
|
|
aStringVal ( u""_ustr ),
|
|
nDoubleVal ( 0 )
|
|
{
|
|
}
|
|
|
|
|
|
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
|
|
OUString aVal, const TypedWhichId<SvxNumberInfoItem> nId ) :
|
|
SfxPoolItem ( nId ),
|
|
pFormatter ( pNumFormatter ),
|
|
eValueType ( SvxNumberValueType::String ),
|
|
aStringVal (std::move( aVal )),
|
|
nDoubleVal ( 0 )
|
|
{
|
|
}
|
|
|
|
|
|
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
|
|
const double& rVal, const TypedWhichId<SvxNumberInfoItem> nId ) :
|
|
SfxPoolItem ( nId ),
|
|
pFormatter ( pNumFormatter ),
|
|
eValueType ( SvxNumberValueType::Number ),
|
|
aStringVal ( u""_ustr ),
|
|
nDoubleVal ( rVal )
|
|
{
|
|
}
|
|
|
|
|
|
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
|
|
const double& rVal, OUString aValueStr,
|
|
const TypedWhichId<SvxNumberInfoItem> nId ) :
|
|
SfxPoolItem ( nId ),
|
|
pFormatter ( pNumFormatter ),
|
|
eValueType ( SvxNumberValueType::Number ),
|
|
aStringVal (std::move( aValueStr )),
|
|
nDoubleVal ( rVal )
|
|
{
|
|
}
|
|
|
|
|
|
SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
|
|
SfxPoolItem ( rItem ),
|
|
pFormatter ( rItem.pFormatter ),
|
|
eValueType ( rItem.eValueType ),
|
|
aStringVal ( rItem.aStringVal ),
|
|
nDoubleVal ( rItem.nDoubleVal ),
|
|
mvDelFormats( rItem.mvDelFormats )
|
|
{
|
|
}
|
|
|
|
|
|
SvxNumberInfoItem::~SvxNumberInfoItem()
|
|
{
|
|
}
|
|
|
|
|
|
bool SvxNumberInfoItem::GetPresentation
|
|
(
|
|
SfxItemPresentation /*ePres*/,
|
|
MapUnit /*eCoreUnit*/,
|
|
MapUnit /*ePresUnit*/,
|
|
OUString& rText, const IntlWrapper&
|
|
) const
|
|
{
|
|
rText.clear();
|
|
return false;
|
|
}
|
|
|
|
|
|
bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const
|
|
{
|
|
assert(SfxPoolItem::operator==(rItem));
|
|
|
|
const SvxNumberInfoItem& rOther = static_cast<const SvxNumberInfoItem&>(rItem);
|
|
|
|
return mvDelFormats == rOther.mvDelFormats &&
|
|
pFormatter == rOther.pFormatter &&
|
|
eValueType == rOther.eValueType &&
|
|
nDoubleVal == rOther.nDoubleVal &&
|
|
aStringVal == rOther.aStringVal;
|
|
}
|
|
|
|
SvxNumberInfoItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const
|
|
{
|
|
return new SvxNumberInfoItem( *this );
|
|
}
|
|
|
|
void SvxNumberInfoItem::SetDelFormats( std::vector<sal_uInt32> && aData )
|
|
{
|
|
mvDelFormats = std::move(aData);
|
|
}
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|