[Libreoffice-commits] core.git: forms/qa forms/source
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 12:55:26 PST 2014
forms/qa/integration/forms/CellBinding.java | 12 +-
forms/qa/integration/forms/FormControlTest.java | 2
forms/qa/integration/forms/SingleControlValidation.java | 4
forms/qa/integration/forms/XMLFormSettings.java | 2
forms/source/component/BaseListBox.hxx | 6 -
forms/source/component/Button.cxx | 20 ++--
forms/source/component/Button.hxx | 16 +--
forms/source/component/CheckBox.cxx | 18 +--
forms/source/component/CheckBox.hxx | 14 +-
forms/source/component/Columns.cxx | 8 -
forms/source/component/Columns.hxx | 12 +-
forms/source/component/ComboBox.cxx | 14 +-
forms/source/component/ComboBox.hxx | 16 +--
forms/source/component/Currency.cxx | 16 +--
forms/source/component/Currency.hxx | 16 +--
forms/source/component/DatabaseForm.cxx | 63 ++++++------
forms/source/component/DatabaseForm.hxx | 16 +--
forms/source/component/Date.cxx | 8 -
forms/source/component/Date.hxx | 16 +--
forms/source/component/Edit.cxx | 6 -
forms/source/component/Edit.hxx | 14 +-
forms/source/component/EditBase.cxx | 6 -
forms/source/component/EditBase.hxx | 10 +-
forms/source/component/EventThread.cxx | 8 -
forms/source/component/EventThread.hxx | 8 -
forms/source/component/File.cxx | 8 -
forms/source/component/File.hxx | 12 +-
forms/source/component/Filter.cxx | 18 +--
forms/source/component/Filter.hxx | 12 +-
forms/source/component/FixedText.cxx | 6 -
forms/source/component/FixedText.hxx | 10 +-
forms/source/component/FormattedFieldWrapper.hxx | 10 +-
forms/source/component/FormsCollection.cxx | 8 -
forms/source/component/FormsCollection.hxx | 12 +-
forms/source/component/Grid.hxx | 16 +--
forms/source/component/GroupBox.cxx | 14 +-
forms/source/component/GroupBox.hxx | 14 +-
forms/source/component/GroupManager.hxx | 18 +--
forms/source/component/Hidden.cxx | 6 -
forms/source/component/Hidden.hxx | 10 +-
forms/source/component/ImageButton.hxx | 16 +--
forms/source/component/ImageControl.cxx | 22 ++--
forms/source/component/ImageControl.hxx | 16 +--
forms/source/component/ListBox.cxx | 34 +++---
forms/source/component/ListBox.hxx | 14 +-
forms/source/component/Numeric.cxx | 16 +--
forms/source/component/Numeric.hxx | 16 +--
forms/source/component/Pattern.cxx | 16 +--
forms/source/component/Pattern.hxx | 16 +--
forms/source/component/RadioButton.cxx | 10 +-
forms/source/component/RadioButton.hxx | 14 +-
forms/source/component/Time.cxx | 20 ++--
forms/source/component/Time.hxx | 16 +--
forms/source/component/cachedrowset.cxx | 16 +--
forms/source/component/cachedrowset.hxx | 12 +-
forms/source/component/clickableimage.cxx | 22 ++--
forms/source/component/clickableimage.hxx | 24 ++--
forms/source/component/cloneable.cxx | 12 +-
forms/source/component/entrylisthelper.cxx | 12 +-
forms/source/component/entrylisthelper.hxx | 12 +-
forms/source/component/errorbroadcaster.cxx | 12 +-
forms/source/component/errorbroadcaster.hxx | 12 +-
forms/source/component/formcontrolfont.cxx | 12 +-
forms/source/component/imgprod.hxx | 4
forms/source/component/navigationbar.cxx | 12 +-
forms/source/component/navigationbar.hxx | 12 +-
forms/source/component/propertybaghelper.cxx | 16 +--
forms/source/component/refvaluecomponent.cxx | 12 +-
forms/source/component/refvaluecomponent.hxx | 12 +-
forms/source/component/scrollbar.cxx | 16 +--
forms/source/component/scrollbar.hxx | 12 +-
forms/source/component/spinbutton.cxx | 16 +--
forms/source/component/spinbutton.hxx | 12 +-
forms/source/helper/commanddescriptionprovider.cxx | 12 +-
forms/source/helper/commandimageprovider.cxx | 12 +-
forms/source/helper/controlfeatureinterception.cxx | 12 +-
forms/source/helper/formnavigation.cxx | 16 +--
forms/source/helper/resettable.cxx | 12 +-
forms/source/helper/urltransformer.cxx | 12 +-
forms/source/helper/windowstateguard.cxx | 16 +--
forms/source/inc/FormComponent.hxx | 36 +++----
forms/source/inc/InterfaceContainer.hxx | 18 +--
forms/source/inc/cloneable.hxx | 12 +-
forms/source/inc/commanddescriptionprovider.hxx | 16 +--
forms/source/inc/commandimageprovider.hxx | 16 +--
forms/source/inc/componenttools.hxx | 12 +-
forms/source/inc/controlfeatureinterception.hxx | 12 +-
forms/source/inc/featuredispatcher.hxx | 12 +-
forms/source/inc/formcontrolfont.hxx | 12 +-
forms/source/inc/formnavigation.hxx | 16 +--
forms/source/inc/forms_module.hxx | 24 ++--
forms/source/inc/forms_module_impl.hxx | 22 ++--
forms/source/inc/frm_resource.hrc | 4
forms/source/inc/frm_resource.hxx | 10 +-
forms/source/inc/frm_strings.hxx | 16 +--
forms/source/inc/limitedformats.hxx | 12 +-
forms/source/inc/listenercontainers.hxx | 16 +--
forms/source/inc/property.hrc | 8 -
forms/source/inc/property.hxx | 70 +++++++-------
forms/source/inc/propertybaghelper.hxx | 30 +++---
forms/source/inc/resettable.hxx | 12 +-
forms/source/inc/services.hxx | 24 ++--
forms/source/inc/togglestate.hxx | 8 -
forms/source/inc/urltransformer.hxx | 12 +-
forms/source/inc/windowstateguard.hxx | 12 +-
forms/source/misc/InterfaceContainer.cxx | 24 ++--
forms/source/misc/componenttools.cxx | 14 +-
forms/source/misc/limitedformats.cxx | 16 +--
forms/source/misc/listenercontainers.cxx | 12 +-
forms/source/misc/property.cxx | 10 +-
forms/source/misc/services.cxx | 26 ++---
forms/source/resource/frm_resource.cxx | 10 +-
forms/source/richtext/attributedispatcher.cxx | 12 +-
forms/source/richtext/attributedispatcher.hxx | 12 +-
forms/source/richtext/clipboarddispatcher.cxx | 18 +--
forms/source/richtext/clipboarddispatcher.hxx | 16 +--
forms/source/richtext/featuredispatcher.cxx | 12 +-
forms/source/richtext/featuredispatcher.hxx | 12 +-
forms/source/richtext/parametrizedattributedispatcher.cxx | 12 +-
forms/source/richtext/parametrizedattributedispatcher.hxx | 12 +-
forms/source/richtext/richtextcontrol.cxx | 28 ++---
forms/source/richtext/richtextcontrol.hxx | 16 +--
forms/source/richtext/richtextengine.cxx | 12 +-
forms/source/richtext/richtextengine.hxx | 16 +--
forms/source/richtext/richtextimplcontrol.cxx | 12 +-
forms/source/richtext/richtextimplcontrol.hxx | 12 +-
forms/source/richtext/richtextmodel.cxx | 12 +-
forms/source/richtext/richtextmodel.hxx | 12 +-
forms/source/richtext/richtextunowrapper.cxx | 18 +--
forms/source/richtext/richtextunowrapper.hxx | 20 ++--
forms/source/richtext/richtextvclcontrol.cxx | 12 +-
forms/source/richtext/richtextvclcontrol.hxx | 12 +-
forms/source/richtext/richtextviewport.cxx | 12 +-
forms/source/richtext/richtextviewport.hxx | 12 +-
forms/source/richtext/rtattributehandler.cxx | 48 ++++-----
forms/source/richtext/rtattributehandler.hxx | 52 +++++-----
forms/source/richtext/specialdispatchers.cxx | 24 ++--
forms/source/richtext/specialdispatchers.hxx | 24 ++--
forms/source/richtext/textattributelistener.hxx | 16 +--
forms/source/runtime/formoperations.cxx | 12 +-
forms/source/runtime/formoperations.hxx | 12 +-
forms/source/solar/component/navbarcontrol.cxx | 18 +--
forms/source/solar/component/navbarcontrol.hxx | 16 +--
forms/source/solar/control/navtoolbar.cxx | 24 ++--
forms/source/solar/inc/navtoolbar.hxx | 16 +--
forms/source/xforms/NameContainer.hxx | 16 +--
forms/source/xforms/binding.cxx | 28 ++---
forms/source/xforms/binding.hxx | 40 ++++----
forms/source/xforms/convert.cxx | 2
forms/source/xforms/datatyperepository.cxx | 12 +-
forms/source/xforms/datatyperepository.hxx | 12 +-
forms/source/xforms/datatypes.cxx | 54 +++++-----
forms/source/xforms/datatypes.hxx | 60 ++++++------
forms/source/xforms/datatypes_impl.hxx | 10 +-
forms/source/xforms/model.cxx | 28 ++---
forms/source/xforms/model.hxx | 24 ++--
forms/source/xforms/model_helper.hxx | 20 ++--
forms/source/xforms/model_ui.cxx | 8 -
forms/source/xforms/submission.cxx | 6 -
forms/source/xforms/submission.hxx | 22 ++--
forms/source/xforms/xmlhelper.cxx | 4
161 files changed, 1283 insertions(+), 1284 deletions(-)
New commits:
commit bed18b128ff1329579369b07b2b172e2906649f8
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 18:50:02 2014 +0100
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java
index f7fcb34..d875801 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 f591be4..55ddfbf 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 05b3fa9..235ef29 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 16e766c..cfa9539 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 672594a..3acaed7 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 54b770b..5ca763a 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 4f6891d..bbf97b8 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 95acfd2..7ca360d 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 175d55c..7aaac7a 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 8e934e4..293e53b 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 dcb6617..6da9079 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 02e8112..c32f209 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 6cd9d1d..04a6d37 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 2bac133..c64e07c 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 b8ed78b..632a523 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 7dcec5f..326acec 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 dc9b619..3dc794c 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 739a489..038d909 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 b9a926d..136bb2e 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 61c6161..52d237b 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 b071a1e..ce39311 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 c7b0ceb..d6af511 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 56d5128..884dae7 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 8653402..6a5b0a6 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 88410cc..ff964cb 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 ca68edd..b3ec310 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 9b1d710..56ffc1f 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 f4ae9c9..5117ec3 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 8a20b54..6bc4390 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 5d33629..7dd37d6 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 e7c7896..d543b09 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 f23a3e5..088f480 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 e91d687..3d36318 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 6698ec6..b903ef0 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 90ab975..bcec645 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 7bd8cd0..f68c13f 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 7c97e93..e5e62d0 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 dc0e24b..3095888 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 b5be554..36fe2e2 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 5930412..c0891dd 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 ad114e7..06dd2c4 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 58a47d9..1410ff4 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 b7f3159..0f30e82 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 14685b6..c103c65 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 4cfde90..e3b314f 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 220a584..af42655 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 f6e1cfe..1a3f45f 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 9e06c78..79c5828 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 3ab7f29..0d826b2 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 23e9825..f8022f5 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 470c291..9ce8ea7 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 a78268f..a37559f 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 ceef68d..726a78f 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 37bf3f9..8989c42 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 a765c58..5d2b7b4 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 9a07551..e30ba66 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 83dcc9f..011e9de 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 8bbe178..b701b58 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 32b32e7..757d4ea 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 e08f57d..39b1857 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 ad381cb..1921a46 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 022a8cc..d6a73b9 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 8f71628..f6b9b09 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 24e2407..ae2fb33 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -30,9 +30,9 @@
#include <cppuhelper/weak.hxx>
-// -----------------
+
// - ImageProducer -
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list