diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-25 09:59:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-26 10:55:58 +0000 |
| commit | e8fd5a07eca70912ddee45aaa34d434809b59fb7 (patch) | |
| tree | d5dc890d12987cad73f5e64301f823ba23a97f2d /filter | |
| parent | e6adb3e8b4de3c0f78d249b83de19b849ef65b59 (diff) | |
update loplugin stylepolice to check local pointers vars
are actually pointer vars.
Also convert from regex to normal code, so we can enable this
plugin all the time.
Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1
Reviewed-on: https://gerrit.libreoffice.org/24391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4 | ||||
| -rw-r--r-- | filter/source/xsltfilter/OleHandler.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index d177204a726d..88d829dead0b 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -137,7 +137,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property Reference< XStyleFamiliesSupplier > xstylefamiliessupplier(mxDoc, UNO_QUERY); Reference< XStyleLoader > xstyleLoader (xstylefamiliessupplier->getStyleFamilies(), UNO_QUERY); if(xstyleLoader.is()){ - Sequence<css::beans::PropertyValue> pValue=xstyleLoader->getStyleLoaderOptions(); + Sequence<css::beans::PropertyValue> aValue = xstyleLoader->getStyleLoaderOptions(); //Load the Styles from the Template URL Supplied in the TypeDetection file if(!comphelper::isFileUrl(msTemplateName)) @@ -148,7 +148,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property msTemplateName=PathString.concat(msTemplateName); } - xstyleLoader->loadStylesFromURL(msTemplateName,pValue); + xstyleLoader->loadStylesFromURL(msTemplateName,aValue); } } diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index d9f72be2b7f8..d79cd01713a1 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -108,17 +108,17 @@ namespace XSLT return "Not Found:";// + streamName; } //The first four byte are the length of the uncompressed data - Sequence<sal_Int8> pLength(4); + Sequence<sal_Int8> aLength(4); Reference<XSeekable> xSeek(subStream, UNO_QUERY); xSeek->seek(0); //Get the uncompressed length - int readbytes = subStream->readBytes(pLength, 4); + int readbytes = subStream->readBytes(aLength, 4); if (4 != readbytes) { return "Can not read the length."; } - int oleLength = (pLength[0] << 0) + (pLength[1] << 8) - + (pLength[2] << 16) + (pLength[3] << 24); + int oleLength = (aLength[0] << 0) + (aLength[1] << 8) + + (aLength[2] << 16) + (aLength[3] << 24); Sequence<sal_Int8> content(oleLength); //Read all bytes. The compressed length should less then the uncompressed length readbytes = subStream->readBytes(content, oleLength); |