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/sfx2 | |
| 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/sfx2')
42 files changed, 307 insertions, 310 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 5fb236529461..38a81548a9c7 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -30,15 +30,15 @@ #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <vector> -//________________________________________________________________________________________________________________ + // some other includes -//________________________________________________________________________________________________________________ + #include <sfx2/viewfrm.hxx> -//________________________________________________________________________________________________________________ + // forwards, typedefs, declarations -//________________________________________________________________________________________________________________ + class SystemWindow; class SfxSlot; @@ -74,7 +74,7 @@ enum SfxPopupAction SFX_POPUP_SHOW }; -//==================================================================== + class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster /* [Description] @@ -215,7 +215,7 @@ public: #define DLEAVEREGISTRATIONS() LeaveRegistrations() #endif -//-------------------------------------------------------------------- + inline bool SfxBindings::IsInRegistrations() const @@ -240,7 +240,7 @@ inline bool SfxBindings::IsInRegistrations() const return 0 != nRegLevel; } -//-------------------------------------------------------------------- + #endif diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 83a85e94c3bb..e0de7c7bef92 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -228,7 +228,7 @@ public: SAL_DLLPRIVATE void SetFactory_Impl( SfxChildWinFactory* ); }; -//------------------------------------------------------------------ + //! soon obsolete ! #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \ static SfxChildWindowContext* CreateImpl(::Window *pParent, \ @@ -364,7 +364,7 @@ public: ((SfxToolbox*)GetWindow())->FillInfo( aInfo ); \ return aInfo; } -//------------------------------------------------------------------ + #endif diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index fcf94f2dec8c..96dfd7280123 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -33,20 +33,20 @@ #include <svtools/valueset.hxx> #include <svtools/ctrlbox.hxx> -// ============================================================================ + namespace sfx { -// ============================================================================ + /** List position type of VCL ListBox. */ typedef sal_uInt16 ListBoxPosType; /** List position type of SVTOOLS ValueSet. */ typedef sal_uInt16 ValueSetPosType; -// ============================================================================ + // Helpers -// ============================================================================ + /** A helper class for mapping list positions from/to represented values. @@ -99,9 +99,9 @@ private: PosT mnNFPos; /// Special "not found" list position. }; -// ============================================================================ + // Base control wrapper classes -// ============================================================================ + /** Base class for all control wrappers. @@ -167,9 +167,9 @@ private: ControlWrapperBase& operator=( const ControlWrapperBase& ); }; -// ============================================================================ + // Single control wrappers -// ============================================================================ + /** Base class template for control wrappers containing one single control. @@ -212,7 +212,7 @@ private: ControlT& mrControl; /// The control of this wrapper. }; -// ============================================================================ + /** A dummy wrapper for a VCL Window that does nothing special. @@ -233,7 +233,7 @@ public: virtual void SetControlValue( void* ); }; -// ---------------------------------------------------------------------------- + /** A wrapper for the VCL CheckBox. */ class SFX2_DLLPUBLIC CheckBoxWrapper: @@ -249,7 +249,7 @@ public: virtual void SetControlValue( sal_Bool bValue ); }; -// ---------------------------------------------------------------------------- + /** A wrapper for the SVTOOLS ColorListBox. */ class SFX2_DLLPUBLIC ColorListBoxWrapper: @@ -270,7 +270,7 @@ public: virtual void SetControlValue( Color aColor ); }; -// ============================================================================ + /** A wrapper for the VCL NumericField. */ template< typename ValueT > @@ -287,7 +287,7 @@ public: virtual void SetControlValue( ValueT nValue ); }; -// ---------------------------------------------------------------------------- + typedef NumericFieldWrapper< sal_Int16 > Int16NumericFieldWrapper; typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper; @@ -297,7 +297,7 @@ typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper; typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper; typedef NumericFieldWrapper< sal_uIntPtr > ULongNumericFieldWrapper; -// ============================================================================ + /** A wrapper for the VCL MetricField. @@ -322,7 +322,7 @@ private: FieldUnit meUnit; }; -// ---------------------------------------------------------------------------- + typedef MetricFieldWrapper< sal_Int16 > Int16MetricFieldWrapper; typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper; @@ -332,7 +332,7 @@ typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper; typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper; typedef MetricFieldWrapper< sal_uIntPtr > ULongMetricFieldWrapper; -// ============================================================================ + /** A wrapper for the VCL ListBox. @@ -364,7 +364,7 @@ public: virtual void SetControlValue( ValueT nValue ); }; -// ---------------------------------------------------------------------------- + typedef ListBoxWrapper< sal_Int16 > Int16ListBoxWrapper; typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper; @@ -374,7 +374,7 @@ typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper; typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper; typedef ListBoxWrapper< sal_uIntPtr > ULongListBoxWrapper; -// ============================================================================ + /** A wrapper for the SVTOOLS ValueSet. @@ -406,7 +406,7 @@ public: virtual void SetControlValue( ValueT nValue ); }; -// ---------------------------------------------------------------------------- + typedef ValueSetWrapper< sal_Int16 > Int16ValueSetWrapper; typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper; @@ -416,9 +416,9 @@ typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper; typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper; typedef ValueSetWrapper< sal_uIntPtr > ULongValueSetWrapper; -// ============================================================================ + // Multi control wrappers -// ============================================================================ + struct MultiControlWrapperHelper_Impl; @@ -451,7 +451,7 @@ private: std::auto_ptr< MultiControlWrapperHelper_Impl > mxImpl; }; -// ---------------------------------------------------------------------------- + /** A multi control wrapper with extended interface. @@ -488,16 +488,16 @@ private: ValueT maDefValue; }; -// ============================================================================ -// ============================================================================ + + // *** Implementation of template functions *** -// ============================================================================ -// ============================================================================ + + // Helpers -// ============================================================================ + template< typename PosT, typename ValueT > ValueT PosValueMapper< PosT, ValueT >::GetValueFromPos( PosT nPos ) const @@ -535,9 +535,9 @@ PosT PosValueMapper< PosT, ValueT >::GetPosFromValue( ValueT nValue ) const return nPos; } -// ============================================================================ + // Single control wrappers -// ============================================================================ + template< typename ControlT, typename ValueT > inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eEnable, TriState eShow ) @@ -548,7 +548,7 @@ inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eE mrControl.Show( eShow == TRISTATE_TRUE ); } -// ============================================================================ + template< typename ValueT > bool NumericFieldWrapper< ValueT >::IsControlDontKnow() const @@ -575,7 +575,7 @@ void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SetValue( this->GetControl().Normalize( static_cast< sal_Int64 >( nValue ) ) ); } -// ============================================================================ + template< typename ValueT > bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const @@ -602,7 +602,7 @@ void MetricFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SetValue( this->GetControl().Normalize( static_cast< sal_Int64 >( nValue ) ), meUnit ); } -// ============================================================================ + template< typename ValueT > ValueT ListBoxWrapper< ValueT >::GetControlValue() const @@ -618,7 +618,7 @@ void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SelectEntryPos( nPos ); } -// ---------------------------------------------------------------------------- + template< typename ValueT > ValueT ValueSetWrapper< ValueT >::GetControlValue() const @@ -634,7 +634,7 @@ void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SelectItem( nPos ); } -// ============================================================================ + } // namespace sfx diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 91bde6c834bc..c693fc961cf6 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -80,7 +80,7 @@ public: SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* ); }; -//==================================================================== + class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem { diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index fbc9ff2d1de2..74a3af3cd4a8 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -23,7 +23,7 @@ class VclBuilderContainer; //right, get both of their non-preview areas to request the same size so that //the preview appears in the same place in each one so flipping between tabs //isn't distracting as it jumps around -// + //there has to be a "maingrid" container which contains all the widgets //except for the preview widget void SFX2_DLLPUBLIC setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage); diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 49e4c1d58711..6c7e175abdf1 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -54,13 +54,13 @@ namespace com } } -//========================================================================= + #define SFX_SHELL_POP_UNTIL 4 #define SFX_SHELL_POP_DELETE 2 #define SFX_SHELL_PUSH 1 -//========================================================================= + class SFX2_DLLPUBLIC SfxDispatcher { diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 095691c5b9d9..016f94a3f0b7 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -29,14 +29,14 @@ #include <boost/shared_ptr.hpp> -//........................................................................ + namespace sfx2 { -//........................................................................ - //==================================================================== + + //= IMacroDocumentAccess - //==================================================================== + /** provides access to several settings of a document, which are needed by ->DocumentMacroMode to properly determine the current macro execution mode of this document */ @@ -186,9 +186,9 @@ namespace sfx2 ~IMacroDocumentAccess() {} }; - //==================================================================== + //= DocumentMacroMode - //==================================================================== + struct DocumentMacroMode_Data; /** encapsulates handling the macro mode of a document @@ -319,9 +319,9 @@ namespace sfx2 ::boost::shared_ptr< DocumentMacroMode_Data > m_pData; }; -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_DOCMACROMODE_HXX diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index 3be4a5ef30b2..21d13a60884d 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -28,14 +28,14 @@ namespace comphelper { class SolarMutex; } -//........................................................................ + namespace sfx2 { -//........................................................................ - //==================================================================== + + //= IModifiableDocument - //==================================================================== + /** callback for the DocumentStorageModifyListener class */ class SAL_NO_VTABLE IModifiableDocument @@ -48,9 +48,9 @@ namespace sfx2 ~IModifiableDocument() {} }; - //==================================================================== + //= DocumentStorageModifyListener - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::util::XModifyListener > DocumentStorageModifyListener_Base; class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base @@ -78,9 +78,9 @@ namespace sfx2 DocumentStorageModifyListener& operator=( const DocumentStorageModifyListener& ); // never implemented }; -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 8fa2391bd469..2bebdddc6d01 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -33,7 +33,7 @@ class SfxObjectShell; -//------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { @@ -59,7 +59,7 @@ public: { return pObjShell; } }; -//------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint { @@ -82,7 +82,7 @@ public: { return xViewController; } }; -//------------------------------------------------------------------- + class SfxNamedHint : public SfxHint { diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 8cdd19ea22c6..0f7f20d73603 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -94,7 +94,7 @@ public: void AddEvent( const OUString&, const OUString&, sal_uInt16 ); }; -// ----------------------------------------------------------------------- + #define PROP_EVENT_TYPE "EventType" #define PROP_LIBRARY "Library" diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 94bee5ffa9b6..d44e11482e60 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -86,7 +86,7 @@ typedef ::std::vector<OUString> TargetList; #define SFXFRAME_HASTITLE 0x0001 -//========================================================================== + // SfxFrame is a management class for windows and their content. // A SfxApplication represent a hierarchy of SfxFrames, with which the actual // content in the derived classes is defined. The base class SfxFrame @@ -96,7 +96,7 @@ typedef ::std::vector<OUString> TargetList; // parent. By calling DoCloser() on any frame in the hierarchy, // a part of the "framework" can be removed, where frames unsubscribe // from their parent frames. -//========================================================================== + class SFX2_DLLPUBLIC SfxFrame { @@ -224,7 +224,7 @@ public: SfxFrame* NextFrame( SfxFrame& rPrev ); }; -//-------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index c6452b1bd829..ebc40e4cb432 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -32,7 +32,7 @@ struct SfxFrameDescriptor_Impl; class SfxFrameDescriptor; class Wallpaper; -//=========================================================================== + // The SfxFrame descriptors build a recursive structure, that covers all the // required data in-order to display the frame document. // Through a SfxFrameSetDescriptor access is given to the whole underlying @@ -41,7 +41,7 @@ class Wallpaper; // describes the view on it. The FrameSet is made up of lines, which in turn, // contains the actual window . A line can be horizontally or vertically // aligned, from which also the alignment of the FrameSet is given. -//=========================================================================== + enum ScrollingMode { diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index b9aca77fc3f2..f840f9619b23 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -22,11 +22,11 @@ #include <sfx2/genlink.hxx> #include <tools/ref.hxx> -//=================================================================== + class SfxHint; -//------------------------------------------------------------------- + class SfxHintPoster: public SvRefBase @@ -59,7 +59,7 @@ public: void SetEventHdl( const GenLink& rLink ); }; -//------------------------------------------------------------------- + SV_DECL_IMPL_REF(SfxHintPoster); diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 9550d3b64ed8..3c5864d03f7e 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -36,7 +36,7 @@ class SfxObjectShell; class Window; class Fraction; -//========================================================================= + class SFX2_DLLPUBLIC SfxInPlaceClient { diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 05126e05cdf4..789a7085cab6 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -29,11 +29,11 @@ #include <sfx2/itemwrapper.hxx> #include <sfx2/controlwrapper.hxx> -// ============================================================================ + namespace sfx { -// ============================================================================ + typedef int ItemConnFlags; @@ -55,9 +55,9 @@ const ItemConnFlags ITEMCONN_HIDE_UNKNOWN = 0x0080; /** Default value for constructors. */ const ItemConnFlags ITEMCONN_DEFAULT = ITEMCONN_NONE; -// ============================================================================ + // Base connection classes -// ============================================================================ + /** A helper for SfxTabPages to connect controls to items. @@ -221,7 +221,7 @@ private: ItemConnFlags mnFlags; /// Flags for additional options. }; -// ---------------------------------------------------------------------------- + /** Base class template for single item <-> single control connection objects. @@ -271,9 +271,9 @@ protected: ControlWrapperRef mxCtrlWrp; }; -// ============================================================================ + // Standard connections -// ============================================================================ + /** This is a helper class to enable/disable/show/hide a control only. @@ -298,12 +298,12 @@ private: sal_uInt16 mnSlot; }; -// ---------------------------------------------------------------------------- + /** Connection between an SfxBoolItem and a VCL CheckBox. */ typedef ItemControlConnection< BoolItemWrapper, CheckBoxWrapper > CheckBoxConnection; -// ============================================================================ + /** Connection between an item and the VCL NumericField. */ template< typename ItemWrpT > @@ -321,14 +321,14 @@ public: ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef NumericConnection< Int16ItemWrapper > Int16NumericConnection; typedef NumericConnection< UInt16ItemWrapper > UInt16NumericConnection; typedef NumericConnection< Int32ItemWrapper > Int32NumericConnection; typedef NumericConnection< UInt32ItemWrapper > UInt32NumericConnection; -// ============================================================================ + /** Connection between an item and the VCL MetricField. @@ -352,14 +352,14 @@ public: FieldUnit eItemUnit = FUNIT_NONE, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef MetricConnection< Int16ItemWrapper > Int16MetricConnection; typedef MetricConnection< UInt16ItemWrapper > UInt16MetricConnection; typedef MetricConnection< Int32ItemWrapper > Int32MetricConnection; typedef MetricConnection< UInt32ItemWrapper > UInt32MetricConnection; -// ============================================================================ + /** Connection between an item and a VCL ListBox. @@ -384,14 +384,14 @@ public: const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef ListBoxConnection< Int16ItemWrapper > Int16ListBoxConnection; typedef ListBoxConnection< UInt16ItemWrapper > UInt16ListBoxConnection; typedef ListBoxConnection< Int32ItemWrapper > Int32ListBoxConnection; typedef ListBoxConnection< UInt32ItemWrapper > UInt32ListBoxConnection; -// ============================================================================ + /** Connection between an item and an SVTOOLS ValueSet. @@ -416,16 +416,16 @@ public: const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef ValueSetConnection< Int16ItemWrapper > Int16ValueSetConnection; typedef ValueSetConnection< UInt16ItemWrapper > UInt16ValueSetConnection; typedef ValueSetConnection< Int32ItemWrapper > Int32ValueSetConnection; typedef ValueSetConnection< UInt32ItemWrapper > UInt32ValueSetConnection; -// ============================================================================ + // Array of connections -// ============================================================================ + class ItemConnectionArrayImpl; @@ -455,15 +455,15 @@ private: std::auto_ptr< ItemConnectionArrayImpl > mxImpl; }; -// ============================================================================ -// ============================================================================ + + // *** Implementation of template functions *** -// ============================================================================ -// ============================================================================ + + // Base connection classes -// ============================================================================ + template< typename ItemWrpT, typename ControlWrpT > ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection( @@ -533,9 +533,9 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet( return bChanged; } -// ============================================================================ + // Standard connections -// ============================================================================ + template< typename ItemWrpT > NumericConnection< ItemWrpT >::NumericConnection( @@ -544,7 +544,7 @@ NumericConnection< ItemWrpT >::NumericConnection( { } -// ============================================================================ + template< typename ItemWrpT > MetricConnection< ItemWrpT >::MetricConnection( @@ -553,7 +553,7 @@ MetricConnection< ItemWrpT >::MetricConnection( { } -// ============================================================================ + template< typename ItemWrpT > ListBoxConnection< ItemWrpT >::ListBoxConnection( @@ -562,7 +562,7 @@ ListBoxConnection< ItemWrpT >::ListBoxConnection( { } -// ============================================================================ + template< typename ItemWrpT > ValueSetConnection< ItemWrpT >::ValueSetConnection( @@ -571,7 +571,7 @@ ValueSetConnection< ItemWrpT >::ValueSetConnection( { } -// ============================================================================ + } // namespace sfx diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index d8ffedb3a5e8..21424acf6467 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -27,13 +27,13 @@ #include <svl/intitem.hxx> #include <svl/itemset.hxx> -// ============================================================================ + namespace sfx { -// ============================================================================ + // Helpers -// ============================================================================ + class SFX2_DLLPUBLIC ItemWrapperHelper { @@ -55,9 +55,9 @@ public: static void RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot ); }; -// ============================================================================ + // Item wrappers -// ============================================================================ + /** Base class wrapping a single item. @@ -120,7 +120,7 @@ private: sal_uInt16 mnSlot; /// The SID of this item wrapper. }; -// ============================================================================ + /** An item wrapper usable for most types of items. @@ -147,7 +147,7 @@ public: { rItem.SetValue( static_cast< InternalValueT >( aValue ) ); } }; -// ---------------------------------------------------------------------------- + typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; typedef ValueItemWrapper< SfxInt16Item, sal_Int16 > Int16ItemWrapper; @@ -156,7 +156,7 @@ typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 > UInt32ItemWrapper; typedef ValueItemWrapper< SfxStringItem, const OUString& > StringItemWrapper; -// ============================================================================ + /** An item wrapper that uses the item itself as value. */ template< typename ItemT > @@ -174,16 +174,16 @@ public: { rItem = rValue; } }; -// ============================================================================ -// ============================================================================ + + // *** Implementation of template functions *** -// ============================================================================ -// ============================================================================ + + // Item wrappers -// ============================================================================ + template< typename ItemT, typename ValueT > const ItemT* SingleItemWrapper< ItemT, ValueT >::GetUniqueItem( const SfxItemSet& rItemSet ) const @@ -197,7 +197,7 @@ const ItemT& SingleItemWrapper< ItemT, ValueT >::GetDefaultItem( const SfxItemSe return static_cast< const ItemT& >( ItemWrapperHelper::GetDefaultItem( rItemSet, mnSlot ) ); } -// ============================================================================ + } // namespace sfx diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 4624026a059e..1a5c91168db7 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -75,7 +75,7 @@ public: void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); }; -//-------------------------------------------------------------------- + class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 2e0aac28796e..ab52672dee23 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -54,7 +54,7 @@ class Window; namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } -//==================================================================== + class SFX2_DLLPUBLIC SfxModule : public SfxShell { diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index f48284cbbb4d..8bd6d0baaf38 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -25,7 +25,7 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -//-------------------------------------------------------------------- + #define SFX_SLOT_CACHABLE 0x0001L // exclusiv to VOLATILE, default #define SFX_SLOT_VOLATILE 0x0002L // per Timer every 2s get new, @@ -73,7 +73,7 @@ #define SFX_SLOT_IMAGEREFLECTION 0x800000L // Mirror image on Vertical/ // Bi-directional writing -//-------------------------------------------------------------------- + class SfxRequest; class SfxItemSet; @@ -99,7 +99,7 @@ class SfxItemSet; #define SFX_STUB_PTR_STATE_NONE &SfxShell::EmptyStateStub -//-------------------------------------------------------------------- + enum SfxSlotKind { @@ -108,7 +108,7 @@ enum SfxSlotKind SFX_KIND_ATTR }; -//========================================================================= + struct SfxTypeAttrib { @@ -213,7 +213,7 @@ SFX_DECL_TYPE(18); // for SvxSearchItem #define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \ { (const SfxType*) &a##ArgTypeId##_Impl, ArgName, ArgSlotId } -//-------------------------------------------------------------------- + class SfxPoolItem; @@ -229,7 +229,7 @@ struct SfxFormalArgument { return (SfxPoolItem*) pType->aTypeId(); } }; -//-------------------------------------------------------------------- + class SfxSlot { @@ -286,7 +286,7 @@ public: const SfxSlot* GetNextSlot() const { return pNextSlot; } }; -//========================================================================= + // returns the id of the function @@ -294,7 +294,7 @@ inline sal_uInt16 SfxSlot::GetSlotId() const { return nSlotId; } -//-------------------------------------------------------------------- + // returns the help-id of the slot inline sal_uIntPtr SfxSlot::GetHelpId() const @@ -302,7 +302,7 @@ inline sal_uIntPtr SfxSlot::GetHelpId() const return nHelpId; } -//-------------------------------------------------------------------- + // returns a bitfield with flags @@ -310,7 +310,7 @@ inline sal_uIntPtr SfxSlot::GetMode() const { return nFlags; } -//-------------------------------------------------------------------- + // determines if the specified mode is assigned @@ -318,7 +318,7 @@ inline sal_Bool SfxSlot::IsMode( sal_uIntPtr nMode ) const { return (nFlags & nMode) != 0; } -//-------------------------------------------------------------------- + // returns the id of the associated group diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index 9f0a4eb84c4e..be61a4cf041a 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -66,7 +66,7 @@ public: TypeId GetSlotType( sal_uInt16 nSlotId ) const; }; -//-------------------------------------------------------------------- + // seeks to the first func in the current group diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index a631653fa7fe..3b0a91607e30 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -28,13 +28,13 @@ #include <vcl/fixed.hxx> #include <sfx2/basedlgs.hxx> -//========================================================================= + class SfxObjectShellLock; class SfxObjectShell; class MoreButton; -//========================================================================= + #define SFXWB_PREVIEW 0x0003 #define SFXWB_LOAD_TEMPLATE 0x0004 diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index c54329f8c6c0..20c7d7689829 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -98,7 +98,7 @@ public: { return aNameResId.GetResMgr(); } }; -//-------------------------------------------------------------------- + // returns the number of functions in this cluster @@ -107,7 +107,7 @@ inline sal_uInt16 SfxInterface::Count() const return nCount; } -//-------------------------------------------------------------------- + // returns a function by position in the array diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index bee41067faf8..f19caa357790 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -25,7 +25,7 @@ #include <sfx2/shell.hxx> -//------------------------------------------------------------------------ + class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem { diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index a62cbb47f7ea..91cdfec9bb5c 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -31,9 +31,9 @@ #include <sfx2/tabdlg.hxx> -// -------------------------------- + // - SfxCommonPrintOptionsTabPage - -// -------------------------------- + class SvtBasePrintOptions; diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 1d8575470d49..15a9a2881437 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -29,7 +29,7 @@ class SfxViewShell; -// ------------------------------------------------------------------------ + struct SfxPrintOptDlg_Impl; class SfxPrintOptionsDialog : public ModalDialog diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 8f656dd0967a..55f7f1c86f0f 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -38,7 +38,7 @@ class SfxSlot; class SfxViewFrame; struct SfxRequest_Impl; -//================================================================== + class SFX2_DLLPUBLIC SfxRequest: public SfxHint { @@ -48,7 +48,7 @@ friend struct SfxRequest_Impl; SfxAllItemSet* pArgs; SfxRequest_Impl* pImp; - //--------------------------------------------------------------------- + public: SAL_DLLPRIVATE void Record_Impl( SfxShell &rSh, const SfxSlot &rSlot, com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder, @@ -56,7 +56,7 @@ public: private: SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet ); - //--------------------------------------------------------------------- + public: SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); @@ -110,7 +110,7 @@ private: const SfxRequest& operator=(const SfxRequest &); // n.i.!! }; -//------------------------------------------------------------------------ + #define SFX_REQUEST_ARG(rReq, pItem, ItemType, nSlotId, bDeep) \ const ItemType *pItem = (const ItemType*) \ diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 6529c5af6781..5a21d82d09b7 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -27,7 +27,7 @@ #define RID_GROUPS_SFXOFFSET 32700 #define RID_GROUPS_END 32767 -//-------------------------------------------------------------------- + #define EVENT_SFX_START 5000 // EVENT_SFX_END 9999 @@ -84,7 +84,7 @@ #define SFX_EVENT_MOUSECLICK_OBJECT ( EVENT_SFX_START + 101 ) #define SFX_EVENT_MOUSEOUT_OBJECT ( EVENT_SFX_START + 102 ) -//-------------------------------------------------------------------- + #define RID_SFX_APP_START (RID_SFX_START + 256) #define RID_SFX_MENU_START (RID_SFX_START + 768) @@ -104,7 +104,7 @@ // RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800) // RID_SFX_HELPCOMPONENT_START (RID_SFX_START + 7000) -//-------------------------------------------------------------------- + #define SFX_OBJECTBAR_APPLICATION 0 #define SFX_OBJECTBAR_OBJECT 1 @@ -185,13 +185,13 @@ #define SFX_FILE_THUMBNAIL_MATH (RID_SFX_START+167) #define SFX_FILE_THUMBNAIL_DEFAULT (RID_SFX_START+168) -//========================================================================= + // group ids -//========================================================================= + // !! If you add a new group, please change sfxbasecontroller.cxx and // !! com.sun.star.frame.CommandGroup accordingly! -//========================================================================= + #define GID_INTERN (RID_GROUPS_SFXOFFSET+ 0) #define GID_APPLICATION (RID_GROUPS_SFXOFFSET+ 1) @@ -221,7 +221,7 @@ #define GID_CONTROLS (RID_GROUPS_SFXOFFSET+25) #define GID_NAVIGATION (RID_GROUPS_SFXOFFSET+26) -// ========================================================================= + #define RID_OPTIONS_START (SID_LIB_START + 2000) // RID_OPTIONS_END (RID_OPTIONS_START + 100) diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index b9396e4e4898..aba163fa2166 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -56,9 +56,9 @@ class SfxViewFrame; sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID ); -//________________________________________________________________________________________________________ + // class declarations -//________________________________________________________________________________________________________ + typedef ::cppu::WeakImplHelper9 < css::frame::XController2 , css::frame::XControllerBorder @@ -74,15 +74,15 @@ typedef ::cppu::WeakImplHelper9 < css::frame::XController2 class SFX2_DLLPUBLIC SfxBaseController :public SfxBaseController_Base ,public ::cppu::BaseMutex { -//________________________________________________________________________________________________________ + // public methods -//________________________________________________________________________________________________________ + public: - //____________________________________________________________________________________________________ + // constructor/destructor - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -119,16 +119,15 @@ public: css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XController2 - //____________________________________________________________________________________________________ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XController - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -235,9 +234,9 @@ public: css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XDispatchProvider - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -271,18 +270,18 @@ public: virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XControllerBorder - //____________________________________________________________________________________________________ + virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XComponent - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -336,9 +335,8 @@ public: virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XDispatchInformationProvider - //____________________________________________________________________________________________________ virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception); @@ -371,9 +369,9 @@ private: DECL_LINK( CheckOutHandler, void * ); -//________________________________________________________________________________________________________ + // private variables -//________________________________________________________________________________________________________ + private: diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 8b5b17a0e02c..ecd0b269dd70 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -104,9 +104,9 @@ struct IMPL_SfxBaseModel_DataContainer ; // impl. struct to hold member o namespace sfx { namespace intern { class ViewCreationGuard; } } -//________________________________________________________________________________________________________ + // class declarations -//________________________________________________________________________________________________________ + /**_______________________________________________________________________________________________________ @short - @@ -172,15 +172,15 @@ class SFX2_DLLPUBLIC SfxBaseModel : protected ::cppu::BaseMutex , public SfxListener { -//________________________________________________________________________________________________________ + // public methods -//________________________________________________________________________________________________________ + public: - //____________________________________________________________________________________________________ + // constructor/destructor - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -212,9 +212,9 @@ public: virtual ~SfxBaseModel() ; - //____________________________________________________________________________________________________ + // XInterface - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short give answer, if interface is supported @@ -263,9 +263,9 @@ public: virtual void SAL_CALL release() throw() ; - //____________________________________________________________________________________________________ + // XTypeProvider - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short get information about supported interfaces @@ -299,9 +299,9 @@ public: virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XStarBasicAccess - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @seealso XStarBasicAccess @@ -330,9 +330,9 @@ public: throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XChild - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -365,9 +365,9 @@ public: virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XComponent - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -419,9 +419,9 @@ public: SAL_CALL getDocumentProperties() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XEventListener - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -438,9 +438,9 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XModel - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -610,9 +610,9 @@ public: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XModel2 - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers() throw (css::uno::RuntimeException, std::exception); @@ -631,9 +631,9 @@ public: css::lang::IllegalArgumentException, css::uno::Exception, std::exception ); - //____________________________________________________________________________________________________ + // XModifiable2 - //____________________________________________________________________________________________________ + virtual ::sal_Bool SAL_CALL disableSetModified( ) throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL enableSetModified( ) throw (css::uno::RuntimeException, std::exception); @@ -700,29 +700,29 @@ public: virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XCloseable - //____________________________________________________________________________________________________ + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XCloseBroadcaster - //____________________________________________________________________________________________________ + virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XPrintJobBroadcaster - //____________________________________________________________________________________________________ + virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XPrintable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -770,16 +770,16 @@ public: virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XStorable2 - //____________________________________________________________________________________________________ + virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XStorable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -877,9 +877,9 @@ public: - //____________________________________________________________________________________________________ + // XLoadable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -919,9 +919,9 @@ public: css::uno::RuntimeException, css::uno::Exception, std::exception); - //____________________________________________________________________________________________________ + // XDocumentSubStorageSupplier - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw ( css::uno::RuntimeException, std::exception ); @@ -929,9 +929,9 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames() throw ( css::io::IOException, css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XStorageBasedDocument - //____________________________________________________________________________________________________ + virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) @@ -967,9 +967,9 @@ public: const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XVisualObject - //____________________________________________________________________________________________________ + virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) throw ( css::lang::IllegalArgumentException, @@ -993,20 +993,19 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XScriptProviderSupplier - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XUIConfigurationManagerSupplier - //____________________________________________________________________________________________________ virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XTransferable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1060,9 +1059,9 @@ public: throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XEventsSupplier - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1080,23 +1079,23 @@ public: virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XEmbeddedScripts - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XScriptInvocationContext - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XEventBroadcaster - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1128,17 +1127,17 @@ public: virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XDocumentEventBroadcaster - //____________________________________________________________________________________________________ + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XUnoTunnel - //____________________________________________________________________________________________________ + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception); @@ -1200,7 +1199,7 @@ public: // css.document.XUndoManagerSupplier virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() @@ -1337,9 +1336,9 @@ public: sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); - //____________________________________________________________________________________________________ + // SfxListener - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1357,9 +1356,9 @@ public: void Notify( SfxBroadcaster& aBC , const SfxHint& aHint ) ; - //____________________________________________________________________________________________________ + // public IMPL? - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1420,9 +1419,9 @@ protected: void setGrabBagItem(const com::sun::star::uno::Any& rVal); -//________________________________________________________________________________________________________ + // private methods -//________________________________________________________________________________________________________ + private: @@ -1467,9 +1466,9 @@ private: SAL_DLLPRIVATE void handleLoadError( sal_uInt32 nError, SfxMedium* pMedium ); -//________________________________________________________________________________________________________ + // private variables and methods -//________________________________________________________________________________________________________ + private: diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx index 70cfcf5b1507..7f7b05f7f5ec 100644 --- a/include/sfx2/sfxmodelfactory.hxx +++ b/include/sfx2/sfxmodelfactory.hxx @@ -25,10 +25,10 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -//........................................................................ + namespace sfx2 { -//........................................................................ + #define SFXMODEL_STANDARD (sal_uInt64)(0x0000) #define SFXMODEL_EMBEDDED_OBJECT (sal_uInt64)(0x0001) @@ -40,9 +40,9 @@ namespace sfx2 const sal_uInt64 _nCreationFlags ); - //==================================================================== + //= createSfxModelFactory - //==================================================================== + /** creates a XSingleServiceFactory which can be used to created instances of classes derived from SfxBaseModel @@ -58,9 +58,9 @@ namespace sfx2 const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames ); -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_SFXMODELFACTORY_HXX diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index bc26695585ba..b8bef217e73e 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -26,7 +26,7 @@ // Please be careful: // Changing just one part here doesn't add new // docking windows automatically! -// + #define SID_DOCKWIN_0 SID_DOCKWIN_START #define SID_DOCKWIN_1 SID_DOCKWIN_START+1 @@ -39,11 +39,11 @@ #define SID_DOCKWIN_8 SID_DOCKWIN_START+8 #define SID_DOCKWIN_9 SID_DOCKWIN_START+9 -//========================================================================= + #define SID_UNKNOWN SID_SFX_START -//------------------------------------------------------------------------- + // default-ids for application #define SID_QUITAPP (SID_SFX_START + 300) @@ -703,7 +703,7 @@ #define ID_VAL_ZOOM (SID_SD_START+234) #define SID_SIZE_OPTIMAL (SID_SD_START+99) -//----------------------------------------------------------------------- + #define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL) #define SID_ZOOM_ENTIRE_PAGE (SID_SIZE_PAGE) @@ -714,7 +714,7 @@ #define SID_ZOOM_150_PERCENT (SID_SVX_START + 1423) #define SID_ZOOM_200_PERCENT (SID_SVX_START + 1424) -//----------------------------------------------------------------------- + // SfxScriptOrganizerItem #define MID_SCRIPT_ORGANIZER_LANGUAGE 1 // Don't use zero for MID's. It's forbidden to do it! @@ -730,7 +730,7 @@ #endif // #ifndef _SFXSIDS_HRC -//----------------------------------------------------------------------- + // SfxSecurityPage related stuff #define FN_EDIT2 (SID_SW_START + 1800) diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 93e2e782b7dc..8b3664f5067c 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -61,7 +61,7 @@ namespace svl class IUndoManager; } -//==================================================================== + enum SfxInterfaceId @@ -123,7 +123,7 @@ enum SfxInterfaceId //TODO/CLEANUP: replace by UNO constant #define SVVERB_SHOW -1 -//==================================================================== + typedef void (*SfxExecFunc)(SfxShell *, SfxRequest &rReq); typedef void (*SfxStateFunc)(SfxShell *, SfxItemSet &rSet); @@ -258,7 +258,7 @@ public: SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); }; -//-------------------------------------------------------------------- + SfxItemPool& SfxShell::GetPool() const /* [Description] @@ -276,7 +276,7 @@ SfxItemPool& SfxShell::GetPool() const DBG_ASSERT( pPool, "no pool" ); return *pPool; } -//------------------------------------------------------------------- + inline void SfxShell::SetPool ( SfxItemPool* pNewPool // Pointer to the new Pool or null @@ -295,7 +295,7 @@ inline void SfxShell::SetPool pPool = pNewPool; } -//===================================================================== + #define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[] = diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc index 5c311127bda3..7d7fd12dc8b7 100644 --- a/include/sfx2/sidebar/ResourceDefinitions.hrc +++ b/include/sfx2/sidebar/ResourceDefinitions.hrc @@ -47,7 +47,7 @@ #define RID_PROPERTYPANEL_NUMFORMAT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START+23) #define RID_PANELDOCK_WINDOW ( RC_PROPERTYPANEL_START + 24 ) -#define STR_TITLE_DISCRIPTION ( RC_PROPERTYPANEL_START + 25 ) // +#define STR_TITLE_DISCRIPTION ( RC_PROPERTYPANEL_START + 25 ) #ifndef STD_MASKCOLOR #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 2231ab0f02cc..c9b5dc1e06cf 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -24,7 +24,7 @@ #include <svl/poolitem.hxx> #include <svtools/statusbarcontroller.hxx> -//------------------------------------------------------------------ + class SfxModule; class StatusBar; @@ -52,7 +52,7 @@ struct SfxStbCtrlFactory {} }; -//------------------------------------------------------------------ + class CommandEvent; class MouseEvent; @@ -123,7 +123,7 @@ public: }; -//------------------------------------------------------------------ + #define SFX_DECL_STATUSBAR_CONTROL() \ static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 8b0ed9b5eed7..14e6ac0d6af2 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -56,7 +56,7 @@ public: const SfxStyleFilter& GetFilterList() const { return aFilterList; } const Image& GetImage() const { return aImage; } - // -------------------------------------------------------------------- + class GrantAccess { friend class SfxStyleFamilies; }; void SetImage( const Image& _rImg ) { aImage = _rImg; } }; diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index 559a091b2ed3..246e8cec145d 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -35,14 +35,14 @@ namespace svt class ToolPanelDeck; } -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... - //================================================================================================================== + + //= ITaskPaneToolPanelAccess - //================================================================================================================== + class SAL_NO_VTABLE ITaskPaneToolPanelAccess { public: @@ -52,9 +52,9 @@ namespace sfx2 ~ITaskPaneToolPanelAccess() {} }; - //================================================================================================================== + //= TaskPaneWrapper - //================================================================================================================== + class SFX2_DLLPUBLIC TaskPaneWrapper :public SfxChildWindow ,public ITaskPaneToolPanelAccess { @@ -72,9 +72,9 @@ namespace sfx2 virtual void ActivateToolPanel( const OUString& i_rPanelURL ); }; - //================================================================================================================== + //= IToolPanelCompare - //================================================================================================================== + class SFX2_DLLPUBLIC SAL_NO_VTABLE IToolPanelCompare { public: @@ -95,9 +95,9 @@ namespace sfx2 ~IToolPanelCompare() {} }; - //================================================================================================================== + //= ModuleTaskPane - //================================================================================================================== + class ModuleTaskPane_Impl; /** SFX-less version of a module dependent task pane, filled with tool panels as specified in the respective module's configuration @@ -152,9 +152,9 @@ namespace sfx2 ::boost::scoped_ptr< ModuleTaskPane_Impl > m_pImpl; }; - //================================================================================================================== + //= TaskPaneController - //================================================================================================================== + class TaskPaneController_Impl; /** is a helper class for connecting a ModuleTaskPane and a TitledDockingWindow, for clients of the ModuleTaskPane which do not use the TaskPaneDockingWindow @@ -178,9 +178,9 @@ namespace sfx2 ::boost::scoped_ptr< TaskPaneController_Impl > m_pImpl; }; - //================================================================================================================== + //= TaskPaneDockingWindow - //================================================================================================================== + class TaskPaneDockingWindow :public TitledDockingWindow ,public ITaskPaneToolPanelAccess { @@ -203,9 +203,9 @@ namespace sfx2 TaskPaneController m_aPaneController; }; -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + #endif // INCLUDED_SFX2_TASKPANE_HXX diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index d2fbc7ac6a39..10177ea8392d 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> -//------------------------------------------------------------------ + class SfxToolBoxControl; class SfxBindings; @@ -63,7 +63,7 @@ struct SfxTbxCtrlFactory {} }; -//------------------------------------------------------------------ + enum SfxPopupWindowType { @@ -75,7 +75,7 @@ enum SfxPopupWindowType SFX_POPUPWINDOW_CONTEXTMENU }; -//------------------------------------------------------------------ + class SfxFrameStatusListener : public svt::FrameStatusListener { @@ -93,7 +93,7 @@ class SfxFrameStatusListener : public svt::FrameStatusListener SfxStatusListenerInterface* m_pCallee; }; -//------------------------------------------------------------------ + /* Floating windows that can be torn from tool boxes should be derived from this class. Since it is also derived from SfxControllerItem, its instances @@ -162,7 +162,7 @@ public: } }; -//------------------------------------------------------------------ + #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ @@ -293,7 +293,7 @@ public: { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } -//========================================================================= + class SfxDragButton_Impl : public FixedImage @@ -316,7 +316,7 @@ public: virtual void Select( sal_Bool bMod1 = sal_False ); }; -//------------------------------------------------------------------------ + /** Toolbox that implements recent files menu for the Open file toolbar button. diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index b9c1e03fb66e..cbac0878fc8b 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -26,14 +26,14 @@ #include <vcl/toolbox.hxx> #include <tools/svborder.hxx> -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... - //================================================================================================================== + + //= TitledDockingWindow - //================================================================================================================== + class SFX2_DLLPUBLIC TitledDockingWindow : public SfxDockingWindow { public: @@ -152,9 +152,9 @@ namespace sfx2 }; -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + #endif // INCLUDED_SFX2_TITLEDOCKWIN_HXX diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 5f4adcc76322..5825ac1d7d86 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -31,14 +31,14 @@ class NotifyEvent; namespace cppu { class OWeakObject; } -//........................................................................ + namespace sfx2 { -//........................................................................ - //==================================================================== + + //= UserInputInterception - //==================================================================== + struct UserInputInterception_Data; /** helper class for implementing the XUserInputInterception interface for a controller implementation @@ -66,9 +66,9 @@ namespace sfx2 ::std::auto_ptr< UserInputInterception_Data > m_pData; }; -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index b7fb8276842d..2129f55aeecc 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -62,7 +62,7 @@ namespace svtools SV_DECL_REF(SfxObjectShell) #endif -//======================================================================== + DBG_NAMEEX(SfxViewFrame) class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener { @@ -286,7 +286,7 @@ private: ); }; -//-------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem { diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index eb40c875d0a2..ae22a37b119a 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -77,7 +77,7 @@ class NotifyEvent; #define DEFAULT_MARGIN_WIDTH 8 #define DEFAULT_MARGIN_HEIGHT 12 -//======================================================================== + // @[SfxViewShell-Flags] @@ -96,7 +96,7 @@ class NotifyEvent; <SfxViewShell>. */ -//========================================================================= + #define SFX_DECL_VIEWFACTORY(Class) \ private: \ @@ -124,7 +124,7 @@ public: \ class SfxInPlaceClient; typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList; -// ----------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener { #ifdef INCLUDED_SFX2_VIEWSH_HXX @@ -296,7 +296,7 @@ public: SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey); }; -//======================================================================== + inline void SfxViewShell::LostFocus() const @@ -317,7 +317,7 @@ inline void SfxViewShell::LostFocus() const { } -//------------------------------------------------------------------------ + inline SfxViewFrame* SfxViewShell::GetViewFrame() const diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index 10181da20678..1cfdc3db0f69 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -23,7 +23,7 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/dllapi.h> -//------------------------------------------------------------------------- + enum SvxZoomType { @@ -34,7 +34,7 @@ enum SvxZoomType SVX_ZOOM_PAGEWIDTH_NOBORDER // GetValue() pagewidth without border }; -//------------------------------------------------------------------------- + class SFX2_DLLPUBLIC SvxZoomItem: public SfxUInt16Item { @@ -66,7 +66,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; -//------------------------------------------------------------------------ + #define SVX_ZOOM_ENABLE_50 0x0001 #define SVX_ZOOM_ENABLE_75 0x0002 |