basctl/source/basicide/breakpoint.cxx | 4 basegfx/source/polygon/b2dpolypolygon.cxx | 4 basic/source/classes/sbxmod.cxx | 6 chart2/source/model/main/BaseCoordinateSystem.cxx | 4 comphelper/source/misc/threadpool.cxx | 8 compilerplugins/clang/store/stylepolice.cxx | 80 --- compilerplugins/clang/stylepolice.cxx | 142 +++++ cui/source/options/personalization.cxx | 10 cui/source/options/treeopt.cxx | 15 dbaccess/source/filter/xml/xmlExport.cxx | 8 dbaccess/source/ui/app/AppDetailPageHelper.cxx | 26 dbaccess/source/ui/dlg/advancedsettings.cxx | 4 desktop/qa/desktop_lib/test_desktop_lib.cxx | 16 drawinglayer/source/animation/animationtiming.cxx | 12 editeng/source/editeng/editdoc.cxx | 4 editeng/source/misc/svxacorr.cxx | 8 extensions/source/scanner/grid.cxx | 4 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4 filter/source/xsltfilter/OleHandler.cxx | 8 formula/source/core/api/token.cxx | 4 helpcompiler/source/HelpIndexer_main.cxx | 12 hwpfilter/source/hwpreader.cxx | 104 +-- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 14 l10ntools/source/helpmerge.cxx | 10 lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 28 - lotuswordpro/source/filter/lwplayout.cxx | 8 mysqlc/source/mysqlc_databasemetadata.cxx | 14 oox/source/core/xmlfilterbase.cxx | 4 oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 22 oox/source/drawingml/effectproperties.cxx | 10 oox/source/drawingml/fillproperties.cxx | 10 oox/source/drawingml/shape.cxx | 16 oox/source/drawingml/textparagraphproperties.cxx | 4 oox/source/export/drawingml.cxx | 6 oox/source/ppt/timenodelistcontext.cxx | 6 opencl/source/openclwrapper.cxx | 4 pyuno/source/module/pyuno_module.cxx | 6 sal/qa/osl/file/osl_File.cxx | 10 sc/qa/unit/ucalc.cxx | 16 sc/source/core/tool/scmatrix.cxx | 4 sc/source/filter/excel/xestyle.cxx | 6 sc/source/filter/excel/xetable.cxx | 10 sc/source/ui/dbgui/PivotLayoutDialog.cxx | 20 sc/source/ui/optdlg/calcoptionsdlg.cxx | 6 sc/source/ui/view/preview.cxx | 8 sd/source/core/drawdoc2.cxx | 12 sd/source/ui/dlg/morphdlg.cxx | 6 sd/source/ui/func/fuchar.cxx | 10 sd/source/ui/func/fumorph.cxx | 14 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 34 - sfx2/source/appl/appopen.cxx | 14 sfx2/source/control/bindings.cxx | 10 sfx2/source/control/querystatus.cxx | 14 sfx2/source/control/sfxstatuslistener.cxx | 16 sfx2/source/control/statcach.cxx | 10 sfx2/source/control/unoctitm.cxx | 10 sfx2/source/dialog/dinfdlg.cxx | 6 sfx2/source/doc/guisaveas.cxx | 6 sfx2/source/statbar/stbitem.cxx | 14 sfx2/source/toolbox/tbxitem.cxx | 32 - slideshow/source/engine/shapes/drawshapesubsetting.cxx | 4 slideshow/source/engine/transitions/slidechangebase.cxx | 6 sot/source/sdstor/ucbstorage.cxx | 4 starmath/source/cursor.cxx | 4 starmath/source/visitors.cxx | 12 stoc/source/javavm/javavm.cxx | 8 svtools/source/config/fontsubstconfig.cxx | 10 svx/source/accessibility/AccessibleShape.cxx | 18 svx/source/dialog/dlgctrl.cxx | 4 svx/source/dialog/docrecovery.cxx | 18 svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 18 svx/source/table/accessiblecell.cxx | 6 svx/source/table/tablerow.cxx | 2 svx/source/table/tablerow.hxx | 2 svx/source/tbxctrls/tbcontrl.cxx | 6 svx/source/xml/xmlgrhlp.cxx | 8 sw/source/core/access/accframebase.cxx | 14 sw/source/core/access/accmap.cxx | 26 sw/source/core/access/accpara.cxx | 3 sw/source/core/access/accselectionhelper.cxx | 14 sw/source/core/crsr/callnk.cxx | 4 sw/source/core/doc/CntntIdxStore.cxx | 4 sw/source/core/doc/SwStyleNameMapper.cxx | 4 sw/source/core/doc/doc.cxx | 4 sw/source/core/doc/docredln.cxx | 10 sw/source/core/layout/paintfrm.cxx | 6 sw/source/core/swg/SwXMLBlockExport.cxx | 2 sw/source/core/txtnode/ndtxt.cxx | 10 sw/source/core/unocore/unostyle.cxx | 30 - sw/source/filter/ww8/docxattributeoutput.cxx | 9 sw/source/filter/ww8/docxexport.cxx | 36 - sw/source/filter/ww8/docxsdrexport.cxx | 23 sw/source/filter/ww8/rtfattributeoutput.cxx | 6 sw/source/filter/ww8/ww8par3.cxx | 36 - sw/source/filter/ww8/ww8par5.cxx | 8 sw/source/ui/envelp/envfmt.cxx | 6 sw/source/uibase/docvw/SidebarWin.cxx | 4 sw/source/uibase/shells/txtattr.cxx | 6 sw/source/uibase/uno/unomailmerge.cxx | 4 sw/source/uibase/utlui/content.cxx | 4 sw/source/uibase/utlui/gloslst.cxx | 22 tools/source/ref/errinf.cxx | 48 - vbahelper/source/vbahelper/vbalineformat.cxx | 74 +- vcl/opengl/texture.cxx | 6 vcl/source/app/help.cxx | 8 vcl/source/bitmap/BitmapProcessor.cxx | 30 - vcl/source/bitmap/BitmapTools.cxx | 8 vcl/source/edit/textdata.cxx | 26 vcl/source/edit/texteng.cxx | 58 +- vcl/source/edit/textview.cxx | 34 - vcl/source/filter/ixpm/xpmread.cxx | 6 vcl/source/gdi/bitmap3.cxx | 10 vcl/source/gdi/pdfwriter_impl.cxx | 16 vcl/source/window/splitwin.cxx | 424 ++++++++-------- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 18 writerfilter/source/dmapper/GraphicImport.cxx | 8 116 files changed, 1092 insertions(+), 1044 deletions(-)
New commits: commit e8fd5a07eca70912ddee45aaa34d434809b59fb7 Author: Noel Grandin <[email protected]> Date: Mon Apr 25 09:59:16 2016 +0200 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 <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/basctl/source/basicide/breakpoint.cxx b/basctl/source/basicide/breakpoint.cxx index 31321fe..411b994 100644 --- a/basctl/source/basicide/breakpoint.cxx +++ b/basctl/source/basicide/breakpoint.cxx @@ -42,8 +42,8 @@ BreakPointList::~BreakPointList() void BreakPointList::reset() { - for (BreakPoint* maBreakPoint : maBreakPoints) - delete maBreakPoint; + for (BreakPoint* pBreakPoint : maBreakPoints) + delete pBreakPoint; maBreakPoints.clear(); } diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx index 2f71066..bfaaede 100644 --- a/basegfx/source/polygon/b2dpolypolygon.cxx +++ b/basegfx/source/polygon/b2dpolypolygon.cxx @@ -105,9 +105,9 @@ public: void setClosed(bool bNew) { - for(basegfx::B2DPolygon & maPolygon : maPolygons) + for(basegfx::B2DPolygon & rPolygon : maPolygons) { - maPolygon.setClosed(bNew); + rPolygon.setClosed(bNew); } } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 85ae94f..f96f03a 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1761,10 +1761,10 @@ void SbModule::GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache) if( (pSymDef->GetType() != SbxEMPTY) && (pSymDef->GetType() != SbxNULL) ) aCache.InsertGlobalVar( pSymDef->GetName(), pParser->aGblStrings.Find(pSymDef->GetTypeId()) ); - SbiSymPool& pChildPool = pSymDef->GetPool(); - for(sal_uInt16 j = 0; j < pChildPool.GetSize(); ++j ) + SbiSymPool& rChildPool = pSymDef->GetPool(); + for(sal_uInt16 j = 0; j < rChildPool.GetSize(); ++j ) { - SbiSymDef* pChildSymDef = pChildPool.Get(j); + SbiSymDef* pChildSymDef = rChildPool.Get(j); //std::cerr << "j: " << j << ", type: " << pChildSymDef->GetType() << "; name:" << pChildSymDef->GetName() << std::endl; if( (pChildSymDef->GetType() != SbxEMPTY) && (pChildSymDef->GetType() != SbxNULL) ) aCache.InsertLocalVar( pSymDef->GetName(), pChildSymDef->GetName(), pParser->aGblStrings.Find(pChildSymDef->GetTypeId()) ); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 5930000..755cadf 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -184,8 +184,8 @@ BaseCoordinateSystem::~BaseCoordinateSystem() { try { - for(tAxisVecVecType::value_type & m_aAllAxi : m_aAllAxis) - ModifyListenerHelper::removeListenerFromAllElements( m_aAllAxi, m_xModifyEventForwarder ); + for(tAxisVecVecType::value_type & i : m_aAllAxis) + ModifyListenerHelper::removeListenerFromAllElements( i, m_xModifyEventForwarder ); ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder ); } catch( const uno::Exception & ex ) diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index ddc1502..4036122 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -102,8 +102,8 @@ ThreadPool::ThreadPool( sal_Int32 nWorkers ) : maTasksComplete.set(); osl::MutexGuard aGuard( maGuard ); - for(rtl::Reference<ThreadWorker> & maWorker : maWorkers) - maWorker->launch(); + for(rtl::Reference<ThreadWorker> & rpWorker : maWorkers) + rpWorker->launch(); } ThreadPool::~ThreadPool() @@ -154,8 +154,8 @@ void ThreadPool::pushTask( ThreadTask *pTask ) maTasks.insert( maTasks.begin(), pTask ); // horrible beyond belief: - for(rtl::Reference<ThreadWorker> & maWorker : maWorkers) - maWorker->signalNewWork(); + for(rtl::Reference<ThreadWorker> & rpWorker : maWorkers) + rpWorker->signalNewWork(); maTasksComplete.reset(); } diff --git a/compilerplugins/clang/store/stylepolice.cxx b/compilerplugins/clang/store/stylepolice.cxx deleted file mode 100644 index 96b5f72..0000000 --- a/compilerplugins/clang/store/stylepolice.cxx +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include <regex> -#include <string> -#include <set> - -#include "compat.hxx" -#include "plugin.hxx" - -// Check for some basic naming mismatches which make the code harder to read - -namespace { - -static const std::regex aMemberRegex("^m([abnprsx]?[A-Z]|[_][a-zA-Z])"); - -class StylePolice : - public RecursiveASTVisitor<StylePolice>, public loplugin::Plugin -{ -public: - explicit StylePolice(InstantiationData const & data): Plugin(data) {} - - virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } - - bool VisitVarDecl(const VarDecl *); -private: - StringRef getFilename(SourceLocation loc); -}; - -StringRef StylePolice::getFilename(SourceLocation loc) -{ - SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(loc); - StringRef name { compiler.getSourceManager().getFilename(spellingLocation) }; - return name; -} - -bool StylePolice::VisitVarDecl(const VarDecl * varDecl) -{ - if (ignoreLocation(varDecl)) { - return true; - } - StringRef aFileName = getFilename(varDecl->getLocStart()); - std::string name = varDecl->getName(); - - // these names appear to be taken from some scientific paper - if (aFileName == SRCDIR "/scaddins/source/analysis/bessel.cxx" ) { - return true; - } - // lots of places where we are storing a "method id" here - if (aFileName.startswith(SRCDIR "/connectivity/source/drivers/jdbc") && name.compare(0,3,"mID") == 0) { - return true; - } - - if (!varDecl->isLocalVarDecl()) { - return true; - } - - if (std::regex_search(name, aMemberRegex)) - { - report( - DiagnosticsEngine::Warning, - "this local variable follows our member field naming convention, which is confusing", - varDecl->getLocation()) - << varDecl->getType() << varDecl->getSourceRange(); - } - return true; -} - - -loplugin::Plugin::Registration< StylePolice > X("stylepolice"); - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/stylepolice.cxx b/compilerplugins/clang/stylepolice.cxx new file mode 100644 index 0000000..93b1fce --- /dev/null +++ b/compilerplugins/clang/stylepolice.cxx @@ -0,0 +1,142 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <regex> +#include <string> +#include <set> + +#include "compat.hxx" +#include "plugin.hxx" + +// Check for some basic naming mismatches which make the code harder to read + +namespace { + +class StylePolice : + public RecursiveASTVisitor<StylePolice>, public loplugin::Plugin +{ +public: + explicit StylePolice(InstantiationData const & data): Plugin(data) {} + + virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } + + bool VisitVarDecl(const VarDecl *); +private: + StringRef getFilename(SourceLocation loc); +}; + +StringRef StylePolice::getFilename(SourceLocation loc) +{ + SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(loc); + StringRef name { compiler.getSourceManager().getFilename(spellingLocation) }; + return name; +} + +bool startswith(const std::string& rStr, const char* pSubStr) { + return rStr.compare(0, strlen(pSubStr), pSubStr) == 0; +} +bool isUpperLetter(char c) { + return c >= 'A' && c <= 'Z'; +} +bool isLowerLetter(char c) { + return c >= 'a' && c <= 'z'; +} +bool isIdentifierLetter(char c) { + return isUpperLetter(c) || isLowerLetter(c); +} +bool matchPointerVar(const std::string& s) { + return s.size() > 2 && s[0] == 'p' && isUpperLetter(s[1]); +} +bool matchMember(const std::string& s) { + return s.size() > 3 && s[0] == 'm' + && ( ( strchr("abnprsx", s[1]) && isUpperLetter(s[2]) ) + || ( s[1] == '_' && isIdentifierLetter(s[2]) ) ); +} + +bool StylePolice::VisitVarDecl(const VarDecl * varDecl) +{ + if (ignoreLocation(varDecl)) { + return true; + } + StringRef aFileName = getFilename(varDecl->getLocStart()); + std::string name = varDecl->getName(); + + if (!varDecl->isLocalVarDecl()) { + return true; + } + + if (matchMember(name)) + { + // these names appear to be taken from some scientific paper + if (aFileName == SRCDIR "/scaddins/source/analysis/bessel.cxx" ) { + } + // lots of places where we are storing a "method id" here + else if (aFileName.startswith(SRCDIR "/connectivity/source/drivers/jdbc") && name.compare(0,3,"mID") == 0) { + } + else { + report( + DiagnosticsEngine::Warning, + "this local variable follows our member field naming convention, which is confusing", + varDecl->getLocation()) + << varDecl->getType() << varDecl->getSourceRange(); + } + } + + QualType qt = varDecl->getType().getDesugaredType(compiler.getASTContext()).getCanonicalType(); + qt = qt.getNonReferenceType(); + std::string typeName = qt.getAsString(); + if (startswith(typeName, "const ")) + typeName = typeName.substr(6); + if (startswith(typeName, "class ")) + typeName = typeName.substr(6); + std::string aOriginalTypeName = varDecl->getType().getAsString(); + if (!qt->isPointerType() && !qt->isArrayType() && !qt->isFunctionPointerType() && !qt->isMemberPointerType() + && matchPointerVar(name) + && !startswith(typeName, "boost::intrusive_ptr") + && !startswith(typeName, "boost::optional") + && !startswith(typeName, "boost::shared_ptr") + && !startswith(typeName, "com::sun::star::uno::Reference") + && !startswith(typeName, "cppu::OInterfaceIteratorHelper") + && !startswith(typeName, "formula::FormulaCompiler::CurrentFactor") + && aOriginalTypeName != "GLXPixmap" + && !startswith(typeName, "rtl::Reference") + && !startswith(typeName, "ScopedVclPtr") + && !startswith(typeName, "std::mem_fun") + && !startswith(typeName, "std::shared_ptr") + && !startswith(typeName, "shared_ptr") // weird issue in slideshow + && !startswith(typeName, "std::unique_ptr") + && !startswith(typeName, "unique_ptr") // weird issue in include/vcl/threadex.hxx + && !startswith(typeName, "std::weak_ptr") + && !startswith(typeName, "struct _LOKDocViewPrivate") + && !startswith(typeName, "sw::UnoCursorPointer") + && !startswith(typeName, "tools::SvRef") + && !startswith(typeName, "VclPtr") + && !startswith(typeName, "vcl::ScopedBitmapAccess") + // lots of the code seems to regard iterator objects as being "pointer-like" + && typeName.find("iterator<") == std::string::npos + && aOriginalTypeName != "sal_IntPtr" ) + { + if (aFileName.startswith(SRCDIR "/bridges/") ) { + } else if (aFileName.startswith(SRCDIR "/vcl/source/fontsubset/sft.cxx") ) { + } else { + report( + DiagnosticsEngine::Warning, + "this local variable of type '%0' follows our pointer naming convention, but it is not a pointer, %1", + varDecl->getLocation()) + << typeName << aOriginalTypeName << varDecl->getSourceRange(); + } + } + return true; +} + +loplugin::Plugin::Registration< StylePolice > X("stylepolice"); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 799da44..d781688 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -131,11 +131,11 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) searchTerm = m_pEdit->GetText(); else { - for(VclPtr<PushButton> & m_vSearchSuggestion : m_vSearchSuggestions) + for(VclPtr<PushButton> & i : m_vSearchSuggestions) { - if( pButton == m_vSearchSuggestion ) + if( pButton == i ) { - searchTerm = m_vSearchSuggestion->GetDisplayText(); + searchTerm = i->GetDisplayText(); break; } } @@ -288,8 +288,8 @@ void SvxPersonalizationTabPage::dispose() m_pDefaultPersona.clear(); m_pOwnPersona.clear(); m_pSelectPersona.clear(); - for (VclPtr<PushButton> & m_vDefaultPersonaImage : m_vDefaultPersonaImages) - m_vDefaultPersonaImage.clear(); + for (VclPtr<PushButton> & i : m_vDefaultPersonaImages) + i.clear(); m_pExtensionPersonaPreview.clear(); m_pPersonaList.clear(); m_pExtensionLabel.clear(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 1450f67..6cf6e03 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1997,21 +1997,18 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( bool bAlreadyOpened = false; if ( pNode->m_aGroupedLeaves.size() > 0 ) { - for (std::vector<OptionsLeaf*> & m_aGroupedLeave : pNode->m_aGroupedLeaves) + for (std::vector<OptionsLeaf*> & rGroup : pNode->m_aGroupedLeaves) { - if ( m_aGroupedLeave.size() > 0 && - m_aGroupedLeave[0]->m_sGroupId - == sLeafGrpId ) + if ( rGroup.size() > 0 && + rGroup[0]->m_sGroupId == sLeafGrpId ) { sal_uInt32 l = 0; - for ( ; l < m_aGroupedLeave.size(); ++l ) + for ( ; l < rGroup.size(); ++l ) { - if ( m_aGroupedLeave[l]-> - m_nGroupIndex >= nLeafGrpIdx ) + if ( rGroup[l]->m_nGroupIndex >= nLeafGrpIdx ) break; } - m_aGroupedLeave.insert( - m_aGroupedLeave.begin() + l, pLeaf ); + rGroup.insert( rGroup.begin() + l, pLeaf ); bAlreadyOpened = true; break; } diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index d186399..61c508d 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -498,9 +498,9 @@ void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin ,XML_MAX_ROW_COUNT ,XML_SUPPRESS_VERSION_COLUMNS }; - for (::xmloff::token::XMLTokenEnum pSetting : pSettings) + for (::xmloff::token::XMLTokenEnum i : pSettings) { - TSettingsMap::const_iterator aFind = _aSettings.find(pSetting); + TSettingsMap::const_iterator aFind = _aSettings.find(i); if ( aFind != _aSettings.end() ) AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second); } @@ -531,9 +531,9 @@ void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings) ,XML_IS_FIRST_ROW_HEADER_LINE ,XML_PARAMETER_NAME_SUBSTITUTION }; - for (::xmloff::token::XMLTokenEnum pSetting : pSettings) + for (::xmloff::token::XMLTokenEnum nSetting : pSettings) { - TSettingsMap::const_iterator aFind = _aSettings.find(pSetting); + TSettingsMap::const_iterator aFind = _aSettings.find(nSetting); if ( aFind != _aSettings.end() ) AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index aaabfb2..bc01939 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -212,8 +212,8 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo m_xWindow = VCLUnoHelper::GetInterface( m_pTablePreview ); SetUniqueId(UID_APP_DETAILPAGE_HELPER); - for (VclPtr<DBTreeListBox> & m_pList : m_pLists) - m_pList = nullptr; + for (VclPtr<DBTreeListBox> & rpBox : m_pLists) + rpBox = nullptr; ImplInitSettings(); } @@ -235,14 +235,14 @@ void OAppDetailPageHelper::dispose() OSL_FAIL("Exception thrown while disposing preview frame!"); } - for (VclPtr<DBTreeListBox> & m_pList : m_pLists) + for (VclPtr<DBTreeListBox> & rpBox : m_pLists) { - if ( m_pList ) + if ( rpBox ) { - m_pList->clearCurrentSelection(); - m_pList->Hide(); - m_pList->clearCurrentSelection(); // why a second time? - m_pList.disposeAndClear(); + rpBox->clearCurrentSelection(); + rpBox->Hide(); + rpBox->clearCurrentSelection(); // why a second time? + rpBox.disposeAndClear(); } } m_aMenu.reset(); @@ -764,10 +764,10 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons void OAppDetailPageHelper::clearPages() { showPreview(nullptr); - for (VclPtr<DBTreeListBox> & m_pList : m_pLists) + for (VclPtr<DBTreeListBox> & rpBox : m_pLists) { - if ( m_pList ) - m_pList->Clear(); + if ( rpBox ) + rpBox->Clear(); } } @@ -1156,9 +1156,9 @@ IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void) , SID_DB_APP_VIEW_DOCINFO_PREVIEW }; - for(unsigned short pAction : pActions) + for(unsigned short nAction : pActions) { - aMenu->CheckItem(pAction,m_aMenu->IsItemChecked(pAction)); + aMenu->CheckItem(nAction,m_aMenu->IsItemChecked(nAction)); } aMenu->EnableItem( SID_DB_APP_VIEW_DOCINFO_PREVIEW, getBorderWin().getView()->getAppController().isCommandEnabled(SID_DB_APP_VIEW_DOCINFO_PREVIEW) ); diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 69b70bb..e6d7160 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -194,9 +194,9 @@ namespace dbaui { std::addressof(m_pRespectDriverResultSetType), "resulttype", DSID_RESPECTRESULTSETTYPE, false } }; - for ( const BooleanSettingDesc& pCopy : aSettings ) + for ( const BooleanSettingDesc& rDesc : aSettings ) { - m_aBooleanSettings.push_back( pCopy ); + m_aBooleanSettings.push_back( rDesc ); } } diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index c73e680..93bde3d 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -774,10 +774,10 @@ void DesktopLOKTest::testSheetOperations() CPPUNIT_ASSERT_EQUAL(pDocument->pClass->getParts(pDocument), 6); - std::vector<OString> pExpected = { "FirstSheet", "Renamed", "Sheet3", "Sheet4", "Sheet5", "LastSheet" }; + std::vector<OString> aExpected = { "FirstSheet", "Renamed", "Sheet3", "Sheet4", "Sheet5", "LastSheet" }; for (int i = 0; i < 6; ++i) { - CPPUNIT_ASSERT_EQUAL(pExpected[i], OString(pDocument->pClass->getPartName(pDocument, i))); + CPPUNIT_ASSERT_EQUAL(aExpected[i], OString(pDocument->pClass->getPartName(pDocument, i))); } comphelper::LibreOfficeKit::setActive(false); @@ -831,13 +831,13 @@ void DesktopLOKTest::testSheetSelections() { char* pUsedMimeType = nullptr; char* pCopiedContent = pDocument->pClass->getTextSelection(pDocument, nullptr, &pUsedMimeType); - std::vector<int> pExpected = {5, 6, 7, 8, 9}; + std::vector<int> aExpected = {5, 6, 7, 8, 9}; std::istringstream iss(pCopiedContent); - for (size_t i = 0; i < pExpected.size(); i++) + for (size_t i = 0; i < aExpected.size(); i++) { std::string token; iss >> token; - CPPUNIT_ASSERT_EQUAL(pExpected[i], std::stoi(token)); + CPPUNIT_ASSERT_EQUAL(aExpected[i], std::stoi(token)); } free(pUsedMimeType); @@ -877,13 +877,13 @@ void DesktopLOKTest::testSheetSelections() { char* pUsedMimeType = nullptr; char* pCopiedContent = pDocument->pClass->getTextSelection(pDocument, nullptr, &pUsedMimeType); - std::vector<int> pExpected = { 8 }; + std::vector<int> aExpected = { 8 }; std::istringstream iss(pCopiedContent); - for (size_t i = 0; i < pExpected.size(); i++) + for (size_t i = 0; i < aExpected.size(); i++) { std::string token; iss >> token; - CPPUNIT_ASSERT_EQUAL(pExpected[i], std::stoi(token)); + CPPUNIT_ASSERT_EQUAL(aExpected[i], std::stoi(token)); } free(pUsedMimeType); diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx index 3d6b432..72400c1 100644 --- a/drawinglayer/source/animation/animationtiming.cxx +++ b/drawinglayer/source/animation/animationtiming.cxx @@ -178,9 +178,9 @@ namespace drawinglayer AnimationEntryList::~AnimationEntryList() { - for(AnimationEntry* maEntrie : maEntries) + for(AnimationEntry* i : maEntries) { - delete maEntrie; + delete i; } } @@ -188,9 +188,9 @@ namespace drawinglayer { AnimationEntryList* pNew = new AnimationEntryList(); - for(AnimationEntry* maEntrie : maEntries) + for(AnimationEntry* i : maEntries) { - pNew->append(*maEntrie); + pNew->append(*i); } return pNew; @@ -281,9 +281,9 @@ namespace drawinglayer { AnimationEntryLoop* pNew = new AnimationEntryLoop(mnRepeat); - for(AnimationEntry* maEntrie : maEntries) + for(AnimationEntry* i : maEntries) { - pNew->append(*maEntrie); + pNew->append(*i); } return pNew; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 7ac78d6..38d749b 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -803,9 +803,9 @@ void ParaPortionList::Reset() long ParaPortionList::GetYOffset(const ParaPortion* pPPortion) const { long nHeight = 0; - for (const auto & maPortion : maPortions) + for (const auto & rPortion : maPortions) { - const ParaPortion* pTmpPortion = maPortion.get(); + const ParaPortion* pTmpPortion = rPortion.get(); if ( pTmpPortion == pPPortion ) return nHeight; nHeight += pTmpPortion->GetHeight(); diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index e3552f7..2a261ae 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1794,16 +1794,16 @@ static bool lcl_FindAbbreviation(const SvStringsISortDtor* pList, const OUString if( nPos < pList->size() ) { OUString sLowerWord(sWord.toAsciiLowerCase()); - OUString pAbk; + OUString sAbr; for( sal_uInt16 n = nPos; n < pList->size() && - '~' == ( pAbk = (*pList)[ n ])[ 0 ]; + '~' == ( sAbr = (*pList)[ n ])[ 0 ]; ++n ) { // ~ and ~. are not allowed! - if( 2 < pAbk.getLength() && pAbk.getLength() - 1 <= sWord.getLength() ) + if( 2 < sAbr.getLength() && sAbr.getLength() - 1 <= sWord.getLength() ) { - OUString sLowerAbk(pAbk.toAsciiLowerCase()); + OUString sLowerAbk(sAbr.toAsciiLowerCase()); for (sal_Int32 i = sLowerAbk.getLength(), ii = sLowerWord.getLength(); i;) { if( !--i ) // agrees diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 40234ae..41917af 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -519,9 +519,9 @@ void GridWindow::drawNew(vcl::RenderContext& rRenderContext) void GridWindow::drawHandles(vcl::RenderContext& rRenderContext) { - for(impHandle & m_aHandle : m_aHandles) + for(impHandle & rHandle : m_aHandles) { - m_aHandle.draw(rRenderContext, m_aMarkerBitmap); + rHandle.draw(rRenderContext, m_aMarkerBitmap); } } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index d177204..88d829d 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 d9f72be..d79cd01 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); diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 28332ed..caa60fd 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1615,10 +1615,10 @@ const FormulaToken* FormulaTokenIterator::PeekNextOperator() } if (!t && maStack.size() > 1) { - FormulaTokenIterator::Item pHere = maStack.back(); + FormulaTokenIterator::Item aHere = maStack.back(); maStack.pop_back(); t = PeekNextOperator(); - maStack.push_back(pHere); + maStack.push_back(aHere); } return t; } diff --git a/helpcompiler/source/HelpIndexer_main.cxx b/helpcompiler/source/HelpIndexer_main.cxx index 85ff29a..82822d8 100644 --- a/helpcompiler/source/HelpIndexer_main.cxx +++ b/helpcompiler/source/HelpIndexer_main.cxx @@ -20,9 +20,9 @@ int main(int argc, char **argv) { try { - const std::string pLang("-lang"); - const std::string pModule("-mod"); - const std::string pDir("-dir"); + const std::string aLang("-lang"); + const std::string aModule("-mod"); + const std::string aDir("-dir"); std::string lang; std::string module; @@ -30,19 +30,19 @@ int main(int argc, char **argv) bool error = false; for (int i = 1; i < argc; ++i) { - if (pLang.compare(argv[i]) == 0) { + if (aLang.compare(argv[i]) == 0) { if (i + 1 < argc) { lang = argv[++i]; } else { error = true; } - } else if (pModule.compare(argv[i]) == 0) { + } else if (aModule.compare(argv[i]) == 0) { if (i + 1 < argc) { module = argv[++i]; } else { error = true; } - } else if (pDir.compare(argv[i]) == 0) { + } else if (aDir.compare(argv[i]) == 0) { if (i + 1 < argc) { dir = argv[++i]; } else { diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 8f63eed..f36352e 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -954,43 +954,43 @@ void HwpReader::makeMasterStyles() int i; int nMax = hwpfile.getMaxSettedPage(); - std::deque<PageSetting> pSet(nMax + 1); + std::deque<PageSetting> aSet(nMax + 1); for( i = 0 ; i < hwpfile.getPageNumberCount() ; i++ ) { ShowPageNum *pn = hwpfile.getPageNumber(i); - pSet[pn->m_nPageNumber].pagenumber = pn; - pSet[pn->m_nPageNumber].bIsSet = true; + aSet[pn->m_nPageNumber].pagenumber = pn; + aSet[pn->m_nPageNumber].bIsSet = true; } for( i = 0 ; i < hwpfile.getHeaderFooterCount() ; i++ ) { HeaderFooter* hf = hwpfile.getHeaderFooter(i); - pSet[hf->m_nPageNumber].bIsSet = true; + aSet[hf->m_nPageNumber].bIsSet = true; if( hf->type == 0 ) // header { switch( hf->where ) { case 0 : - pSet[hf->m_nPageNumber].header = hf; - pSet[hf->m_nPageNumber].header_even = nullptr; - pSet[hf->m_nPageNumber].header_odd = nullptr; + aSet[hf->m_nPageNumber].header = hf; + aSet[hf->m_nPageNumber].header_even = nullptr; + aSet[hf->m_nPageNumber].header_odd = nullptr; break; case 1: - pSet[hf->m_nPageNumber].header_even = hf; - if( pSet[hf->m_nPageNumber].header ) + aSet[hf->m_nPageNumber].header_even = hf; + if( aSet[hf->m_nPageNumber].header ) { - pSet[hf->m_nPageNumber].header_odd = - pSet[hf->m_nPageNumber].header; - pSet[hf->m_nPageNumber].header = nullptr; + aSet[hf->m_nPageNumber].header_odd = + aSet[hf->m_nPageNumber].header; + aSet[hf->m_nPageNumber].header = nullptr; } break; case 2: - pSet[hf->m_nPageNumber].header_odd = hf; - if( pSet[hf->m_nPageNumber].header ) + aSet[hf->m_nPageNumber].header_odd = hf; + if( aSet[hf->m_nPageNumber].header ) { - pSet[hf->m_nPageNumber].header_even = - pSet[hf->m_nPageNumber].header; - pSet[hf->m_nPageNumber].header = nullptr; + aSet[hf->m_nPageNumber].header_even = + aSet[hf->m_nPageNumber].header; + aSet[hf->m_nPageNumber].header = nullptr; } break; } @@ -1000,26 +1000,26 @@ void HwpReader::makeMasterStyles() switch( hf->where ) { case 0 : - pSet[hf->m_nPageNumber].footer = hf; - pSet[hf->m_nPageNumber].footer_even = nullptr; - pSet[hf->m_nPageNumber].footer_odd = nullptr; + aSet[hf->m_nPageNumber].footer = hf; + aSet[hf->m_nPageNumber].footer_even = nullptr; + aSet[hf->m_nPageNumber].footer_odd = nullptr; break; case 1: - pSet[hf->m_nPageNumber].footer_even = hf; - if( pSet[hf->m_nPageNumber].footer ) + aSet[hf->m_nPageNumber].footer_even = hf; + if( aSet[hf->m_nPageNumber].footer ) { - pSet[hf->m_nPageNumber].footer_odd = - pSet[hf->m_nPageNumber].footer; - pSet[hf->m_nPageNumber].footer = nullptr; + aSet[hf->m_nPageNumber].footer_odd = + aSet[hf->m_nPageNumber].footer; + aSet[hf->m_nPageNumber].footer = nullptr; } break; case 2: - pSet[hf->m_nPageNumber].footer_odd = hf; - if( pSet[hf->m_nPageNumber].footer ) + aSet[hf->m_nPageNumber].footer_odd = hf; + if( aSet[hf->m_nPageNumber].footer ) { - pSet[hf->m_nPageNumber].footer_even = - pSet[hf->m_nPageNumber].footer; - pSet[hf->m_nPageNumber].footer = nullptr; + aSet[hf->m_nPageNumber].footer_even = + aSet[hf->m_nPageNumber].footer; + aSet[hf->m_nPageNumber].footer = nullptr; } break; } @@ -1046,47 +1046,47 @@ void HwpReader::makeMasterStyles() rstartEl("style:master-page", rList); pList->clear(); - if( pSet[i].bIsSet ) /* If you've changed the current setting */ + if( aSet[i].bIsSet ) /* If you've changed the current setting */ { - if( !pSet[i].pagenumber ){ + if( !aSet[i].pagenumber ){ if( pPrevSet && pPrevSet->pagenumber ) - pSet[i].pagenumber = pPrevSet->pagenumber; + aSet[i].pagenumber = pPrevSet->pagenumber; } - if( pSet[i].pagenumber ) + if( aSet[i].pagenumber ) { - if( pSet[i].pagenumber->where == 7 && pSet[i].header ) + if( aSet[i].pagenumber->where == 7 && aSet[i].header ) { - pSet[i].header_even = pSet[i].header; - pSet[i].header_odd = pSet[i].header; - pSet[i].header = nullptr; + aSet[i].header_even = aSet[i].header; + aSet[i].header_odd = aSet[i].header; + aSet[i].header = nullptr; } - if( pSet[i].pagenumber->where == 8 && pSet[i].footer ) + if( aSet[i].pagenumber->where == 8 && aSet[i].footer ) { - pSet[i].footer_even = pSet[i].footer; - pSet[i].footer_odd = pSet[i].footer; - pSet[i].footer = nullptr; + aSet[i].footer_even = aSet[i].footer; + aSet[i].footer_odd = aSet[i].footer; + aSet[i].footer = nullptr; } } - if( !pSet[i].header_even && pPrevSet && pPrevSet->header_even ) + if( !aSet[i].header_even && pPrevSet && pPrevSet->header_even ) { - pSet[i].header_even = pPrevSet->header_even; + aSet[i].header_even = pPrevSet->header_even; } - if( !pSet[i].header_odd && pPrevSet && pPrevSet->header_odd ) + if( !aSet[i].header_odd && pPrevSet && pPrevSet->header_odd ) { - pSet[i].header_odd = pPrevSet->header_odd; + aSet[i].header_odd = pPrevSet->header_odd; } - if( !pSet[i].footer_even && pPrevSet && pPrevSet->footer_even ) + if( !aSet[i].footer_even && pPrevSet && pPrevSet->footer_even ) { - pSet[i].footer_even = pPrevSet->footer_even; + aSet[i].footer_even = pPrevSet->footer_even; } - if( !pSet[i].footer_odd && pPrevSet && pPrevSet->footer_odd ) + if( !aSet[i].footer_odd && pPrevSet && pPrevSet->footer_odd ) { - pSet[i].footer_odd = pPrevSet->footer_odd; + aSet[i].footer_odd = pPrevSet->footer_odd; } - pPage = &pSet[i]; - pPrevSet = &pSet[i]; + pPage = &aSet[i]; + pPrevSet = &aSet[i]; } else if( pPrevSet ) /* If the previous setting exists */ { diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 5f8be77..718902c 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -64,8 +64,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return -1; } - jfw::JavaInfoGuard pInfo; - errcode = jfw_getSelectedJRE(&pInfo.info); + jfw::JavaInfoGuard aInfo; + errcode = jfw_getSelectedJRE(&aInfo.info); if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS) { @@ -73,19 +73,19 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return -1; } - if (pInfo.info == nullptr) + if (aInfo.info == nullptr) { - if (!findAndSelect(&pInfo.info)) + if (!findAndSelect(&aInfo.info)) return -1; } else { //check if the JRE was not uninstalled sal_Bool bExist = false; - errcode = jfw_existJRE(pInfo.info, &bExist); + errcode = jfw_existJRE(aInfo.info, &bExist); if (errcode == JFW_E_NONE) { - if (!bExist && !findAndSelect(&pInfo.info)) + if (!bExist && !findAndSelect(&aInfo.info)) return -1; } else @@ -95,7 +95,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } } - OString sPaths = getLD_LIBRARY_PATH(pInfo.info->arVendorData); + OString sPaths = getLD_LIBRARY_PATH(aInfo.info->arVendorData); fprintf(stdout, "%s\n", sPaths.getStr()); } catch (const std::exception&) diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index c5fda05..d6ad3af 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -169,8 +169,8 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile file->Extract(); XMLHashMap* aXMLStrHM = file->GetStrings(); - static ResData pResData("",""); - pResData.sResTyp = "help"; + static ResData s_ResData("",""); + s_ResData.sResTyp = "help"; std::vector<OString> order = file->getOrder(); std::vector<OString>::iterator pos; @@ -186,10 +186,10 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile printf("DBG: sHelpFile = %s\n",sHelpFile.getStr() ); #endif - pResData.sGId = posm->first; - pResData.sFilename = sHelpFile; + s_ResData.sGId = posm->first; + s_ResData.sFilename = sHelpFile; - ProcessHelp( aLangHM , sLanguage, &pResData , pMergeDataFile ); + ProcessHelp( aLangHM , sLanguage, &s_ResData , pMergeDataFile ); } file->Write(sPath); diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 4bbd7a0..ed5c675 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -283,15 +283,15 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM uno::Reference< XLinguServiceManager2 > xLngSvcMgr( GetLngSvcMgr_Impl() ); uno::Reference< XSpellChecker1 > xSpell; - OUString rTerm(qTerm); - OUString pTerm(qTerm); + OUString aRTerm(qTerm); + OUString aPTerm(qTerm); CapType ct = CapType::UNKNOWN; sal_Int32 stem = 0; sal_Int32 stem2 = 0; sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale ); - if (LinguIsUnspecified( nLanguage) || rTerm.isEmpty()) + if (LinguIsUnspecified( nLanguage) || aRTerm.isEmpty()) return noMeanings; if (!hasLocale( rLocale )) @@ -363,8 +363,8 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM { // convert word to all lower case for searching if (!stem) - ct = capitalType(rTerm, pCC); - OUString nTerm(makeLowerCase(rTerm, pCC)); + ct = capitalType(aRTerm, pCC); + OUString nTerm(makeLowerCase(aRTerm, pCC)); OString aTmp( OU2ENC(nTerm, eEnc) ); nmean = pTH->Lookup(aTmp.getStr(),aTmp.getLength(),&pmean); @@ -378,7 +378,7 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM if (stem) { xTmpRes2 = xSpell->spell( "<?xml?><query type='analyze'><word>" + - pTerm + "</word></query>", nLanguage, rProperties ); + aPTerm + "</word></query>", nLanguage, rProperties ); if (xTmpRes2.is()) { Sequence<OUString>seq = xTmpRes2->getAlternatives(); @@ -443,7 +443,7 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM OUString aAlt( cTerm + catst); pStr[i] = aAlt; } - Meaning * pMn = new Meaning(rTerm); + Meaning * pMn = new Meaning(aRTerm); OUString dTerm(pe->defn,strlen(pe->defn),eEnc ); pMn->SetMeaning(dTerm); pMn->SetSynonyms(aStr); @@ -471,31 +471,31 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM return noMeanings; Reference< XSpellAlternatives > xTmpRes; xTmpRes = xSpell->spell( "<?xml?><query type='stem'><word>" + - rTerm + "</word></query>", nLanguage, rProperties ); + aRTerm + "</word></query>", nLanguage, rProperties ); if (xTmpRes.is()) { Sequence<OUString>seq = xTmpRes->getAlternatives(); if (seq.getLength() > 0) { - rTerm = seq[0]; // XXX Use only the first stem + aRTerm = seq[0]; // XXX Use only the first stem continue; } } // stem the last word of the synonym (for categories after affixation) - rTerm = rTerm.trim(); - sal_Int32 pos = rTerm.lastIndexOf(' '); + aRTerm = aRTerm.trim(); + sal_Int32 pos = aRTerm.lastIndexOf(' '); if (!pos) return noMeanings; xTmpRes = xSpell->spell( "<?xml?><query type='stem'><word>" + - rTerm.copy(pos + 1) + "</word></query>", nLanguage, rProperties ); + aRTerm.copy(pos + 1) + "</word></query>", nLanguage, rProperties ); if (xTmpRes.is()) { Sequence<OUString>seq = xTmpRes->getAlternatives(); if (seq.getLength() > 0) { - pTerm = rTerm.copy(pos + 1); - rTerm = rTerm.copy(0, pos + 1) + seq[0]; + aPTerm = aRTerm.copy(pos + 1); + aRTerm = aRTerm.copy(0, pos + 1) + seq[0]; #if 0 for (int i = 0; i < seq.getLength(); i++) { diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index e5c8c1d..c70153c 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -1656,12 +1656,12 @@ XFColumnSep* LwpLayout::GetColumnSep() return nullptr; } - LwpBorderStuff& pBorderStuff = pLayoutGutters->GetBorderStuff(); + LwpBorderStuff& rBorderStuff = pLayoutGutters->GetBorderStuff(); LwpBorderStuff::BorderType eType = LwpBorderStuff::LEFT; - LwpColor aColor = pBorderStuff.GetSideColor(eType); - double fWidth = pBorderStuff.GetSideWidth(eType); - //sal_uInt16 nType = pBorderStuff->GetSideType(eType); + LwpColor aColor = rBorderStuff.GetSideColor(eType); + double fWidth = rBorderStuff.GetSideWidth(eType); + //sal_uInt16 nType = rBorderStuff->GetSideType(eType); XFColumnSep* pColumnSep = new XFColumnSep(); XFColor aXFColor(aColor.To24Color()); diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index b83674b..85cffeb 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -1333,13 +1333,13 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(rtl::OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), - pNamePattern(rtl::OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr()); + procNamePattern(rtl::OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr()); try { boost::scoped_ptr< sql::ResultSet> rset( meta->getProcedures(cat, sPattern.compare("")? sPattern:wild, - pNamePattern.compare("")? pNamePattern:wild)); + procNamePattern.compare("")? procNamePattern:wild)); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); sql::ResultSetMetaData * rs_meta = rset->getMetaData(); @@ -1631,8 +1631,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const Any& primaryCatalog, - const rtl::OUString& primarySchema, - const rtl::OUString& primaryTable, + const rtl::OUString& primarySchema_, + const rtl::OUString& primaryTable_, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) @@ -1644,14 +1644,14 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( std::string primaryCat(primaryCatalog.hasValue()? rtl::OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), foreignCat(foreignCatalog.hasValue()? rtl::OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""), - pSchema(rtl::OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()), - pTable(rtl::OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()), + primarySchema(rtl::OUStringToOString(primarySchema_, m_rConnection.getConnectionEncoding()).getStr()), + primaryTable(rtl::OUStringToOString(primaryTable_, m_rConnection.getConnectionEncoding()).getStr()), fSchema(rtl::OUStringToOString(foreignSchema, m_rConnection.getConnectionEncoding()).getStr()), fTable(rtl::OUStringToOString(foreignTable, m_rConnection.getConnectionEncoding()).getStr()); try { rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); - boost::scoped_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, pSchema, pTable, foreignCat, fSchema, fTable)); + boost::scoped_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, primarySchema, primaryTable, foreignCat, fSchema, fTable)); sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sal_uInt32 columns = rs_meta->getColumnCount(); while (rset->next()) { diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 40bd20a..a3cd576 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -785,8 +785,8 @@ writeCustomProperties( XmlFilterBase& rSelf, const Reference< XDocumentPropertie { OUStringBuffer buf; ::sax::Converter::convertDuration( buf, aDuration ); - OUString pDuration = buf.makeStringAndClear(); - writeElement( pAppProps, FSNS( XML_vt, XML_lpwstr ), pDuration ); + OUString aDurationStr = buf.makeStringAndClear(); + writeElement( pAppProps, FSNS( XML_vt, XML_lpwstr ), aDurationStr ); } else if ( ( aprop[n].Value ) >>= aDateTime ) writeElement( pAppProps, FSNS( XML_vt, XML_filetime ), aDateTime ); diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 5e50ce7..51b58da 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -83,8 +83,8 @@ void LayoutAtom::dump(int level) OSL_TRACE( "level = %d - %s of type %s", level, OUSTRING_TO_CSTR( msName ), typeid(*this).name() ); - const std::vector<LayoutAtomPtr>& pChildren=getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), + const std::vector<LayoutAtomPtr>& rChildren=getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), [level] (LayoutAtomPtr const& pAtom) { pAtom->dump(level + 1); } ); } @@ -581,8 +581,8 @@ public: void ShapeCreationVisitor::defaultVisit(LayoutAtom& rAtom) { - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } @@ -598,7 +598,7 @@ void ShapeCreationVisitor::visit(AlgAtom& rAtom) void ShapeCreationVisitor::visit(ForEachAtom& rAtom) { - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); sal_Int32 nChildren=1; if( rAtom.iterator().mnPtType == XML_node ) @@ -607,7 +607,7 @@ void ShapeCreationVisitor::visit(ForEachAtom& rAtom) // attribute that is contained in diagram's // getPointsPresNameMap() ShallowPresNameVisitor aVisitor(mrDgm); - std::for_each( pChildren.begin(), pChildren.end(), + std::for_each( rChildren.begin(), rChildren.end(), [&] (LayoutAtomPtr const& pAtom) { pAtom->accept(aVisitor); } ); nChildren = aVisitor.getCount(); } @@ -621,7 +621,7 @@ void ShapeCreationVisitor::visit(ForEachAtom& rAtom) for( mnCurrIdx=0; mnCurrIdx<nCnt && nStep>0; mnCurrIdx+=nStep ) { // TODO there is likely some conditions - std::for_each( pChildren.begin(), pChildren.end(), + std::for_each( rChildren.begin(), rChildren.end(), [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } @@ -688,8 +688,8 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom) void ShapeLayoutingVisitor::defaultVisit(LayoutAtom& rAtom) { // visit all children, one of them needs to be the layout algorithm - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } @@ -727,8 +727,8 @@ void ShallowPresNameVisitor::defaultVisit(LayoutAtom& rAtom) { // visit all children, at least one of them needs to have proper // name set - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx index 3ec31e0..2dd529b 100644 --- a/oox/source/drawingml/effectproperties.cxx +++ b/oox/source/drawingml/effectproperties.cxx @@ -73,9 +73,9 @@ void EffectProperties::pushToPropMap( PropertyMap& rPropMap, css::beans::PropertyValue Effect::getEffect() { - css::beans::PropertyValue pRet; + css::beans::PropertyValue aRet; if( msName.isEmpty() ) - return pRet; + return aRet; css::uno::Sequence< css::beans::PropertyValue > aSeq( maAttribs.size() ); sal_uInt32 i = 0; @@ -86,10 +86,10 @@ css::beans::PropertyValue Effect::getEffect() i++; } - pRet.Name = msName; - pRet.Value = css::uno::Any( aSeq ); + aRet.Name = msName; + aRet.Value = css::uno::Any( aSeq ); - return pRet; + return aRet; } } // namespace drawingml diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index a86d7c0..338b823 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -772,9 +772,9 @@ bool ArtisticEffectProperties::isEmpty() const css::beans::PropertyValue ArtisticEffectProperties::getEffect() { - css::beans::PropertyValue pRet; + css::beans::PropertyValue aRet; if( msName.isEmpty() ) - return pRet; + return aRet; css::uno::Sequence< css::beans::PropertyValue > aSeq( maAttribs.size() + 1 ); sal_uInt32 i = 0; @@ -797,10 +797,10 @@ css::beans::PropertyValue ArtisticEffectProperties::getEffect() aSeq[i].Value = uno::makeAny( aGraphicSeq ); } - pRet.Name = msName; - pRet.Value = css::uno::Any( aSeq ); + aRet.Name = msName; + aRet.Value = css::uno::Any( aSeq ); - return pRet; + return aRet; } void ArtisticEffectProperties::assignUsed( const ArtisticEffectProperties& rSourceProps ) diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 29e4399..fb5a30a 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1221,8 +1221,8 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) return xShape; // Stream in which to place the rendered shape - SvMemoryStream pTempStream; - Reference < io::XStream > xStream( new utl::OStreamWrapper( pTempStream ) ); + SvMemoryStream aTempStream; + Reference < io::XStream > xStream( new utl::OStreamWrapper( aTempStream ) ); Reference < io::XOutputStream > xOutputStream( xStream->getOutputStream() ); // Rendering format @@ -1258,11 +1258,11 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) xGraphicExporter->setSourceDocument( xSourceDoc ); xGraphicExporter->filter( aDescriptor ); - pTempStream.Seek( STREAM_SEEK_TO_BEGIN ); + aTempStream.Seek( STREAM_SEEK_TO_BEGIN ); Graphic aGraphic; GraphicFilter aFilter( false ); - if ( aFilter.ImportGraphic( aGraphic, "", pTempStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast < Sequence < PropertyValue >* > ( nullptr ) ) != GRFILTER_OK ) + if ( aFilter.ImportGraphic( aGraphic, "", aTempStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast < Sequence < PropertyValue >* > ( nullptr ) ) != GRFILTER_OK ) { SAL_WARN( "oox.drawingml", OSL_THIS_FUNC << "Unable to import rendered stream into graphic object" ); @@ -1409,10 +1409,10 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& void Shape::putPropertyToGrabBag( const OUString& sPropertyName, const Any& aPropertyValue ) { - PropertyValue pNewProperty; - pNewProperty.Name = sPropertyName; - pNewProperty.Value = aPropertyValue; - putPropertyToGrabBag( pNewProperty ); + PropertyValue aNewProperty; + aNewProperty.Name = sPropertyName; + aNewProperty.Value = aPropertyValue; + putPropertyToGrabBag( aNewProperty ); } void Shape::putPropertyToGrabBag( const PropertyValue& pProperty ) diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 9627333..20b9d38 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -519,8 +519,8 @@ void TextParagraphProperties::dump() const xStart->gotoEnd( true ); Reference< XPropertySet > xPropSet( xRange, UNO_QUERY ); pushToPropSet( nullptr, xPropSet, emptyMap, nullptr, false, 0 ); - PropertySet pSet( xPropSet ); - pSet.dump(); + PropertySet aPropSet( xPropSet ); + aPropSet.dump(); } #endif } } diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 6c4de9b..87dd2e1 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1824,12 +1824,12 @@ void DrawingML::WriteParagraphNumbering( const Reference< XPropertySet >& rXProp FSEND ); } - OUString pAutoNumType = GetAutoNumType( nNumberingType, bSDot, bPBehind, bPBoth ); + OUString aAutoNumType = GetAutoNumType( nNumberingType, bSDot, bPBehind, bPBoth ); - if (!pAutoNumType.isEmpty()) + if (!aAutoNumType.isEmpty()) { mpFS->singleElementNS(XML_a, XML_buAutoNum, - XML_type, OUStringToOString(pAutoNumType, RTL_TEXTENCODING_UTF8).getStr(), + XML_type, OUStringToOString(aAutoNumType, RTL_TEXTENCODING_UTF8).getStr(), XML_startAt, nStartWith > 1 ? IS(nStartWith) : nullptr, FSEND); } diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index c5ddf76..15925d9 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -433,9 +433,9 @@ namespace oox { namespace ppt { //xParentNode if( isCurrentElement( mnElement ) ) { - NodePropertyMap & pProps(mpNode->getNodeProperties()); - pProps[ NP_DIRECTION ] = makeAny( mnDir == XML_cw ); - pProps[ NP_COLORINTERPOLATION ] = makeAny( mnColorSpace == XML_hsl ? AnimationColorSpace::HSL : AnimationColorSpace::RGB ); + NodePropertyMap & rProps(mpNode->getNodeProperties()); + rProps[ NP_DIRECTION ] = makeAny( mnDir == XML_cw ); + rProps[ NP_COLORINTERPOLATION ] = makeAny( mnColorSpace == XML_hsl ? AnimationColorSpace::HSL : AnimationColorSpace::RGB ); const GraphicHelper& rGraphicHelper = getFilter().getGraphicHelper(); if( maToClr.isUsed() ) mpNode->setTo( Any( maToClr.getColor( rGraphicHelper ) ) ); diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index b17dc3e..7013178 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -703,8 +703,8 @@ bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEv rtl::Bootstrap::expandMacros(url); OUString path; osl::FileBase::getSystemPathFromFileURL(url,path); - ds_device pSelectedDevice = getDeviceSelection(path, bForceEvaluation); - pDeviceId = pSelectedDevice.aDeviceID; + ds_device aSelectedDevice = getDeviceSelection(path, bForceEvaluation); + pDeviceId = aSelectedDevice.aDeviceID; } diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index b574109..8da500e 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -170,11 +170,11 @@ void fillStruct( for( int i = 0 ; i < remainingPosInitialisers && i < nMembers ; i ++ ) { const int tupleIndex = state.getCntConsumed(); - const OUString pMemberName (pCompType->ppMemberNames[i]); - state.setInitialised(pMemberName, tupleIndex); + const OUString& rMemberName (pCompType->ppMemberNames[i]); + state.setInitialised(rMemberName, tupleIndex); PyObject *element = PyTuple_GetItem( initializer, tupleIndex ); Any a = runtime.pyObject2Any( element, ACCEPT_UNO_ANY ); - inv->setValue( pMemberName, a ); + inv->setValue( rMemberName, a ); } } if ( PyTuple_Size( initializer ) > 0 ) diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 26501d9..69ec26e 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -1257,20 +1257,12 @@ namespace osl_FileStatus createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); - Directory pDir( aTmpName3 ); - nError1 = pDir.open(); - CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); - nError1 = pDir.getNextItem( rItem ); - CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); - pDir.close(); - /* Directory aDir( aTmpName3 ); nError1 = aDir.open(); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); - nError1 = aDir.getNextItem( rItem, 0 ); + nError1 = aDir.getNextItem( rItem ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); aDir.close(); - */ } void tearDown() override diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index d10ac5b..87e5e11 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -6086,18 +6086,18 @@ void Test::testFormulaWizardSubformula() m_pDoc->SetString(ScAddress(1,1,0), "=1/0"); // B2 m_pDoc->SetString(ScAddress(1,2,0), "=gibberish"); // B3 - ScSimpleFormulaCalculator pFCell1( m_pDoc, ScAddress(0,0,0), "=B1:B3", true ); - sal_uInt16 nErrCode = pFCell1.GetErrCode(); - CPPUNIT_ASSERT( nErrCode == 0 || pFCell1.IsMatrix() ); - CPPUNIT_ASSERT_EQUAL( OUString("{1;#DIV/0!;#NAME?}"), pFCell1.GetString().getString() ); + ScSimpleFormulaCalculator aFCell1( m_pDoc, ScAddress(0,0,0), "=B1:B3", true ); + sal_uInt16 nErrCode = aFCell1.GetErrCode(); + CPPUNIT_ASSERT( nErrCode == 0 || aFCell1.IsMatrix() ); + CPPUNIT_ASSERT_EQUAL( OUString("{1;#DIV/0!;#NAME?}"), aFCell1.GetString().getString() ); m_pDoc->SetString(ScAddress(1,0,0), "=NA()"); // B1 m_pDoc->SetString(ScAddress(1,1,0), "2"); // B2 m_pDoc->SetString(ScAddress(1,2,0), "=1+2"); // B3 - ScSimpleFormulaCalculator pFCell2( m_pDoc, ScAddress(0,0,0), "=B1:B3", true ); - nErrCode = pFCell2.GetErrCode(); - CPPUNIT_ASSERT( nErrCode == 0 || pFCell2.IsMatrix() ); - CPPUNIT_ASSERT_EQUAL( OUString("{#N/A;2;3}"), pFCell2.GetString().getString() ); + ScSimpleFormulaCalculator aFCell2( m_pDoc, ScAddress(0,0,0), "=B1:B3", true ); + nErrCode = aFCell2.GetErrCode(); + CPPUNIT_ASSERT( nErrCode == 0 || aFCell2.IsMatrix() ); + CPPUNIT_ASSERT_EQUAL( OUString("{#N/A;2;3}"), aFCell2.GetString().getString() ); m_pDoc->DeleteTab(0); } diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 26b98ac..4e33efa 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -1110,9 +1110,9 @@ public: WalkElementBlocksMultipleValues(bool bTextAsZero, const std::vector<std::unique_ptr<Op>>& aOp) : maOp(aOp), mbFirst(true), mbTextAsZero(bTextAsZero) { - for (const auto& pOp : maOp) + for (const auto& rpOp : maOp) { - maRes.emplace_back(pOp->mInitVal, pOp->mInitVal, 0); + maRes.emplace_back(rpOp->mInitVal, rpOp->mInitVal, 0); } maRes.emplace_back(0.0, 0.0, 0); // count } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 665bf41..13e232c 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -661,12 +661,12 @@ sal_uInt32 XclExpPaletteImpl::GetLeastUsedListColor() const for( sal_uInt32 nIdx = 0, nCount = mxColorList->size(); nIdx < nCount; ++nIdx ) { - XclListColor& pEntry = *mxColorList->at( nIdx ).get(); + XclListColor& rEntry = *mxColorList->at( nIdx ).get(); // ignore the base colors - if( !pEntry.IsBaseColor() && (pEntry.GetWeighting() < nMinW) ) + if( !rEntry.IsBaseColor() && (rEntry.GetWeighting() < nMinW) ) { nFound = nIdx; - nMinW = pEntry.GetWeighting(); + nMinW = rEntry.GetWeighting(); } } return nFound; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 0302c9e..867d5b8 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2146,20 +2146,20 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt else { comphelper::ThreadPool &rPool = comphelper::ThreadPool::getSharedOptimalPool(); - std::vector<RowFinalizeTask*> pTasks(nThreads, nullptr); + std::vector<RowFinalizeTask*> aTasks(nThreads, nullptr); for ( size_t i = 0; i < nThreads; i++ ) - pTasks[ i ] = new RowFinalizeTask( rColXFIndexes, i == 0 ); + aTasks[ i ] = new RowFinalizeTask( rColXFIndexes, i == 0 ); RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = maRowMap.end(); size_t nIdx = 0; for ( itr = itrBeg; itr != itrEnd; ++itr, ++nIdx ) - pTasks[ nIdx % nThreads ]->push_back( itr->second.get() ); + aTasks[ nIdx % nThreads ]->push_back( itr->second.get() ); for ( size_t i = 1; i < nThreads; i++ ) - rPool.pushTask( pTasks[ i ] ); + rPool.pushTask( aTasks[ i ] ); // Progress bar updates must be synchronous to avoid deadlock - pTasks[0]->doWork(); + aTasks[0]->doWork(); rPool.waitUntilEmpty(); } diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index d1bc023..681758c 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -579,25 +579,25 @@ void ScPivotLayoutDialog::ApplyLabelData(ScDPSaveData& rSaveData) for (it = rLabelDataVector.begin(); it != rLabelDataVector.end(); ++it) { - const ScDPLabelData& pLabelData = *it->get(); + const ScDPLabelData& rLabelData = *it->get(); - OUString aUnoName = ScDPUtil::createDuplicateDimensionName(pLabelData.maName, pLabelData.mnDupCount); + OUString aUnoName = ScDPUtil::createDuplicateDimensionName(rLabelData.maName, rLabelData.mnDupCount); ScDPSaveDimension* pSaveDimensions = rSaveData.GetExistingDimensionByName(aUnoName); if (pSaveDimensions == nullptr) continue; - pSaveDimensions->SetUsedHierarchy(pLabelData.mnUsedHier); - pSaveDimensions->SetShowEmpty(pLabelData.mbShowAll); - pSaveDimensions->SetRepeatItemLabels(pLabelData.mbRepeatItemLabels); - pSaveDimensions->SetSortInfo(&pLabelData.maSortInfo); - pSaveDimensions->SetLayoutInfo(&pLabelData.maLayoutInfo); - pSaveDimensions->SetAutoShowInfo(&pLabelData.maShowInfo); + pSaveDimensions->SetUsedHierarchy(rLabelData.mnUsedHier); + pSaveDimensions->SetShowEmpty(rLabelData.mbShowAll); + pSaveDimensions->SetRepeatItemLabels(rLabelData.mbRepeatItemLabels); + pSaveDimensions->SetSortInfo(&rLabelData.maSortInfo); + pSaveDimensions->SetLayoutInfo(&rLabelData.maLayoutInfo); + pSaveDimensions->SetAutoShowInfo(&rLabelData.maShowInfo); - bool bManualSort = (pLabelData.maSortInfo.Mode == DataPilotFieldSortMode::MANUAL); + bool bManualSort = (rLabelData.maSortInfo.Mode == DataPilotFieldSortMode::MANUAL); std::vector<ScDPLabelData::Member>::const_iterator itMember; - for (itMember = pLabelData.maMembers.begin(); itMember != pLabelData.maMembers.end(); ++itMember) + for (itMember = rLabelData.maMembers.begin(); itMember != rLabelData.maMembers.end(); ++itMember) { const ScDPLabelData::Member& rLabelMember = *itMember; ScDPSaveMember* pMember = pSaveDimensions->GetMemberByName(rLabelMember.maName); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index d9c7ddb..a62900c 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -318,9 +318,9 @@ struct OpenCLTester mbOldAutoCalc = mpDoc->GetAutoCalc(); mpDoc->SetAutoCalc(false); mpOldCalcConfig = ScInterpreter::GetGlobalConfig(); - ScCalcConfig pConfig(mpOldCalcConfig); - pConfig.mnOpenCLMinimumFormulaGroupSize = 20; - ScInterpreter::SetGlobalConfig(pConfig); + ScCalcConfig aConfig(mpOldCalcConfig); + aConfig.mnOpenCLMinimumFormulaGroupSize = 20; + ScInterpreter::SetGlobalConfig(aConfig); mpDoc->SetString(ScAddress(0,0,0), "Result:"); } diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index fb3e9cb..18f4038 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1186,8 +1186,8 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) const SfxPoolItem* pItem = nullptr; if ( rStyleSet.GetItemState( ATTR_PAGE_HEADERSET, false, &pItem ) == SfxItemState::SET ) { - const SfxItemSet& pHeaderSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet(); - Size aHeaderSize = static_cast<const SvxSizeItem&>(pHeaderSet.Get(ATTR_PAGE_SIZE)).GetSize(); + const SfxItemSet& rHeaderSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet(); + Size aHeaderSize = static_cast<const SvxSizeItem&>(rHeaderSet.Get(ATTR_PAGE_SIZE)).GetSize(); aHeaderSize.Height() = (long)( aButtonUpPt.Y() / HMM_PER_TWIPS + aOffset.Y() / HMM_PER_TWIPS - aULItem.GetUpper()); aHeaderSize.Height() = aHeaderSize.Height() * 100 / mnScale; SvxSetItem aNewHeader( static_cast<const SvxSetItem&>(rStyleSet.Get(ATTR_PAGE_HEADERSET)) ); @@ -1201,8 +1201,8 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) const SfxPoolItem* pItem = nullptr; if( rStyleSet.GetItemState( ATTR_PAGE_FOOTERSET, false, &pItem ) == SfxItemState::SET ) { - const SfxItemSet& pFooterSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet(); - Size aFooterSize = static_cast<const SvxSizeItem&>(pFooterSet.Get(ATTR_PAGE_SIZE)).GetSize(); + const SfxItemSet& rFooterSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet(); + Size aFooterSize = static_cast<const SvxSizeItem&>(rFooterSet.Get(ATTR_PAGE_SIZE)).GetSize(); aFooterSize.Height() = (long)( nHeight - aButtonUpPt.Y() / HMM_PER_TWIPS - aOffset.Y() / HMM_PER_TWIPS - aULItem.GetLower() ); aFooterSize.Height() = aFooterSize.Height() * 100 / mnScale; SvxSetItem aNewFooter( static_cast<const SvxSetItem&>(rStyleSet.Get(ATTR_PAGE_FOOTERSET)) ); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index fdc5c8f..68f3b91 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -251,11 +251,11 @@ void SdDrawDocument::UpdatePageRelativeURLs(const OUString& rOldName, const OUSt if (rNewName.isEmpty()) return; - SfxItemPool& pPool(GetPool()); - sal_uInt32 nCount = pPool.GetItemCount2(EE_FEATURE_FIELD); + SfxItemPool& rPool(GetPool()); + sal_uInt32 nCount = rPool.GetItemCount2(EE_FEATURE_FIELD); for (sal_uInt32 nOff = 0; nOff < nCount; nOff++) { - const SfxPoolItem *pItem = pPool.GetItem2(EE_FEATURE_FIELD, nOff); + const SfxPoolItem *pItem = rPool.GetItem2(EE_FEATURE_FIELD, nOff); const SvxFieldItem* pFldItem = dynamic_cast< const SvxFieldItem * > (pItem); if(pFldItem) @@ -295,11 +295,11 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_ { bool bNotes = (pPage->GetPageKind() == PK_NOTES); - SfxItemPool& pPool(GetPool()); - sal_uInt32 nCount = pPool.GetItemCount2(EE_FEATURE_FIELD); + SfxItemPool& rPool(GetPool()); + sal_uInt32 nCount = rPool.GetItemCount2(EE_FEATURE_FIELD); for (sal_uInt32 nOff = 0; nOff < nCount; nOff++) { - const SfxPoolItem *pItem = pPool.GetItem2(EE_FEATURE_FIELD, nOff); + const SfxPoolItem *pItem = rPool.GetItem2(EE_FEATURE_FIELD, nOff); const SvxFieldItem* pFldItem; if ((pFldItem = dynamic_cast< const SvxFieldItem * > (pItem)) != nullptr) diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 40fe770..bd3704b 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -45,9 +45,9 @@ MorphDlg::MorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObjec LoadSettings(); - SfxItemPool & pPool = pObj1->GetObjectItemPool(); - SfxItemSet aSet1( pPool ); - SfxItemSet aSet2( pPool ); + SfxItemPool & rPool = pObj1->GetObjectItemPool(); + SfxItemSet aSet1( rPool ); + SfxItemSet aSet2( rPool ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index e3f6b9c..87c896c 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -109,19 +109,19 @@ void FuChar::DoExecute( SfxRequest& rReq ) if( nResult == RET_OK ) { const SfxItemSet* pOutputSet = pDlg->GetOutputItemSet(); - SfxItemSet pOtherSet( *pOutputSet ); + SfxItemSet aOtherSet( *pOutputSet ); // and now the reverse process - const SvxBrushItem* pBrushItem= static_cast<const SvxBrushItem*>(pOtherSet.GetItem( SID_ATTR_BRUSH_CHAR )); + const SvxBrushItem* pBrushItem= static_cast<const SvxBrushItem*>(aOtherSet.GetItem( SID_ATTR_BRUSH_CHAR )); if ( pBrushItem ) { SvxBackgroundColorItem aBackColorItem( pBrushItem->GetColor(), EE_CHAR_BKGCOLOR ); - pOtherSet.ClearItem( SID_ATTR_BRUSH_CHAR ); - pOtherSet.Put( aBackColorItem ); + aOtherSet.ClearItem( SID_ATTR_BRUSH_CHAR ); + aOtherSet.Put( aBackColorItem ); } - rReq.Done( pOtherSet ); + rReq.Done( aOtherSet ); pArgs = rReq.GetArgs(); } } diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index bede93a..46893b6 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -342,14 +342,14 @@ void FuMorph::ImpInsertPolygons( long nStartLineWidth = 0; long nEndLineWidth = 0; SdrPageView* pPageView = mpView->GetSdrPageView(); - SfxItemPool & pPool = pObj1->GetObjectItemPool(); - SfxItemSet aSet1( pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); + SfxItemPool & rPool = pObj1->GetObjectItemPool(); + SfxItemSet aSet1( rPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); SfxItemSet aSet2( aSet1 ); - bool bLineColor = false; - bool bFillColor = false; - bool bLineWidth = false; - bool bIgnoreLine = false; - bool bIgnoreFill = false; + bool bLineColor = false; + bool bFillColor = false; + bool bLineWidth = false; + bool bIgnoreLine = false; + bool bIgnoreFill = false; aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 20e762c..4282999 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -86,34 +86,34 @@ namespace std::vector<char> lcl_escapeLineFeeds(const char* const i_pStr) { size_t nLength(strlen(i_pStr)); - std::vector<char> pBuffer; - pBuffer.reserve(2*nLength+1); + std::vector<char> aBuffer; + aBuffer.reserve(2*nLength+1); const char* pRead = i_pStr; while( nLength-- ) { if( *pRead == '\r' ) { - pBuffer.push_back('\\'); - pBuffer.push_back('r'); + aBuffer.push_back('\\'); + aBuffer.push_back('r'); } else if( *pRead == '\n' ) { - pBuffer.push_back('\\'); - pBuffer.push_back('n'); + aBuffer.push_back('\\'); + aBuffer.push_back('n'); } else if( *pRead == '\\' ) { - pBuffer.push_back('\\'); - pBuffer.push_back('\\'); + aBuffer.push_back('\\'); + aBuffer.push_back('\\'); } else - pBuffer.push_back(*pRead); + aBuffer.push_back(*pRead); pRead++; } - pBuffer.push_back(0); + aBuffer.push_back(0); - return pBuffer; + return aBuffer; } } @@ -572,14 +572,14 @@ void PDFOutDev::processLink(Link* link, Catalog*) { const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString(); - std::vector<char> pEsc( lcl_escapeLineFeeds(pURI) ); + std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) ); printf( "drawLink %f %f %f %f %s\n", normalize(x1), normalize(y1), normalize(x2), normalize(y2), - pEsc.data() ); + aEsc.data() ); } } @@ -765,7 +765,7 @@ void PDFOutDev::updateFont(GfxState *state) aFont = it->second; - std::vector<char> pEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); + std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); printf( " %d %d %d %d %f %d %s", aFont.isEmbedded, aFont.isBold, @@ -773,7 +773,7 @@ void PDFOutDev::updateFont(GfxState *state) aFont.isUnderline, normalize(state->getTransformedFontSize()), nEmbedSize, - pEsc.data() ); + aEsc.data() ); } printf( "\n" ); @@ -918,8 +918,8 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, for( int i=0; i<uLen; ++i ) { buf[ m_pUtf8Map->mapUnicode(u[i], buf, sizeof(buf)-1) ] = 0; - std::vector<char> pEsc( lcl_escapeLineFeeds(buf) ); - printf( "%s", pEsc.data() ); + std::vector<char> aEsc( lcl_escapeLineFeeds(buf) ); + printf( "%s", aEsc.data() ); } printf( "\n" ); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index e2a00ed..de80bc8 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -592,7 +592,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( !pFileNameItem ) { // get FileName from dialog - std::vector<OUString> pURLList; + std::vector<OUString> aURLList; OUString aFilter; SfxItemSet* pSet = nullptr; OUString aPath; @@ -630,12 +630,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) sal_uIntPtr nErr = sfx2::FileOpenDialog_Impl( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - SFXWB_MULTISELECTION, OUString(), pURLList, + SFXWB_MULTISELECTION, OUString(), aURLList, aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList ); if ( nErr == ERRCODE_ABORT ) { - pURLList.clear(); + aURLList.clear(); return; } @@ -646,7 +646,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.AppendItem( SfxStringItem( SID_REFERER, "private:user" ) ); delete pSet; - if(!pURLList.empty()) + if(!aURLList.empty()) { if ( nSID == SID_OPENTEMPLATE ) rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, false ) ); @@ -683,7 +683,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.AppendItem(SfxStringItem(SID_DOC_SERVICE, aDocService)); } - for(std::vector<OUString>::const_iterator i = pURLList.begin(); i != pURLList.end(); ++i) + for(std::vector<OUString>::const_iterator i = aURLList.begin(); i != aURLList.end(); ++i) { rReq.RemoveItem( SID_FILE_NAME ); rReq.AppendItem( SfxStringItem( SID_FILE_NAME, *i ) ); @@ -715,10 +715,10 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } } - pURLList.clear(); + aURLList.clear(); return; } - pURLList.clear(); + aURLList.clear(); } bool bHyperlinkUsed = false; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index ccf5c2f..bf96cf1 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1889,27 +1889,27 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, std::unique_ptr<SfxPoolI else { css::uno::Any aAny = pBind->GetStatus().State; - css::uno::Type pType = aAny.getValueType(); + css::uno::Type aType = aAny.getValueType(); - if ( pType == cppu::UnoType<bool>::get() ) + if ( aType == cppu::UnoType<bool>::get() ) { bool bTemp = false; aAny >>= bTemp ; rpState.reset(new SfxBoolItem( nSlot, bTemp )); } - else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) + else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; aAny >>= nTemp ; rpState.reset(new SfxUInt16Item( nSlot, nTemp )); } - else if ( pType == cppu::UnoType<sal_uInt32>::get() ) + else if ( aType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; aAny >>= nTemp ; rpState.reset(new SfxUInt32Item( nSlot, nTemp )); } - else if ( pType == cppu::UnoType<OUString>::get() ) + else if ( aType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; aAny >>= sTemp ; diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 3e10e9e..2f939a7 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -109,40 +109,40 @@ throw( RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { m_eState = SfxItemState::DEFAULT; - css::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type aType = rEvent.State.getValueType(); - if ( pType == cppu::UnoType<bool>::get() ) + if ( aType == cppu::UnoType<bool>::get() ) { bool bTemp = false; rEvent.State >>= bTemp ; m_pItem = new SfxBoolItem( m_nSlotID, bTemp ); } - else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) + else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; rEvent.State >>= nTemp ; m_pItem = new SfxUInt16Item( m_nSlotID, nTemp ); } - else if ( pType == cppu::UnoType<sal_uInt32>::get() ) + else if ( aType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; rEvent.State >>= nTemp ; m_pItem = new SfxUInt32Item( m_nSlotID, nTemp ); } - else if ( pType == cppu::UnoType<OUString>::get() ) + else if ( aType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; rEvent.State >>= sTemp ; m_pItem = new SfxStringItem( m_nSlotID, sTemp ); } - else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) + else if ( aType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) { ItemStatus aItemStatus; rEvent.State >>= aItemStatus; m_eState = (SfxItemState) aItemStatus.State; m_pItem = new SfxVoidItem( m_nSlotID ); } - else if ( pType == cppu::UnoType< css::frame::status::Visibility>::get() ) + else if ( aType == cppu::UnoType< css::frame::status::Visibility>::get() ) { Visibility aVisibilityStatus; rEvent.State >>= aVisibilityStatus; diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 4e6567e..dab426a 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -168,45 +168,45 @@ throw( RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - css::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type aType = rEvent.State.getValueType(); - if ( pType == ::cppu::UnoType<void>::get() ) + if ( aType == ::cppu::UnoType<void>::get() ) { pItem = new SfxVoidItem( m_nSlotID ); eState = SfxItemState::UNKNOWN; } - else if ( pType == cppu::UnoType< bool >::get() ) + else if ( aType == cppu::UnoType< bool >::get() ) { bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( m_nSlotID, bTemp ); } - else if ( pType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) + else if ( aType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt16Item( m_nSlotID, nTemp ); } - else if ( pType == cppu::UnoType<sal_uInt32>::get() ) + else if ( aType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( m_nSlotID, nTemp ); } - else if ( pType == cppu::UnoType<OUString>::get() ) + else if ( aType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( m_nSlotID, sTemp ); } - else if ( pType == cppu::UnoType< css::frame::status::ItemStatus >::get() ) + else if ( aType == cppu::UnoType< css::frame::status::ItemStatus >::get() ) { ItemStatus aItemStatus; rEvent.State >>= aItemStatus; eState = (SfxItemState) aItemStatus.State; pItem = new SfxVoidItem( m_nSlotID ); } - else if ( pType == cppu::UnoType< css::frame::status::Visibility >::get() ) + else if ( aType == cppu::UnoType< css::frame::status::Visibility >::get() ) { Visibility aVisibilityStatus; rEvent.State >>= aVisibilityStatus; diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 6b1a9e8..d5165c4 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -95,26 +95,26 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const css::frame::FeatureStateE eState = SfxItemState::DEFAULT; css::uno::Any aAny = aStatus.State; - css::uno::Type pType = aAny.getValueType(); - if ( pType == cppu::UnoType< bool >::get() ) + css::uno::Type aType = aAny.getValueType(); + if ( aType == cppu::UnoType< bool >::get() ) { bool bTemp = false; aAny >>= bTemp ; pItem = new SfxBoolItem( nId, bTemp ); } - else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) + else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; aAny >>= nTemp ; pItem = new SfxUInt16Item( nId, nTemp ); } - else if ( pType == cppu::UnoType<sal_uInt32>::get() ) + else if ( aType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; aAny >>= nTemp ; pItem = new SfxUInt32Item( nId, nTemp ); } - else if ( pType == cppu::UnoType<OUString>::get() ) + else if ( aType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; aAny >>= sTemp ; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 9550336..b22e843 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -156,27 +156,27 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const css::frame::FeatureState if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - css::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type aType = rEvent.State.getValueType(); - if ( pType == cppu::UnoType< bool >::get() ) + if ( aType == cppu::UnoType< bool >::get() ) { bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( pCtrlItem->GetId(), bTemp ); } - else if ( pType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) + else if ( aType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt16Item( pCtrlItem->GetId(), nTemp ); } - else if ( pType == cppu::UnoType<sal_uInt32>::get() ) + else if ( aType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( pCtrlItem->GetId(), nTemp ); } - else if ( pType == cppu::UnoType<OUString>::get() ) + else if ( aType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; rEvent.State >>= sTemp ; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index b6a72e8..8bd00e6 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -162,14 +162,14 @@ OUString ConvertDateTime_Impl( const OUString& rName, { Date aD(uDT); tools::Time aT(uDT); - const OUString pDelim ( ", " ); + const OUString aDelim( ", " ); OUString aStr( rWrapper.getDate( aD ) ); - aStr += pDelim; + aStr += aDelim; aStr += rWrapper.getTime( aT ); OUString aAuthor = comphelper::string::stripStart(rName, ' '); if (!aAuthor.isEmpty()) { - aStr += pDelim; + aStr += aDelim; aStr += aAuthor; } return aStr; diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 6347ae9..e7507c6 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -777,10 +777,10 @@ bool ModelData_Impl::CheckFilterOptionsDialogExistence() while ( xFilterEnum->hasMoreElements() ) { - uno::Sequence< beans::PropertyValue > pProps; - if ( xFilterEnum->nextElement() >>= pProps ) + uno::Sequence< beans::PropertyValue > aProps; + if ( xFilterEnum->nextElement() >>= aProps ) { - ::comphelper::SequenceAsHashMap aPropsHM( pProps ); + ::comphelper::SequenceAsHashMap aPropsHM( aProps ); OUString aUIServName = aPropsHM.getUnpackedValueOrDefault( "UIComponent", OUString() ); diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 693d164..3c34c60 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -252,38 +252,38 @@ throw ( css::uno::RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - uno::Type pType = rEvent.State.getValueType(); + uno::Type aType = rEvent.State.getValueType(); - if ( pType == cppu::UnoType<void>::get() ) + if ( aType == cppu::UnoType<void>::get() ) { pItem = new SfxVoidItem( nSlotID ); eState = SfxItemState::UNKNOWN; } - else if ( pType == cppu::UnoType<bool>::get() ) + else if ( aType == cppu::UnoType<bool>::get() ) { bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( nSlotID, bTemp ); } - else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) + else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt16Item( nSlotID, nTemp ); } - else if ( pType == cppu::UnoType<sal_uInt32>::get() ) + else if ( aType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( nSlotID, nTemp ); } - else if ( pType == cppu::UnoType<OUString>::get() ) + else if ( aType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotID, sTemp ); } - else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) + else if ( aType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) { frame::status::ItemStatus aItemStatus; rEvent.State >>= aItemStatus; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 3e2855b..d036ad1 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -477,38 +477,38 @@ throw ( css::uno::RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - css::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type aType = rEvent.State.getValueType(); - if ( pType == cppu::UnoType<void>::get() ) + if ( aType == cppu::UnoType<void>::get() ) { pItem = new SfxVoidItem( nSlotId ); eState = SfxItemState::UNKNOWN; } ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
