Tag: cws_src680_oj14 User: fs Date: 2007-06-27 05:05:49+0000 Modified: dba/reportdesign/source/core/api/ReportControlModel.cxx dba/reportdesign/source/core/inc/ReportControlModel.hxx
Log: #i10000# don't make the FontDescriptor comparison operator inline File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportControlModel.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportControlModel.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +26 -5 -------------------- --- ReportControlModel.cxx 2007-05-09 13:50:21+0000 1.1.2.1 +++ ReportControlModel.cxx 2007-06-27 05:05:46+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: ReportControlModel.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 13:50:21 $ + * last change: $Author: fs $ $Date: 2007/06/27 05:05:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,9 +39,30 @@ #include <com/sun/star/beans/XPropertyState.hpp> namespace reportdesign { - using namespace com::sun::star; - using namespace comphelper; - // ----------------------------------------------------------------------------- +using namespace com::sun::star; +using namespace comphelper; + +bool operator==( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ) +{ + return ( _lhs.Name == _rhs.Name ) + && ( _lhs.Height == _rhs.Height ) + && ( _lhs.Width == _rhs.Width ) + && ( _lhs.StyleName == _rhs.StyleName ) + && ( _lhs.Family == _rhs.Family ) + && ( _lhs.CharSet == _rhs.CharSet ) + && ( _lhs.Pitch == _rhs.Pitch ) + && ( _lhs.CharacterWidth == _rhs.CharacterWidth ) + && ( _lhs.Weight == _rhs.Weight ) + && ( _lhs.Slant == _rhs.Slant ) + && ( _lhs.Underline == _rhs.Underline ) + && ( _lhs.Strikeout == _rhs.Strikeout ) + && ( _lhs.Orientation == _rhs.Orientation ) + && ( _lhs.Kerning == _rhs.Kerning ) + && ( _lhs.WordLineMode == _rhs.WordLineMode ) + && ( _lhs.Type == _rhs.Type ); +} + +// ----------------------------------------------------------------------------- // XContainer void OReportControlModel::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException) { Directory: /dba/reportdesign/source/core/inc/ ============================================= File [changed]: ReportControlModel.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/inc/ReportControlModel.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +4 -22 -------------------- --- ReportControlModel.hxx 2007-06-27 04:58:18+0000 1.1.2.2 +++ ReportControlModel.hxx 2007-06-27 05:05:46+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: ReportControlModel.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: fs $ $Date: 2007/06/27 04:58:18 $ + * last change: $Author: fs $ $Date: 2007/06/27 05:05:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,27 +68,9 @@ namespace reportdesign { - bool operator==( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ) - { - return ( _lhs.Name == _rhs.Name ) - && ( _lhs.Height == _rhs.Height ) - && ( _lhs.Width == _rhs.Width ) - && ( _lhs.StyleName == _rhs.StyleName ) - && ( _lhs.Family == _rhs.Family ) - && ( _lhs.CharSet == _rhs.CharSet ) - && ( _lhs.Pitch == _rhs.Pitch ) - && ( _lhs.CharacterWidth == _rhs.CharacterWidth ) - && ( _lhs.Weight == _rhs.Weight ) - && ( _lhs.Slant == _rhs.Slant ) - && ( _lhs.Underline == _rhs.Underline ) - && ( _lhs.Strikeout == _rhs.Strikeout ) - && ( _lhs.Orientation == _rhs.Orientation ) - && ( _lhs.Kerning == _rhs.Kerning ) - && ( _lhs.WordLineMode == _rhs.WordLineMode ) - && ( _lhs.Type == _rhs.Type ); - } + bool operator==( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ); - bool operator!=( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ) + inline bool operator!=( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ) { return !( _lhs == _rhs ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
