diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 11:06:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 11:06:55 +0000 |
| commit | 4b37d9a8ef1c90643bf8fc0db3abfb02d80a5ac2 (patch) | |
| tree | bc80e66c4314f96fcd8e00be3b16a2f40c5c23d1 /stoc/source | |
| parent | d9742013dd19097084821ba3662daf0018b55676 (diff) | |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'stoc/source')
| -rw-r--r-- | stoc/source/implementationregistration/implreg.cxx | 23 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 1 |
2 files changed, 2 insertions, 22 deletions
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 6741ccfcb29b..d5868490f732 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 6a0fa1d1dd9a..6b97a619b34a 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)) |