Avoid reserved identifiers

Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4

1 files changed, 22 insertions, 22 deletions

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index bf03a07ae852..cb9e98583152 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -88,7 +88,7 @@ const sal_Char sCalc_Round[]=   "round";
 const sal_Char sCalc_Date[] =   "date";
 
 // ATTENTION: sorted list of all operators
-struct _CalcOp
+struct CalcOp
 {
     union{
         const sal_Char* pName;
@@ -97,7 +97,7 @@ struct _CalcOp
     SwCalcOper eOp;
 };
 
-_CalcOp const aOpTable[] = {
+CalcOp const aOpTable[] = {
 /* ACOS */    {{sCalc_Acos},       CALC_ACOS},  // Arc cosine
 /* ADD */     {{sCalc_Add},        CALC_PLUS},  // Addition
 /* AND */     {{sCalc_And},        CALC_AND},   // log. AND
@@ -150,38 +150,38 @@ extern "C" {
 static int SAL_CALL OperatorCompare( const void *pFirst, const void *pSecond)
 {
     int nRet = 0;
-    if( CALC_NAME == static_cast<const _CalcOp*>(pFirst)->eOp )
+    if( CALC_NAME == static_cast<const CalcOp*>(pFirst)->eOp )
     {
-        if( CALC_NAME == static_cast<const _CalcOp*>(pSecond)->eOp )
-            nRet = static_cast<const _CalcOp*>(pFirst)->pUName->compareTo(
-                   *static_cast<const _CalcOp*>(pSecond)->pUName );
+        if( CALC_NAME == static_cast<const CalcOp*>(pSecond)->eOp )
+            nRet = static_cast<const CalcOp*>(pFirst)->pUName->compareTo(
+                   *static_cast<const CalcOp*>(pSecond)->pUName );
         else
-            nRet = static_cast<const _CalcOp*>(pFirst)->pUName->compareToAscii(
-                   static_cast<const _CalcOp*>(pSecond)->pName );
+            nRet = static_cast<const CalcOp*>(pFirst)->pUName->compareToAscii(
+                   static_cast<const CalcOp*>(pSecond)->pName );
     }
     else
     {
-        if( CALC_NAME == static_cast<const _CalcOp*>(pSecond)->eOp )
-            nRet = -1 * static_cast<const _CalcOp*>(pSecond)->pUName->compareToAscii(
-                        static_cast<const _CalcOp*>(pFirst)->pName );
+        if( CALC_NAME == static_cast<const CalcOp*>(pSecond)->eOp )
+            nRet = -1 * static_cast<const CalcOp*>(pSecond)->pUName->compareToAscii(
+                        static_cast<const CalcOp*>(pFirst)->pName );
         else
-            nRet = strcmp( static_cast<const _CalcOp*>(pFirst)->pName,
-                           static_cast<const _CalcOp*>(pSecond)->pName );
+            nRet = strcmp( static_cast<const CalcOp*>(pFirst)->pName,
+                           static_cast<const CalcOp*>(pSecond)->pName );
     }
     return nRet;
 }
 }// extern "C"
 
-_CalcOp* FindOperator( const OUString& rSrch )
+CalcOp* FindOperator( const OUString& rSrch )
 {
-    _CalcOp aSrch;
+    CalcOp aSrch;
     aSrch.pUName = &rSrch;
     aSrch.eOp = CALC_NAME;
 
-    return static_cast<_CalcOp*>(bsearch( static_cast<void*>(&aSrch),
+    return static_cast<CalcOp*>(bsearch( static_cast<void*>(&aSrch),
                               static_cast<void const *>(aOpTable),
-                              sizeof( aOpTable ) / sizeof( _CalcOp ),
-                              sizeof( _CalcOp ),
+                              sizeof( aOpTable ) / sizeof( CalcOp ),
+                              sizeof( CalcOp ),
                               OperatorCompare ));
 }
 
@@ -677,10 +677,10 @@ SwCalcOper SwCalc::GetToken()
             }
 
             // catch operators
-            _CalcOp* pFnd = ::FindOperator( sLowerCaseName );
+            CalcOp* pFnd = ::FindOperator( sLowerCaseName );
             if( pFnd )
             {
-                switch( ( eCurrOper = static_cast<_CalcOp*>(pFnd)->eOp ) )
+                switch( ( eCurrOper = static_cast<CalcOp*>(pFnd)->eOp ) )
                 {
                 case CALC_SUM:
                 case CALC_MEAN:
@@ -1034,10 +1034,10 @@ SwCalcOper SwCalc::GetToken()
                     return GetToken();  // call again
 
                 // catch operators
-                _CalcOp* pFnd = ::FindOperator( aStr );
+                CalcOp* pFnd = ::FindOperator( aStr );
                 if( pFnd )
                 {
-                    switch( ( eCurrOper = static_cast<_CalcOp*>(pFnd)->eOp ) )
+                    switch( ( eCurrOper = static_cast<CalcOp*>(pFnd)->eOp ) )
                     {
                     case CALC_SUM :
                     case CALC_MEAN :