[Libreoffice-commits] .: basic/inc basic/source

[Fridrich Strba]

 basic/inc/basic/sbxvar.hxx    |    1 +
 basic/source/sbx/sbxvalue.cxx |   14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 1f2d0c83d07b2c877722069c0075ba35860a0400
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Nov 15 13:19:24 2011 +0100

    Put back a method needed by Windows and reformat a bit

diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 485c33e..08e8002 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -212,6 +212,7 @@ public:
 
             // Special methods
     sal_Bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+    sal_Bool PutDecimal( SbxDecimal* pDecimal ); // This function is needed for Windows build, don't remove
     sal_Bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
     sal_Bool PutCurrency( const sal_Int64& );
             // Interface for CDbl in Basic
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index f279374..f617318 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -755,21 +755,21 @@ sal_Bool SbxValue::PutString( const ::rtl::OUString& r )
 sal_Bool SbxValue::p( t n ) \
 { SbxValues aRes(e); aRes.m = n; Put( aRes ); return sal_Bool( !IsError() ); }
 
-PUT( PutByte,     SbxBYTE,       sal_uInt8,             nByte )
+PUT( PutByte,     SbxBYTE,       sal_uInt8,        nByte )
 PUT( PutChar,     SbxCHAR,       sal_Unicode,      nChar )
 PUT( PutCurrency, SbxCURRENCY,   const sal_Int64&, nInt64 )
 PUT( PutDate,     SbxDATE,       double,           nDouble )
 PUT( PutDouble,   SbxDOUBLE,     double,           nDouble )
-PUT( PutErr,      SbxERROR,      sal_uInt16,           nUShort )
-PUT( PutInteger,  SbxINTEGER,    sal_Int16,            nInteger )
-PUT( PutLong,     SbxLONG,       sal_Int32,            nLong )
+PUT( PutErr,      SbxERROR,      sal_uInt16,       nUShort )
+PUT( PutInteger,  SbxINTEGER,    sal_Int16,        nInteger )
+PUT( PutLong,     SbxLONG,       sal_Int32,        nLong )
 PUT( PutObject,   SbxOBJECT,     SbxBase*,         pObj )
 PUT( PutSingle,   SbxSINGLE,     float,            nSingle )
-PUT( PutULong,    SbxULONG,      sal_uInt32,           nULong )
-PUT( PutUShort,   SbxUSHORT,     sal_uInt16,           nUShort )
+PUT( PutULong,    SbxULONG,      sal_uInt32,       nULong )
+PUT( PutUShort,   SbxUSHORT,     sal_uInt16,       nUShort )
 PUT( PutInt64,    SbxSALINT64,   sal_Int64,        nInt64 )
 PUT( PutUInt64,   SbxSALUINT64,  sal_uInt64,       uInt64 )
-
+PUT( PutDecimal,  SbxDECIMAL,    SbxDecimal*,      pDecimal )
 
 ////////////////////////// Setting of the data type ///////////////////////////