diff options
Diffstat (limited to 'connectivity/source/inc/TSortIndex.hxx')
| -rw-r--r-- | connectivity/source/inc/TSortIndex.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index e03910ff5ac4..8d12cdd11d81 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -47,8 +47,8 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSortIndex { public: - typedef std::vector< std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; - typedef std::vector<OKeyType> TKeyTypeVector; + typedef std::vector<std::pair<sal_Int32, std::unique_ptr<OKeyValue>>> TIntValuePairVector; + typedef std::vector<OKeyType> TKeyTypeVector; private: TIntValuePairVector m_aKeyValues; @@ -60,6 +60,8 @@ namespace connectivity OSortIndex( const std::vector<OKeyType>& _aKeyType, const std::vector<TAscendingOrder>& _aAscending); + OSortIndex(OSortIndex const &) = delete; // MSVC2015 workaround + OSortIndex& operator=(OSortIndex const &) = delete; // MSVC2015 workaround ~OSortIndex(); @@ -69,7 +71,7 @@ namespace connectivity pKeyValue the keyvalue to be appended ATTENTION: when the sortindex is already frozen the parameter will be deleted */ - void AddKeyValue(OKeyValue * pKeyValue); + void AddKeyValue(std::unique_ptr<OKeyValue> pKeyValue); /** Freeze freezes the sortindex so that new values could only be appended by their value |