From 43b4903db3e925c652e25c34362490f8adc9c5ec Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 27 Apr 2016 09:22:13 +0200 Subject: teach stylepolice plugin about ref-counted-pointer naming Change-Id: I6e91d22fc1826038c05ddb6fc065563c6a250752 Reviewed-on: https://gerrit.libreoffice.org/24459 Tested-by: Jenkins Reviewed-by: Noel Grandin --- writerperfect/source/common/WPXSvInputStream.cxx | 8 ++++---- writerperfect/source/writer/WordPerfectImportFilter.cxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'writerperfect/source') diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 95d5dd06a845..362f4a25c698 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -227,12 +227,12 @@ void OLEStorageImpl::traverse(const tools::SvRef &rStorage, const rt else if (aIt->IsStorage()) { const rtl::OUString aPath = concatPath(rPath, aIt->GetName()); - SotStorageRefWrapper xStorage; - xStorage.ref = rStorage->OpenSotStorage(aIt->GetName(), STREAM_STD_READ); - maStorageMap[aPath] = xStorage; + SotStorageRefWrapper aStorage; + aStorage.ref = rStorage->OpenSotStorage(aIt->GetName(), STREAM_STD_READ); + maStorageMap[aPath] = aStorage; // deep-first traversal - traverse(xStorage.ref, aPath); + traverse(aStorage.ref, aPath); } else { diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 00b2a9aba4fb..5b13c67dda95 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -140,10 +140,10 @@ throw (RuntimeException, std::exception) // OO Document Handler: abstract class to handle document SAX messages, concrete implementation here // writes to in-memory target doc - DocumentHandler xHandler(xInternalHandler); + DocumentHandler aHandler(xInternalHandler); OdtGenerator collector; - collector.addDocumentHandler(&xHandler, ODF_FLAT_XML); + collector.addDocumentHandler(&aHandler, ODF_FLAT_XML); collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject); collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage); if (libwpd::WPD_OK == libwpd::WPDocument::parse(&input, &collector, aUtf8Passwd.isEmpty() ? nullptr : aUtf8Passwd.getStr())) -- cgit