summaryrefslogtreecommitdiff
path: root/sc/qa
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-02-12 21:24:03 +0100
committerJulien Nabet <serval2412@yahoo.fr>2013-02-12 21:24:25 +0100
commit56f4d7dc9d0a10dbe0bc2d55fb5fa931453c91db (patch)
tree5d2a05570034d03369e60473d5fce671775c219d /sc/qa
parent1aaf9a9b362188eb706eae2b6b93df35266047d3 (diff)
Some cppcheck cleaning
Change-Id: I8609949377181f8edb30ac07b2791cfcd079fc7d
Diffstat (limited to 'sc/qa')
-rw-r--r--sc/qa/unit/helper/qahelper.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 86275f7d4077..b09a61e2991e 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -103,10 +103,9 @@ void loadFile(const OUString& aFileName, std::string& aContent)
OString aOFileName = OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8);
#ifdef ANDROID
- const char *contents;
size_t size;
if (strncmp(aOFileName.getStr(), "/assets/", sizeof("/assets/")-1) == 0) {
- contents = (const char *) lo_apkentry(aOFileName.getStr(), &size);
+ const char *contents = (const char *) lo_apkentry(aOFileName.getStr(), &size);
if (contents != 0) {
aContent = std::string(contents, size);
return;
@@ -243,7 +242,7 @@ public:
for ( unsigned int index=0; index<numElems; ++index )
{
OUString sFileName = OUString::createFromAscii( aTestValues[ index ].sTestDoc );
- printf("aTestValues[%d] %s\n", index, OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ printf("aTestValues[%u] %s\n", index, OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
int nImportType = aTestValues[ index ].nImportType;
int nExportType = aTestValues[ index ].nExportType;
ScDocShellRef xShell = loadDoc( sFileName, nImportType );