mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove fontattribute.cxx from clang-format excludelist

Browse Source 
Change-Id: I3720692af45920a4d084fe6ca4dd08bc0598ac13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106385
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2020-10-21 20:51:51 +02:00
committed by Tomaž Vajngerl
parent e469ba3ba9
commit b576ca8d23
2 changed files with 99 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
drawinglayer/source/attribute/fontattribute.cxx
View File

@@ -21,7 +21,6 @@
#include <rtl/instance.hxx>
#include <rtl/ustring.hxx>
namespace drawinglayer::attribute
{
class ImpFontAttribute
@@ -40,41 +39,33 @@ namespace drawinglayer::attribute
bool mbBiDiStrong : 1; // BiDi Flag
bool mbMonospaced : 1;
ImpFontAttribute(
const OUString& rFamilyName,
const OUString& rStyleName,
sal_uInt16 nWeight,
bool bSymbol,
bool bVertical,
bool bItalic,
bool bMonospaced,
bool bOutline,
bool bRTL,
bool bBiDiStrong)
: maFamilyName(rFamilyName),
maStyleName(rStyleName),
mnWeight(nWeight),
mbSymbol(bSymbol),
mbVertical(bVertical),
mbItalic(bItalic),
mbOutline(bOutline),
mbRTL(bRTL),
mbBiDiStrong(bBiDiStrong),
mbMonospaced(bMonospaced)
ImpFontAttribute(const OUString& rFamilyName, const OUString& rStyleName, sal_uInt16 nWeight,
bool bSymbol, bool bVertical, bool bItalic, bool bMonospaced, bool bOutline,
bool bRTL, bool bBiDiStrong)
: maFamilyName(rFamilyName)
, maStyleName(rStyleName)
, mnWeight(nWeight)
, mbSymbol(bSymbol)
, mbVertical(bVertical)
, mbItalic(bItalic)
, mbOutline(bOutline)
, mbRTL(bRTL)
, mbBiDiStrong(bBiDiStrong)
, mbMonospaced(bMonospaced)
{
}
ImpFontAttribute()
: maFamilyName(),
maStyleName(),
mnWeight(0),
mbSymbol(false),
mbVertical(false),
mbItalic(false),
mbOutline(false),
mbRTL(false),
mbBiDiStrong(false),
mbMonospaced(false)
: maFamilyName()
, maStyleName()
, mnWeight(0)
, mbSymbol(false)
, mbVertical(false)
, mbItalic(false)
, mbOutline(false)
, mbRTL(false)
, mbBiDiStrong(false)
, mbMonospaced(false)
{
}
@@ -93,37 +84,26 @@ namespace drawinglayer::attribute
bool operator==(const ImpFontAttribute& rCompare) const
{
return (getFamilyName() == rCompare.getFamilyName()
&& getStyleName() == rCompare.getStyleName()
&& getWeight() == rCompare.getWeight()
&& getSymbol() == rCompare.getSymbol()
&& getVertical() == rCompare.getVertical()
&& getItalic() == rCompare.getItalic()
&& getOutline() == rCompare.getOutline()
&& getRTL() == rCompare.getRTL()
&& getBiDiStrong() == rCompare.getBiDiStrong()
&& getStyleName() == rCompare.getStyleName() && getWeight() == rCompare.getWeight()
&& getSymbol() == rCompare.getSymbol() && getVertical() == rCompare.getVertical()
&& getItalic() == rCompare.getItalic() && getOutline() == rCompare.getOutline()
&& getRTL() == rCompare.getRTL() && getBiDiStrong() == rCompare.getBiDiStrong()
&& getMonospaced() == rCompare.getMonospaced());
}
};
namespace
{
struct theGlobalDefault :
public rtl::Static< FontAttribute::ImplType, theGlobalDefault > {};
struct theGlobalDefault : public rtl::Static<FontAttribute::ImplType, theGlobalDefault>
{
};
}
FontAttribute::FontAttribute(
const OUString& rFamilyName,
const OUString& rStyleName,
sal_uInt16 nWeight,
bool bSymbol,
bool bVertical,
bool bItalic,
bool bMonospaced,
bool bOutline,
bool bRTL,
bool bBiDiStrong)
: mpFontAttribute(ImpFontAttribute(
rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic, bMonospaced, bOutline, bRTL, bBiDiStrong))
FontAttribute::FontAttribute(const OUString& rFamilyName, const OUString& rStyleName,
sal_uInt16 nWeight, bool bSymbol, bool bVertical, bool bItalic,
bool bMonospaced, bool bOutline, bool bRTL, bool bBiDiStrong)
: mpFontAttribute(ImpFontAttribute(rFamilyName, rStyleName, nWeight, bSymbol, bVertical,
bItalic, bMonospaced, bOutline, bRTL, bBiDiStrong))
{
}
@@ -147,56 +127,25 @@ namespace drawinglayer::attribute
return rCandidate.mpFontAttribute == mpFontAttribute;
}
const OUString& FontAttribute::getFamilyName() const
{
return mpFontAttribute->getFamilyName();
}
const OUString& FontAttribute::getFamilyName() const { return mpFontAttribute->getFamilyName(); }
const OUString& FontAttribute::getStyleName() const
{
return mpFontAttribute->getStyleName();
}
const OUString& FontAttribute::getStyleName() const { return mpFontAttribute->getStyleName(); }
sal_uInt16 FontAttribute::getWeight() const
{
return mpFontAttribute->getWeight();
}
sal_uInt16 FontAttribute::getWeight() const { return mpFontAttribute->getWeight(); }
bool FontAttribute::getSymbol() const
{
return mpFontAttribute->getSymbol();
}
bool FontAttribute::getSymbol() const { return mpFontAttribute->getSymbol(); }
bool FontAttribute::getVertical() const
{
return mpFontAttribute->getVertical();
}
bool FontAttribute::getVertical() const { return mpFontAttribute->getVertical(); }
bool FontAttribute::getItalic() const
{
return mpFontAttribute->getItalic();
}
bool FontAttribute::getItalic() const { return mpFontAttribute->getItalic(); }
bool FontAttribute::getOutline() const
{
return mpFontAttribute->getOutline();
}
bool FontAttribute::getOutline() const { return mpFontAttribute->getOutline(); }
bool FontAttribute::getRTL() const
{
return mpFontAttribute->getRTL();
}
bool FontAttribute::getRTL() const { return mpFontAttribute->getRTL(); }
bool FontAttribute::getBiDiStrong() const
{
return mpFontAttribute->getBiDiStrong();
}
bool FontAttribute::getMonospaced() const
{
return mpFontAttribute->getMonospaced();
}
bool FontAttribute::getBiDiStrong() const { return mpFontAttribute->getBiDiStrong(); }
bool FontAttribute::getMonospaced() const { return mpFontAttribute->getMonospaced(); }
} // end of namespace

1
solenv/clang-format/excludelist
View File

@@ -3334,7 +3334,6 @@ drawinglayer/source/animation/animationtiming.cxx
drawinglayer/source/attribute/fillgradientattribute.cxx
drawinglayer/source/attribute/fillgraphicattribute.cxx
drawinglayer/source/attribute/fillhatchattribute.cxx
drawinglayer/source/attribute/fontattribute.cxx
drawinglayer/source/attribute/lineattribute.cxx
drawinglayer/source/attribute/linestartendattribute.cxx
drawinglayer/source/attribute/materialattribute3d.cxx