diff options
Diffstat (limited to 'toolkit/source/controls')
27 files changed, 212 insertions, 212 deletions
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() { |