newmenucontroller.cxx (30acf5e8) | newmenucontroller.cxx (437a6594) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 533 unchanged lines hidden (view full) --- 542 } 543} 544 545// XInitialization 546void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) 547{ 548 osl::MutexGuard aLock( m_aMutex ); 549 | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 533 unchanged lines hidden (view full) --- 542 } 543} 544 545// XInitialization 546void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) 547{ 548 osl::MutexGuard aLock( m_aMutex ); 549 |
550 sal_Bool bInitalized( m_bInitialized ); 551 if ( !bInitalized ) | 550 sal_Bool bInitialized( m_bInitialized ); 551 if ( !bInitialized ) |
552 { 553 svt::PopupMenuControllerBase::initialize( aArguments ); 554 555 if ( m_bInitialized ) 556 { 557 const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); 558 559 m_bShowImages = rSettings.GetUseImagesInMenus(); --- 33 unchanged lines hidden --- | 552 { 553 svt::PopupMenuControllerBase::initialize( aArguments ); 554 555 if ( m_bInitialized ) 556 { 557 const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); 558 559 m_bShowImages = rSettings.GetUseImagesInMenus(); --- 33 unchanged lines hidden --- |