diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:29:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 05:51:48 -0600 |
| commit | e90c27f5e180f58997026c69aa746498aa995823 (patch) | |
| tree | b1cd5ba050f91e4791cb177eb1712baab16ad4d3 /toolkit | |
| parent | de2beb35985c9112777d0ca4f5e953a5d494e6d2 (diff) | |
Remove visual noise from toolkit
Change-Id: I1704d6ac497f2e47a813813640ead14c5fa480d9
Reviewed-on: https://gerrit.libreoffice.org/8326
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit')
56 files changed, 444 insertions, 444 deletions
diff --git a/toolkit/qa/complex/toolkit/Assert.java b/toolkit/qa/complex/toolkit/Assert.java index 8fad8cee6b78..609befcc3dd6 100644 --- a/toolkit/qa/complex/toolkit/Assert.java +++ b/toolkit/qa/complex/toolkit/Assert.java @@ -28,7 +28,7 @@ import static org.junit.Assert.*; */ public class Assert { - // -------------------------------------------------------------------------------------------------------- + /** invokes a given method on a given object, and assures a certain exception is caught * @param i_message * is the message to print when the check fails @@ -215,7 +215,7 @@ public class Assert i_object, i_methodName, i_argClasses, i_methodArgs, i_expectedExceptionClass ); } - // -------------------------------------------------------------------------------------------------------- + public static void assertException( Object i_object, Class<?> _unoInterfaceClass, String i_methodName, Object[] i_methodArgs, Class<?> i_expectedExceptionClass ) { diff --git a/toolkit/qa/complex/toolkit/GridControl.java b/toolkit/qa/complex/toolkit/GridControl.java index b0959e4dfde7..7edb597c5593 100644 --- a/toolkit/qa/complex/toolkit/GridControl.java +++ b/toolkit/qa/complex/toolkit/GridControl.java @@ -62,13 +62,13 @@ import org.openoffice.test.OfficeConnection; */ public class GridControl { - // ----------------------------------------------------------------------------------------------------------------- + public GridControl() { m_context = m_connection.getComponentContext(); } - // ----------------------------------------------------------------------------------------------------------------- + private static void impl_dispose( final Object... i_components ) { for ( int i=0; i<i_components.length; ++i ) @@ -81,7 +81,7 @@ public class GridControl } } - // ----------------------------------------------------------------------------------------------------------------- + private void impl_recreateGridModel() throws Exception { impl_dispose( m_gridControlModel, m_columnModel, m_dataModel ); @@ -101,7 +101,7 @@ public class GridControl assertNotNull( "the out-of-the-box data model should be mutable and sortable", m_dataModel ); } - // ----------------------------------------------------------------------------------------------------------------- + @Test public void testGridControlCloning() throws Exception { @@ -137,7 +137,7 @@ public class GridControl impl_assertEquality( originalColumnModel, clonedColumnModel ); } - // ----------------------------------------------------------------------------------------------------------------- + @Test public void testDisposal() throws Exception { @@ -187,7 +187,7 @@ public class GridControl assertTrue( "new column model is not disposed after disposing the grid column model", newColumnModelListener.isDisposed() ); } - // ----------------------------------------------------------------------------------------------------------------- + /** * tests various aspects of the <code>XMutableGridDataModel</code> interface */ @@ -217,7 +217,7 @@ public class GridControl assertEquals( "implicit extension of the column count doesn't work", 2, dataModel.getColumnCount() ); } - // ----------------------------------------------------------------------------------------------------------------- + @Test public void testGridColumnModel() throws Exception { @@ -320,7 +320,7 @@ public class GridControl assertEquals( insertionIndex, newColumn.getIndex() ); } - // ----------------------------------------------------------------------------------------------------------------- + @Test public void testDataModel() throws Exception { @@ -347,7 +347,7 @@ public class GridControl } } - // ----------------------------------------------------------------------------------------------------------------- + @Test public void testSortableDataModel() throws Exception { @@ -424,7 +424,7 @@ public class GridControl } } - // ----------------------------------------------------------------------------------------------------------------- + @Test public void testView() throws Exception { @@ -474,7 +474,7 @@ public class GridControl rowCount - 2, gridControl.getCurrentRow() ); } - // ----------------------------------------------------------------------------------------------------------------- + private XControl impl_createDialogWithGridControl() throws Exception { // create a simple dialog model/control/peer trinity @@ -510,14 +510,14 @@ public class GridControl return gridControl; } - // ----------------------------------------------------------------------------------------------------------------- + private int impl_assertInteger( final Object i_object ) { assertTrue( i_object instanceof Integer ); return ((Integer)i_object).intValue(); } - // ----------------------------------------------------------------------------------------------------------------- + private void impl_assertColumnModelConsistency() throws IndexOutOfBoundsException { for ( int col = 0; col < m_columnModel.getColumnCount(); ++col ) @@ -536,7 +536,7 @@ public class GridControl } } - // ----------------------------------------------------------------------------------------------------------------- + private void impl_assertEquality( final XGridDataModel i_reference, final XGridDataModel i_compare ) throws IndexOutOfBoundsException { assertNotNull( i_reference ); @@ -559,7 +559,7 @@ public class GridControl } } - // ----------------------------------------------------------------------------------------------------------------- + private void impl_assertEquality( final XGridColumnModel i_reference, final XGridColumnModel i_compare ) throws IndexOutOfBoundsException { assertEquals( "column model comparison: wrong column counts", i_reference.getColumnCount(), i_compare.getColumnCount() ); @@ -571,7 +571,7 @@ public class GridControl } } - // ----------------------------------------------------------------------------------------------------------------- + private void impl_assertEquality( final XGridColumn i_reference, final XGridColumn i_compare ) { final Method[] methods = XGridColumn.class.getMethods(); @@ -593,7 +593,7 @@ public class GridControl } } - // ----------------------------------------------------------------------------------------------------------------- + private boolean impl_areSameInterface( final Object i_lhs, final Object i_rhs ) { final XInterface lhs = UnoRuntime.queryInterface( XInterface.class, i_lhs ); @@ -601,21 +601,21 @@ public class GridControl return UnoRuntime.areSame( lhs, rhs ); } - // ----------------------------------------------------------------------------------------------------------------- + @Before public void initTestCase() { m_disposables.clear(); } - // ----------------------------------------------------------------------------------------------------------------- + @After public void cleanupTestCase() { impl_dispose( m_disposables.toArray() ); } - // ----------------------------------------------------------------------------------------------------------------- + @BeforeClass public static void setUpConnection() throws java.lang.Exception { @@ -630,7 +630,7 @@ public class GridControl System.out.println( "seeding random number generator with " + seed ); } - // ----------------------------------------------------------------------------------------------------------------- + @AfterClass public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception @@ -642,20 +642,20 @@ public class GridControl System.out.println( "--------------------------------------------------------------------------------" ); } - // ----------------------------------------------------------------------------------------------------------------- + public <T> T createInstance( Class<T> i_interfaceClass, final String i_serviceIndentifer ) throws Exception { return UnoRuntime.queryInterface( i_interfaceClass, createInstance( i_serviceIndentifer ) ); } - // ----------------------------------------------------------------------------------------------------------------- + private Object createInstance( final String i_serviceName ) throws Exception { Object instance = m_context.getServiceManager().createInstanceWithContext( i_serviceName, m_context ); assertNotNull( "could not create an instance of '" + i_serviceName + "'", instance ); return instance; } - // ----------------------------------------------------------------------------------------------------------------- + private static final class DisposeListener implements XEventListener { DisposeListener( final Object i_component ) @@ -677,7 +677,7 @@ public class GridControl private boolean m_isDisposed; } - // ----------------------------------------------------------------------------------------------------------------- + private static final class ColumnModelListener implements XContainerListener { ColumnModelListener() @@ -734,7 +734,7 @@ public class GridControl private List< ContainerEvent > m_replacementEvents = new ArrayList< ContainerEvent >(); } - // ----------------------------------------------------------------------------------------------------------------- + private static final OfficeConnection m_connection = new OfficeConnection(); private static Random m_randomGenerator = new Random(); private final XComponentContext m_context; diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 9579d8c2ff6b..3c81a52b80f5 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -40,10 +40,10 @@ #include <limits> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... + using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::Reference; @@ -68,9 +68,9 @@ namespace toolkit namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; - //================================================================================================================== + //= AnimatedImagesPeer_Data - //================================================================================================================== + struct CachedImage { OUString sImageURL; @@ -101,9 +101,9 @@ namespace toolkit } }; - //================================================================================================================== + //= helper - //================================================================================================================== + namespace { @@ -292,9 +292,9 @@ namespace toolkit } } - //================================================================================================================== + //= AnimatedImagesPeer - //================================================================================================================== + AnimatedImagesPeer::AnimatedImagesPeer() :AnimatedImagesPeer_Base() @@ -525,8 +525,8 @@ namespace toolkit m_pData->aCachedImageSets.resize(0); } -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 91a7231fd833..16752a2afdc0 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -30,10 +30,10 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -51,9 +51,9 @@ namespace toolkit using ::com::sun::star::awt::FontDescriptor; using ::com::sun::star::awt::XStyleChangeListener; - //================================================================================================================== + //= WindowStyleSettings_Data - //================================================================================================================== + struct WindowStyleSettings_Data { VCLXWindow* pOwningWindow; @@ -84,9 +84,9 @@ namespace toolkit return 1L; } - //================================================================================================================== + //= StyleMethodGuard - //================================================================================================================== + class StyleMethodGuard { public: @@ -104,9 +104,9 @@ namespace toolkit SolarMutexGuard m_aGuard; }; - //================================================================================================================== + //= WindowStyleSettings - //================================================================================================================== + WindowStyleSettings::WindowStyleSettings(::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) :m_pData( new WindowStyleSettings_Data(i_rListenerMutex, i_rOwningWindow ) ) @@ -966,8 +966,8 @@ namespace toolkit m_pData->aStyleChangeListeners.removeInterface( i_rListener ); } -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx index b827cc42a16a..912c2f08ccb4 100644 --- a/toolkit/source/awt/stylesettings.hxx +++ b/toolkit/source/awt/stylesettings.hxx @@ -33,14 +33,14 @@ namespace osl class VCLXWindow; -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... - //================================================================================================================== + + //= WindowStyleSettings - //================================================================================================================== + struct WindowStyleSettings_Data; typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XStyleSettings > WindowStyleSettings_Base; @@ -168,9 +168,9 @@ namespace toolkit ::boost::scoped_ptr< WindowStyleSettings_Data > m_pData; }; -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + #endif // TOOLKIT_STYLESETTINGS_HXX diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 7047f123ff9b..04853a4ec6c1 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -24,9 +24,9 @@ #include <rtl/uuid.h> #include <vcl/dibtools.hxx> -// ---------------------------------------------------- + // class VCLXBitmap -// ---------------------------------------------------- + // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXBitmap::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 782bea9e98c0..d007b425e25e 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -29,9 +29,9 @@ #include "toolkit/awt/scrollabledialog.hxx" #include <toolkit/helper/property.hxx> -// ---------------------------------------------------- + // class VCLXContainer -// ---------------------------------------------------- + void VCLXContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index cf4aa026dce1..d6b2e22abba4 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -38,9 +38,9 @@ #include <vcl/bitmapex.hxx> #include <vcl/font.hxx> -// ---------------------------------------------------- + // class VCLXDevice -// ---------------------------------------------------- + VCLXDevice::VCLXDevice() { mpOutputDevice = NULL; diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 1f79313704b8..0fc2d187feb3 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -28,9 +28,9 @@ #include <vcl/outdev.hxx> -// ---------------------------------------------------- + // class VCLXFont -// ---------------------------------------------------- + VCLXFont::VCLXFont() { mpFontMetric = NULL; diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 21cc15ddd971..d447e1f47786 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -34,9 +34,9 @@ using namespace com::sun::star; -// ---------------------------------------------------- + // class VCLXGraphics -// ---------------------------------------------------- + // uno::XInterface uno::Any VCLXGraphics::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index b556d1bbdacf..cde9ca69e766 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -22,9 +22,9 @@ #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> -// ---------------------------------------------------- + // class VCLXPointer -// ---------------------------------------------------- + VCLXPointer::VCLXPointer() { } diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 8764d4cb5807..e7871e554e27 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -25,9 +25,9 @@ #include <rtl/uuid.h> #include <vcl/svapp.hxx> -// ---------------------------------------------------- + // class VCLXRegion -// ---------------------------------------------------- + VCLXRegion::VCLXRegion() { } diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index 3c3f0d4b7d33..3571719b5ddd 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -32,10 +32,10 @@ namespace toolkit ::com::sun::star::uno::Any getButtonLikeFaceColor( const Window* _pWindow ); } -//........................................................................ + namespace toolkit { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -56,9 +56,9 @@ namespace toolkit } } - //==================================================================== + //= VCLXSpinButton - //==================================================================== + DBG_NAME( VCLXSpinButton ) VCLXSpinButton::VCLXSpinButton() @@ -112,7 +112,7 @@ namespace toolkit typedef void (SpinButton::*SetSpinButtonValue) (long); typedef long (SpinButton::*GetSpinButtonValue) (void) const; - //................................................................ + void lcl_setSpinButtonValue(Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue ) { SolarMutexGuard aGuard; @@ -121,7 +121,7 @@ namespace toolkit (pSpinButton->*_pSetter)( _nValue ); } - //................................................................ + sal_Int32 lcl_getSpinButtonValue(const Window* _pWindow, GetSpinButtonValue _pGetter ) { SolarMutexGuard aGuard; @@ -340,8 +340,8 @@ namespace toolkit return aReturn; } -//........................................................................ + } // namespace toolkit -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 1579c02db8c0..91aead615cc0 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -37,9 +37,9 @@ #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> -// ---------------------------------------------------- + // class VCLXSystemDependentWindow -// ---------------------------------------------------- + VCLXSystemDependentWindow::VCLXSystemDependentWindow() { } diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 154e373476c8..337ea0dfe5c3 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -35,9 +35,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::view; -// ---------------------------------------------------- + // class VCLXTabPageContainer -// ---------------------------------------------------- + void VCLXTabPageContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx b/toolkit/source/awt/vclxtabpagemodel.cxx index 51756ed92220..f84e4755d1d0 100644 --- a/toolkit/source/awt/vclxtabpagemodel.cxx +++ b/toolkit/source/awt/vclxtabpagemodel.cxx @@ -24,9 +24,9 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx> #include <cppuhelper/typeprovider.hxx> -// ---------------------------------------------------- + // class VCLXDialog -// ---------------------------------------------------- + VCLXTabPageModel::VCLXTabPageModel() { diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index cf11f2ad3eb5..408612a7d2a4 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -236,9 +236,9 @@ void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (Runt pWindow->SetScreenNumber( _display ); } -// ---------------------------------------------------- + // class VCLXTopWindow -// ---------------------------------------------------- + void VCLXTopWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 6fdedf9ad8b4..08ded0437793 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -81,9 +81,9 @@ using ::com::sun::star::style::VerticalAlignment_MAKE_FIXED_SIZE; namespace WritingMode2 = ::com::sun::star::text::WritingMode2; namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior; -//==================================================================== + //= VCLXWindowImpl -//==================================================================== + class VCLXWindowImpl { private: @@ -336,8 +336,8 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() return mxWindowStyleSettings; } -//==================================================================== -//==================================================================== + + // Uses an out-parameter instead of return value, due to the object reference @@ -355,9 +355,9 @@ void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pW pWindow->GetBorder( rEvent.LeftInset, rEvent.TopInset, rEvent.RightInset, rEvent.BottomInset ); } -// ---------------------------------------------------- + // class VCLXWindow -// ---------------------------------------------------- + DBG_NAME(VCLXWindow); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 546aa7d5e74f..320b62a5cb0f 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -199,9 +199,9 @@ namespace toolkit } } -// ---------------------------------------------------- + // class VCLXGraphicControl -// ---------------------------------------------------- + void VCLXGraphicControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -330,7 +330,7 @@ void VCLXGraphicControl::setProperty( const OUString& PropertyName, const ::com: // class VCLXButton -// ---------------------------------------------------- + void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -613,9 +613,9 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -// ---------------------------------------------------- + // class VCLXImageControl -// ---------------------------------------------------- + void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -744,9 +744,9 @@ void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::s return aProp; } -// ---------------------------------------------------- + // class VCLXCheckBox -// ---------------------------------------------------- + void VCLXCheckBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) @@ -1046,9 +1046,9 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -// ---------------------------------------------------- + // class VCLXRadioButton -// ---------------------------------------------------- + void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -1329,9 +1329,9 @@ void VCLXRadioButton::ImplClickedOrToggled( bool bToggled ) } } -// ---------------------------------------------------- + // class VCLXSpinField -// ---------------------------------------------------- + void VCLXSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -1463,9 +1463,9 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } -// ---------------------------------------------------- + // class VCLXListBox -// ---------------------------------------------------- + void VCLXListBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -2172,9 +2172,9 @@ void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent ) throw (Runti VCLXWindow::disposing( i_rEvent ); } -// ---------------------------------------------------- + // class VCLXMessageBox -// ---------------------------------------------------- + void VCLXMessageBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -2257,9 +2257,9 @@ sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeExceptio return ::com::sun::star::awt::Size( 250, 100 ); } -// ---------------------------------------------------- + // class VCLXDialog -// ---------------------------------------------------- + void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { VCLXTopWindow::ImplGetPropertyIds( rIds ); @@ -2443,9 +2443,9 @@ throw(::com::sun::star::uno::RuntimeException) } -// ---------------------------------------------------- + // class VCLXTabPage -// ---------------------------------------------------- + VCLXMultiPage::VCLXMultiPage() : maTabListeners( *this ), mTabId( 1 ) { OSL_TRACE("VCLXMultiPage::VCLXMultiPage()" ); @@ -2728,9 +2728,9 @@ void VCLXMultiPage::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) }; } -// ---------------------------------------------------- + // class VCLXTabPage -// ---------------------------------------------------- + VCLXTabPage::VCLXTabPage() { } @@ -2862,9 +2862,9 @@ TabPage *VCLXTabPage::getTabPage() const throw (uno::RuntimeException) throw uno::RuntimeException(); } -// ---------------------------------------------------- + // class VCLXFixedHyperlink -// ---------------------------------------------------- + VCLXFixedHyperlink::VCLXFixedHyperlink() : @@ -3154,9 +3154,9 @@ void VCLXFixedHyperlink::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) VCLXWindow::ImplGetPropertyIds( rIds ); } -// ---------------------------------------------------- + // class VCLXFixedText -// ---------------------------------------------------- + void VCLXFixedText::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -3297,9 +3297,9 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio return VCLUnoHelper::ConvertToAWTSize( aAdjustedSize ); } -// ---------------------------------------------------- + // class VCLXScrollBar -// ---------------------------------------------------- + void VCLXScrollBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -3774,9 +3774,9 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } -// ---------------------------------------------------- + // class VCLXEdit -// ---------------------------------------------------- + void VCLXEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -4151,9 +4151,9 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -// ---------------------------------------------------- + // class VCLXComboBox -// ---------------------------------------------------- + void VCLXComboBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -4641,9 +4641,9 @@ void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent ) throw (Runt VCLXEdit::disposing( i_rEvent ); } -// ---------------------------------------------------- + // class VCLXFormattedSpinField -// ---------------------------------------------------- + void VCLXFormattedSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { // Interestingly in the UnoControl API this is @@ -4746,9 +4746,9 @@ void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const :: } -// ---------------------------------------------------- + // class VCLXDateField -// ---------------------------------------------------- + void VCLXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -5096,9 +5096,9 @@ sal_Bool VCLXDateField::isStrictFormat() throw(::com::sun::star::uno::RuntimeExc } -// ---------------------------------------------------- + // class VCLXTimeField -// ---------------------------------------------------- + void VCLXTimeField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -5405,9 +5405,9 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun: return aProp; } -// ---------------------------------------------------- + // class VCLXNumericField -// ---------------------------------------------------- + void VCLXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -5999,9 +5999,9 @@ void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::su } -// ---------------------------------------------------- + // class VCLXCurrencyField -// ---------------------------------------------------- + void VCLXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -6356,9 +6356,9 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com:: return aProp; } -// ---------------------------------------------------- + // class VCLXPatternField -// ---------------------------------------------------- + void VCLXPatternField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -6530,9 +6530,9 @@ void VCLXPatternField::setProperty( const OUString& PropertyName, const ::com::s return aProp; } -// ---------------------------------------------------- + // class VCLXToolBox -// ---------------------------------------------------- + VCLXToolBox::VCLXToolBox() { } @@ -6546,9 +6546,9 @@ VCLXToolBox::~VCLXToolBox() return getAccessibleFactory().createAccessibleContext( this ); } -// ---------------------------------------------------- + // class VCLXFrame -// ---------------------------------------------------- + VCLXFrame::VCLXFrame() { } diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 56b13a0bd25f..c9b2a04ac261 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -28,10 +28,10 @@ #include <toolkit/helper/externallock.hxx> #include <vcl/window.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ + using ::comphelper::OContextEntryGuard; using namespace ::com::sun::star; @@ -40,9 +40,9 @@ namespace toolkit using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; - //==================================================================== + //= OAccessibleControlContext - //==================================================================== + OAccessibleControlContext::OAccessibleControlContext() : OAccessibleControlContext_Base(new VCLExternalSolarLock) @@ -365,8 +365,8 @@ namespace toolkit return nColor; } -//........................................................................ + } //namespace toolkit -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 6a83618667d6..06a983f94b12 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -207,9 +207,9 @@ static const OUString& getStepPropertyName( ) return s_sStepProperty; } -// ---------------------------------------------------- + // class ControlModelContainerBase -// ---------------------------------------------------- + ControlModelContainerBase::ControlModelContainerBase( const Reference< XComponentContext >& rxContext ) :ControlModelContainer_IBase( rxContext ) ,maContainerListeners( *this ) @@ -265,7 +265,7 @@ Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException) { - // ==================================================================== + // tell our listeners { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -277,11 +277,11 @@ void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException) maChangeListeners.disposeAndClear( aDisposeEvent ); } - // ==================================================================== + // call the base class UnoControlModel::dispose(); - // ==================================================================== + // dispose our child models // for this, collect the models (we collect them from maModels, and this is modified when disposing children) ::std::vector< Reference< XControlModel > > aChildModels( maModels.size() ); @@ -838,7 +838,7 @@ namespace eExpandingGroup }; - // ........................................................................ + static sal_Int32 lcl_getDialogStep( const Reference< XControlModel >& _rxModel ) { sal_Int32 nStep = 0; @@ -1128,9 +1128,9 @@ void ControlModelContainerBase::stopControlListening( const Reference< XControlM xModelProps->removePropertyChangeListener( getTabIndexPropertyName(), this ); } -// ============================================================================ + // = class ResourceListener -// ============================================================================ + ResourceListener::ResourceListener( const Reference< util::XModifyListener >& rListener ) : @@ -1351,10 +1351,10 @@ throw ( RuntimeException ) } } -//=============================================================== -// ---------------------------------------------------- + + // class DialogContainerControl -// ---------------------------------------------------- + ControlContainerBase::ControlContainerBase( const Reference< XComponentContext >& rxContext ) :ContainerControl_IBase() ,m_xContext(rxContext) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index a4ca7b950ad2..63eb71e29212 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::util; #define PROPERTY_DIALOGSOURCEURL OUString( "DialogSourceURL" ) #define PROPERTY_IMAGEURL OUString( "ImageURL" ) #define PROPERTY_GRAPHIC OUString( "Graphic" ) -// + // we probably will need both a hash of control models and hash of controls // => use some template magic @@ -301,9 +301,9 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 } -// ============================================================================ + // = class UnoDialogControl -// ============================================================================ + UnoDialogControl::UnoDialogControl( const uno::Reference< uno::XComponentContext >& rxContext ) :UnoDialogControl_Base( rxContext ) @@ -648,9 +648,9 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang ControlContainerBase::ImplModelPropertiesChanged(rEvents); } -// ---------------------------------------------------- + // class MultiPageControl -// ---------------------------------------------------- + UnoMultiPageControl::UnoMultiPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext), maTabListeners( *this ) { maComponentInfos.nWidth = 280; @@ -951,9 +951,9 @@ sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) throw (RuntimeException return sal_True; } -// ---------------------------------------------------- + // class UnoPageControl -// ---------------------------------------------------- + UnoPageControl::UnoPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext) { maComponentInfos.nWidth = 280; @@ -1058,9 +1058,9 @@ sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) throw (RuntimeException) // Frame control -// ---------------------------------------------------- + // class UnoFrameControl -// ---------------------------------------------------- + UnoFrameControl::UnoFrameControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext) { maComponentInfos.nWidth = 280; diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index ce0bcbb0227d..9691838fc87d 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -29,10 +29,10 @@ #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> -//........................................................................ + namespace toolkit { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -43,28 +43,28 @@ namespace toolkit namespace { - // ............................................................... + ::osl::Mutex& getDefaultFormatsMutex() { static ::osl::Mutex s_aDefaultFormatsMutex; return s_aDefaultFormatsMutex; } - // ............................................................... + Reference< XNumberFormatsSupplier >& lcl_getDefaultFormatsAccess_nothrow() { static Reference< XNumberFormatsSupplier > s_xDefaultFormats; return s_xDefaultFormats; } - // ............................................................... + bool& lcl_getTriedCreation() { static bool s_bTriedCreation = false; return s_bTriedCreation; } - // ............................................................... + const Reference< XNumberFormatsSupplier >& lcl_getDefaultFormats_throw() { ::osl::MutexGuard aGuard( getDefaultFormatsMutex() ); @@ -82,16 +82,16 @@ namespace toolkit return rDefaultFormats; } - // ............................................................... + static oslInterlockedCount s_refCount(0); - // ............................................................... + void lcl_registerDefaultFormatsClient() { osl_atomic_increment( &s_refCount ); } - // ............................................................... + void lcl_revokeDefaultFormatsClient() { ::osl::ClearableMutexGuard aGuard( getDefaultFormatsMutex() ); @@ -108,9 +108,9 @@ namespace toolkit } } - // =================================================================== + // = UnoControlFormattedFieldModel - // =================================================================== + UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) @@ -417,9 +417,9 @@ namespace toolkit return xInfo; } - // =================================================================== + // = UnoFormattedFieldControl - // =================================================================== + UnoFormattedFieldControl::UnoFormattedFieldControl() :UnoSpinFieldControl() @@ -452,9 +452,9 @@ namespace toolkit GetTextListeners().textChanged( e ); } -//........................................................................ + } // namespace toolkit -//........................................................................ + extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL stardiv_Toolkit_UnoControlFormattedFieldModel_get_implementation( diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 736125e87f4f..be15946a4da7 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -52,10 +52,10 @@ #define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT -//........................................................................ + // namespace toolkit // { -//........................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -65,9 +65,9 @@ using namespace ::com::sun::star::container; using namespace ::comphelper; - //==================================================================== + //= OGeometryControlModel_Base - //==================================================================== + OGeometryControlModel_Base::OGeometryControlModel_Base(::com::sun::star::uno::XAggregation* _pAggregateInstance) :OPropertySetAggregationHelper( m_aBHelper ) @@ -435,9 +435,9 @@ xComp->dispose(); } - //==================================================================== + //= OCommonGeometryControlModel - //==================================================================== + typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; @@ -630,8 +630,8 @@ } } -//........................................................................ + // } // namespace toolkit -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 4c5fb7c0053b..dd8654b78f06 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -34,9 +34,9 @@ namespace toolkit using namespace ::com::sun::star::util; using namespace ::com::sun::star::style; - //================================================================================================================== + //= DefaultGridColumnModel - //================================================================================================================== + GridColumn::GridColumn() :GridColumn_Base( m_aMutex ) diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index adb1798debec..6fae5db67ee6 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -267,9 +267,9 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(Runtime } -//====================================================================================================================== + //= UnoGridControl -//====================================================================================================================== + UnoGridControl::UnoGridControl() :UnoGridControl_Base() ,m_aSelectionListeners( *this ) diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 313d6b26b027..1ebcf6d9a773 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -37,9 +37,9 @@ namespace toolkit class GridEventForwarder; -// =================================================================== + // = UnoGridModel -// =================================================================== + class UnoGridModel : public UnoControlModel { protected: @@ -69,9 +69,9 @@ public: }; -// =================================================================== + // = UnoGridControl -// =================================================================== + typedef ::cppu::ImplInheritanceHelper2 < UnoControlBase , ::com::sun::star::awt::grid::XGridControl , ::com::sun::star::awt::grid::XGridRowSelection diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx index cad7956ac29f..14b00678c0b3 100644 --- a/toolkit/source/controls/grid/grideventforwarder.cxx +++ b/toolkit/source/controls/grid/grideventforwarder.cxx @@ -20,10 +20,10 @@ #include "grideventforwarder.hxx" #include "gridcontrol.hxx" -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -40,9 +40,9 @@ namespace toolkit using ::com::sun::star::container::ContainerEvent; using ::com::sun::star::lang::EventObject; - //================================================================================================================== + //= GridEventForwarder - //================================================================================================================== + GridEventForwarder::GridEventForwarder( UnoGridControl& i_parent ) :m_parent( i_parent ) @@ -130,8 +130,8 @@ namespace toolkit xPeer->disposing( i_event ); } -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx index 87a0efad4d25..41a356e97f2c 100644 --- a/toolkit/source/controls/grid/grideventforwarder.hxx +++ b/toolkit/source/controls/grid/grideventforwarder.hxx @@ -26,16 +26,16 @@ #include <cppuhelper/implbase2.hxx> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... + class UnoGridControl; - //================================================================================================================== + //= GridEventForwarder - //================================================================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::grid::XGridDataListener , ::com::sun::star::container::XContainerListener > GridEventForwarder_Base; @@ -69,9 +69,9 @@ namespace toolkit UnoGridControl& m_parent; }; -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + #endif // TOOLKIT_GRIDEVENTFORWARDER_HXX diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx index 176229ac32f8..e4050ec1207a 100644 --- a/toolkit/source/controls/grid/initguard.hxx +++ b/toolkit/source/controls/grid/initguard.hxx @@ -24,14 +24,14 @@ #include <comphelper/componentguard.hxx> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... - //================================================================================================================== + + //= InitGuard - //================================================================================================================== + template < class IMPL > class InitGuard : public ::comphelper::ComponentGuard { @@ -48,9 +48,9 @@ namespace toolkit } }; -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + #endif // SVTOOLS_INITGUARD_HXX diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 0f91eaf23945..7c8627b3ee36 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -258,9 +258,9 @@ private: } } - //================================================================================================================== + //= SortableGridDataModel - //================================================================================================================== + DBG_NAME( SortableGridDataModel ) SortableGridDataModel::SortableGridDataModel( Reference< XComponentContext > const & rxContext ) diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 4cbf5fbe1626..08dfb3a27059 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -24,10 +24,10 @@ #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <osl/diagnose.h> -//........................................................................ + namespace toolkit { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -35,9 +35,9 @@ namespace toolkit using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -// ---------------------------------------------------- + // helper -// ---------------------------------------------------- + static void lcl_throwIllegalArgumentException( ) { // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... @@ -49,9 +49,9 @@ static void lcl_throwIndexOutOfBoundsException( ) throw IndexOutOfBoundsException(); } - // =================================================================== + // = UnoControlRoadmapModel - // =================================================================== + UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XComponentContext >& i_factory ) :UnoControlRoadmapModel_Base( i_factory ) @@ -353,9 +353,9 @@ static void lcl_throwIndexOutOfBoundsException( ) maContainerListeners.removeInterface( xListener ); } - // =================================================================== + // = UnoRoadmapControl - // =================================================================== + UnoRoadmapControl::UnoRoadmapControl() :UnoControlRoadmap_Base() diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index c5d2ff6a1fa6..3dd1467436b5 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -49,12 +49,12 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( ) & m_bInteractive, ::getCppuType( &m_bInteractive ) ); - // ... + // Note that the list of registered properties has to be fixed: Different // instances of this class have to register the same set of properties with // the same attributes. - // + // This is because all instances of the class share the same PropertySetInfo // which has been built from the registered property of _one_ instance. } diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 88d43459ecd9..07948f485fa8 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -38,9 +38,9 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -// ---------------------------------------------------- + // class StdTabController -// ---------------------------------------------------- + StdTabController::StdTabController() { } diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index c9017edb444f..a718f2afc727 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -31,9 +31,9 @@ #define UNOCONTROL_STREAMVERSION (short)2 -// ---------------------------------------------------- + // class UnoControlModelEntryList -// ---------------------------------------------------- + UnoControlModelEntryList::UnoControlModelEntryList() { } @@ -86,9 +86,9 @@ void UnoControlModelEntryList::insert( size_t i, UnoControlModelEntry* item ) { } -// ---------------------------------------------------- + // class StdTabControllerModel -// ---------------------------------------------------- + StdTabControllerModel::StdTabControllerModel() { mbGroupControl = true; diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 63532b33f838..0df53a77f9f4 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -41,9 +41,9 @@ using namespace ::com::sun::star::view; using ::com::sun::star::awt::tab::XTabPageModel; #define WRONG_TYPE_EXCEPTION "Type must be ::com::sun::star::awt::tab::XTabPageModel!" -// ---------------------------------------------------- + // class UnoControlTabPageContainerModel -// ---------------------------------------------------- + UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XComponentContext >& i_factory ) :UnoControlTabPageContainerModel_Base( i_factory ) ,maContainerListeners( *this ) @@ -214,9 +214,9 @@ void UnoControlTabPageContainerModel::removeContainerListener( const Reference< maContainerListeners.removeInterface( l ); } -// ---------------------------------------------------- + // class UnoControlTabPageContainer -// ---------------------------------------------------- + UnoControlTabPageContainer::UnoControlTabPageContainer( const uno::Reference< uno::XComponentContext >& rxContext ) :UnoControlTabPageContainer_Base(rxContext) ,m_aTabPageListeners( *this ) diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index c9971827ce42..b48d7ac5d735 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -25,16 +25,16 @@ // for introspection #include <toolkit/awt/vclxwindows.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ + using namespace ::com::sun::star; - //==================================================================== + //= UnoControlScrollBarModel - //==================================================================== + UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) @@ -83,9 +83,9 @@ namespace toolkit } - //==================================================================== + //= UnoControlScrollBarModel - //==================================================================== + UnoScrollBarControl::UnoScrollBarControl() :UnoControlBase() ,maAdjustmentListeners( *this ) @@ -279,9 +279,9 @@ namespace toolkit -//........................................................................ + } // namespace toolkit -//........................................................................ + extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL stardiv_Toolkit_UnoControlScrollBarModel_get_implementation( diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 6c435876accc..f1736047796c 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -60,9 +60,9 @@ public: css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); }; -//==================================================================== + //= UnoSpinButtonControl -//==================================================================== + typedef ::cppu::ImplHelper2 < css::awt::XAdjustmentListener , css::awt::XSpinValue @@ -111,9 +111,9 @@ public: css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); }; - //==================================================================== + //= UnoSpinButtonModel - //==================================================================== + UnoSpinButtonModel::UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) @@ -199,9 +199,9 @@ public: return aServices; } - //==================================================================== + //= UnoSpinButtonControl - //==================================================================== + UnoSpinButtonControl::UnoSpinButtonControl() :UnoControlBase() diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 657cbd0c2511..8151559d36d8 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -38,9 +38,9 @@ using namespace ::com::sun::star::view; namespace toolkit { -// ---------------------------------------------------- + // class UnoTreeModel -// ---------------------------------------------------- + UnoTreeModel::UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) { diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index 1da2846e7594..ecbc9328dcd9 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -29,9 +29,9 @@ namespace toolkit { -// =================================================================== + // = UnoTreeModel -// =================================================================== + class UnoTreeModel : public UnoControlModel { protected: diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 85df9cb56a80..2e16a7954ddc 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -91,7 +91,7 @@ static Sequence< OUString> lcl_ImplGetPropertyNames( const Reference< XMultiProp return aNames; } -// ==================================================== + class VclListenerLock { private: @@ -130,9 +130,9 @@ struct UnoControl_Data } }; -// ---------------------------------------------------- + // class UnoControl -// ---------------------------------------------------- + DBG_NAME( UnoControl ) UnoControl::UnoControl() : maDisposeListeners( *this ) diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 0f92dcf0e695..7cfec1dc6373 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -28,9 +28,9 @@ using namespace com::sun::star; -// ---------------------------------------------------- + // class UnoControlBase -// ---------------------------------------------------- + bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId ) { diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 09245689bc2a..86d4224b008b 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -40,9 +40,9 @@ using namespace ::com::sun::star; -// ---------------------------------------------------- + // class UnoControlHolder -// ---------------------------------------------------- + struct UnoControlHolder { uno::Reference< awt::XControl > mxControl; @@ -310,10 +310,10 @@ OUString UnoControlHolderList::impl_getFreeName_throw() } throw uno::RuntimeException("out of identifiers", NULL ); } -// ---------------------------------------------------- + // Function to set the controls' visibility according // to the dialog's "Step" property -// ---------------------------------------------------- + void implUpdateVisibility ( sal_Int32 nDialogStep, @@ -355,9 +355,9 @@ void implUpdateVisibility } -// ---------------------------------------------------- + // class DialogStepChangedListener -// ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1< beans::XPropertyChangeListener > PropertyChangeListenerHelper; class DialogStepChangedListener: public PropertyChangeListenerHelper @@ -392,9 +392,9 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyC implUpdateVisibility( nDialogStep, mxControlContainer ); } -// ---------------------------------------------------- + // class UnoControlContainer -// ---------------------------------------------------- + UnoControlContainer::UnoControlContainer() :UnoControlContainer_Base() ,maCListeners( *this ) diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 1f505023a6a9..6245b5203444 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -23,9 +23,9 @@ #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx> -// ---------------------------------------------------- + // class UnoControlContainerModel -// ---------------------------------------------------- + UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) { diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 3af23cb198be..fd0550664452 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -110,9 +110,9 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, } } -// ---------------------------------------------------- + // class UnoControlModel -// ---------------------------------------------------- + UnoControlModel::UnoControlModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel_Base() ,MutexAndBroadcastHelper() @@ -1052,7 +1052,7 @@ bool convertType(Any& _rConvertedValue, const Any& _rNewValueTest, const TYPE* / } } -// .................................................................. + sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue ) throw (IllegalArgumentException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index e79c2f38ec40..e69a30030dba 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -117,9 +117,9 @@ ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL ) return xGraphic; } -// ---------------------------------------------------- + // class UnoControlEditModel -// ---------------------------------------------------- + UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -176,9 +176,9 @@ stardiv_Toolkit_UnoControlEditModel_get_implementation( return cppu::acquire(new UnoControlEditModel(context)); } -// ---------------------------------------------------- + // class UnoEditControl -// ---------------------------------------------------- + UnoEditControl::UnoEditControl() :UnoControlBase() ,maTextListeners( *this ) @@ -502,9 +502,9 @@ stardiv_Toolkit_UnoEditControl_get_implementation( return cppu::acquire(new UnoEditControl()); } -// ---------------------------------------------------- + // class UnoControlFileControlModel -// ---------------------------------------------------- + UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -570,9 +570,9 @@ stardiv_Toolkit_UnoControlFileControlModel_get_implementation( return cppu::acquire(new UnoControlFileControlModel(context)); } -// ---------------------------------------------------- + // class UnoFileControl -// ---------------------------------------------------- + UnoFileControl::UnoFileControl() :UnoEditControl() { @@ -591,9 +591,9 @@ stardiv_Toolkit_UnoFileControl_get_implementation( return cppu::acquire(new UnoFileControl()); } -// ---------------------------------------------------- + // class GraphicControlModel -// ---------------------------------------------------- + uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { if ( nPropId == BASEPROPERTY_GRAPHIC ) @@ -662,9 +662,9 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n } } -// ---------------------------------------------------- + // class UnoControlButtonModel -// ---------------------------------------------------- + UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext >& rxContext ) :GraphicControlModel( rxContext ) { @@ -727,9 +727,9 @@ stardiv_Toolkit_UnoControlButtonModel_get_implementation( return cppu::acquire(new UnoControlButtonModel(context)); } -// ---------------------------------------------------- + // class UnoButtonControl -// ---------------------------------------------------- + UnoButtonControl::UnoButtonControl() :UnoButtonControl_Base() ,maActionListeners( *this ) @@ -875,9 +875,9 @@ stardiv_Toolkit_UnoButtonControl_get_implementation( return cppu::acquire(new UnoButtonControl()); } -// ---------------------------------------------------- + // class UnoControlImageControlModel -// ---------------------------------------------------- + UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComponentContext >& rxContext ) :GraphicControlModel( rxContext ) ,mbAdjustingImageScaleMode( false ) @@ -965,9 +965,9 @@ stardiv_Toolkit_UnoControlImageControlModel_get_implementation( return cppu::acquire(new UnoControlImageControlModel(context)); } -// ---------------------------------------------------- + // class UnoImageControlControl -// ---------------------------------------------------- + UnoImageControlControl::UnoImageControlControl() :UnoImageControlControl_Base() ,maActionListeners( *this ) @@ -1018,9 +1018,9 @@ stardiv_Toolkit_UnoImageControlControl_get_implementation( return cppu::acquire(new UnoImageControlControl()); } -// ---------------------------------------------------- + // class UnoControlRadioButtonModel -// ---------------------------------------------------- + UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XComponentContext >& rxContext ) :GraphicControlModel( rxContext ) { @@ -1072,9 +1072,9 @@ stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation( return cppu::acquire(new UnoControlRadioButtonModel(context)); } -// ---------------------------------------------------- + // class UnoRadioButtonControl -// ---------------------------------------------------- + UnoRadioButtonControl::UnoRadioButtonControl() :UnoRadioButtonControl_Base() ,maItemListeners( *this ) @@ -1212,7 +1212,7 @@ void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) thr // note that speaking stricly, this is wrong: When in 1.0.x, the user would have de-selected // a radio button _without_ selecing another one, this would have caused a notification. // With the change done here, this today won't cause a notification anymore. - // + // Fortunately, it's not possible for the user to de-select a radio button without selecting another on, // at least not via the regular UI. It _would_ be possible via the Accessibility API, which // counts as "user input", too. But in 1.0.x, there was no Accessibility API, so there is nothing @@ -1242,9 +1242,9 @@ stardiv_Toolkit_UnoRadioButtonControl_get_implementation( return cppu::acquire(new UnoRadioButtonControl()); } -// ---------------------------------------------------- + // class UnoControlCheckBoxModel -// ---------------------------------------------------- + UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentContext >& rxContext ) :GraphicControlModel( rxContext ) { @@ -1296,9 +1296,9 @@ stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation( return cppu::acquire(new UnoControlCheckBoxModel(context)); } -// ---------------------------------------------------- + // class UnoCheckBoxControl -// ---------------------------------------------------- + UnoCheckBoxControl::UnoCheckBoxControl() :UnoCheckBoxControl_Base() ,maItemListeners( *this ), maActionListeners( *this ) @@ -1441,9 +1441,9 @@ stardiv_Toolkit_UnoCheckBoxControl_get_implementation( return cppu::acquire(new UnoCheckBoxControl()); } -// ---------------------------------------------------- + // class UnoControlFixedHyperlinkModel -// ---------------------------------------------------- + UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -1505,9 +1505,9 @@ stardiv_Toolkit_UnoControlFixedHyperlinkModel_get_implementation( return cppu::acquire(new UnoControlFixedHyperlinkModel(context)); } -// ---------------------------------------------------- + // class UnoFixedHyperlinkControl -// ---------------------------------------------------- + UnoFixedHyperlinkControl::UnoFixedHyperlinkControl() :UnoControlBase() ,maActionListeners( *this ) @@ -1644,9 +1644,9 @@ stardiv_Toolkit_UnoFixedHyperlinkControl_get_implementation( return cppu::acquire(new UnoFixedHyperlinkControl()); } -// ---------------------------------------------------- + // class UnoControlFixedTextModel -// ---------------------------------------------------- + UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -1702,9 +1702,9 @@ stardiv_Toolkit_UnoControlFixedTextModel_get_implementation( return cppu::acquire(new UnoControlFixedTextModel(context)); } -// ---------------------------------------------------- + // class UnoFixedTextControl -// ---------------------------------------------------- + UnoFixedTextControl::UnoFixedTextControl() :UnoControlBase() { @@ -1791,9 +1791,9 @@ stardiv_Toolkit_UnoFixedTextControl_get_implementation( return cppu::acquire(new UnoFixedTextControl()); } -// ---------------------------------------------------- + // class UnoControlGroupBoxModel -// ---------------------------------------------------- + UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -1851,9 +1851,9 @@ stardiv_Toolkit_UnoControlGroupBoxModel_get_implementation( return cppu::acquire(new UnoControlGroupBoxModel(context)); } -// ---------------------------------------------------- + // class UnoGroupBoxControl -// ---------------------------------------------------- + UnoGroupBoxControl::UnoGroupBoxControl() :UnoControlBase() { @@ -1879,9 +1879,9 @@ stardiv_Toolkit_UnoGroupBoxControl_get_implementation( return cppu::acquire(new UnoGroupBoxControl()); } -// ===================================================================================================================== + // = UnoControlListBoxModel_Data -// ===================================================================================================================== + struct ListItem { OUString ItemText; @@ -1981,9 +1981,9 @@ private: ::std::vector< ListItem > m_aListItems; }; -// ===================================================================================================================== + // = UnoControlListBoxModel -// ===================================================================================================================== + UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XComponentContext >& rxContext, ConstructorMode const i_mode ) :UnoControlListBoxModel_Base( rxContext ) @@ -2433,9 +2433,9 @@ stardiv_Toolkit_UnoControlListBoxModel_get_implementation( return cppu::acquire(new UnoControlListBoxModel(context)); } -// ---------------------------------------------------- + // class UnoListBoxControl -// ---------------------------------------------------- + UnoListBoxControl::UnoListBoxControl() :UnoListBoxControl_Base() ,maActionListeners( *this ) @@ -2865,9 +2865,9 @@ stardiv_Toolkit_UnoListBoxControl_get_implementation( return cppu::acquire(new UnoListBoxControl()); } -// ---------------------------------------------------- + // class UnoControlComboBoxModel -// ---------------------------------------------------- + UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentContext >& rxContext ) :UnoControlListBoxModel( rxContext, ConstructWithoutProperties ) { @@ -2949,9 +2949,9 @@ stardiv_Toolkit_UnoControlComboBoxModel_get_implementation( return cppu::acquire(new UnoControlComboBoxModel(context)); } -// ---------------------------------------------------- + // class UnoComboBoxControl -// ---------------------------------------------------- + UnoComboBoxControl::UnoComboBoxControl() :UnoEditControl() ,maActionListeners( *this ) @@ -3270,9 +3270,9 @@ stardiv_Toolkit_UnoComboBoxControl_get_implementation( return cppu::acquire(new UnoComboBoxControl()); } -// ---------------------------------------------------- + // UnoSpinFieldControl -// ---------------------------------------------------- + UnoSpinFieldControl::UnoSpinFieldControl() :UnoEditControl() ,maSpinListeners( *this ) @@ -3362,9 +3362,9 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::sta xField->enableRepeat( bRepeat ); } -// ---------------------------------------------------- + // class UnoControlDateFieldModel -// ---------------------------------------------------- + UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -3414,9 +3414,9 @@ stardiv_Toolkit_UnoControlDateFieldModel_get_implementation( return cppu::acquire(new UnoControlDateFieldModel(context)); } -// ---------------------------------------------------- + // class UnoDateFieldControl -// ---------------------------------------------------- + UnoDateFieldControl::UnoDateFieldControl() :UnoSpinFieldControl() { @@ -3618,9 +3618,9 @@ stardiv_Toolkit_UnoDateFieldControl_get_implementation( return cppu::acquire(new UnoDateFieldControl()); } -// ---------------------------------------------------- + // class UnoControlTimeFieldModel -// ---------------------------------------------------- + UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -3670,9 +3670,9 @@ stardiv_Toolkit_UnoControlTimeFieldModel_get_implementation( return cppu::acquire(new UnoControlTimeFieldModel(context)); } -// ---------------------------------------------------- + // class UnoTimeFieldControl -// ---------------------------------------------------- + UnoTimeFieldControl::UnoTimeFieldControl() :UnoSpinFieldControl() { @@ -3833,9 +3833,9 @@ stardiv_Toolkit_UnoTimeFieldControl_get_implementation( return cppu::acquire(new UnoTimeFieldControl()); } -// ---------------------------------------------------- + // class UnoControlNumericFieldModel -// ---------------------------------------------------- + UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -3885,9 +3885,9 @@ stardiv_Toolkit_UnoControlNumericFieldModel_get_implementation( return cppu::acquire(new UnoControlNumericFieldModel(context)); } -// ---------------------------------------------------- + // class UnoNumericFieldControl -// ---------------------------------------------------- + UnoNumericFieldControl::UnoNumericFieldControl() :UnoSpinFieldControl() { @@ -4045,9 +4045,9 @@ stardiv_Toolkit_UnoNumericFieldControl_get_implementation( return cppu::acquire(new UnoNumericFieldControl()); } -// ---------------------------------------------------- + // class UnoControlCurrencyFieldModel -// ---------------------------------------------------- + UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -4103,9 +4103,9 @@ stardiv_Toolkit_UnoControlCurrencyFieldModel_get_implementation( return cppu::acquire(new UnoControlCurrencyFieldModel(context)); } -// ---------------------------------------------------- + // class UnoCurrencyFieldControl -// ---------------------------------------------------- + UnoCurrencyFieldControl::UnoCurrencyFieldControl() :UnoSpinFieldControl() { @@ -4262,9 +4262,9 @@ stardiv_Toolkit_UnoCurrencyFieldControl_get_implementation( return cppu::acquire(new UnoCurrencyFieldControl()); } -// ---------------------------------------------------- + // class UnoControlPatternFieldModel -// ---------------------------------------------------- + UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -4313,9 +4313,9 @@ stardiv_Toolkit_UnoControlPatternFieldModel_get_implementation( return cppu::acquire(new UnoControlPatternFieldModel(context)); } -// ---------------------------------------------------- + // class UnoPatternFieldControl -// ---------------------------------------------------- + UnoPatternFieldControl::UnoPatternFieldControl() :UnoSpinFieldControl() { @@ -4410,9 +4410,9 @@ stardiv_Toolkit_UnoPatternFieldControl_get_implementation( return cppu::acquire(new UnoPatternFieldControl()); } -// ---------------------------------------------------- + // class UnoControlProgressBarModel -// ---------------------------------------------------- + UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -4474,9 +4474,9 @@ stardiv_Toolkit_UnoControlProgressBarModel_get_implementation( return cppu::acquire(new UnoControlProgressBarModel(context)); } -// ---------------------------------------------------- + // class UnoProgressBarControl -// ---------------------------------------------------- + UnoProgressBarControl::UnoProgressBarControl() :UnoControlBase() { @@ -4558,9 +4558,9 @@ stardiv_Toolkit_UnoProgressBarControl_get_implementation( return cppu::acquire(new UnoProgressBarControl()); } -// ---------------------------------------------------- + // class UnoControlFixedLineModel -// ---------------------------------------------------- + UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -4618,9 +4618,9 @@ stardiv_Toolkit_UnoControlFixedLineModel_get_implementation( return cppu::acquire(new UnoControlFixedLineModel(context)); } -// ---------------------------------------------------- + // class UnoFixedLineControl -// ---------------------------------------------------- + UnoFixedLineControl::UnoFixedLineControl() :UnoControlBase() { diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index e9d9535ed43c..7acdb933c20e 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -33,15 +33,15 @@ // here) died, it's not said that everybody released all references to the // XAccessibleContext used by this component, and implemented in the acc lib. // So we cannot really unload the lib. - // + // Alternatively, if the lib would us own "usage counting", i.e. every component // implemented therein would affect a static ref count, the acc lib could care // for unloading itself. -//........................................................................ + namespace toolkit { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -58,9 +58,9 @@ namespace toolkit static ::rtl::Reference< IAccessibleFactory > s_pFactory; } - //==================================================================== + //= AccessibleDummyFactory - //==================================================================== + class AccessibleDummyFactory : public IAccessibleFactory { public: @@ -170,9 +170,9 @@ namespace toolkit return m_refCount; } - //==================================================================== + //= AccessibilityClient - //==================================================================== + AccessibilityClient::AccessibilityClient() :m_bInitialized( false ) @@ -270,8 +270,8 @@ namespace toolkit return *s_pFactory; } -//........................................................................ + } // namespace toolkit -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index c66d1489cd43..de1a2ee3a9cb 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -40,10 +40,10 @@ #include <functional> #include <algorithm> -//........................................................................ + namespace toolkitform { -//........................................................................ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -277,7 +277,7 @@ namespace toolkitform // if we survived classifyFormControl, then it's a real form control, and they all have // service infos - // ================================ + // set the common widget properties @@ -347,7 +347,7 @@ namespace toolkitform // text style _rpDescriptor->TextStyle = 0; - // ............................ + // multi line and word break // The MultiLine property of the control is mapped to both the "MULTILINE" and // "WORDBREAK" style flags @@ -359,7 +359,7 @@ namespace toolkitform if ( bMultiLine ) _rpDescriptor->TextStyle |= TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK; } - // ............................ + // horizontal alignment static const OUString FM_PROP_ALIGN("Align"); if ( xPSI->hasPropertyByName( FM_PROP_ALIGN ) ) @@ -377,7 +377,7 @@ namespace toolkitform OSL_FAIL( "describePDFControl: invalid text align!" ); } } - // ............................ + // vertical alignment { OUString sVertAlignPropertyName( "VerticalAlign" ); @@ -414,17 +414,17 @@ namespace toolkitform _rpDescriptor->TabOrder = nIndex; } - // ================================ + // special widget properties // edits if ( _rpDescriptor->getType() == ::vcl::PDFWriter::Edit ) { ::vcl::PDFWriter::EditWidget* pEditWidget = static_cast< ::vcl::PDFWriter::EditWidget* >( _rpDescriptor.get() ); - // ............................ + // multiline (already flagged in the TextStyle) pEditWidget->MultiLine = ( _rpDescriptor->TextStyle & TEXT_DRAW_MULTILINE ) != 0; - // ............................ + // password input OUString sEchoCharPropName( "EchoChar" ); if ( xPSI->hasPropertyByName( sEchoCharPropName ) ) @@ -433,12 +433,12 @@ namespace toolkitform if ( ( xModelProps->getPropertyValue( sEchoCharPropName ) >>= nEchoChar ) && ( nEchoChar != 0 ) ) pEditWidget->Password = true; } - // ............................ + // file select static const OUString FM_SUN_COMPONENT_FILECONTROL("com.sun.star.form.component.FileControl"); if ( xSI->supportsService( FM_SUN_COMPONENT_FILECONTROL ) ) pEditWidget->FileSelect = true; - // ............................ + // maximum text length static const OUString FM_PROP_MAXTEXTLEN("MaxTextLen"); if ( xPSI->hasPropertyByName( FM_PROP_MAXTEXTLEN ) ) @@ -552,14 +552,14 @@ namespace toolkitform if ( _rpDescriptor->getType() == ::vcl::PDFWriter::ListBox ) { ::vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< ::vcl::PDFWriter::ListBoxWidget* >( _rpDescriptor.get() ); - // ............................ + // drop down static const OUString FM_PROP_DROPDOWN("Dropdown"); OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_DROPDOWN ) >>= pListWidget->DropDown ); - // ............................ + // multi selection OSL_VERIFY( xModelProps->getPropertyValue("MultiSelection") >>= pListWidget->MultiSelect ); - // ............................ + // entries getStringItemVector( xModelProps, pListWidget->Entries ); // since we explicitly list the entries in the order in which they appear, they should not be @@ -586,14 +586,14 @@ namespace toolkitform if ( _rpDescriptor->getType() == ::vcl::PDFWriter::ComboBox ) { ::vcl::PDFWriter::ComboBoxWidget* pComboWidget = static_cast< ::vcl::PDFWriter::ComboBoxWidget* >( _rpDescriptor.get() ); - // ............................ + // entries getStringItemVector( xModelProps, pComboWidget->Entries ); // same reasoning as above pComboWidget->Sort = false; } - // ================================ + // some post-processing // text line ends @@ -606,8 +606,8 @@ namespace toolkitform } } -//........................................................................ + } // namespace toolkitform -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/helper/imagealign.cxx b/toolkit/source/helper/imagealign.cxx index fa5297f5eebc..5201d27ef900 100644 --- a/toolkit/source/helper/imagealign.cxx +++ b/toolkit/source/helper/imagealign.cxx @@ -21,10 +21,10 @@ #include <com/sun/star/awt/ImagePosition.hpp> #include <com/sun/star/awt/ImageAlign.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ + using namespace ::com::sun::star::awt::ImagePosition; using namespace ::com::sun::star::awt::ImageAlign; @@ -120,8 +120,8 @@ namespace toolkit return nReturn; } -//........................................................................ + } // namespace toolkit -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index fbb34badbd6e..26d8adf734d4 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -20,9 +20,9 @@ #include <toolkit/helper/listenermultiplexer.hxx> #include <com/sun/star/lang/DisposedException.hpp> -// ---------------------------------------------------- + // class ListenerMultiplexerBase -// ---------------------------------------------------- + ListenerMultiplexerBase::ListenerMultiplexerBase( ::cppu::OWeakObject& rSource ) : ::cppu::OInterfaceContainerHelper( GetMutex() ), mrContext( rSource ) { @@ -39,9 +39,9 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase() } -// ---------------------------------------------------- + // class EventListenerMultiplexer -// ---------------------------------------------------- + EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource ) : ListenerMultiplexerBase( rSource ) { @@ -60,61 +60,61 @@ void EventListenerMultiplexer::disposing( const ::com::sun::star::lang::EventObj { } -// ---------------------------------------------------- + // class FocusListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusGained, ::com::sun::star::awt::FocusEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusLost, ::com::sun::star::awt::FocusEvent ) -// ---------------------------------------------------- + // class WindowListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowResized, ::com::sun::star::awt::WindowEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowMoved, ::com::sun::star::awt::WindowEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowShown, ::com::sun::star::lang::EventObject ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowHidden, ::com::sun::star::lang::EventObject ) -// ---------------------------------------------------- + // class VclContainerListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowAdded, ::com::sun::star::awt::VclContainerEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowRemoved, ::com::sun::star::awt::VclContainerEvent ) -// ---------------------------------------------------- + // class KeyListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyPressed, ::com::sun::star::awt::KeyEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyReleased, ::com::sun::star::awt::KeyEvent ) -// ---------------------------------------------------- + // class MouseListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mousePressed, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseReleased, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseEntered, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseExited, ::com::sun::star::awt::MouseEvent ) -// ---------------------------------------------------- + // class MouseMotionListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseDragged, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseMoved, ::com::sun::star::awt::MouseEvent ) -// ---------------------------------------------------- + // class PaintListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener, windowPaint, ::com::sun::star::awt::PaintEvent ) -// ---------------------------------------------------- + // class TopWindowListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowOpened, ::com::sun::star::lang::EventObject ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowClosing, ::com::sun::star::lang::EventObject ) @@ -124,27 +124,27 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::su IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowActivated, ::com::sun::star::lang::EventObject ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) -// ---------------------------------------------------- + // class TextListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener, textChanged, ::com::sun::star::awt::TextEvent ) -// ---------------------------------------------------- + // class ActionListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener, actionPerformed, ::com::sun::star::awt::ActionEvent ) -// ---------------------------------------------------- + // class ItemListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener, itemStateChanged, ::com::sun::star::awt::ItemEvent ) -// ---------------------------------------------------- + // class TabListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener ) void TabListenerMultiplexer::inserted( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException) IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, inserted, ::sal_Int32 ) @@ -157,47 +157,47 @@ IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, void TabListenerMultiplexer::deactivated( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException) IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, deactivated, ::sal_Int32 ) -// ---------------------------------------------------- + // class ContainerListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementInserted, ::com::sun::star::container::ContainerEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementRemoved, ::com::sun::star::container::ContainerEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementReplaced, ::com::sun::star::container::ContainerEvent ) -// ---------------------------------------------------- + // class SpinListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, up, ::com::sun::star::awt::SpinEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, down, ::com::sun::star::awt::SpinEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, first, ::com::sun::star::awt::SpinEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, last, ::com::sun::star::awt::SpinEvent ) -// ---------------------------------------------------- + // class AdjustmentListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener, adjustmentValueChanged, ::com::sun::star::awt::AdjustmentEvent ) -// ---------------------------------------------------- + // class MenuListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemHighlighted, ::com::sun::star::awt::MenuEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemSelected, ::com::sun::star::awt::MenuEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemActivated, ::com::sun::star::awt::MenuEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemDeactivated, ::com::sun::star::awt::MenuEvent ) -// ---------------------------------------------------- + // class TreeSelectionListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener, selectionChanged, ::com::sun::star::lang::EventObject ) -// ---------------------------------------------------- + // class TreeSelectionListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, requestChildNodes, ::com::sun::star::awt::tree::TreeExpansionEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanding, ::com::sun::star::awt::tree::TreeExpansionEvent, ::com::sun::star::awt::tree::ExpandVetoException ) @@ -205,20 +205,20 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiple IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanded, ::com::sun::star::awt::tree::TreeExpansionEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeCollapsed, ::com::sun::star::awt::tree::TreeExpansionEvent ) -// ---------------------------------------------------- + // class TreeEditListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) -// ---------------------------------------------------- + // class SelectionListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener, selectionChanged, ::com::sun::star::awt::grid::GridSelectionEvent ) -// ---------------------------------------------------- + // class SelectionListenerMultiplexer -// ---------------------------------------------------- + IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener, tabPageActivated, ::com::sun::star::awt::tab::TabPageActivatedEvent ) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index 9886e61b5a8c..3db66c940f5a 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -22,9 +22,9 @@ #include <toolkit/helper/property.hxx> #include <map> -// ---------------------------------------------------- + // class UnoPropertyArrayHelper -// ---------------------------------------------------- + UnoPropertyArrayHelper::UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs ) { diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 7f0cdcf5d2c4..f0a2f1cbec61 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -116,9 +116,9 @@ using namespace ::com::sun::star; } } -// ---------------------------------------------------- + // class UnoWrapper -// ---------------------------------------------------- + extern "C" { diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 9b10be493488..420992c0c2c7 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -56,9 +56,9 @@ using namespace ::com::sun::star; -// ---------------------------------------------------- + // class VCLUnoHelper -// ---------------------------------------------------- + uno::Reference< ::com::sun::star::awt::XToolkit> VCLUnoHelper::CreateToolkit() { @@ -457,9 +457,9 @@ sal_Int32 VCLUnoHelper::VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit ) using namespace ::com::sun::star::util; -//==================================================================== + //= file-local helpers -//==================================================================== + namespace { enum UnitConversionDirection @@ -516,9 +516,9 @@ namespace return (sal_Int16)FUNIT_NONE; } } -//======================================================================== + //= MeasurementUnitConversion -//======================================================================== + sal_Int16 VCLUnoHelper::ConvertToMeasurementUnit( FieldUnit _nFieldUnit, sal_Int16 _nUNOToFieldValueFactor ) { diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index 5b56ec874bb4..c9d30819949c 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -111,9 +111,9 @@ public class AccessibilityTreeModel } - // + // child management: - // + @@ -299,12 +299,12 @@ public class AccessibilityTreeModel return aPath.toArray(); } - // + // listeners (and helper methods) - // + // We are registered with listeners as soon as objects are in the // tree cache, and we should get removed as soon as they are out. - // + protected void fireTreeNodesChanged(TreeModelEvent e) { diff --git a/toolkit/test/accessibility/NodeHandler.java b/toolkit/test/accessibility/NodeHandler.java index efa8fb09e1a8..a84c41e86fdb 100644 --- a/toolkit/test/accessibility/NodeHandler.java +++ b/toolkit/test/accessibility/NodeHandler.java @@ -124,10 +124,10 @@ abstract class NodeHandler public abstract AccessibleTreeNode createChild ( AccessibleTreeNode aParent, int nIndex); - // + // The following methods support editing of children and actions. // They have default implementations for no actions and read-only. - // + /** May this child be changed? */ public boolean isChildEditable (AccessibleTreeNode aNode, int nIndex) diff --git a/toolkit/test/accessibility/TextUpdateListener.java b/toolkit/test/accessibility/TextUpdateListener.java index 3f22c6e5a66f..4364d5598884 100644 --- a/toolkit/test/accessibility/TextUpdateListener.java +++ b/toolkit/test/accessibility/TextUpdateListener.java @@ -171,7 +171,7 @@ class TextUpdateListener implements TreeModelListener // { // // create a new node // DefaultMutableTreeNode aNew = newTextTreeNode( xText ); - // + // // get parent (must be DefaultMutableTreeNode) // DefaultMutableTreeNode aParent = // (DefaultMutableTreeNode)aNode.getParent(); |