diff options
Diffstat (limited to 'toolkit/source/controls')
30 files changed, 617 insertions, 617 deletions
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 4cd86d028205..ce48809c1a74 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ namespace toolkit m_xControlModel = m_xControlModel.query( xControl->getModel() ); OSL_ENSURE( m_xControlModel.is(), "OAccessibleControlContext::Init: invalid creator (no control, or control without model!" ); if ( !m_xControlModel.is() ) - throw DisposedException(); // caught by the caller (the create method) + throw DisposedException(); // caught by the caller (the create method) // start listening at the model startModelListening(); @@ -190,7 +190,7 @@ namespace toolkit pStateSet = new ::utl::AccessibleStateSetHelper( implGetForeignControlledStates() ); } else - { // only the DEFUNC state if we're already disposed + { // only the DEFUNC state if we're already disposed pStateSet = new ::utl::AccessibleStateSetHelper; pStateSet->AddState( AccessibleStateType::DEFUNC ); } @@ -215,7 +215,7 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) + ::rtl::OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) { ::rtl::OUString sReturn; try @@ -235,7 +235,7 @@ namespace toolkit } //-------------------------------------------------------------------- - Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const + Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const { Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY ); Reference< awt::XWindow > xWindow; @@ -376,7 +376,7 @@ namespace toolkit } //........................................................................ -} //namespace toolkit +} //namespace toolkit //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index b80222108594..b99a377109ad 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -171,7 +171,7 @@ public: struct CloneControlModel : public ::std::unary_function< UnoControlDialogModel::UnoControlModelHolder, void > { private: - UnoControlDialogModel::UnoControlModelHolderList& m_rTargetList; + UnoControlDialogModel::UnoControlModelHolderList& m_rTargetList; public: CloneControlModel( UnoControlDialogModel::UnoControlModelHolderList& _rTargetList ) @@ -206,19 +206,19 @@ public: // ---------------------------------------------------------------------------- static void lcl_throwIllegalArgumentException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IllegalArgumentException(); } // ---------------------------------------------------------------------------- static void lcl_throwNoSuchElementException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw NoSuchElementException(); } // ---------------------------------------------------------------------------- static void lcl_throwElementExistException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw ElementExistException(); } @@ -236,20 +236,20 @@ static const ::rtl::OUString& getStepPropertyName( ) return s_sStepProperty; } -// ---------------------------------------------------- -// class UnoControlDialogModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlDialogModel +// ---------------------------------------------------- UnoControlDialogModel::UnoControlDialogModel() :maContainerListeners( *this ) ,maChangeListeners ( GetMutex() ) ,mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false ) { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); -// ImplRegisterProperty( BASEPROPERTY_BORDER ); +// ImplRegisterProperty( BASEPROPERTY_BORDER ); ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); ImplRegisterProperty( BASEPROPERTY_ENABLED ); ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR ); -// ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); +// ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); ImplRegisterProperty( BASEPROPERTY_HELPURL ); ImplRegisterProperty( BASEPROPERTY_TITLE ); @@ -387,9 +387,9 @@ void SAL_CALL UnoControlDialogModel::dispose( ) throw(RuntimeException) ::std::vector< Reference< XControlModel > > aChildModels( maModels.size() ); ::std::transform( - maModels.begin(), maModels.end(), // source range - aChildModels.begin(), // target location - ::std::select1st< UnoControlModelHolder >( ) // operation to apply -> select the XControlModel part + maModels.begin(), maModels.end(), // source range + aChildModels.begin(), // target location + ::std::select1st< UnoControlModelHolder >( ) // operation to apply -> select the XControlModel part ); // now dispose @@ -622,9 +622,9 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getElementNames() throw(Runti Sequence< ::rtl::OUString > aNames( maModels.size() ); ::std::transform( - maModels.begin(), maModels.end(), // source range - aNames.getArray(), // target range - ::std::select2nd< UnoControlModelHolder >() // operator to apply: select the second element (the name) + maModels.begin(), maModels.end(), // source range + aNames.getArray(), // target range + ::std::select2nd< UnoControlModelHolder >() // operator to apply: select the second element (the name) ); return aNames; @@ -791,7 +791,7 @@ Sequence< Reference< XControlModel > > SAL_CALL UnoControlDialogModel::getContro // has it? if ( xPSI.is() && xPSI->hasPropertyByName( getTabIndexPropertyName() ) ) - { // yes + { // yes sal_Int32 nTabIndex = -1; xControlProps->getPropertyValue( getTabIndexPropertyName() ) >>= nTabIndex; @@ -913,8 +913,8 @@ void UnoControlDialogModel::implNotifyTabModelChange( const ::rtl::OUString& _rA // the changes event ChangesEvent aEvent; aEvent.Source = *this; - aEvent.Base <<= aEvent.Source; // the "base of the changes root" is also ourself - aEvent.Changes.realloc( 1 ); // exactly one change + aEvent.Base <<= aEvent.Source; // the "base of the changes root" is also ourself + aEvent.Changes.realloc( 1 ); // exactly one change aEvent.Changes[ 0 ].Accessor <<= _rAccessor; @@ -1007,10 +1007,10 @@ void UnoControlDialogModel::implUpdateGroupStructure() // in extreme we have as much groups as controls maGroups.reserve( aControlModels.getLength() ); - GroupingMachineState eState = eLookingForGroup; // the current state of our machine - Reference< XServiceInfo > xModelSI; // for checking for a radion button + GroupingMachineState eState = eLookingForGroup; // the current state of our machine + Reference< XServiceInfo > xModelSI; // for checking for a radion button ModelGroup* aCurrentGroup = NULL; // the group which we're currently building - sal_Bool bIsRadioButton; // is it a radio button? + sal_Bool bIsRadioButton; // is it a radio button? const ::rtl::OUString GROUP_NAME( RTL_CONSTASCII_USTRINGPARAM( "GroupName" ) ); @@ -1054,7 +1054,7 @@ void UnoControlDialogModel::implUpdateGroupStructure() case eExpandingGroup: { if ( !bIsRadioButton ) - { // no radio button -> the group is done + { // no radio button -> the group is done aCurrentGroup = NULL; eState = eLookingForGroup; #if OSL_DEBUG_LEVEL > 1 @@ -1493,7 +1493,7 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) } sal_Int16 nH = aFM.Ascent + aFM.Descent; - sal_Int16 nW = nH/2; // calculate avarage width?! + sal_Int16 nW = nH/2; // calculate avarage width?! nX *= nW; nX /= 4; @@ -1561,9 +1561,9 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) // destroy the old tab controller, if existent if ( mxTabController.is() ) { - mxTabController->setModel( NULL ); // just to be sure, should not be necessary + mxTabController->setModel( NULL ); // just to be sure, should not be necessary removeTabController( mxTabController ); - ::comphelper::disposeComponent( mxTabController ); // just to be sure, should not be necessary + ::comphelper::disposeComponent( mxTabController ); // just to be sure, should not be necessary mxTabController.clear(); } @@ -1995,7 +1995,7 @@ void UnoDialogControl::ImplUpdateResourceResolver() && ( xStringResourceResolver == xCurrStringResourceResolver ) ) { - Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); + Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); Reference< XPropertiesChangeListener > xListener( xPropertySet, UNO_QUERY ); xMultiPropSet->firePropertiesChangeEvent( aPropNames, xListener ); } @@ -2012,7 +2012,7 @@ void UnoDialogControl::ImplUpdateResourceResolver() Reference< XPropertySet > xPropertySet( getModel(), UNO_QUERY ); if ( xPropertySet.is() ) { - Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); + Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); Reference< XPropertiesChangeListener > xListener( xPropertySet, UNO_QUERY ); xMultiPropSet->firePropertiesChangeEvent( lcl_getLanguageDependentProperties(), xListener ); } @@ -2132,9 +2132,9 @@ throw (RuntimeException) ImplUpdateResourceResolver(); } -// ---------------------------------------------------- -// Helper Method to convert relative url to physical location -// ---------------------------------------------------- +// ---------------------------------------------------- +// Helper Method to convert relative url to physical location +// ---------------------------------------------------- ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) { diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index ef860a33b7ac..653f14958cbb 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ using namespace std; namespace toolkit { - + // Methods XElementAccess Type NameContainer_Impl::getElementType() throw(RuntimeException) @@ -61,7 +61,7 @@ Type NameContainer_Impl::getElementType() return mType; } -sal_Bool NameContainer_Impl::hasElements() +sal_Bool NameContainer_Impl::hasElements() throw(RuntimeException) { sal_Bool bRet = (mnElementCount > 0); @@ -69,7 +69,7 @@ sal_Bool NameContainer_Impl::hasElements() } // Methods XNameAccess -Any NameContainer_Impl::getByName( const OUString& aName ) +Any NameContainer_Impl::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); @@ -88,7 +88,7 @@ Sequence< OUString > NameContainer_Impl::getElementNames() return mNames; } -sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) +sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) throw(RuntimeException) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); @@ -98,7 +98,7 @@ sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace -void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aElement ) +void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { Type aAnyType = aElement.getValueType(); @@ -115,7 +115,7 @@ void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aEleme mValues.getArray()[ iHashResult ] = aElement; // Fire event - ContainerEvent aEvent; + ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element <<= aElement; aEvent.ReplacedElement = aOldElement; @@ -125,7 +125,7 @@ void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aEleme // Methods XNameContainer -void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElement ) +void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { Type aAnyType = aElement.getValueType(); @@ -146,14 +146,14 @@ void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElemen mHashMap[ aName ] = nCount; // Fire event - ContainerEvent aEvent; + ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element <<= aElement; aEvent.Accessor <<= aName; maContainerListeners.elementInserted( aEvent ); } -void NameContainer_Impl::removeByName( const OUString& Name ) +void NameContainer_Impl::removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { NameContainerNameMap::iterator aIt = mHashMap.find( Name ); @@ -166,7 +166,7 @@ void NameContainer_Impl::removeByName( const OUString& Name ) Any aOldElement = mValues.getConstArray()[ iHashResult ]; // Fire event - ContainerEvent aEvent; + ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element = aOldElement; aEvent.Accessor <<= Name; diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index b82b8b4be2c0..1c2416dc489b 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace toolkit const Reference< XNumberFormatsSupplier >& lcl_getDefaultFormats_throw() { ::osl::MutexGuard aGuard( getDefaultFormatsMutex() ); - + bool& rbTriedCreation = lcl_getTriedCreation(); Reference< XNumberFormatsSupplier >& rDefaultFormats( lcl_getDefaultFormatsAccess_nothrow() ); if ( !rDefaultFormats.is() && !rbTriedCreation ) @@ -376,7 +376,7 @@ namespace toolkit throw IllegalArgumentException( ( ::rtl::OUString::createFromAscii("Unable to convert the given value for the property ") - += GetPropertyName((sal_uInt16)nPropId) ) + += GetPropertyName((sal_uInt16)nPropId) ) += ::rtl::OUString::createFromAscii(" (double, integer, or string expected)."), static_cast< XPropertySet* >(this), 1); @@ -416,7 +416,7 @@ namespace toolkit static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -459,13 +459,13 @@ namespace toolkit aValues[1] = xPeer->getProperty( aNames[1] ); ImplSetPropertyValues( aNames, aValues, FALSE ); - + if ( GetTextListeners().getLength() ) GetTextListeners().textChanged( e ); } //........................................................................ -} // namespace toolkit +} // namespace toolkit //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 5349e311c86a..578312290743 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,27 +43,27 @@ #include <comphelper/sequence.hxx> -#define GCM_PROPERTY_ID_POS_X 1 -#define GCM_PROPERTY_ID_POS_Y 2 -#define GCM_PROPERTY_ID_WIDTH 3 -#define GCM_PROPERTY_ID_HEIGHT 4 -#define GCM_PROPERTY_ID_NAME 5 -#define GCM_PROPERTY_ID_TABINDEX 6 -#define GCM_PROPERTY_ID_STEP 7 -#define GCM_PROPERTY_ID_TAG 8 +#define GCM_PROPERTY_ID_POS_X 1 +#define GCM_PROPERTY_ID_POS_Y 2 +#define GCM_PROPERTY_ID_WIDTH 3 +#define GCM_PROPERTY_ID_HEIGHT 4 +#define GCM_PROPERTY_ID_NAME 5 +#define GCM_PROPERTY_ID_TABINDEX 6 +#define GCM_PROPERTY_ID_STEP 7 +#define GCM_PROPERTY_ID_TAG 8 #define GCM_PROPERTY_ID_RESOURCERESOLVER 9 -#define GCM_PROPERTY_POS_X ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX")) -#define GCM_PROPERTY_POS_Y ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY")) -#define GCM_PROPERTY_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")) -#define GCM_PROPERTY_HEIGHT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")) -#define GCM_PROPERTY_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) -#define GCM_PROPERTY_TABINDEX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")) -#define GCM_PROPERTY_STEP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step")) -#define GCM_PROPERTY_TAG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")) -#define GCM_PROPERTY_RESOURCERESOLVER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver")) +#define GCM_PROPERTY_POS_X ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX")) +#define GCM_PROPERTY_POS_Y ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY")) +#define GCM_PROPERTY_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")) +#define GCM_PROPERTY_HEIGHT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")) +#define GCM_PROPERTY_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) +#define GCM_PROPERTY_TABINDEX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")) +#define GCM_PROPERTY_STEP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step")) +#define GCM_PROPERTY_TAG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")) +#define GCM_PROPERTY_RESOURCERESOLVER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver")) -#define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT +#define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT //........................................................................ // namespace toolkit @@ -100,7 +100,7 @@ { m_xAggregate = _pAggregateInstance; - { // check if the aggregat is cloneable + { // check if the aggregat is cloneable Reference< XCloneable > xCloneAccess(m_xAggregate, UNO_QUERY); m_bCloneable = xCloneAccess.is(); } @@ -183,14 +183,14 @@ void OGeometryControlModel_Base::registerProperties() { // register our members for the property handling of the OPropertyContainer - registerProperty(GCM_PROPERTY_POS_X, GCM_PROPERTY_ID_POS_X, DEFAULT_ATTRIBS(), &m_nPosX, ::getCppuType(&m_nPosX)); - registerProperty(GCM_PROPERTY_POS_Y, GCM_PROPERTY_ID_POS_Y, DEFAULT_ATTRIBS(), &m_nPosY, ::getCppuType(&m_nPosY)); - registerProperty(GCM_PROPERTY_WIDTH, GCM_PROPERTY_ID_WIDTH, DEFAULT_ATTRIBS(), &m_nWidth, ::getCppuType(&m_nWidth)); - registerProperty(GCM_PROPERTY_HEIGHT, GCM_PROPERTY_ID_HEIGHT, DEFAULT_ATTRIBS(), &m_nHeight, ::getCppuType(&m_nHeight)); - registerProperty(GCM_PROPERTY_NAME, GCM_PROPERTY_ID_NAME, DEFAULT_ATTRIBS(), &m_aName, ::getCppuType(&m_aName)); - registerProperty(GCM_PROPERTY_TABINDEX, GCM_PROPERTY_ID_TABINDEX, DEFAULT_ATTRIBS(), &m_nTabIndex, ::getCppuType(&m_nTabIndex)); - registerProperty(GCM_PROPERTY_STEP, GCM_PROPERTY_ID_STEP, DEFAULT_ATTRIBS(), &m_nStep, ::getCppuType(&m_nStep)); - registerProperty(GCM_PROPERTY_TAG, GCM_PROPERTY_ID_TAG, DEFAULT_ATTRIBS(), &m_aTag, ::getCppuType(&m_aTag)); + registerProperty(GCM_PROPERTY_POS_X, GCM_PROPERTY_ID_POS_X, DEFAULT_ATTRIBS(), &m_nPosX, ::getCppuType(&m_nPosX)); + registerProperty(GCM_PROPERTY_POS_Y, GCM_PROPERTY_ID_POS_Y, DEFAULT_ATTRIBS(), &m_nPosY, ::getCppuType(&m_nPosY)); + registerProperty(GCM_PROPERTY_WIDTH, GCM_PROPERTY_ID_WIDTH, DEFAULT_ATTRIBS(), &m_nWidth, ::getCppuType(&m_nWidth)); + registerProperty(GCM_PROPERTY_HEIGHT, GCM_PROPERTY_ID_HEIGHT, DEFAULT_ATTRIBS(), &m_nHeight, ::getCppuType(&m_nHeight)); + registerProperty(GCM_PROPERTY_NAME, GCM_PROPERTY_ID_NAME, DEFAULT_ATTRIBS(), &m_aName, ::getCppuType(&m_aName)); + registerProperty(GCM_PROPERTY_TABINDEX, GCM_PROPERTY_ID_TABINDEX, DEFAULT_ATTRIBS(), &m_nTabIndex, ::getCppuType(&m_nTabIndex)); + registerProperty(GCM_PROPERTY_STEP, GCM_PROPERTY_ID_STEP, DEFAULT_ATTRIBS(), &m_nStep, ::getCppuType(&m_nStep)); + registerProperty(GCM_PROPERTY_TAG, GCM_PROPERTY_ID_TAG, DEFAULT_ATTRIBS(), &m_aTag, ::getCppuType(&m_aTag)); registerProperty(GCM_PROPERTY_RESOURCERESOLVER, GCM_PROPERTY_ID_RESOURCERESOLVER, DEFAULT_ATTRIBS(), &m_xStrResolver, ::getCppuType(&m_xStrResolver)); } @@ -198,19 +198,19 @@ ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) const { ::com::sun::star::uno::Any aDefault; - + switch ( nHandle ) { - case GCM_PROPERTY_ID_POS_X: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_POS_Y: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_WIDTH: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_HEIGHT: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_NAME: aDefault <<= ::rtl::OUString(); break; - case GCM_PROPERTY_ID_TABINDEX: aDefault <<= (sal_Int16) -1; break; - case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break; + case GCM_PROPERTY_ID_POS_X: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_POS_Y: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_WIDTH: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_HEIGHT: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_NAME: aDefault <<= ::rtl::OUString(); break; + case GCM_PROPERTY_ID_TABINDEX: aDefault <<= (sal_Int16) -1; break; + case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aDefault <<= Reference< resource::XStringResourceResolver >(); break; - default: DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" ); + default: DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" ); } return aDefault; @@ -220,19 +220,19 @@ ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetPropertyValueByHandle(sal_Int32 nHandle) const { ::com::sun::star::uno::Any aValue; - + switch ( nHandle ) { - case GCM_PROPERTY_ID_POS_X: aValue <<= m_nPosX; break; - case GCM_PROPERTY_ID_POS_Y: aValue <<= m_nPosY; break; - case GCM_PROPERTY_ID_WIDTH: aValue <<= m_nWidth; break; - case GCM_PROPERTY_ID_HEIGHT: aValue <<= m_nHeight; break; - case GCM_PROPERTY_ID_NAME: aValue <<= m_aName; break; - case GCM_PROPERTY_ID_TABINDEX: aValue <<= m_nTabIndex; break; - case GCM_PROPERTY_ID_STEP: aValue <<= m_nStep; break; - case GCM_PROPERTY_ID_TAG: aValue <<= m_aTag; break; + case GCM_PROPERTY_ID_POS_X: aValue <<= m_nPosX; break; + case GCM_PROPERTY_ID_POS_Y: aValue <<= m_nPosY; break; + case GCM_PROPERTY_ID_WIDTH: aValue <<= m_nWidth; break; + case GCM_PROPERTY_ID_HEIGHT: aValue <<= m_nHeight; break; + case GCM_PROPERTY_ID_NAME: aValue <<= m_aName; break; + case GCM_PROPERTY_ID_TABINDEX: aValue <<= m_nTabIndex; break; + case GCM_PROPERTY_ID_STEP: aValue <<= m_nStep; break; + case GCM_PROPERTY_ID_TAG: aValue <<= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue <<= m_xStrResolver; break; - default: DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" ); + default: DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" ); } return aValue; @@ -240,19 +240,19 @@ //-------------------------------------------------------------------- void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue) - { + { switch ( nHandle ) { - case GCM_PROPERTY_ID_POS_X: aValue >>= m_nPosX; break; - case GCM_PROPERTY_ID_POS_Y: aValue >>= m_nPosY; break; - case GCM_PROPERTY_ID_WIDTH: aValue >>= m_nWidth; break; - case GCM_PROPERTY_ID_HEIGHT: aValue >>= m_nHeight; break; - case GCM_PROPERTY_ID_NAME: aValue >>= m_aName; break; - case GCM_PROPERTY_ID_TABINDEX: aValue >>= m_nTabIndex; break; - case GCM_PROPERTY_ID_STEP: aValue >>= m_nStep; break; - case GCM_PROPERTY_ID_TAG: aValue >>= m_aTag; break; + case GCM_PROPERTY_ID_POS_X: aValue >>= m_nPosX; break; + case GCM_PROPERTY_ID_POS_Y: aValue >>= m_nPosY; break; + case GCM_PROPERTY_ID_WIDTH: aValue >>= m_nWidth; break; + case GCM_PROPERTY_ID_HEIGHT: aValue >>= m_nHeight; break; + case GCM_PROPERTY_ID_NAME: aValue >>= m_aName; break; + case GCM_PROPERTY_ID_TABINDEX: aValue >>= m_nTabIndex; break; + case GCM_PROPERTY_ID_STEP: aValue >>= m_nStep; break; + case GCM_PROPERTY_ID_TAG: aValue >>= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue >>= m_xStrResolver; break; - default: DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" ); + default: DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" ); } } @@ -332,7 +332,7 @@ { OPropertyArrayAggregationHelper& rPH = static_cast<OPropertyArrayAggregationHelper&>(const_cast<OGeometryControlModel_Base*>(this)->getInfoHelper()); ::rtl::OUString sPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&sPropName, &nOriginalHandle, _nHandle)) OPropertySetAggregationHelper::getFastPropertyValue(_rValue, _nHandle); @@ -392,14 +392,14 @@ // should have been reset // set properties - pOwnClone->m_nPosX = m_nPosX; - pOwnClone->m_nPosY = m_nPosY; - pOwnClone->m_nWidth = m_nWidth; - pOwnClone->m_nHeight = m_nHeight; - pOwnClone->m_aName = m_aName; - pOwnClone->m_nTabIndex = m_nTabIndex; - pOwnClone->m_nStep = m_nStep; - pOwnClone->m_aTag = m_aTag; + pOwnClone->m_nPosX = m_nPosX; + pOwnClone->m_nPosY = m_nPosY; + pOwnClone->m_nWidth = m_nWidth; + pOwnClone->m_nHeight = m_nHeight; + pOwnClone->m_aName = m_aName; + pOwnClone->m_nTabIndex = m_nTabIndex; + pOwnClone->m_nStep = m_nStep; + pOwnClone->m_aTag = m_aTag; // Clone event container @@ -407,13 +407,13 @@ static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( this ); Reference< ::com::sun::star::script::XScriptEventsSupplier > xCloneEventsSupplier = static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( pOwnClone ); - + if( xEventsSupplier.is() && xCloneEventsSupplier.is() ) { Reference< XNameContainer > xEventCont = xEventsSupplier->getEvents(); Reference< XNameContainer > xCloneEventCont = xCloneEventsSupplier->getEvents(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = + ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames(); const ::rtl::OUString* pNames = aNames.getConstArray(); sal_Int32 i, nNameCount = aNames.getLength(); @@ -453,8 +453,8 @@ //==================================================================== //-------------------------------------------------------------------- - typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int; - typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; + typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int; + typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray; // for creating class-unique PropertySetInfo's, we need some info: @@ -518,7 +518,7 @@ //-------------------------------------------------------------------- struct PropertyNameEqual : public ::std::unary_function< Property, bool > { - const ::rtl::OUString& m_rCompare; + const ::rtl::OUString& m_rCompare; PropertyNameEqual( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { } bool operator()( const Property& _rLHS ) @@ -561,7 +561,7 @@ // look for the current property in the properties of our aggregate const Property* pAggPropPos = ::std::find_if( pAggProps, pAggPropsEnd, PropertyNameEqual( pProp->Name ) ); if ( pAggPropPos != pAggPropsEnd ) - { // found a duplicate + { // found a duplicate // -> remove from the aggregate property sequence ::comphelper::removeElementAt( aAggregateProps, pAggPropPos - pAggProps ); // which means we have to adjust the pointers @@ -612,7 +612,7 @@ //-------------------------------------------------------------------- struct Int32Equal : public ::std::unary_function< sal_Int32, bool > { - sal_Int32 m_nCompare; + sal_Int32 m_nCompare; Int32Equal( sal_Int32 _nCompare ) : m_nCompare( _nCompare ) { } bool operator()( sal_Int32 _nLHS ) @@ -648,7 +648,7 @@ } //........................................................................ -// } // namespace toolkit +// } // namespace toolkit //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 1716d843a117..d6d99cf4cc40 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,14 +117,14 @@ void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) t for(sal_Int32 i=0;i<rowElements;i++) { - Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); + Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); columns.push_back(xColumn); xColumn->setIndex(i); } } ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException) { - Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); + Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); xColumn->setColumnWidth(column->getColumnWidth()); xColumn->setPreferredWidth(column->getPreferredWidth()); xColumn->setMaxWidth(column->getMaxWidth()); diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx index 7f01b625e62c..6dbe18e347a3 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ class DefaultGridColumnModel : public ::cppu::WeakImplHelper2< XGridColumnModel, public: DefaultGridColumnModel(const Reference< XMultiServiceFactory >& xFactory); virtual ~DefaultGridColumnModel(); - + // XGridColumnModel //virtual ::sal_Bool SAL_CALL getColumnSelectionAllowed() throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index f59e7a42f768..45714078bd00 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,9 +77,9 @@ void DefaultGridDataModel::broadcast( broadcast_type eType, const GridDataEvent& XGridDataListener* pListener = static_cast<XGridDataListener*>(aListIter.next()); switch( eType ) { - case row_added: pListener->rowAdded(aEvent); break; - case row_removed: pListener->rowRemoved(aEvent); break; - case data_changed: pListener->dataChanged(aEvent); break; + case row_added: pListener->rowAdded(aEvent); break; + case row_removed: pListener->rowRemoved(aEvent); break; + case data_changed: pListener->dataChanged(aEvent); break; } } } @@ -96,7 +96,7 @@ void DefaultGridDataModel::broadcast_changed( ::rtl::OUString name, sal_Int32 in //--------------------------------------------------------------------- -void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName, +void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName, ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException) { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -106,7 +106,7 @@ void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString //--------------------------------------------------------------------- -void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName, +void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName, ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException) { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -180,13 +180,13 @@ void SAL_CALL DefaultGridDataModel::addRow(const ::rtl::OUString & headername, c // store row data std::vector< Any > newRow; for ( int i = 0; i < rRowdata.getLength();i++) - { + { newRow.push_back(rRowdata[i]); } data.push_back( newRow ); - - broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow)); + + broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow)); } @@ -199,21 +199,21 @@ void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::s ::rtl::OUString headerName( (::rtl::OUString) rowHeaders[index] ); rowHeaders.erase(rowHeaders.begin() + index); - Sequence< Any >& rowData ( (Sequence< Any >&)data[index] ); + Sequence< Any >& rowData ( (Sequence< Any >&)data[index] ); data.erase(data.begin() + index); - broadcast_remove( index, headerName, rowData); + broadcast_remove( index, headerName, rowData); } - else + else return; } //--------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL DefaultGridDataModel::getData() throw (::com::sun::star::uno::RuntimeException) { - + std::vector< std::vector< Any > >::iterator iterator; std::vector< Sequence< Any > > dummyContainer(0); - + for(iterator = data.begin(); iterator != data.end(); iterator++) { Sequence< Any > cols(comphelper::containerToSequence(*iterator)); @@ -242,7 +242,7 @@ void SAL_CALL DefaultGridDataModel::removeAll() throw (RuntimeException) { rowHeaders.clear(); data.clear(); - broadcast_remove( -1, ::rtl::OUString(), 0); + broadcast_remove( -1, ::rtl::OUString(), 0); } //--------------------------------------------------------------------- void SAL_CALL DefaultGridDataModel::setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException) diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx index ac6282a0eaef..2b882a08a8bb 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 8c1645e2f6ae..168569e7fe35 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ void GridColumn::broadcast( broadcast_column_type eType, const GridColumnEvent& XGridColumnListener* pListener = static_cast<XGridColumnListener*>(aListIter.next()); switch( eType ) { - case column_attribute_changed: pListener->columnChanged(aEvent); break; + case column_attribute_changed: pListener->columnChanged(aEvent); break; } } } diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index 4d582201d128..c7f3e7701c8b 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ public: virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); - + virtual void SAL_CALL setIndex(sal_Int32 _nIndex)throw (::com::sun::star::uno::RuntimeException); private: void broadcast( broadcast_column_type eType, const GridColumnEvent& aEvent ); diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 158876245be6..3206260e420a 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ using namespace ::com::sun::star::view; namespace toolkit { -// ---------------------------------------------------- -// class UnoGridModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoGridModel +// ---------------------------------------------------- UnoGridModel::UnoGridModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -91,7 +91,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel ) : UnoControlModel( rModel ) { } - + UnoControlModel* UnoGridModel::Clone() const { return new UnoGridModel( *this ); @@ -105,9 +105,9 @@ OUString UnoGridModel::getServiceName() throw(RuntimeException) Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { switch( nPropId ) - { + { case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) ); + return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) ); case BASEPROPERTY_GRID_SELECTIONMODE: return uno::makeAny( SelectionType(1) ); case BASEPROPERTY_GRID_SHOWROWHEADER: @@ -127,9 +127,9 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_GRID_ROW_BACKGROUND: return uno::makeAny(com::sun::star::util::Color(0xFFFFFF) ); default: - return UnoControlModel::ImplGetDefaultValue( nPropId ); + return UnoControlModel::ImplGetDefaultValue( nPropId ); } - + } ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper() @@ -137,7 +137,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -151,9 +151,9 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(Runtime } -// ---------------------------------------------------- -// class UnoGridControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoGridControl +// ---------------------------------------------------- UnoGridControl::UnoGridControl() : mSelectionMode(SelectionType(1)), m_aSelectionListeners( *this ) @@ -179,7 +179,7 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk Reference< XGridControl > xGrid( getPeer(), UNO_QUERY_THROW ); xGrid->addSelectionListener(&m_aSelectionListeners); - + Reference<XGridDataListener> xListener ( getPeer(), UNO_QUERY_THROW ); Reference<XGridColumnListener> xColListener ( getPeer(), UNO_QUERY_THROW ); Reference<XPropertySet> xPropSet ( getModel(), UNO_QUERY_THROW ); @@ -191,7 +191,7 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk if(xGridColumnModel != NULL) { for(int i = 0;i<xGridColumnModel->getColumnCount();i++) - { + { xGridColumnModel->getColumn(i)->addColumnListener(xColListener); } } diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 564e752e618e..be3adbc7200b 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,16 +52,16 @@ using namespace ::com::sun::star::container; // =================================================================== class UnoGridModel : public UnoControlModel { -protected: - Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); +protected: + Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoGridModel(); UnoGridModel( const UnoGridModel& rModel ); - + UnoControlModel* Clone() const; - + // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -80,21 +80,21 @@ class UnoGridControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, :: { public: UnoGridControl(); - ::rtl::OUString GetComponentServiceName(); - + ::rtl::OUString GetComponentServiceName(); + // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XControl void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::awt::grid::XGridControl + // ::com::sun::star::awt::grid::XGridControl - virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::grid::XGridSelection - + virtual ::sal_Int32 SAL_CALL getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getMaxSelectionIndex() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL selectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException); @@ -107,14 +107,14 @@ public: virtual void SAL_CALL selectRow(::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoGridControl, UnoControlBase, szServiceName_GridControl ) using UnoControl::getPeer; private: ::com::sun::star::view::SelectionType mSelectionMode; - SelectionListenerMultiplexer m_aSelectionListeners; + SelectionListenerMultiplexer m_aSelectionListeners; }; } // toolkit diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index bf9639901f11..0c17a584c476 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ 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 .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IllegalArgumentException(); } static void lcl_throwIndexOutOfBoundsException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IndexOutOfBoundsException(); } @@ -142,7 +142,7 @@ static void lcl_throwIndexOutOfBoundsException( ) // ------------------------------------------------------------------- - ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -157,7 +157,7 @@ static void lcl_throwIndexOutOfBoundsException( ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -204,7 +204,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void UnoControlRoadmapModel::SetRMItemDefaultProperties( const sal_Int32 , Reference< XInterface > xRoadmapItem) { - Any aAny; + Any aAny; Reference< XPropertySet > xPropertySet( xRoadmapItem, UNO_QUERY ); Reference< XPropertySet > xProps( xRoadmapItem, UNO_QUERY ); if ( xProps.is() ) @@ -296,7 +296,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index) - throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index e12fbfae7565..c66cfb368bd1 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index bb4f35644e3a..50799a017167 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -// ---------------------------------------------------- -// class StdTabController -// ---------------------------------------------------- +// ---------------------------------------------------- +// class StdTabController +// ---------------------------------------------------- StdTabController::StdTabController() { } @@ -61,13 +61,13 @@ StdTabController::~StdTabController() } sal_Bool StdTabController::ImplCreateComponentSequence( - Sequence< Reference< XControl > >& rControls, - const Sequence< Reference< XControlModel > >& rModels, - Sequence< Reference< XWindow > >& rComponents, - Sequence< Any>* pTabStops, + Sequence< Reference< XControl > >& rControls, + const Sequence< Reference< XControlModel > >& rModels, + Sequence< Reference< XWindow > >& rComponents, + Sequence< Any>* pTabStops, sal_Bool bPeerComponent ) const { - sal_Bool bOK = sal_True; + sal_Bool bOK = sal_True; // nur die wirklich geforderten Controls sal_Int32 nModels = rModels.getLength(); @@ -94,7 +94,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( const Reference< XControl > * pControls = rControls.getConstArray(); - sal_uInt32 nCtrls = rControls.getLength(); + sal_uInt32 nCtrls = rControls.getLength(); rComponents.realloc( nCtrls ); Reference< XWindow > * pComps = rComponents.getArray(); Any* pTabs = NULL; @@ -107,22 +107,22 @@ sal_Bool StdTabController::ImplCreateComponentSequence( } for ( sal_uInt32 n = 0; bOK && ( n < nCtrls ); n++ ) - { + { // Zum Model passendes Control suchen Reference< XControl > xCtrl(pControls[n]); if ( xCtrl.is() ) { if (bPeerComponent) - pComps[n] = Reference< XWindow > (xCtrl->getPeer(), UNO_QUERY); + pComps[n] = Reference< XWindow > (xCtrl->getPeer(), UNO_QUERY); else pComps[n] = Reference< XWindow > (xCtrl, UNO_QUERY); // TabStop-Property if ( pTabs ) - { + { // opt: String fuer TabStop als Konstante static const ::rtl::OUString aTabStopName( ::rtl::OUString::createFromAscii( "Tabstop" ) ); - + Reference< XPropertySet > xPSet( xCtrl->getModel(), UNO_QUERY ); Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); if( xInfo->hasPropertyByName( aTabStopName ) ) @@ -147,9 +147,9 @@ void StdTabController::ImplActivateControl( sal_Bool bFirst ) const Sequence< Reference< XControl > > aCtrls = xTabController->getControls(); const Reference< XControl > * pControls = aCtrls.getConstArray(); sal_uInt32 nCount = aCtrls.getLength(); - + for ( sal_uInt32 n = bFirst ? 0 : nCount; bFirst ? ( n < nCount ) : n; ) - { + { sal_uInt32 nCtrl = bFirst ? n++ : --n; DBG_ASSERT( pControls[nCtrl].is(), "Control nicht im Container!" ); if ( pControls[nCtrl].is() ) @@ -187,35 +187,35 @@ IMPL_XTYPEPROVIDER_END void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + mxModel = Model; } Reference< XTabControllerModel > StdTabController::getModel( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + return mxModel; } void StdTabController::setContainer( const Reference< XControlContainer >& Container ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + mxControlContainer = Container; } Reference< XControlContainer > StdTabController::getContainer( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + return mxControlContainer; } Sequence< Reference< XControl > > StdTabController::getControls( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + Sequence< Reference< XControl > > aSeq; if ( mxControlContainer.is() ) @@ -241,7 +241,7 @@ Sequence< Reference< XControl > > StdTabController::getControls( ) throw(Runtim void StdTabController::autoTabOrder( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + DBG_ASSERT( mxControlContainer.is(), "autoTabOrder: No ControlContainer!" ); if ( !mxControlContainer.is() ) return; @@ -251,7 +251,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) // vieleicht erhalte ich hier einen TabController, // der schneller die Liste meiner Controls ermittelt - Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); + Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); Sequence< Reference< XControl > > aControls = xTabController->getControls(); // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container, @@ -306,7 +306,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) void StdTabController::activateTabOrder( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + // Am Container die Tab-Reihenfolge aktivieren... Reference< XControl > xC( mxControlContainer, UNO_QUERY ); @@ -318,7 +318,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) // vieleicht erhalte ich hier einen TabController, // der schneller die Liste meiner Controls ermittelt - Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); + Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); // Flache Liste besorgen... Sequence< Reference< XControlModel > > aModels = mxModel->getControlModels(); @@ -327,7 +327,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) // DG: Aus Optimierungsgruenden werden die Controls mittels getControls() geholt, // dieses hoert sich zwar wiedersinning an, fuehrt aber im konkreten Fall (Forms) zu sichtbaren - // Geschwindigkeitsvorteilen + // Geschwindigkeitsvorteilen Sequence< Reference< XControl > > aControls = xTabController->getControls(); // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container, @@ -338,8 +338,8 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) xVclContainerPeer->setTabOrder( aCompSeq, aTabSeq, mxModel->getGroupControl() ); ::rtl::OUString aName; - Sequence< Reference< XControlModel > > aThisGroupModels; - Sequence< Reference< XWindow > > aControlComponents; + Sequence< Reference< XControlModel > > aThisGroupModels; + Sequence< Reference< XWindow > > aControlComponents; sal_uInt32 nGroups = mxModel->getGroupCount(); for ( sal_uInt32 nG = 0; nG < nGroups; nG++ ) @@ -362,14 +362,14 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) void StdTabController::activateFirst( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ImplActivateControl( sal_True ); } void StdTabController::activateLast( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ImplActivateControl( sal_False ); } @@ -412,7 +412,7 @@ Reference< XControl > StdTabController::FindControl( Sequence< Reference< XCont if ( !xCtrl.is() && rxCtrlModel.is()) */ DBG_ASSERT( rxCtrlModel.is(), "ImplFindControl - welches ?!" ); - + const Reference< XControl > * pCtrls = rCtrls.getConstArray(); sal_Int32 nCtrls = rCtrls.getLength(); for ( sal_Int32 n = 0; n < nCtrls; n++ ) diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index e4f62e1c3a9f..efa718fbc8bc 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,11 +40,11 @@ #include <tools/debug.hxx> -#define UNOCONTROL_STREAMVERSION (short)2 +#define UNOCONTROL_STREAMVERSION (short)2 -// ---------------------------------------------------- -// class UnoControlModelEntryList -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlModelEntryList +// ---------------------------------------------------- UnoControlModelEntryList::UnoControlModelEntryList() { } @@ -73,9 +73,9 @@ void UnoControlModelEntryList::DestroyEntry( sal_uInt32 nEntry ) delete pEntry; } -// ---------------------------------------------------- -// class StdTabControllerModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class StdTabControllerModel +// ---------------------------------------------------- StdTabControllerModel::StdTabControllerModel() { mbGroupControl = sal_True; @@ -149,8 +149,8 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star sal_uInt32 nStoredControls = 0; sal_Int32 nDataBeginMark = xMark->createMark(); - OutStream->writeLong( 0L ); // DataLen - OutStream->writeLong( 0L ); // nStoredControls + OutStream->writeLong( 0L ); // DataLen + OutStream->writeLong( 0L ); // nStoredControls sal_uInt32 nCtrls = rCtrls.getLength(); for ( sal_uInt32 n = 0; n < nCtrls; n++ ) @@ -219,21 +219,21 @@ IMPL_XTYPEPROVIDER_END sal_Bool StdTabControllerModel::getGroupControl( ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + return mbGroupControl; } void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + mbGroupControl = GroupControl; } void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + maControls.Reset(); ImplSetControlModels( maControls, Controls ); } @@ -241,7 +241,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > StdTabControllerModel::getControlModels( ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq( ImplGetControlCount( maControls ) ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > * pRefs = aSeq.getArray(); ImplGetControlModels( &pRefs, maControls ); @@ -251,7 +251,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const ::rtl::OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + // Die Controls stehen eventuel flach in der Liste und werden jetzt gruppiert. // Verschachtelte Gruppen sind erstmal nicht moeglich... // Das erste Element der Gruppe welches auch schon in der flachen Liste @@ -291,7 +291,7 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + // erstmal nur eine Ebene... // Das Model und die Impl-Methoden arbeiten zwar rekursiv, aber das wird // erstmal nich nach aussen gegeben. @@ -310,7 +310,7 @@ sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno:: void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, ::rtl::OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq; sal_uInt32 nG = 0; sal_uInt32 nEntries = maControls.Count(); @@ -337,7 +337,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::S void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + sal_uInt32 nGroup = 0; sal_uInt32 nEntries = maControls.Count(); for ( sal_uInt32 n = 0; n < nEntries; n++ ) @@ -366,7 +366,7 @@ void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com: void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream > xMark( OutStream, ::com::sun::star::uno::UNO_QUERY ); DBG_ASSERT( xMark.is(), "write: no XMarkableStream!" ); @@ -390,7 +390,7 @@ void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq = ImplReadControls( InStream ); setControlModels( aSeq ); diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index e2acf791a886..75a29ae6b862 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace toolkit static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx index f60abcaf3823..f0454e8d81b7 100644 --- a/toolkit/source/controls/tksimpleanimation.cxx +++ b/toolkit/source/controls/tksimpleanimation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,7 +185,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->start(); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSimpleAnimationControl::stop() throw ( uno::RuntimeException ) { @@ -195,7 +195,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->stop(); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSimpleAnimationControl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& ImageList ) throw ( uno::RuntimeException ) diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index c22cbf1fae10..6cefd1e5552b 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ namespace toolkit static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -247,7 +247,7 @@ namespace toolkit { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), sal_True ); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException) { @@ -255,7 +255,7 @@ namespace toolkit ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( currentValue ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getValue( ) throw (RuntimeException) { @@ -268,19 +268,19 @@ namespace toolkit return nValue; } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True ); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum( ) throw (RuntimeException) { @@ -293,7 +293,7 @@ namespace toolkit return nMin; } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum( ) throw (RuntimeException) { @@ -306,13 +306,13 @@ namespace toolkit return nMax; } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement( ) throw (RuntimeException) { @@ -325,13 +325,13 @@ namespace toolkit return nIncrement; } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation( ) throw (RuntimeException) { @@ -344,7 +344,7 @@ namespace toolkit return nOrientation; } - + //........................................................................ } // namespace toolkit //........................................................................ diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx index 0f3d2a58654e..e4081377ff06 100644 --- a/toolkit/source/controls/tkthrobber.cxx +++ b/toolkit/source/controls/tkthrobber.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,7 +183,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->start(); } - + //-------------------------------------------------------------------- void SAL_CALL UnoThrobberControl::stop() throw ( uno::RuntimeException ) { @@ -193,7 +193,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->stop(); } - + //........................................................................ } // namespace toolkit //........................................................................ diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 2b3a6d61d9ea..d5d9ce350a6d 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ using namespace ::com::sun::star::view; namespace toolkit { -// ---------------------------------------------------- -// class UnoTreeModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoTreeModel +// ---------------------------------------------------- UnoTreeModel::UnoTreeModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -82,7 +82,7 @@ UnoTreeModel::UnoTreeModel( const UnoTreeModel& rModel ) : UnoControlModel( rModel ) { } - + UnoControlModel* UnoTreeModel::Clone() const { return new UnoTreeModel( *this ); @@ -122,7 +122,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -136,9 +136,9 @@ Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo( ) throw(Runtime } -// ---------------------------------------------------- -// class UnoTreeControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoTreeControl +// ---------------------------------------------------- UnoTreeControl::UnoTreeControl() : maSelectionListeners( *this ) , maTreeExpansionListeners( *this ) diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index a6f037f9c56a..5b71bdb8fab3 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,16 +50,16 @@ using namespace ::com::sun::star::container; // =================================================================== class UnoTreeModel : public UnoControlModel { -protected: - Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); +protected: + Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoTreeModel(); UnoTreeModel( const UnoTreeModel& rModel ); - + UnoControlModel* Clone() const; - + // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -78,7 +78,7 @@ class UnoTreeControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, :: { public: UnoTreeControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 2f6f6e9118cf..780f82d4d6ff 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ static void implThrowIllegalArgumentException() throw( IllegalArgumentException throw IllegalArgumentException(); } -class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeDataModel, XServiceInfo >, +class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeDataModel, XServiceInfo >, public MutexAndBroadcastHelper { public: @@ -141,7 +141,7 @@ public: } private: - TreeNodeVector maChilds; + TreeNodeVector maChilds; Any maDisplayValue; Any maDataValue; sal_Bool mbHasChildsOnDemand; @@ -186,10 +186,10 @@ void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTr XTreeDataModelListener* pListener = static_cast<XTreeDataModelListener*>(aListIter.next()); switch( eType ) { - case nodes_changed: pListener->treeNodesChanged(aEvent); break; - case nodes_inserted: pListener->treeNodesInserted(aEvent); break; - case nodes_removed: pListener->treeNodesRemoved(aEvent); break; - case structure_changed: pListener->treeStructureChanged(aEvent); break; + case nodes_changed: pListener->treeNodesChanged(aEvent); break; + case nodes_inserted: pListener->treeNodesInserted(aEvent); break; + case nodes_removed: pListener->treeNodesRemoved(aEvent); break; + case structure_changed: pListener->treeStructureChanged(aEvent); break; } } } @@ -224,7 +224,7 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode > MutableTreeNodeRef xImpl( dynamic_cast< MutableTreeNode* >( xNode.get() ) ); if( !xImpl.is() || xImpl->mbIsInserted ) throw IllegalArgumentException(); - + xImpl->mbIsInserted = true; mxRootNode.set(xImpl.get()); @@ -447,7 +447,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - + MutableTreeNodeRef xImpl; if( (nChildIndex >= 0) && (nChildIndex < (sal_Int32)maChilds.size()) ) diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index d078aa358e60..71df27cf0cd5 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,8 +106,8 @@ static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMu Sequence< ::rtl::OUString> aNames; Reference< XPropertySetInfo > xPSInf = rxModel->getPropertySetInfo(); DBG_ASSERT( xPSInf.is(), "UpdateFromModel: No PropertySetInfo!" ); - if ( xPSInf.is() ) - { + if ( xPSInf.is() ) + { Sequence< Property> aProps = xPSInf->getProperties(); sal_Int32 nLen = aProps.getLength(); aNames = Sequence< ::rtl::OUString>( nLen ); @@ -119,7 +119,7 @@ static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMu return aNames; } -// ==================================================== +// ==================================================== class VclListenerLock { private: @@ -158,9 +158,9 @@ struct UnoControl_Data } }; -// ---------------------------------------------------- -// class UnoControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControl +// ---------------------------------------------------- DBG_NAME( UnoControl ) UnoControl::UnoControl() : maDisposeListeners( *this ) @@ -192,7 +192,7 @@ UnoControl::~UnoControl() return ::rtl::OUString(); } -Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ) +Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ) { DBG_ASSERT( !mbCreatingCompatiblePeer, "ImplGetCompatiblePeer - rekursive?" ); @@ -210,7 +210,7 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE if( bVis ) maComponentInfos.bVisible = sal_False; - Reference< XWindowPeer > xCurrentPeer = getPeer(); + Reference< XWindowPeer > xCurrentPeer = getPeer(); setPeer( NULL ); // queryInterface ourself, to allow aggregation @@ -287,7 +287,7 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An // this assumption may be false in some (seldom) multi-threading scenarios (cause propertiesChange // releases our mutex before calling here in) // That's why this additional check - + if ( mxVclWindowPeer.is() ) { Any aConvertedValue( rVal ); @@ -318,7 +318,7 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An } } } - + mxVclWindowPeer->setProperty( rPropName, aConvertedValue ); } } @@ -327,7 +327,7 @@ void UnoControl::PrepareWindowDescriptor( WindowDescriptor& ) { } -Reference< XWindow > UnoControl::getParentPeer() const +Reference< XWindow > UnoControl::getParentPeer() const { Reference< XWindow > xPeer; if( mxContext.is() ) @@ -348,7 +348,7 @@ void UnoControl::updateFromModel() // Alle standard Properties werden ausgelesen und in das Peer uebertragen if( getPeer().is() ) { - Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); + Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); if( xPropSet.is() ) { Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); @@ -409,7 +409,7 @@ void UnoControl::dispose( ) throw(RuntimeException) maMouseMotionListeners.disposeAndClear( aDisposeEvent ); maPaintListeners.disposeAndClear( aDisposeEvent ); maModeChangeListeners.disposeAndClear( aDisposeEvent ); - + // Model wieder freigeben setModel( Reference< XControlModel > () ); setContext( Reference< XInterface > () ); @@ -418,14 +418,14 @@ void UnoControl::dispose( ) throw(RuntimeException) void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + maDisposeListeners.addInterface( rxListener ); } void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + maDisposeListeners.removeInterface( rxListener ); } @@ -464,7 +464,7 @@ void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvent ImplModelPropertiesChanged( aEvents ); } - + void UnoControl::ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock ) { MapString2Int::iterator pos = mpData->aSuspendedPropertyNotifications.find( rPropertyName ); @@ -502,8 +502,8 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent if( getPeer().is() ) { DECLARE_STL_VECTOR( PropertyValue, PropertyValueVector); - PropertyValueVector aPeerPropertiesToSet; - sal_Int32 nIndependentPos = 0; + PropertyValueVector aPeerPropertiesToSet; + sal_Int32 nIndependentPos = 0; bool bResourceResolverSet( false ); // position where to insert the independent properties into aPeerPropertiesToSet, // dependent ones are inserted at the end of the vector @@ -537,9 +537,9 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent if ( pEvents->NewValue >>= xStrResolver ) bResourceResolverSet = xStrResolver.is(); } - + sal_uInt16 nPType = GetPropertyId( pEvents->PropertyName ); - if ( mbDesignMode && mbDisposePeer && !mbRefeshingPeer && !mbCreatingPeer ) + if ( mbDesignMode && mbDisposePeer && !mbRefeshingPeer && !mbCreatingPeer ) { // if we're in design mode, then some properties can change which // require creating a *new* peer (since these properties cannot @@ -606,7 +606,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent } } - Reference< XWindow > xParent = getParentPeer(); + Reference< XWindow > xParent = getParentPeer(); Reference< XControl > xThis( (XAggregation*)(::cppu::OWeakAggObject*)this, UNO_QUERY ); // call createPeer via a interface got from queryInterface, so the aggregating class can intercept it @@ -624,14 +624,14 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent bool bMustBeInserted( true ); for ( sal_uInt32 i = 0; i < aPeerPropertiesToSet.size(); i++ ) { - if ( aPeerPropertiesToSet[i].Name.equalsAsciiL( + if ( aPeerPropertiesToSet[i].Name.equalsAsciiL( pLangDepProp->pPropName, pLangDepProp->nPropNameLength )) { bMustBeInserted = false; break; } } - + if ( bMustBeInserted ) { // Add language dependent props at the end @@ -642,12 +642,12 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent PropertyValue( aPropName, 0, xPS->getPropertyValue( aPropName ), PropertyState_DIRECT_VALUE ) ); } } - + ++pLangDepProp; } } aGuard.clear(); - + // clear the guard before creating a new peer - as usual, our peer implementations use the SolarMutex // #82300# - 2000-12-21 - fs@openoffice.org if (bNeedNewPeer && xParent.is()) @@ -663,7 +663,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent mxPeer.clear(); mxVclWindowPeer = NULL; mbRefeshingPeer = sal_True; - Reference< XWindowPeer > xP( xParent, UNO_QUERY ); + Reference< XWindowPeer > xP( xParent, UNO_QUERY ); xThis->createPeer( Reference< XToolkit > (), xP ); mbRefeshingPeer = sal_False; aPeerPropertiesToSet.clear(); @@ -684,7 +684,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent // To prevent deadlocks resulting from this, we do this without our own mutex locked // 2000-11-03 - fs@openoffice.org PropertyValueVectorIterator aEnd = aPeerPropertiesToSet.end(); - for ( PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin(); + for ( PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin(); aLoop != aEnd; ++aLoop ) @@ -776,17 +776,17 @@ void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 Reference< XWindow > xWindow; { ::osl::MutexGuard aGuard( GetMutex() ); - + if ( Flags & awt::PosSize::X ) - maComponentInfos.nX = X; + maComponentInfos.nX = X; if ( Flags & awt::PosSize::Y ) - maComponentInfos.nY = Y; + maComponentInfos.nY = Y; if ( Flags & awt::PosSize::WIDTH ) - maComponentInfos.nWidth = Width; + maComponentInfos.nWidth = Width; if ( Flags & awt::PosSize::HEIGHT ) maComponentInfos.nHeight = Height; maComponentInfos.nFlags |= Flags; - + xWindow = xWindow.query( getPeer() ); } @@ -814,7 +814,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException) Reference< XWindow > xWindow; { ::osl::MutexGuard aGuard( GetMutex() ); - + // Visible status ist Sache der View maComponentInfos.bVisible = bVisible; xWindow = xWindow.query( getPeer() ); @@ -828,7 +828,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException) Reference< XWindow > xWindow; { ::osl::MutexGuard aGuard( GetMutex() ); - + // Enable status ist Sache der View maComponentInfos.bEnable = bEnable; xWindow = xWindow.query( getPeer() ); @@ -837,7 +837,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException) xWindow->setEnable( bEnable ); } -void UnoControl::setFocus( ) throw(RuntimeException) +void UnoControl::setFocus( ) throw(RuntimeException) { Reference< XWindow > xWindow; { @@ -1010,7 +1010,7 @@ sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw( Reference< XView > xView; { ::osl::MutexGuard aGuard( GetMutex() ); - + mxGraphics = rDevice; xView = xView.query( getPeer() ); } @@ -1047,7 +1047,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException) if ( xDrawPeerView.is() ) { Reference< XVclWindowPeer > xWindowPeer; - xWindowPeer.set( xDrawPeer, UNO_QUERY ); + xWindowPeer.set( xDrawPeer, UNO_QUERY ); if ( xWindowPeer.is() ) xWindowPeer->setDesignMode( mbDesignMode ); xDrawPeerView->draw( x, y ); @@ -1062,7 +1062,7 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException) Reference< XView > xView; { ::osl::MutexGuard aGuard( GetMutex() ); - + maComponentInfos.nZoomX = fZoomX; maComponentInfos.nZoomY = fZoomY; @@ -1076,14 +1076,14 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException) void UnoControl::setContext( const Reference< XInterface >& rxContext ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + mxContext = rxContext; } Reference< XInterface > UnoControl::getContext( ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + return mxContext; } @@ -1123,7 +1123,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this; throw( aException ); } - + if( !getPeer().is() ) { mbCreatingPeer = sal_True; @@ -1133,7 +1133,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer if( rParentPeer.is() && mxContext.is() ) { // kein TopWindow - if ( !xToolkit.is() ) + if ( !xToolkit.is() ) xToolkit = rParentPeer->getToolkit(); Any aAny = OWeakAggObject::queryInterface( ::getCppuType((const Reference< XControlContainer>*)0) ); Reference< XControlContainer > xC; @@ -1148,13 +1148,13 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer { // Nur richtig, wenn es sich um ein Top Window handelt if( rParentPeer.is() ) { - if ( !xToolkit.is() ) + if ( !xToolkit.is() ) xToolkit = rParentPeer->getToolkit(); eType = WindowClass_CONTAINER; } else { - if ( !xToolkit.is() ) + if ( !xToolkit.is() ) xToolkit = VCLUnoHelper::CreateToolkit(); eType = WindowClass_TOP; } @@ -1169,7 +1169,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer // Border Reference< XPropertySet > xPSet( mxModel, UNO_QUERY ); Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); - + Any aVal; ::rtl::OUString aPropName = GetPropertyName( BASEPROPERTY_BORDER ); if ( xInfo->hasPropertyByName( aPropName ) ) @@ -1226,7 +1226,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer if ( ( aVal >>= b ) && b) aDescr.WindowAttributes |= VclWindowPeerAttribute::DROPDOWN; } - + // Spin aPropName = GetPropertyName( BASEPROPERTY_SPIN ); if ( xInfo->hasPropertyByName( aPropName ) ) @@ -1278,7 +1278,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer } //added for issue79712 - //NoLabel + //NoLabel aPropName = GetPropertyName( BASEPROPERTY_NOLABEL ); if ( xInfo->hasPropertyByName( aPropName ) ) { @@ -1288,7 +1288,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer aDescr.WindowAttributes |= VclWindowPeerAttribute::NOLABEL; } //issue79712 ends - + // Align aPropName = GetPropertyName( BASEPROPERTY_ALIGN ); if ( xInfo->hasPropertyByName( aPropName ) ) @@ -1364,7 +1364,7 @@ Reference< XWindowPeer > UnoControl::getPeer() throw(RuntimeException) sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); // query for the XPropertiesChangeListener - our delegator is allowed to overwrite this interface @@ -1399,14 +1399,14 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw return mxModel.is(); } -Reference< XControlModel > UnoControl::getModel( ) throw(RuntimeException) +Reference< XControlModel > UnoControl::getModel( ) throw(RuntimeException) { return mxModel; } Reference< XView > UnoControl::getView( ) throw(RuntimeException) { - return static_cast< XView* >( this ); + return static_cast< XView* >( this ); } void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) @@ -1439,7 +1439,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) maModeChangeListeners.notifyEach( &XModeChangeListener::modeChanged, aModeChangeEvent ); } -sal_Bool UnoControl::isDesignMode( ) throw(RuntimeException) +sal_Bool UnoControl::isDesignMode( ) throw(RuntimeException) { return mbDesignMode; } @@ -1450,7 +1450,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) } // XServiceInfo -::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException) +::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException) { DBG_ERROR( "This method should be overloaded!" ); return ::rtl::OUString(); @@ -1459,7 +1459,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); const ::rtl::OUString* pArray = aSNL.getConstArray(); const ::rtl::OUString* pArrayEnd = aSNL.getConstArray() + aSNL.getLength(); @@ -1487,7 +1487,7 @@ Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) th if ( !xCurrentContext.is() ) { if ( !mbDesignMode ) - { // in alive mode, use the AccessibleContext of the peer + { // in alive mode, use the AccessibleContext of the peer Reference< XAccessible > xPeerAcc( getPeer(), UNO_QUERY ); if ( xPeerAcc.is() ) xCurrentContext = xPeerAcc->getAccessibleContext( ); diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 254fefe54cd0..20eda935000b 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,9 +36,9 @@ #include <tools/debug.hxx> -// ---------------------------------------------------- -// class UnoControlBase -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlBase +// ---------------------------------------------------- sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId ) { @@ -92,7 +92,7 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc void UnoControlBase::ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ) { // Model ggf. schon abgemeldet, aber ein Event schlaegt noch zu... - if ( mxModel.is() ) + if ( mxModel.is() ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); if ( !bUpdateThis ) diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 7aa2e63fd9cc..4918f9e37dfc 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,9 +56,9 @@ using namespace ::com::sun::star; extern WorkWindow* lcl_GetDefaultWindow(); -// ---------------------------------------------------- -// class UnoControlHolder -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlHolder +// ---------------------------------------------------- struct UnoControlHolder { uno::Reference< awt::XControl > mxControl; @@ -66,7 +66,7 @@ struct UnoControlHolder public: UnoControlHolder( const ::rtl::OUString& rName, const uno::Reference< awt::XControl > & rControl ) - : mxControl( rControl ), + : mxControl( rControl ), msName( rName ) { } @@ -328,10 +328,10 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti } throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "out of identifiers" ) ), NULL ); } -// ---------------------------------------------------- -// Function to set the controls' visibility according -// to the dialog's "Step" property -// ---------------------------------------------------- +// ---------------------------------------------------- +// Function to set the controls' visibility according +// to the dialog's "Step" property +// ---------------------------------------------------- void implUpdateVisibility ( sal_Int32 nDialogStep, @@ -373,9 +373,9 @@ void implUpdateVisibility } -// ---------------------------------------------------- -// class DialogStepChangedListener -// ---------------------------------------------------- +// ---------------------------------------------------- +// class DialogStepChangedListener +// ---------------------------------------------------- typedef ::cppu::WeakImplHelper1< beans::XPropertyChangeListener > PropertyChangeListenerHelper; class DialogStepChangedListener: public PropertyChangeListenerHelper @@ -388,7 +388,7 @@ public: : mxControlContainer( xControlContainer ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw( uno::RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw( uno::RuntimeException); // XPropertyChangeListener virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException); @@ -401,7 +401,7 @@ void SAL_CALL DialogStepChangedListener::disposing( const lang::EventObject& /* mxControlContainer.clear(); } -void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyChangeEvent& evt ) +void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException) { // evt.PropertyName HAS to be "Step" because we only use the listener for that @@ -410,16 +410,16 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyC implUpdateVisibility( nDialogStep, mxControlContainer ); } -// ---------------------------------------------------- -// class UnoControlContainer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlContainer +// ---------------------------------------------------- UnoControlContainer::UnoControlContainer() : maCListeners( *this ) { mpControls = new UnoControlHolderList; } UnoControlContainer::UnoControlContainer( uno::Reference< awt::XWindowPeer > xP ) - : maCListeners( *this ) + : maCListeners( *this ) { setPeer( xP ); mbDisposePeer = sal_False; @@ -442,7 +442,7 @@ void UnoControlContainer::ImplActivateTabControllers() } // lang::XComponent -void UnoControlContainer::dispose( ) throw(uno::RuntimeException) +void UnoControlContainer::dispose( ) throw(uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -643,7 +643,7 @@ void UnoControlContainer::impl_createControlPeerIfNecessary( const uno::Referenc // if the container already has a peer, then also create a peer for the control uno::Reference< awt::XWindowPeer > xMyPeer( getPeer() ); - + if( xMyPeer.is() ) { _rxControl->createPeer( NULL, xMyPeer ); diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index c29886dadf5f..cc5aba769fb8 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,9 +34,9 @@ #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx> -// ---------------------------------------------------- -// class UnoControlContainerModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlContainerModel +// ---------------------------------------------------- UnoControlContainerModel::UnoControlContainerModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -75,11 +75,11 @@ UnoControlContainerModel::UnoControlContainerModel() ::cppu::IPropertyArrayHelper& UnoControlContainerModel::getInfoHelper() { ::osl::Guard< ::osl::Mutex > aGuard( ((UnoControlContainerModel*)this)->GetMutex() ); - + static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - ::com::sun::star::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + ::com::sun::star::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 4ad984647eb4..10a14d733e52 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,8 +74,8 @@ using ::com::sun::star::awt::FontDescriptor; struct ImplControlProperty { private: - sal_uInt16 nId; - ::com::sun::star::uno::Any aValue; + sal_uInt16 nId; + ::com::sun::star::uno::Any aValue; public: ImplControlProperty( const ImplControlProperty& rProp ) : aValue( rProp.aValue ) @@ -93,67 +93,67 @@ public: nId = nT; } - sal_uInt16 GetId() const { return nId; } - const ::com::sun::star::uno::Any& GetValue() const { return aValue; } - void SetValue( const ::com::sun::star::uno::Any& rValue ) { aValue = rValue; } + sal_uInt16 GetId() const { return nId; } + const ::com::sun::star::uno::Any& GetValue() const { return aValue; } + void SetValue( const ::com::sun::star::uno::Any& rValue ) { aValue = rValue; } }; DECLARE_TABLE( ImplPropertyTable, ImplControlProperty* ) -#define UNOCONTROL_STREAMVERSION (short)2 +#define UNOCONTROL_STREAMVERSION (short)2 static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, const Any& rValue ) { // some props are defined with other types than the matching FontDescriptor members have // (e.g. FontWidth, FontSlant) // 78474 - 09/19/2000 - FS - float nExtractFloat = 0; - sal_Int16 nExtractShort = 0; + float nExtractFloat = 0; + sal_Int16 nExtractShort = 0; switch ( nPropId ) { - case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue >>= rFD.Name; + case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue >>= rFD.Name; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue >>= rFD.StyleName; + case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue >>= rFD.StyleName; break; - case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue >>= rFD.Family; + case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue >>= rFD.Family; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue >>= rFD.CharSet; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue >>= rFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue >>= rFD.Weight; + case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue >>= rFD.Weight; break; - case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: if ( rValue >>= nExtractShort ) + case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: if ( rValue >>= nExtractShort ) rFD.Slant = (::com::sun::star::awt::FontSlant)nExtractShort; else rValue >>= rFD.Slant; break; - case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue >>= rFD.Underline; + case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue >>= rFD.Underline; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue >>= rFD.Strikeout; + case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue >>= rFD.Strikeout; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue >>= rFD.Width; + case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue >>= rFD.Width; break; - case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue >>= rFD.Pitch; + case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue >>= rFD.Pitch; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue >>= rFD.CharacterWidth; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue >>= rFD.CharacterWidth; break; - case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue >>= rFD.Orientation; + case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue >>= rFD.Orientation; break; - case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue >>= rFD.Kerning; + case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue >>= rFD.Kerning; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue >>= rFD.WordLineMode; + case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue >>= rFD.WordLineMode; break; - case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue >>= rFD.Type; + case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue >>= rFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: DBG_ERROR( "FontProperty?!" ); } } -// ---------------------------------------------------- -// class UnoControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlModel +// ---------------------------------------------------- UnoControlModel::UnoControlModel() : OPropertySetHelper( BrdcstHelper ), maDisposeListeners( *this ) { @@ -193,7 +193,7 @@ UnoControlModel::~UnoControlModel() delete mpData; } -UnoControlModel* UnoControlModel::Clone() const +UnoControlModel* UnoControlModel::Clone() const { DBG_ERROR( "UnoControlModel::Clone() ?!" ); return NULL; @@ -202,7 +202,7 @@ UnoControlModel* UnoControlModel::Clone() const ::com::sun::star::uno::Sequence<sal_Int32> UnoControlModel::ImplGetPropertyIds() const { sal_uInt32 nIDs = mpData->Count(); - ::com::sun::star::uno::Sequence<sal_Int32> aIDs( nIDs ); + ::com::sun::star::uno::Sequence<sal_Int32> aIDs( nIDs ); sal_Int32* pIDs = aIDs.getArray(); for ( sal_uInt32 n = 0; n < nIDs; n++ ) pIDs[n] = mpData->GetObjectKey( n ); @@ -232,23 +232,23 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const EmptyFontDescriptor aFD; switch ( nPropId ) { - case BASEPROPERTY_FONTDESCRIPTOR: aDefault <<= aFD; break; - case BASEPROPERTY_FONTDESCRIPTORPART_NAME: aDefault <<= aFD.Name; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: aDefault <<= aFD.StyleName; break; - case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: aDefault <<= aFD.Family; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: aDefault <<= aFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: aDefault <<= (float)aFD.Height; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: aDefault <<= aFD.Weight; break; - case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: aDefault <<= (sal_Int16)aFD.Slant; break; - case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: aDefault <<= aFD.Underline; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: aDefault <<= aFD.Strikeout; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: aDefault <<= aFD.Width; break; - case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: aDefault <<= aFD.Pitch; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: aDefault <<= aFD.CharacterWidth; break; - case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: aDefault <<= aFD.Orientation; break; - case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: aDefault <<= aFD.Kerning; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: aDefault <<= aFD.WordLineMode; break; - case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: aDefault <<= aFD.Type; break; + case BASEPROPERTY_FONTDESCRIPTOR: aDefault <<= aFD; break; + case BASEPROPERTY_FONTDESCRIPTORPART_NAME: aDefault <<= aFD.Name; break; + case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: aDefault <<= aFD.StyleName; break; + case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: aDefault <<= aFD.Family; break; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: aDefault <<= aFD.CharSet; break; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: aDefault <<= (float)aFD.Height; break; + case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: aDefault <<= aFD.Weight; break; + case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: aDefault <<= (sal_Int16)aFD.Slant; break; + case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: aDefault <<= aFD.Underline; break; + case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: aDefault <<= aFD.Strikeout; break; + case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: aDefault <<= aFD.Width; break; + case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: aDefault <<= aFD.Pitch; break; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: aDefault <<= aFD.CharacterWidth; break; + case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: aDefault <<= aFD.Orientation; break; + case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: aDefault <<= aFD.Kerning; break; + case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: aDefault <<= aFD.WordLineMode; break; + case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: aDefault <<= aFD.Type; break; default: DBG_ERROR( "FontProperty?!" ); } } @@ -275,9 +275,9 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_DATESHOWCENTURY: case BASEPROPERTY_TIME: case BASEPROPERTY_VALUE_DOUBLE: - case BASEPROPERTY_PROGRESSVALUE: - case BASEPROPERTY_SCROLLVALUE: - case BASEPROPERTY_VISIBLESIZE: + case BASEPROPERTY_PROGRESSVALUE: + case BASEPROPERTY_SCROLLVALUE: + case BASEPROPERTY_VISIBLESIZE: case BASEPROPERTY_BACKGROUNDCOLOR: case BASEPROPERTY_FILLCOLOR: break; // Void @@ -303,14 +303,14 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_TIMEMIN: aDefault <<= (sal_Int32) 0; break; case BASEPROPERTY_VALUEMAX_DOUBLE: aDefault <<= (double) 1000000; break; case BASEPROPERTY_VALUEMIN_DOUBLE: aDefault <<= (double) -1000000; break; - case BASEPROPERTY_VALUESTEP_DOUBLE: aDefault <<= (double ) 1; break; + case BASEPROPERTY_VALUESTEP_DOUBLE: aDefault <<= (double ) 1; break; case BASEPROPERTY_PROGRESSVALUE_MAX: aDefault <<= (sal_Int32) 100; break; case BASEPROPERTY_PROGRESSVALUE_MIN: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_SCROLLVALUE_MAX: aDefault <<= (sal_Int32) 100; break; - case BASEPROPERTY_SCROLLVALUE_MIN: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_LINEINCREMENT: aDefault <<= (sal_Int32) 1; break; - case BASEPROPERTY_BLOCKINCREMENT: aDefault <<= (sal_Int32) 10; break; - case BASEPROPERTY_ORIENTATION: aDefault <<= (sal_Int32) 0; break; + case BASEPROPERTY_SCROLLVALUE_MAX: aDefault <<= (sal_Int32) 100; break; + case BASEPROPERTY_SCROLLVALUE_MIN: aDefault <<= (sal_Int32) 0; break; + case BASEPROPERTY_LINEINCREMENT: aDefault <<= (sal_Int32) 1; break; + case BASEPROPERTY_BLOCKINCREMENT: aDefault <<= (sal_Int32) 10; break; + case BASEPROPERTY_ORIENTATION: aDefault <<= (sal_Int32) 0; break; case BASEPROPERTY_SPINVALUE: aDefault <<= (sal_Int32) 0; break; case BASEPROPERTY_SPININCREMENT: aDefault <<= (sal_Int32) 1; break; case BASEPROPERTY_SPINVALUE_MIN: aDefault <<= (sal_Int32) 0; break; @@ -354,7 +354,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_HELPTEXT: case BASEPROPERTY_HELPURL: case BASEPROPERTY_IMAGEURL: - case BASEPROPERTY_DIALOGSOURCEURL: + case BASEPROPERTY_DIALOGSOURCEURL: case BASEPROPERTY_EDITMASK: case BASEPROPERTY_LITERALMASK: case BASEPROPERTY_LABEL: @@ -411,8 +411,8 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const // look for the currency entry (for this language) which has the given bank symbol Sequence< Currency2 > aAllCurrencies = aLocaleInfo.getAllCurrencies(); - const Currency2* pAllCurrencies = aAllCurrencies.getConstArray(); - const Currency2* pAllCurrenciesEnd = pAllCurrencies + aAllCurrencies.getLength(); + const Currency2* pAllCurrencies = aAllCurrencies.getConstArray(); + const Currency2* pAllCurrenciesEnd = pAllCurrencies + aAllCurrencies.getLength(); ::rtl::OUString sCurrencySymbol = aLocaleInfo.getCurrSymbol(); if ( !sBankSymbol.getLength() ) @@ -638,7 +638,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: for ( i = 0; i < nProps; i++ ) { sal_Int32 nPropDataBeginMark = xMark->createMark(); - OutStream->writeLong( 0L ); // DataLen + OutStream->writeLong( 0L ); // DataLen ImplControlProperty* pProp = aProps.GetObject( i ); OutStream->writeShort( pProp->GetId() ); @@ -782,9 +782,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: for ( sal_uInt16 n = BASEPROPERTY_FONT_TYPE; n <= BASEPROPERTY_FONT_ATTRIBS; n++ ) { sal_Int32 nPropDataBeginMark = xMark->createMark(); - OutStream->writeLong( 0L ); // DataLen - OutStream->writeShort( n ); // PropId - OutStream->writeBoolean( sal_False ); // Void + OutStream->writeLong( 0L ); // DataLen + OutStream->writeShort( n ); // PropId + OutStream->writeBoolean( sal_False ); // Void if ( n == BASEPROPERTY_FONT_TYPE ) { @@ -924,7 +924,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { long nEntries = InStream->readLong(); ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = InStream->readUTF(); aValue <<= aSeq; @@ -934,7 +934,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { long nEntries = InStream->readLong(); ::com::sun::star::uno::Sequence<sal_uInt16> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = (sal_uInt16)InStream->readShort(); aValue <<= aSeq; } @@ -942,7 +942,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { long nEntries = InStream->readLong(); ::com::sun::star::uno::Sequence<sal_Int16> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = (sal_Int16)InStream->readShort(); aValue <<= aSeq; } @@ -970,7 +970,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { // Sonst ist es nur die redundante Info fuer alte Versionen // Daten werden durch MarkableStream geskippt. - if ( nVersion < 2 ) + if ( nVersion < 2 ) { if ( !pFD ) { @@ -999,7 +999,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } pFD->Width = (sal_Int16)InStream->readLong(); pFD->Height = (sal_Int16)InStream->readLong(); - InStream->readShort(); // ::com::sun::star::awt::FontWidth ignorieren - wurde mal falsch geschrieben und wird nicht gebraucht. + InStream->readShort(); // ::com::sun::star::awt::FontWidth ignorieren - wurde mal falsch geschrieben und wird nicht gebraucht. pFD->CharacterWidth = ::com::sun::star::awt::FontWidth::DONTKNOW; } } @@ -1007,7 +1007,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { if ( nVersion < 2 ) { - if ( !pFD ) + if ( !pFD ) { pFD = new ::com::sun::star::awt::FontDescriptor; ImplControlProperty* pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR ); @@ -1038,7 +1038,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } } - if ( mpData->Get( nPropId ) ) + if ( mpData->Get( nPropId ) ) { aProps.getArray()[i] = GetPropertyName( nPropId ); aValues.getArray()[i] = aValue; @@ -1051,13 +1051,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: // Falls bereits mehr drinsteht als diese Version kennt: xMark->jumpToMark( nPropDataBeginMark ); InStream->skipBytes( nPropDataLen ); - xMark->deleteMark(nPropDataBeginMark); + xMark->deleteMark(nPropDataBeginMark); } - if ( bInvalidEntries ) + if ( bInvalidEntries ) { - for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ ) + for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ ) { - if ( !aProps.getConstArray()[i].getLength() ) + if ( !aProps.getConstArray()[i].getLength() ) { ::comphelper::removeElementAt( aProps, i ); ::comphelper::removeElementAt( aValues, i ); @@ -1065,7 +1065,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } } } - + try { setPropertyValues( aProps, aValues ); @@ -1075,7 +1075,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: DBG_UNHANDLED_EXCEPTION(); } - if ( pFD ) + if ( pFD ) { ::com::sun::star::uno::Any aValue; aValue <<= *pFD; @@ -1090,13 +1090,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { DBG_ERROR( "This method should be overloaded!" ); return ::rtl::OUString(); - + } sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); const ::rtl::OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) @@ -1168,7 +1168,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & if ( bConverted ) rConvertedValue <<= nAsDouble; else - { // try as integer - 96136 - 2002-10-08 - fs@openoffice.org + { // try as integer - 96136 - 2002-10-08 - fs@openoffice.org sal_Int32 nAsInteger = 0; bConverted = ( rValue >>= nAsInteger ); if ( bConverted ) @@ -1260,7 +1260,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { // Fehlt: Die gefakten Einzelproperties des FontDescriptors... - + ImplControlProperty* pProp = mpData->Get( nPropId ); ENSURE_OR_RETURN_VOID( pProp, "UnoControlModel::setFastPropertyValue_NoBroadcast: invalid property id!" ); @@ -1271,9 +1271,9 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nPropId ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((UnoControlModel*)this)->GetMutex() ); - + ImplControlProperty* pProp = mpData->Get( nPropId ); - + if ( pProp ) rValue = pProp->GetValue(); else if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) @@ -1281,39 +1281,39 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR ); ::com::sun::star::awt::FontDescriptor aFD; pProp->GetValue() >>= aFD; - switch ( nPropId ) + switch ( nPropId ) { - case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue <<= aFD.Name; + case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue <<= aFD.Name; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue <<= aFD.StyleName; + case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue <<= aFD.StyleName; break; - case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue <<= aFD.Family; + case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue <<= aFD.Family; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue <<= aFD.CharSet; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue <<= aFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue <<= (float)aFD.Height; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue <<= (float)aFD.Height; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue <<= aFD.Weight; + case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue <<= aFD.Weight; break; - case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: rValue <<= (sal_Int16)aFD.Slant; + case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: rValue <<= (sal_Int16)aFD.Slant; break; - case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue <<= aFD.Underline; + case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue <<= aFD.Underline; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue <<= aFD.Strikeout; + case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue <<= aFD.Strikeout; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue <<= aFD.Width; + case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue <<= aFD.Width; break; - case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue <<= aFD.Pitch; + case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue <<= aFD.Pitch; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue <<= aFD.CharacterWidth; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue <<= aFD.CharacterWidth; break; - case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue <<= aFD.Orientation; + case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue <<= aFD.Orientation; break; - case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue <<= aFD.Kerning; + case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue <<= aFD.Kerning; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue <<= aFD.WordLineMode; + case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue <<= aFD.WordLineMode; break; - case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue <<= aFD.Type; + case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue <<= aFD.Type; break; default: DBG_ERROR( "FontProperty?!" ); } @@ -1345,7 +1345,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); - + Any aOldSingleValue; getFastPropertyValue( aOldSingleValue, BASEPROPERTY_FONTDESCRIPTORPART_START ); @@ -1384,10 +1384,10 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); - + sal_Int32 nProps = rPropertyNames.getLength(); -// sal_Int32* pHandles = new sal_Int32[nProps]; +// sal_Int32* pHandles = new sal_Int32[nProps]; // don't do this - it leaks in case of an exception Sequence< sal_Int32 > aHandles( nProps ); sal_Int32* pHandles = aHandles.getArray(); @@ -1399,16 +1399,16 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< sal_Int32 nValidHandles = getInfoHelper().fillHandles( pHandles, rPropertyNames ); - if ( nValidHandles ) + if ( nValidHandles ) { // if somebody sets properties which are single aspects of a font descriptor, // remove them, and build a font descriptor instead ::std::auto_ptr< awt::FontDescriptor > pFD; - for ( sal_uInt16 n = 0; n < nProps; ++n ) + for ( sal_uInt16 n = 0; n < nProps; ++n ) { if ( ( pHandles[n] >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( pHandles[n] <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { - if ( !pFD.get() ) + if ( !pFD.get() ) { ImplControlProperty* pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR ); pFD.reset( new awt::FontDescriptor ); @@ -1433,9 +1433,9 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< else aGuard.clear(); // same as a few lines above - + // FD-Propertie nicht in das Array mergen, weil sortiert... - if ( pFD.get() ) + if ( pFD.get() ) { ::com::sun::star::uno::Any aValue; aValue <<= *pFD; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index b72ae69e44c6..90fcba2e4e32 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ using namespace ::toolkit; #define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ ::rtl::OUString SAL_CALL ImplName::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( "stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ { \ ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \ aNames.realloc( aNames.getLength() + 1 ); \ @@ -91,9 +91,9 @@ using namespace ::toolkit; -// ---------------------------------------------------- -// class UnoControlEditModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlEditModel +// ---------------------------------------------------- UnoControlEditModel::UnoControlEditModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit ); @@ -128,7 +128,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -142,9 +142,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf } -// ---------------------------------------------------- -// class UnoEditControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoEditControl +// ---------------------------------------------------- UnoEditControl::UnoEditControl() :maTextListeners( *this ) ,mnMaxTextLen( 0 ) @@ -456,9 +456,9 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t } -// ---------------------------------------------------- -// class UnoControlFileControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlFileControlModel +// ---------------------------------------------------- UnoControlFileControlModel::UnoControlFileControlModel() { ImplRegisterProperty( BASEPROPERTY_ALIGN ); @@ -502,7 +502,7 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -515,9 +515,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert return xInfo; } -// ---------------------------------------------------- -// class UnoFileControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoFileControl +// ---------------------------------------------------- UnoFileControl::UnoFileControl() { } @@ -527,9 +527,9 @@ UnoFileControl::UnoFileControl() return ::rtl::OUString::createFromAscii( "filecontrol" ); } -// ---------------------------------------------------- -// class GraphicControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class GraphicControlModel +// ---------------------------------------------------- uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { if ( nPropId == BASEPROPERTY_GRAPHIC ) @@ -634,9 +634,9 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n } } -// ---------------------------------------------------- -// class UnoControlButtonModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlButtonModel +// ---------------------------------------------------- UnoControlButtonModel::UnoControlButtonModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXButton ); @@ -677,7 +677,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -690,9 +690,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI return xInfo; } -// ---------------------------------------------------- -// class UnoButtonControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoButtonControl +// ---------------------------------------------------- UnoButtonControl::UnoButtonControl() : maActionListeners( *this ) , maItemListeners( *this ) @@ -829,9 +829,9 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw( return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlImageControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlImageControlModel +// ---------------------------------------------------- UnoControlImageControlModel::UnoControlImageControlModel() :mbAdjustingImageScaleMode( false ) { @@ -859,7 +859,7 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -910,9 +910,9 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal } } -// ---------------------------------------------------- -// class UnoImageControlControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoImageControlControl +// ---------------------------------------------------- UnoImageControlControl::UnoImageControlControl() : maActionListeners( *this ) { @@ -954,9 +954,9 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize ) return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlRadioButtonModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlRadioButtonModel +// ---------------------------------------------------- UnoControlRadioButtonModel::UnoControlRadioButtonModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton ); @@ -986,7 +986,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1001,9 +1001,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert -// ---------------------------------------------------- -// class UnoRadioButtonControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoRadioButtonControl +// ---------------------------------------------------- UnoRadioButtonControl::UnoRadioButtonControl() : maItemListeners( *this ), maActionListeners( *this ) { @@ -1161,9 +1161,9 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) t return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlCheckBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlCheckBoxModel +// ---------------------------------------------------- UnoControlCheckBoxModel::UnoControlCheckBoxModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox ); @@ -1193,7 +1193,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1208,9 +1208,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe -// ---------------------------------------------------- -// class UnoCheckBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoCheckBoxControl +// ---------------------------------------------------- UnoCheckBoxControl::UnoCheckBoxControl() : maItemListeners( *this ), maActionListeners( *this ) { @@ -1344,9 +1344,9 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) thro return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- +// ---------------------------------------------------- // class UnoControlFixedHyperlinkModel -// ---------------------------------------------------- +// ---------------------------------------------------- UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink ); @@ -1386,7 +1386,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1399,9 +1399,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp return xInfo; } -// ---------------------------------------------------- +// ---------------------------------------------------- // class UnoFixedHyperlinkControl -// ---------------------------------------------------- +// ---------------------------------------------------- UnoFixedHyperlinkControl::UnoFixedHyperlinkControl() : maActionListeners( *this ) { @@ -1659,9 +1659,9 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) thr return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlGroupBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlGroupBoxModel +// ---------------------------------------------------- UnoControlGroupBoxModel::UnoControlGroupBoxModel() { ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); @@ -1697,7 +1697,7 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1710,9 +1710,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe return xInfo; } -// ---------------------------------------------------- -// class UnoGroupBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoGroupBoxControl +// ---------------------------------------------------- UnoGroupBoxControl::UnoGroupBoxControl() { maComponentInfos.nWidth = 100; @@ -1766,7 +1766,7 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1779,9 +1779,9 @@ uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( return xInfo; } -// ---------------------------------------------------- -// class MultiPageControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MultiPageControl +// ---------------------------------------------------- UnoMultiPageControl::UnoMultiPageControl() { maComponentInfos.nWidth = 100; @@ -1948,7 +1948,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -2342,9 +2342,9 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n m_aItemListListeners.notifyEach( NotificationMethod, aEvent ); } -// ---------------------------------------------------- -// class UnoListBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoListBoxControl +// ---------------------------------------------------- UnoListBoxControl::UnoListBoxControl() :maActionListeners( *this ) ,maItemListeners( *this ) @@ -2764,17 +2764,17 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv if ( xPeerListener.is() ) xPeerListener->itemListChanged( i_rEvent ); } -ActionListenerMultiplexer& UnoListBoxControl::getActionListeners() +ActionListenerMultiplexer& UnoListBoxControl::getActionListeners() { return maActionListeners; } -ItemListenerMultiplexer& UnoListBoxControl::getItemListeners() +ItemListenerMultiplexer& UnoListBoxControl::getItemListeners() { return maItemListeners; } -// ---------------------------------------------------- -// class UnoControlComboBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlComboBoxModel +// ---------------------------------------------------- UnoControlComboBoxModel::UnoControlComboBoxModel() : UnoControlListBoxModel(true) { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox ); @@ -2793,7 +2793,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -2847,11 +2847,11 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons return UnoControlModel::ImplGetDefaultValue( nPropId ); } -// ---------------------------------------------------- -// class UnoComboBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoComboBoxControl +// ---------------------------------------------------- UnoComboBoxControl::UnoComboBoxControl() - : maActionListeners( *this ), + : maActionListeners( *this ), maItemListeners( *this ) { maComponentInfos.nWidth = 100; @@ -2961,7 +2961,7 @@ void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemLis { if( getPeer().is() && maItemListeners.getLength() == 1 ) { - uno::Reference < awt::XComboBox > xComboBox( getPeer(), uno::UNO_QUERY ); // MT: Mal alles so umstellen, schoener als Ref anlegen und query rufen + uno::Reference < awt::XComboBox > xComboBox( getPeer(), uno::UNO_QUERY ); // MT: Mal alles so umstellen, schoener als Ref anlegen und query rufen xComboBox->removeItemListener( &maItemListeners ); } maItemListeners.removeInterface( l ); @@ -3045,11 +3045,11 @@ void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rE if ( xPeerListener.is() ) xPeerListener->itemListChanged( i_rEvent ); } -ActionListenerMultiplexer& UnoComboBoxControl::getActionListeners() +ActionListenerMultiplexer& UnoComboBoxControl::getActionListeners() { return maActionListeners; } -ItemListenerMultiplexer& UnoComboBoxControl::getItemListeners() +ItemListenerMultiplexer& UnoComboBoxControl::getItemListeners() { return maItemListeners; } @@ -3167,9 +3167,9 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException } -// ---------------------------------------------------- -// UnoSpinFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// UnoSpinFieldControl +// ---------------------------------------------------- UnoSpinFieldControl::UnoSpinFieldControl() : maSpinListeners( *this ) { mbRepeat = sal_False; @@ -3257,9 +3257,9 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::sta xField->enableRepeat( bRepeat ); } -// ---------------------------------------------------- -// class UnoControlDateFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlDateFieldModel +// ---------------------------------------------------- UnoControlDateFieldModel::UnoControlDateFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField ); @@ -3287,7 +3287,7 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3302,9 +3302,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS -// ---------------------------------------------------- -// class UnoDateFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoDateFieldControl +// ---------------------------------------------------- UnoDateFieldControl::UnoDateFieldControl() { mnFirst = Date( 1, 1, 1900 ).GetDate(); @@ -3497,9 +3497,9 @@ sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException) return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } -// ---------------------------------------------------- -// class UnoControlTimeFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlTimeFieldModel +// ---------------------------------------------------- UnoControlTimeFieldModel::UnoControlTimeFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField ); @@ -3527,7 +3527,7 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3542,9 +3542,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS -// ---------------------------------------------------- -// class UnoTimeFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoTimeFieldControl +// ---------------------------------------------------- UnoTimeFieldControl::UnoTimeFieldControl() { mnFirst = Time( 0, 0 ).GetTime(); @@ -3696,9 +3696,9 @@ sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException) return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } -// ---------------------------------------------------- -// class UnoControlNumericFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlNumericFieldModel +// ---------------------------------------------------- UnoControlNumericFieldModel::UnoControlNumericFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField ); @@ -3726,7 +3726,7 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3741,9 +3741,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper -// ---------------------------------------------------- -// class UnoNumericFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoNumericFieldControl +// ---------------------------------------------------- UnoNumericFieldControl::UnoNumericFieldControl() { mnFirst = 0; @@ -3892,9 +3892,9 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -// ---------------------------------------------------- -// class UnoControlCurrencyFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlCurrencyFieldModel +// ---------------------------------------------------- UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField ); @@ -3928,7 +3928,7 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3941,9 +3941,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope return xInfo; } -// ---------------------------------------------------- -// class UnoCurrencyFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoCurrencyFieldControl +// ---------------------------------------------------- UnoCurrencyFieldControl::UnoCurrencyFieldControl() { mnFirst = 0; @@ -4091,9 +4091,9 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeExceptio return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -// ---------------------------------------------------- -// class UnoControlPatternFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlPatternFieldModel +// ---------------------------------------------------- UnoControlPatternFieldModel::UnoControlPatternFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField ); @@ -4120,7 +4120,7 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -4134,9 +4134,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper } -// ---------------------------------------------------- -// class UnoPatternFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoPatternFieldControl +// ---------------------------------------------------- UnoPatternFieldControl::UnoPatternFieldControl() { } @@ -4223,9 +4223,9 @@ sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException) } -// ---------------------------------------------------- -// class UnoControlProgressBarModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlProgressBarModel +// ---------------------------------------------------- UnoControlProgressBarModel::UnoControlProgressBarModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -4265,7 +4265,7 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -4279,9 +4279,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert } -// ---------------------------------------------------- -// class UnoProgressBarControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoProgressBarControl +// ---------------------------------------------------- UnoProgressBarControl::UnoProgressBarControl() { } @@ -4355,9 +4355,9 @@ sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::Runtime } -// ---------------------------------------------------- -// class UnoControlFixedLineModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlFixedLineModel +// ---------------------------------------------------- UnoControlFixedLineModel::UnoControlFixedLineModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -4393,7 +4393,7 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -4406,13 +4406,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS return xInfo; } -// ---------------------------------------------------- -// class UnoFixedLineControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoFixedLineControl +// ---------------------------------------------------- UnoFixedLineControl::UnoFixedLineControl() { - maComponentInfos.nWidth = 100; // ?? - maComponentInfos.nHeight = 100; // ?? + maComponentInfos.nWidth = 100; // ?? + maComponentInfos.nHeight = 100; // ?? } ::rtl::OUString UnoFixedLineControl::GetComponentServiceName() |