[Libreoffice-commits] .: 5 commits - cppu/source idlc/source io/source sal/osl stoc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 24 06:54:24 PST 2011
cppu/source/uno/data.cxx | 4 +--
cppu/source/uno/eq.hxx | 3 --
idlc/source/aststack.cxx | 4 ---
idlc/source/astunion.cxx | 2 -
io/source/stm/omark.cxx | 4 ---
sal/osl/unx/file_misc.cxx | 3 --
sal/osl/unx/file_url.cxx | 5 ----
stoc/source/implementationregistration/implreg.cxx | 23 ---------------------
stoc/source/javavm/javavm.cxx | 1
9 files changed, 8 insertions(+), 41 deletions(-)
New commits:
commit 4a5931c9bb916cc08b4303775ae46a625cb4ed65
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 11:06:55 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 0744e17..30c22d1 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -487,14 +487,9 @@ static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
const OUString& linkName,
const OUString& linkTarget,
const OUString& implName)
- // throw ( InvalidRegistryException, RuntimeException )
{
- sal_Bool ret = sal_False;
-
Reference < XRegistryKey > xRootKey;
-// try
-// {
xRootKey = xDest->getRootKey();
if (xRootKey->getKeyType(linkName) == RegistryKeyType_LINK)
@@ -507,23 +502,9 @@ static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
linkName + spool().colon_old ), oldImplName);
}
}
-// }
-// catch (InvalidRegistryException&)
-// {
-// }
-// try
-// {
if (xRootKey->isValid())
- {
- ret = xRootKey->createLink(linkName, linkTarget);
- }
-// }
-// catch(InvalidRegistryException&)
-// {
-// }
-
-// return ret;
+ xRootKey->createLink(linkName, linkTarget);
}
//*************************************************************************
@@ -666,7 +647,6 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
const Reference < XRegistryKey >& xKey,
const OUString& implName,
sal_Bool bRegister)
- // throw ( InvalidRegistryException, RuntimeException )
{
sal_Bool hasSubKeys = sal_False;
@@ -734,7 +714,6 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
}
}
}
- return;
}
//*************************************************************************
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 700c3d2..2e2fe51 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -540,6 +540,7 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
char * p = tmData->tm_zone;
#else
char * p = tzname[0];
+ (void)tmData;
#endif
if (!strcmp(TIMEZONE, p))
commit 35a81f22d4b179a06bfc83579596fb282b68411d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:58:17 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 2740844..4a3912c 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -735,10 +735,8 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
);
// this method is blocking
- sal_Int32 nRead;
Sequence<sal_Int8> seqDummy( nBytesToSkip );
-
- nRead = readBytes( seqDummy , nBytesToSkip );
+ readBytes( seqDummy , nBytesToSkip );
}
sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, RuntimeException)
commit f4327314528d794447f3107b37b4adfea8ed1cc6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:55:39 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 901b27b..0d693ed 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -274,7 +274,7 @@ sal_Bool SAL_CALL uno_type_equalData(
{
return _equalData(
pVal1, pVal1Type, 0,
- pVal2, pVal2Type, 0,
+ pVal2, pVal2Type,
queryInterface, release );
}
//##################################################################################################
@@ -286,7 +286,7 @@ sal_Bool SAL_CALL uno_equalData(
{
return _equalData(
pVal1, pVal1TD->pWeakRef, pVal1TD,
- pVal2, pVal2TD->pWeakRef, pVal2TD,
+ pVal2, pVal2TD->pWeakRef,
queryInterface, release );
}
//##################################################################################################
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index 2f08fea..638b833 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -303,7 +303,7 @@ inline sal_Bool _equalData(
void * pDest,
typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,
void * pSource,
- typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr,
+ typelib_TypeDescriptionReference * pSourceType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () )
{
@@ -316,7 +316,6 @@ inline sal_Bool _equalData(
}
while (typelib_TypeClass_ANY == (eSourceTypeClass = pSourceType->eTypeClass))
{
- pSourceTypeDescr = 0;
pSourceType = ((uno_Any *)pSource)->pType;
pSource = ((uno_Any *)pSource)->pData;
}
commit 0b132a38935fc40ab148c72d64fd9249e9be0c6f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:52:43 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/idlc/source/aststack.cxx b/idlc/source/aststack.cxx
index 49063d1..6a172e5 100644
--- a/idlc/source/aststack.cxx
+++ b/idlc/source/aststack.cxx
@@ -124,11 +124,9 @@ AstStack* AstStack::push(AstScope* pScope)
void AstStack::pop()
{
- AstScope *pScope;
-
if (m_top < 1)
return;
- pScope = m_stack[--m_top];
+ --m_top;
}
void AstStack::clear()
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index 4c0f5c6..df11400 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -305,7 +305,6 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
AstUnionLabel* pLabel = NULL;
AstExprValue* pExprValue = NULL;
RTConstValue aConst;
- RTFieldAccess access = RT_ACCESS_READWRITE;
OUString docu;
sal_uInt16 index = 0;
if ( pDefault )
@@ -345,7 +344,6 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
if ( pDefault )
{
- access = RT_ACCESS_DEFAULT;
aConst.m_type = RT_TYPE_INT64;
aConst.m_value.aHyper = disc + 1;
aBlob.setFieldData(
commit 9957af8a1ef119e29c43542421c42be456cbc3c6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:51:12 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index f942ed4..44a9642 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -697,8 +697,7 @@ static oslFileError oslDoMoveFile( const sal_Char* pszPath, const sal_Char* pszD
if ( tErr != osl_File_E_None )
{
- oslFileError tErrRemove;
- tErrRemove=osl_psz_removeFile(pszDestPath);
+ osl_psz_removeFile(pszDestPath);
return tErr;
}
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 391f90f..b59f350 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -520,7 +520,6 @@ namespace /* private */
oslFileError _osl_resolvepath(
/*inout*/ sal_Unicode* path,
- /*inout*/ sal_Unicode* current_pos,
/*inout*/ bool* failed)
{
oslFileError ferr = osl_File_E_None;
@@ -537,7 +536,6 @@ namespace /* private */
if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX))
return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
- current_pos = ustrtoend(path) - 1;
}
else
{
@@ -619,7 +617,6 @@ namespace /* private */
{
ferr = _osl_resolvepath(
path_resolved_so_far,
- presolvedsf,
&realpath_failed);
if (osl_File_E_None != ferr)
@@ -638,7 +635,6 @@ namespace /* private */
{
ferr = _osl_resolvepath(
path_resolved_so_far,
- presolvedsf,
&realpath_failed);
if (osl_File_E_None != ferr)
@@ -664,7 +660,6 @@ namespace /* private */
{
ferr = _osl_resolvepath(
path_resolved_so_far,
- presolvedsf,
&realpath_failed);
if (osl_File_E_None != ferr)
More information about the Libreoffice-commits
mailing list