[Libreoffice-commits] .: basic/source

Joseph Powers jpowers at kemper.freedesktop.org
Thu Jan 13 06:21:25 PST 2011


 basic/source/sbx/sbxobj.cxx  |    7 +++----
 basic/source/sbx/sbxscan.cxx |   26 +++++++++++++-------------
 basic/source/sbx/sbxvar.cxx  |    3 +--
 3 files changed, 17 insertions(+), 19 deletions(-)

New commits:
commit 198b11353bd09e40b43628097182b915a0b0c7f3
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Jan 13 06:21:15 2011 -0800

    Remove some extra #includes and trailing whitespace

diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index b020c93..bbac334 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,6 @@
 #include <tools/stream.hxx>
 #include <vcl/sound.hxx>
 #include <basic/sbx.hxx>
-#include <basic/sbxbase.hxx>
 #include "sbxres.hxx"
 #include <svl/brdcst.hxx>
 
@@ -307,7 +306,7 @@ BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
     return FALSE;
 }
 
-SbxProperty* SbxObject::GetDfltProperty() 
+SbxProperty* SbxObject::GetDfltProperty()
 {
     if ( !pDfltProp && aDfltPropName.Len() )
     {
@@ -320,7 +319,7 @@ SbxProperty* SbxObject::GetDfltProperty()
 void SbxObject::SetDfltProperty( const XubString& rName )
 {
     if ( rName != aDfltPropName )
-        pDfltProp = NULL; 
+        pDfltProp = NULL;
     aDfltPropName = rName;
     SetModified( TRUE );
 }
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index aeff9a4..0bc6c97 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -662,7 +662,7 @@ enum VbaFormatType
 
 struct VbaFormatInfo
 {
-    VbaFormatType meType; 
+    VbaFormatType meType;
     const char* mpVbaFormat; // Format string in vba
     NfIndexTableOffset meOffset; // SvNumberFormatter format index, if meType = VBA_FORMAT_TYPE_OFFSET
     const char* mpOOoFormat; // if meType = VBA_FORMAT_TYPE_USERDEFINED
@@ -674,12 +674,12 @@ struct VbaFormatInfo
 #define VBA_FORMAT_USERDEFINED( pcUtf8, pcDefinedUtf8 ) \
     { VBA_FORMAT_TYPE_USERDEFINED, pcUtf8, NF_NUMBER_STANDARD, pcDefinedUtf8 }
 
-static VbaFormatInfo pFormatInfoTable[] = 
+static VbaFormatInfo pFormatInfoTable[] =
 {
     VBA_FORMAT_OFFSET( "Long Date", NF_DATE_SYSTEM_LONG ),
     VBA_FORMAT_USERDEFINED( "Medium Date", "DD-MMM-YY" ),
     VBA_FORMAT_OFFSET( "Short Date", NF_DATE_SYSTEM_SHORT ),
-    VBA_FORMAT_USERDEFINED( "Long Time", "H:MM:SS AM/PM" ), 
+    VBA_FORMAT_USERDEFINED( "Long Time", "H:MM:SS AM/PM" ),
     VBA_FORMAT_OFFSET( "Medium Time", NF_TIME_HHMMAMPM ),
     VBA_FORMAT_OFFSET( "Short Time", NF_TIME_HHMM ),
     VBA_FORMAT_OFFSET( "ddddd", NF_DATE_SYSTEM_SHORT ),
@@ -697,7 +697,7 @@ VbaFormatInfo* getFormatInfo( const String& rFmt )
     {
         if( rFmt.EqualsIgnoreCaseAscii( pInfo->mpVbaFormat ) )
             break;
-        i++;    
+        i++;
     }
     return pInfo;
 }
@@ -724,7 +724,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
     double d = 0;
 
     // pflin, It is better to use SvNumberFormatter to handle the date/time/number format.
-    // the SvNumberFormatter output is mostly compatible with 
+    // the SvNumberFormatter output is mostly compatible with
     // VBA output besides the OOo-basic output
     if( pFmt && !SbxBasicFormater::isBasicFormat( *pFmt ) )
     {
@@ -742,7 +742,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
         }
 
         LanguageType eLangType = GetpApp()->GetSettings().GetLanguage();
-        com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > 
+        com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
             xFactory = comphelper::getProcessServiceFactory();
         SvNumberFormatter aFormatter( xFactory, eLangType );
 
@@ -754,7 +754,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
 
         BOOL bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber );
 
-        // number format, use SvNumberFormatter to handle it. 
+        // number format, use SvNumberFormatter to handle it.
         if( bSuccess )
         {
             String aFmtStr = *pFmt;
@@ -773,14 +773,14 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
                 aFormatter.GetOutputString( nNumber, nIndex, rRes, &pCol );
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_GENERALDATE )
-                    || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_C )) 
+                    || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_C ))
             {
                 if( nNumber <=-1.0 || nNumber >= 1.0 )
                 {
-                    // short date 
+                    // short date
                     nIndex = aFormatter.GetFormatIndex( NF_DATE_SYSTEM_SHORT, eLangType );
                        aFormatter.GetOutputString( nNumber, nIndex, rRes, &pCol );
-                
+
                     // long time
                     if( floor( nNumber ) != nNumber )
                     {
@@ -801,7 +801,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
                 }
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_N )
-                    || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN )) 
+                    || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ))
             {
                 INT32 nMin = implGetMinute( nNumber );
                 if( nMin < 10 && aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ) )
@@ -888,7 +888,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
                     sal_Unicode cComma = rData.getNumDecimalSep().GetBuffer()[0];
                     sal_Unicode c1000  = rData.getNumThousandSep().GetBuffer()[0];
                     String aCurrencyStrg = rData.getCurrSymbol();
- 
+
                     // Initialisierung des Basic-Formater-Hilfsobjekts:
                     // hole die Resourcen f"ur die vordefinierten Ausgaben
                     // des Format()-Befehls, z.B. f"ur "On/Off".
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index fd6c639..32c2d59 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,6 @@
 #include "svl/brdcst.hxx"
 
 #include <basic/sbx.hxx>
-#include <basic/sbxbase.hxx>
 #include "sbxres.hxx"
 #include "sbxconv.hxx"
 #include <math.h>


More information about the Libreoffice-commits mailing list