diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
| commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
| tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 /writerperfect/source/calc | |
| parent | 4e729de73f2947155248f8df5897380611b87917 (diff) | |
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerperfect/source/calc')
| -rw-r--r-- | writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index ef8ff59ea013..86d21ec8a6e2 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -76,7 +76,7 @@ public: } //! add a file - void addFile(rtl::OUString const& path, std::string const& shortName) + void addFile(OUString const& path, std::string const& shortName) { m_nameToPathMap[shortName] = path; } @@ -108,7 +108,7 @@ public: if (m_nameToPathMap.size() < id) return nullptr; - std::map<std::string, rtl::OUString>::const_iterator it = m_nameToPathMap.begin(); + std::map<std::string, OUString>::const_iterator it = m_nameToPathMap.begin(); std::advance(it, id); return it->first.c_str(); } @@ -134,7 +134,7 @@ public: OUString lPath = m_nameToPathMap.find(name)->second; do { - const rtl::OUString aTitle(xRow->getString(1)); + const OUString aTitle(xRow->getString(1)); if (aTitle != lPath) continue; @@ -169,7 +169,7 @@ private: /// the main container uno::Reference<ucb::XContent> m_xContent; /// the map short name to path - std::map<std::string, rtl::OUString> m_nameToPathMap; + std::map<std::string, OUString> m_nameToPathMap; FolderStream(const FolderStream&) = delete; FolderStream& operator=(const FolderStream&) = delete; }; @@ -336,8 +336,8 @@ MSWorksCalcImportFilter::filter(const css::uno::Sequence<css::beans::PropertyVal const css::uno::Reference<container::XChild> xChild(xContent, uno::UNO_QUERY); if (xChild.is()) { - rtl::OUString sWM3Name; - rtl::OUString sFM3Name; + OUString sWM3Name; + OUString sFM3Name; const css::uno::Reference<ucb::XContent> xPackageContent(xChild->getParent(), uno::UNO_QUERY); uno::Reference<sdbc::XResultSet> xResultSet @@ -351,12 +351,12 @@ MSWorksCalcImportFilter::filter(const css::uno::Sequence<css::beans::PropertyVal sWM3Name = aTmpUrl.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset); aTmpUrl.setExtension("FM3"); - const rtl::OUString& sTestFM3Name + const OUString& sTestFM3Name = aTmpUrl.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset); do { - const rtl::OUString& aTitle(xRow->getString(1)); + const OUString& aTitle(xRow->getString(1)); if (aTitle.equalsIgnoreAsciiCase(sTestFM3Name)) sFM3Name = aTitle; } while (xResultSet->next() && sFM3Name.isEmpty()); |