summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authornccuong <cao.cuong.ngo@gmail.com>2013-03-04 15:25:02 +0100
committerEike Rathke <erack@redhat.com>2013-03-06 12:59:26 +0000
commita6b91730053fc61416716ae176081b91de52532b (patch)
tree192e578875f9abe82ca535e3cb794944bac9d9aa /basic
parent6374ae0721a5e5da9ed1a477f9642feba01199a6 (diff)
fdo#60148 Clean up warnings from the Clang compiler plugin
Change-Id: I08d755677c46c476710ecbd067ed9f7e2f54a671 loplugin: clean warnings: unused variables, incorrect indentation and log area. Reviewed-on: https://gerrit.libreoffice.org/2544 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'basic')
-rw-r--r--basic/source/runtime/iosys.cxx2
-rw-r--r--basic/source/sbx/sbxobj.cxx6
-rw-r--r--basic/source/sbx/sbxvalue.cxx62
3 files changed, 36 insertions, 34 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 4daa688b702b..de08aaacccea 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -704,7 +704,7 @@ namespace
void WriteLines(SvStream &rStream, const rtl::OString& rStr)
{
rtl::OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) );
- write_uInt8s_FromOString(rStream, rStr);
+ write_uInt8s_FromOString(rStream, aStr);
endl( rStream );
}
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 69f99201309d..da05ce28fc18 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -219,7 +219,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
DbgOutf( "SBX: Search %.*s %s %s in %s",
nLvl++, " ",
( t >= SbxCLASS_DONTCARE && t <= SbxCLASS_OBJECT )
- ? pCls[ t-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr1.getStr() );
+ ? pCls[ t-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr2.getStr() );
#endif
if( !GetAll( t ) )
@@ -504,7 +504,7 @@ void SbxObject::Insert( SbxVariable* pVar )
DbgOutf( "SBX: Insert %s %s in %s",
( pVar->GetClass() >= SbxCLASS_DONTCARE &&
pVar->GetClass() <= SbxCLASS_OBJECT )
- ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr1.getStr() );
+ ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr2.getStr() );
#endif
}
}
@@ -547,7 +547,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
DbgOutf( "SBX: Insert %s %s in %s",
( pVar->GetClass() >= SbxCLASS_DONTCARE &&
pVar->GetClass() <= SbxCLASS_OBJECT )
- ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr1.getStr() );
+ ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr2.getStr() );
#endif
}
}
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index e4d9000ca11e..7356f8978343 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -44,37 +44,39 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
else
SetFlag( SBX_FIXED );
if( p )
- switch( t & 0x0FFF )
{
- case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (sal_Int16*) p; break;
- case SbxSALUINT64: n |= SbxBYREF; aData.puInt64 = (sal_uInt64*) p; break;
- case SbxSALINT64:
- case SbxCURRENCY: n |= SbxBYREF; aData.pnInt64 = (sal_Int64*) p; break;
- case SbxLONG: n |= SbxBYREF; aData.pLong = (sal_Int32*) p; break;
- case SbxSINGLE: n |= SbxBYREF; aData.pSingle = (float*) p; break;
- case SbxDATE:
- case SbxDOUBLE: n |= SbxBYREF; aData.pDouble = (double*) p; break;
- case SbxSTRING: n |= SbxBYREF; aData.pOUString = (OUString*) p; break;
- case SbxERROR:
- case SbxUSHORT:
- case SbxBOOL: n |= SbxBYREF; aData.pUShort = (sal_uInt16*) p; break;
- case SbxULONG: n |= SbxBYREF; aData.pULong = (sal_uInt32*) p; break;
- case SbxCHAR: n |= SbxBYREF; aData.pChar = (sal_Unicode*) p; break;
- case SbxBYTE: n |= SbxBYREF; aData.pByte = (sal_uInt8*) p; break;
- case SbxINT: n |= SbxBYREF; aData.pInt = (int*) p; break;
- case SbxOBJECT:
- aData.pObj = (SbxBase*) p;
- if( p )
- aData.pObj->AddRef();
- break;
- case SbxDECIMAL:
- aData.pDecimal = (SbxDecimal*) p;
- if( p )
- aData.pDecimal->addRef();
- break;
- default:
- DBG_ASSERT( !this, "Angabe eines Pointers unzulaessig" );
- n = SbxNULL;
+ switch( t & 0x0FFF )
+ {
+ case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (sal_Int16*) p; break;
+ case SbxSALUINT64: n |= SbxBYREF; aData.puInt64 = (sal_uInt64*) p; break;
+ case SbxSALINT64:
+ case SbxCURRENCY: n |= SbxBYREF; aData.pnInt64 = (sal_Int64*) p; break;
+ case SbxLONG: n |= SbxBYREF; aData.pLong = (sal_Int32*) p; break;
+ case SbxSINGLE: n |= SbxBYREF; aData.pSingle = (float*) p; break;
+ case SbxDATE:
+ case SbxDOUBLE: n |= SbxBYREF; aData.pDouble = (double*) p; break;
+ case SbxSTRING: n |= SbxBYREF; aData.pOUString = (OUString*) p; break;
+ case SbxERROR:
+ case SbxUSHORT:
+ case SbxBOOL: n |= SbxBYREF; aData.pUShort = (sal_uInt16*) p; break;
+ case SbxULONG: n |= SbxBYREF; aData.pULong = (sal_uInt32*) p; break;
+ case SbxCHAR: n |= SbxBYREF; aData.pChar = (sal_Unicode*) p; break;
+ case SbxBYTE: n |= SbxBYREF; aData.pByte = (sal_uInt8*) p; break;
+ case SbxINT: n |= SbxBYREF; aData.pInt = (int*) p; break;
+ case SbxOBJECT:
+ aData.pObj = (SbxBase*) p;
+ if( p )
+ aData.pObj->AddRef();
+ break;
+ case SbxDECIMAL:
+ aData.pDecimal = (SbxDecimal*) p;
+ if( p )
+ aData.pDecimal->addRef();
+ break;
+ default:
+ DBG_ASSERT( !this, "Angabe eines Pointers unzulaessig" );
+ n = SbxNULL;
+ }
}
else
memset( &aData, 0, sizeof( SbxValues ) );