summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--connectivity/source/drivers/macab/MacabRecord.cxx2
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx4
2 files changed, 2 insertions, 4 deletions
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index b7e270f378f2..3072e1eaa2f4 100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -42,8 +42,6 @@ MacabRecord::MacabRecord(const sal_Int32 _size)
: size(_size),
fields(std::make_unique<macabfield *[]>(size))
{
- size = _size;
- fields = std::make_unique<macabfield *[]>(size);
sal_Int32 i;
for(i = 0; i < size; i++)
fields[i] = nullptr;
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 8667ebc9f205..92adf4642938 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -127,8 +127,8 @@ protected:
OUString computeName(const OUString& name);
OUString m_name;
- rtl::Reference<NestedRegistryImpl> m_xRegistry;
sal_uInt32 m_state;
+ rtl::Reference<NestedRegistryImpl> m_xRegistry;
Reference<XRegistryKey> m_localKey;
Reference<XRegistryKey> m_defaultKey;
};
@@ -137,7 +137,7 @@ protected:
NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry,
Reference<XRegistryKey>& localKey,
Reference<XRegistryKey>& defaultKey )
- : m_xRegistry(pDefaultRegistry), m_state(m_xRegistry->m_state), m_localKey(localKey), m_defaultKey(defaultKey)
+ : m_state(pDefaultRegistry->m_state), m_xRegistry(pDefaultRegistry), m_localKey(localKey), m_defaultKey(defaultKey)
{
if (m_localKey.is())
{