diff options
Diffstat (limited to 'framework/source')
56 files changed, 657 insertions, 708 deletions
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index ca2977a8b989..6233d40712ae 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -126,9 +126,9 @@ void GlobalAcceleratorConfiguration::fillCache() } -// + // XComponent.dispose(), #i120029#, to release the cyclic reference -// + void SAL_CALL GlobalAcceleratorConfiguration::dispose() throw(css::uno::RuntimeException, std::exception) { diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index a33a2e64de87..5b832e2e4835 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -169,9 +169,9 @@ void ModuleAcceleratorConfiguration::fillCache() } -// + // XComponent.dispose(), #i120029#, to release the cyclic reference -// + void SAL_CALL ModuleAcceleratorConfiguration::dispose() throw(css::uno::RuntimeException, std::exception) { diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 7047b64a9300..e3bdfb1daebd 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -583,7 +583,7 @@ OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath) return lToken; } -//=============================================== + } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index b425aaa538bf..0f508701ea14 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -34,7 +34,7 @@ namespace framework{ -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short initialize instance with necessary information @descr We need a valid uno service manager to create or instanciate new services. All other information to create frames or tasks come in on right interface methods. @@ -48,7 +48,7 @@ TaskCreator::TaskCreator( const css::uno::Reference< css::uno::XComponentContext { } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short deinitialize instance @descr We should release all used resource which are not needed any longer. *//*-*****************************************************************************************************/ @@ -57,7 +57,7 @@ TaskCreator::~TaskCreator() m_xContext.clear(); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** TODO document me *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName , diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index c5e006ba4719..a71c621e5ed2 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -65,9 +65,9 @@ static sal_Bool impldbg_checkParameter_addStatusListener ( const css::uno const css::util::URL& aURL ); static sal_Bool impldbg_checkParameter_removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , const css::util::URL& aURL ); -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + MenuDispatcher::MenuDispatcher( const uno::Reference< XComponentContext >& xContext , const uno::Reference< XFrame >& xOwner ) // Init baseclasses first @@ -88,9 +88,9 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XComponentContext >& xOwner->addFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + MenuDispatcher::~MenuDispatcher() { // Warn programmer if he forgot to dispose this instance. @@ -98,17 +98,17 @@ MenuDispatcher::~MenuDispatcher() // and a dtor isn't the best place to do that! } -//***************************************************************************************************************** + // XDispatch -//***************************************************************************************************************** + void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException, std::exception ) { } -//***************************************************************************************************************** + // XDispatch -//***************************************************************************************************************** + void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) { @@ -121,9 +121,9 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat m_aListenerContainer.addInterface( aURL.Complete, xControl ); } -//***************************************************************************************************************** + // XDispatch -//***************************************************************************************************************** + void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) { @@ -136,9 +136,9 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X m_aListenerContainer.removeInterface( aURL.Complete, xControl ); } -//***************************************************************************************************************** + // XFrameActionListener -//***************************************************************************************************************** + void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception ) { @@ -175,9 +175,8 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro } } -//***************************************************************************************************************** + // XEventListener -//***************************************************************************************************************** void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -214,9 +213,9 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce } } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel ) { for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos ) @@ -234,9 +233,9 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce } } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource ) { uno::Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY ); @@ -318,7 +317,7 @@ static sal_Bool impldbg_checkParameter_MenuDispatcher( const uno::Reference< return xContext.is() && xOwner.is(); } -//***************************************************************************************************************** + // We need a valid URL. What is meaning with "register for nothing"?! // xControl must correct to - nobody can advised otherwise! static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl, @@ -339,7 +338,7 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference return bOK ; } -//***************************************************************************************************************** + // The same goes for these case! We have added valid listener for correct URL only. // We can't remove invalid listener for nothing! static sal_Bool impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl, diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 2227ddf94413..dfaea211947e 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -33,9 +33,9 @@ namespace framework{ -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + DEFINE_XSERVICEINFO_MULTISERVICE ( Oxt_Handler , ::cppu::OWeakObject , @@ -48,7 +48,7 @@ DEFINE_INIT_SERVICE ( Oxt_Handler, } ) -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short standard ctor @descr These initialize a new instance of this class with needed information for work. @@ -68,7 +68,7 @@ Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFac { } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short standard dtor @descr - @@ -91,7 +91,7 @@ Oxt_Handler::~Oxt_Handler() } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface ::com::sun::star::frame::XDispatch @short try to load audio file @@ -150,7 +150,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& dispatchWithNotification( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface ::com::sun::star::document::XExtendedFilterDetection @short try to detect file (given as argument included in "lDescriptor") diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 3ed1f1b6f7e7..2fc0bef59fcd 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -221,7 +221,7 @@ class AddonsOptions_Impl : public ConfigItem // overloaded methods of baseclass - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short called for notify of configmanager @descr These method is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. You must update your @@ -237,7 +237,7 @@ class AddonsOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& lPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short write changes to configuration @descr These method writes the changed values into the sub tree and should always called in our destructor to guarantee consistency of config data. @@ -256,7 +256,7 @@ class AddonsOptions_Impl : public ConfigItem // public interface - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short base implementation of public interface for "SvtDynamicMenuOptions"! @descr These class is used as static member of "SvtDynamicMenuOptions" ... => The code exist only for one time and isn't duplicated for every instance! @@ -312,7 +312,7 @@ class AddonsOptions_Impl : public ConfigItem typedef ::boost::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, ::std::equal_to< OUString > > ToolbarMergingInstructions; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of key names of our configuration management which represent oue module tree @descr These methods return the current list of key names! We need it to get needed values from our configuration management! @@ -400,9 +400,9 @@ void AddonsOptions_Impl::ImageEntry::addImage(ImageSize eSize, aURL[(int)eSize] = rURL; } -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + AddonsOptions_Impl::AddonsOptions_Impl() // Init baseclasses first : ConfigItem( ROOTNODE_ADDONMENU ), @@ -471,9 +471,9 @@ AddonsOptions_Impl::AddonsOptions_Impl() EnableNotification( aNotifySeq ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + AddonsOptions_Impl::~AddonsOptions_Impl() { // We must save our current values .. if user forget it! @@ -509,57 +509,57 @@ void AddonsOptions_Impl::ReadConfigurationData() ReadStatusbarMergeInstructions( m_aCachedStatusbarMergingInstructions ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ ) { Application::PostUserEvent( STATIC_LINK( 0, AddonsOptions, Notify ) ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void AddonsOptions_Impl::Commit() { OSL_FAIL( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::HasAddonsMenu() const { return ( m_aCachedMenuProperties.getLength() > 0 ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const { return m_aCachedToolBarPartProperties.size(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const { return m_aCachedMenuProperties; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const { return m_aCachedMenuBarPartProperties; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const { if ( /*nIndex >= 0 &&*/ nIndex < m_aCachedToolBarPartProperties.size() ) @@ -568,9 +568,9 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBa return m_aEmptyAddonToolBar; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const { if ( nIndex < m_aCachedToolBarPartResourceNames.size() ) @@ -579,25 +579,25 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nInd return OUString(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const { return m_aCachedHelpMenuProperties; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const { return m_aCachedMergeMenuInsContainer; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool AddonsOptions_Impl::GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const @@ -617,9 +617,9 @@ const MergeStatusbarInstructionContainer& AddonsOptions_Impl::GetMergeStatusbarI return m_aCachedStatusbarMergingInstructions; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + static Image ScaleImage( const Image &rImage, bool bBig ) { Size aSize = ToolBox::GetDefaultImageSize(bBig); @@ -679,9 +679,9 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, sal_Bool bBig, return aImage; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq ) { // Read the AddonMenu set and fill property sequences @@ -718,9 +718,9 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue return ( rAddonMenuSeq.getLength() > 0 ); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq ) { // Read the AddonMenu set and fill property sequences @@ -757,9 +757,9 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu return ( rAddonOfficeHelpMenuSeq.getLength() > 0 ); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq ) { // Read the OfficeMenuBar set and fill property sequences @@ -813,9 +813,9 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV return ( rAddonOfficeMenuBarSeq.getLength() > 0 ); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames ) { // Read the OfficeToolBar set and fill property sequences @@ -837,9 +837,9 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) { sal_Bool bInsertSeparator = sal_False; @@ -881,9 +881,9 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString rToolBarItemSetN return ( (sal_uInt32)rAddonOfficeToolBarSeq.getLength() > nToolBarItemCount ); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) { Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); @@ -906,9 +906,9 @@ void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyVal } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) { // Read the user-defined Images set and fill image manager @@ -958,9 +958,9 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) } } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + OUString AddonsOptions_Impl::GeneratePrefixURL() { @@ -974,9 +974,9 @@ OUString AddonsOptions_Impl::GeneratePrefixURL() return aPopupMenuURL; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer ) { @@ -1044,9 +1044,9 @@ sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionCont return sal_True; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ) { OUString aMergeMenuBaseNode( aMergeAddonInstructionBase+m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] ); @@ -1061,9 +1061,9 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu ); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions ) { const OUString aToolbarMergeRootName( "AddonUI/OfficeToolbarMerging/" ); @@ -1136,9 +1136,9 @@ sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruc return sal_True; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) { OUStringBuffer aBuffer( aMergeAddonInstructionBase ); @@ -1284,9 +1284,9 @@ sal_Bool AddonsOptions_Impl::ReadStatusBarItem( return bResult; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu ) { sal_Bool bResult = sal_False; @@ -1358,9 +1358,9 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen return bResult; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ) { sal_Bool bResult = sal_False; @@ -1399,9 +1399,9 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, return bResult; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ) { Sequence< Sequence< PropertyValue > > aTargetSubMenuSeq; @@ -1420,9 +1420,9 @@ sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTarget return sal_True; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ) { sal_Bool bResult = sal_False; @@ -1477,9 +1477,9 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeNa return bResult; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq ) { Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM ); @@ -1507,9 +1507,9 @@ sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSu return sal_True; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL ) { // FIXME: potentially this is not so useful in a world of delayed image loading @@ -1517,9 +1517,9 @@ sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL ) return ( pIter != m_aImageManager.end() ); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void AddonsOptions_Impl::SubstituteVariables( OUString& aURL ) { if ( aURL.startsWith( EXPAND_PROTOCOL ) ) @@ -1534,9 +1534,9 @@ void AddonsOptions_Impl::SubstituteVariables( OUString& aURL ) } } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) { Image aImage; @@ -1568,9 +1568,9 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) return aImage; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId ) { if ( aImageId.isEmpty() ) @@ -1596,9 +1596,9 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUS m_aImageManager.insert( ImageManager::value_type( aURL, aImageEntry )); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUString& aImagesNodeName ) { Sequence< OUString > aImageDataNodeNames = GetPropertyNamesImages( aImagesNodeName ); @@ -1645,9 +1645,9 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin return pEntry; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const { sal_Bool bResult = sal_False; @@ -1687,9 +1687,9 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin return lResult; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const { // The URL is automatically set and not read from the configuration. @@ -1703,9 +1703,9 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri return lResult; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const { Sequence< OUString > lResult( PROPERTYCOUNT_TOOLBARITEM ); @@ -1738,9 +1738,9 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem( return lResult; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode ) const { Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES ); @@ -1758,17 +1758,17 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& return lResult; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL ; sal_Int32 AddonsOptions::m_nRefCount = 0 ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + AddonsOptions::AddonsOptions() { // Global access, must be guarded (multithreading!). @@ -1782,9 +1782,9 @@ AddonsOptions::AddonsOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + AddonsOptions::~AddonsOptions() { // Global access, must be guarded (multithreading!) @@ -1800,18 +1800,18 @@ AddonsOptions::~AddonsOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_Bool AddonsOptions::HasAddonsMenu() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->HasAddonsMenu(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_Int32 AddonsOptions::GetAddonsToolBarCount() const { @@ -1819,63 +1819,63 @@ sal_Int32 AddonsOptions::GetAddonsToolBarCount() const return m_pDataContainer->GetAddonsToolBarCount(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetAddonsMenu(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetAddonsMenuBarPart(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart( sal_uInt32 nIndex ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetAddonsToolBarPart( nIndex ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetAddonsToolbarResourceName( nIndex ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetAddonsHelpMenu(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetMergeMenuInstructions(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool AddonsOptions::GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const @@ -1891,26 +1891,26 @@ const MergeStatusbarInstructionContainer& AddonsOptions::GetMergeStatusbarInstru return m_pDataContainer->GetMergeStatusbarInstructions(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const { return GetImageFromURL( aURL, bBig, sal_False ); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& AddonsOptions::GetOwnStaticMutex() { // Initialize static mutex only for one time! @@ -1933,9 +1933,9 @@ Mutex& AddonsOptions::GetOwnStaticMutex() return *pMutex; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG ) { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 68eb2c7f3f57..f22d4e32ffcd 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short declaration of special continuation for filter selection @descr Sometimes filter detection during loading document failed. Then we need a possibility to ask user for his decision. These continuation transport selected filter by user to diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index 95910a7e7e98..3e1f677c1811 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -26,10 +26,10 @@ #include <rtl/ref.hxx> #include <tools/diagnose_ex.h> -//...................................................................................................................... + namespace framework { -//...................................................................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -47,9 +47,9 @@ namespace framework using ::com::sun::star::document::UndoManagerEvent; using ::com::sun::star::lang::EventObject; - //================================================================================================================== + //= UndoManagerContextListener - //================================================================================================================== + typedef ::cppu::WeakImplHelper1 < XUndoManagerListener > UndoManagerContextListener_Base; class UndoManagerContextListener : public UndoManagerContextListener_Base @@ -194,9 +194,9 @@ namespace framework m_documentDisposed = true; } - //================================================================================================================== + //= DocumentUndoGuard_Data - //================================================================================================================== + struct DocumentUndoGuard_Data { Reference< XUndoManager > xUndoManager; @@ -239,9 +239,9 @@ namespace framework } } - //================================================================================================================== + //= DocumentUndoGuard - //================================================================================================================== + DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent ) :m_pData( new DocumentUndoGuard_Data ) @@ -254,8 +254,8 @@ namespace framework lcl_restore( *m_pData ); } -//...................................................................................................................... + } // namespace framework -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 306b6fd8d2b3..1676fce67b27 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -507,7 +507,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_sendTitleChangedEvent (); } -//***************************************************************************************************************** + void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent) { @@ -518,7 +518,7 @@ void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle.append (xTitle->getTitle ()); } -//***************************************************************************************************************** + void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) { OUString name(utl::ConfigManager::getProductName()); @@ -530,7 +530,7 @@ void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) } } -//***************************************************************************************************************** + void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) { // SYNCHRONIZED -> @@ -563,7 +563,7 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) {} } -//***************************************************************************************************************** + #ifdef DBG_UTIL void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) { diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 129dfe517bd6..51b5a1818b8d 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -34,10 +34,10 @@ #include <queue> #include <boost/function.hpp> -//...................................................................................................................... + namespace framework { -//...................................................................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -65,9 +65,9 @@ namespace framework using ::com::sun::star::util::XModifyListener; using ::svl::IUndoManager; - //================================================================================================================== + //= UndoActionWrapper - //================================================================================================================== + class UndoActionWrapper : public SfxUndoAction { public: @@ -141,9 +141,9 @@ namespace framework return false; } - //================================================================================================================== + //= UndoManagerRequest - //================================================================================================================== + class UndoManagerRequest : public ::comphelper::AnyEvent { public: @@ -197,9 +197,9 @@ namespace framework - //================================================================================================================== + //= UndoManagerHelper_Impl - //================================================================================================================== + class UndoManagerHelper_Impl : public SfxUndoListener { private: @@ -241,13 +241,13 @@ namespace framework { } - //.............................................................................................................. + IUndoManager& getUndoManager() const { return m_rUndoManagerImplementation.getImplUndoManager(); } - //.............................................................................................................. + Reference< XUndoManager > getXUndoManager() const { return m_rUndoManagerImplementation.getThis(); @@ -921,9 +921,9 @@ namespace framework // TODO: do we need to care? Or is this the responsibility of our owner? } - //================================================================================================================== + //= UndoManagerHelper - //================================================================================================================== + UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl ) :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) ) @@ -1032,7 +1032,7 @@ namespace framework namespace { - //.............................................................................................................. + OUString lcl_getCurrentActionTitle( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { // SYNCHRONIZED ---> @@ -1054,7 +1054,7 @@ namespace framework // <--- SYNCHRONIZED } - //.............................................................................................................. + Sequence< OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { // SYNCHRONIZED ---> @@ -1170,8 +1170,8 @@ namespace framework m_pImpl->removeModifyListener( i_listener ); } -//...................................................................................................................... + } // namespace framework -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 8a7edefc8233..b0361d8a0f77 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -27,7 +27,7 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short use ctor to initialize instance @seealso class ReadGuard @@ -55,7 +55,7 @@ LockHelper::LockHelper( comphelper::SolarMutex* pSolarMutex ) } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short default dtor to release safed pointer @descr We have created dynamical mutex- or lock-member ... or we hold a pointer to external objects. We must release it! @@ -85,7 +85,7 @@ LockHelper::~LockHelper() } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface IMutex @short set an exclusiv lock @descr We must match this lock call with current set lock type and used lock member. @@ -107,7 +107,7 @@ void LockHelper::acquire() m_pSolarMutex->acquire(); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface IMutex @short release exclusiv lock @descr We must match this unlock call with current set lock type and used lock member. @@ -129,7 +129,7 @@ void LockHelper::release() m_pSolarMutex->release(); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface IRWLock @short set lock for reading @descr A guard should call this method to acquire read access on your member. @@ -150,7 +150,7 @@ void LockHelper::acquireReadAccess() m_pSolarMutex->acquire(); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface IRWLock @short reset lock for reading @descr A guard should call this method to release read access on your member. @@ -170,7 +170,7 @@ void LockHelper::releaseReadAccess() m_pSolarMutex->release(); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface IRWLock @short set lock for writing @descr A guard should call this method to acquire write access on your member. @@ -192,7 +192,7 @@ void LockHelper::acquireWriteAccess() m_pSolarMutex->acquire(); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface IRWLock @short reset lock for writing @descr A guard should call this method to release write access on your member. @@ -212,7 +212,7 @@ void LockHelper::releaseWriteAccess() m_pSolarMutex->release(); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface IRWLock @short downgrade a write access to a read access @descr A guard should call this method to change a write to a read access. @@ -240,7 +240,7 @@ void LockHelper::downgradeWriteAccess() // Not supported for mutex! } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short return a reference to a static lock helper @descr Sometimes we need the global mutex or rw-lock! (e.g. in our own static methods) But it's not a good idea to use these global one very often ... @@ -280,7 +280,7 @@ LockHelper& LockHelper::getGlobalLock() return *pLock; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short return a reference to shared mutex member @descr Sometimes we need a osl-mutex for sharing with our uno helper ... What can we do? diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 87e67b1fded2..bd13359e4a5c 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -26,7 +26,7 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short standard ctor @descr Initialize instance with right start values for correct working. @@ -44,7 +44,7 @@ TransactionManager::TransactionManager() m_aBarrier.open(); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short standard dtor @descr - @@ -59,7 +59,7 @@ TransactionManager::~TransactionManager() { } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @interface ITransactionManager @short set new working mode @descr These implementation knows for states of working: E_INIT, E_WORK, E_CLOSING, E_CLOSE @@ -119,7 +119,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode ) } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @interface ITransactionManager @short get current working mode @descr If you stand in your close() or init() method ... but don't know @@ -165,7 +165,7 @@ EWorkingMode TransactionManager::getWorkingMode() const return m_eWorkingMode; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @interface ITransactionManager @short start new transaction @descr A guard should use this method to start a new transaction. He should looks for rejected @@ -207,7 +207,7 @@ void TransactionManager::registerTransaction( EExceptionMode eMode, ERejectReas } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @interface ITransactionManager @short finish transaction @descr A guard should call this method to release current transaction. @@ -236,7 +236,7 @@ void TransactionManager::unregisterTransaction() throw( css::uno::RuntimeExcept } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @interface ITransactionManager @short look for rejected calls @descr Sometimes user need a possibility to get information about rejected calls @@ -269,7 +269,7 @@ sal_Bool TransactionManager::isCallRejected( ERejectReason& eReason ) const return( eReason!=E_NOREASON ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short throw any exceptions for rejected calls @descr If a user wishes to use our automatic exception mode we use this impl-method. We check all combinations of eReason and eExceptionMode and throw correct exception with some diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index 154c2432cf91..6871a758ad1d 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -33,9 +33,9 @@ const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< namespace framework { -//***************************************************************************************************************** + // XInterface, XTypeProvider -//***************************************************************************************************************** + ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : m_aShareMutex( rMutex ) diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 47fd34fd6041..4b4271fffdbe 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -35,9 +35,9 @@ using namespace ::com::sun::star::uno ; using namespace ::cppu ; using namespace ::osl ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const css::uno::Reference< XFrame >& xOwner ) // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) @@ -46,16 +46,15 @@ DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const css::uno::Refere { } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor() { } -//***************************************************************************************************************** + // XDockingAreaAcceptor -//***************************************************************************************************************** css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception) { // Ready for multithreading diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index 6bc4685a8cb3..142758d2e1e8 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -36,9 +36,9 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner ) // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) @@ -49,16 +49,15 @@ OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwne SAL_WARN_IF( !impldbg_checkParameter_OComponentAccessCtor( xOwner ), "fwk", "OComponentAccess::OComponentAccess(): Invalid parameter detected!" ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + OComponentAccess::~OComponentAccess() { } -//***************************************************************************************************************** + // XEnumerationAccess -//***************************************************************************************************************** css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -86,9 +85,8 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration return xReturn; } -//***************************************************************************************************************** + // XElementAccess -//***************************************************************************************************************** Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception ) { // Elements in list an enumeration are components! @@ -96,9 +94,8 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e return ::getCppuType((const css::uno::Reference< XComponent >*)NULL); } -//***************************************************************************************************************** + // XElementAccess -//***************************************************************************************************************** sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -119,9 +116,9 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std:: return bReturn; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void OComponentAccess::impl_collectAllChildComponents( const css::uno::Reference< XFramesSupplier >& xNode , Sequence< css::uno::Reference< XComponent > >& seqComponents ) { @@ -153,9 +150,9 @@ void OComponentAccess::impl_collectAllChildComponents( const css::uno::Refere // ... otherwise break a recursive path and go back at current stack! } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const { // Set default return value, if method failed. @@ -200,7 +197,7 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ -//***************************************************************************************************************** + sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< XDesktop >& xOwner ) { return xOwner.is(); diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 2c1f9e1b5db2..9342deec2561 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -32,9 +32,9 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) // Init baseclasses first // Attention: @@ -52,18 +52,17 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Referenc SAL_WARN_IF( !impldbg_checkParameter_OComponentEnumerationCtor( seqComponents ), "fwk", "OComponentEnumeration::OComponentEnumeration(): Invalid parameter detected!" ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + OComponentEnumeration::~OComponentEnumeration() { // Reset instance, free memory .... impl_resetObject(); } -//***************************************************************************************************************** + // XEventListener -//***************************************************************************************************************** void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -78,9 +77,8 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro impl_resetObject(); } -//***************************************************************************************************************** + // XEnumeration -//***************************************************************************************************************** sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -93,9 +91,9 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti return ( m_nPosition < (sal_uInt32)(m_seqComponents.getLength()) ); } -//***************************************************************************************************************** + // XEnumeration -//***************************************************************************************************************** + Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , WrappedTargetException , RuntimeException, std::exception ) @@ -120,9 +118,9 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementExcepti return aComponent; } -//***************************************************************************************************************** + // proteced method -//***************************************************************************************************************** + void OComponentEnumeration::impl_resetObject() { // Attention: @@ -154,7 +152,7 @@ void OComponentEnumeration::impl_resetObject() But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ -//***************************************************************************************************************** + // An empty list is allowed ... hasMoreElements() will return false then! sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) { @@ -171,7 +169,7 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor return bOK ; } -//***************************************************************************************************************** + sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObject& aEvent ) { return aEvent.Source.is(); diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 4ba1b88f1d75..f0ce0c24611c 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -37,9 +37,9 @@ using namespace ::osl ; using namespace ::std ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner , FrameContainer* pFrameContainer ) // Init baseclasses first @@ -54,18 +54,17 @@ OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner SAL_WARN_IF( !impldbg_checkParameter_OFramesCtor( xOwner, pFrameContainer ), "fwk", "OFrames::OFrames(): Invalid parameter detected!" ); } -//***************************************************************************************************************** + // (proteced!) destructor -//***************************************************************************************************************** + OFrames::~OFrames() { // Reset instance, free memory .... impl_resetObject(); } -//***************************************************************************************************************** + // XFrames -//***************************************************************************************************************** void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -89,9 +88,8 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::append():Our owner is dead - you can't append any frames ...!" ); } -//***************************************************************************************************************** + // XFrames -//***************************************************************************************************************** void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -116,9 +114,8 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::remove(): Our owner is dead - you can't remove any frames ...!" ); } -//***************************************************************************************************************** + // XFrames -//***************************************************************************************************************** Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -223,9 +220,8 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int return seqFrames; } -//***************************************************************************************************************** + // XIndexAccess -//***************************************************************************************************************** sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -247,9 +243,9 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) return nCount; } -//***************************************************************************************************************** + // XIndexAccess -//***************************************************************************************************************** + Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , WrappedTargetException , RuntimeException, std::exception ) @@ -279,18 +275,16 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce return aReturnValue; } -//***************************************************************************************************************** + // XElementAccess -//***************************************************************************************************************** Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception ) { // This "container" support XFrame-interfaces only! return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL ); } -//***************************************************************************************************************** + // XElementAccess -//***************************************************************************************************************** sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -314,9 +308,9 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception return bHasElements; } -//***************************************************************************************************************** + // proteced method -//***************************************************************************************************************** + void OFrames::impl_resetObject() { // Attention: @@ -331,9 +325,9 @@ void OFrames::impl_resetObject() m_pFrameContainer = NULL; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination , const Sequence< css::uno::Reference< XFrame > >& seqSource ) { @@ -384,7 +378,7 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ -//***************************************************************************************************************** + // An instance of this class can only work with valid initialization. // We share the mutex with ouer owner class, need a valid factory to instanciate new services and // use the access to ouer owner for some operations. @@ -394,7 +388,7 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Refere return xOwner.is() && pFrameContainer != 0; } -//***************************************************************************************************************** + // Its only allowed to add valid references to container. // AND - alle frames must support XFrames-interface! sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame ) @@ -402,7 +396,7 @@ sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFra return xFrame.is(); } -//***************************************************************************************************************** + // Its only allowed to add valid references to container... // ... => You can only delete valid references! sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame ) @@ -410,7 +404,7 @@ sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFra return xFrame.is(); } -//***************************************************************************************************************** + // A search for frames must initiate with right flags. // Some one are superflous and not supported yet. But here we control only the range of incoming parameter! sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 634583b52ea6..7d186140a724 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -44,7 +44,7 @@ namespace framework{ -//***************************************************************************************************************** + PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xContext (xContext ) @@ -52,12 +52,12 @@ PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno { } -//***************************************************************************************************************** + PersistentWindowState::~PersistentWindowState() { } -//***************************************************************************************************************** + void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -88,7 +88,7 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u xFrame->addFrameActionListener(this); } -//***************************************************************************************************************** + void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -149,14 +149,14 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv } } -//***************************************************************************************************************** + void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { // nothing todo here - because we hold the frame as weak reference only } -//***************************************************************************************************************** + OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame) { @@ -177,7 +177,7 @@ OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< return sModuleName; } -//***************************************************************************************************************** + OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sModuleName) { @@ -208,7 +208,7 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno:: return sWindowState; } -//***************************************************************************************************************** + void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sModuleName , const OUString& sWindowState) @@ -237,7 +237,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere {} } -//***************************************************************************************************************** + OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { OUString sWindowState; @@ -267,7 +267,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: } -//********************************************************************************************************* + void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , const OUString& sWindowState) { diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 8585679d214f..2a94ebe09e5d 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -28,19 +28,19 @@ namespace framework{ -//*********************************************** + StatusIndicator::StatusIndicator(StatusIndicatorFactory* pFactory) : ThreadHelpBase ( ) , m_xFactory (pFactory) { } -//*********************************************** + StatusIndicator::~StatusIndicator() { } -//*********************************************** + void SAL_CALL StatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException, std::exception) @@ -57,7 +57,7 @@ void SAL_CALL StatusIndicator::start(const OUString& sText , } } -//*********************************************** + void SAL_CALL StatusIndicator::end() throw(css::uno::RuntimeException, std::exception) { @@ -73,7 +73,7 @@ void SAL_CALL StatusIndicator::end() } } -//*********************************************** + void SAL_CALL StatusIndicator::reset() throw(css::uno::RuntimeException, std::exception) { @@ -89,7 +89,7 @@ void SAL_CALL StatusIndicator::reset() } } -//*********************************************** + void SAL_CALL StatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException, std::exception) { @@ -105,7 +105,7 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText) } } -//*********************************************** + void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException, std::exception) { diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 538b789d8a7e..3e713ca31a54 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -42,18 +42,18 @@ namespace framework{ -//***************************************************************************************************************** + TagWindowAsModified::TagWindowAsModified() : ThreadHelpBase (&Application::GetSolarMutex()) { } -//***************************************************************************************************************** + TagWindowAsModified::~TagWindowAsModified() { } -//***************************************************************************************************************** + void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -76,7 +76,7 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno impl_update (xFrame); } -//***************************************************************************************************************** + void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -116,7 +116,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent // <- SYNCHRONIZED } -//***************************************************************************************************************** + void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -142,7 +142,7 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven impl_update (xFrame); } -//***************************************************************************************************************** + void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -173,7 +173,7 @@ void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEven // <- SAFE ---------------------------------- } -//***************************************************************************************************************** + void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XFrame >& xFrame) { if ( ! xFrame.is ()) diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 188d09512bdc..5a95a936e504 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -53,7 +53,7 @@ static const ::sal_Int32 INVALID_ICON_ID = -1; static const ::sal_Int32 DEFAULT_ICON_ID = 0; -//***************************************************************************************************************** + TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xContext (xContext ) @@ -61,12 +61,12 @@ TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentCo { } -//***************************************************************************************************************** + TitleBarUpdate::~TitleBarUpdate() { } -//***************************************************************************************************************** + void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -101,7 +101,7 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any xBroadcaster->addTitleChangeListener (this); } -//***************************************************************************************************************** + void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -117,14 +117,14 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE } } -//***************************************************************************************************************** + void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */) throw (css::uno::RuntimeException, std::exception) { impl_forceUpdate (); } -//***************************************************************************************************************** + void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { @@ -209,7 +209,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr } -//***************************************************************************************************************** + ::sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, TModuleInfo& rInfo ) { @@ -244,7 +244,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr return sal_False; } -//***************************************************************************************************************** + void TitleBarUpdate::impl_forceUpdate() { // SYNCHRONIZED -> @@ -269,7 +269,7 @@ void TitleBarUpdate::impl_forceUpdate() #endif } -//***************************************************************************************************************** + void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XController > xController = xFrame->getController (); @@ -341,7 +341,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra // <- VCL SYNCHRONIZED } -//***************************************************************************************************************** + void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame) { // no window ... no chance to set any title -> return diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 67977728290c..08fdc66fcf2d 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -28,14 +28,14 @@ namespace framework{ -//*********************************************** + WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& xListener) : ThreadHelpBase( ) , m_xListener (xListener) { } -//*********************************************** + void SAL_CALL WakeUpThread::run() { ::osl::Condition aSleeper; @@ -60,7 +60,7 @@ void SAL_CALL WakeUpThread::run() } } -//*********************************************** + void SAL_CALL WakeUpThread::onTerminated() { delete this; diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 63986d98a41f..341cc85b7230 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -28,13 +28,13 @@ #include <comphelper/sequenceasvector.hxx> -//__________________________________________ + // definition namespace framework { -//__________________________________________ + /** @short implements a cache for any accelerator configuration. @@ -46,19 +46,19 @@ namespace framework */ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... { - //______________________________________ + // const, types public: - //--------------------------------------- + /** TODO document me commands -> keys */ typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList; typedef BaseHash< TKeyList > TCommand2Keys; - //--------------------------------------- + /** TODO document me keys -> commands */ @@ -67,40 +67,40 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b KeyEventHashCode , KeyEventEqualsFunc > TKey2Commands; - //______________________________________ + // member private: - //--------------------------------------- + /** map commands to keys in relation 1:n. First key is interpreted as preferred one! */ TCommand2Keys m_lCommand2Keys; - //--------------------------------------- + /** map keys to commands in relation 1:1. */ TKey2Commands m_lKey2Commands; - //______________________________________ + // interface public: - //--------------------------------------- + /** @short creates a new - but empty - cache instance. */ AcceleratorCache(); - //--------------------------------------- + /** @short make a copy of this cache. @descr Used for the copy-on-write feature. */ AcceleratorCache(const AcceleratorCache& rCopy); - //--------------------------------------- + /** @short does nothing real. */ virtual ~AcceleratorCache(); - //--------------------------------------- + /** @short write changes back to the original container. @param rCopy @@ -109,11 +109,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b */ virtual void takeOver(const AcceleratorCache& rCopy); - //--------------------------------------- + /** TODO document me */ AcceleratorCache& operator=(const AcceleratorCache& rCopy); - //--------------------------------------- + /** @short checks if the specified key exists. @param aKey @@ -125,11 +125,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; virtual sal_Bool hasCommand(const OUString& sCommand) const; - //--------------------------------------- + /** TODO document me */ virtual TKeyList getAllKeys() const; - //--------------------------------------- + /** @short add a new or change an existing key-command pair of this container. @@ -142,7 +142,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand); - //--------------------------------------- + /** @short returns the list of keys, which are registered for this command. @@ -154,11 +154,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b */ virtual TKeyList getKeysByCommand(const OUString& sCommand) const; - //--------------------------------------- + /** TODO */ virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; - //--------------------------------------- + /** TODO */ virtual void removeKey(const css::awt::KeyEvent& aKey); virtual void removeCommand(const OUString& sCommand); diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 535f87358c91..179492564a06 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -51,7 +51,7 @@ #include <cppuhelper/implbase4.hxx> #include <salhelper/singletonref.hxx> -//__________________________________________ + // definition namespace framework @@ -65,7 +65,7 @@ const char CFG_ENTRY_MODULES[] = "Modules"; in combination with the salhelper::SingletonRef mechanism! */ typedef PresetHandler AcceleratorPresets; -//__________________________________________ + /** implements a read/write access to the accelerator configuration. */ @@ -77,17 +77,17 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, // css::ui::XUIConfigurationStorage // css::ui::XUIConfiguration { - //______________________________________ + // member protected: - //--------------------------------------- + /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - //--------------------------------------- + /** used to: i ) copy configuration files from the share to the user layer ii ) provide access to these config files @@ -95,15 +95,15 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, iv ) provide commit for changes. */ PresetHandler m_aPresetHandler; - //--------------------------------------- + /** contains the cached configuration data */ AcceleratorCache m_aReadCache; - //--------------------------------------- + /** used to implement the copy on write pattern! */ AcceleratorCache* m_pWriteCache; - //______________________________________ + // native interface! public: @@ -111,7 +111,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, XMLBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~XMLBasedAcceleratorConfiguration( ); - //______________________________________ + // uno interface! public: @@ -194,12 +194,12 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, // IStorageListener virtual void changesOccurred(const OUString& sPath); - //______________________________________ + // helper for derived classes protected: - //--------------------------------------- + /** @short return the current office locale. @descr We do not cache this value, because we are not listen @@ -210,12 +210,12 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, */ OUString impl_ts_getLocale() const; - //______________________________________ + // helper private: - //--------------------------------------- + /** @short load a configuration set, using the given stream. @param xStream @@ -223,7 +223,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, */ void impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream); - //--------------------------------------- + /** @short save a configuration set, using the given stream. @param xStream @@ -231,7 +231,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, */ void impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream); - //--------------------------------------- + /** @short try to locate and open a sub storage. @descr It search at the root storage for the specified @@ -259,7 +259,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, const OUString& sSubStorage , sal_Bool bOutStream ); - //--------------------------------------- + /** @short returns a reference to one of our internal cache members. @descr We implement the copy-on-write pattern. Doing so @@ -291,12 +291,12 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, // css::ui::XUIConfigurationStorage // css::ui::XUIConfiguration { - //______________________________________ + // member protected: - //--------------------------------------- + /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -312,7 +312,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; - //______________________________________ + // native interface! public: @@ -320,7 +320,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~XCUBasedAcceleratorConfiguration( ); - //______________________________________ + // uno interface! public: @@ -413,12 +413,12 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //______________________________________ + // helper for derived classes protected: - //--------------------------------------- + /** @short return the current office locale. @descr We do not cache this value, because we are not listen @@ -429,7 +429,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, */ OUString impl_ts_getLocale() const; - //______________________________________ + // helper private: diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index 9d84c26d1338..154a1eb0caee 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -24,13 +24,13 @@ #include <stdtypes.h> -//__________________________________________ + // definition namespace framework { -//__________________________________________ + /** TODO document me */ @@ -38,7 +38,7 @@ class IStorageListener { public: - //-------------------------------------- + /** @short TODO */ virtual void changesOccurred(const OUString& sPath) = 0; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index d73816af181b..0336934f4358 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -30,19 +30,19 @@ namespace framework { -//__________________________________________ + /** can be used to map key identifier to the corresponding key codes ... */ class KeyMapping { - //______________________________________ + // const, types private: - //--------------------------------------- + /** @short is used to map a key code to the right key identifier, which is used to make the xml file "human readable" @@ -53,33 +53,33 @@ class KeyMapping const char* Identifier; }; - //--------------------------------------- + /** @short hash structure to map identifier to key codes. */ typedef BaseHash< sal_Int16 > Identifier2CodeHash; - //--------------------------------------- + /** @short hash structure to map key codes to identifier. */ typedef ::boost::unordered_map< sal_Int16 , OUString , ShortHashCode , ::std::equal_to< sal_Int16 > > Code2IdentifierHash; - //______________________________________ + // member private: static KeyIdentifierInfo KeyIdentifierMap[]; - //--------------------------------------- + /** @short hash to map identifier to key codes. */ Identifier2CodeHash m_lIdentifierHash; - //--------------------------------------- + /** @short hash to map key codes to identifier. */ Code2IdentifierHash m_lCodeHash; - //______________________________________ + // interface public: @@ -87,7 +87,7 @@ class KeyMapping KeyMapping(); virtual ~KeyMapping(); - //---------------------------------- + /** @short return a suitable key code for the specified key identifier. @@ -105,7 +105,7 @@ class KeyMapping virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException); - //---------------------------------- + /** @short return a suitable key identifier for the specified key code. @@ -116,12 +116,12 @@ class KeyMapping */ virtual OUString mapCodeToIdentifier(sal_uInt16 nCode); - //______________________________________ + // helper private: - //---------------------------------- + /** @short check if the given string describe a numeric value ... and convert it. diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 45896436572e..1ca54f710f5e 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -64,12 +64,12 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas static OUString RESOURCETYPE_ACCELERATOR(); static OUString RESOURCETYPE_STATUSBAR(); - //------------------------------------------- + // types public: - //--------------------------------------- + /** @short this handler can provide different types of configuration. @@ -85,7 +85,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas private: - //--------------------------------------- + /** @short because a concurrent access to the same storage from different implementations isnt supported, we have to share it with others. @@ -112,23 +112,23 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas virtual ~TSharedStorages() {}; }; - //------------------------------------------- + // member private: - //--------------------------------------- + /** @short can be used to create on needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - //--------------------------------------- + /** @short knows the type of provided configuration. @descr e.g. global, modules, ... */ EConfigType m_eConfigType; - //--------------------------------------- + /** @short specify the type of resource, which configuration sets must be provided here. @@ -136,7 +136,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ OUString m_sResourceType; - //--------------------------------------- + /** @short specify the application module for a module dependend configuration. @@ -146,19 +146,19 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ OUString m_sModule; - //--------------------------------------- + /** @short provides access to the: a) shared root storages b) shared "inbetween" storages of the share and user layer. */ ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages; - //--------------------------------------- + /** @short if we run in document mode, we cant use the global root storages! We have to use a special document storage explicitly. */ StorageHolder m_lDocumentStorages; - //--------------------------------------- + /** @short holds the folder storage of the share layer alive, where the current configuration set exists. @@ -171,12 +171,12 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageShare; - //--------------------------------------- + /** @short global language-independent storage */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageNoLang; - //--------------------------------------- + /** @short holds the folder storage of the user layer alive, where the current configuration set exists. @@ -189,17 +189,17 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageUser; - //--------------------------------------- + /** @short knows the names of all presets inside the current working storage of the share layer. */ OUStringList m_lPresets; - //--------------------------------------- + /** @short knows the names of all targets inside the current working storage of the user layer. */ OUStringList m_lTargets; - //--------------------------------------- + /** @short its the current office locale and will be used to handle localized presets. @@ -207,18 +207,18 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas localized handling inside this class! */ LanguageTag m_aLanguageTag; - //--------------------------------------- + /** @short knows the relative path from the root. */ OUString m_sRelPathShare; OUString m_sRelPathNoLang; OUString m_sRelPathUser; - //------------------------------------------- + // native interface public: - //--------------------------------------- + /** @short does nothing real. @descr Because this class should be useable in combination @@ -231,19 +231,19 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext); - //--------------------------------------- + /** @short copy ctor */ PresetHandler(const PresetHandler& rCopy); - //--------------------------------------- + /** @short closes all open storages ... if user forgot that .-) */ virtual ~PresetHandler(); - //--------------------------------------- + /** @short free all currently cache(!) storages. */ void forgetCachedStorages(); - //--------------------------------------- + /** @short return access to the internally used and cached root storage. @descr These root storages are the base of all further opened @@ -261,7 +261,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageShare(); css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageUser(); - //--------------------------------------- + /** @short provides access to the current working storages. @descr Working storages are the "lowest" storages, where the @@ -273,7 +273,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas css::uno::Reference< css::embed::XStorage > getWorkingStorageShare(); css::uno::Reference< css::embed::XStorage > getWorkingStorageUser(); - //--------------------------------------- + /** @short check if there is a parent storage well known for the specified child storage and return it. @@ -286,7 +286,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild); css::uno::Reference< css::embed::XStorage > getParentStorageUser (const css::uno::Reference< css::embed::XStorage >& xChild); - //--------------------------------------- + /** @short free all internal structures and let this handler work on a new type of configuration sets. @@ -327,7 +327,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas const css::uno::Reference< css::embed::XStorage >& xDocumentRoot , const LanguageTag& rLanguageTag = LanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE)); - //--------------------------------------- + /** @short try to copy the specified preset from the share layer to the user layer and establish it as the specified target. @@ -351,7 +351,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas void copyPresetToTarget(const OUString& sPreset, const OUString& sTarget); - //--------------------------------------- + /** @short open the specified preset as stream object and return it. @@ -369,7 +369,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset, sal_Bool bUseNoLangGlobal = sal_False); - //--------------------------------------- + /** @short open the specified target as stream object and return it. @@ -391,7 +391,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget , sal_Bool bCreateIfMissing); - //--------------------------------------- + /** @short do anything which is necessary to flush all changes back to disk. @@ -401,17 +401,17 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ void commitUserChanges(); - //--------------------------------------- + /** TODO */ void addStorageListener(IStorageListener* pListener); void removeStorageListener(IStorageListener* pListener); - //------------------------------------------- + // helper private: - //--------------------------------------- + /** @short open a config path ignoring errors (catching exceptions). @descr We catch only normal exceptions here - no runtime exceptions. @@ -431,7 +431,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas sal_Int32 eMode , sal_Bool bShare); - //--------------------------------------- + /** @short try to find the specified locale inside list of possible ones. @descr The lits of possible locale values was e.g. retrieved from the system @@ -458,7 +458,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas OUString& rLanguageTag , sal_Bool bAllowFallbacks ); - //--------------------------------------- + /** @short open a config path ignoring errors (catching exceptions). @descr We catch only normal exceptions here - no runtime exceptions. @@ -492,7 +492,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas OUString& rLanguageTag , sal_Bool bAllowFallback); - //--------------------------------------- + /** @short returns the names of all sub storages of specified storage. @param xFolder diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 13bef973296a..8879e0319900 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -32,13 +32,13 @@ namespace framework { -//----------------------------------------------- + /** TODO document me */ class StorageHolder : private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... { - //------------------------------------------- + // types public: @@ -65,7 +65,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas OUStringHash , ::std::equal_to< OUString > > TPath2StorageInfo; - //------------------------------------------- + // member private: @@ -75,95 +75,95 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ TPath2StorageInfo m_lStorages; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short TODO */ StorageHolder(); - //--------------------------------------- + /** @short TODO */ virtual ~StorageHolder(); - //--------------------------------------- + /** @short TODO */ virtual void forgetCachedStorages(); - //--------------------------------------- + /** @short TODO */ virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot); - //--------------------------------------- + /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getRootStorage() const; - //--------------------------------------- + /** @short TODO open or get! */ virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath , sal_Int32 nOpenMode); - //--------------------------------------- + /** @short TODO */ virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath); - //--------------------------------------- + /** @short TODO */ virtual void commitPath(const OUString& sPath); - //--------------------------------------- + /** @short TODO */ virtual void closePath(const OUString& sPath); - //--------------------------------------- + /** @short TODO */ virtual void notifyPath(const OUString& sPath); - //--------------------------------------- + /** @short TODO */ virtual void addStorageListener( IStorageListener* pListener, const OUString& sPath ); - //--------------------------------------- + /** @short TODO */ virtual void removeStorageListener( IStorageListener* pListener, const OUString& sPath ); - //--------------------------------------- + /** @short TODO */ virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage); - //--------------------------------------- + /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild); - //--------------------------------------- + /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath); - //--------------------------------------- + /** @short TODO */ void operator=(const StorageHolder& rCopy); - //--------------------------------------- + /** @short opens a sub element of the specified base storage. @descr First this method try to open the requested sub element @@ -197,16 +197,16 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas sal_Int32 eOpenMode , sal_Bool bAllowFallback); - //--------------------------------------- + // helper private: - //----------------------------------- + /** @short TODO */ static OUString impl_st_normPath(const OUString& sPath); - //----------------------------------- + /** @short TODO */ static OUStringList impl_st_parsePath(const OUString& sPath); diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 9d13717418f0..23b16ac9d9c9 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -39,7 +39,7 @@ class LoadDispatcher : private ThreadHelpBase , public ::cppu::WeakImplHelper2< css::frame::XNotifyingDispatch, // => XDispatch => XInterface css::frame::XSynchronousDispatch > { - //___________________________________________ + // member private: @@ -59,7 +59,7 @@ class LoadDispatcher : private ThreadHelpBase /** @short TODO document me */ LoadEnv m_aLoader; - //___________________________________________ + // native interface public: @@ -88,13 +88,13 @@ class LoadDispatcher : private ThreadHelpBase const OUString sTargetName , sal_Int32 nSearchFlags); - //_______________________________________ + /** @short used to free internal resources. */ virtual ~LoadDispatcher(); - //___________________________________________ + // uno interface public: diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 5aec5b650419..2c0ff5fcc9a5 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -60,12 +60,12 @@ class WindowCommandDispatch : private ThreadHelpBase /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; - //___________________________________________ + // native interface public: - //_______________________________________ + /** @short creates a new instance and initialize it with all necessary parameters. @@ -82,18 +82,18 @@ class WindowCommandDispatch : private ThreadHelpBase WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame); - //_______________________________________ + /** @short used to free internal resources. */ virtual ~WindowCommandDispatch(); - //___________________________________________ + // implementation private: - //_______________________________________ + /** @short establish all listener connections we need. @@ -108,13 +108,13 @@ class WindowCommandDispatch : private ThreadHelpBase */ void impl_stopListening(); - //_______________________________________ + /** @short callback from VCL to notify new commands */ DECL_LINK( impl_notifyCommand, void* ); - //_______________________________________ + /** @short dispatch right command URLs into our frame context. diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 91d8325023f6..0fb34d4d14a6 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -37,7 +37,7 @@ namespace framework{ */ class ActionLockGuard : private ThreadHelpBase { - //------------------------------------------- + // member private: @@ -49,12 +49,12 @@ class ActionLockGuard : private ThreadHelpBase forced by this guard instance. */ sal_Bool m_bActionLocked; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short default ctor to initialize a "non working guard". @descr That can be useful in cases, where no resource still exists, @@ -67,7 +67,7 @@ class ActionLockGuard : private ThreadHelpBase { } - //--------------------------------------- + /** @short initialize new guard instance and lock the given resource immediately. @param xLock @@ -80,7 +80,7 @@ class ActionLockGuard : private ThreadHelpBase setResource(xLock); } - //--------------------------------------- + /** @short release this guard instance and make shure, that no lock will exist afterwards on the internal wrapped resource. */ @@ -89,7 +89,7 @@ class ActionLockGuard : private ThreadHelpBase unlock(); } - //--------------------------------------- + /** @short set a new resource for locking at this guard. @descr This call will fail, if an internal resource already exists @@ -117,7 +117,7 @@ class ActionLockGuard : private ThreadHelpBase return sal_True; } - //--------------------------------------- + /** @short set a new resource for locking at this guard. @descr This call will fail, if an internal resource already exists @@ -147,7 +147,7 @@ class ActionLockGuard : private ThreadHelpBase xLock->removeActionLock(); } - //--------------------------------------- + /** @short lock the internal wrapped resource, if its not already done. */ virtual void lock() { @@ -162,7 +162,7 @@ class ActionLockGuard : private ThreadHelpBase // <- SAFE .......................... } - //--------------------------------------- + /** @short unlock the internal wrapped resource, if its not already done. */ virtual void unlock() { diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index f6c1bd7ac823..2642f09ab532 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -305,7 +305,7 @@ public: */ void startLoading(); - //_______________________________________ + /** @short wait for an alreay running load request (started by calling startLoading() before). @@ -329,7 +329,7 @@ public: */ sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0); - //_______________________________________ + /** TODO document me ... */ css::uno::Reference< css::lang::XComponent > getTargetComponent() const; @@ -381,7 +381,7 @@ public: /** TODO document me ... */ css::uno::Reference< css::uno::XInterface > impl_searchLoader(); - //_______________________________________ + /** @short it means; show the frame, bring it to front, might set the right icon etcpp. in case loading was diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index fc54bd0378b7..8ec03e2c09ad 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -54,12 +54,12 @@ class TargetHelper E_HELPTASK }; - //___________________________________________ + // interface public: - //___________________________________________ + /** @short it checks the given unknown target name, if it's the expected special one. @@ -78,7 +78,7 @@ class TargetHelper static sal_Bool matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget); - //___________________________________________ + /** @short it checks, if the given name can be used to set it at a frame using XFrame.setName() method. diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 7035eb034c59..e8d400bab416 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -36,7 +36,7 @@ namespace framework{ namespace frame{ -//----------------------------------------------- + inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XModel > xModel; @@ -48,7 +48,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un return xModel; } -//----------------------------------------------- + /** @short close (or dispose) the given resource. @descr It try to close the given resource first. diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 9493589509f8..ff4510f18f9e 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -33,7 +33,7 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -//_______________________________________________ + // namespaces namespace framework{ @@ -43,7 +43,7 @@ class WindowHelper { public: -//----------------------------------------------- + static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { if (!xWindow.is()) @@ -68,7 +68,7 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); } -//----------------------------------------------- + static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow , const OUString& sWindowState) { @@ -99,7 +99,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // <- SOLAR SAFE ---------------------------- } -//----------------------------------------------- + static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { // even child frame containing top level windows (e.g. query designer of database) will be closed diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 697d8df38468..bcfcf090fc35 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2821,7 +2821,7 @@ throw ( RuntimeException, std::exception ) } } -// ______________________________________________ + void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent ) throw( RuntimeException, std::exception ) diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 2e1fd8d560c8..b4cbb1738883 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -141,29 +141,25 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a // child window notifications long childWindowEvent( VclSimpleEvent* pEvent ); - //--------------------------------------------------------------------------------------------------------- + // XInterface - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------------------------------------------- + // XEventListener - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------------------------------------------- + // XWindowListener - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); - //--------------------------------------------------------------------------------------------------------- // XDockableWindowListener - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -172,9 +168,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //--------------------------------------------------------------------------------------------------------- // XUIConfigurationListener - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -203,9 +197,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a sal_Int32 nRowColumn; }; - //--------------------------------------------------------------------------------------------------------- + // internal helper methods - //--------------------------------------------------------------------------------------------------------- + bool implts_isParentWindowVisible() const; ::Rectangle implts_calcDockingArea(); void implts_sortUIElements(); @@ -214,9 +208,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow ); void implts_destroyDockingAreaWindows(); - //--------------------------------------------------------------------------------------------------------- + // layout methods - //--------------------------------------------------------------------------------------------------------- + void implts_setDockingAreaWindowSizes( const ::com::sun::star::awt::Rectangle& rBorderSpace ); ::com::sun::star::awt::Point implts_findNextCascadeFloatingPos(); void implts_renumberRowColumnData( ::com::sun::star::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement ); @@ -228,9 +222,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_setLayoutInProgress( bool bInProgress = true ); bool implts_isLayoutInProgress() const { return m_bLayoutInProgress; } - //--------------------------------------------------------------------------------------------------------- + // lookup/container methods - //--------------------------------------------------------------------------------------------------------- + UIElement implts_findToolbar( const OUString& aName ); UIElement implts_findToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xToolbar ); UIElement& impl_findToolbar( const OUString& aName ); @@ -241,9 +235,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a ::Size implts_getTopBottomDockingAreaSizes(); void implts_getUIElementVectorCopy( UIElementVector& rCopy ); - //--------------------------------------------------------------------------------------------------------- + // internal docking methods - //--------------------------------------------------------------------------------------------------------- + ::Rectangle implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset ); void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos ); DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos ); @@ -265,9 +259,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::com::sun::star::awt::Point& rVirtualPos, ::Point& rPixelPos ); void implts_setTrackingRect( ::com::sun::star::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect ); - //--------------------------------------------------------------------------------------------------------- + // creation methods - //--------------------------------------------------------------------------------------------------------- + void implts_createAddonsToolBars(); void implts_createCustomToolBars(); void implts_createNonContextSensitiveToolBars(); @@ -278,15 +272,15 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_setToolbarCreation( bool bStart = true ); bool implts_isToolbarCreationActive(); - //--------------------------------------------------------------------------------------------------------- + // persistence methods - //--------------------------------------------------------------------------------------------------------- + sal_Bool implts_readWindowStateData( const OUString& aName, UIElement& rElementData ); void implts_writeWindowStateData( const UIElement& rElementData ); - //--------------------------------------------------------------------------------------------------------- + // members - //--------------------------------------------------------------------------------------------------------- + css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::awt::XWindow2 > m_xContainerWindow; diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 36f8a7d10310..6f9d0882e484 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -34,9 +34,9 @@ namespace framework{ // used to mark a dispatch as comment (mostly it indicates an error) Changing of this wdefine will impact all using of such comments ... #define REM_AS_COMMENT "rem " -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + DEFINE_XSERVICEINFO_MULTISERVICE_2( DispatchRecorder, @@ -68,7 +68,7 @@ void flatten_struct_members( Any( (char const *)data + pTD->pMemberOffsets[ nPos ], pTD->ppTypeRefs[ nPos ] ) ); } } -//================================================================================================== + Sequence< Any > make_seq_out_of_struct( Any const & val ) SAL_THROW( (RuntimeException) ) @@ -100,19 +100,19 @@ Sequence< Any > make_seq_out_of_struct( return Sequence< Any >( &vec[ 0 ], vec.size() ); } -//*********************************************************************** + DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , m_xConverter( css::script::Converter::create(xContext) ) { } -//************************************************************************ + DispatchRecorder::~DispatchRecorder() { } -//************************************************************************* + // generate header void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& ) throw( css::uno::RuntimeException, std::exception ) { @@ -120,7 +120,7 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css:: /* } */ } -//************************************************************************* + void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { @@ -130,7 +130,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, m_aStatements.push_back( aStatement ); } -//************************************************************************* + void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { @@ -141,7 +141,6 @@ void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& m_aStatements.push_back( aStatement ); } -//************************************************************************* void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException, std::exception ) { /* SAFE{ */ @@ -150,7 +149,6 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException /* } */ } -//************************************************************************* OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException, std::exception ) { /* SAFE{ */ @@ -180,7 +178,7 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeE /* } */ } -//************************************************************************* + void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer ) { // if value == bool diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 9db2b7d3125d..209afd78af71 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -28,9 +28,9 @@ namespace framework{ -//***************************************************************************************************************** + // XInterface, XTypeProvider -//***************************************************************************************************************** + DEFINE_XSERVICEINFO_MULTISERVICE( DispatchRecorderSupplier, diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 9e083f9436ee..fe12cfd17a20 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -133,7 +133,7 @@ void Desktop::constructorInit() m_aTransactionManager.setWorkingMode( E_WORK ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short standard constructor to create instance by factory @descr This constructor initialize a new instance of this class by valid factory, and will be set valid values on his member and baseclasses. @@ -182,7 +182,7 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon { } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short standard destructor @descr This one do NOTHING! Use dispose() instaed of this. @@ -215,7 +215,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::u ); } -//============================================================================= + sal_Bool SAL_CALL Desktop::terminate() throw( css::uno::RuntimeException, std::exception ) { @@ -377,7 +377,7 @@ bool SAL_CALL Desktop::terminateQuickstarterToo() return terminate(); } -//============================================================================= + void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { @@ -420,7 +420,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener ); } -//============================================================================= + void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { @@ -466,7 +466,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css:: m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XDesktop @short get access to create enumerations of all current components @descr You will be the owner of the returned object and must delete it if you don't use it again. @@ -493,7 +493,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getC return xAccess; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XDesktop @short return the current active component @descr The most current component is the window, model or the controller of the current active frame. @@ -527,7 +527,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone return xComponent; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XDesktop @short return the current active frame in hierarchy @descr There can be more then one different active paths in our frame hierarchy. But only one of them @@ -566,7 +566,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th return css::uno::Reference< css::frame::XFrame >( xLast, css::uno::UNO_QUERY ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XComponentLoader @short try to load given URL into a task @descr You can give us some information about the content, which you will load into a frame. @@ -603,7 +603,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom return LoadEnv::loadComponentFromURL(xThis, m_xContext, sURL, sTargetFrameName, nSearchFlags, lArguments); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XTasksSupplier @short get access to create enumerations of ouer taskchildren @descr Direct children of desktop are tasks everytime. @@ -630,7 +630,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT return NULL; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XTasksSupplier @short return current active task of ouer direct children @descr Desktop children are tasks only ! If we have an active path from desktop @@ -654,7 +654,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw return NULL; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XDispatchProvider @short search a dispatcher for given URL @descr We use a helper implementation (class DispatchProvider) to do so. @@ -700,7 +700,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co } } -//***************************************************************************************************************** css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -710,7 +709,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk return m_xDispatchHelper->queryDispatches( lQueries ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XDipsatchProviderInterception @short supports registration/deregistration of interception objects, which are interested on special dispatches. @@ -730,7 +729,7 @@ void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Refe xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor ); } -//***************************************************************************************************************** + void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw( css::uno::RuntimeException, std::exception) { @@ -740,7 +739,7 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe xInterceptionHelper->releaseDispatchProviderInterceptor( xInterceptor ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XFramesSupplier @short return access to append or remove children on desktop @descr We don't implement these interface directly. We use a helper class to do this. @@ -766,7 +765,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw( return m_xFramesHelper; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XFramesSupplier @short set/get the current active child frame @descr It must be a task. Direct children of desktop are tasks only! No frames are accepted. @@ -805,7 +804,6 @@ void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XF } } -//***************************************************************************************************************** css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -815,7 +813,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr return m_aChildTaskContainer.getActive(); } -/*-************************************************************************************************************//** +/* @interface XFrame @short non implemented methods! @descr Some method make no sense for our desktop! He has no window or parent or ... @@ -828,29 +826,25 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr @onerror - @threadsafe - -*//*-*************************************************************************************************************/ +*/ void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& ) throw( css::uno::RuntimeException, std::exception ) { } -//***************************************************************************************************************** css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::awt::XWindow >(); } -//***************************************************************************************************************** void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ ) throw( css::uno::RuntimeException, std::exception ) { } -//***************************************************************************************************************** css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::frame::XFramesSupplier >(); } -//***************************************************************************************************************** OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exception ) { /* SAFE { */ @@ -859,7 +853,6 @@ OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exc /* } SAFE */ } -//***************************************************************************************************************** void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception ) { /* SAFE { */ @@ -869,13 +862,11 @@ void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::Runtime /* } SAFE */ } -//***************************************************************************************************************** sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException, std::exception ) { return sal_True; } -//***************************************************************************************************************** void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::exception ) { // Desktop is activae always ... but sometimes our frames try to activate @@ -883,7 +874,6 @@ void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::except // So - please don't show any assertions here. Do nothing! } -//***************************************************************************************************************** void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exception ) { // Desktop is activae always ... but sometimes our frames try to deactivate @@ -891,49 +881,43 @@ void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exce // So - please don't show any assertions here. Do nothing! } -//***************************************************************************************************************** sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::exception ) { return sal_True; } -//***************************************************************************************************************** + sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >& /*xComponentWindow*/ , const css::uno::Reference< css::frame::XController >& /*xController*/ ) throw( css::uno::RuntimeException, std::exception ) { return sal_False; } -//***************************************************************************************************************** css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::awt::XWindow >(); } -//***************************************************************************************************************** css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::frame::XController >(); } -//***************************************************************************************************************** void SAL_CALL Desktop::contextChanged() throw( css::uno::RuntimeException, std::exception ) { } -//***************************************************************************************************************** void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception ) { } -//***************************************************************************************************************** + // css::frame::XFrame -//***************************************************************************************************************** void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception ) { } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XFrame @short try to find a frame with special parameters @descr This method searches for a frame with the specified name. @@ -1164,7 +1148,7 @@ void SAL_CALL Desktop::disposing() m_aTransactionManager.setWorkingMode( E_CLOSE ); } -/*-************************************************************************************************************//** +/* @interface XComponent @short add/remove listener for dispose events @descr Add an event listener to this object, if you wish to get information @@ -1180,7 +1164,7 @@ void SAL_CALL Desktop::disposing() @onerror - @threadsafe yes -*//*-*************************************************************************************************************/ +*/ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -1193,7 +1177,6 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >*) NULL ), xListener ); } -//***************************************************************************************************************** void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -1206,7 +1189,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >*) NULL ), xListener ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XDispatchResultListener @short callback for dispatches @descr To support our method "loadComponentFromURL()" we are listener on temp. created dispatcher. @@ -1244,7 +1227,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& /* UNSAFE AREA ----------------------------------------------------------------------------------------- */ } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XEventListener @short not implemented! @descr We are a status listener ... and so we must be an event listener too ... But we don't need it really! @@ -1263,7 +1246,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un SAL_WARN( "fwk", "Desktop::disposing(): Algorithm error! Normaly desktop is temp. listener ... not all the time. So this method shouldn't be called." ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XInteractionHandler @short callback for loadComponentFromURL for detected exceptions during load proccess @descr In this case we must cancel loading and throw these detected exception again as result @@ -1401,7 +1384,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix() return m_xTitleNumberGenerator->getUntitledPrefix (); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short try to convert a property value @descr This method is called from helperclass "OPropertySetHelper". Don't use this directly! @@ -1467,7 +1450,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon return bReturn ; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short set value of a transient property @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! @@ -1501,7 +1484,7 @@ void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast( sal_Int32 } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short get value of a transient property @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! @@ -1539,7 +1522,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short return structure and information about transient properties @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! @@ -1585,7 +1568,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , return(*pInfoHelper); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short return propertysetinfo @descr You can call this method to get information about transient properties of this object. @@ -1633,7 +1616,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert return (*pInfo); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short return current component of current frame @descr The desktop himself has no component. But every frame in subtree. If somewhere call getCurrentComponent() at this class, we try to find the right frame and @@ -1685,7 +1668,7 @@ css::uno::Reference< css::lang::XComponent > Desktop::impl_getFrameComponent( co return xComponent; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short create table with information about properties @descr We use a helper class to support properties. These class need some information about this. These method create a new static description table with name, type, r/w-flags and so on ... @@ -1722,7 +1705,7 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty return lPropertyDescriptor; } -//============================================================================= + void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lCalledListener, ::sal_Bool& bVeto ) { @@ -1763,7 +1746,7 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC } } -//============================================================================= + void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerList& lCalledListener) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1788,7 +1771,7 @@ void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerL } } -//============================================================================= + void Desktop::impl_sendNotifyTerminationEvent() { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1819,7 +1802,7 @@ void Desktop::impl_sendNotifyTerminationEvent() } } -//============================================================================= + ::sal_Bool Desktop::impl_closeFrames(::sal_Bool bAllowUI) { ReadGuard aReadLock( m_aLock ); // start synchronize diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 0323a0a77125..bf60a8f3047e 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -101,7 +101,7 @@ enum EActiveState E_FOCUS // I have the focus now. I must a member of an active path! }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short implements a normal frame of hierarchy @descr An instance of these class can be a normal node in frame tree. A frame support influencing of his subtree, find of subframes, activate- and deactivate-mechanism as well as @@ -354,7 +354,7 @@ private: private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short helper methods @descr Follow methods are needed at different points of our code (more then ones!). @@ -383,7 +383,7 @@ private: // (should be private everyway!) - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short debug-method to check incoming parameter of some other mehods of this class @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). @@ -414,10 +414,10 @@ private: static sal_Bool implcp_windowDeactivated ( const css::lang::EventObject& aEvent ); static sal_Bool implcp_disposing ( const css::lang::EventObject& aEvent ); -//************************************************************************************************************* + // variables // -threadsafe by own read/write lock "m_aLock" -//************************************************************************************************************* + private: css::uno::Reference< css::uno::XComponentContext > m_xContext ; /// reference to factory, which has create this instance @@ -484,9 +484,9 @@ protected: css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame = css::uno::WeakReference< css::frame::XFrame2 >(); -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + DEFINE_XINTERFACE_22 ( Frame , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), @@ -537,7 +537,7 @@ DEFINE_XTYPEPROVIDER_21 ( Frame css::frame::XTitleChangeBroadcaster ) -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short standard constructor to create instance by factory @descr This constructor initialize a new instance of this class by valid factory, and will be set valid values on his member and baseclasses. @@ -642,7 +642,7 @@ void Frame::initListeners() impl_initializePropInfo(); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short standard destructor @descr This one do NOTHING! Use dispose() instaed of this. @@ -658,7 +658,7 @@ Frame::~Frame() SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk", "Frame::~Frame(): Who forgot to dispose this service?" ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface XComponentLoader @short try to load given URL into a task @descr You can give us some information about the content, which you will load into a frame. @@ -701,7 +701,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR return LoadEnv::loadComponentFromURL(xThis, xContext, sURL, sTargetFrameName, nSearchFlags, lArguments); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short return access to append or remove children on desktop @descr We don't implement these interface directly. We use a helper class to do this. If you wish to add or delete children to/from the container, call these method to get @@ -736,7 +736,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs return m_xFramesHelper; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short get the current active child frame @descr It must be a frameto. Direct children of a frame are frames only! No task or desktop is accepted. We don't save this information directly in this class. We use ouer container-helper @@ -765,7 +765,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw return m_aChildFrameContainer.getActive(); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short set the new active direct child frame @descr It must be a frame to. Direct children of frame are frames only! No task or desktop is accepted. We don't save this information directly in this class. We use ouer container-helper @@ -850,7 +850,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** initialize new created layout manager **/ void lcl_enableLayoutManager(const css::uno::Reference< css::frame::XLayoutManager2 >& xLayoutManager, @@ -866,7 +866,7 @@ void lcl_enableLayoutManager(const css::uno::Reference< css::frame::XLayoutManag xLayoutManager->setDockingAreaAcceptor(xDockingAreaAcceptor); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** deinitialize layout manager **/ void lcl_disableLayoutManager(const css::uno::Reference< css::frame::XLayoutManager2 >& xLayoutManager, @@ -877,7 +877,7 @@ void lcl_disableLayoutManager(const css::uno::Reference< css::frame::XLayoutMana xLayoutManager->attachFrame(css::uno::Reference< css::frame::XFrame >()); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short initialize frame instance @descr A frame needs a window. This method set a new one ... but should called one times only! We use this window to listen for window events and forward it to our set component. @@ -961,7 +961,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& pTitleHelper->setOwner(xThis); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short returns current set container window @descr The ContainerWindow property is used as a container for the component in this frame. So this object implements a container interface too. @@ -987,7 +987,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() th return m_xContainerWindow; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short set parent frame @descr We need a parent to support some functionality! e.g. findFrame() By the way we use the chance to set an internal information about our top state. @@ -1018,7 +1018,7 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS m_bIsFrameTop = ( xIsDesktop.is() || ! xCreator.is() ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short returns current parent frame @descr The Creator is the parent frame container. If it is NULL, the frame is the uppermost one. @@ -1041,7 +1041,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() return m_xParent; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short returns current set name of frame @descr This name is used to find target of findFrame() or queryDispatch() calls. @@ -1060,7 +1060,7 @@ OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException, std::excep /* } SAFE */ } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short set new name for frame @descr This name is used to find target of findFrame() or queryDispatch() calls. @@ -1086,7 +1086,7 @@ void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeEx /* } SAFE */ } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short search for frames @descr This method searches for a frame with the specified name. Frames may contain other frames (e.g. a frameset) and may @@ -1368,7 +1368,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr return xTarget; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short - @descr Returns sal_True, if this frame is a "top frame", otherwise sal_False. The "m_bIsFrameTop" member must be set in the ctor or setCreator() method. @@ -1399,7 +1399,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException, std::excepti return m_bIsFrameTop; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short activate frame in hierarchy @descr This feature is used to mark active paths in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. @@ -1492,7 +1492,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short deactivate frame in hierarchy @descr This feature is used to deactive paths in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. @@ -1575,7 +1575,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short returns active state @descr Call it to get information about current active state of this frame. @@ -1603,7 +1603,7 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exce ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short ??? @descr - @@ -1624,7 +1624,7 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::ex implts_sendFrameActionEvent( css::frame::FrameAction_CONTEXT_CHANGED ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short set new component inside the frame @descr A frame is a container for a component. Use this method to set, change or realease it! We accept null references! The xComponentWindow will be a child of our container window @@ -1801,7 +1801,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X return sal_True; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short returns current set component window @descr Frames are used to display components. The actual displayed component is held by the m_xComponentWindow property. If the component implements only a @@ -1831,7 +1831,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th return m_xComponentWindow; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short returns current set controller @descr Frames are used to display components. The actual displayed component is held by the m_xComponentWindow property. If the component implements only a @@ -1859,7 +1859,7 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() t return m_xController; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short add/remove listener for activate/deactivate/contextChanged events @descr - @@ -1886,7 +1886,6 @@ void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::fra m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XFrameActionListener >*)NULL ), xListener ); } -//***************************************************************************************************************** void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -1901,7 +1900,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css:: m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XFrameActionListener >*)NULL ), xListener ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short support two way mechanism to release a frame @descr This method ask internal component (controller) if he accept this close request. In case of <TRUE/> nothing will be happen (from point of caller of this close method). @@ -2002,7 +2001,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close dispose(); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short be a listener for close events! @descr Adds/remove a CloseListener at this frame instance. If the close() method is called on this object, the such listener are informed and can disagree with that by throwing @@ -2025,7 +2024,6 @@ void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCl m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } -//***************************************************************************************************************** void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { // Use soft exception mode - moslty this method is called during disposing of this frame ... @@ -2035,7 +2033,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } -//***************************************************************************************************************** + OUString SAL_CALL Frame::getTitle() throw (css::uno::RuntimeException, std::exception) { @@ -2050,7 +2048,7 @@ OUString SAL_CALL Frame::getTitle() return xTitle->getTitle(); } -//***************************************************************************************************************** + void SAL_CALL Frame::setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) { @@ -2065,7 +2063,7 @@ void SAL_CALL Frame::setTitle( const OUString& sTitle ) xTitle->setTitle(sTitle); } -//***************************************************************************************************************** + void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception) { @@ -2080,7 +2078,7 @@ void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::fra xTitle->addTitleChangeListener(xListener); } -//***************************************************************************************************************** + void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { @@ -2172,7 +2170,7 @@ void Frame::implts_forgetSubFrames() // <- SAFE } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short destroy instance @descr The owner of this object calles the dispose method if the object should be destroyed. All other objects and components, that are registered @@ -2319,7 +2317,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException, std::exception Application::SetDialogCancelMode( old ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short Be a listener for dispose events! @descr Adds/remove an EventListener to this object. If the dispose method is called on this object, the disposing method of the listener is called. @@ -2344,7 +2342,6 @@ void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEv m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } -//***************************************************************************************************************** void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -2359,7 +2356,7 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang:: m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short create new status indicator @descr Use returned status indicator to show progresses and some text information. All created objects share the same dialog! Only the last one can show his information. @@ -2399,7 +2396,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI return css::uno::Reference< css::task::XStatusIndicator >(); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short search for target to load URL @descr This method searches for a dispatch for the specified DispatchDescriptor. The FrameSearchFlags and the FrameName of the DispatchDescriptor are @@ -2444,7 +2441,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short handle more then ones dispatches at same call @descr Returns a sequence of dispatches. For details see the queryDispatch method. For failed dispatches we return empty items in list! @@ -2467,7 +2464,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram return m_xDispatchHelper->queryDispatches( lDescriptor ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short register/unregister interceptor for dispatch calls @descr If you wish to handle some dispatches by himself ... you should be an interceptor for it. Please see class OInterceptionHelper for further information. @@ -2491,7 +2488,6 @@ void SAL_CALL Frame::registerDispatchProviderInterceptor( const css::uno::Refere xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor ); } -//***************************************************************************************************************** void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) { // We use a helper to support these interface and an interceptor mechanism. @@ -2505,7 +2501,7 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Referen xInterceptionHelper->releaseDispatchProviderInterceptor( xInterceptor ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short provides information about all possible dispatch functions inside the currnt frame environment *//*-*****************************************************************************************************/ @@ -2515,14 +2511,14 @@ css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups() return m_xDispatchInfoHelper->getSupportedCommandGroups(); } -//***************************************************************************************************************** + css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw(css::uno::RuntimeException, std::exception) { return m_xDispatchInfoHelper->getConfigurableDispatchInformation(nCommandGroup); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short notifications for window events @descr We are a listener on our container window to forward it to our component window. @@ -2551,7 +2547,6 @@ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& aEvent ) throw( implts_resizeComponentWindow(); } -//***************************************************************************************************************** void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -2575,7 +2570,7 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw( cs } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short notifications for window events @descr We are a listener on our container window to forward it to our component window ... but a XTopWindowListener we are only if we are a top frame! @@ -2612,7 +2607,6 @@ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& aEvent ) thr } } -//***************************************************************************************************************** void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -2663,7 +2657,6 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) t } } -//***************************************************************************************************************** void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { /* #i62088# @@ -2709,7 +2702,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css:: // Or if it will be reached it will be for sure that all your member are gone .-) } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short react for a show event for the internal container window @descr Normaly we don't need this information really. But we can use it to implement the special feature "trigger first visible task". @@ -2774,7 +2767,7 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un impl_checkMenuCloser(); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short called by dispose of our windows! @descr This object is forced to release all references to the interfaces given by the parameter source. We are a listener at our container window and @@ -2811,7 +2804,7 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( cs } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @interface com.sun.star.document.XActionLockable @short implement locking of frame/task from outside @descr Sometimes we have problems to decide if closing of task is allowed. Because; frame/task @@ -2837,7 +2830,6 @@ sal_Bool SAL_CALL Frame::isActionLocked() throw( css::uno::RuntimeException, std return( m_nExternalLockCount!=0); } -//***************************************************************************************************************** void SAL_CALL Frame::addActionLock() throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -2845,7 +2837,6 @@ void SAL_CALL Frame::addActionLock() throw( css::uno::RuntimeException, std::exc ++m_nExternalLockCount; } -//***************************************************************************************************************** void SAL_CALL Frame::removeActionLock() throw( css::uno::RuntimeException, std::exception ) { // Register no transaction here! Otherwhise we wait for ever inside possible @@ -2860,7 +2851,6 @@ void SAL_CALL Frame::removeActionLock() throw( css::uno::RuntimeException, std:: implts_checkSuicide(); } -//***************************************************************************************************************** void SAL_CALL Frame::setActionLocks( sal_Int16 nLock ) throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -2872,7 +2862,6 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock ) throw( css::uno::RuntimeE m_nExternalLockCount = m_nExternalLockCount + nLock; } -//***************************************************************************************************************** sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException, std::exception ) { // Register no transaction here! Otherwhise we wait for ever inside possible @@ -2894,7 +2883,7 @@ sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException, return nCurrentLocks; } -//***************************************************************************************************************** + void Frame::impl_initializePropInfo() { impl_setPropertyChangeBroadcaster(static_cast< css::frame::XFrame* >(this)); @@ -2935,7 +2924,7 @@ void Frame::impl_initializePropInfo() css::beans::PropertyAttribute::TRANSIENT)); } -//***************************************************************************************************************** + void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle , const css::uno::Any& aValue ) @@ -2995,7 +2984,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, } } -//***************************************************************************************************************** + css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { @@ -3042,7 +3031,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty* return aValue; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short dispose old container window and forget his reference @descr Sometimes we must repair our "modal dialog parent mechanism" too! @@ -3066,7 +3055,7 @@ void Frame::impl_disposeContainerWindow( css::uno::Reference< css::awt::XWindow } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short send frame action event to our listener @descr This method is threadsafe AND can be called by our dispose method too! @@ -3127,7 +3116,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short helper to resize our component window @descr A frame contains 2 windows - a container ~ and a component window. This method resize inner component window to full size of outer container window. @@ -3163,7 +3152,7 @@ void Frame::implts_resizeComponentWindow() } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short helper to set icon on our container window (if it is a system window!) @descr We use our internal set controller (if it exist) to specify which factory he represanted. These information can be used to find right icon. But our controller can say it us directly @@ -3258,7 +3247,7 @@ void Frame::implts_setIconOnWindow() } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short helper to start/stop listeneing for window events on container window @descr If we get a new container window, we must set it on internal member ... and stop listening at old one ... and start listening on new one! @@ -3312,7 +3301,7 @@ void Frame::implts_startWindowListening() } } -//***************************************************************************************************************** + void Frame::implts_stopWindowListening() { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -3352,7 +3341,7 @@ void Frame::implts_stopWindowListening() } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short helper to force breaked close() request again @descr If we self disagree with a close() request, and detect that all external locks are gone ... then we must try to close this frame again. @@ -3517,7 +3506,7 @@ void Frame::impl_checkMenuCloser() // debug methods -//***************************************************************************************************************** + // Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer! // And we accept frames only! No tasks and desktops! sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) @@ -3525,49 +3514,49 @@ sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XF return css::uno::Reference< css::frame::XDesktop >( xFrame, css::uno::UNO_QUERY ).is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent ) { return !aEvent.Source.is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent ) { return !aEvent.Source.is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); } -//***************************************************************************************************************** + sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 70e057f48a1d..bcde6a97300f 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -79,9 +79,9 @@ static const char *szWNTLicenseName = "/license"; static const char *szWNTLicenseExt = ".txt"; #endif -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + License::License( const Reference< XComponentContext >& rxContext ) // Init baseclasses first // Attention: @@ -96,16 +96,16 @@ License::License( const Reference< XComponentContext >& rxContext ) { } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + License::~License() { } -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + DEFINE_XSERVICEINFO_MULTISERVICE_2 ( License, OWeakObject , @@ -318,9 +318,9 @@ void SAL_CALL License::removeCloseListener(const css::uno::Reference< css::util: } -//************************************************************************ + // License Dialog -//************************************************************************ + LicenseDialog::LicenseDialog(const OUString & aLicensePath, ResMgr *pResMgr) : ModalDialog(NULL, ResId(DLG_LICENSE, *pResMgr)), diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index cbbeb85e6032..77c5e723bcef 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -27,17 +27,17 @@ namespace framework using namespace ::com::sun::star ; using namespace ::rtl ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) : m_xFactory( xFactory ) { } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + MediaTypeDetectionHelper::~MediaTypeDetectionHelper() { } @@ -53,9 +53,9 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper, } ) -//***************************************************************************************************************** + // XStringMapping -//***************************************************************************************************************** + sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq) throw (uno::RuntimeException, std::exception) diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index ae8c3f4d291e..6ef05ffea908 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -79,7 +79,7 @@ typedef ::boost::unordered_map< ::sal_Int32 , Int32HashCode , ::std::equal_to< ::sal_Int32 > > TTabPageInfoHash; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short implements a helper service providing a dockable tab control window *//*-*************************************************************************************************************/ @@ -202,9 +202,9 @@ DEFINE_XTYPEPROVIDER_6 ( TabWindowService , ) -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + TabWindowService::TabWindowService() // Init baseclasses first // Attention: @@ -235,9 +235,9 @@ void TabWindowService::initProperties() m_aTransactionManager.setWorkingMode( E_WORK ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + TabWindowService::~TabWindowService() { // SAFE-> @@ -247,9 +247,9 @@ TabWindowService::~TabWindowService() m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) ); } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + ::sal_Int32 SAL_CALL TabWindowService::insertTab() throw ( css::uno::RuntimeException, std::exception ) { @@ -264,9 +264,9 @@ TabWindowService::~TabWindowService() return nID; } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) @@ -283,9 +283,9 @@ void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) pTabWin->RemovePage(nID); } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 nID , const css::uno::Sequence< css::beans::NamedValue >& lProperties) throw (css::lang::IndexOutOfBoundsException, @@ -310,9 +310,9 @@ void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 } } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabProps(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) @@ -327,9 +327,9 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabPr return rInfo.m_lProperties; } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) @@ -346,9 +346,9 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) pTabWin->ActivatePage(nID); } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + ::sal_Int32 SAL_CALL TabWindowService::getActiveTabID() throw (css::uno::RuntimeException, std::exception) { @@ -357,27 +357,27 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) return m_nCurrentPageIndex; } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) throw (css::uno::RuntimeException, std::exception) { m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } -//***************************************************************************************************************** + // XSimpleTabController -//***************************************************************************************************************** + void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) throw (css::uno::RuntimeException, std::exception) { m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } -//***************************************************************************************************************** + // XComponent -//***************************************************************************************************************** + void SAL_CALL TabWindowService::dispose() throw (css::uno::RuntimeException, std::exception) { @@ -396,25 +396,25 @@ void SAL_CALL TabWindowService::dispose() m_xTabWin.clear(); } -//***************************************************************************************************************** + // XComponent -//***************************************************************************************************************** + void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) { m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } -//***************************************************************************************************************** + // XComponent -//***************************************************************************************************************** + void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) { m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } -//***************************************************************************************************************** + void TabWindowService::impl_initializePropInfo() { impl_setPropertyChangeBroadcaster(static_cast< css::awt::XSimpleTabController* >(this)); @@ -427,7 +427,7 @@ void TabWindowService::impl_initializePropInfo() css::beans::PropertyAttribute::TRANSIENT)); } -//***************************************************************************************************************** + void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 /*nHandle */, const css::uno::Any& /*aValue */) @@ -435,7 +435,7 @@ void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sPropert { } -//***************************************************************************************************************** + css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { @@ -458,9 +458,9 @@ css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& / return aValue; } -//***************************************************************************************************************** + // TabWindowService -//***************************************************************************************************************** + IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) { @@ -527,9 +527,9 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) return 0; } -//***************************************************************************************************************** + // TabWindowService -//***************************************************************************************************************** + void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException) { @@ -544,9 +544,9 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) } } -//***************************************************************************************************************** + // TabWindowService -//***************************************************************************************************************** + TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException) { diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 6af2e8e51b14..3f60751bd7a2 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -30,9 +30,9 @@ namespace framework { -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UriAbbreviation , ::cppu::OWeakObject , SERVICENAME_STRINGABBREVIATION , diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index e392e980bd07..25cd3f948159 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -123,9 +123,8 @@ namespace _rURL.Main = _rParser.GetMainURL( INetURLObject::NO_DECODE ); } } -//***************************************************************************************************************** + // XURLTransformer -//***************************************************************************************************************** sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) { // Safe impossible cases. @@ -176,9 +175,9 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css return sal_False; } -//***************************************************************************************************************** + // XURLTransformer -//***************************************************************************************************************** + sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol ) throw( css::uno::RuntimeException, std::exception ) { @@ -232,9 +231,8 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, } } -//***************************************************************************************************************** + // XURLTransformer -//***************************************************************************************************************** sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) { // Safe impossible cases. @@ -295,9 +293,9 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u return sal_False; } -//***************************************************************************************************************** + // XURLTransformer -//***************************************************************************************************************** + OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword ) throw( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 1469e1a53d1b..2e223256526b 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -45,9 +45,9 @@ using namespace com::sun::star; namespace framework { -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + DEFINE_XINTERFACE_11 ( TabWindow , ::cppu::OWeakObject , DIRECT_INTERFACE( css::lang::XTypeProvider ), diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index 48eeffd979ea..b5486723b5f9 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -43,9 +43,9 @@ using namespace com::sun::star::util; namespace framework { -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( TabWinFactory , ::cppu::OWeakObject , SERVICENAME_TABWINFACTORY , diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index bd6257e04bb7..4b52cbba2fa6 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -55,9 +55,9 @@ static const char GLOBALSETTINGS_PROPERTY_STATESENABLED[] = "StatesEnabled"; namespace framework { -//***************************************************************************************************************** + // Configuration access class for WindowState supplier implementation -//***************************************************************************************************************** + class GlobalSettings_Access : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< @@ -95,7 +95,7 @@ class GlobalSettings_Access : private ThreadHelpBase , }; -//***************************************************************************************************************** + GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : ThreadHelpBase(), @@ -272,9 +272,9 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() return sal_False; } -//***************************************************************************************************************** + // global class -//***************************************************************************************************************** + struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {}; static GlobalSettings_Access* pStaticSettings = 0; diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index c3f6f2df3a05..6a577b011592 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -119,9 +119,9 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces IdToInfoCache m_aIdCache; }; -//***************************************************************************************************************** + // XInterface, XTypeProvider -//***************************************************************************************************************** + ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) : m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ), diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index a1d78b2c42d3..96ec158c9c21 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -98,9 +98,9 @@ static const char* CONFIGURATION_PROPERTIES[] = 0 }; -//***************************************************************************************************************** + // Configuration access class for WindowState supplier implementation -//***************************************************************************************************************** + class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameContainer, XContainerListener > { @@ -221,7 +221,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo std::vector< OUString > m_aPropArray; }; -//***************************************************************************************************************** + ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString& aModuleName, const Reference< XComponentContext >& rxContext ) : m_aConfigWindowAccess( "/org.openoffice.Office.UI." ), diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 67ca57f3a945..f7ef370eb6ae 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -49,9 +49,9 @@ using namespace ::com::sun::star::ui; namespace framework { -//***************************************************************************************************************** + // XInterface, XTypeProvider -//***************************************************************************************************************** + DEFINE_XINTERFACE_11 ( MenuBarWrapper , UIConfigElementWrapperBase , DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index caf157bef312..6f36d557f110 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -144,7 +144,7 @@ throw ( RuntimeException, std::exception ) m_xReceiver->statusChanged( Event ); } -//***************************************************************************************************************** + static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) { @@ -178,9 +178,9 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager return xLayoutManager; } -//***************************************************************************************************************** + // XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** + ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index f7b5a357b491..aea23fa302d0 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -78,9 +78,9 @@ const sal_Int32 COMMAND_PROPERTY_MIRROR = 4; namespace framework { -//***************************************************************************************************************** + // Configuration access class for PopupMenuControllerFactory implementation -//***************************************************************************************************************** + class ConfigurationAccess_UICommand : // Order is necessary for right initialization! public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener> @@ -179,9 +179,9 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa sal_Bool m_bGenericDataRetrieved; }; -//***************************************************************************************************************** + // XInterface, XTypeProvider -//***************************************************************************************************************** + ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) : m_aConfigCmdAccess( CONFIGURATION_ROOT_ACCESS ), m_aConfigPopupAccess( CONFIGURATION_ROOT_ACCESS ), diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 05a679afb15f..3bd67f9dab05 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -56,9 +56,9 @@ OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aMo return aKey.makeStringAndClear(); } -//***************************************************************************************************************** + // XInterface, XTypeProvider -//***************************************************************************************************************** + ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const OUString& _sRoot,bool _bAskValue ) : ThreadHelpBase(), m_aPropCommand( "Command" ), |