Author: hdu
Date: Mon Apr 29 11:00:29 2013
New Revision: 1476961
URL: http://svn.apache.org/r1476961
Log:
inline awt::Size inequality operator
the *hxx change was missing in my previous commit r1476261, sorry
about that and thanks for them temporary fix.
The function and its use cases suggest inlining. Exporting its
instantiation from the chart module or having the generic symbol
in the chart namespace are not required.
Modified:
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
Modified:
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx?rev=1476961&r1=1476960&r2=1476961&view=diff
==============================================================================
---
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
(original)
+++
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
Mon Apr 29 11:00:29 2013
@@ -32,7 +32,14 @@
#include <boost/shared_ptr.hpp>
#include <vector>
+// this operator is not defined by default
+inline bool operator!=( const ::com::sun::star::awt::Size& rSize1, const
::com::sun::star::awt::Size& rSize2 )
+{
+ return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
+}
+
//.............................................................................
+
namespace chart
{
namespace wrapper
@@ -44,9 +51,6 @@ enum tSeriesOrDiagramPropertyType
DIAGRAM
};
-extern bool operator!=( const ::com::sun::star::awt::Size & rSize1,
- const ::com::sun::star::awt::Size & rSize2 );
-
//PROPERTYTYPE is the type of the outer property
template< typename PROPERTYTYPE >
Modified:
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx?rev=1476961&r1=1476960&r2=1476961&view=diff
==============================================================================
---
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
(original)
+++
openoffice/trunk/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
Mon Apr 29 11:00:29 2013
@@ -94,12 +94,6 @@ public:
virtual ~WrappedSymbolBitmapURLProperty();
};
-// this operator is not defined by default
-bool operator!=( const awt::Size & rSize1, const awt::Size & rSize2 )
-{
- return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
-}
-
class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty<
awt::Size >
{
public:
