summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-20 10:34:01 +0200
committerNoel Grandin <noel@peralex.com>2016-04-21 08:32:47 +0200
commit5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch)
tree2407c6fc040a795e6ffc69de02ba940285c04c7f /filter
parent5bb308a9ad16f6002486a60e4a753693818580b6 (diff)
new plugin stylepolice
check for local variables which follow our member field naming convention, which is highly confusing Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/icgm/actimpr.cxx12
-rw-r--r--filter/source/msfilter/eschesdo.cxx12
-rw-r--r--filter/source/msfilter/msvbahelper.cxx10
-rw-r--r--filter/source/svg/svgreader.cxx6
-rw-r--r--filter/source/svg/svgwriter.cxx6
-rw-r--r--filter/source/t602/t602filter.cxx12
6 files changed, 29 insertions, 29 deletions
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 0fbfb402f3bd..3d055095fa7d 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -407,18 +407,18 @@ void CGMImpressOutAct::EndGroup()
mnGroupLevel--;
if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL )
{
- sal_uInt32 mnFirstIndex = mpGroupLevel[ mnGroupLevel ];
- if ( mnFirstIndex == 0xffffffff )
- mnFirstIndex = 0;
- sal_uInt32 mnCurrentCount = maXShapes->getCount();
- if ( ( mnCurrentCount - mnFirstIndex ) > 1 )
+ sal_uInt32 nFirstIndex = mpGroupLevel[ mnGroupLevel ];
+ if ( nFirstIndex == 0xffffffff )
+ nFirstIndex = 0;
+ sal_uInt32 nCurrentCount = maXShapes->getCount();
+ if ( ( nCurrentCount - nFirstIndex ) > 1 )
{
uno::Reference< drawing::XShapeGrouper > aXShapeGrouper;
aXShapeGrouper.set( maXDrawPage, uno::UNO_QUERY );
if( aXShapeGrouper.is() )
{
uno::Reference< drawing::XShapes > aXShapes = drawing::ShapeCollection::create(comphelper::getProcessComponentContext());
- for ( sal_uInt32 i = mnFirstIndex; i < mnCurrentCount; i++ )
+ for ( sal_uInt32 i = nFirstIndex; i < nCurrentCount; i++ )
{
uno::Reference< drawing::XShape > aXShape = *static_cast<uno::Reference< drawing::XShape > const *>(maXShapes->getByIndex( i ).getValue());
if (aXShape.is() )
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 7ba2f6a335ed..1a3e62a54220 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -172,10 +172,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
if( const SdrObject* pSdrObj = rObj.GetSdrObject() )
if (!pSdrObj->GetName().isEmpty())
aShapeName = pSdrObj->GetName();
- uno::Reference< drawing::XShape> mXShape(rObj.GetShapeRef(), uno::UNO_QUERY);
- if (mXShape.is())
+ uno::Reference< drawing::XShape> xShape(rObj.GetShapeRef(), uno::UNO_QUERY);
+ if (xShape.is())
{
- uno::Reference<beans::XPropertySet> xPropertySet(mXShape, uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
if (xPropertySet.is())
{
uno::Sequence<beans::PropertyValue> aGrabBag;
@@ -1082,11 +1082,11 @@ basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape
else
{
// iT#s a xShape, get its transformation
- const Reference< XPropertySet > mXPropSet(rxShape, UNO_QUERY);
+ const Reference< XPropertySet > xPropSet(rxShape, UNO_QUERY);
- if(mXPropSet.is())
+ if(xPropSet.is())
{
- const Any aAny = mXPropSet->getPropertyValue("Transformation");
+ const Any aAny = xPropSet->getPropertyValue("Transformation");
if(aAny.hasValue())
{
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 744fdc2591fa..c43638abbd19 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -692,12 +692,12 @@ KeyCodeEntry aMSKeyCodesData[] = {
awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException )
{
- static MSKeyCodeMap msKeyCodes;
- if ( msKeyCodes.empty() )
+ static MSKeyCodeMap s_KeyCodes;
+ if ( s_KeyCodes.empty() )
{
for ( unsigned int i = 0; i < SAL_N_ELEMENTS( aMSKeyCodesData ); ++i )
{
- msKeyCodes[ OUString::createFromAscii( aMSKeyCodesData[ i ].sName ) ] = aMSKeyCodesData[ i ].nCode;
+ s_KeyCodes[ OUString::createFromAscii( aMSKeyCodesData[ i ].sName ) ] = aMSKeyCodesData[ i ].nCode;
}
}
OUString sKeyCode;
@@ -731,8 +731,8 @@ awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException
nVclKey |= parseChar( (char)( sKeyCode[ 0 ] ) );
else
{
- MSKeyCodeMap::iterator it = msKeyCodes.find( sKeyCode );
- if ( it == msKeyCodes.end() ) // unknown or unsupported
+ MSKeyCodeMap::iterator it = s_KeyCodes.find( sKeyCode );
+ if ( it == s_KeyCodes.end() ) // unknown or unsupported
throw uno::RuntimeException();
nVclKey |= it->second;
}
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 33a8d33cd7b1..fe2912c9d618 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -2277,10 +2277,10 @@ bool SVGReader::parseAndConvert()
StatePool aStatePool;
StateMap aStateMap;
- std::vector< uno::Reference<xml::dom::XElement> > maUseElementVector;
+ std::vector< uno::Reference<xml::dom::XElement> > aUseElementVector;
annotateStyles(aStatePool,aStateMap,aInitialState,
- xDocElem,m_xDocumentHandler,maUseElementVector);
+ xDocElem,m_xDocumentHandler,aUseElementVector);
#ifdef DEBUG_FILTER_SVGREADER
dumpTree(xDocElem);
@@ -2321,7 +2321,7 @@ bool SVGReader::parseAndConvert()
aStateMap,
xDocElem,
m_xDocumentHandler,
- maUseElementVector);
+ aUseElementVector);
m_xDocumentHandler->endElement( "draw:page" );
m_xDocumentHandler->endElement( "office:drawing" );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 3730b5350b17..48787bbab49d 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -946,10 +946,10 @@ bool SVGTextWriter::nextParagraph()
if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) )
{
bool bIsNumbered = true;
- OUString msNumberingIsNumber("NumberingIsNumber");
- if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) )
+ OUString sNumberingIsNumber("NumberingIsNumber");
+ if( xPropSetInfo->hasPropertyByName( sNumberingIsNumber ) )
{
- if( !(xPropSet->getPropertyValue( msNumberingIsNumber ) >>= bIsNumbered ) )
+ if( !(xPropSet->getPropertyValue( sNumberingIsNumber ) >>= bIsNumbered ) )
{
OSL_FAIL( "numbered paragraph without number info" );
bIsNumbered = false;
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index cfb1f2909315..f30a9edd867e 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -119,7 +119,7 @@ namespace T602ImportFilter {
#define Start_(_nam) \
if (mxHandler.is()) \
{ \
- mxHandler->startElement(_nam, mAttrList); \
+ mxHandler->startElement(_nam, xAttrList); \
if (mpAttrList) \
mpAttrList->Clear(); \
}
@@ -218,7 +218,7 @@ void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments )
void T602ImportFilter::inschr(unsigned char ch)
{
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
if(!ini.showcomm&&pst.comment) return;
@@ -282,7 +282,7 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property
mpAttrList = new SvXMLAttributeList;
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
mxHandler->startDocument();
@@ -527,7 +527,7 @@ void T602ImportFilter::inschrdef(unsigned char ch)
void T602ImportFilter::wrtfnt()
{
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
const sal_Char *style = "P1";
switch(fst.nowfnt) {
@@ -575,7 +575,7 @@ unsigned char T602ImportFilter::Readchar602()
void T602ImportFilter::par602(bool endofpage)
{
sal_Int16 endp;
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
if(!endofpage || !pst.waspar) {
if(ini.showcomm||!pst.comment) {
@@ -713,7 +713,7 @@ void T602ImportFilter::Read602()
unsigned char ch=0;
char cmd602[3] = {0};
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
if (node==QUIT) return;