diff options
author | Herbert Dürr <hdu@apache.org> | 2013-04-29 10:00:29 +0000 |
---|---|---|
committer | Herbert Dürr <hdu@apache.org> | 2013-04-29 10:00:29 +0000 |
commit | 89d66819c0f5b3a3218befd5bbc83d05babbf6d6 (patch) | |
tree | ceed2172bd4e119fcba77344fdef8d06d984ae08 /chart2/source | |
parent | e55eae98ea7c337c07dacc5d5c5602c6ecb57fa3 (diff) |
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.
Notes
Notes:
prefer: 8cff18bee2a560c682b5c54d8f68c8bf9d8a69a8
Diffstat (limited to 'chart2/source')
-rw-r--r-- | chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 10 | ||||
-rwxr-xr-x | chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 9fa5bb400a5d..9325e762fe26 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -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 > diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index b490dcd93fb9..de0c96f97306 100755 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -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: |