summaryrefslogtreecommitdiff
path: root/writerperfect
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-27 09:22:13 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-28 09:31:16 +0000
commit43b4903db3e925c652e25c34362490f8adc9c5ec (patch)
treeaf12777b72d42280467e8cc19b914b2c7f4f3816 /writerperfect
parent7d6308dad9f4a079d57719a6e3a9c4cebb47d051 (diff)
teach stylepolice plugin about ref-counted-pointer naming
Change-Id: I6e91d22fc1826038c05ddb6fc065563c6a250752 Reviewed-on: https://gerrit.libreoffice.org/24459 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'writerperfect')
-rw-r--r--writerperfect/inc/ImportFilter.hxx4
-rw-r--r--writerperfect/source/common/WPXSvInputStream.cxx8
-rw-r--r--writerperfect/source/writer/WordPerfectImportFilter.cxx4
3 files changed, 8 insertions, 8 deletions
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index be429ae8960f..e7a27f4ee847 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -89,12 +89,12 @@ public:
// OO Graphics Handler: abstract class to handle document SAX messages, concrete implementation here
// writes to in-memory target doc
- DocumentHandler xHandler(xInternalHandler);
+ DocumentHandler aHandler(xInternalHandler);
WPXSvInputStream input(xInputStream);
Generator exporter;
- exporter.addDocumentHandler(&xHandler, ODF_FLAT_XML);
+ exporter.addDocumentHandler(&aHandler, ODF_FLAT_XML);
this->doRegisterHandlers(exporter);
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<SotStorage> &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()))