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/toolkit | |
| 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/toolkit')
51 files changed, 365 insertions, 365 deletions
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index fae461fe453d..0006e089fd89 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -30,14 +30,14 @@ #include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... - //================================================================================================================== + + //= AnimatedImagesPeer - //================================================================================================================== + struct AnimatedImagesPeer_Data; typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow , ::com::sun::star::awt::XAnimation @@ -90,9 +90,9 @@ namespace toolkit ::boost::scoped_ptr< AnimatedImagesPeer_Data > m_pData; }; -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + #endif // INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index b340efd49e1e..f2f2e060f653 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -23,7 +23,7 @@ #include <vcl/dialog.hxx> #include <vcl/scrbar.hxx> -//........................................................................ + namespace toolkit { class ScrollableInterface @@ -74,9 +74,9 @@ namespace toolkit // Window virtual void Resize(); }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index e6d44e25dae6..58a71293f918 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -45,9 +45,9 @@ class AccessibleStateSetHelper; } -// ---------------------------------------------------- + // class VCLXAccessibleComponent -// ---------------------------------------------------- + typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 6df90b1669e0..31c32c7d6002 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -29,9 +29,9 @@ #include <vcl/bitmapex.hxx> -// ---------------------------------------------------- + // class VCLXBitmap -// ---------------------------------------------------- + class VCLXBitmap : public ::com::sun::star::awt::XBitmap, public ::com::sun::star::awt::XDisplayBitmap, diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index e49a49c892fe..aeea9ca140ef 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -30,9 +30,9 @@ #include <toolkit/awt/vclxwindow.hxx> -// ---------------------------------------------------- + // class VCLXContainer -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXContainer : public ::com::sun::star::awt::XVclContainer, public ::com::sun::star::awt::XVclContainerPeer, diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index e28844e1492c..1657c14a97e7 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -32,9 +32,9 @@ class OutputDevice; class VirtualDevice; -// ---------------------------------------------------- + // class VCLXDevice -// ---------------------------------------------------- + // For using nDummy, no incompatible update, add a sal_Bool bCreatedWithToolkitMember later... #define FLAGS_CREATEDWITHTOOLKIT 0x00000001 @@ -98,9 +98,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXVirtualDevice -// ---------------------------------------------------- + class VCLXVirtualDevice : public VCLXDevice { diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index e77c38f3f28b..3d0f46a59976 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -29,9 +29,9 @@ #include <osl/mutex.hxx> #include <vcl/metric.hxx> -// ---------------------------------------------------- + // class VCLXFont -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXFont : public ::com::sun::star::awt::XFont2, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 1407bbb65625..9b6092715d07 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -43,9 +43,9 @@ class Region; #define INITOUTDEV_ALL 0xFFFF -// ---------------------------------------------------- + // class VCLXGraphics -// ---------------------------------------------------- + class VCLXGraphics : public ::com::sun::star::awt::XGraphics2, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index fdaa4c7570c4..63fab5e97694 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -45,9 +45,9 @@ typedef ::std::vector< css::uno::Reference< css::awt::XPopupMenu >* > PopupMenuRefList; -// ---------------------------------------------------- + // class VCLXMenu -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXMenu : public css::awt::XMenuBar, public css::awt::XPopupMenu, diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 757278db39b6..38c7f08f460d 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -29,9 +29,9 @@ #include <vcl/pointr.hxx> -// ---------------------------------------------------- + // class VCLXPointer -// ---------------------------------------------------- + class VCLXPointer : public ::com::sun::star::awt::XPointer, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index 395bdae56335..adf82e682879 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -45,9 +45,9 @@ sal_uInt16 Orientation; // PORTRAIT, LANDSCAPE */ -// ---------------------------------------------------- + // class VCLXPrinterPropertySet -// ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XPrinterPropertySet > VCLXPrinterPropertySet_Base; @@ -98,9 +98,9 @@ public: void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class VCLXPrinter -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper1 < VCLXPrinterPropertySet , ::com::sun::star::awt::XPrinter @@ -137,9 +137,9 @@ public: void SAL_CALL endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class VCLXInfoPrinter -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper1 < VCLXPrinterPropertySet , ::com::sun::star::awt::XInfoPrinter @@ -170,9 +170,9 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class VCLXPrinterServer -// ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XPrinterServer > VCLXPrinterServer_Base; diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 9bad42554973..6e6948f18709 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -29,9 +29,9 @@ #include <vcl/region.hxx> -// ---------------------------------------------------- + // class VCLXRegion -// ---------------------------------------------------- + class VCLXRegion : public ::com::sun::star::awt::XRegion, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index 033d3b67c3c3..1743583a2d1a 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -25,14 +25,14 @@ #include <comphelper/uno3.hxx> #include <com/sun/star/awt/XSpinValue.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= VCLXSpinButton - //==================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XSpinValue > VCLXSpinButton_Base; @@ -84,9 +84,9 @@ namespace toolkit VCLXSpinButton& operator=( const VCLXSpinButton& ); // never implemented }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index 4aad076c81fb..e00e65660977 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -28,9 +28,9 @@ #include <toolkit/awt/vclxwindow.hxx> -// ---------------------------------------------------- + // class VCLXSystemDependendtWindow -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt::XSystemDependentWindowPeer, public VCLXWindow diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index 254359bb85e9..19b9d3ca7b54 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -33,7 +33,7 @@ #include <cppuhelper/implbase2.hxx> #include <toolkit/awt/vclxcontainer.hxx> -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2 < VCLXContainer , ::com::sun::star::awt::tab::XTabPageContainer , ::com::sun::star::container::XContainerListener diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 1b28ce0a266b..e37fb0314ec6 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -78,9 +78,9 @@ public: virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); }; -// ---------------------------------------------------- + // class VCLXTopWindow -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base, public VCLXContainer diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index ef3ea47d280a..399459a17649 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -57,9 +57,9 @@ namespace toolkit } -// ---------------------------------------------------- + // class VCLXWINDOW -// ---------------------------------------------------- + class UnoPropertyArrayHelper; class VCLXWindowImpl; diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 6c730fa69f0c..3ace6c255019 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -103,10 +103,10 @@ class ToolBox; class VclSimpleEvent; class VclMenuEvent; -// ---------------------------------------------------- + // class VCLXGraphicControl // deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow @@ -142,9 +142,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXButton -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton @@ -191,9 +191,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXImageControl -// ---------------------------------------------------- + class VCLXImageControl : public VCLXGraphicControl { public: @@ -216,9 +216,9 @@ protected: virtual void ImplSetNewImage(); }; -// ---------------------------------------------------- + // class VCLXCheckBox -// ---------------------------------------------------- + class VCLXCheckBox : public ::com::sun::star::awt::XCheckBox, public ::com::sun::star::awt::XButton, public VCLXGraphicControl @@ -274,9 +274,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXRadioButton -// ---------------------------------------------------- + class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton, public ::com::sun::star::awt::XButton, public VCLXGraphicControl @@ -332,9 +332,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXMessageBox -// ---------------------------------------------------- + class VCLXMessageBox : public ::com::sun::star::awt::XMessageBox, public VCLXTopWindow { @@ -366,9 +366,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFrame -// ---------------------------------------------------- + class VCLXFrame : public VCLXContainer { protected: @@ -402,9 +402,9 @@ public: -// ---------------------------------------------------- + // class VCLXDialog -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXDialog : public ::com::sun::star::awt::XDialog2, public VCLXTopWindow { @@ -445,9 +445,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXTabPage -// ---------------------------------------------------- + class VCLXTabPage : public VCLXContainer { public: @@ -527,9 +527,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFixedHyperlink -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink : public ::com::sun::star::awt::XFixedHyperlink, public VCLXWindow @@ -582,9 +582,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFixedText -// ---------------------------------------------------- + class VCLXFixedText : public ::com::sun::star::awt::XFixedText, public VCLXWindow { @@ -619,9 +619,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXScrollBar -// ---------------------------------------------------- + class VCLXScrollBar : public ::com::sun::star::awt::XScrollBar, public VCLXWindow { @@ -680,9 +680,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXEdit -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXEdit : public ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextEditField, public ::com::sun::star::awt::XTextLayoutConstrains, @@ -748,9 +748,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXListBox -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow , ::com::sun::star::awt::XListBox , ::com::sun::star::awt::XTextLayoutConstrains @@ -825,9 +825,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXComboBox -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2 < VCLXEdit , ::com::sun::star::awt::XComboBox , ::com::sun::star::awt::XItemListListener > VCLXComboBox_Base; @@ -889,9 +889,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXSpinField -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXSpinField : public ::com::sun::star::awt::XSpinField, public VCLXEdit { @@ -927,9 +927,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFormattedSpinField -// ---------------------------------------------------- + class VCLXFormattedSpinField : public VCLXSpinField { private: @@ -955,9 +955,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXDateField -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField, public VCLXFormattedSpinField { @@ -1003,9 +1003,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXTimeField -// ---------------------------------------------------- + class VCLXTimeField : public ::com::sun::star::awt::XTimeField, public VCLXFormattedSpinField { @@ -1048,9 +1048,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXNumericField -// ---------------------------------------------------- + class VCLXNumericField : public ::com::sun::star::awt::XNumericField, public VCLXFormattedSpinField { @@ -1093,9 +1093,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXMetricField -// ---------------------------------------------------- + class MetricFormatter; class MetricField; class VCLXMetricField : public ::com::sun::star::awt::XMetricField, @@ -1145,9 +1145,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXCurrencyField -// ---------------------------------------------------- + class VCLXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public VCLXFormattedSpinField { @@ -1191,9 +1191,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXPatternField -// ---------------------------------------------------- + class VCLXPatternField : public ::com::sun::star::awt::XPatternField, public VCLXFormattedSpinField { @@ -1227,9 +1227,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXToolBox -// ---------------------------------------------------- + class VCLXToolBox : public VCLXWindow { private: diff --git a/include/toolkit/awt/xsimpleanimation.hxx b/include/toolkit/awt/xsimpleanimation.hxx index 786b4fa6e902..b41b81d23672 100644 --- a/include/toolkit/awt/xsimpleanimation.hxx +++ b/include/toolkit/awt/xsimpleanimation.hxx @@ -27,14 +27,14 @@ #include <boost/scoped_ptr.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= XSimpleAnimation - //==================================================================== + typedef ::cppu::ImplInheritanceHelper1 < VCLXWindow , ::com::sun::star::awt::XSimpleAnimation > XSimpleAnimation_Base; @@ -61,9 +61,9 @@ namespace toolkit XSimpleAnimation& operator=( const XSimpleAnimation& ); // never implemented }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX diff --git a/include/toolkit/awt/xthrobber.hxx b/include/toolkit/awt/xthrobber.hxx index e1b19c7b2b3f..fd2959b75442 100644 --- a/include/toolkit/awt/xthrobber.hxx +++ b/include/toolkit/awt/xthrobber.hxx @@ -28,14 +28,14 @@ #include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= XThrobber - //==================================================================== + typedef ::cppu::ImplInheritanceHelper1 < VCLXWindow , ::com::sun::star::awt::XThrobber > XThrobber_Base; @@ -64,9 +64,9 @@ namespace toolkit XThrobber& operator=( const XThrobber& ); // never implemented }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index e5c00aae464c..6726f4e64fa8 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -28,14 +28,14 @@ #include <com/sun/star/awt/XWindow.hpp> class Window; -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= OAccessibleControlContext - //==================================================================== + typedef ::comphelper::OAccessibleComponentHelper OAccessibleControlContext_Base; typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener @@ -120,9 +120,9 @@ namespace toolkit Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx index cf9baad50fb4..58e7b2f337da 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/include/toolkit/controls/animatedimages.hxx @@ -31,10 +31,10 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... + struct AnimatedImagesControlModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel @@ -87,9 +87,9 @@ namespace toolkit m_pData; }; -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + #endif // INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 54e4ca17d640..90abe782b8db 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -40,9 +40,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <tools/gen.hxx> -// ---------------------------------------------------- + // class ControlModelContainerBase -// ---------------------------------------------------- + typedef UnoControlModel ControlModel_Base; typedef ::cppu::AggImplInheritanceHelper8 < ControlModel_Base , ::com::sun::star::lang::XMultiServiceFactory diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index 70fcef1fa9f8..1d47f22e9bbc 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/util/XNumberFormatter.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - // =================================================================== + + // = UnoControlFormattedFieldModel - // =================================================================== + class UnoControlFormattedFieldModel : public UnoControlModel { protected: @@ -99,9 +99,9 @@ namespace toolkit void impl_updateCachedFormatKey_nothrow(); }; - // =================================================================== + // = UnoFormattedFieldControl - // =================================================================== + class UnoFormattedFieldControl : public UnoSpinFieldControl { public: @@ -115,9 +115,9 @@ namespace toolkit DECLIMPL_SERVICEINFO_DERIVED( UnoFormattedFieldControl, UnoEditControl, szServiceName2_UnoControlFormattedField ) }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index fa389f2647d6..302b64258c54 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -45,14 +45,14 @@ namespace com { namespace sun { namespace star { } }}} -//........................................................................ + // namespace toolkit // { -//........................................................................ - //==================================================================== + + //= OGeometryControlModel_Base - //==================================================================== + typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::util::XCloneable , ::com::sun::star::script::XScriptEventsSupplier > OGCM_Base; @@ -165,17 +165,17 @@ namespace com { namespace sun { namespace star { void registerProperties(); }; - //==================================================================== + //= OTemplateInstanceDisambiguation - //==================================================================== + template <class CONTROLMODEL> class OTemplateInstanceDisambiguation { }; - //==================================================================== + //= OGeometryControlModel - //==================================================================== + /* example for usage: Reference< XAggregation > xIFace = new ::toolkit::OGeometryControlModel< UnoControlButtonModel > (); */ @@ -208,9 +208,9 @@ namespace com { namespace sun { namespace star { virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - //==================================================================== + //= OCommonGeometryControlModel - //==================================================================== + /** allows to extend an arbitrary com.sun.star.awt::UnoControlModel with geometry information. */ @@ -255,9 +255,9 @@ namespace com { namespace sun { namespace star { #include <toolkit/controls/geometrycontrolmodel_impl.hxx> -//........................................................................ + // } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx index de708b53bbad..c035c2e6ea47 100644 --- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx +++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx @@ -19,31 +19,31 @@ // no include protection. This is included from within geometrycontrolmodel.hxx only -//==================================================================== + //= OGeometryControlModel -//==================================================================== -//-------------------------------------------------------------------- + + template <class CONTROLMODEL> OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) :OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) ) { } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) :OGeometryControlModel_Base(_rxAggregateInstance) { } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> ::cppu::IPropertyArrayHelper& SAL_CALL OGeometryControlModel<CONTROLMODEL>::getInfoHelper() { return *this->getArrayHelper(); } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rProps, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rAggregateProps) const { @@ -54,7 +54,7 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno:: _rAggregateProps = m_xAggregateSet->getPropertySetInfo()->getProperties(); } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -71,7 +71,7 @@ template <class CONTROLMODEL> return pId->getImplementationId(); } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> OGeometryControlModel_Base* OGeometryControlModel<CONTROLMODEL>::createClone_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index c0336806a5e5..d9e332d4add3 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -39,10 +39,10 @@ #include <comphelper/uno3.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ + typedef GraphicControlModel UnoControlRoadmapModel_Base; @@ -68,9 +68,9 @@ namespace toolkit css::awt::XItemEventBroadcaster> SVTXRoadmap_Base; - // =================================================================== + // = UnoControlRoadmapModel - // =================================================================== + class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base, public UnoControlRoadmapModel_IBase @@ -143,9 +143,9 @@ namespace toolkit }; - // =================================================================== + // = UnoRoadmapControl - // =================================================================== + class UnoRoadmapControl : public UnoControlRoadmap_Base, public UnoControlRoadmap_IBase { @@ -182,9 +182,9 @@ namespace toolkit DECLIMPL_SERVICEINFO_DERIVED( UnoRoadmapControl, UnoControlBase, szServiceName2_UnoControlRoadmap ) }; -//........................................................................ + } // toolkit -//........................................................................ + diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx index c047b7381a32..7d7beff9d6a0 100644 --- a/include/toolkit/controls/roadmapentry.hxx +++ b/include/toolkit/controls/roadmapentry.hxx @@ -65,7 +65,7 @@ protected: // other stuff - // ... + // (e.g. DECLARE_SERVICE_INFO();) protected: diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx index 740167356f21..150b9b30778a 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/include/toolkit/controls/tabpagecontainer.hxx @@ -33,9 +33,9 @@ #include <toolkit/controls/controlmodelcontainerbase.hxx> #include <toolkit/helper/listenermultiplexer.hxx> -// ------------------------------------------------------------------ + // class ::com::sun::star::awt::tab::UnoControlTabPageContainerModel -// ------------------------------------------------------------------ + typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel , ::com::sun::star::awt::tab::XTabPageContainerModel > UnoControlTabPageContainerModel_Base; @@ -90,9 +90,9 @@ public: void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// =================================================================== + // = UnoControlTabPageContainer -// =================================================================== + typedef ::cppu::AggImplInheritanceHelper1 < ControlContainerBase , ::com::sun::star::awt::tab::XTabPageContainer > UnoControlTabPageContainer_Base; diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx index c48250cf75be..780fbd1be69f 100644 --- a/include/toolkit/controls/tabpagemodel.hxx +++ b/include/toolkit/controls/tabpagemodel.hxx @@ -55,9 +55,9 @@ public: css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class UnoTabPageControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase , ::com::sun::star::awt::tab::XTabPage , ::com::sun::star::awt::XWindowListener diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index c9f9cd395621..7b552a29e218 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/awt/XAdjustmentListener.hpp> #include <com/sun/star/awt/AdjustmentType.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= UnoControlScrollBarModel - //==================================================================== + class UnoControlScrollBarModel : public UnoControlModel { protected: @@ -57,9 +57,9 @@ namespace toolkit DECLIMPL_SERVICEINFO_DERIVED( UnoControlScrollBarModel, UnoControlModel, szServiceName2_UnoControlScrollBarModel ) }; - //==================================================================== + //= UnoControlScrollBarModel - //==================================================================== + class UnoScrollBarControl : public UnoControlBase, public ::com::sun::star::awt::XAdjustmentListener, public ::com::sun::star::awt::XScrollBar @@ -109,9 +109,9 @@ namespace toolkit -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX diff --git a/include/toolkit/controls/tksimpleanimation.hxx b/include/toolkit/controls/tksimpleanimation.hxx index 1936e6622251..482390c8fd96 100644 --- a/include/toolkit/controls/tksimpleanimation.hxx +++ b/include/toolkit/controls/tksimpleanimation.hxx @@ -28,14 +28,14 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= UnoSimpleAnimationControlModel - //==================================================================== + class UnoSimpleAnimationControlModel : public UnoControlModel { protected: @@ -59,9 +59,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; - //==================================================================== + //= UnoSimpleAnimationControl - //==================================================================== + typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase , ::com::sun::star::awt::XSimpleAnimation @@ -86,9 +86,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX diff --git a/include/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx index b32246a27857..f952b2785b01 100644 --- a/include/toolkit/controls/tkthrobber.hxx +++ b/include/toolkit/controls/tkthrobber.hxx @@ -28,14 +28,14 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= UnoThrobberControlModel - //==================================================================== + class UnoThrobberControlModel : public UnoControlModel { protected: @@ -59,9 +59,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; - //==================================================================== + //= UnoThrobberControl - //==================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XThrobber > UnoThrobberControl_Base; @@ -94,9 +94,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index 8b2afac05e91..6a9e97fcb789 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -62,9 +62,9 @@ struct UnoControlComponentInfos }; struct UnoControl_Data; -// ---------------------------------------------------- + // class UnoControl -// ---------------------------------------------------- + typedef ::cppu::WeakAggImplHelper9 < ::com::sun::star::awt::XControl , ::com::sun::star::awt::XWindow2 , ::com::sun::star::awt::XView diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index 124671e7c181..fd833e66eb30 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -26,9 +26,9 @@ #include <toolkit/controls/unocontrol.hxx> -// ---------------------------------------------------- + // class UnoControlBase -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl { diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 5b6db2f1ae6a..7f8cd2787d01 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -35,9 +35,9 @@ class UnoControlHolderList; -// ---------------------------------------------------- + // class UnoControlContainer -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XUnoControlContainer , ::com::sun::star::awt::XControlContainer diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index 0347ff433884..ff8dd4374604 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -26,9 +26,9 @@ #include <toolkit/helper/servicenames.hxx> -// ---------------------------------------------------- + // class ::com::sun::star::awt::UnoControlContainerModel -// ---------------------------------------------------- + class UnoControlContainerModel : public UnoControlModel { protected: diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 65b28598acab..6fdd1a37c64b 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -45,9 +45,9 @@ typedef std::map<sal_uInt16, ::com::sun::star::uno::Any> ImplPropertyTable; -// ---------------------------------------------------- + // class UnoControlModel -// ---------------------------------------------------- + typedef ::cppu::WeakAggImplHelper7 < ::com::sun::star::awt::XControlModel , ::com::sun::star::beans::XPropertyState diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 5ed719967501..112342649f10 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -75,9 +75,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlEditModel -// ---------------------------------------------------- + class UnoControlEditModel : public UnoControlModel { protected: @@ -101,9 +101,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlEditModel, UnoControlModel, szServiceName2_UnoControlEditModel ) }; -// ---------------------------------------------------- + // class UnoEditControl -// ---------------------------------------------------- + typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XTextComponent , ::com::sun::star::awt::XTextListener , ::com::sun::star::awt::XLayoutConstrains @@ -179,9 +179,9 @@ public: sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); }; -// ---------------------------------------------------- + // class UnoControlFileControlModel -// ---------------------------------------------------- + class UnoControlFileControlModel : public UnoControlModel { protected: @@ -204,9 +204,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlFileControlModel, UnoControlModel, szServiceName2_UnoControlFileControlModel ) }; -// ---------------------------------------------------- + // class UnoFileControl -// ---------------------------------------------------- + class UnoFileControl : public UnoEditControl { public: @@ -217,9 +217,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, szServiceName2_UnoControlFileControl ) }; -// ---------------------------------------------------- + // class GraphicControlModel -// ---------------------------------------------------- + class GraphicControlModel : public UnoControlModel { private: @@ -247,9 +247,9 @@ private: GraphicControlModel& operator=( const GraphicControlModel& ); // never implemented }; -// ---------------------------------------------------- + // class UnoControlButtonModel -// ---------------------------------------------------- + class UnoControlButtonModel : public GraphicControlModel { protected: @@ -272,9 +272,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel ) }; -// ---------------------------------------------------- + // class UnoButtonControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton @@ -322,9 +322,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, szServiceName2_UnoControlButton ) }; -// ---------------------------------------------------- + // class UnoControlImageControlModel -// ---------------------------------------------------- + class UnoControlImageControlModel : public GraphicControlModel { private: @@ -353,9 +353,9 @@ public: void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); }; -// ---------------------------------------------------- + // class UnoImageControlControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase , ::com::sun::star::awt::XLayoutConstrains > UnoImageControlControl_Base; @@ -384,9 +384,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, szServiceName2_UnoControlImageControl ) }; -// ---------------------------------------------------- + // class UnoControlRadioButtonModel -// ---------------------------------------------------- + class UnoControlRadioButtonModel : public GraphicControlModel { @@ -411,9 +411,9 @@ public: }; -// ---------------------------------------------------- + // class UnoRadioButtonControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XRadioButton @@ -464,9 +464,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlCheckBoxModel -// ---------------------------------------------------- + class UnoControlCheckBoxModel : public GraphicControlModel { protected: @@ -489,9 +489,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, szServiceName2_UnoControlCheckBoxModel ) }; -// ---------------------------------------------------- + // class UnoCheckBoxControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XCheckBox @@ -545,9 +545,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlFixedTextModel -// ---------------------------------------------------- + class UnoControlFixedHyperlinkModel : public UnoControlModel { protected: @@ -570,9 +570,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, szServiceName_UnoControlFixedHyperlinkModel ) }; -// ---------------------------------------------------- + // class UnoFixedHyperlinkControl -// ---------------------------------------------------- + class UnoFixedHyperlinkControl : public UnoControlBase, public ::com::sun::star::awt::XFixedHyperlink, public ::com::sun::star::awt::XLayoutConstrains @@ -619,9 +619,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoFixedHyperlinkControl, UnoControlBase, szServiceName_UnoControlFixedHyperlink ) }; -// ---------------------------------------------------- + // class UnoControlFixedTextModel -// ---------------------------------------------------- + class UnoControlFixedTextModel : public UnoControlModel { protected: @@ -645,9 +645,9 @@ public: }; -// ---------------------------------------------------- + // class UnoFixedTextControl -// ---------------------------------------------------- + class UnoFixedTextControl : public UnoControlBase, public ::com::sun::star::awt::XFixedText, public ::com::sun::star::awt::XLayoutConstrains @@ -684,9 +684,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlGroupBoxModel -// ---------------------------------------------------- + class UnoControlGroupBoxModel : public UnoControlModel { protected: @@ -710,9 +710,9 @@ public: }; -// ---------------------------------------------------- + // class UnoGroupBoxControl -// ---------------------------------------------------- + class UnoGroupBoxControl : public UnoControlBase { public: @@ -726,9 +726,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlListBoxModel -// ---------------------------------------------------- + struct UnoControlListBoxModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel , ::com::sun::star::awt::XItemList @@ -830,9 +830,9 @@ protected: ::cppu::OInterfaceContainerHelper m_aItemListListeners; }; -// ---------------------------------------------------- + // class UnoListBoxControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper5 < UnoControlBase , ::com::sun::star::awt::XListBox , ::com::sun::star::awt::XItemListener @@ -910,9 +910,9 @@ private: ItemListenerMultiplexer maItemListeners; }; -// ---------------------------------------------------- + // class UnoControlComboBoxModel -// ---------------------------------------------------- + class UnoControlComboBoxModel : public UnoControlListBoxModel { protected: @@ -939,9 +939,9 @@ public: }; -// ---------------------------------------------------- + // class UnoComboBoxControl -// ---------------------------------------------------- + class UnoComboBoxControl : public UnoEditControl , public ::com::sun::star::awt::XComboBox , public ::com::sun::star::awt::XItemListener @@ -1008,9 +1008,9 @@ protected: }; -// ---------------------------------------------------- + // class UnoSpinFieldControl -// ---------------------------------------------------- + class UnoSpinFieldControl : public UnoEditControl, public ::com::sun::star::awt::XSpinField { @@ -1047,9 +1047,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlDateFieldModel -// ---------------------------------------------------- + class UnoControlDateFieldModel : public UnoControlModel { protected: @@ -1073,9 +1073,9 @@ public: }; -// ---------------------------------------------------- + // class UnoDateFieldControl -// ---------------------------------------------------- + class UnoDateFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XDateField { @@ -1123,9 +1123,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoDateFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlDateField ) }; -// ---------------------------------------------------- + // class UnoControlTimeFieldModel -// ---------------------------------------------------- + class UnoControlTimeFieldModel : public UnoControlModel { protected: @@ -1149,9 +1149,9 @@ public: }; -// ---------------------------------------------------- + // class UnoTimeFieldControl -// ---------------------------------------------------- + class UnoTimeFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XTimeField { @@ -1198,9 +1198,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlNumericFieldModel -// ---------------------------------------------------- + class UnoControlNumericFieldModel : public UnoControlModel { protected: @@ -1224,9 +1224,9 @@ public: }; -// ---------------------------------------------------- + // class UnoNumericFieldControl -// ---------------------------------------------------- + class UnoNumericFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XNumericField { @@ -1275,9 +1275,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlCurrencyFieldModel -// ---------------------------------------------------- + class UnoControlCurrencyFieldModel : public UnoControlModel { protected: @@ -1301,9 +1301,9 @@ public: }; -// ---------------------------------------------------- + // class UnoCurrencyFieldControl -// ---------------------------------------------------- + class UnoCurrencyFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XCurrencyField { @@ -1351,9 +1351,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoCurrencyFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlCurrencyField ) }; -// ---------------------------------------------------- + // class UnoControlPatternFieldModel -// ---------------------------------------------------- + class UnoControlPatternFieldModel : public UnoControlModel { protected: @@ -1377,9 +1377,9 @@ public: }; -// ---------------------------------------------------- + // class UnoPatternFieldControl -// ---------------------------------------------------- + class UnoPatternFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XPatternField { @@ -1412,9 +1412,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlProgressBarModel -// ---------------------------------------------------- + class UnoControlProgressBarModel : public UnoControlModel { protected: @@ -1437,9 +1437,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, szServiceName2_UnoControlProgressBarModel ) }; -// ---------------------------------------------------- + // class UnoProgressBarControl -// ---------------------------------------------------- + class UnoProgressBarControl : public UnoControlBase, public ::com::sun::star::awt::XProgressBar { @@ -1468,9 +1468,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlFixedLineModel -// ---------------------------------------------------- + class UnoControlFixedLineModel : public UnoControlModel { protected: @@ -1494,9 +1494,9 @@ public: }; -// ---------------------------------------------------- + // class UnoFixedLineControl -// ---------------------------------------------------- + class UnoFixedLineControl : public UnoControlBase { public: diff --git a/include/toolkit/helper/accessibilityclient.hxx b/include/toolkit/helper/accessibilityclient.hxx index 73572154f579..a3915aff907f 100644 --- a/include/toolkit/helper/accessibilityclient.hxx +++ b/include/toolkit/helper/accessibilityclient.hxx @@ -22,14 +22,14 @@ #include <toolkit/helper/accessiblefactory.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= AccessibilityClient - //==================================================================== + /** a client for the accessibility implementations which have been outsourced from the main toolkit library @@ -57,9 +57,9 @@ namespace toolkit void ensureInitialized(); }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx index 0c90cd82be20..6428a10fa15d 100644 --- a/include/toolkit/helper/accessiblefactory.hxx +++ b/include/toolkit/helper/accessiblefactory.hxx @@ -41,10 +41,10 @@ class VCLXToolBox; class VCLXWindow; class Menu; -//........................................................................ + namespace toolkit { -//........................................................................ + /** a function which is able to create a factory for the standard Accessible/Context components needed for standard toolkit controls @@ -55,9 +55,9 @@ namespace toolkit */ typedef void* (SAL_CALL * GetStandardAccComponentFactory)( ); - //================================================================ + //= IAccessibleFactory - //================================================================ + class IAccessibleFactory : public ::rtl::IReference { public: @@ -125,9 +125,9 @@ namespace toolkit ~IAccessibleFactory() {} }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx index d075b3910fff..d37a85e3ac35 100644 --- a/include/toolkit/helper/emptyfontdescriptor.hxx +++ b/include/toolkit/helper/emptyfontdescriptor.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> -// ---------------------------------------------------- + // class EmptyFontDescriptor -// ---------------------------------------------------- + class EmptyFontDescriptor : public ::com::sun::star::awt::FontDescriptor { public: diff --git a/include/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx index f00f1edbbbf8..11fda9a000e7 100644 --- a/include/toolkit/helper/externallock.hxx +++ b/include/toolkit/helper/externallock.hxx @@ -22,9 +22,9 @@ #include <toolkit/dllapi.h> #include <comphelper/accessiblecontexthelper.hxx> -// ----------------------------------------------------------------------------- + // class VCLExternalSolarLock -// ----------------------------------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLExternalSolarLock : public ::comphelper::IMutex { diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx index eff8dfc92aa3..5ded833a00e3 100644 --- a/include/toolkit/helper/formpdfexport.hxx +++ b/include/toolkit/helper/formpdfexport.hxx @@ -33,10 +33,10 @@ namespace vcl class PDFExtOutDevData; } -//........................................................................ + namespace toolkitform { -//........................................................................ + /** creates a PDF compatible control descriptor for the given control */ @@ -46,9 +46,9 @@ namespace toolkitform ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(()); -//........................................................................ + } // namespace toolkitform -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX diff --git a/include/toolkit/helper/imagealign.hxx b/include/toolkit/helper/imagealign.hxx index ad4ba0134d49..7b063c9a14d5 100644 --- a/include/toolkit/helper/imagealign.hxx +++ b/include/toolkit/helper/imagealign.hxx @@ -23,10 +23,10 @@ #include <sal/types.h> #include <vcl/button.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ + /** translates a VCL ImageAlign value into an css.awt.ImagePosition value */ @@ -44,9 +44,9 @@ namespace toolkit */ sal_Int16 getExtendedImagePosition( sal_Int16 _nImageAlign ); -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index 4f9bea93f5c1..982ec4b44ac3 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -49,9 +49,9 @@ #include <toolkit/helper/macros.hxx> #include <com/sun/star/awt/grid/XGridSelectionListener.hpp> #include <com/sun/star/awt/tab/XTabPageContainerListener.hpp> -// ---------------------------------------------------- + // class ListenerMultiplexerBase -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC ListenerMultiplexerBase : public MutexHelper, public ::cppu::OInterfaceContainerHelper, @@ -74,24 +74,24 @@ public: }; -// ---------------------------------------------------- + // class EventListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, ::com::sun::star::lang::XEventListener ) DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class FocusListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class WindowListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -101,25 +101,25 @@ DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class VclContainerListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) void SAL_CALL windowAdded( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL windowRemoved( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class KeyListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class MouseListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -127,24 +127,24 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::sta void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class MouseMotionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class PaintListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TopWindowListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -155,30 +155,30 @@ DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star:: void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TextListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class ActionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class ItemListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TabListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener ) void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -187,18 +187,18 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, ::com::sun::star: void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class ContainerListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class SpinListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -206,16 +206,16 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class AdjustmentListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class MenuListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -223,16 +223,16 @@ DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt:: void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TreeSelectionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TreeExpansionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) virtual void SAL_CALL requestChildNodes( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL treeExpanding( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -241,24 +241,24 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com:: virtual void SAL_CALL treeCollapsed( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TreeEditListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException, std::exception); virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class SelectionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) void SAL_CALL selectionChanged( const ::com::sun::star::awt::grid::GridSelectionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TabPageListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener ) void SAL_CALL tabPageActivated( const ::com::sun::star::awt::tab::TabPageActivatedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 3f1ac4efdf33..f6622cb3f225 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -73,7 +73,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ } -// ------------------------------------------------------------------------------------- + #define IMPL_IMPLEMENTATION_ID( ClassName ) \ ::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) \ @@ -104,7 +104,7 @@ IMPL_IMPLEMENTATION_ID( ClassName ) \ static ::cppu::OTypeCollection collection( \ getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider>* ) NULL ), -// ------------------------------------------------------------------------------------- + #define IMPL_XTYPEPROVIDER_END \ ); \ @@ -114,7 +114,7 @@ IMPL_IMPLEMENTATION_ID( ClassName ) \ return (*pCollection).getTypes(); \ } -// ------------------------------------------------------------------------------------- + #define DECL_LISTENERMULTIPLEXER_START( ClassName, InterfaceName ) \ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ @@ -126,7 +126,7 @@ public: \ void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); -// ------------------------------------------------------------------------------------- + #define DECL_LISTENERMULTIPLEXER_START_DLLPUB( ClassName, InterfaceName ) \ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public InterfaceName \ @@ -138,12 +138,12 @@ public: \ void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); -// ------------------------------------------------------------------------------------- + #define DECL_LISTENERMULTIPLEXER_END \ }; -// ------------------------------------------------------------------------------------- + #define IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ClassName, InterfaceName ) \ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ @@ -161,7 +161,7 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: { \ } -// ------------------------------------------------------------------------------------- + #if OSL_DEBUG_LEVEL > 0 #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ @@ -257,7 +257,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa void ClassName::MethodName( const EventType& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType ) -// ------------------------------------------------------------------------------------- + #define DECLIMPL_SUPPORTS_SERVICE( ) \ sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ @@ -271,7 +271,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa return sal_False; \ } -// ------------------------------------------------------------------------------------- + #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit." #ImplName ); } \ @@ -283,7 +283,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa return aNames; \ } \ -// ------------------------------------------------------------------------------------- + #define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \ OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit." #ImplName ); } \ diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx index 1f7a107ec4bf..949d644d9558 100644 --- a/include/toolkit/helper/mutexhelper.hxx +++ b/include/toolkit/helper/mutexhelper.hxx @@ -22,9 +22,9 @@ #include <osl/mutex.hxx> -// ---------------------------------------------------- + // class MutexHelper -// ---------------------------------------------------- + class MutexHelper { diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx index ac36b3bd0b4b..2c45c641ee0b 100644 --- a/include/toolkit/helper/unopropertyarrayhelper.hxx +++ b/include/toolkit/helper/unopropertyarrayhelper.hxx @@ -26,9 +26,9 @@ #include <list> #include <set> -// ---------------------------------------------------- + // class UnoPropertyArrayHelper -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper { private: diff --git a/include/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx index 95a9c1a9ff6b..f00977734e29 100644 --- a/include/toolkit/helper/unowrapper.hxx +++ b/include/toolkit/helper/unowrapper.hxx @@ -29,9 +29,9 @@ #include <vcl/unowrap.hxx> #include <vcl/window.hxx> -// ---------------------------------------------------- + // class UnoWrapper -// ---------------------------------------------------- + class UnoWrapper : public UnoWrapperBase { diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 444c04498c45..74c6ade01193 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -65,9 +65,9 @@ class OutputDevice; class MouseEvent; class KeyEvent; -// ---------------------------------------------------- + // class VclUnoHelper -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLUnoHelper { public: @@ -116,9 +116,9 @@ public: static MapUnit UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ); static sal_Int32 VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit ); - //======================================================================== + //= MeasurementUnitConversion - //======================================================================== + /** small helper to convert between MeasurementUnit and FieldUnit */ |