diff options
| author | Mark Page <aptitude@btconnect.com> | 2016-06-07 11:59:24 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-08 11:09:44 +0000 |
| commit | 22fa9289fdc6fd8d82d754adfef39fee3fd3c52f (patch) | |
| tree | 9adcbeb8394912bd45f6c346d2dac3144c621593 /include/connectivity | |
| parent | f595e70cfee85a423f592190c607231cb00e3180 (diff) | |
tdf#96099 Remove various smart pointer typedefs
Change-Id: I76843139e43ca1c158a977e24d210d5af93e4d0f
Reviewed-on: https://gerrit.libreoffice.org/26014
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/connectivity')
| -rw-r--r-- | include/connectivity/TKey.hxx | 2 | ||||
| -rw-r--r-- | include/connectivity/TTableHelper.hxx | 6 | ||||
| -rw-r--r-- | include/connectivity/sdbcx/VKey.hxx | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx index a7f067a9ede9..cfce73d09c6a 100644 --- a/include/connectivity/TKey.hxx +++ b/include/connectivity/TKey.hxx @@ -36,7 +36,7 @@ namespace connectivity OTableKeyHelper( OTableHelper* _pTable); OTableKeyHelper( OTableHelper* _pTable ,const OUString& Name - ,const sdbcx::TKeyProperties& _rProps + ,const std::shared_ptr<sdbcx::KeyProperties>& _rProps ); inline OTableHelper* getTable() const { return m_pTable; } }; diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index 3e56f9c34c36..0953a7d150ea 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -72,7 +72,7 @@ namespace connectivity }; typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - typedef std::map<OUString, sdbcx::TKeyProperties> TKeyMap; + typedef std::map<OUString, std::shared_ptr<sdbcx::KeyProperties>> TKeyMap; struct OTableHelperImpl; @@ -150,8 +150,8 @@ namespace connectivity virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; // helper method to get key properties - sdbcx::TKeyProperties getKeyProperties(const OUString& _sName) const; - void addKey(const OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties); + std::shared_ptr<sdbcx::KeyProperties> getKeyProperties(const OUString& _sName) const; + void addKey(const OUString& _sName,const std::shared_ptr<sdbcx::KeyProperties>& _aKeyProperties); virtual OUString getTypeCreatePattern() const; diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx index 80962175ff62..0d52f22d2ff8 100644 --- a/include/connectivity/sdbcx/VKey.hxx +++ b/include/connectivity/sdbcx/VKey.hxx @@ -56,7 +56,6 @@ namespace connectivity {} KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){} }; - typedef std::shared_ptr< KeyProperties > TKeyProperties; typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OKey_BASE; class OCollection; @@ -69,7 +68,7 @@ namespace connectivity public OKey_BASE { protected: - TKeyProperties m_aProps; + std::shared_ptr<KeyProperties> m_aProps; OCollection* m_pColumns; using ODescriptor_BASE::rBHelper; @@ -79,7 +78,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; public: OKey(bool _bCase); - OKey(const OUString& Name,const TKeyProperties& _rProps,bool _bCase); + OKey(const OUString& Name,const std::shared_ptr<KeyProperties>& _rProps,bool _bCase); virtual ~OKey( ); |