salhelper/inc/salhelper/dynload.hxx | 8
stoc/source/defaultregistry/defaultregistry.cxx | 147 ++++++++-------
stoc/source/implementationregistration/implreg.cxx | 3
stoc/source/inspect/introspection.cxx | 4
stoc/source/javavm/jvmargs.cxx | 15 -
stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx | 3
6 files changed, 93 insertions(+), 87 deletions(-)
New commits:
commit 14acb6b69800c0850157c2ba15b50c5527e46939
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 7 11:38:05 2012 +0100
Unused variables
Change-Id: I8d0d72ac2c3d7f0b0576980c770cb62af983d074
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index fa3867d..2de4c88 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1657,7 +1657,6 @@ Sequence< OUString >
ImplementationRegistration::getImplementations(
const OUString & locationUrl)
throw ( RuntimeException )
{
- OUString implLoaderUrl(implementationLoaderUrl);
OUString activatorName;
if (!implementationLoaderUrl.isEmpty())
@@ -1668,7 +1667,7 @@ Sequence< OUString >
ImplementationRegistration::getImplementations(
} else
{
// check locationUrl to find out what kind of loader is needed
- // set implLoaderUrl
+ // set implementationLoaderUrl
}
if( m_xSMgr.is() ) {
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index b8d73d4..5956088 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -356,10 +356,6 @@ sal_Int32 IntrospectionAccessStatic_Impl::getMethodIndex(
const ::rtl::OUString&
for( int i = 0 ; i < nLen ; ++i )
{
const Reference<XIdlMethod> xMethod2 = pMethods[ i
];
-
- ::rtl::OUString aTestClassName =
xMethod2->getDeclaringClass()->getName();
- ::rtl::OUString aTestMethodName =
xMethod2->getName();
-
if( xMethod2->getName() == aPureMethodName )
{
Reference< XIdlClass > xMethClass2 =
xMethod2->getDeclaringClass();
diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx
index 31808a6..7497fcb 100644
--- a/stoc/source/javavm/jvmargs.cxx
+++ b/stoc/source/javavm/jvmargs.cxx
@@ -21,8 +21,6 @@
#include "jvmargs.hxx"
#include <rtl/ustring.hxx>
-
-using ::rtl::OUString;
namespace stoc_javavm {
JVM::JVM() throw()//: _enabled(sal_False)
@@ -31,20 +29,9 @@ JVM::JVM() throw()//: _enabled(sal_False)
void JVM::pushProp(const OUString & property)
{
- sal_Int32 index = property.indexOf((sal_Unicode)'=');
- if(index > 0)
- {
- OUString left = property.copy(0, index).trim();
- OUString right(property.copy(index + 1).trim());
- _props.push_back(property);
- }
- else
- { // no '=', could be -X
- _props.push_back(property);
- }
+ _props.push_back(property);
}
-
const ::std::vector< ::rtl::OUString > & JVM::getProperties() const
{
return _props;
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
index 20e08ae..50be0cb 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
@@ -128,9 +128,6 @@ TypeDescriptionEnumerationImpl::createInstance(
aBytes.getConstArray(), aBytes.getLength(), false,
TYPEREG_VERSION_1);
- rtl::OUString aName(
- aReader.getTypeName().replace( '/', '.' ) );
-
if ( aReader.getTypeClass() == RT_TYPE_MODULE )
{
// Do not close xKey!
commit 98108afb23f04d46c81b8b7d97fc2c71f57207a8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 7 11:31:51 2012 +0100
Proper indentation
Change-Id: I9fe211563c8b2b2718be25180294421af5593886
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx
b/stoc/source/defaultregistry/defaultregistry.cxx
index 149593f..b6534fb 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -185,8 +185,8 @@ NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl*
pDefaultRegistry,
if (m_localKey.is())
{
m_name = m_localKey->getKeyName();
- } else
- if (m_defaultKey.is())
+ }
+ else if (m_defaultKey.is())
{
m_name = m_defaultKey->getKeyName();
}
@@ -213,8 +213,8 @@ NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName,
if (m_localKey.is())
{
m_name = m_localKey->getKeyName();
- } else
- if (m_defaultKey.is())
+ }
+ else if (m_defaultKey.is())
{
m_name = m_defaultKey->getKeyName();
}
@@ -261,10 +261,10 @@ OUString NestedKeyImpl::computeName(const OUString& name)
if ( m_localKey.is() && m_localKey->isValid() )
{
resLocalName = m_localKey->getResolvedName(name);
- } else
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
- return m_defaultKey->getResolvedName(name);
+ return m_defaultKey->getResolvedName(name);
}
if ( !resLocalName.isEmpty() && m_pRegistry->m_defaultReg->isValid() )
@@ -333,8 +333,8 @@ RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const
OUString& rKeyName )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getKeyType(rKeyName);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getKeyType(rKeyName);
}
@@ -352,8 +352,8 @@ RegistryValueType SAL_CALL NestedKeyImpl::getValueType( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getValueType();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getValueType();
}
@@ -371,11 +371,12 @@ sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getLongValue();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getLongValue();
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -391,14 +392,15 @@ void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32
value )
if ( m_localKey.is() && m_localKey->isValid() )
{
m_localKey->setLongValue(value);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
m_localKey = rootKey->createKey(m_name);
m_localKey->setLongValue(value);
m_state = m_pRegistry->m_state++;
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -414,11 +416,12 @@ Sequence< sal_Int32 > SAL_CALL
NestedKeyImpl::getLongListValue( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getLongListValue();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getLongListValue();
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -434,14 +437,15 @@ void SAL_CALL NestedKeyImpl::setLongListValue( const
Sequence< sal_Int32 >& seqV
if ( m_localKey.is() && m_localKey->isValid() )
{
m_localKey->setLongListValue(seqValue);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
m_localKey = rootKey->createKey(m_name);
m_localKey->setLongListValue(seqValue);
m_state = m_pRegistry->m_state++;
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -457,11 +461,12 @@ OUString SAL_CALL NestedKeyImpl::getAsciiValue( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getAsciiValue();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getAsciiValue();
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -477,14 +482,15 @@ void SAL_CALL NestedKeyImpl::setAsciiValue( const
OUString& value )
if ( m_localKey.is() && m_localKey->isValid() )
{
m_localKey->setAsciiValue(value);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
m_localKey = rootKey->createKey(m_name);
m_localKey->setAsciiValue(value);
m_state = m_pRegistry->m_state++;
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -500,11 +506,12 @@ Sequence< OUString > SAL_CALL
NestedKeyImpl::getAsciiListValue( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getAsciiListValue();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getAsciiListValue();
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -520,14 +527,15 @@ void SAL_CALL NestedKeyImpl::setAsciiListValue( const
Sequence< OUString >& seqV
if ( m_localKey.is() && m_localKey->isValid() )
{
m_localKey->setAsciiListValue(seqValue);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
m_localKey = rootKey->createKey(m_name);
m_localKey->setAsciiListValue(seqValue);
m_state = m_pRegistry->m_state++;
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -543,11 +551,12 @@ OUString SAL_CALL NestedKeyImpl::getStringValue( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getStringValue();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getStringValue();
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -563,14 +572,15 @@ void SAL_CALL NestedKeyImpl::setStringValue( const
OUString& value )
if ( m_localKey.is() && m_localKey->isValid() )
{
m_localKey->setStringValue(value);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
m_localKey = rootKey->createKey(m_name);
m_localKey->setStringValue(value);
m_state = m_pRegistry->m_state++;
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -586,11 +596,12 @@ Sequence< OUString > SAL_CALL
NestedKeyImpl::getStringListValue( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getStringListValue();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getStringListValue();
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -606,14 +617,15 @@ void SAL_CALL NestedKeyImpl::setStringListValue( const
Sequence< OUString >& seq
if ( m_localKey.is() && m_localKey->isValid() )
{
m_localKey->setStringListValue(seqValue);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
m_localKey = rootKey->createKey(m_name);
m_localKey->setStringListValue(seqValue);
m_state = m_pRegistry->m_state++;
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -629,11 +641,12 @@ Sequence< sal_Int8 > SAL_CALL
NestedKeyImpl::getBinaryValue( )
if ( m_localKey.is() && m_localKey->isValid() )
{
return m_localKey->getBinaryValue();
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
return m_defaultKey->getBinaryValue();
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -649,14 +662,15 @@ void SAL_CALL NestedKeyImpl::setBinaryValue( const
Sequence< sal_Int8 >& value )
if ( m_localKey.is() && m_localKey->isValid() )
{
m_localKey->setBinaryValue(value);
- } else
- if ( m_defaultKey.is() && m_defaultKey->isValid() )
+ }
+ else if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
m_localKey = rootKey->createKey(m_name);
m_localKey->setBinaryValue(value);
m_state = m_pRegistry->m_state++;
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -691,7 +705,8 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey(
const OUString& aKeyN
if ( localKey.is() || defaultKey.is() )
{
return ((XRegistryKey*)new NestedKeyImpl(m_pRegistry, localKey,
defaultKey));
- } else
+ }
+ else
{
return Reference<XRegistryKey>();
}
@@ -729,7 +744,8 @@ Reference< XRegistryKey > SAL_CALL
NestedKeyImpl::createKey( const OUString& aKe
return ((XRegistryKey*)new NestedKeyImpl(m_pRegistry, localKey,
defaultKey));
}
- } else
+ }
+ else
{
Reference<XRegistryKey> localKey, defaultKey;
@@ -785,7 +801,8 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString&
rKeyName )
}
m_pRegistry->m_localReg->getRootKey()->deleteKey(resolvedName);
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -966,7 +983,8 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const
OUString& aLinkName, const OU
}
resolvedName = resolvedName + aLinkName.copy(lastIndex);
- } else
+ }
+ else
{
if ( lastIndex == 0 )
resolvedName = m_name + aLinkName;
@@ -977,7 +995,8 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const
OUString& aLinkName, const OU
if ( m_localKey.is() && m_localKey->isValid() )
{
isCreated =
m_pRegistry->m_localReg->getRootKey()->createLink(resolvedName, aLinkTarget);
- } else
+ }
+ else
{
if ( m_defaultKey.is() && m_defaultKey->isValid() )
{
@@ -1020,7 +1039,8 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString&
rLinkName )
}
resolvedName = resolvedName + rLinkName.copy(lastIndex);
- } else
+ }
+ else
{
if ( lastIndex == 0 )
resolvedName = m_name + rLinkName;
@@ -1032,7 +1052,8 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString&
rLinkName )
!m_localKey->isReadOnly() )
{
m_pRegistry->m_localReg->getRootKey()->deleteLink(resolvedName);
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
@@ -1064,7 +1085,8 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const
OUString& rLinkName )
}
resolvedName = resolvedName + rLinkName.copy(lastIndex);
- } else
+ }
+ else
{
if ( lastIndex == 0 )
resolvedName = m_name + rLinkName;
@@ -1324,7 +1346,8 @@ Reference< XRegistryKey > SAL_CALL
NestedRegistryImpl::getRootKey( )
return ((XRegistryKey*)new NestedKeyImpl(this, localKey,
defaultKey));
}
- } else
+ }
+ else
{
throw InvalidRegistryException();
}
commit 55a58245c9608cee41c852ac29d432cb611871ab
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 7 11:27:33 2012 +0100
Proper indentation
Change-Id: I4f85be9a33be6d9a3c756f2422eb7574beac1e1d
diff --git a/salhelper/inc/salhelper/dynload.hxx
b/salhelper/inc/salhelper/dynload.hxx
index 6def1d7..f79bb22 100644
--- a/salhelper/inc/salhelper/dynload.hxx
+++ b/salhelper/inc/salhelper/dynload.hxx
@@ -156,9 +156,13 @@ public:
if( m_pLoader != toAssign.m_pLoader )
{
if( toAssign.m_pLoader )
- toAssign.m_pLoader->acquire();
+ {
+ toAssign.m_pLoader->acquire();
+ }
if( m_pLoader )
- m_pLoader->release();
+ {
+ m_pLoader->release();
+ }
m_pLoader = toAssign.m_pLoader;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
