Kaydet (Commit) a6659d6d authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

provide complete types of some SdrCustomShapeGeometryItem functors...

before they are used

(cherry picked from commit 7d6c5e79)

Conflicts:
	svx/inc/svx/sdasitm.hxx
	svx/source/items/customshapeitem.cxx

Change-Id: Iac3e37bcfd4ab26d97411092259da2cc1879c2de
üst 1fb61b87
......@@ -127,6 +127,23 @@ public:
SdrTextAutoGrowSizeItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, rIn ) {}
};
// some useful inline methods
inline bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const OUString& r1, const OUString& r2 ) const
{
return r1.equals( r2 );
}
inline bool SdrCustomShapeGeometryItem::PropertyPairEq::operator()( const SdrCustomShapeGeometryItem::PropertyPair& r1, const SdrCustomShapeGeometryItem::PropertyPair& r2 ) const
{
return ( r1.first.equals( r2.first ) ) && ( r1.second.equals( r2.second ) );
}
inline size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const
{
return (size_t)r1.first.hashCode() + r1.second.hashCode();
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -31,23 +31,12 @@ SdrCustomShapeDataItem::SdrCustomShapeDataItem()
: SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, String() )
{}
bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const OUString& r1, const OUString& r2 ) const
{
return r1.equals( r2 );
}
bool SdrCustomShapeGeometryItem::PropertyPairEq::operator()( const SdrCustomShapeGeometryItem::PropertyPair& r1, const SdrCustomShapeGeometryItem::PropertyPair& r2 ) const
{
return ( r1.first.equals( r2.first ) ) && ( r1.second.equals( r2.second ) );
}
size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const
{
return (size_t)r1.first.hashCode() + r1.second.hashCode();
};
TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem);
SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem()
: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )
{}
SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< beans::PropertyValue >& rVal )
: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment