diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-12 10:06:27 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-13 08:09:28 +0000 |
commit | f12b17867ef8fa2cfc2ddb7ecda9d7acc57cfa59 (patch) | |
tree | 3b0a89e34cfca550b38b92423a1de4b805d2c91c /vcl/unx | |
parent | 96fab0513215cc416e96e1b2089466afd0d2791c (diff) |
clang-tidy modernize-loop-convert in vcl
Change-Id: I79e97a4826bfe3918de223cccf48646a1404f901
Reviewed-on: https://gerrit.libreoffice.org/24922
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/app/keysymnames.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/app/randrwrapper.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 24 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 23 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atktextattributes.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/resourceprovider.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 3 |
15 files changed, 66 insertions, 70 deletions
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index 746eaadf8d09..e39af7c63547 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -475,12 +475,12 @@ namespace vcl_sal { // translate keycodes, used within the displayed menu shortcuts OUString getKeysymReplacementName( const OUString& pLang, KeySym nSymbol ) { - for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ ) + for(const auto & rKeyboard : aKeyboards) { - if( pLang.equalsAscii( aKeyboards[n].pLangName ) ) + if( pLang.equalsAscii( rKeyboard.pLangName ) ) { - const struct KeysymNameReplacement* pRepl = aKeyboards[n].pReplacements; - for( int m = aKeyboards[n].nReplacements ; m ; ) + const struct KeysymNameReplacement* pRepl = rKeyboard.pReplacements; + for( int m = rKeyboard.nReplacements ; m ; ) { if( nSymbol == pRepl[--m].aSymbol ) return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index 51eccc111c19..4913625b4cd8 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -146,9 +146,9 @@ void SalDisplay::processRandREvent( XEvent* pEvent ) { // update screens bool bNotify = false; - for( size_t i = 0; i < m_aScreens.size(); i++ ) + for(ScreenData & rScreen : m_aScreens) { - if( m_aScreens[i].m_bInit ) + if( rScreen.m_bInit ) { XRRScreenConfiguration *pConfig = nullptr; XRRScreenSize *pSizes = nullptr; @@ -156,16 +156,16 @@ void SalDisplay::processRandREvent( XEvent* pEvent ) Rotation nRot = 0; SizeID nId = 0; - pConfig = pWrapper->XRRGetScreenInfo( GetDisplay(), m_aScreens[i].m_aRoot ); + pConfig = pWrapper->XRRGetScreenInfo( GetDisplay(), rScreen.m_aRoot ); nId = pWrapper->XRRConfigCurrentConfiguration( pConfig, &nRot ); pSizes = pWrapper->XRRConfigSizes( pConfig, &nSizes ); XRRScreenSize *pTargetSize = pSizes + nId; bNotify = bNotify || - m_aScreens[i].m_aSize.Width() != pTargetSize->width || - m_aScreens[i].m_aSize.Height() != pTargetSize->height; + rScreen.m_aSize.Width() != pTargetSize->width || + rScreen.m_aSize.Height() != pTargetSize->height; - m_aScreens[i].m_aSize = Size( pTargetSize->width, pTargetSize->height ); + rScreen.m_aSize = Size( pTargetSize->width, pTargetSize->height ); pWrapper->XRRFreeScreenConfigInfo( pConfig ); diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 460c318534d9..dd5ce040d610 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1959,9 +1959,9 @@ bool SalX11Display::Dispatch( XEvent *pEvent ) case PropertyNotify: if( pEvent->xproperty.atom == getWMAdaptor()->getAtom( WMAdaptor::VCL_SYSTEM_SETTINGS ) ) { - for( size_t i = 0; i < m_aScreens.size(); i++ ) + for(ScreenData & rScreen : m_aScreens) { - if( pEvent->xproperty.window == m_aScreens[i].m_aRefWindow ) + if( pEvent->xproperty.window == rScreen.m_aRefWindow ) { std::list< SalFrame* >::const_iterator it; for( it = m_aFrames.begin(); it != m_aFrames.end(); ++it ) diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 09e1492f2250..813465503308 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -941,8 +941,8 @@ bool GnomeWMAdaptor::isValid() const void WMAdaptor::initAtoms() { // get basic atoms - for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAtomTab ); i++ ) - m_aWMAtoms[ aAtomTab[i].nProtocol ] = XInternAtom( m_pDisplay, aAtomTab[i].pProtocol, False ); + for(const WMAdaptorProtocol & i : aAtomTab) + m_aWMAtoms[ i.nProtocol ] = XInternAtom( m_pDisplay, i.pProtocol, False ); m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ] = XInternAtom( m_pDisplay, "_NET_SUPPORTING_WM_CHECK", True ); m_aWMAtoms[ NET_WM_NAME ] = XInternAtom( m_pDisplay, "_NET_WM_NAME", True ); } @@ -1490,11 +1490,11 @@ void WMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool bVert { Point aMed( aTL.X() + rGeom.nWidth/2, aTL.Y() + rGeom.nHeight/2 ); const std::vector< Rectangle >& rScreens = m_pSalDisplay->GetXineramaScreens(); - for( size_t i = 0; i < rScreens.size(); i++ ) - if( rScreens[i].IsInside( aMed ) ) + for(const auto & rScreen : rScreens) + if( rScreen.IsInside( aMed ) ) { - aTL += rScreens[i].TopLeft(); - aScreenSize = rScreens[i].GetSize(); + aTL += rScreen.TopLeft(); + aScreenSize = rScreen.GetSize(); break; } } @@ -2090,14 +2090,14 @@ void NetWMAdaptor::showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const &root_x, &root_y, &lx, &ly, &mask ); const std::vector< Rectangle >& rScreens = m_pSalDisplay->GetXineramaScreens(); Point aMousePoint( root_x, root_y ); - for( size_t i = 0; i < rScreens.size(); i++ ) + for(const auto & rScreen : rScreens) { - if( rScreens[i].IsInside( aMousePoint ) ) + if( rScreen.IsInside( aMousePoint ) ) { - pFrame->maGeometry.nX = rScreens[i].Left(); - pFrame->maGeometry.nY = rScreens[i].Top(); - pFrame->maGeometry.nWidth = rScreens[i].GetWidth(); - pFrame->maGeometry.nHeight = rScreens[i].GetHeight(); + pFrame->maGeometry.nX = rScreen.Left(); + pFrame->maGeometry.nY = rScreen.Top(); + pFrame->maGeometry.nWidth = rScreen.GetWidth(); + pFrame->maGeometry.nHeight = rScreen.GetHeight(); break; } } diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 5cc202c4f2c7..895cbfd91dcb 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -663,14 +663,14 @@ PrintFontManager::PrintFontManager() , m_nNextDirAtom( 1 ) , m_pFontCache( nullptr ) { - for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ ) + for(const AdobeEncEntry& rEntry : aAdobeCodes) { - m_aUnicodeToAdobename.insert( std::unordered_multimap< sal_Unicode, OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); - m_aAdobenameToUnicode.insert( std::unordered_multimap< OString, sal_Unicode, OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); - if( aAdobeCodes[i].aAdobeStandardCode ) + m_aUnicodeToAdobename.insert( std::unordered_multimap< sal_Unicode, OString >::value_type( rEntry.aUnicode, rEntry.pAdobename ) ); + m_aAdobenameToUnicode.insert( std::unordered_multimap< OString, sal_Unicode, OStringHash >::value_type( rEntry.pAdobename, rEntry.aUnicode ) ); + if( rEntry.aAdobeStandardCode ) { - m_aUnicodeToAdobecode.insert( std::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); - m_aAdobecodeToUnicode.insert( std::unordered_multimap< sal_uInt8, sal_Unicode >::value_type( aAdobeCodes[i].aAdobeStandardCode, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobecode.insert( std::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( rEntry.aUnicode, rEntry.aAdobeStandardCode ) ); + m_aAdobecodeToUnicode.insert( std::unordered_multimap< sal_uInt8, sal_Unicode >::value_type( rEntry.aAdobeStandardCode, rEntry.aUnicode ) ); } } @@ -789,11 +789,11 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: // first look for an adjacent file static const char* pSuffix[] = { ".afm", ".AFM" }; - for( unsigned int i = 0; i < SAL_N_ELEMENTS(pSuffix); i++ ) + for(const char* i : pSuffix) { OString aName = OStringBuffer( rFontFile.copy(0, rFontFile.getLength() - 4)). - append(pSuffix[i]).makeStringAndClear(); + append(i).makeStringAndClear(); OStringBuffer aFilePath(aDir); aFilePath.append('/').append(aName); diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index f8873d9f2aa4..62aeca15524d 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -46,8 +46,8 @@ CairoTextRender::CairoTextRender() : mnTextColor(MAKE_SALCOLOR(0x00, 0x00, 0x00)) //black { - for( int i = 0; i < MAX_FALLBACK; ++i ) - mpServerFont[i] = nullptr; + for(ServerFont* & rp : mpServerFont) + rp = nullptr; #if ENABLE_GRAPHITE // check if graphite fonts have been disabled diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 5821a38fcaa6..c5803f0781f5 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -254,11 +254,11 @@ bool X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) sal_uInt8 nSalColorGreen = SALCOLOR_GREEN ( nSalColor ); sal_uInt8 nSalColorBlue = SALCOLOR_BLUE ( nSalColor ); - for( int nY = 0; nY < 8; nY++ ) + for(auto & nY : nOrdDither8Bit) { for( int nX = 0; nX < 8; nX++ ) { - short nMagic = nOrdDither8Bit[nY][nX]; + short nMagic = nY[nX]; sal_uInt8 nR = P_DELTA * DMAP( nSalColorRed, nMagic ); sal_uInt8 nG = P_DELTA * DMAP( nSalColorGreen, nMagic ); sal_uInt8 nB = P_DELTA * DMAP( nSalColorBlue, nMagic ); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index d9799f279bf0..3e2a17f2e75f 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -1263,10 +1263,10 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo // clean up the temporary PDF files if( ! i_pFileName || bAborted ) { - for( size_t i = 0; i < aPDFFiles.size(); i++ ) + for(PDFPrintFile & rPDFFile : aPDFFiles) { - osl_removeFile( aPDFFiles[i].maTmpURL.pData ); - OSL_TRACE( "removed print PDF file %s", OUStringToOString( aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + osl_removeFile( rPDFFile.maTmpURL.pData ); + OSL_TRACE( "removed print PDF file %s", OUStringToOString( rPDFFile.maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() ); } } diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 141c14154ee0..41cf16ee8409 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -262,8 +262,8 @@ GenPspGraphics::GenPspGraphics() m_bFontVertical( false ), m_pInfoPrinter( nullptr ) { - for( int i = 0; i < MAX_FALLBACK; i++ ) - m_pServerFont[i] = nullptr; + for(ServerFont* & rp : m_pServerFont) + rp = nullptr; } void GenPspGraphics::Init(psp::JobData* pJob, psp::PrinterGfx* pGfx, diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 75df5943bb5d..3024b1ed6fa0 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -398,8 +398,6 @@ void PPDParser::scanPPDDir( const OUString& rDir ) } const pSuffixes[] = { { ".PS", 3 }, { ".PPD", 4 }, { ".PS.GZ", 6 }, { ".PPD.GZ", 7 } }; - const int nSuffixes = SAL_N_ELEMENTS(pSuffixes); - PPDCache &rPPDCache = thePPDCache::get(); osl::Directory aDir( rDir ); @@ -425,13 +423,13 @@ void PPDParser::scanPPDDir( const OUString& rDir ) aPPDFile.Append( aFileName ); // match extension - for( int nSuffix = 0; nSuffix < nSuffixes; nSuffix++ ) + for(const suffix_t & rSuffix : pSuffixes) { - if( aFileName.getLength() > pSuffixes[nSuffix].nSuffixLen ) + if( aFileName.getLength() > rSuffix.nSuffixLen ) { - if( aFileName.endsWithIgnoreAsciiCaseAsciiL( pSuffixes[nSuffix].pSuffix, pSuffixes[nSuffix].nSuffixLen ) ) + if( aFileName.endsWithIgnoreAsciiCaseAsciiL( rSuffix.pSuffix, rSuffix.nSuffixLen ) ) { - (*rPPDCache.pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - pSuffixes[nSuffix].nSuffixLen ) ] = aPPDFile.PathToFileName(); + (*rPPDCache.pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - rSuffix.nSuffixLen ) ] = aPPDFile.PathToFileName(); break; } } diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 993c898d068a..f28e8b077bc4 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -1150,11 +1150,11 @@ void SystemQueueInfo::run() std::list< OString > aLines; /* Discover which command we can use to get a list of all printer queues */ - for( unsigned int i = 0; i < SAL_N_ELEMENTS(aParms); i++ ) + for(const auto & rParm : aParms) { aLines.clear(); OStringBuffer aCmdLine( 128 ); - aCmdLine.append( aParms[i].pQueueCommand ); + aCmdLine.append( rParm.pQueueCommand ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "trying print queue command \"%s\" ... ", aParms[i].pQueueCommand ); #endif @@ -1167,11 +1167,11 @@ void SystemQueueInfo::run() if( ! pclose( pPipe ) ) { std::list< PrinterInfoManager::SystemPrintQueue > aSysPrintQueues; - aParms[i].pHandler( aLines, aSysPrintQueues, &(aParms[i]) ); + rParm.pHandler( aLines, aSysPrintQueues, &rParm ); MutexGuard aGuard( m_aMutex ); m_bChanged = true; m_aQueues = aSysPrintQueues; - m_aCommand = OUString::createFromAscii( aParms[i].pPrintCommand ); + m_aCommand = OUString::createFromAscii( rParm.pPrintCommand ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "success\n" ); #endif diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 0b10f17560bb..2197e3824e78 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -200,9 +200,8 @@ static void CreateNetWmAppIcon( sal_uInt16 nIcon, NetWmIconData& netwm_icon ) const int sizes[ 3 ] = { 48, 32, 16 }; netwm_icon.resize( 48 * 48 + 32 * 32 + 16 * 16 + 3 * 2 ); int pos = 0; - for( int i = 0; i < 3; ++i ) + for(int size : sizes) { - int size = sizes[ i ]; sal_uInt16 nIconSizeOffset; if( size >= 48 ) nIconSizeOffset = SV_ICON_SIZE48_START; @@ -507,11 +506,11 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen &aRoot, &aChild, &root_x, &root_y, &lx, &ly, &mask ); const std::vector< Rectangle >& rScreens = GetDisplay()->GetXineramaScreens(); - for( size_t i = 0; i < rScreens.size(); i++ ) - if( rScreens[i].IsInside( Point( root_x, root_y ) ) ) + for(const auto & rScreen : rScreens) + if( rScreen.IsInside( Point( root_x, root_y ) ) ) { - x = rScreens[i].Left(); - y = rScreens[i].Top(); + x = rScreen.Left(); + y = rScreen.Top(); break; } } @@ -1453,13 +1452,13 @@ void X11SalFrame::Center( ) &x, &y, &mask ); const std::vector< Rectangle >& rScreens = GetDisplay()->GetXineramaScreens(); - for( size_t i = 0; i < rScreens.size(); i++ ) - if( rScreens[i].IsInside( Point( root_x, root_y ) ) ) + for(const auto & rScreen : rScreens) + if( rScreen.IsInside( Point( root_x, root_y ) ) ) { - nScreenX = rScreens[i].Left(); - nScreenY = rScreens[i].Top(); - nRealScreenWidth = rScreens[i].GetWidth(); - nRealScreenHeight = rScreens[i].GetHeight(); + nScreenX = rScreen.Left(); + nScreenY = rScreen.Top(); + nRealScreenWidth = rScreen.GetWidth(); + nRealScreenHeight = rScreen.GetHeight(); break; } } diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 6da4d349cac3..b7857d079b66 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -1071,8 +1071,8 @@ attribute_set_new_from_property_values( sal_Int32 aIndexList[TEXT_ATTRIBUTE_LAST] = { -1 }; // Initialize index array with -1 - for( sal_Int32 attr = 0; attr < TEXT_ATTRIBUTE_LAST; ++attr ) - aIndexList[attr] = -1; + for(sal_Int32 & rn : aIndexList) + rn = -1; find_exported_attributes(aIndexList, rAttributeList); diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index 9727a9cf9654..c6b09452df91 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -60,10 +60,10 @@ static const struct static sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) { - for ( size_t i = 0; i < SAL_N_ELEMENTS( CtrlIdToResIdTable ); i++ ) + for (auto & i : CtrlIdToResIdTable) { - if ( CtrlIdToResIdTable[i].ctrlId == aControlId ) - return CtrlIdToResIdTable[i].resId; + if ( i.ctrlId == aControlId ) + return i.resId; } return -1; } diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index a79713ab631f..78d337a14fe2 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -993,9 +993,8 @@ void GtkSalMenu::ActivateAllSubmenus(Menu* pMenuBar) { pMenuBar->HandleMenuActivateEvent(mpVCLMenu); pMenuBar->HandleMenuDeActivateEvent(mpVCLMenu); - for ( size_t nPos = 0; nPos < maItems.size(); nPos++ ) + for (GtkSalMenuItem* pSalItem : maItems) { - GtkSalMenuItem *pSalItem = maItems[ nPos ]; if ( pSalItem->mpSubMenu != nullptr ) { pSalItem->mpSubMenu->ActivateAllSubmenus(pMenuBar); |