diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:50:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 14:54:56 -0600 |
| commit | bed18b128ff1329579369b07b2b172e2906649f8 (patch) | |
| tree | 2d3766c57b8b262e9560578edecb83e070154fe1 /forms | |
| parent | Remove visual noise from formula (diff) | |
| download | core-bed18b128ff1329579369b07b2b172e2906649f8.tar.gz core-bed18b128ff1329579369b07b2b172e2906649f8.zip | |
Remove visual noise from forms
Conflicts:
forms/source/component/DatabaseForm.cxx
Change-Id: I4005fe65e89794bd92191c37221c252a3e964917
Reviewed-on: https://gerrit.libreoffice.org/8262
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'forms')
161 files changed, 1283 insertions, 1284 deletions
diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index f7fcb3457df0..d8758017ccc1 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -281,7 +281,7 @@ public class CellBinding extends complexlib.ComplexTestCase short col = (short)0; short row = (short)18; - // ............................................................... + // add a list entry source which fills the list boxes list from cells in the // spreadsheet short sourceCol = (short)4; @@ -292,11 +292,11 @@ public class CellBinding extends complexlib.ComplexTestCase //setListSource( listBox, sourceCol, row, (short)( row + 2 ) ); // TODO: this is currently prone to deadlocks - // ............................................................... + // bind to a cell bindToCell( listBox, col, row ); - // ............................................................... + // do the tests listBox.setPropertyValue( "SelectedItems", new short[] { (short)0 } ); verifyStringCellContent( col, row, "Apples", "programmatically selecting a list entry is not propagated to the cell." ); @@ -323,7 +323,7 @@ public class CellBinding extends complexlib.ComplexTestCase short col = (short)0; short row = (short)21; - // ............................................................... + // add a list entry source which fills the list boxes list from cells in the // spreadsheet short sourceCol = (short)4; @@ -334,11 +334,11 @@ public class CellBinding extends complexlib.ComplexTestCase //setListSource( listBox, sourceCol, row, (short)( row + 2 ) ); // TODO: this is currently prone to deadlocks - // ............................................................... + // bind to a cell bindToCell( listBox, col, row, "com.sun.star.table.ListPositionCellBinding" ); - // ............................................................... + // do the tests listBox.setPropertyValue( "SelectedItems", new short[] { (short)0 } ); verifyNumericCellContent( col, row, 1, "programmatically selecting a list entry is not propagated (as index) to the cell." ); diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index f591be402ca1..55ddfbfbf2a9 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -459,7 +459,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE } } - //========================================================================= + /* ------------------------------------------------------------------ */ private boolean ensureDataSource() throws Exception { diff --git a/forms/qa/integration/forms/SingleControlValidation.java b/forms/qa/integration/forms/SingleControlValidation.java index 05b3fa9e0afa..235ef29eee87 100644 --- a/forms/qa/integration/forms/SingleControlValidation.java +++ b/forms/qa/integration/forms/SingleControlValidation.java @@ -106,7 +106,7 @@ public class SingleControlValidation implements XFormComponentValidityListener } m_inputField = controls[ 0 ]; - // ---------------------------------- + controlPos += 4; XPropertySet xLabel = m_formLayer.createControlAndShape( "FixedText", columnPos, controlPos, 70, 4, null ); xLabel.setPropertyValue( "Label", new String( "Status:" ) ); @@ -114,7 +114,7 @@ public class SingleControlValidation implements XFormComponentValidityListener m_statusField = m_formLayer.createControlAndShape( "FixedText", columnPos, controlPos, 70, 4, null ); m_statusField.setPropertyValue( "Label", new String( "" ) ); - // ---------------------------------- + controlPos += 6; xLabel = m_formLayer.createControlAndShape( "FixedText", columnPos, controlPos, 70, 4, null ); xLabel.setPropertyValue( "Label", new String( "Explanation for invalidity:" ) ); diff --git a/forms/qa/integration/forms/XMLFormSettings.java b/forms/qa/integration/forms/XMLFormSettings.java index 16e766ceac25..cfa9539bfec4 100644 --- a/forms/qa/integration/forms/XMLFormSettings.java +++ b/forms/qa/integration/forms/XMLFormSettings.java @@ -184,7 +184,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase assure( "model data changed, but document is modified", !m_document.isModified() ); - // ................................................................. + // finally, check whether the flag survives loading and saving Model internalDataModel = m_document.addXFormModel( "internalData" ); internalDataModel.setIsDocumentInternalData( true ); diff --git a/forms/source/component/BaseListBox.hxx b/forms/source/component/BaseListBox.hxx index 672594a70683..3acaed7c37b9 100644 --- a/forms/source/component/BaseListBox.hxx +++ b/forms/source/component/BaseListBox.hxx @@ -20,16 +20,16 @@ #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX #define INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX -//......................................................................... + namespace frm { const sal_uInt16 ENTRY_NOT_FOUND = 0xFFFF; const sal_uInt16 BOUNDCOLUMN = 0x0001; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 54b770b8cc0f..5ca763ae40fb 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -31,10 +31,10 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; @@ -49,9 +49,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using ::com::sun::star::frame::XDispatchProviderInterceptor; -//================================================================== + //= OButtonModel -//================================================================== + InterfaceRef SAL_CALL OButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { @@ -330,9 +330,9 @@ void OButtonModel::impl_resetNoBroadcast_nothrow() } } -//================================================================== + // OButtonControl -//================================================================== + InterfaceRef SAL_CALL OButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { @@ -566,7 +566,7 @@ public: void handleListening( const OUString& _rPropertyName ); }; -//.............................................................................. + DoPropertyListening::DoPropertyListening( const Reference< XInterface >& _rxComponent, const Reference< XPropertyChangeListener >& _rxListener, bool _bStart ) @@ -578,7 +578,7 @@ DoPropertyListening::DoPropertyListening( DBG_ASSERT( m_xListener.is(), "DoPropertyListening::DoPropertyListening: invalid listener!" ); } -//.............................................................................. + void DoPropertyListening::handleListening( const OUString& _rPropertyName ) { if ( m_xProps.is() ) @@ -759,8 +759,8 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc OFormNavigationHelper::releaseDispatchProviderInterceptor( _rxInterceptor ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 4f6891d12832..bbf97b8e787b 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -35,14 +35,14 @@ #include <cppuhelper/implbase1.hxx> -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + // OButtonModel -//================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::form::XReset > OButtonModel_Base; class OButtonModel :public OClickableImageBaseModel @@ -106,9 +106,9 @@ protected: using OClickableImageBaseModel::disposing; }; -//================================================================== + // OButtonControl -//================================================================== + typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XButton , ::com::sun::star::awt::XActionListener , ::com::sun::star::beans::XPropertyChangeListener @@ -194,9 +194,9 @@ private: void startOrStopModelPropertyListening( bool _bStart ); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 95acfd2eb609..7ca360d7eee7 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -25,7 +25,7 @@ #include <comphelper/basicio.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -41,9 +41,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -//================================================================== + //= OCheckBoxControl -//================================================================== + OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactory) @@ -68,11 +68,11 @@ StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com return aSupported; } -//================================================================== + //= OCheckBoxModel -//================================================================== -//================================================================== + + InterfaceRef SAL_CALL OCheckBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException) { return *(new OCheckBoxModel( comphelper::getComponentContext(_rxFactory) )); @@ -211,7 +211,7 @@ Any OCheckBoxModel::translateDbColumnToControlValue() { Any aValue; - ////////////////////////////////////////////////////////////////// + // Set value in ControlModel bool bValue = bool(); // avoid warning if(DbUseBool()) @@ -287,8 +287,8 @@ sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) return sal_True; } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index 175d55c330b5..7aaac7ac90bc 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -22,13 +22,13 @@ #include "refvaluecomponent.hxx" -//......................................................................... + namespace frm { -//================================================================== + //= OCheckBoxModel -//================================================================== + class OCheckBoxModel :public OReferenceValueComponent { protected: @@ -63,9 +63,9 @@ protected: virtual sal_Bool commitControlValueToDbColumn( bool _bPostReset ); }; -//================================================================== + //= OCheckBoxControl -//================================================================== + class OCheckBoxControl : public OBoundControl { public: @@ -76,9 +76,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 8e934e41dccf..293e53b62845 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -43,10 +43,10 @@ #include "frm_resource.hrc" #include <tools/debug.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -579,8 +579,8 @@ IMPL_COLUMN(ComboBoxColumn, FRM_SUN_COMPONENT_COMBOBOX, sal_Fals IMPL_COLUMN(ListBoxColumn, FRM_SUN_COMPONENT_LISTBOX, sal_False); IMPL_COLUMN(FormattedFieldColumn, FRM_SUN_COMPONENT_FORMATTEDFIELD, sal_False); -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index dcb6617857ff..6da907945a92 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -37,14 +37,14 @@ using namespace comphelper; -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + // OGridColumn -//================================================================== + typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::util::XCloneable > OGridColumn_BASE; class OGridColumn :public ::comphelper::OBaseMutex @@ -203,8 +203,8 @@ DECL_COLUMN(FormattedFieldColumn) #endif // INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 02e81129690a..c32f20910407 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -53,7 +53,7 @@ using namespace dbtools; -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -69,9 +69,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -//======================================================================== + // class OComboBoxModel -//======================================================================== + InterfaceRef SAL_CALL OComboBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException) { @@ -864,9 +864,9 @@ void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( R OBoundControlModel::disposing( _rSource ); } -//======================================================================== + //= OComboBoxControl -//======================================================================== + InterfaceRef SAL_CALL OComboBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException) @@ -891,8 +891,8 @@ StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(Runti return aSupported; } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 6cd9d1d18da1..04a6d37bf114 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -37,13 +37,13 @@ #include <vcl/timer.hxx> -//......................................................................... + namespace frm { -//================================================================== + // OComboBoxModel -//================================================================== + class OComboBoxModel :public OBoundControlModel ,public OEntryListHelper @@ -51,7 +51,7 @@ class OComboBoxModel { CachedRowSet m_aListRowSet; // the row set to fill the list ::com::sun::star::uno::Any m_aBoundColumn; // obsolet - OUString m_aListSource; // + OUString m_aListSource; OUString m_aDefaultText; // DefaultText ::com::sun::star::uno::Any m_aLastKnownValue; @@ -144,9 +144,9 @@ protected: DECLARE_XCLONEABLE(); }; -//================================================================== + // OComboBoxControl -//================================================================== + class OComboBoxControl : public OBoundControl { @@ -158,9 +158,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 2bac133ff194..c64e07c88709 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -24,10 +24,10 @@ #include <unotools/syslocale.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; @@ -40,9 +40,9 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -//================================================================== + // OCurrencyControl -//================================================================== + OCurrencyControl::OCurrencyControl(const Reference<XComponentContext>& _rxFactory) :OBoundControl(_rxFactory, VCL_CONTROL_CURRENCYFIELD) @@ -72,9 +72,9 @@ StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std:: return aSupported; } -//================================================================== + // OCurrencyModel -//================================================================== + InterfaceRef SAL_CALL OCurrencyModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { @@ -249,8 +249,8 @@ void OCurrencyModel::resetNoBroadcast() m_aSaveValue.clear(); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index b8ed78bb70fa..632a52343aae 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -22,14 +22,14 @@ #include "EditBase.hxx" -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + //= OCurrencyModel -//================================================================== + class OCurrencyModel :public OEditBaseModel { @@ -70,9 +70,9 @@ protected: void implConstruct(); }; -//================================================================== + //= OCurrencyControl -//================================================================== + class OCurrencyControl: public OBoundControl { protected: @@ -85,9 +85,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_CURRENCY_HXX diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 7dcec5fd63b6..326acecc9f6f 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -123,14 +123,14 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseForm() static ::frm::OMultiInstanceAutoRegistration< ::frm::ODatabaseForm > aAutoRegistration; } -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + //= DocumentModifyGuard -//================================================================== + class DocumentModifyGuard { public: @@ -162,11 +162,11 @@ private: Reference< XModifiable2 > m_xDocumentModify; }; -//================================================================== + //= OFormSubmitResetThread //=----------------------------------------------------------------- //= submitting and resetting html-forms asynchronously -//================================================================== + class OFormSubmitResetThread: public OComponentEventThread @@ -208,9 +208,9 @@ void OFormSubmitResetThread::processEvent( ((ODatabaseForm *)pCompImpl)->reset_impl(true); } -//================================================================== + //= ODatabaseForm -//================================================================== + Reference< XInterface > SAL_CALL ODatabaseForm::Create( const Reference< XMultiServiceFactory >& _rxFactory ) @@ -470,7 +470,7 @@ ODatabaseForm::~ODatabaseForm() } } -//============================================================================== + // html tools OUString ODatabaseForm::GetDataURLEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) @@ -528,7 +528,7 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro return aResult.makeStringAndClear(); } -//============================================================================== + // html tools OUString ODatabaseForm::GetDataTextEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) @@ -1095,7 +1095,7 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString return sal_True; } -//============================================================================== + // internals void ODatabaseForm::onError( const SQLErrorEvent& _rEvent ) @@ -1351,7 +1351,7 @@ Reference< XConnection > ODatabaseForm::getConnection() return m_aMutex; } -//============================================================================== + // property handling void ODatabaseForm::describeFixedAndAggregateProperties( @@ -1821,7 +1821,7 @@ void SAL_CALL ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle, bool /* } } -//============================================================================== + // com::sun::star::beans::XPropertyState PropertyState ODatabaseForm::getPropertyStateByHandle(sal_Int32 nHandle) @@ -1934,7 +1934,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const return aReturn; } -//============================================================================== + // com::sun::star::form::XReset void SAL_CALL ODatabaseForm::reset() throw( RuntimeException, std::exception ) @@ -2108,7 +2108,7 @@ void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener> m_aResetListeners.removeTypedListener( _rListener ); } -//============================================================================== + // com::sun::star::form::XSubmit void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control, @@ -2326,7 +2326,7 @@ void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListene m_aSubmitListeners.removeInterface(_rListener); } -//============================================================================== + // com::sun::star::sdbc::XSQLErrorBroadcaster void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException, std::exception ) @@ -2347,7 +2347,7 @@ void ODatabaseForm::invlidateParameters() m_aParameterManager.clearAllParameterInformation(); } -//============================================================================== + // OChangeListener void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) @@ -2366,7 +2366,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt } } -//============================================================================== + // smartXChild void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) @@ -2427,7 +2427,7 @@ void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, makeAny( OUString() ) ); } -//============================================================================== + // smartXTabControllerModel sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::RuntimeException, std::exception) @@ -2548,7 +2548,7 @@ void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Refe m_pGroupManager->getGroupByName( Name, _rGroup ); } -//============================================================================== + // com::sun::star::lang::XEventListener void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) @@ -2589,7 +2589,7 @@ void ODatabaseForm::impl_createLoadTimer() m_pLoadTimer->SetTimeoutHdl(LINK(this,ODatabaseForm,OnTimeout)); } -//============================================================================== + // com::sun::star::form::XLoadListener void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) @@ -2661,7 +2661,7 @@ IMPL_LINK_NOARG(ODatabaseForm, OnTimeout) return 1; } -//============================================================================== + // com::sun::star::form::XLoadable void SAL_CALL ODatabaseForm::load() throw( RuntimeException, std::exception ) @@ -3026,16 +3026,15 @@ void SAL_CALL ODatabaseForm::removeLoadListener(const Reference<XLoadListener>& m_aLoadListeners.removeInterface(aListener); } -//============================================================================== + // com::sun::star::sdbc::XCloseable -//============================================================================== void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std::exception ) { // unload will close the aggregate unload(); } -//============================================================================== + // com::sun::star::sdbc::XRowSetListener void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception ) @@ -3227,7 +3226,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t return sal_True; } -//============================================================================== + // com::sun::star::sdb::XRowSetApproveBroadcaster void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException, std::exception ) @@ -3264,7 +3263,7 @@ void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSet } } -//============================================================================== + // com::sun:star::form::XDatabaseParameterBroadcaster void SAL_CALL ODatabaseForm::addDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception ) @@ -3289,7 +3288,7 @@ void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabasePa ODatabaseForm::removeDatabaseParameterListener( _rListener ); } -//============================================================================== + // com::sun::star::sdb::XCompletedExecution void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) @@ -3313,7 +3312,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractio } } -//============================================================================== + // com::sun::star::sdbc::XRowSet void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException, std::exception ) @@ -3353,7 +3352,7 @@ void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListene m_xAggregateAsRowSet->removeRowSetListener(_rListener); } -//============================================================================== + // com::sun::star::sdbc::XResultSet sal_Bool SAL_CALL ODatabaseForm::next() throw( SQLException, RuntimeException, std::exception ) @@ -4111,8 +4110,8 @@ void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeExcept setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName)); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index dc9b61917578..3dc794cdf56c 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -82,19 +82,19 @@ namespace com { namespace sun { namespace star { namespace sdbc { class Timer; class INetMIMEMessage; -//......................................................................... + namespace frm { -//......................................................................... -//======================================================================== + + //= html tools -//======================================================================== + const sal_uInt16 SUCCESSFUL_REPRESENT_TEXT = 0x0001; const sal_uInt16 SUCCESSFUL_REPRESENT_FILE = 0x0002; -//------------------------------------------------------------------------------ + class HtmlSuccessfulObj { public: @@ -117,7 +117,7 @@ public: typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList; -//======================================================================== + class OGroupManager; class OFormSubmitResetThread; typedef ::cppu::ImplHelper12 < ::com::sun::star::form::XForm @@ -553,9 +553,9 @@ inline void ODatabaseForm::submitNBC(const ::com::sun::star::uno::Reference< ::c submit_impl(Control, MouseEvt, false); } -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 739a4894654e..038d909052a0 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -26,10 +26,10 @@ using namespace dbtools; -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -320,8 +320,8 @@ Sequence< Type > ODateModel::getSupportedBindingTypes() return Sequence< Type >( &::getCppuType( static_cast< util::Date* >( NULL ) ), 1 ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index b9a926dec121..136bb2e52de2 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -23,14 +23,14 @@ #include "EditBase.hxx" #include "limitedformats.hxx" -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + //= ODateModel -//================================================================== + class ODateModel :public OEditBaseModel ,public OLimitedFormats @@ -100,9 +100,9 @@ private: ::com::sun::star::uno::Any& _rUNOValue ) const; }; -//================================================================== + //= ODateControl -//================================================================== + class ODateControl: public OBoundControl { protected: @@ -117,9 +117,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 61c6161c847d..52d237bc8af0 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -45,7 +45,7 @@ using namespace dbtools; -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -738,8 +738,8 @@ Any OEditModel::getDefaultForReset() const return makeAny( m_aDefaultText ); } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index b071a1e102b8..ce3931145415 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -27,13 +27,13 @@ namespace dbtools { class FormattedColumnValue; } -//......................................................................... + namespace frm { -//================================================================== + //= OEditModel -//================================================================== + class OEditModel :public OEditBaseModel { @@ -118,9 +118,9 @@ private: bool implActsAsRichText( ) const; }; -//================================================================== + //= OEditControl -//================================================================== + typedef ::cppu::ImplHelper3< ::com::sun::star::awt::XFocusListener, ::com::sun::star::awt::XKeyListener, ::com::sun::star::form::XChangeBroadcaster > OEditControl_BASE; @@ -172,9 +172,9 @@ private: DECL_LINK( OnKeyPressed, void* ); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index c7b0cebf6ce8..d6af51106559 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/Date.hpp> -//......................................................................... + namespace frm { using namespace ::com::sun::star; @@ -375,8 +375,8 @@ Any OEditBaseModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const } } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 56d51280fad6..884dae79e2f3 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -45,13 +45,13 @@ #define PF_SPECIAL_FLAGS 0xFF00 -//......................................................................... + namespace frm { -//================================================================== + //= OEditBaseModel -//================================================================== + class OEditBaseModel : public OBoundControlModel { sal_Int16 m_nLastReadVersion; @@ -95,9 +95,9 @@ protected: // (one of the PF_.... constants). After ::read they may ask for that flags with getLastReadVersion }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 8653402e29e7..6a5b0a6c0e0e 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -21,10 +21,10 @@ #include <comphelper/guarding.hxx> #include <tools/debug.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; @@ -218,8 +218,8 @@ void OComponentEventThread::run() while( true ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 88410cc103ac..ff964cbe0804 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -36,10 +36,10 @@ #include <comphelper/uno3.hxx> using namespace comphelper; -//......................................................................... + namespace frm { -//......................................................................... + // *************************************************************************************************** // *************************************************************************************************** @@ -111,9 +111,9 @@ private: void impl_clearEventQueue(); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index ca68edd9cef4..b3ec3105bcb2 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -29,10 +29,10 @@ #include <comphelper/guarding.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; @@ -282,8 +282,8 @@ void OFileControlModel::_reset() } } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 9b1d710a7975..56ffc1f021d7 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -22,14 +22,14 @@ #include "FormComponent.hxx" -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + // OFileControlModel -//================================================================== + class OFileControlModel :public OControlModel ,public ::com::sun::star::form::XReset @@ -87,9 +87,9 @@ protected: DECLARE_XCLONEABLE(); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index f4ae9c9450a4..5117ec3c231e 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -70,10 +70,10 @@ extern "C" void SAL_CALL createRegistryInfo_OFilterControl() static ::frm::OMultiInstanceAutoRegistration< ::frm::OFilterControl > aAutoRegistration; } -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -89,9 +89,9 @@ namespace frm using namespace ::connectivity; - //===================================================================== + // OFilterControl - //===================================================================== + OFilterControl::OFilterControl( const Reference< XComponentContext >& _rxORB ) :UnoControl() @@ -825,13 +825,13 @@ namespace frm return; } // some properties which are "derived" from the control model we're working for - // ................................................... + // the field m_xField.clear(); OSL_ENSURE( ::comphelper::hasProperty( PROPERTY_BOUNDFIELD, xControlModel ), "OFilterControl::initialize: control model needs a bound field property!" ); xControlModel->getPropertyValue( PROPERTY_BOUNDFIELD ) >>= m_xField; - // ................................................... + // filter list and control class m_bFilterList = ::comphelper::hasProperty( PROPERTY_FILTERPROPOSAL, xControlModel ) && ::comphelper::getBOOL( xControlModel->getPropertyValue( PROPERTY_FILTERPROPOSAL ) ); if ( m_bFilterList ) @@ -864,7 +864,7 @@ namespace frm } } - // ................................................... + // the connection meta data for the form which we're working for Reference< XChild > xModel( xControlModel, UNO_QUERY ); Reference< XRowSet > xForm; @@ -908,8 +908,8 @@ namespace frm return static_cast< XServiceInfo* >( new OFilterControl( comphelper::getComponentContext(_rxFactory) ) ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 8a20b5434e26..6bc439057f04 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -38,14 +38,14 @@ #include <boost/unordered_map.hpp> -//......................................................................... + namespace frm { -//......................................................................... - //===================================================================== + + // OFilterControl - //===================================================================== + typedef ::cppu::ImplHelper5 < ::com::sun::star::awt::XTextComponent , ::com::sun::star::awt::XFocusListener , ::com::sun::star::awt::XItemListener @@ -142,9 +142,9 @@ namespace frm void displayException( const ::com::sun::star::sdb::SQLContext& _rExcept ); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 5d336292c3e2..7dd37d6c7a24 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -24,7 +24,7 @@ #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -115,8 +115,8 @@ void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInSt readHelpTextCompatibly(_rxInStream); } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index e7c789632157..d543b09c0726 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -22,13 +22,13 @@ #include "FormComponent.hxx" -//......................................................................... + namespace frm { -//================================================================== + // OFixedTextModel -//================================================================== + class OFixedTextModel :public OControlModel { @@ -55,9 +55,9 @@ protected: DECLARE_XCLONEABLE(); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index f23a3e515304..088f480d740d 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XCloneable.hpp> -//......................................................................... + namespace frm { class OEditModel; -//================================================================== + //= OFormattedFieldWrapper -//================================================================== + typedef ::cppu::WeakAggImplHelper3 < ::com::sun::star::io::XPersistObject , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::util::XCloneable @@ -86,9 +86,9 @@ protected: void ensureAggregate(); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index e91d68789f00..3d363188f5bc 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -26,10 +26,10 @@ #include <tools/debug.hxx> #include <com/sun/star/form/XForm.hpp> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::form; @@ -158,8 +158,8 @@ InterfaceRef OFormsCollection::getParent() throw( RuntimeException, std::except return m_xParent; } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index 6698ec61897d..b903ef065d9c 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -25,18 +25,18 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/form/XForms.hpp> -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + // OFormsCollection // Implementiert den UNO-Container fuer Formulare // enthaelt alle zugeordneten Forms // dieses Container kann selbst den Context fuer Formulare darstellen // oder aussen einen Context uebergeben bekommen -//================================================================== + typedef ::cppu::OComponentHelper FormsCollectionComponentBase; typedef ::cppu::ImplHelper2< ::com::sun::star::form::XForms ,::com::sun::star::lang::XServiceInfo > OFormsCollection_BASE; @@ -182,8 +182,8 @@ public: { OInterfaceContainer::removeContainerListener(p1); } }; -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 90ab975690f8..bcec645e88b2 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -31,16 +31,16 @@ #include <comphelper/proparrhlp.hxx> #include <cppuhelper/implbase7.hxx> -//......................................................................... + namespace frm { -//......................................................................... + class OGridColumn; -//================================================================== + // ColumnDescription -//================================================================== + struct ColumnDescription : public ElementDescription { @@ -48,9 +48,9 @@ class OGridColumn; OGridColumn* pColumn; // not owned by this instance! only to prevent duplicate XUnoTunnel usage }; -//================================================================== + // OGridControlModel -//================================================================== + typedef ::cppu::ImplHelper7 < ::com::sun::star::awt::XControlModel , ::com::sun::star::form::XGridColumnFactory , ::com::sun::star::form::XReset @@ -201,9 +201,9 @@ protected: void cloneColumns( const OGridControlModel* _pOriginalContainer ); }; -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 7bd8cd023a8d..f68c13f5880b 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -24,7 +24,7 @@ #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -39,9 +39,9 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -//================================================================== + // OGroupBoxModel -//================================================================== + InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory) throw (RuntimeException) @@ -127,9 +127,9 @@ void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInSt } }; -//================================================================== + // OGroupBoxControl -//================================================================== + InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory) throw (RuntimeException) @@ -154,8 +154,8 @@ StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(Runti return aSupported; } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index 7c97e931bad4..e5e62d0d3720 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -22,13 +22,13 @@ #include "FormComponent.hxx" -//......................................................................... + namespace frm { -//================================================================== + // OGroupBoxModel -//================================================================== + class OGroupBoxModel :public OControlModel { @@ -55,9 +55,9 @@ protected: DECLARE_XCLONEABLE(); }; -//================================================================== + // OGroupBoxControl (nur aus Kompatibilitaet zur 5.0) -//================================================================== + class OGroupBoxControl : public OControl { public: @@ -68,9 +68,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index dc0e24ba32ab..3095888e0125 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -57,12 +57,12 @@ GroupCompAccessArrays ist mit einem Element des GroupCompArrays verpointert. ========================================================================*/ -//......................................................................... + namespace frm { -//......................................................................... -//======================================================================== + + template <class ELEMENT, class LESS_COMPARE> sal_Int32 insert_sorted(::std::vector<ELEMENT>& _rArray, const ELEMENT& _rNewElement, const LESS_COMPARE& _rCompareOp) { @@ -94,7 +94,7 @@ namespace frm return sal_False; } -//======================================================================== + class OGroupComp { OUString m_aName; @@ -122,7 +122,7 @@ public: typedef std::vector<OGroupComp> OGroupCompArr; -//======================================================================== + class OGroupComp; class OGroupCompAcc { @@ -143,7 +143,7 @@ public: typedef std::vector<OGroupCompAcc> OGroupCompAccArr; -//======================================================================== + class OGroup { OGroupCompArr m_aCompArray; @@ -173,7 +173,7 @@ public: typedef std::map<OUString, OGroup> OGroupArr; typedef std::vector<OGroupArr::iterator> OActiveGroups; -//======================================================================== + class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener> { OGroup* m_pCompGroup; // Alle Components nach TabIndices sortiert @@ -214,9 +214,9 @@ public: }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index b5be554449a7..36fe2e2c67c5 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -25,7 +25,7 @@ #include <comphelper/basicio.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -169,8 +169,8 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea OControlModel::read(_rxInStream); } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 5930412a972a..c0891ddbbafc 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -22,13 +22,13 @@ #include "FormComponent.hxx" -//......................................................................... + namespace frm { -//================================================================== + // OHiddenModel -//================================================================== + class OHiddenModel :public OControlModel { @@ -70,8 +70,8 @@ protected: #endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index ad114e7a368c..06dd2c4eae03 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -23,14 +23,14 @@ #include "clickableimage.hxx" #include <com/sun/star/awt/XMouseListener.hpp> -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + // OImageButtonModel -//================================================================== + class OImageButtonModel :public OClickableImageBaseModel { @@ -55,9 +55,9 @@ protected: DECLARE_XCLONEABLE(); }; -//================================================================== + // OImageButtonControl -//================================================================== + typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XMouseListener> OImageButtonControl_BASE; class OImageButtonControl : public OClickableImageBaseControl, public OImageButtonControl_BASE @@ -91,9 +91,9 @@ public: using OClickableImageBaseControl::disposing; }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMAGEBUTTON_HXX diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 58a47d9c9ccb..1410ff4c0d9b 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -60,10 +60,10 @@ #define ID_OPEN_GRAPHICS 1 #define ID_CLEAR_GRAPHICS 2 -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; @@ -80,9 +80,9 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::frame; -//============================================================================== + //= OImageControlModel -//============================================================================== + namespace { enum ImageStoreType @@ -117,9 +117,9 @@ namespace } } -//============================================================================== + // OImageControlModel -//============================================================================== + InterfaceRef SAL_CALL OImageControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) @@ -690,9 +690,9 @@ IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic ) return 1L; } -//================================================================== + // OImageControlControl -//================================================================== + InterfaceRef SAL_CALL OImageControlControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) @@ -946,7 +946,7 @@ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& } else { - ////////////////////////////////////////////////////////////////////// + // Double click if (e.ClickCount == 2) { @@ -1001,8 +1001,8 @@ void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) th { } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index b7f3159a0742..0f30e82cd8ec 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -32,14 +32,14 @@ using namespace comphelper; -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + // OImageControlModel -//================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::form::XImageProducerSupplier , ::com::sun::star::awt::XImageProducer > OImageControlModel_Base; @@ -143,9 +143,9 @@ protected: DECL_LINK( OnImageImportDone, ::Graphic* ); }; -//================================================================== + //= OImageControlControl -//================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XMouseListener , ::com::sun::star::util::XModifyBroadcaster > OImageControlControl_Base; @@ -194,9 +194,9 @@ private: bool impl_isEmptyGraphics_nothrow() const; }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 14685b611dc5..c103c65deb4d 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -59,7 +59,7 @@ #include <iterator> -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -78,9 +78,9 @@ namespace frm using ::connectivity::ORowSetValue; - //============================================================================== + //= helper - //============================================================================== + namespace { @@ -123,14 +123,14 @@ namespace frm } } - //============================================================================== + //= ItemEventDescription - //============================================================================== + typedef ::comphelper::EventHolder< ItemEvent > ItemEventDescription; - //============================================================================== + //= OListBoxModel - //============================================================================== + InterfaceRef SAL_CALL OListBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException) { @@ -1410,7 +1410,7 @@ namespace frm namespace { - //................................................................ + struct ExtractStringFromSequence_Safe : public ::std::unary_function< sal_Int16, OUString > { protected: @@ -1428,7 +1428,7 @@ namespace frm } }; - //................................................................ + Any lcl_getSingleSelectedEntry( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< OUString >& _rStringList ) { Any aReturn; @@ -1448,7 +1448,7 @@ namespace frm return aReturn; } - //................................................................ + Any lcl_getMultiSelectedEntries( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< OUString >& _rStringList ) { Sequence< OUString > aSelectedEntriesTexts( _rSelectSequence.getLength() ); @@ -1461,7 +1461,7 @@ namespace frm return makeAny( aSelectedEntriesTexts ); } - //................................................................ + struct ExtractAnyFromValueList_Safe : public ::std::unary_function< sal_Int16, Any > { protected: @@ -1479,7 +1479,7 @@ namespace frm } }; - //................................................................ + Any lcl_getSingleSelectedEntryAny( const Sequence< sal_Int16 >& _rSelectSequence, const ValueList& _rStringList ) { Any aReturn; @@ -1495,7 +1495,7 @@ namespace frm return aReturn; } - //................................................................ + Any lcl_getMultiSelectedEntriesAny( const Sequence< sal_Int16 >& _rSelectSequence, const ValueList& _rStringList ) { Sequence< Any > aSelectedEntriesValues( _rSelectSequence.getLength() ); @@ -1722,9 +1722,9 @@ namespace frm initFromField( m_xCursor ); } - //================================================================== + // OListBoxControl - //================================================================== + InterfaceRef SAL_CALL OListBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException) @@ -2129,8 +2129,8 @@ namespace frm m_xAggregateListBox->makeVisible( nEntry ); } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 4cfde90fa28a..e3b314fb2bc1 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -90,13 +90,13 @@ than the model. E.g. the "SelectedItems" property is *display* *values*. */ -//......................................................................... + namespace frm { -//================================================================== + //= OListBoxModel -//================================================================== + typedef ::std::vector< ::connectivity::ORowSetValue > ValueList; class OListBoxModel :public OBoundControlModel @@ -240,9 +240,9 @@ private: bool impl_hasBoundComponent() const { return m_nBoundColumnType != ::com::sun::star::sdbc::DataType::SQLNULL; } }; -//================================================================== + //= OListBoxControl -//================================================================== + typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XFocusListener , ::com::sun::star::awt::XItemListener , ::com::sun::star::awt::XListBox @@ -331,9 +331,9 @@ private: DECL_LINK( OnTimeout, void* ); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 220a584b4bec..af42655720d2 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -21,10 +21,10 @@ #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; @@ -38,9 +38,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -//================================================================== + // ONumericControl -//================================================================== + ONumericControl::ONumericControl(const Reference<XComponentContext>& _rxFactory) @@ -72,9 +72,9 @@ Sequence<Type> ONumericControl::_getTypes() return OBoundControl::_getTypes(); } -//================================================================== + // ONumericModel -//================================================================== + InterfaceRef SAL_CALL ONumericModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { @@ -203,8 +203,8 @@ void ONumericModel::resetNoBroadcast() m_aSaveValue.clear(); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index f6e1cfe555e8..1a3f45f138ff 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -22,14 +22,14 @@ #include "EditBase.hxx" -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + //= ONumericModel -//================================================================== + class ONumericModel :public OEditBaseModel { @@ -67,9 +67,9 @@ protected: DECLARE_XCLONEABLE(); }; -//================================================================== + //= ONumericControl -//================================================================== + class ONumericControl: public OBoundControl { protected: @@ -83,9 +83,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_NUMERIC_HXX diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 9e06c78d93ee..79c5828f5eed 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -20,10 +20,10 @@ #include "Pattern.hxx" #include "comphelper/processfactory.hxx" -//......................................................................... + namespace frm { -//......................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::lang::XMultiServiceFactory; @@ -40,9 +40,9 @@ namespace frm namespace FormComponentType = ::com::sun::star::form::FormComponentType; -//================================================================== + // OPatternControl -//================================================================== + OPatternControl::OPatternControl(const Reference<XComponentContext>& _rxFactory) :OBoundControl(_rxFactory, VCL_CONTROL_PATTERNFIELD) @@ -72,9 +72,9 @@ StringSequence OPatternControl::getSupportedServiceNames() throw(std::exception) return aSupported; } -//================================================================== + // OPatternModel -//================================================================== + InterfaceRef SAL_CALL OPatternModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { @@ -239,8 +239,8 @@ void OPatternModel::resetNoBroadcast() m_aLastKnownValue.clear(); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index 3ab7f2987438..0d826b2cf8ca 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -26,14 +26,14 @@ #include <memory> -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + //= OPatternModel -//================================================================== + class OPatternModel :public OEditBaseModel { @@ -76,9 +76,9 @@ protected: DECLARE_XCLONEABLE(); }; -//================================================================== + //= OPatternControl -//================================================================== + class OPatternControl: public OBoundControl { protected: @@ -92,9 +92,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_PATTERN_HXX diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 23e98251535b..f8022f56a879 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> -//......................................................................... + namespace frm { using namespace ::com::sun::star::uno; @@ -44,7 +44,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -//================================================================== + InterfaceRef SAL_CALL ORadioButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException) { @@ -90,7 +90,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit> // them in the proper order. } -//================================================================== + InterfaceRef SAL_CALL ORadioButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException) { return *(new ORadioButtonModel( comphelper::getComponentContext(_rxFactory) )); @@ -414,8 +414,8 @@ sal_Bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) return sal_True; } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index 470c2910aeb9..9ce8ea73a297 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -22,13 +22,13 @@ #include "refvaluecomponent.hxx" -//......................................................................... + namespace frm { -//================================================================== + // ORadioButtonModel -//================================================================== + class ORadioButtonModel :public OReferenceValueComponent { public: @@ -80,9 +80,9 @@ private: void setControlSource(); }; -//================================================================== + // ORadioButtonControl -//================================================================== + class ORadioButtonControl: public OBoundControl { public: @@ -97,9 +97,9 @@ protected: virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_RADIOBUTTON_HXX diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index a78268f14aff..a37559fdb130 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -26,10 +26,10 @@ using namespace dbtools; -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -44,13 +44,13 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; -//================================================================== + //= -//================================================================== -//================================================================== + + //= OTimeControl -//================================================================== + OTimeControl::OTimeControl(const Reference<XComponentContext>& _rxFactory) :OBoundControl(_rxFactory, VCL_CONTROL_TIMEFIELD) @@ -80,9 +80,9 @@ StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exce return aSupported; } -//================================================================== + //= OTimeModel -//================================================================== + InterfaceRef SAL_CALL OTimeModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { @@ -319,8 +319,8 @@ Sequence< Type > OTimeModel::getSupportedBindingTypes() return Sequence< Type >( &::getCppuType( static_cast< util::Time* >( NULL ) ), 1 ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index ceef68d52132..726a78f0f9c2 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -23,14 +23,14 @@ #include "EditBase.hxx" #include "limitedformats.hxx" -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + //= OTimeModel -//================================================================== + class OTimeModel :public OEditBaseModel ,public OLimitedFormats @@ -100,9 +100,9 @@ private: ::com::sun::star::uno::Any& _rUNOValue ) const; }; -//================================================================== + //= OTimeControl -//================================================================== + class OTimeControl: public OBoundControl { protected: @@ -117,9 +117,9 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx index 37bf3f9d33a9..8989c4266286 100644 --- a/forms/source/component/cachedrowset.cxx +++ b/forms/source/component/cachedrowset.cxx @@ -29,10 +29,10 @@ #include <tools/diagnose_ex.h> -//........................................................................ + namespace frm { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -54,9 +54,9 @@ namespace frm namespace ResultSetType = ::com::sun::star::sdbc::ResultSetType; - //==================================================================== + //= CachedRowSet_Data - //==================================================================== + struct CachedRowSet_Data { OUString sCommand; @@ -74,9 +74,9 @@ namespace frm } }; - //==================================================================== + //= CachedRowSet - //==================================================================== + CachedRowSet::CachedRowSet() :m_pData( new CachedRowSet_Data ) @@ -183,8 +183,8 @@ namespace frm } } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx index a765c5871b6d..5d2b7b43187f 100644 --- a/forms/source/component/cachedrowset.hxx +++ b/forms/source/component/cachedrowset.hxx @@ -27,15 +27,15 @@ #include <memory> -//........................................................................ + namespace frm { -//........................................................................ + struct CachedRowSet_Data; - //==================================================================== + //= CachedRowSet - //==================================================================== + /** caches a result set obtained from a SQL statement */ class CachedRowSet @@ -79,9 +79,9 @@ namespace frm ::std::auto_ptr< CachedRowSet_Data > m_pData; }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 9a075519df01..e30ba660a942 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -44,10 +44,10 @@ #include <svtools/imageresourceaccess.hxx> #define LOCAL_URL_PREFIX '#' -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; @@ -65,9 +65,9 @@ namespace frm using ::com::sun::star::awt::MouseEvent; using ::com::sun::star::task::XInteractionHandler; - //================================================================== + // OClickableImageBaseControl - //================================================================== + Sequence<Type> OClickableImageBaseControl::_getTypes() { @@ -257,7 +257,7 @@ namespace frm if (!xModel.is()) return; - /////////////////////////////////////////////////////////////////////// + // Jetzt URL ausfuehren Reference< XController > xController = xModel->getCurrentController(); if (!xController.is()) @@ -434,9 +434,9 @@ namespace frm } } - //================================================================== + // OClickableImageBaseModel - //================================================================== + Sequence<Type> OClickableImageBaseModel::_getTypes() { @@ -857,9 +857,9 @@ namespace frm } } - //================================================================== + // OImageProducerThread_Impl - //================================================================== + EventObject* OImageProducerThread_Impl::cloneEvent( const EventObject* _pEvt ) const { @@ -875,8 +875,8 @@ namespace frm ((OClickableImageBaseControl *)pCompImpl)->actionPerformed_Impl( sal_True, *(MouseEvent *)pEvt ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 83dcc9fae04f..011e9de7808d 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -38,16 +38,16 @@ class SfxMedium; -//......................................................................... + namespace frm { -//......................................................................... + class OImageProducerThread_Impl; class ControlFeatureInterception; - //================================================================== + // OClickableImageBaseModel - //================================================================== + typedef ::cppu::ImplHelper3 < ::com::sun::star::form::XImageProducerSupplier , ::com::sun::star::awt::XImageProducer , ::com::sun::star::form::submission::XSubmissionSupplier @@ -145,9 +145,9 @@ namespace frm void implInitializeImageURL( ); }; - //================================================================== + // ImageModelMethodGuard - //================================================================== + class ImageModelMethodGuard : public ::osl::MutexGuard { private: @@ -165,9 +165,9 @@ namespace frm } }; - //================================================================== + // OClickableImageBaseControl - //================================================================== + typedef ::cppu::ImplHelper3 < ::com::sun::star::form::XApproveActionBroadcaster , ::com::sun::star::form::submission::XSubmission , ::com::sun::star::frame::XDispatchProviderInterception @@ -248,9 +248,9 @@ namespace frm ) SAL_THROW((com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)); }; - //================================================================== + // OImageProducerThread_Impl - //================================================================== + class OImageProducerThread_Impl: public OComponentEventThread { protected: @@ -277,9 +277,9 @@ namespace frm using OComponentEventThread::addEvent; }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX diff --git a/forms/source/component/cloneable.cxx b/forms/source/component/cloneable.cxx index 8bbe17854bb3..b701b58fb17d 100644 --- a/forms/source/component/cloneable.cxx +++ b/forms/source/component/cloneable.cxx @@ -22,18 +22,18 @@ #include <comphelper/uno3.hxx> #include <tools/debug.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::comphelper; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - //==================================================================== + //= OCloneableAggregation - //==================================================================== + Reference< XAggregation > OCloneableAggregation::createAggregateClone( const OCloneableAggregation* _pOriginal ) { @@ -52,8 +52,8 @@ namespace frm return xAggregateClone; } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index 32b32e7ecbc1..757d4ea4362d 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -25,19 +25,19 @@ #include <comphelper/property.hxx> #include <algorithm> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; - //===================================================================== + //= OEntryListHelper - //===================================================================== + OEntryListHelper::OEntryListHelper( OControlModel& _rControlModel ) :m_rControlModel( _rControlModel ) @@ -306,8 +306,8 @@ namespace frm stringItemListChanged( _rInstanceLock ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index e08f57dbbc01..39b1857f7af2 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -28,17 +28,17 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> -//......................................................................... + namespace frm { -//......................................................................... + class OControlModel; class ControlModelLock; - //===================================================================== + //= OEntryListHelper - //===================================================================== + typedef ::cppu::ImplHelper3 < ::com::sun::star::form::binding::XListEntrySink , ::com::sun::star::form::binding::XListEntryListener , ::com::sun::star::util::XRefreshable @@ -180,9 +180,9 @@ namespace frm OEntryListHelper& operator=( const OEntryListHelper& ); // never implemented }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index ad381cb70358..1921a467cc72 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -21,10 +21,10 @@ #include <connectivity/dbtools.hxx> #include <com/sun/star/sdb/SQLContext.hpp> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -32,9 +32,9 @@ namespace frm using namespace ::com::sun::star::sdb; using namespace ::dbtools; - //===================================================================== + //= OErrorBroadcaster - //===================================================================== + OErrorBroadcaster::OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper ) :m_rBHelper( _rBHelper ) @@ -97,8 +97,8 @@ namespace frm m_aErrorListeners.removeInterface( _rxListener ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx index 022a8cc156a3..d6a73b9c55fd 100644 --- a/forms/source/component/errorbroadcaster.hxx +++ b/forms/source/component/errorbroadcaster.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdb/SQLErrorEvent.hpp> -//......................................................................... + namespace frm { -//......................................................................... - //===================================================================== + + //= OErrorBroadcaster - //===================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::sdb::XSQLErrorBroadcaster > OErrorBroadcaster_BASE; @@ -58,9 +58,9 @@ namespace frm virtual void SAL_CALL removeSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_ERRORBROADCASTER_HXX diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 8f7162803e97..f6b9b0902a8b 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -28,10 +28,10 @@ #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::comphelper; using namespace ::com::sun::star::uno; @@ -119,9 +119,9 @@ namespace frm } } - //===================================================================== + //= FontControlModel - //===================================================================== + FontControlModel::FontControlModel( bool _bToolkitCompatibleDefaults ) :m_nFontRelief( FontRelief::NONE ) @@ -571,8 +571,8 @@ namespace frm return aReturn; } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index 24e2407ad3aa..ae2fb33b0308 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -30,9 +30,9 @@ #include <cppuhelper/weak.hxx> -// ----------------- + // - ImageProducer - -// ----------------- + diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index b9739f3fec72..2078697bdfed 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -32,10 +32,10 @@ extern "C" void SAL_CALL createRegistryInfo_ONavigationBarModel() static ::frm::OMultiInstanceAutoRegistration< ::frm::ONavigationBarModel > aAutoRegistration; } -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -53,9 +53,9 @@ namespace frm registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT | PropertyAttribute::MAYBEVOID, \ &memberAny, ::getCppuType( static_cast< type* >( NULL ) ) ); - //================================================================== + // ONavigationBarModel - //================================================================== + ONavigationBarModel::ONavigationBarModel( const Reference< XComponentContext >& _rxFactory ) :OControlModel( _rxFactory, OUString() ) @@ -486,8 +486,8 @@ namespace frm ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index a5c7354f9a20..e8c0339c9ffb 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -32,14 +32,14 @@ #include <set> -//......................................................................... + namespace frm { -//......................................................................... - //================================================================== + + // ONavigationBarModel - //================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XControlModel > ONavigationBarModel_BASE; @@ -122,9 +122,9 @@ namespace frm void implInitPropertyContainer(); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 833ad7bfac95..890109092000 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -35,10 +35,10 @@ #define NEW_HANDLE_BASE 10000 -//........................................................................ + namespace frm { -//........................................................................ + using ::com::sun::star::lang::DisposedException; using ::com::sun::star::uno::Sequence; @@ -57,9 +57,9 @@ namespace frm namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - //==================================================================== + //= helper - //==================================================================== + namespace { @@ -70,9 +70,9 @@ namespace frm } } - //==================================================================== + //= PropertyBagHelper - //==================================================================== + PropertyBagHelper::PropertyBagHelper( IPropertyBagHelperContext& _rContext ) :m_rContext( _rContext ) @@ -338,8 +338,8 @@ namespace frm xMe->setPropertyValues( aNames, aValues ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index af996f8c7b08..4af480f1fe33 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -23,19 +23,19 @@ #include <list> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::form::binding; - //==================================================================== + //= - //==================================================================== + OReferenceValueComponent::OReferenceValueComponent( const Reference< XComponentContext >& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue ) :OBoundControlModel( _rxFactory, _rUnoControlModelTypeName, _rDefault, sal_False, sal_True, sal_True ) @@ -282,8 +282,8 @@ namespace frm return aValidatableValue; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index bee7af2f0ce8..e609924f9b11 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -23,14 +23,14 @@ #include "FormComponent.hxx" #include "togglestate.hxx" -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= OReferenceValueComponent - //==================================================================== + /** a OBoundControlModel which features the exchange of a reference value */ class OReferenceValueComponent : public OBoundControlModel @@ -90,9 +90,9 @@ namespace frm getDefaultForReset() const; }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 839d95bfaca4..85f86c091e15 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -28,10 +28,10 @@ extern "C" void SAL_CALL createRegistryInfo_OScrollBarModel() static ::frm::OMultiInstanceAutoRegistration< ::frm::OScrollBarModel > aRegisterModel; } -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -42,9 +42,9 @@ namespace frm using namespace ::com::sun::star::io; using namespace ::com::sun::star::form::binding; - //==================================================================== + //= helper - //==================================================================== + Any translateExternalDoubleToControlIntValue( const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties, @@ -94,9 +94,9 @@ namespace frm return aExternalDoubleValue; } - //==================================================================== + //= OScrollBarModel - //==================================================================== + OScrollBarModel::OScrollBarModel( const Reference<XComponentContext>& _rxFactory ) @@ -300,8 +300,8 @@ namespace frm return Sequence< Type >( &::getCppuType( static_cast< double* >( NULL ) ), 1 ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index 948c46a8e79a..81ab40ccd67b 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -22,14 +22,14 @@ #include "FormComponent.hxx" #include "frm_module.hxx" -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= OScrollBarModel - //==================================================================== + class OScrollBarModel :public OBoundControlModel { private: @@ -86,9 +86,9 @@ namespace frm using OBoundControlModel::getFastPropertyValue; }; -//........................................................................ + } // namespacefrm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index c5a21b811259..18ec0246a9ff 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -27,10 +27,10 @@ extern "C" void SAL_CALL createRegistryInfo_OSpinButtonModel() static ::frm::OMultiInstanceAutoRegistration< ::frm::OSpinButtonModel > aRegisterModel; } -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -41,18 +41,18 @@ namespace frm using namespace ::com::sun::star::io; using namespace ::com::sun::star::form::binding; - //==================================================================== + //= OSpinButtonModel - //==================================================================== + // implemented elsewhere Any translateExternalDoubleToControlIntValue( const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties, const OUString& _rMinValueName, const OUString& _rMaxValueName ); Any translateControlIntToExternalDoubleValue( const Any& _rControlIntValue ); - //==================================================================== + //= OSpinButtonModel - //==================================================================== + OSpinButtonModel::OSpinButtonModel( const Reference<XComponentContext>& _rxFactory ) @@ -256,8 +256,8 @@ namespace frm return Sequence< Type >( &::getCppuType( static_cast< double* >( NULL ) ), 1 ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index 88b5ad48a3f5..b8457c6147e8 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -22,14 +22,14 @@ #include "FormComponent.hxx" #include "frm_module.hxx" -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= OSpinButtonModel - //==================================================================== + class OSpinButtonModel :public OBoundControlModel { private: @@ -86,9 +86,9 @@ namespace frm using OBoundControlModel::getFastPropertyValue; }; -//........................................................................ + } // namespacefrm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx index fec8c7230234..b588bd8bef26 100644 --- a/forms/source/helper/commanddescriptionprovider.cxx +++ b/forms/source/helper/commanddescriptionprovider.cxx @@ -28,10 +28,10 @@ #include <comphelper/namedvaluecollection.hxx> #include <tools/diagnose_ex.h> -//........................................................................ + namespace frm { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -52,9 +52,9 @@ namespace frm using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::frame::theUICommandDescription; - //==================================================================== + //= DefaultCommandDescriptionProvider - //==================================================================== + class DefaultCommandDescriptionProvider : public ICommandDescriptionProvider { public: @@ -126,8 +126,8 @@ namespace frm return pDescriptionProvider; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx index 72adc999f1f1..71a1fab71e3c 100644 --- a/forms/source/helper/commandimageprovider.cxx +++ b/forms/source/helper/commandimageprovider.cxx @@ -28,10 +28,10 @@ #include <tools/diagnose_ex.h> -//........................................................................ + namespace frm { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -57,9 +57,9 @@ namespace frm namespace ImageType = ::com::sun::star::ui::ImageType; - //==================================================================== + //= DocumentCommandImageProvider - //==================================================================== + class DocumentCommandImageProvider : public ICommandImageProvider { public: @@ -166,8 +166,8 @@ namespace frm return pImageProvider; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index d0f3f120143d..a40a41323e6f 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -20,19 +20,19 @@ #include "controlfeatureinterception.hxx" #include "urltransformer.hxx" -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; - //==================================================================== + //= ControlFeatureInterception - //==================================================================== + ControlFeatureInterception::ControlFeatureInterception( const Reference< XComponentContext >& _rxORB ) :m_pUrlTransformer( new UrlTransformer( _rxORB ) ) @@ -150,8 +150,8 @@ namespace frm return queryDispatch( m_pUrlTransformer->getStrictURLFromAscii( _pAsciiURL ) ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index 9670ca62d2f7..fe0d93d45bf6 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -27,10 +27,10 @@ #include <tools/debug.hxx> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -39,9 +39,9 @@ namespace frm using namespace ::com::sun::star::frame; namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; - //================================================================== + //= OFormNavigationHelper - //================================================================== + OFormNavigationHelper::OFormNavigationHelper( const Reference< XComponentContext >& _rxORB ) :m_xORB( _rxORB ) @@ -372,9 +372,9 @@ namespace frm m_aSupportedFeatures.swap( aEmpty ); } - //================================================================== + //= OFormNavigationMapper - //================================================================== + OFormNavigationMapper::OFormNavigationMapper( const Reference< XComponentContext >& _rxORB ) { @@ -466,8 +466,8 @@ namespace frm return -1; } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/helper/resettable.cxx b/forms/source/helper/resettable.cxx index 1a87e5087fa5..7a36cb6bb622 100644 --- a/forms/source/helper/resettable.cxx +++ b/forms/source/helper/resettable.cxx @@ -21,10 +21,10 @@ #include <cppuhelper/weak.hxx> -//........................................................................ + namespace frm { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -40,9 +40,9 @@ namespace frm using ::com::sun::star::form::XResetListener; using ::com::sun::star::lang::EventObject; - //==================================================================== + //= ResetHelper - //==================================================================== + void ResetHelper::addResetListener( const Reference< XResetListener >& _listener ) { @@ -82,8 +82,8 @@ namespace frm m_aResetListeners.disposeAndClear( aEvent ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx index c80744fa6155..11b8b835f666 100644 --- a/forms/source/helper/urltransformer.cxx +++ b/forms/source/helper/urltransformer.cxx @@ -23,18 +23,18 @@ #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; - //==================================================================== + //= UrlTransformer - //==================================================================== + UrlTransformer::UrlTransformer( const Reference< XComponentContext >& _rxORB ) :m_xORB( _rxORB ) @@ -82,8 +82,8 @@ namespace frm m_xTransformer->parseSmart( _rURL, OUString::createFromAscii( _pAsciiURL ) ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx index b970069419f2..d84709469814 100644 --- a/forms/source/helper/windowstateguard.cxx +++ b/forms/source/helper/windowstateguard.cxx @@ -25,10 +25,10 @@ #include <cppuhelper/implbase1.hxx> #include <tools/diagnose_ex.h> -//........................................................................ + namespace frm { -//........................................................................ + using ::com::sun::star::awt::XWindowListener2; using ::com::sun::star::uno::Reference; @@ -41,9 +41,9 @@ namespace frm using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Exception; - //==================================================================== + //= WindowStateGuard_Impl - //==================================================================== + typedef ::cppu::WeakImplHelper1 < XWindowListener2 > WindowStateGuard_Impl_Base; class WindowStateGuard_Impl : public WindowStateGuard_Impl_Base @@ -186,9 +186,9 @@ namespace frm dispose(); } - //==================================================================== + //= WindowStateGuard - //==================================================================== + WindowStateGuard::WindowStateGuard() { @@ -214,8 +214,8 @@ namespace frm m_pImpl = new WindowStateGuard_Impl( _rxWindow, xModelProps ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 2568b782e6dd..e93de5a5f2fe 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -73,10 +73,10 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -//......................................................................... + namespace frm { -//......................................................................... + // default tab index for components const sal_Int16 FRM_DEFAULT_TABINDEX = 0; @@ -94,9 +94,9 @@ namespace frm class OControlModel; - //========================================================================= + //= ControlModelLock - //========================================================================= + /** class whose instances lock a OControlModel Locking here merely means locking the OControlModel's mutex. @@ -150,10 +150,10 @@ namespace frm ControlModelLock& operator=( const ControlModelLock& ); // never implemented }; -//========================================================================= + //= OControl //= base class for form layer controls -//========================================================================= + typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XControl , ::com::sun::star::lang::XEventListener , ::com::sun::star::lang::XServiceInfo @@ -274,10 +274,10 @@ private: void impl_resetStateGuard_nothrow(); }; -//================================================================== + //= OBoundControl //= a form control implementing the XBoundControl interface -//================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::form::XBoundControl > OBoundControl_BASE; class OBoundControl :public OControl @@ -323,10 +323,10 @@ protected: virtual void _setLock(sal_Bool _bLock); }; -//================================================================== + //= OControlModel //= model of a form layer control -//================================================================== + //added for exporting OCX control #define INVALID_OBJ_ID_IN_MSO 0xFFFF @@ -529,7 +529,7 @@ public: getInstanceMutex() { return m_aMutex; } }; -//================================================================== + // simple destructor #define DECLARE_DEFAULT_DTOR( classname ) \ ~classname() \ @@ -574,7 +574,7 @@ public: ); \ DECLARE_DEFAULT_DTOR( classname ) \ -//================================================================== + // XCloneable #define DECLARE_XCLONEABLE( ) \ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -587,10 +587,10 @@ public: return pClone; \ } -//================================================================== + //= OBoundControlModel //= model of a form layer control which is bound to a data source field -//================================================================== + typedef ::cppu::ImplHelper4 < ::com::sun::star::form::XLoadListener , ::com::sun::star::form::XReset , ::com::sun::star::beans::XPropertyChangeListener @@ -1289,9 +1289,9 @@ private: ); }; - //========================================================================= + //= inlines - //========================================================================= + inline void ControlModelLock::acquire() { m_rModel.lockInstance( OControlModel::LockAccess() ); @@ -1306,9 +1306,9 @@ private: impl_notifyAll_nothrow(); } -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index faec5ea32e64..2842901b3045 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -52,13 +52,13 @@ namespace com { namespace sun { namespace star { namespace uno { using namespace comphelper; -//......................................................................... + namespace frm { -//......................................................................... -//================================================================== + + struct ElementDescription { public: @@ -79,10 +79,10 @@ namespace frm typedef ::std::vector<InterfaceRef> OInterfaceArray; typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap; -//================================================================== + // OInterfaceContainer // implements a container for form components -//================================================================== + typedef ::cppu::ImplHelper8 < ::com::sun::star::container::XNameContainer , ::com::sun::star::container::XIndexContainer , ::com::sun::star::container::XContainer @@ -280,9 +280,9 @@ private: void impl_createEventAttacher_nothrow(); }; -//================================================================== + //= OFormComponents -//================================================================== + typedef ::cppu::ImplHelper1< ::com::sun::star::form::XFormComponent> OFormComponents_BASE; typedef ::cppu::OComponentHelper FormComponentsBase; // else MSVC kills itself on some statements @@ -314,9 +314,9 @@ public: // XEventListener using OInterfaceContainer::disposing; }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX diff --git a/forms/source/inc/cloneable.hxx b/forms/source/inc/cloneable.hxx index ffc6d0a8d778..4dbff169d7a7 100644 --- a/forms/source/inc/cloneable.hxx +++ b/forms/source/inc/cloneable.hxx @@ -22,14 +22,14 @@ #include <com/sun/star/uno/XAggregation.hpp> -//......................................................................... + namespace frm { -//......................................................................... - //==================================================================== + + //= OCloneableAggregation - //==================================================================== + class OCloneableAggregation { protected: @@ -39,9 +39,9 @@ namespace frm static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > createAggregateClone( const OCloneableAggregation* _pOriginal ); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_CLONEABLE_HXX diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx index 9ece1a93190d..8369e1816b1a 100644 --- a/forms/source/inc/commanddescriptionprovider.hxx +++ b/forms/source/inc/commanddescriptionprovider.hxx @@ -25,14 +25,14 @@ #include <boost/shared_ptr.hpp> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= ICommandDescriptionProvider - //==================================================================== + class SAL_NO_VTABLE ICommandDescriptionProvider { public: @@ -43,18 +43,18 @@ namespace frm typedef ::boost::shared_ptr< const ICommandDescriptionProvider > PCommandDescriptionProvider; - //===================================================================== + //= factory - //===================================================================== + PCommandDescriptionProvider createDocumentCommandDescriptionProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_COMMANDDESCRIPTIONPROVIDER_HXX diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index d50f60af298e..9c7107b5e611 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -27,14 +27,14 @@ #include <boost/shared_ptr.hpp> -//........................................................................ + namespace frm { -//........................................................................ - //===================================================================== + + //= ICommandImageProvider - //===================================================================== + typedef OUString CommandURL; typedef ::com::sun::star::uno::Sequence< CommandURL > CommandURLs; typedef ::std::vector< Image > CommandImages; @@ -52,18 +52,18 @@ namespace frm typedef ::boost::shared_ptr< const ICommandImageProvider > PCommandImageProvider; - //===================================================================== + //= factory - //===================================================================== + PCommandImageProvider createDocumentCommandImageProvider( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_COMMANDIMAGEPROVIDER_HXX diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx index d5ffe7f7a564..d158a07a51b3 100644 --- a/forms/source/inc/componenttools.hxx +++ b/forms/source/inc/componenttools.hxx @@ -27,10 +27,10 @@ #include <set> #include <functional> -//........................................................................ + namespace frm { -//........................................................................ + struct TypeCompareLess : public ::std::binary_function< ::com::sun::star::uno::Type, ::com::sun::star::uno::Type, bool > { @@ -44,9 +44,9 @@ namespace frm } }; - //==================================================================== + //= TypeBag - //==================================================================== + /** a helper class which merges sequences of <type scope="com::sun::star::uno">Type</type>s, so that the resulting sequence contains every type at most once */ @@ -87,9 +87,9 @@ namespace frm ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getXModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_COMPONENTTOOLS_HXX diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index c8d8560b1469..3881a6ebde2e 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -26,15 +26,15 @@ #include <memory> -//........................................................................ + namespace frm { -//........................................................................ + class UrlTransformer; - //==================================================================== + //= ControlFeatureInterception - //==================================================================== + /** helper class for controls which allow some of their features to be intercepted by external instances @@ -85,9 +85,9 @@ namespace frm queryDispatch( const sal_Char* _pAsciiURL ) SAL_THROW((::com::sun::star::uno::RuntimeException)); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx index 70b1c0a50280..0902551f2707 100644 --- a/forms/source/inc/featuredispatcher.hxx +++ b/forms/source/inc/featuredispatcher.hxx @@ -22,14 +22,14 @@ #include <rtl/ustring.hxx> -//......................................................................... + namespace frm { -//......................................................................... - //========================================================================= + + //= IFeatureDispatcher - //========================================================================= + class IFeatureDispatcher { public: @@ -98,9 +98,9 @@ namespace frm ~IFeatureDispatcher() {} }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_FEATUREDISPATCHER_HXX diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx index e29d93d177af..6d0afd63840b 100644 --- a/forms/source/inc/formcontrolfont.hxx +++ b/forms/source/inc/formcontrolfont.hxx @@ -29,14 +29,14 @@ namespace cppu { class OPropertySetHelper; } -//......................................................................... + namespace frm { -//......................................................................... - //===================================================================== + + //= FontControlModel - //===================================================================== + class FontControlModel { private: @@ -95,9 +95,9 @@ namespace frm FontControlModel& operator=( const FontControlModel& ); // never implemented }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index fd05cf8de86f..7edb1812555f 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -32,17 +32,17 @@ #include <memory> -//......................................................................... + namespace frm { -//......................................................................... + class UrlTransformer; class ControlFeatureInterception; - //================================================================== + //= OFormNavigationHelper - //================================================================== + typedef ::cppu::ImplHelper2 < ::com::sun::star::frame::XDispatchProviderInterception , ::com::sun::star::frame::XStatusListener > OFormNavigationHelper_Base; @@ -176,9 +176,9 @@ namespace frm void initializeSupportedFeatures(); }; - //================================================================== + //= OFormNavigationMapper - //================================================================== + /** helper class mapping between feature ids and feature URLs */ class OFormNavigationMapper @@ -225,9 +225,9 @@ namespace frm OFormNavigationMapper& operator=( const OFormNavigationMapper& ); // never implemented }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_FORMNAVIGATION_HXX diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index 655a78adb9a5..0bddbf4537c6 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -35,10 +35,10 @@ #include <rtl/string.hxx> #include <comphelper/processfactory.hxx> -//......................................................................... + namespace FORMS_MODULE_NAMESPACE { -//......................................................................... + typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( @@ -49,9 +49,9 @@ namespace FORMS_MODULE_NAMESPACE rtl_ModuleCount* ); - //========================================================================= + //= OFormsModule - //========================================================================= + class OFormsModule { private: @@ -115,9 +115,9 @@ namespace FORMS_MODULE_NAMESPACE static void ensureImpl(); }; - //========================================================================== + //= OMultiInstanceAutoRegistration - //========================================================================== + template <class TYPE> class OMultiInstanceAutoRegistration { @@ -158,9 +158,9 @@ namespace FORMS_MODULE_NAMESPACE OFormsModule::revokeComponent(TYPE::getImplementationName_Static()); } - //========================================================================== + //= OOneInstanceAutoRegistration - //========================================================================== + template <class TYPE> class OOneInstanceAutoRegistration { @@ -200,10 +200,10 @@ namespace FORMS_MODULE_NAMESPACE OFormsModule::revokeComponent(TYPE::getImplementationName_Static()); } - //========================================================================== + //= helper for classes implementing the service handling via //= OMultiInstanceAutoRegistration or OOneInstanceAutoRegistration - //========================================================================== + #define DECLARE_SERVICE_REGISTRATION( classname ) \ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ @@ -305,8 +305,8 @@ namespace FORMS_MODULE_NAMESPACE ); \ } \ -//......................................................................... + } // namespace FORMS_MODULE_NAMESPACE -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx index b49f2bb22126..bfcd4f10039f 100644 --- a/forms/source/inc/forms_module_impl.hxx +++ b/forms/source/inc/forms_module_impl.hxx @@ -27,10 +27,10 @@ #include <comphelper/sequence.hxx> -//......................................................................... + namespace FORMS_MODULE_NAMESPACE { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -38,20 +38,20 @@ namespace FORMS_MODULE_NAMESPACE using namespace ::comphelper; using namespace ::cppu; - //========================================================================= + //= OFormsModule - //========================================================================= - //-------------------------------------------------------------------------- + + //- registration helper - //-------------------------------------------------------------------------- + Sequence< OUString >* OFormsModule::s_pImplementationNames = NULL; Sequence< Sequence< OUString > >* OFormsModule::s_pSupportedServices = NULL; Sequence< sal_Int64 >* OFormsModule::s_pCreationFunctionPointers = NULL; Sequence< sal_Int64 >* OFormsModule::s_pFactoryFunctionPointers = NULL; - //-------------------------------------------------------------------------- + void OFormsModule::registerComponent( const OUString& _rImplementationName, const Sequence< OUString >& _rServiceNames, @@ -87,7 +87,7 @@ namespace FORMS_MODULE_NAMESPACE s_pFactoryFunctionPointers->getArray()[nOldLen] = reinterpret_cast<sal_Int64>(_pFactoryFunction); } - //-------------------------------------------------------------------------- + void OFormsModule::revokeComponent(const OUString& _rImplementationName) { if (!s_pImplementationNames) @@ -125,7 +125,7 @@ namespace FORMS_MODULE_NAMESPACE } } - //-------------------------------------------------------------------------- + Reference< XInterface > OFormsModule::getComponentFactory( const OUString& _rImplementationName, const Reference< XMultiServiceFactory >& _rxServiceManager) @@ -174,8 +174,8 @@ namespace FORMS_MODULE_NAMESPACE return NULL; } -//......................................................................... + } // namespace FORMS_MODULE_NAMESPACE -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc index 33d3ed9dcf72..2275f445988e 100644 --- a/forms/source/inc/frm_resource.hrc +++ b/forms/source/inc/frm_resource.hrc @@ -22,10 +22,10 @@ #include <svl/solar.hrc> -//------------------------------------------------------------------------------ + #define RID_FRM_STRINGS_START RID_FORMLAYER_START -//------------------------------------------------------------------------------ + //- String-IDs #define RID_BASELISTBOX_ERROR_FILLLIST ( RID_FRM_STRINGS_START + 0 ) #define RID_STR_IMPORT_GRAPHIC ( RID_FRM_STRINGS_START + 1 ) diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx index 17bb86d457e4..3dce65394d43 100644 --- a/forms/source/inc/frm_resource.hxx +++ b/forms/source/inc/frm_resource.hxx @@ -23,16 +23,16 @@ #include <rtl/ustring.hxx> class SimpleResMgr; -//......................................................................... + namespace frm { #define FRM_RES_STRING(id) ResourceManager::loadString(id) - //================================================================== + //= ResourceManager //= handling resources within the FormLayer library - //================================================================== + class ResourceManager { static SimpleResMgr* m_pImpl; @@ -61,9 +61,9 @@ namespace frm static OUString loadString(sal_uInt16 _nResId); }; -//......................................................................... + } -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HXX diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 60e4e2c8d145..87f87c87e1f5 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -24,14 +24,14 @@ #include <rtl/ustring.hxx> #include <comphelper/string.hxx> -//.............................................................................. + namespace frm { -//.............................................................................. - //-------------------------------------------------------------------------- + + //- properties - //-------------------------------------------------------------------------- + #define PROPERTY_TABINDEX "TabIndex" #define PROPERTY_TAG "Tag" #define PROPERTY_NAME "Name" @@ -270,9 +270,9 @@ namespace frm #define PROPERTY_CONTROL_TYPE_IN_MSO "ControlTypeinMSO" #define PROPERTY_OBJ_ID_IN_MSO "ObjIDinMSO" - //-------------------------------------------------------------------------- + //- URLs - //-------------------------------------------------------------------------- + #define URL_FORM_POSITION ".uno:FormController/positionForm" #define URL_FORM_RECORDCOUNT ".uno:FormController/RecordCount" #define URL_RECORD_FIRST ".uno:FormController/moveToFirst" @@ -294,9 +294,9 @@ namespace frm #define URL_FORM_APPLY_FILTER ".uno:FormController/applyFilter" #define URL_FORM_REMOVE_FILTER ".uno:FormController/removeFilterOrder" -//.............................................................................. + } // namespace frm -//.............................................................................. + #endif // INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX diff --git a/forms/source/inc/limitedformats.hxx b/forms/source/inc/limitedformats.hxx index a5b6c67a5004..a4d5a02c0132 100644 --- a/forms/source/inc/limitedformats.hxx +++ b/forms/source/inc/limitedformats.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> -//......................................................................... + namespace frm { -//......................................................................... - //===================================================================== + + //= OLimitedFormats - //===================================================================== + /** maintains translation tables format key <-> enum value <p>Used for controls which provide a limited number for (standard) formats, which should be available as format keys.</p> @@ -89,9 +89,9 @@ namespace frm static void clearTable(const sal_Int16 _nTableId); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_LIMITEDFORMATS_HXX diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx index a453c11c0d65..d28d05becafc 100644 --- a/forms/source/inc/listenercontainers.hxx +++ b/forms/source/inc/listenercontainers.hxx @@ -24,14 +24,14 @@ #include <comphelper/listenernotification.hxx> #include <cppuhelper/weak.hxx> -//........................................................................ + namespace frm { -//........................................................................ - //===================================================================== + + //= EventListeners - //===================================================================== + template < class LISTENER > class EventListeners : public ::comphelper::OListenerContainerBase< LISTENER, ::com::sun::star::lang::EventObject > { @@ -77,9 +77,9 @@ namespace frm using EventListeners_Base::disposing; }; - //===================================================================== + //= ResetListeners - //===================================================================== + typedef EventListeners < ::com::sun::star::form::XResetListener > ResetListeners_Base; class ResetListeners : public ResetListeners_Base @@ -122,9 +122,9 @@ namespace frm ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index a35aa65db4e4..7820fd65ae01 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -22,10 +22,10 @@ #include <rtl/ustring.hxx> #include "frm_strings.hxx" -//......................................................................... + namespace frm { -//......................................................................... + // PropertyId's, welche eine Zuordnung zu einen PropertyName haben #define PROPERTY_ID_START 0 @@ -297,9 +297,9 @@ namespace frm // start ID fuer aggregierte Properties #define PROPERTY_ID_AGGREGATE_ID (PROPERTY_ID_START + 10000) -//......................................................................... + } -//......................................................................... + #endif // _FRM_PROPERTY_HRC_ diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 2584e2c54a17..a5c6aad70ef4 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -34,23 +34,23 @@ using namespace comphelper; -//========================================================================= + //= property helper classes -//========================================================================= + //... namespace frm ....................................................... namespace frm { -//......................................................................... -//================================================================== + + //= assigment property handle <-> property name //= used by the PropertySetAggregationHelper -//================================================================== + class PropertyInfoService { - //.................................................................. + struct PropertyAssignment { OUString sName; @@ -67,7 +67,7 @@ class PropertyInfoService typedef std::vector<PropertyAssignment> PropertyMap; static PropertyMap s_AllKnownProperties; - //.................................................................. + // comparing two PropertyAssignment's public: typedef PropertyAssignment PUBLIC_SOLARIS_COMPILER_HACK; @@ -95,7 +95,7 @@ private: static void initialize(); }; -//.................................................................. + // a class implementing the comphelper::IPropertyInfoService class ConcreteInfoService : public ::comphelper::IPropertyInfoService { @@ -105,31 +105,31 @@ public: virtual sal_Int32 getPreferredPropertyId(const OUString& _rName); }; -//------------------------------------------------------------------------------ + #define DECL_PROP_IMPL(varname, type) \ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< type* >(0)), -//------------------------------------------------------------------------------ + #define DECL_BOOL_PROP_IMPL(varname) \ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getBooleanCppuType(), -//------------------------------------------------------------------------------ + #define DECL_IFACE_PROP_IMPL(varname, type) \ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< com::sun::star::uno::Reference< type >* >(0)), -//------------------------------------------------------------------------------ + #define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ baseclass::describeFixedProperties( _rProps ); \ sal_Int32 nOldCount = _rProps.getLength(); \ _rProps.realloc( nOldCount + ( count ) ); \ ::com::sun::star::beans::Property* pProperties = _rProps.getArray() + nOldCount; \ -//------------------------------------------------------------------------------ + #define BEGIN_DESCRIBE_BASE_PROPERTIES( count ) \ _rProps.realloc( count ); \ ::com::sun::star::beans::Property* pProperties = _rProps.getArray(); \ -//------------------------------------------------------------------------------ + #define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate ) \ _rProps.realloc( count ); \ ::com::sun::star::beans::Property* pProperties = _rProps.getArray(); \ @@ -137,73 +137,73 @@ public: if (aggregate.is()) \ _rAggregateProps = aggregate->getPropertySetInfo()->getProperties(); \ -// === -//------------------------------------------------------------------------------ + + #define DECL_PROP0(varname, type) \ DECL_PROP_IMPL(varname, type) 0) -//------------------------------------------------------------------------------ + #define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1) -//------------------------------------------------------------------------------ + #define DECL_PROP2(varname, type, attrib1, attrib2) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) -//------------------------------------------------------------------------------ + #define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3) -//------------------------------------------------------------------------------ + #define DECL_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3 | com::sun::star::beans::PropertyAttribute::attrib4) // === some property types require special handling // === such as interfaces -//------------------------------------------------------------------------------ + #define DECL_IFACE_PROP0(varname, type) \ DECL_IFACE_PROP_IMPL(varname, type) 0) -//------------------------------------------------------------------------------ + #define DECL_IFACE_PROP1(varname, type, attrib1) \ DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1) -//------------------------------------------------------------------------------ + #define DECL_IFACE_PROP2(varname, type, attrib1, attrib2) \ DECL_IFACE_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) -//------------------------------------------------------------------------------ + #define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3) \ DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3) -//------------------------------------------------------------------------------ + #define DECL_IFACE_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3 | PropertyAttribute::attrib4) // === or Boolean properties -//------------------------------------------------------------------------------ + #define DECL_BOOL_PROP0(varname) \ DECL_BOOL_PROP_IMPL(varname) 0) -//------------------------------------------------------------------------------ + #define DECL_BOOL_PROP1(varname, attrib1) \ DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1) -//------------------------------------------------------------------------------ + #define DECL_BOOL_PROP2(varname, attrib1, attrib2) \ DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) -//------------------------------------------------------------------------------ + #define DECL_BOOL_PROP3( varname, attrib1, attrib2, attrib3 ) \ DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3 ) -// === -//------------------------------------------------------------------------------ + + #define END_DESCRIBE_PROPERTIES() \ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \ -//============================================================================== -//------------------------------------------------------------------------------ + + #define REGISTER_PROP_1( prop, member, attrib1 ) \ registerProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::attrib1, \ &member, ::getCppuType( &member ) ); @@ -216,7 +216,7 @@ public: registerProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::attrib1 | PropertyAttribute::attrib2 | PropertyAttribute::attrib3, \ &member, ::getCppuType( &member ) ); -//------------------------------------------------------------------------------ + #define REGISTER_VOID_PROP_1( prop, memberAny, type, attrib1 ) \ registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::MAYBEVOID | PropertyAttribute::attrib1, \ &memberAny, ::getCppuType( static_cast< type* >( NULL ) ) ); @@ -225,7 +225,7 @@ public: registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::MAYBEVOID | PropertyAttribute::attrib1 | PropertyAttribute::attrib2, \ &memberAny, ::getCppuType( static_cast< type* >( NULL ) ) ); -//......................................................................... + } //... namespace frm ....................................................... diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx index 50c3e319b08a..b811cdb011df 100644 --- a/forms/source/inc/propertybaghelper.hxx +++ b/forms/source/inc/propertybaghelper.hxx @@ -27,14 +27,14 @@ #include <boost/noncopyable.hpp> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= class IPropertyBagHelperContext - //==================================================================== + class SAL_NO_VTABLE IPropertyBagHelperContext { public: @@ -52,9 +52,9 @@ namespace frm ~IPropertyBagHelperContext() {} }; - //==================================================================== + //= class PropertyBagHelper - //==================================================================== + class PropertyBagHelper : public ::boost::noncopyable { private: @@ -109,51 +109,51 @@ namespace frm sal_Int32 impl_findFreeHandle( const OUString& _rPropertyName ); }; - //-------------------------------------------------------------------- + inline ::comphelper::OPropertyArrayAggregationHelper& PropertyBagHelper::getInfoHelper() const { return impl_ts_getArrayHelper(); } - //-------------------------------------------------------------------- + inline void PropertyBagHelper::getDynamicFastPropertyValue( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const { m_aDynamicProperties.getFastPropertyValue( _nHandle, _out_rValue ); } - //-------------------------------------------------------------------- + inline bool PropertyBagHelper::convertDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::com::sun::star::uno::Any& _out_rConvertedValue, ::com::sun::star::uno::Any& _out_rCurrentValue ) const { return m_aDynamicProperties.convertFastPropertyValue( _nHandle, _rNewValue, _out_rConvertedValue, _out_rCurrentValue ); } - //-------------------------------------------------------------------- + inline void PropertyBagHelper::setDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) { m_aDynamicProperties.setFastPropertyValue( _nHandle, _rValue ); } - //-------------------------------------------------------------------- + inline void PropertyBagHelper::getDynamicPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const { m_aDynamicProperties.getPropertyDefaultByHandle( _nHandle, _out_rValue ); } - //-------------------------------------------------------------------- + inline bool PropertyBagHelper::hasDynamicPropertyByName( const OUString& _rName ) const { return m_aDynamicProperties.hasPropertyByName( _rName ); } - //-------------------------------------------------------------------- + inline bool PropertyBagHelper::hasDynamicPropertyByHandle( sal_Int32 _nHandle ) const { return m_aDynamicProperties.hasPropertyByHandle( _nHandle ); } -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_PROPERTYBAGHELPER_HXX diff --git a/forms/source/inc/resettable.hxx b/forms/source/inc/resettable.hxx index e486dd225303..3331e43ded6f 100644 --- a/forms/source/inc/resettable.hxx +++ b/forms/source/inc/resettable.hxx @@ -29,14 +29,14 @@ namespace cppu class OWeakObject; } -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= ResetHelper - //==================================================================== + class ResetHelper { public: @@ -60,9 +60,9 @@ namespace frm ::cppu::OInterfaceContainerHelper m_aResetListeners; }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_RESETTABLE_HXX diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx index f1cba8476be2..62e204771243 100644 --- a/forms/source/inc/services.hxx +++ b/forms/source/inc/services.hxx @@ -23,10 +23,10 @@ #include <rtl/ustring.hxx> #include "frm_strings.hxx" -//......................................................................... + namespace frm { -//......................................................................... + #define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField" @@ -71,9 +71,9 @@ namespace frm #define VCL_CONTROLMODEL_SPINBUTTON "com.sun.star.awt.UnoControlSpinButtonModel" #define VCL_CONTROL_SPINBUTTON "com.sun.star.awt.UnoControlSpinButton" - // ----------------------- + // service names for compatibility - // ----------------------- + #define FRM_COMPONENT_FORM "stardiv.one.form.component.Form" #define FRM_COMPONENT_EDIT "stardiv.one.form.component.Edit" // compatibility #define FRM_COMPONENT_TEXTFIELD "stardiv.one.form.component.TextField" @@ -118,9 +118,9 @@ namespace frm #define STARDIV_ONE_FORM_CONTROL_FORMATTEDFIELD "stardiv.one.form.control.FormattedField" // </compatibility_I> - // ----------------------- + // new (sun) service names - // ----------------------- + #define FRM_SUN_COMPONENT_FORM "com.sun.star.form.component.Form" #define FRM_SUN_COMPONENT_HTMLFORM "com.sun.star.form.component.HTMLForm" #define FRM_SUN_COMPONENT_DATAFORM "com.sun.star.form.component.DataForm" @@ -198,23 +198,23 @@ namespace frm #define VALIDATABLE_CONTROL_MODEL "com.sun.star.form.binding.ValidatableControlModel" #define VALIDATABLE_BINDABLE_CONTROL_MODEL "com.sun.star.form.binding.ValidatableBindableControlModel" - // ----------------------- + // common - // ----------------------- + #define FRM_SUN_FORMCOMPONENT "com.sun.star.form.FormComponent" - // ----------------------- + // misc - // ----------------------- + #define SRV_AWT_IMAGEPRODUCER "com.sun.star.awt.ImageProducer" #define SRV_SDB_ROWSET "com.sun.star.sdb.RowSet" #define SRV_SDB_CONNECTION "com.sun.star.sdb.Connection" -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX diff --git a/forms/source/inc/togglestate.hxx b/forms/source/inc/togglestate.hxx index aa4798a3c138..d02032ea8e89 100644 --- a/forms/source/inc/togglestate.hxx +++ b/forms/source/inc/togglestate.hxx @@ -20,16 +20,16 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_TOGGLESTATE_HXX #define INCLUDED_FORMS_SOURCE_INC_TOGGLESTATE_HXX -//........................................................................ + namespace frm { -//........................................................................ + enum ToggleState { TRISTATE_FALSE = 0, TRISTATE_TRUE = 1, TRISTATE_INDET = 2 }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_TOGGLESTATE_HXX diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx index dd62ac4b6b7c..3bc7b5b67661 100644 --- a/forms/source/inc/urltransformer.hxx +++ b/forms/source/inc/urltransformer.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/URL.hpp> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= UrlTransformer - //==================================================================== + class UrlTransformer { private: @@ -69,9 +69,9 @@ namespace frm bool implEnsureTransformer() const; }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_URLTRANSFORMER_HXX diff --git a/forms/source/inc/windowstateguard.hxx b/forms/source/inc/windowstateguard.hxx index 6d65cdd79d3a..587c2f6265f0 100644 --- a/forms/source/inc/windowstateguard.hxx +++ b/forms/source/inc/windowstateguard.hxx @@ -24,14 +24,14 @@ #include <com/sun/star/awt/XControlModel.hpp> #include <rtl/ref.hxx> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= WindowStateGuard - //==================================================================== + class WindowStateGuard_Impl; /** a helper class which monitors certain states of an XWindow2, and ensures @@ -65,9 +65,9 @@ namespace frm ); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_INC_WINDOWSTATEGUARD_HXX diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 24e80a146b09..cf13dbe61fc7 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -47,7 +47,7 @@ #include <algorithm> #include <boost/scoped_ptr.hpp> -//......................................................................... + #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/document/XCodeNameQuery.hpp> #include <ooo/vba/XVBAToOOEventDescGen.hpp> @@ -55,7 +55,7 @@ namespace frm { -//......................................................................... + using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; @@ -165,9 +165,9 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn } } -//================================================================== + //= ElementDescription -//================================================================== + ElementDescription::ElementDescription( ) { @@ -178,9 +178,9 @@ ElementDescription::~ElementDescription() { } -//================================================================== + //= OInterfaceContainer -//================================================================== + OInterfaceContainer::OInterfaceContainer( const Reference<XComponentContext>& _rxContext, @@ -280,7 +280,7 @@ void OInterfaceContainer::disposing() namespace { - //.......................................................................... + void lcl_saveEvents( ::std::vector< Sequence< ScriptEventDescriptor > >& _rSave, const Reference< XEventAttacherManager >& _rxManager, const sal_Int32 _nItemCount ) { @@ -296,7 +296,7 @@ namespace _rSave.push_back(_rxManager->getScriptEvents( i )); } - //.......................................................................... + void lcl_restoreEvents( const ::std::vector< Sequence< ScriptEventDescriptor > >& _rSave, const Reference< XEventAttacherManager >& _rxManager ) { @@ -1269,9 +1269,9 @@ void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScrip m_xEventAttacher->removeScriptListener( xListener ); } -//================================================================== + //= OFormComponents -//================================================================== + Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) { @@ -1342,8 +1342,8 @@ InterfaceRef OFormComponents::getParent() throw( RuntimeException, std::exceptio return m_xParent; } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx index a4a828529e73..1c16e2c2ed23 100644 --- a/forms/source/misc/componenttools.cxx +++ b/forms/source/misc/componenttools.cxx @@ -24,10 +24,10 @@ #include <algorithm> #include <iterator> -//........................................................................ + namespace frm { -//........................................................................ + using ::com::sun::star::frame::XModel; using ::com::sun::star::uno::XInterface; @@ -35,9 +35,9 @@ namespace frm using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::container::XChild; - //==================================================================== + //= TypeBag - //==================================================================== + TypeBag::TypeBag( const TypeSequence& _rTypes1 ) { @@ -89,7 +89,7 @@ namespace frm return aTypes; } - //==================================================================== + Reference< XModel > getXModel( const Reference< XInterface >& _rxComponent ) { Reference< XInterface > xParent = _rxComponent; @@ -103,8 +103,8 @@ namespace frm return xModel; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index ffa75cfa1d1e..abe26ce1ad92 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -25,10 +25,10 @@ #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -40,9 +40,9 @@ namespace frm ::osl::Mutex OLimitedFormats::s_aMutex; Reference< XNumberFormatsSupplier > OLimitedFormats::s_xStandardFormats; - //===================================================================== + //= - //===================================================================== + enum LocaleType { @@ -127,9 +127,9 @@ namespace frm return NULL; } - //===================================================================== + //= OLimitedFormats - //===================================================================== + OLimitedFormats::OLimitedFormats(const Reference< XComponentContext >& _rxContext, const sal_Int16 _nClassId) :m_nFormatEnumPropertyHandle(-1) @@ -377,8 +377,8 @@ namespace frm } } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx index c6ff7fd32e45..4cecbe839129 100644 --- a/forms/source/misc/listenercontainers.cxx +++ b/forms/source/misc/listenercontainers.cxx @@ -19,18 +19,18 @@ #include "listenercontainers.hxx" -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::form; - //==================================================================== + //= ResetListeners - //==================================================================== + bool ResetListeners::implTypedNotify( const Reference< XResetListener >& _rxListener, const EventObject& _rEvent ) SAL_THROW( ( Exception ) ) @@ -50,8 +50,8 @@ namespace frm return true; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index d042d2968858..e86a7bd94b20 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -29,11 +29,11 @@ //... namespace frm ....................................................... namespace frm { -//......................................................................... -//================================================================== + + //= PropertyInfoService -//================================================================== + PropertyInfoService::PropertyMap PropertyInfoService::s_AllKnownProperties; sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName) @@ -66,7 +66,7 @@ sal_Int32 ConcreteInfoService::getPreferredPropertyId(const OUString& _rName) #define ADD_PROP_ASSIGNMENT(varname) \ s_AllKnownProperties.push_back(PropertyAssignment(PROPERTY_##varname, PROPERTY_ID_##varname)) -//.................................................................. + void PropertyInfoService::initialize() { if (!s_AllKnownProperties.empty()) @@ -242,7 +242,7 @@ void PropertyInfoService::initialize() ); } -//......................................................................... + } //... namespace frm ....................................................... diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index fd29532e4b3b..4b7416c5e32a 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -//....................................................................................... + #define DECLARE_SERVICE_INFO(classImplName) \ namespace frm { \ extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL classImplName##_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory) throw (::com::sun::star::uno::RuntimeException); \ @@ -119,27 +119,27 @@ void registerClassInfo( } -//....................................................................................... + #define REGISTER_CLASS_CORE(classImplName) \ registerClassInfo( \ OUString("com.sun.star.form.") + OUString(#classImplName), \ aServices, \ frm::classImplName##_CreateInstance) -//....................................................................................... + #define REGISTER_CLASS1(classImplName, service1) \ aServices.realloc(1); \ aServices.getArray()[0] = service1; \ REGISTER_CLASS_CORE(classImplName) -//....................................................................................... + #define REGISTER_CLASS2(classImplName, service1, service2) \ aServices.realloc(2); \ aServices.getArray()[0] = service1; \ aServices.getArray()[1] = service2; \ REGISTER_CLASS_CORE(classImplName) -//....................................................................................... + #define REGISTER_CLASS3(classImplName, service1, service2, service3) \ aServices.realloc(3); \ aServices.getArray()[0] = service1; \ @@ -147,7 +147,7 @@ void registerClassInfo( aServices.getArray()[2] = service3; \ REGISTER_CLASS_CORE(classImplName) -//....................................................................................... + #define REGISTER_CLASS4(classImplName, service1, service2, service3, service4) \ aServices.realloc(4); \ aServices.getArray()[0] = service1; \ @@ -164,7 +164,7 @@ void ensureClassInfos() return; Sequence< OUString > aServices; - // ======================================================================== + // = ControlModels // - FixedText @@ -221,7 +221,7 @@ void ensureClassInfos() aServices, frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted); - // ======================================================================== + // = Controls // - RadioButton REGISTER_CLASS2(ORadioButtonControl, STARDIV_ONE_FORM_CONTROL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON); @@ -255,7 +255,7 @@ void ensureClassInfos() REGISTER_CLASS2(OImageControlControl, STARDIV_ONE_FORM_CONTROL_IMAGECONTROL, FRM_SUN_CONTROL_IMAGECONTROL); - // ======================================================================== + // = various aServices.realloc(1); aServices.getArray()[0] = "com.sun.star.form.Forms"; @@ -263,7 +263,7 @@ void ensureClassInfos() REGISTER_CLASS1(ImageProducer, SRV_AWT_IMAGEPRODUCER); - // ======================================================================== + // = XForms core #define REGISTER_XFORMS_CLASS(name) \ aServices.realloc(1); \ @@ -275,7 +275,7 @@ void ensureClassInfos() } -//======================================================================================= + extern "C" { @@ -317,7 +317,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI if (!_pServiceManager || !_pImplName) return NULL; - // ======================================================================== + // a lot of stuff which is implemented "manually" here in this file void* pRet = NULL; @@ -359,7 +359,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI } } - // ======================================================================== + // the real way - use the OModule if ( !pRet ) { diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index 2942d905b7cd..702ed3a35b40 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.cxx @@ -28,13 +28,13 @@ #include <svl/solar.hrc> -//......................................................................... + namespace frm { - //================================================================== + //= ResourceManager - //================================================================== + SimpleResMgr* ResourceManager::m_pImpl = NULL; @@ -70,8 +70,8 @@ namespace frm return sReturn; } -//......................................................................... + } -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index ae170eb08aa5..ca2b1c3a0e3f 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -21,10 +21,10 @@ #include <editeng/editview.hxx> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -32,9 +32,9 @@ namespace frm using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; - //==================================================================== + //= OAttributeDispatcher - //==================================================================== + OAttributeDispatcher::OAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) @@ -121,8 +121,8 @@ namespace frm doNotify( static_cast< XStatusListener* >( aIter.next() ), aEvent ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index b4d9926bc115..80dab703df0d 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -23,14 +23,14 @@ #include "rtattributes.hxx" #include "textattributelistener.hxx" -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= OAttributeDispatcher - //==================================================================== + class OAttributeDispatcher :public ORichTextFeatureDispatcher ,public ITextAttributeListener { @@ -88,9 +88,9 @@ namespace frm ) SAL_THROW (()); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_ATTRIBUTEDISPATCHER_HXX diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 3945f7735bd2..1ccb9481a3cc 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -24,10 +24,10 @@ #include <svtools/cliplistener.hxx> #include <svtools/transfer.hxx> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -35,7 +35,7 @@ namespace frm using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; - //==================================================================== + namespace { static URL createClipboardURL( OClipboardDispatcher::ClipboardFunc _eFunc ) @@ -57,9 +57,9 @@ namespace frm } } - //==================================================================== + //= OClipboardDispatcher - //==================================================================== + OClipboardDispatcher::OClipboardDispatcher( EditView& _rView, ClipboardFunc _eFunc ) :ORichTextFeatureDispatcher( _rView, createClipboardURL( _eFunc ) ) @@ -132,9 +132,9 @@ namespace frm } } - //==================================================================== + //= OPasteClipboardDispatcher - //==================================================================== + OPasteClipboardDispatcher::OPasteClipboardDispatcher( EditView& _rView ) :OClipboardDispatcher( _rView, ePaste ) @@ -194,8 +194,8 @@ namespace frm return m_bPastePossible && OClipboardDispatcher::implIsEnabled(); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index ea77ba47d47f..aa0feeacc9fa 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -25,14 +25,14 @@ class TransferableClipboardListener; class TransferableDataHelper; -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= OClipboardDispatcher - //==================================================================== + class OClipboardDispatcher : public ORichTextFeatureDispatcher { public: @@ -66,9 +66,9 @@ namespace frm virtual sal_Bool implIsEnabled( ) const; }; - //==================================================================== + //= OPasteClipboardDispatcher - //==================================================================== + class OPasteClipboardDispatcher : public OClipboardDispatcher { private: @@ -91,9 +91,9 @@ namespace frm DECL_LINK( OnClipboardChanged, TransferableDataHelper* ); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_CLIPBOARDDISPATCHER_HXX diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 31c901373181..7c018bc0db2e 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -19,19 +19,19 @@ #include "featuredispatcher.hxx" -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; - //==================================================================== + //= ORichTextFeatureDispatcher - //==================================================================== + ORichTextFeatureDispatcher::ORichTextFeatureDispatcher( EditView& _rView, const URL& _rURL ) :m_aFeatureURL( _rURL ) @@ -139,8 +139,8 @@ namespace frm } } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 32d4389f33c0..98e1ddae5f25 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -27,14 +27,14 @@ #include <comphelper/broadcasthelper.hxx> class EditView; -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= ORichTextFeatureDispatcher - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::frame::XDispatch > ORichTextFeatureDispatcher_Base; @@ -89,9 +89,9 @@ namespace frm virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index 774027286d5e..ee8951545960 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -27,10 +27,10 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -38,9 +38,9 @@ namespace frm using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; - //==================================================================== + //= OParametrizedAttributeDispatcher - //==================================================================== + OParametrizedAttributeDispatcher::OParametrizedAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) :OAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher ) @@ -126,8 +126,8 @@ namespace frm } } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index ee4aafb091d5..36b3ddfa25f2 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -23,14 +23,14 @@ #include "attributedispatcher.hxx" class SfxPoolItem; -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= OParametrizedAttributeDispatcher - //==================================================================== + class OParametrizedAttributeDispatcher :public OAttributeDispatcher { public: @@ -59,9 +59,9 @@ namespace frm const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_PARAMETRIZEDATTRIBUTEDISPATCHER_HXX diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 2cce4fb1f551..bbb5403f1d6d 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -46,10 +46,10 @@ extern "C" void SAL_CALL createRegistryInfo_ORichTextControl() static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextControl > aAutoRegistration; } -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -75,9 +75,9 @@ namespace frm } \ return aReturn; - //================================================================== + // ORichTextControl - //================================================================== + ORichTextControl::ORichTextControl() :UnoEditControl() @@ -106,7 +106,7 @@ namespace frm namespace { - //.............................................................. + static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag ) { @@ -115,7 +115,7 @@ namespace frm _rAllBits |= ( bFlagValue ? _nPositiveFlag : nNegativeFlag ); } - //.............................................................. + static void implAdjustTwoStateFlag( const Any& _rValue, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) { sal_Bool bFlagValue = sal_False; @@ -130,14 +130,14 @@ namespace frm } } - //.............................................................. + static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) { implAdjustTwoStateFlag( _rxProps->getPropertyValue( _rPropertyName ), _rAllBits, _nFlag, _bInvert ); } - //.............................................................. + static void adjustTwoStateWinBit( Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false ) { WinBits nBits = _pWindow->GetStyle(); @@ -145,7 +145,7 @@ namespace frm _pWindow->SetStyle( nBits ); } - //.............................................................. + static WinBits getWinBits( const Reference< XControlModel >& _rxModel, WinBits nBaseBits = 0 ) { WinBits nBits = nBaseBits; @@ -300,9 +300,9 @@ namespace frm return UnoControl::requiresNewPeer( _rPropertyName ) || _rPropertyName.equals( PROPERTY_RICH_TEXT ); } - //================================================================== + // ORichTextPeer - //================================================================== + ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, Window* _pParentWindow, WinBits _nStyle ) { @@ -476,7 +476,7 @@ namespace frm // the id belonging to "SuperScript", it gets the FN_SET_SUPER_SCRIPT - which // is completely unknown to the EditEngine. // So, we need to translate such conflicting ids. - // + // Note that the real solution would be to fix the applications to // *not* define conflicting slots. Alternatively, if SFX would provide a slot pool // which is *static* (i.e. independent on the active application), then we @@ -728,8 +728,8 @@ namespace frm aDispatcherPos->second.get()->invalidate(); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 6ce25b768252..87341fc188a5 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -33,16 +33,16 @@ #include <map> -//......................................................................... + namespace frm { -//......................................................................... + class ORichTextFeatureDispatcher; - //================================================================== + // ORichTextControl - //================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProvider > ORichTextControl_Base; class ORichTextControl :public UnoEditControl @@ -83,9 +83,9 @@ namespace frm virtual bool requiresNewPeer( const OUString& _rPropertyName ) const; }; - //================================================================== + // ORichTextPeer - //================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProvider > ORichTextPeer_Base; class ORichTextPeer :public VCLXWindow @@ -140,9 +140,9 @@ namespace frm SingleAttributeDispatcher implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL ); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTCONTROL_HXX diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 488df7c5c7ba..4712a61fbf13 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -36,14 +36,14 @@ #include <algorithm> #include <functional> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= RichTextEngine - //==================================================================== + RichTextEngine* RichTextEngine::Create() { @@ -142,8 +142,8 @@ namespace frm return 0L; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index 40e706fda17b..9a81210f8387 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -26,14 +26,14 @@ class SfxItemPool; class EditStatus; -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= IEngineStatusListener - //==================================================================== + class IEngineStatusListener { public: @@ -43,9 +43,9 @@ namespace frm ~IEngineStatusListener() {} }; - //==================================================================== + //= RichTextEngine - //==================================================================== + class RichTextEngine : public EditEngine { private: @@ -78,9 +78,9 @@ namespace frm DECL_LINK( EditEngineStatusChanged, EditStatus* ); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index b81929e4e5b5..cc61a35e3097 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -37,13 +37,13 @@ #define EMPTY_PAPER_SIZE 0x7FFFFFFF -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= RichTextControlImpl - //==================================================================== + RichTextControlImpl::RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttrListener, ITextSelectionListener* _pSelectionListener ) :m_pAntiImpl ( _pAntiImpl ) @@ -661,8 +661,8 @@ namespace frm return m_pViewport->GetHideInactiveSelection( ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index f9f5c8788f91..b946a7482601 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -31,17 +31,17 @@ class EditView; class EditStatus; class Window; class SvxScriptSetItem; -//........................................................................ + namespace frm { -//........................................................................ + class ITextAttributeListener; class ITextSelectionListener; class RichTextViewPort; - //==================================================================== + //= RichTextControlImpl - //==================================================================== + class RichTextControlImpl : public IEngineStatusListener { typedef ::std::map< AttributeId, AttributeState > StateCache; @@ -180,9 +180,9 @@ namespace frm DECL_LINK( OnVScroll, ScrollBar* ); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTIMPLCONTROL_HXX diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 20cec279a2cb..2270637f08cf 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -39,10 +39,10 @@ extern "C" void SAL_CALL createRegistryInfo_ORichTextModel() static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextModel > aRegisterModel; } -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -55,9 +55,9 @@ namespace frm namespace WritingMode2 = ::com::sun::star::text::WritingMode2; - //==================================================================== + //= ORichTextModel - //==================================================================== + ORichTextModel::ORichTextModel( const Reference< XComponentContext >& _rxFactory ) :OControlModel ( _rxFactory, OUString() ) @@ -612,8 +612,8 @@ namespace frm } } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index da004bc06f3a..e1f725d26fc5 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -33,15 +33,15 @@ #include <memory> class EditEngine; -//........................................................................ + namespace frm { -//........................................................................ + class RichTextEngine; - //==================================================================== + //= ORichTextModel - //==================================================================== + typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XControlModel , ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::util::XModifyBroadcaster @@ -176,9 +176,9 @@ namespace frm ORichTextModel& operator=( const ORichTextModel& ); // never implemented }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index c091d28fd2eb..c65daeca8fa4 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -28,17 +28,17 @@ #include <svx/svdobj.hxx> #include <editeng/unoprnms.hxx> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; - //==================================================================== + namespace { const SvxItemPropertySet* getTextEnginePropertySet() @@ -58,9 +58,9 @@ namespace frm } } - //==================================================================== + //= ORichTextUnoWrapper - //==================================================================== + ORichTextUnoWrapper::ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ) :SvxUnoText( getTextEnginePropertySet() ) @@ -73,9 +73,9 @@ namespace frm { } - //==================================================================== + //= RichTextEditSource - //==================================================================== + RichTextEditSource::RichTextEditSource( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ) :m_rEngine ( _rEngine ) @@ -119,8 +119,8 @@ namespace frm m_pTextChangeListener->potentialTextChange(); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx index a92128fdedac..1fdee88720e2 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -23,14 +23,14 @@ #include <editeng/unotext.hxx> #include <editeng/unoedsrc.hxx> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= IEngineTextChangeListener - //==================================================================== + class IEngineTextChangeListener { public: @@ -40,9 +40,9 @@ namespace frm ~IEngineTextChangeListener() {} }; - //==================================================================== + //= ORichTextUnoWrapper - //==================================================================== + class ORichTextUnoWrapper : public SvxUnoText { public: @@ -58,9 +58,9 @@ namespace frm ORichTextUnoWrapper& operator=( const ORichTextUnoWrapper& ); // never implemented }; - //==================================================================== + //= RichTextEditSource - //==================================================================== + class RichTextEditSource : public SvxEditSource { private: @@ -85,9 +85,9 @@ namespace frm RichTextEditSource& operator=( const RichTextEditSource& ); // never implemented }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index fdd967bd618c..314b734ec54e 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -38,16 +38,16 @@ #include <editeng/editids.hrc> #include <svx/svxids.hrc> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::awt; - //==================================================================== + //= RichTextControl - //==================================================================== + RichTextControl::RichTextControl( RichTextEngine* _pEngine, Window* _pParent, WinBits _nStyle, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener ) @@ -363,9 +363,9 @@ namespace frm return m_pImpl->GetHideInactiveSelection( ); } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index e603af87481f..7a9acbaac28c 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -30,16 +30,16 @@ class EditView; class EditEngine; class SfxItemSet; -//........................................................................ + namespace frm { -//........................................................................ + class RichTextControlImpl; class RichTextEngine; - //==================================================================== + //= RichTextControl - //==================================================================== + class RichTextControl : public Control, public IMultiAttributeDispatcher { private: @@ -122,9 +122,9 @@ namespace frm Window& getViewport() const; }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index 26077b52d48a..f65460014ff4 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -20,14 +20,14 @@ #include "richtextviewport.hxx" #include <editeng/editview.hxx> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= RichTextViewPort - //==================================================================== + RichTextViewPort::RichTextViewPort( Window* _pParent ) :Control ( _pParent ) @@ -113,8 +113,8 @@ namespace frm return m_bHideInactiveSelection; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index 63cff4f7b677..9500256f2790 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -22,14 +22,14 @@ #include <vcl/ctrl.hxx> class EditView; -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= RichTextViewPort - //==================================================================== + class RichTextViewPort : public Control { private: @@ -64,9 +64,9 @@ namespace frm } }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVIEWPORT_HXX diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index d46891693eb3..22d0b6733610 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -35,13 +35,13 @@ #include <editeng/frmdiritem.hxx> #include <editeng/scripttypeitem.hxx> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= ReferenceBase - //==================================================================== + oslInterlockedCount SAL_CALL ReferenceBase::acquire() { @@ -59,9 +59,9 @@ namespace frm { } - //==================================================================== + //= AttributeHandler - //==================================================================== + AttributeHandler::AttributeHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :m_nAttribute( _nAttributeId ) @@ -125,9 +125,9 @@ namespace frm return aState; } - //==================================================================== + //= AttributeHandlerFactory - //==================================================================== + namespace { @@ -199,9 +199,9 @@ namespace frm return pReturn; } - //==================================================================== + //= ParaAlignmentHandler - //==================================================================== + ParaAlignmentHandler::ParaAlignmentHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_PARA_JUST ) @@ -235,9 +235,9 @@ namespace frm _rNewAttribs.Put( SvxAdjustItem( m_eAdjust, getWhich() ) ); } - //==================================================================== + //= LineSpacingHandler - //==================================================================== + LineSpacingHandler::LineSpacingHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_PARA_SBL ) @@ -278,9 +278,9 @@ namespace frm _rNewAttribs.Put( aLineSpacing ); } - //==================================================================== + //= EscapementHandler - //==================================================================== + EscapementHandler::EscapementHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_CHAR_ESCAPEMENT ) @@ -315,9 +315,9 @@ namespace frm _rNewAttribs.Put( SvxEscapementItem( bIsChecked ? SVX_ESCAPEMENT_OFF : m_eEscapement, getWhich() ) ); } - //==================================================================== + //= SlotHandler - //==================================================================== + SlotHandler::SlotHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :AttributeHandler( _nAttributeId, _nWhichId ) @@ -358,9 +358,9 @@ namespace frm OSL_FAIL( "SlotHandler::executeAttribute: need attributes to do something!" ); } - //==================================================================== + //= FontSizeHandler - //==================================================================== + FontSizeHandler::FontSizeHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :AttributeHandler( _nAttributeId, _nWhichId ) @@ -429,9 +429,9 @@ namespace frm } } - //==================================================================== + //= ParagraphDirectionHandler - //==================================================================== + ParagraphDirectionHandler::ParagraphDirectionHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_PARA_WRITINGDIR ) @@ -477,9 +477,9 @@ namespace frm _rNewAttribs.Put( SvxAdjustItem( m_eDefaultAdjustment, EE_PARA_JUST ) ); } - //==================================================================== + //= BooleanHandler - //==================================================================== + BooleanHandler::BooleanHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :AttributeHandler( _nAttributeId, _nWhichId ) @@ -509,8 +509,8 @@ namespace frm } } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index e4bbf4c9ed24..2e6e6cac1348 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -28,14 +28,14 @@ class SfxItemSet; class SfxPoolItem; class SfxItemPool; -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= ReferenceBase - //==================================================================== + class ReferenceBase : public ::rtl::IReference { protected: @@ -50,9 +50,9 @@ namespace frm virtual ~ReferenceBase(); }; - //==================================================================== + //= IAttributeHandler - //==================================================================== + class IAttributeHandler : public ::rtl::IReference { public: @@ -64,9 +64,9 @@ namespace frm ~IAttributeHandler() {} }; - //==================================================================== + //= AttributeHandler - //==================================================================== + class AttributeHandler :public ReferenceBase ,public IAttributeHandler { @@ -104,9 +104,9 @@ namespace frm virtual ~AttributeHandler(); }; - //==================================================================== + //= AttributeHandlerFactory - //==================================================================== + class AttributeHandlerFactory { public: @@ -119,9 +119,9 @@ namespace frm ~AttributeHandlerFactory(); // never implemented }; - //==================================================================== + //= ParaAlignmentHandler - //==================================================================== + class ParaAlignmentHandler : public AttributeHandler { private: @@ -135,9 +135,9 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const; }; - //==================================================================== + //= LineSpacingHandler - //==================================================================== + class LineSpacingHandler : public AttributeHandler { private: @@ -151,9 +151,9 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const; }; - //==================================================================== + //= EscapementHandler - //==================================================================== + class EscapementHandler : public AttributeHandler { private: @@ -167,9 +167,9 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const; }; - //==================================================================== + //= SlotHandler - //==================================================================== + class SlotHandler : public AttributeHandler { private: @@ -183,9 +183,9 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const; }; - //==================================================================== + //= BooleanHandler - //==================================================================== + class BooleanHandler : public AttributeHandler { public: @@ -196,9 +196,9 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const; }; - //==================================================================== + //= FontSizeHandler - //==================================================================== + class FontSizeHandler : public AttributeHandler { public: @@ -209,9 +209,9 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const; }; - //==================================================================== + //= ParagraphDirectionHandler - //==================================================================== + class ParagraphDirectionHandler : public AttributeHandler { private: @@ -227,9 +227,9 @@ namespace frm virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const; }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTEHANDLER_HXX diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index 78832fc9197a..10cf4db23a43 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -23,10 +23,10 @@ #include <svx/svxids.hrc> #include <editeng/scriptspaceitem.hxx> -//........................................................................ + namespace frm { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -34,9 +34,9 @@ namespace frm using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; - //==================================================================== + //= OSelectAllDispatcher - //==================================================================== + OSelectAllDispatcher::OSelectAllDispatcher( EditView& _rView, const URL& _rURL ) :ORichTextFeatureDispatcher( _rView, _rURL ) @@ -86,9 +86,9 @@ namespace frm return aEvent; } - //==================================================================== + //= OParagraphDirectionDispatcher - //==================================================================== + OParagraphDirectionDispatcher::OParagraphDirectionDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) @@ -109,9 +109,9 @@ namespace frm return aEvent; } - //==================================================================== + //= OTextDirectionDispatcher - //==================================================================== + OTextDirectionDispatcher::OTextDirectionDispatcher( EditView& _rView, const URL& _rURL ) :ORichTextFeatureDispatcher( _rView, _rURL ) @@ -149,9 +149,9 @@ namespace frm return aEvent; } - //==================================================================== + //= OAsianFontLayoutDispatcher - //==================================================================== + OAsianFontLayoutDispatcher::OAsianFontLayoutDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) :OParametrizedAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher ) @@ -183,8 +183,8 @@ namespace frm return NULL; } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index 57b87c5d0cfc..7683e3ba432f 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -22,14 +22,14 @@ #include "parametrizedattributedispatcher.hxx" -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= OSelectAllDispatcher - //==================================================================== + class OSelectAllDispatcher : public ORichTextFeatureDispatcher { public: @@ -47,9 +47,9 @@ namespace frm virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const; }; - //==================================================================== + //= OParagraphDirectionDispatcher - //==================================================================== + class OParagraphDirectionDispatcher : public OAttributeDispatcher { public: @@ -65,9 +65,9 @@ namespace frm virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const; }; - //==================================================================== + //= OTextDirectionDispatcher - //==================================================================== + class OTextDirectionDispatcher : public ORichTextFeatureDispatcher { public: @@ -81,9 +81,9 @@ namespace frm virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const; }; - //==================================================================== + //= OAsianFontLayoutDispatcher - //==================================================================== + class OAsianFontLayoutDispatcher : public OParametrizedAttributeDispatcher { public: @@ -100,9 +100,9 @@ namespace frm const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ); }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_SPECIALDISPATCHERS_HXX diff --git a/forms/source/richtext/textattributelistener.hxx b/forms/source/richtext/textattributelistener.hxx index f99932993dcf..339ec893d002 100644 --- a/forms/source/richtext/textattributelistener.hxx +++ b/forms/source/richtext/textattributelistener.hxx @@ -22,14 +22,14 @@ #include "rtattributes.hxx" struct ESelection; -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= ITextAttributeListener - //==================================================================== + class ITextAttributeListener { public: @@ -39,9 +39,9 @@ namespace frm ~ITextAttributeListener() {} }; - //==================================================================== + //= ITextAttributeListener - //==================================================================== + class ITextSelectionListener { public: @@ -51,9 +51,9 @@ namespace frm ~ITextSelectionListener() {} }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RICHTEXT_TEXTATTRIBUTELISTENER_HXX diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index cfef86646d27..5eca4e7a8119 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -67,10 +67,10 @@ extern "C" void SAL_CALL createRegistryInfo_FormOperations() static ::frm::OMultiInstanceAutoRegistration< ::frm::FormOperations > aAutoRegistration; } -//........................................................................ + namespace frm { -//........................................................................ + using ::dbtools::SQLExceptionInfo; using ::com::sun::star::uno::Reference; @@ -121,9 +121,9 @@ namespace frm namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; namespace RowChangeAction = ::com::sun::star::sdb::RowChangeAction; - //==================================================================== + //= FormOperations - //==================================================================== + FormOperations::FormOperations( const Reference< XComponentContext >& _rxContext ) :FormOperations_Base( m_aMutex ) @@ -1760,8 +1760,8 @@ namespace frm } } -//........................................................................ + } // namespace frm -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index fefee016c5ec..b4b78a0545fd 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -35,14 +35,14 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase6.hxx> -//........................................................................ + namespace frm { -//........................................................................ - //==================================================================== + + //= FormOperations - //==================================================================== + typedef ::cppu::WeakComponentImplHelper6 < ::com::sun::star::form::runtime::XFormOperations , ::com::sun::star::lang::XInitialization , ::com::sun::star::lang::XServiceInfo @@ -376,9 +376,9 @@ namespace frm }; }; -//........................................................................ + } // namespace frm -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_RUNTIME_FORMOPERATIONS_HXX diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index cd29d5eb6bc3..b3f9814b2786 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -45,10 +45,10 @@ extern "C" void SAL_CALL createRegistryInfo_ONavigationBarControl() static ::frm::OMultiInstanceAutoRegistration< ::frm::ONavigationBarControl > aAutoRegistration; } -//......................................................................... + namespace frm { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -65,9 +65,9 @@ namespace frm xTypedPeer->method( param1 ); \ } - //================================================================== + // ONavigationBarControl - //================================================================== + ONavigationBarControl::ONavigationBarControl( const Reference< XComponentContext >& _rxORB) :UnoControl(), m_xContext(_rxORB) @@ -96,7 +96,7 @@ namespace frm namespace { - //.............................................................. + static WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel ) { WinBits nBits = 0; @@ -229,9 +229,9 @@ namespace frm FORWARD_TO_PEER_1( XVclWindowPeer, setDesignMode, _bOn ); } - //================================================================== + // ONavigationBarPeer - //================================================================== + ONavigationBarPeer* ONavigationBarPeer::Create( const Reference< XComponentContext >& _rxORB, Window* _pParentWindow, const Reference< XControlModel >& _rxModel ) @@ -517,8 +517,8 @@ namespace frm _rFeatureIds.push_back( FormFeature::RemoveFilterAndSort ); } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 8e23dc1fcf77..e96db9aec8db 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -31,14 +31,14 @@ #include <cppuhelper/implbase1.hxx> #include <tools/wintypes.hxx> -//......................................................................... + namespace frm { -//......................................................................... - //================================================================== + + // ONavigationBarControl - //================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProviderInterception > ONavigationBarControl_Base; @@ -84,9 +84,9 @@ namespace frm virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - //================================================================== + // ONavigationBarPeer - //================================================================== + class ONavigationBarPeer :public VCLXWindow ,public OFormNavigationHelper @@ -142,9 +142,9 @@ namespace frm virtual bool isEnabled( sal_Int16 _nFeatureId ) const; }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_SOLAR_COMPONENT_NAVBARCONTROL_HXX diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 3fd7e856203d..a47048a2bef8 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -36,16 +36,16 @@ #define LID_RECORD_LABEL 1000 #define LID_RECORD_FILLER 1001 -//......................................................................... + namespace frm { -//......................................................................... + using ::com::sun::star::uno::makeAny; namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; - //===================================================================== - //..................................................................... + + namespace { static bool isArtificialItem( sal_Int16 _nFeatureId ) @@ -95,9 +95,9 @@ namespace frm } } - //===================================================================== + //= ImplNavToolBar - //===================================================================== + class ImplNavToolBar : public ToolBox { protected: @@ -135,9 +135,9 @@ namespace frm } } - //===================================================================== + //= NavigationToolBar - //===================================================================== + NavigationToolBar::NavigationToolBar( Window* _pParent, WinBits _nStyle, const PCommandImageProvider& _pImageProvider, const PCommandDescriptionProvider& _pDescriptionProvider ) @@ -651,9 +651,9 @@ namespace frm _pItemWindow->EnableRTL( *static_cast< const sal_Bool* >( _pIsRTLEnabled ) ); } - //===================================================================== + //= RecordPositionInput - //===================================================================== + RecordPositionInput::RecordPositionInput( Window* _pParent ) :NumericField( _pParent, WB_BORDER | WB_VCENTER ) @@ -710,8 +710,8 @@ namespace frm } -//......................................................................... + } // namespace frm -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index e9179c65b981..62c252e3ffdb 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -25,10 +25,10 @@ #include <boost/shared_ptr.hpp> -//......................................................................... + namespace frm { -//......................................................................... + class IFeatureDispatcher; class ICommandImageProvider; @@ -36,9 +36,9 @@ namespace frm class ImplNavToolBar; - //===================================================================== + //= NavigationToolBar - //===================================================================== + class NavigationToolBar : public Window { public: @@ -154,9 +154,9 @@ namespace frm void enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const; }; - //===================================================================== + //= RecordPositionInput - //===================================================================== + class RecordPositionInput : public NumericField { private: @@ -179,9 +179,9 @@ namespace frm void FirePosition( sal_Bool _bForce ); }; -//......................................................................... + } // namespace frm -//......................................................................... + #endif // INCLUDED_FORMS_SOURCE_SOLAR_INC_NAVTOOLBAR_HXX diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index 7484eeeb7bae..3b2d7927c0be 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -92,9 +92,9 @@ public: NameContainer() {} virtual ~NameContainer() {} - // + // methods for XElementAccess - // + virtual com::sun::star::uno::Type SAL_CALL getElementType() throw( com::sun::star::uno::RuntimeException, std::exception ) @@ -109,9 +109,9 @@ public: } - // + // methods for XNameAccess (inherits XElementAccess) - // + virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& rName ) @@ -151,9 +151,9 @@ public: } - // + // methods for XNameReplace (inherits XNameAccess) - // + virtual void SAL_CALL replaceByName( const OUString& rName, @@ -174,9 +174,9 @@ public: } - // + // methods for XNameContainer (inherits XNameReplace) - // + virtual void SAL_CALL insertByName( const OUString& rName, diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index b0a6f845302e..eb5ea49c78ff 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -1033,9 +1033,9 @@ void Binding::_checkBindingID() -// + // XValueBinding -// + Binding::Sequence_Type_t Binding::getSupportedValueTypes() throw( RuntimeException, std::exception ) @@ -1102,9 +1102,9 @@ void Binding::setValue( const Any_t& aValue ) } -// + // XListEntry Source -// + sal_Int32 Binding::getListEntryCount() throw( RuntimeException, std::exception ) @@ -1197,9 +1197,9 @@ void Binding::removeListEntryListener( const XListEntryListener_t& xListener ) } -// + // XValidator -// + sal_Bool Binding::isValid( const Any_t& ) throw( RuntimeException, std::exception ) @@ -1247,9 +1247,9 @@ void Binding::removeValidityConstraintListener( -// + // xml::dom::event::XEventListener -// + void Binding::handleEvent( const XEvent_t& xEvent ) throw( RuntimeException, std::exception ) @@ -1280,9 +1280,9 @@ void Binding::handleEvent( const XEvent_t& xEvent ) } -// + // lang::XUnoTunnel -// + sal_Int64 Binding::getSomething( const IntSequence_t& xId ) throw( RuntimeException, std::exception ) @@ -1290,9 +1290,9 @@ sal_Int64 Binding::getSomething( const IntSequence_t& xId ) return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : NULL ); } -// + // XCloneable -// + Binding::XCloneable_t SAL_CALL Binding::createClone() throw( RuntimeException, std::exception ) @@ -1310,9 +1310,9 @@ Binding::XCloneable_t SAL_CALL Binding::createClone() return XCloneable_t( xClone, UNO_QUERY ); } -// + // property set implementations -// + #define REGISTER_PROPERTY( property, type ) \ registerProperty( PROPERTY( property, type ), \ diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index 61ea981b65ba..3ee3c94b02ea 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -174,9 +174,9 @@ public: Binding(); virtual ~Binding() throw(); - // + // property methods: get/set value - // + Model_t getModel() const; /// get XForms model void _setModel( const Model_t& ); /// set XForms model (only called by Model) @@ -277,9 +277,9 @@ public: static IntSequence_t getUnoTunnelID(); static Binding* getBinding( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& ); - // + // class-scoped typedef for easy-to-read UNO interfaces - // + // basic types typedef com::sun::star::uno::Any Any_t; @@ -379,9 +379,9 @@ public: - // + // XValueBinding: - // + public: @@ -403,9 +403,9 @@ public: - // + // XListEntry Source - // + virtual sal_Int32 SAL_CALL getListEntryCount() throw( RuntimeException_t, std::exception ); @@ -427,9 +427,9 @@ public: - // + // XValidator: - // + virtual sal_Bool SAL_CALL isValid( const Any_t& ) @@ -450,10 +450,10 @@ public: RuntimeException_t, std::exception ); - // + // XModifyBroadcaster & friends: // inform listeners about changes in our values - // + public: @@ -468,10 +468,10 @@ public: - // + // XNamed: // get/set name - // + public: @@ -483,10 +483,10 @@ public: - // + // xml::dom::event::XEventListener // receive an event if our node changed - // + virtual void SAL_CALL handleEvent( const XEvent_t& xEvent ) @@ -494,17 +494,17 @@ public: - // + // XUnoTunnel - // + virtual sal_Int64 SAL_CALL getSomething( const IntSequence_t& ) throw( RuntimeException_t, std::exception ); - // + // XCloneable - // + virtual XCloneable_t SAL_CALL createClone() throw( RuntimeException_t, std::exception ); diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index a0c769053b6c..ddaeafa8d8b1 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -274,7 +274,7 @@ namespace } } -// ============================================================================ + void Convert::init() { ADD_ENTRY( this, OUString ); diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index 8f2b6bb5b118..f665cdd04a15 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -32,10 +32,10 @@ #include <algorithm> #include <o3tl/compat_functional.hxx> -//........................................................................ + namespace xforms { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; @@ -51,9 +51,9 @@ namespace xforms using ::com::sun::star::xsd::XDataType; using namespace frm; - //==================================================================== + //= ODataTypeRepository - //==================================================================== + ODataTypeRepository::ODataTypeRepository( ) { @@ -272,8 +272,8 @@ namespace xforms REGISTER_VOID_PROP( XSD_MIN_INCLUSIVE_INT, m_aMinInclusive, ValueType ); REGISTER_VOID_PROP( XSD_MIN_EXCLUSIVE_INT, m_aMinExclusive, ValueType ); } -//........................................................................ + } // namespace xforms -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 1852e951e88b..ea06c34aca41 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -26,15 +26,15 @@ #include <map> -//........................................................................ + namespace xforms { -//........................................................................ + class OXSDDataType; - //==================================================================== + //= ODataTypeRepository - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::xforms::XDataTypeRepository > ODataTypeRepository_Base; class ODataTypeRepository : public ODataTypeRepository_Base @@ -80,9 +80,9 @@ namespace xforms Repository::iterator implLocate( const OUString& _rName, bool _bAllowMiss = false ) SAL_THROW( ( ::com::sun::star::container::NoSuchElementException ) ); }; -//........................................................................ + } // namespace xforms -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_XFORMS_DATATYPEREPOSITORY_HXX diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index ada7062aff45..94e8ed5635eb 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -26,10 +26,10 @@ #include <tools/datetime.hxx> #include <rtl/math.hxx> -//........................................................................ + namespace xforms { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; @@ -56,9 +56,9 @@ namespace xforms using namespace ::frm; U_NAMESPACE_USE - //==================================================================== + //= OXSDDataType - //==================================================================== + OXSDDataType::OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass ) :OXSDDataType_PBase( m_aBHelper ) @@ -329,9 +329,9 @@ namespace xforms OXSDDataType_PBase::removeVetoableChangeListener( PropertyName, aListener ); } - //==================================================================== + //= OValueLimitedType_Base - //==================================================================== + OValueLimitedType_Base::OValueLimitedType_Base( const OUString& _rName, sal_Int16 _nTypeClass ) :OXSDDataType( _rName, _nTypeClass ) ,m_fCachedMaxInclusive( 0 ) @@ -497,9 +497,9 @@ namespace xforms return sInfo.makeStringAndClear(); } - //==================================================================== + //= OStringType - //==================================================================== + OStringType::OStringType( const OUString& _rName, sal_Int16 _nTypeClass ) :OStringType_Base( _rName, _nTypeClass ) @@ -613,9 +613,9 @@ namespace xforms return sInfo.makeStringAndClear(); } - //==================================================================== + //= OBooleanType - //==================================================================== + OBooleanType::OBooleanType( const OUString& _rName ) :OBooleanType_Base( _rName, DataTypeClass::BOOLEAN ) @@ -647,9 +647,9 @@ namespace xforms return ( nReason == 0 ) ? OUString() : getName(); } - //==================================================================== + //= ODecimalType - //==================================================================== + ODecimalType::ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass ) :ODecimalType_Base( _rName, _nTypeClass ) @@ -750,9 +750,9 @@ namespace xforms OSL_VERIFY( _rValue >>= _rDoubleValue ); } - //==================================================================== + //= - //==================================================================== + #define DEFAULT_IMPLEMNENT_SUBTYPE( classname, typeclass ) \ classname::classname( const OUString& _rName ) \ :classname##_Base( _rName, DataTypeClass::typeclass ) \ @@ -766,9 +766,9 @@ namespace xforms } \ - //==================================================================== + //= ODateType - //==================================================================== + DEFAULT_IMPLEMNENT_SUBTYPE( ODateType, DATE ) @@ -808,9 +808,9 @@ namespace xforms _rDoubleValue = aToolsDate.GetDate(); } - //==================================================================== + //= OTimeType - //==================================================================== + DEFAULT_IMPLEMNENT_SUBTYPE( OTimeType, TIME ) @@ -857,9 +857,9 @@ namespace xforms _rDoubleValue = aToolsTime.GetTime(); } - //==================================================================== + //= ODateTimeType - //==================================================================== + DEFAULT_IMPLEMNENT_SUBTYPE( ODateTimeType, DATETIME ) @@ -921,9 +921,9 @@ namespace xforms _rDoubleValue = lcl_normalizeDateTime( aValue ); } - //==================================================================== + //= OShortIntegerType - //==================================================================== + OShortIntegerType::OShortIntegerType( const OUString& _rName, sal_Int16 _nTypeClass ) :OShortIntegerType_Base( _rName, _nTypeClass ) @@ -949,7 +949,7 @@ namespace xforms // Else, we may have a situation where the UI claims an input to be valid // (say "12345678"), while internally, and at submission time, this is cut to // some smaller value. - // + // Additionally, this of course does not care for strings which are no numers ... return true; } @@ -969,15 +969,15 @@ namespace xforms OSL_VERIFY( _rValue >>= nValue ); _rDoubleValue = nValue; } - //==================================================================== - //==================================================================== + + #define DATATYPES_INCLUDED_BY_MASTER_HEADER #include "datatypes_impl.hxx" #undef DATATYPES_INCLUDED_BY_MASTER_HEADER -//........................................................................ + } // namespace xforms -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 82cdd3c67b93..99241d10fff2 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -36,14 +36,14 @@ #include <memory> -//........................................................................ + namespace xforms { -//........................................................................ - //==================================================================== + + //= OXSDDataType - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::xsd::XDataType > OXSDDataType_Base; typedef ::comphelper::OMutexAndBroadcastHelper OXSDDataType_BBase; @@ -135,9 +135,9 @@ namespace xforms virtual void registerProperties(); }; - //==================================================================== + //= helper for deriving from OXSDDataType - //==================================================================== + #define DECLARE_DEFAULT_CLONING( classname ) \ virtual OXSDDataType* createClone( const OUString& _rName ) const; \ virtual void initializeClone( const OXSDDataType& _rCloneSource ); \ @@ -169,9 +169,9 @@ namespace xforms registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, ::com::sun::star::beans::PropertyAttribute::BOUND | ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, \ &memberAny, ::getCppuType( static_cast< type* >( NULL ) ) ); - //==================================================================== + //= OValueLimitedType_Base - //==================================================================== + class OValueLimitedType_Base : public OXSDDataType { protected: @@ -225,9 +225,9 @@ namespace xforms virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const = 0; }; - //==================================================================== + //= OValueLimitedType - //==================================================================== + template < typename VALUE_TYPE > class OValueLimitedType : public OValueLimitedType_Base { @@ -243,9 +243,9 @@ namespace xforms virtual void registerProperties(); }; - //==================================================================== + //= ODerivedDataType - //==================================================================== + /** helper class for implementing interfaces derived from XDataType */ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS = OXSDDataType > @@ -267,9 +267,9 @@ namespace xforms virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); }; - //==================================================================== + //= OBooleanType - //==================================================================== + class OBooleanType; typedef ODerivedDataType< OBooleanType > OBooleanType_Base; class OBooleanType : public OBooleanType_Base @@ -285,9 +285,9 @@ namespace xforms virtual OUString _explainInvalid( sal_uInt16 nReason ); }; - //==================================================================== + //= OStringType - //==================================================================== + class OStringType; typedef ODerivedDataType< OStringType > OStringType_Base; class OStringType :public OStringType_Base @@ -312,9 +312,9 @@ namespace xforms virtual void registerProperties(); }; - //==================================================================== + //= ODecimalType - //==================================================================== + class ODecimalType; typedef ODerivedDataType< ODecimalType, OValueLimitedType< double > > ODecimalType_Base; class ODecimalType : public ODecimalType_Base @@ -342,9 +342,9 @@ namespace xforms using ODecimalType_Base::initializeTypedClone; }; - //==================================================================== + //= - //==================================================================== + #define DEFAULT_DECLARE_SUBTYPE( classname, valuetype ) \ class classname; \ typedef ODerivedDataType< classname, OValueLimitedType< valuetype > > classname##_Base; \ @@ -368,24 +368,24 @@ namespace xforms using classname##_Base::initializeTypedClone; \ }; - //==================================================================== + //= ODateType - //==================================================================== + DEFAULT_DECLARE_SUBTYPE( ODateType, ::com::sun::star::util::Date ) - //==================================================================== + //= OTimeType - //==================================================================== + DEFAULT_DECLARE_SUBTYPE( OTimeType, ::com::sun::star::util::Time ) - //==================================================================== + //= ODateTimeType - //==================================================================== + DEFAULT_DECLARE_SUBTYPE( ODateTimeType, ::com::sun::star::util::DateTime ) - //==================================================================== + //= OShortIntegerType - //==================================================================== + class OShortIntegerType; typedef ODerivedDataType< OShortIntegerType, OValueLimitedType< sal_Int16 > > OShortIntegerType_Base; class OShortIntegerType : public OShortIntegerType_Base @@ -407,9 +407,9 @@ namespace xforms using OShortIntegerType_Base::initializeTypedClone; }; -//........................................................................ + } // namespace xforms -//........................................................................ + #endif // INCLUDED_FORMS_SOURCE_XFORMS_DATATYPES_HXX diff --git a/forms/source/xforms/datatypes_impl.hxx b/forms/source/xforms/datatypes_impl.hxx index c197196a33ba..8f1a54f44c9f 100644 --- a/forms/source/xforms/datatypes_impl.hxx +++ b/forms/source/xforms/datatypes_impl.hxx @@ -21,7 +21,7 @@ #error "not to be included directly!" #endif -//-------------------------------------------------------------------- + template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType( const OUString& _rName, sal_Int16 _nTypeClass ) :SUPERCLASS( _rName, _nTypeClass ) @@ -29,7 +29,7 @@ ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType( const { } -//-------------------------------------------------------------------- + template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > ::cppu::IPropertyArrayHelper* ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::createArrayHelper( ) const { @@ -38,14 +38,14 @@ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > return new ::cppu::OPropertyArrayHelper( aProps ); } -//-------------------------------------------------------------------- + template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ) { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } -//-------------------------------------------------------------------- + template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > ::cppu::IPropertyArrayHelper& SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getInfoHelper() { @@ -59,7 +59,7 @@ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > } -//-------------------------------------------------------------------- + template< typename VALUE_TYPE > OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const OUString& _rName, sal_Int16 _nTypeClass ) :OValueLimitedType_Base( _rName, _nTypeClass ) diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 3d5b1a0b434d..04d4eb8a0da0 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -82,9 +82,9 @@ using namespace xforms; -// + // The Model -// + void Model::ensureAtLeastOneInstance() { @@ -232,9 +232,9 @@ void Model::dbg_assertInvariant() const #endif -// + // MIP management -// + void Model::addMIP( void* pTag, const XNode_t& xNode, const MIP& rMIP ) { @@ -448,9 +448,9 @@ bool Model::isValid() const -// + // implement xforms::XModel -// + OUString Model::getID() throw( RuntimeException, std::exception ) @@ -544,9 +544,9 @@ Model::XDataTypeRepository_t SAL_CALL Model::getDataTypeRepository( ) return mxDataTypes; } -// + // instance management -// + Model::XSet_t Model::getInstances() throw( RuntimeException, std::exception ) @@ -578,9 +578,9 @@ Model::XDocument_t SAL_CALL Model::getDefaultInstance() -// + // bindings management -// + Model::XPropertySet_t SAL_CALL Model::createBinding() throw( RuntimeException, std::exception ) @@ -614,9 +614,9 @@ Model::XSet_t Model::getBindings() -// + // submission management -// + Model::XSubmission_t Model::createSubmission() throw( RuntimeException, std::exception ) @@ -652,9 +652,9 @@ Model::XSet_t Model::getSubmissions() return mxSubmissions; } -// + // implement XPropertySet & friends -// + #define HANDLE_ID 0 #define HANDLE_ForeignSchema 3 diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 9e5ec4284e4a..b3440ec0257c 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -165,9 +165,9 @@ public: #endif - // + // MIP (model item property) management - // + // register MIPs which apply to a given node; only to be called by bindings // (The pTag parameter serves only to be able to remove the MIPs @@ -201,10 +201,10 @@ public: - // + // XModel // implement the xforms::XModel implementation - // + virtual OUString SAL_CALL getID() @@ -310,10 +310,10 @@ public: throw( css::uno::RuntimeException, std::exception ) { PropertySetBase::setPropertyValue(p1, p2); } - // + // XFormsUIHelper1 & friends: // (implementation in model_ui.cxx) - // + /// determine a reasonable control service for a given node /// (based on data type MIP assigned to the node) @@ -415,25 +415,25 @@ public: throw( RuntimeException_t, std::exception ); - // + // XUpdatable - // + public: virtual void SAL_CALL update() throw( RuntimeException_t, std::exception ); - // + // XUnoTunnel - // + public: virtual sal_Int64 SAL_CALL getSomething( const IntSequence_t& ) throw( RuntimeException_t, std::exception ); - // + // XTypeProvider::getImplementationId - // + public: virtual IntSequence_t SAL_CALL getImplementationId() diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index 72fb684228e9..2287f61a96eb 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HELPER_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HELPER_HXX -// + // some helper definitions that must be available for model.cxx and // model_ui.cxx -// + #include "namedcollection.hxx" #include "binding.hxx" @@ -40,9 +40,9 @@ namespace xforms class Model; } -// + // BindingCollection -// + namespace xforms { @@ -76,9 +76,9 @@ protected: -// + // SubmissionCollection -// + class SubmissionCollection : public NamedCollection<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > { @@ -109,9 +109,9 @@ protected: }; -// + // InstanceCollection -// + class InstanceCollection : public Collection<com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> > { @@ -130,9 +130,9 @@ public: }; -// + // helper functions -// + sal_Int32 lcl_findInstance( const InstanceCollection*, const OUString& ); diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 2ee7a2d87098..9c896c3fffeb 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -69,9 +69,9 @@ using namespace com::sun::star::xml::xpath; -// + // implement XFormsUIHelper1 -// + OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) throw( RuntimeException, std::exception ) @@ -956,9 +956,9 @@ void Model::setNodeValue( } -// + // helper functions from model_helper.hxx -// + void xforms::getInstanceData( const Sequence<PropertyValue>& aValues, diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index a812646afcec..4204c094d92c 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -373,9 +373,9 @@ Model* Submission::getModelImpl() const } -// + // Property-Set implementation -// + #define HANDLE_ID 0 #define HANDLE_Bind 1 @@ -645,7 +645,7 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere Reference< XDocument > aDocument = aDocBuilder->newDocument(); Reference< XDocumentFragment > aFragment = aDocument->createDocumentFragment(); - // + if (aObj->getObjectType() == XPathObjectType_XPATH_NODESET) { Reference< XNodeList > aList = aObj->getNodeList(); diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index 9ba4dda422f4..2d453d7a1a9b 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -96,9 +96,9 @@ public: Submission(); virtual ~Submission() throw(); - // + // property methods: get/set value - // + /// get XForms model com::sun::star::uno::Reference<com::sun::star::xforms::XModel> @@ -184,10 +184,10 @@ private: protected: - // + // XPropertySet & friends: // implement abstract methods from PropertySetHelper - // + virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, @@ -202,10 +202,10 @@ private: public: - // + // XNamed: // get/set name - // + virtual OUString SAL_CALL getName() throw( com::sun::star::uno::RuntimeException, std::exception ); @@ -215,18 +215,18 @@ public: - // + // XUnoTunnel - // + virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence<sal_Int8>& ) throw( com::sun::star::uno::RuntimeException, std::exception ); - // + // XSubmission - // + virtual void SAL_CALL submit( ) throw ( com::sun::star::util::VetoException, @@ -244,7 +244,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); - // + // XPropertySet // (need to disambiguate this) diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx index 4eb8025a9d14..f9b58f0477e0 100644 --- a/forms/source/xforms/xmlhelper.cxx +++ b/forms/source/xforms/xmlhelper.cxx @@ -33,9 +33,9 @@ using com::sun::star::xml::dom::DocumentBuilder; using com::sun::star::xml::dom::XDocumentBuilder; -// + // determine valid XML name -// + // character class: // 1: NameStartChar |