commit a2f91994dffb5945ff70de864591d594d2fe7f59
author Stephan Bergmann <sbergman@redhat.com> Fri Apr 08 22:23:06 2016 +0200
committer Stephan Bergmann <sbergman@redhat.com> Mon Apr 11 14:32:29 2016 +0200
tree 309076940195087801ef8dc9c9515941b0bc291e
parent 662035ed6334711d053cb4a7b2d37ff95c1f6838

Avoid reserved identifier

Change-Id: I6dfb2961adeb412405c58e0a0b51e130cbd3e0c3

basic/source/sbx/sbxform.cxx

diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 3323d4f..92c8bc8 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -227,7 +227,7 @@ void SbxBasicFormater::ParseBack( OUStringBuffer& sStrg, const OUString& sFormat
    }
}

#ifdef _with_sprintf
#ifdef with_sprintf_


void SbxBasicFormater::InitScan( double _dNum )
@@ -657,7 +657,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
    bZeroSpaceOn = false;


#ifdef _with_sprintf
#ifdef with_sprintf_
    InitScan( dNumber );
#endif
    // scanning the format-string:
@@ -697,7 +697,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                        for( short j = nMaxDigit; j > nDigitPos; j-- )
                        {
                            short nTempDigit;
#ifdef _with_sprintf
#ifdef with_sprintf_
                            AppendDigit( sReturnStrg, nTempDigit = GetDigitAtPosScan( j, bFoundFirstDigit ) );
#else
                            AppendDigit( sReturnStrg, nTempDigit = GetDigitAtPos( dNumber, j, dNumber, bFoundFirstDigit ) );
@@ -730,7 +730,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                else
                {
                    short nTempDigit;
#ifdef _with_sprintf
#ifdef with_sprintf_
                    AppendDigit( sReturnStrg, nTempDigit = GetDigitAtPosScan( nDigitPos, bFoundFirstDigit ) );
#else
                    AppendDigit( sReturnStrg, nTempDigit = GetDigitAtPos( dNumber, nDigitPos, dNumber, bFoundFirstDigit ) );
@@ -760,7 +760,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                    {
                        for( short j = nMaxExponentDigit; j > nExponentPos; j-- )
                        {
#ifdef _with_sprintf
#ifdef with_sprintf_
                            AppendDigit( sReturnStrg, GetDigitAtPosExpScan( dExponent, j, bFoundFirstDigit ) );
#else
                            AppendDigit( sReturnStrg,GetDigitAtPos( dExponent, j, dExponent, bFoundFirstDigit ) );
@@ -775,7 +775,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                }
                else
                {
#ifdef _with_sprintf
#ifdef with_sprintf_
                    AppendDigit( sReturnStrg, GetDigitAtPosExpScan( dExponent, nExponentPos, bFoundFirstDigit ) );
#else
                    AppendDigit( sReturnStrg, GetDigitAtPos( dExponent, nExponentPos, dExponent, bFoundFirstDigit ) );
@@ -817,7 +817,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                }

                bool bOverflow = false;
#ifdef _with_sprintf
#ifdef with_sprintf_
                short nNextDigit = GetDigitAtPosScan( nDigitPos, bFoundFirstDigit );
#else
                short nNextDigit = GetDigitAtPos( dNumber, nDigitPos, dNumber, bFoundFirstDigit );
@@ -916,7 +916,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
    // scan completed - rounding necessary?
    if( !bScientific )
    {
#ifdef _with_sprintf
#ifdef with_sprintf_
        short nNextDigit = GetDigitAtPosScan( nDigitPos, bFoundFirstDigit );
#else
        short nNextDigit = GetDigitAtPos( dNumber, nDigitPos, dNumber, bFoundFirstDigit );

include/basic/sbxform.hxx

diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx
index ff32b37..4832ed3 100644
--- a/include/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
@@ -73,7 +73,7 @@
        a) use sprintf()
        b) use log10() and pow() digit
*/
#define _with_sprintf   // use a)
#define with_sprintf_   // use a)

#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
@@ -115,7 +115,7 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
    BASIC_DLLPRIVATE void   StrRoundDigit( OUStringBuffer& sStrg, short nPos );
    BASIC_DLLPRIVATE void   ParseBack( OUStringBuffer& sStrg, const OUString& sFormatStrg,
                                       short nFormatPos );
#ifdef _with_sprintf
#ifdef with_sprintf_
    // Methods for string conversion with sprintf():
    BASIC_DLLPRIVATE void   InitScan( double _dNum );
    BASIC_DLLPRIVATE void   InitExp( double _dNewExp );