diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:06:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 09:51:32 -0600 |
commit | 8792ec7b2129650777b7b4bfacaa7c13d923279b (patch) | |
tree | f181e37b61533b460397cc68625fd21f46bb6393 /include/framework | |
parent | dff29fadfe418421f2af9fd4f1dccc8a9b4cd545 (diff) |
Remove visual noise from include
Conflicts:
include/framework/preventduplicateinteraction.hxx
include/sfx2/sfxbasecontroller.hxx
include/sfx2/sfxbasemodel.hxx
include/toolkit/awt/vclxtabpagemodel.hxx
include/vcl/field.hxx
include/vcl/settings.hxx
Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/framework')
-rw-r--r-- | include/framework/addonsoptions.hxx | 62 | ||||
-rw-r--r-- | include/framework/documentundoguard.hxx | 12 | ||||
-rw-r--r-- | include/framework/framelistanalyzer.hxx | 8 | ||||
-rw-r--r-- | include/framework/iguard.hxx | 6 | ||||
-rw-r--r-- | include/framework/imutex.hxx | 8 | ||||
-rw-r--r-- | include/framework/interaction.hxx | 4 | ||||
-rw-r--r-- | include/framework/preventduplicateinteraction.hxx | 26 | ||||
-rw-r--r-- | include/framework/titlehelper.hxx | 30 | ||||
-rw-r--r-- | include/framework/undomanagerhelper.hxx | 20 |
9 files changed, 88 insertions, 88 deletions
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 49c1cfff2e57..6f0a0d43ff9a 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -27,11 +27,11 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ + // types, enums, ... -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @descr The method GetAddonsMenu() returns a list of property values. Use follow defines to separate values by names. *//*-*************************************************************************************************************/ @@ -113,11 +113,11 @@ struct FWE_DLLPUBLIC MergeStatusbarInstruction typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionContainer; -//_________________________________________________________________________________________________________________ + // forward declarations -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -126,7 +126,7 @@ typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionCont class AddonsOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about menu features @descr - @@ -138,16 +138,16 @@ class AddonsOptions_Impl; class FWE_DLLPUBLIC AddonsOptions { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -166,11 +166,11 @@ class FWE_DLLPUBLIC AddonsOptions AddonsOptions(); ~AddonsOptions(); - //--------------------------------------------------------------------------------------------------------- + // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short clears completely the addons menu @descr Call this methods to clear the addons menu To fill it again use AppendItem(). @@ -185,7 +185,7 @@ class FWE_DLLPUBLIC AddonsOptions void Clear(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short returns if an addons menu is available @descr Call to retrieve if a addons menu is available @@ -195,7 +195,7 @@ class FWE_DLLPUBLIC AddonsOptions sal_Bool HasAddonsMenu() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short returns number of addons toolbars @descr Call to retrieve the number of addons toolbars @@ -204,7 +204,7 @@ class FWE_DLLPUBLIC AddonsOptions *//*-*****************************************************************************************************/ sal_Int32 GetAddonsToolBarCount() const ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short returns the complete addons menu @descr Call it to get all entries of the addon menu. We return a list of all nodes with his names and properties. @@ -218,7 +218,7 @@ class FWE_DLLPUBLIC AddonsOptions const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenu() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets the menu bar part of all addon components registered @descr - @@ -231,7 +231,7 @@ class FWE_DLLPUBLIC AddonsOptions const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenuBarPart() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets a toolbar part of an single addon @descr - @@ -244,7 +244,7 @@ class FWE_DLLPUBLIC AddonsOptions const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsToolBarPart( sal_uInt32 nIndex ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets a unique toolbar resource name of an single addon @descr - @@ -257,7 +257,7 @@ class FWE_DLLPUBLIC AddonsOptions const OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Retrieves all available merge instructions for the Office menu bar @descr - @@ -270,7 +270,7 @@ class FWE_DLLPUBLIC AddonsOptions const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Retrieves all available merge instructions for a single toolbar @descr - @@ -282,7 +282,7 @@ class FWE_DLLPUBLIC AddonsOptions *//*-*****************************************************************************************************/ bool GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets the Add-On help menu part of all addon components registered @descr - @@ -296,7 +296,7 @@ class FWE_DLLPUBLIC AddonsOptions const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Retrieve an image for a command URL which is defined inside the addon menu configuration @descr Call it to retrieve an image for a command URL which is defined inside the addon menu configuration @@ -311,11 +311,11 @@ class FWE_DLLPUBLIC AddonsOptions Image GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; Image GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const; - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! @@ -331,7 +331,7 @@ class FWE_DLLPUBLIC AddonsOptions static ::osl::Mutex& GetOwnStaticMutex(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! @@ -346,9 +346,9 @@ class FWE_DLLPUBLIC AddonsOptions *//*-*****************************************************************************************************/ DECL_STATIC_LINK( AddonsOptions, Notify, void* ); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx index 3ae19e3c4ee7..905038cedb0c 100644 --- a/include/framework/documentundoguard.hxx +++ b/include/framework/documentundoguard.hxx @@ -26,14 +26,14 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... + namespace framework { -//...................................................................................................................... - //================================================================================================================== + + //= DocumentUndoGuard - //================================================================================================================== + struct DocumentUndoGuard_Data; /** a helper class guarding the Undo manager of a document @@ -54,9 +54,9 @@ namespace framework ::boost::scoped_ptr< DocumentUndoGuard_Data > m_pData; }; -//...................................................................................................................... + } // namespace framework -//...................................................................................................................... + #endif // INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index fa276ee82b11..1d132148190d 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -35,7 +35,7 @@ namespace framework{ */ class FWE_DLLPUBLIC FrameListAnalyzer { - //_______________________________________ + // types public: @@ -55,7 +55,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer E_ZOMBIE = 32768 // use it for special test scenarios only!!! }; - //_______________________________________ + // member public: @@ -152,7 +152,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer This value is undefined if m_eDetectMode doesn't have set the flag E_BACKINGCOMPONENT! */ sal_Bool m_bReferenceIsBacking; - //_______________________________________ + // interface public: @@ -178,7 +178,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer sal_uInt32 eDetectMode ); virtual ~FrameListAnalyzer(); - //_______________________________________ + // helper private: diff --git a/include/framework/iguard.hxx b/include/framework/iguard.hxx index f57fd3c8c9f3..46071b49e00b 100644 --- a/include/framework/iguard.hxx +++ b/include/framework/iguard.hxx @@ -24,14 +24,14 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr interface for guarding a lock *//*-*************************************************************************************************************/ class SAL_NO_VTABLE IGuard { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: /** clears the lock. If the guard does not currently hold the lock, nothing happens. diff --git a/include/framework/imutex.hxx b/include/framework/imutex.hxx index 39e9f50ebe39..7268db9d0737 100644 --- a/include/framework/imutex.hxx +++ b/include/framework/imutex.hxx @@ -24,17 +24,17 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr We need this interface to support using of different mutex implementations in a generic way. *//*-*************************************************************************************************************/ class SAL_NO_VTABLE IMutex { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @descr These functions must be supported by a derived class! acquire() -try to register thread release() -unregister thread diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx index 0b316fb6505d..2855f30edd4b 100644 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -39,7 +39,7 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short special request for interaction to ask user for right filter @descr These helper can be used to ask user for right filter, if filter detection failed. It capsulate communication with any interaction handler and supports an easy @@ -74,7 +74,7 @@ class FWE_DLLPUBLIC RequestFilterSelect com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short special request for interaction @descr User must decide between a preselected and another detected filter. It capsulate communication with any interaction handler and supports an easy diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 405f368298eb..3345537b4be3 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -54,7 +54,7 @@ struct ThreadHelpBase2 class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 ,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 > { - //_____________________________________ + // structs, types etcp. public: @@ -90,7 +90,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 typedef ::std::vector< InteractionInfo > InteractionList; - //_____________________________________ + // member private: @@ -106,11 +106,11 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 object was used.*/ InteractionList m_lInteractionRules; - //_____________________________________ + // uno interface public: - //_________________________________ + /** @interface XInteractionHandler @short called from outside to handle a problem @@ -124,7 +124,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) throw(css::uno::RuntimeException, std::exception); - //_________________________________ + /** @interface XInteractionHandler2 @short called from outside to handle a problem @@ -138,7 +138,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 virtual ::sal_Bool SAL_CALL handleInteractionRequest( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //_________________________________ + /** @interface XInterface @short called to query another interface of the component @@ -148,11 +148,11 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //_____________________________________ + // c++ interface public: - //_________________________________ + /** @short ctor to guarantee right initialized instances of this class @descr It uses the given uno service manager to create the global @@ -165,13 +165,13 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ PreventDuplicateInteraction(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //_________________________________ + /** @short dtor to free used memory. */ virtual ~PreventDuplicateInteraction(); - //_________________________________ + /** @short set the outside interaction handler, which must be used internally if the interaction will not be blocked by the set list of rules. @@ -183,7 +183,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual void setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler); - //_________________________________ + /** @short instead of setting an outside interaction handler, this method make sure the default UUI interaction handler of the office is used. @@ -192,7 +192,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual void useDefaultUUIHandler(); - //_________________________________ + /** @short add a new interaction to the list of interactions, which must be handled by this helper. @@ -210,7 +210,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual void addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo); - //_________________________________ + /** @short return the info struct for the specified interaction. diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 2980f40b5b6d..361c83e83971 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -58,21 +58,21 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex css::frame::XFrameActionListener , css::document::XEventListener > { - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short lightweight constructor. */ TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** @short free all internally used resources. */ virtual ~TitleHelper(); - //--------------------------------------- + /** set an outside component which uses this container and must be set as source of all broadcasted messages, exceptions. @@ -86,7 +86,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex */ void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner); - //--------------------------------------- + /** set an outside component which provides the righht string and number for an untitled component. @@ -100,47 +100,47 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex */ void connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers); - //--------------------------------------- + /** @see XTitle */ virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitle */ virtual void SAL_CALL setTitle(const OUString& sTitle) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitleChangeListener */ virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see css.document.XEventListener */ virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see css.lang.XEventListener */ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see css.frame.XFrameActionListener */ virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception); - //------------------------------------------- + // internal private: @@ -167,7 +167,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex OUString impl_convertURL2Title(const OUString& sURL); - //------------------------------------------- + // member private: diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx index fe71eacb9a17..8c0c42897bb2 100644 --- a/include/framework/undomanagerhelper.hxx +++ b/include/framework/undomanagerhelper.hxx @@ -34,14 +34,14 @@ namespace svl class IUndoManager; } -//...................................................................................................................... + namespace framework { -//...................................................................................................................... - //================================================================================================================== + + //= IMutexGuard - //================================================================================================================== + class SAL_NO_VTABLE IMutexGuard : public IGuard { public: @@ -55,9 +55,9 @@ namespace framework ~IMutexGuard() {} }; - //================================================================================================================== + //= IUndoManagerImplementation - //================================================================================================================== + class SAL_NO_VTABLE IUndoManagerImplementation { public: @@ -80,9 +80,9 @@ namespace framework ~IUndoManagerImplementation() {} }; - //================================================================================================================== + //= UndoManagerHelper - //================================================================================================================== + class UndoManagerHelper_Impl; /** helper class for implementing an XUndoManager @@ -150,9 +150,9 @@ namespace framework ::boost::scoped_ptr< UndoManagerHelper_Impl > m_pImpl; }; -//...................................................................................................................... + } // namespace framework -//...................................................................................................................... + #endif // INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX |