[Libreoffice-commits] .: 5 commits - basic/source connectivity/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Dec 30 13:02:52 PST 2010
basic/source/app/process.cxx | 2 ++
basic/source/runtime/methods.cxx | 1 +
connectivity/source/drivers/adabas/BDriver.cxx | 2 ++
xmloff/source/draw/ximpcustomshape.cxx | 8 ++++----
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 89659f15c1127453342f098e09f209cbfb427fe8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 30 20:59:06 2010 +0000
cppcheck: prefer prefix variant
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 667bfa8..e768c8b 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1165,7 +1165,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
while( aEquationNameIter != aEquationNameEnd )
{
(*pH)[ *aEquationNameIter ] = (sal_Int32)( aEquationNameIter - maEquationNames.begin() );
- aEquationNameIter++;
+ ++aEquationNameIter;
}
// resolve equation
@@ -1196,7 +1196,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
}
}
while( nIndexOf != -1 );
- aEquationIter++;
+ ++aEquationIter;
}
// Path
@@ -1237,7 +1237,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
default:
break;
}
- aPathIter++;
+ ++aPathIter;
}
std::vector< beans::PropertyValues >::iterator aHandleIter = maHandles.begin();
std::vector< beans::PropertyValues >::iterator aHandleEnd = maHandles.end();
@@ -1273,7 +1273,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
}
pValues++;
}
- aHandleIter++;
+ ++aHandleIter;
}
delete pH;
}
commit dcba880b0e02937356fbb0db061843d8a72f34e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 30 20:56:47 2010 +0000
osl_getProcessInfo requires Size to be set first
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1479d41..0206e19 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3629,6 +3629,7 @@ RTLFUNC(Shell)
if ( bSucc && SbiRuntime::isVBAEnabled())
{
oslProcessInfo aInfo;
+ aInfo.Size = sizeof(oslProcessInfo);
osl_getProcessInfo( pApp, osl_Process_IDENTIFIER, &aInfo );
nResult = aInfo.Ident;
}
commit 41f259df94aef4350b0584703afa9e6ce6f8585d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 30 20:55:45 2010 +0000
osl_getProcessInfo requires Size to be set first
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 53268cb..5c8bab9 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -1164,6 +1164,7 @@ int ODriver::X_START(const ::rtl::OUString& sDBName)
OSL_ASSERT(eError == osl_Process_E_None);
oslProcessInfo aInfo;
+ aInfo.Size = sizeof(oslProcessInfo);
if(osl_getProcessInfo(aApp, osl_Process_EXITCODE, &aInfo) == osl_Process_E_None && aInfo.Code)
return aInfo.Code;
@@ -1199,6 +1200,7 @@ int ODriver::X_STOP(const ::rtl::OUString& sDBName)
return 1;
oslProcessInfo aInfo;
+ aInfo.Size = sizeof(oslProcessInfo);
if(osl_getProcessInfo(aApp, osl_Process_EXITCODE, &aInfo) == osl_Process_E_None && aInfo.Code)
return aInfo.Code;
commit 1683ce69460d90452760777145cb94bef44f3156
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 30 20:53:00 2010 +0000
osl_getProcessInfo requires Size to be set first
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 420c2b4..397eaad 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -99,6 +99,7 @@ long Process::ImplGetExitCode()
if ( m_pProcess )
{
oslProcessInfo aProcessInfo;
+ aProcessInfo.Size = sizeof(oslProcessInfo);
osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo );
if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) )
SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT );
commit de58722aa499b0de84463edd2e966eebe5aa0513
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 30 20:52:40 2010 +0000
osl_getProcessInfo requires Size to be set first
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 8789cdb..420c2b4 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -83,6 +83,7 @@ BOOL Process::ImplIsRunning()
if ( m_pProcess && bHasBeenStarted )
{
oslProcessInfo aProcessInfo;
+ aProcessInfo.Size = sizeof(oslProcessInfo);
osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo );
if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) )
return TRUE;
More information about the Libreoffice-commits
mailing list