diff options
Diffstat (limited to 'writerperfect/source')
4 files changed, 52 insertions, 53 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()); diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index eeb449db0e9a..7f3e1b165da6 100644 --- a/writerperfect/source/common/DirectoryStream.cxx +++ b/writerperfect/source/common/DirectoryStream.cxx @@ -51,8 +51,7 @@ namespace writerperfect { namespace { -uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent, - const rtl::OUString& rName) +uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent, const OUString& rName) { uno::Reference<io::XInputStream> xInputStream; @@ -68,7 +67,7 @@ uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent, const uno::Reference<sdbc::XRow> xRow(xResultSet, uno::UNO_QUERY_THROW); do { - const rtl::OUString aTitle(xRow->getString(1)); + const OUString aTitle(xRow->getString(1)); if (aTitle == rName) { const uno::Reference<ucb::XContent> xSubContent(xContentAccess->queryContent()); @@ -195,7 +194,7 @@ librevenge::RVNGInputStream* DirectoryStream::getSubStreamByName(const char* con ucbhelper::Content aContent(m_pImpl->xContent, uno::Reference<ucb::XCommandEnvironment>(), comphelper::getProcessComponentContext()); const uno::Reference<io::XInputStream> xInputStream( - findStream(aContent, rtl::OUString::createFromAscii(pName))); + findStream(aContent, OUString::createFromAscii(pName))); if (xInputStream.is()) return new WPXSvInputStream(xInputStream); diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index c0ac94ae3e18..771345a8c925 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -83,7 +83,7 @@ typedef struct namespace { -rtl::OUString lcl_normalizeSubStreamPath(const rtl::OUString& rPath) +OUString lcl_normalizeSubStreamPath(const OUString& rPath) { // accept paths which begin by '/' // TODO: maybe this should to a full normalization @@ -95,7 +95,7 @@ rtl::OUString lcl_normalizeSubStreamPath(const rtl::OUString& rPath) namespace { -const rtl::OUString concatPath(const rtl::OUString& lhs, const rtl::OUString& rhs) +const OUString concatPath(const OUString& lhs, const OUString& rhs) { if (lhs.isEmpty()) return rhs; @@ -104,26 +104,26 @@ const rtl::OUString concatPath(const rtl::OUString& lhs, const rtl::OUString& rh struct OLEStreamData { - OLEStreamData(const rtl::OString& rName, const rtl::OString& rvngName); + OLEStreamData(const OString& rName, const OString& rvngName); SotStorageStreamRefWrapper stream; /** Name of the stream. * - * This is not @c rtl::OUString, because we need to be able to + * This is not @c OUString, because we need to be able to * produce const char* from it. */ - rtl::OString const name; + OString const name; /** librevenge name of the stream. * - * This is not @c rtl::OUString, because we need to be able to + * This is not @c OUString, because we need to be able to * produce const char* from it. */ - rtl::OString const RVNGname; + OString const RVNGname; }; -typedef std::unordered_map<rtl::OUString, std::size_t> NameMap_t; -typedef std::unordered_map<rtl::OUString, SotStorageRefWrapper> OLEStorageMap_t; +typedef std::unordered_map<OUString, std::size_t> NameMap_t; +typedef std::unordered_map<OUString, SotStorageRefWrapper> OLEStorageMap_t; /** Representation of an OLE2 storage. * @@ -147,13 +147,13 @@ struct OLEStorageImpl void initialize(std::unique_ptr<SvStream> pStream); - tools::SvRef<SotStorageStream> getStream(const rtl::OUString& rPath); + tools::SvRef<SotStorageStream> getStream(const OUString& rPath); tools::SvRef<SotStorageStream> const& getStream(std::size_t nId); private: - void traverse(const tools::SvRef<SotStorage>& rStorage, const rtl::OUString& rPath); + void traverse(const tools::SvRef<SotStorage>& rStorage, const OUString& rPath); - tools::SvRef<SotStorageStream> createStream(const rtl::OUString& rPath); + tools::SvRef<SotStorageStream> createStream(const OUString& rPath); public: SotStorageRefWrapper mxRootStorage; //< root storage of the OLE2 @@ -163,7 +163,7 @@ public: bool mbInitialized; }; -OLEStreamData::OLEStreamData(const rtl::OString& rName, const rtl::OString& rvngName) +OLEStreamData::OLEStreamData(const OString& rName, const OString& rvngName) : stream() , name(rName) , RVNGname(rvngName) @@ -191,9 +191,9 @@ void OLEStorageImpl::initialize(std::unique_ptr<SvStream> pStream) mbInitialized = true; } -tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString& rPath) +tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const OUString& rPath) { - const rtl::OUString aPath(lcl_normalizeSubStreamPath(rPath)); + const OUString aPath(lcl_normalizeSubStreamPath(rPath)); NameMap_t::iterator aIt = maNameMap.find(aPath); // For the while don't return stream in this situation. @@ -203,8 +203,8 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString& rP return tools::SvRef<SotStorageStream>(); if (!maStreams[aIt->second].stream.ref.is()) - maStreams[aIt->second].stream.ref = createStream( - rtl::OStringToOUString(maStreams[aIt->second].name, RTL_TEXTENCODING_UTF8)); + maStreams[aIt->second].stream.ref + = createStream(OStringToOUString(maStreams[aIt->second].name, RTL_TEXTENCODING_UTF8)); return maStreams[aIt->second].stream.ref; } @@ -213,12 +213,12 @@ tools::SvRef<SotStorageStream> const& OLEStorageImpl::getStream(const std::size_ { if (!maStreams[nId].stream.ref.is()) maStreams[nId].stream.ref - = createStream(rtl::OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8)); + = createStream(OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8)); return maStreams[nId].stream.ref; } -void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rtl::OUString& rPath) +void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const OUString& rPath) { SvStorageInfoList infos; @@ -228,18 +228,18 @@ void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rt { if (info.IsStream()) { - rtl::OUString baseName = info.GetName(), rvngName = baseName; + OUString baseName = info.GetName(), rvngName = baseName; // librevenge::RVNGOLEStream ignores the first character when is a control code, so ... if (!rvngName.isEmpty() && rvngName.toChar() < 32) rvngName = rvngName.copy(1); maStreams.emplace_back( - rtl::OUStringToOString(concatPath(rPath, baseName), RTL_TEXTENCODING_UTF8), - rtl::OUStringToOString(concatPath(rPath, rvngName), RTL_TEXTENCODING_UTF8)); + OUStringToOString(concatPath(rPath, baseName), RTL_TEXTENCODING_UTF8), + OUStringToOString(concatPath(rPath, rvngName), RTL_TEXTENCODING_UTF8)); maNameMap[concatPath(rPath, rvngName)] = maStreams.size() - 1; } else if (info.IsStorage()) { - const rtl::OUString aPath = concatPath(rPath, info.GetName()); + const OUString aPath = concatPath(rPath, info.GetName()); SotStorageRefWrapper aStorage; aStorage.ref = rStorage->OpenSotStorage(info.GetName(), StreamMode::STD_READ); maStorageMap[aPath] = aStorage; @@ -255,15 +255,15 @@ void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rt } } -tools::SvRef<SotStorageStream> OLEStorageImpl::createStream(const rtl::OUString& rPath) +tools::SvRef<SotStorageStream> OLEStorageImpl::createStream(const OUString& rPath) { const sal_Int32 nDelim = rPath.lastIndexOf(u'/'); if (-1 == nDelim) return mxRootStorage.ref->OpenSotStream(rPath, StreamMode::STD_READ); - const rtl::OUString aDir = rPath.copy(0, nDelim); - const rtl::OUString aName = rPath.copy(nDelim + 1); + const OUString aDir = rPath.copy(0, nDelim); + const OUString aName = rPath.copy(nDelim + 1); const OLEStorageMap_t::const_iterator aIt = maStorageMap.find(aDir); @@ -278,16 +278,16 @@ namespace { struct ZipStreamData { - explicit ZipStreamData(const rtl::OString& rName); + explicit ZipStreamData(const OString& rName); Reference<XInputStream> xStream; /** Name of the stream. * - * This is not @c rtl::OUString, because we need to be able to + * This is not @c OUString, because we need to be able to * produce const char* from it. */ - rtl::OString const aName; + OString const aName; }; /** Representation of a Zip storage. @@ -307,13 +307,13 @@ struct ZipStorageImpl */ void initialize(); - Reference<XInputStream> getStream(const rtl::OUString& rPath); + Reference<XInputStream> getStream(const OUString& rPath); Reference<XInputStream> const& getStream(std::size_t nId); private: void traverse(const Reference<container::XNameAccess>& rxEnum); - Reference<XInputStream> createStream(const rtl::OUString& rPath); + Reference<XInputStream> createStream(const OUString& rPath); public: Reference<container::XNameAccess> mxContainer; //< root of the Zip @@ -322,7 +322,7 @@ public: bool mbInitialized; }; -ZipStreamData::ZipStreamData(const rtl::OString& rName) +ZipStreamData::ZipStreamData(const OString& rName) : xStream() , aName(rName) { @@ -344,9 +344,9 @@ void ZipStorageImpl::initialize() mbInitialized = true; } -Reference<XInputStream> ZipStorageImpl::getStream(const rtl::OUString& rPath) +Reference<XInputStream> ZipStorageImpl::getStream(const OUString& rPath) { - const rtl::OUString aPath(lcl_normalizeSubStreamPath(rPath)); + const OUString aPath(lcl_normalizeSubStreamPath(rPath)); NameMap_t::iterator aIt = maNameMap.find(aPath); // For the while don't return stream in this situation. @@ -365,14 +365,14 @@ Reference<XInputStream> const& ZipStorageImpl::getStream(const std::size_t nId) { if (!maStreams[nId].xStream.is()) maStreams[nId].xStream - = createStream(rtl::OStringToOUString(maStreams[nId].aName, RTL_TEXTENCODING_UTF8)); + = createStream(OStringToOUString(maStreams[nId].aName, RTL_TEXTENCODING_UTF8)); return maStreams[nId].xStream; } void ZipStorageImpl::traverse(const Reference<container::XNameAccess>& rxContainer) { - const Sequence<rtl::OUString> lNames = rxContainer->getElementNames(); + const Sequence<OUString> lNames = rxContainer->getElementNames(); maStreams.reserve(lNames.getLength()); @@ -380,13 +380,13 @@ void ZipStorageImpl::traverse(const Reference<container::XNameAccess>& rxContain { if (!lNames[n].endsWith("/")) // skip dirs { - maStreams.emplace_back(rtl::OUStringToOString(lNames[n], RTL_TEXTENCODING_UTF8)); + maStreams.emplace_back(OUStringToOString(lNames[n], RTL_TEXTENCODING_UTF8)); maNameMap[lNames[n]] = maStreams.size() - 1; } } } -Reference<XInputStream> ZipStorageImpl::createStream(const rtl::OUString& rPath) +Reference<XInputStream> ZipStorageImpl::createStream(const OUString& rPath) { Reference<XInputStream> xStream; @@ -632,7 +632,7 @@ bool WPXSvInputStreamImpl::existsSubStream(const char* const name) PositionHolder pos(mxSeekable); mxSeekable->seek(0); - const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8)); + const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8)); if (isOLE()) { @@ -662,7 +662,7 @@ librevenge::RVNGInputStream* WPXSvInputStreamImpl::getSubStreamByName(const char PositionHolder pos(mxSeekable); mxSeekable->seek(0); - const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8)); + const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8)); if (isOLE()) { diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index 4c80c6cf075e..852c71aebdf1 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -27,7 +27,7 @@ bool EBookImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStr OdtGenerator& rGenerator, utl::MediaDescriptor& rDescriptor) { - rtl::OUString aFilterName; + OUString aFilterName; rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName; assert(!aFilterName.isEmpty()); |