openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1468401 - in /openoffice/trunk/main/svx: inc/svx/sdasitm.hxx source/items/customshapeitem.cxx
Date Tue, 16 Apr 2013 13:03:09 GMT
Author: hdu
Date: Tue Apr 16 13:03:08 2013
New Revision: 1468401

URL: http://svn.apache.org/r1468401
Log:
provide complete types of some SdrCustomShapeGeometryItem functors before they are used

Modified:
    openoffice/trunk/main/svx/inc/svx/sdasitm.hxx
    openoffice/trunk/main/svx/source/items/customshapeitem.cxx

Modified: openoffice/trunk/main/svx/inc/svx/sdasitm.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/sdasitm.hxx?rev=1468401&r1=1468400&r2=1468401&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/sdasitm.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/sdasitm.hxx Tue Apr 16 13:03:08 2013
@@ -138,5 +138,22 @@ public:
 	SdrTextAutoGrowSizeItem( SvStream& rIn )   :		SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE,
rIn )   {}
 };
 
+// some useful inline methods
+
+inline bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const rtl::OUString&
r1, const rtl::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
 

Modified: openoffice/trunk/main/svx/source/items/customshapeitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/items/customshapeitem.cxx?rev=1468401&r1=1468400&r2=1468401&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/items/customshapeitem.cxx (original)
+++ openoffice/trunk/main/svx/source/items/customshapeitem.cxx Tue Apr 16 13:03:08 2013
@@ -43,19 +43,6 @@ SdrCustomShapeDataItem::SdrCustomShapeDa
 :	SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, rVal )
 {}
 
-bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const rtl::OUString& r1, const
rtl::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 )



Mime
View raw message