diff options
| author | Noel <noelgrandin@gmail.com> | 2020-12-02 09:41:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-12-03 07:05:02 +0100 |
| commit | a5216cf1eb647862f377bed9b9a447e8bccf338f (patch) | |
| tree | 1873118c6e50d8baba33b80b820179a9df38958d /sd | |
| parent | a186fd4f2427df7baa50f78e99644dc5a50dfb12 (diff) | |
convert SvtPathOptions::Paths to scoped enum
Change-Id: I2e6cab798309a1bc2ade00661bc95dd5ae20f748
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107045
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/ppt/propread.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/propread.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 3883f9d50cfe..02a2b544215d 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -359,11 +359,11 @@ bool ImplSdPPTImport::Import() pSection = const_cast<Section*>(pDInfoSec2->GetSection( aUserPropSetGUID )); if ( pSection ) { - Dictionary aDict; + PropDictionary aDict; pSection->GetDictionary(aDict); if (!aDict.empty()) { - Dictionary::const_iterator iter = aDict.find( OUString("_PID_HLINKS") ); + auto iter = aDict.find( OUString("_PID_HLINKS") ); if ( iter != aDict.end() ) { diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 6a8416343d6d..2a1b4e440178 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -259,7 +259,7 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu } } -void Section::GetDictionary(Dictionary& rDict) +void Section::GetDictionary(PropDictionary& rDict) { auto iter = std::find_if(maEntries.begin(), maEntries.end(), [](const std::unique_ptr<PropEntry>& rxEntry) { return rxEntry->mnId == 0; }); diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index 6ec04df7d9d4..f0edafb72802 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -81,7 +81,7 @@ #define VT_BYREF 0x4000 #define VT_TYPEMASK 0xFFF -typedef std::map<OUString,sal_uInt32> Dictionary; +typedef std::map<OUString,sal_uInt32> PropDictionary; struct PropEntry { @@ -126,7 +126,7 @@ class Section final Section& operator=( const Section& rSection ); bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); - void GetDictionary( Dictionary& rDict ); + void GetDictionary( PropDictionary& rDict ); const sal_uInt8* GetFMTID() const { return aFMTID; }; void Read( SotStorageStream* pStrm ); }; |