[Libreoffice-commits] core.git: toolkit/source

[Stephan Bergmann]

 toolkit/source/controls/unocontrolmodel.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 478ec0126ba8b2d89fadcc02b52bfb29c2edb9d8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 28 18:30:23 2014 +0100

    This has always only converted the condition of ?: to long
    
    ...not the resulting value, and seems unnecessary anyway.
    
    Change-Id: I8c58b180af2bd36f2c3dbcad888c3dd0b9e4c87d

diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 79db937..0dcc3e0 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -546,7 +546,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun:
 
     // Save FontProperty always in the old format (due to missing distinction
     // between 5.0 and 5.1)
-    OutStream->writeLong( (long) ( aProps.find( BASEPROPERTY_FONTDESCRIPTOR ) != aProps.end() ) ? ( nProps + 3 ) : nProps );
+    OutStream->writeLong( ( aProps.find( BASEPROPERTY_FONTDESCRIPTOR ) != aProps.end() ) ? ( nProps + 3 ) : nProps );
     for ( std::set<sal_uInt16>::const_iterator it = aProps.begin(); it != aProps.end(); ++it )
     {
         sal_Int32 nPropDataBeginMark = xMark->createMark();