[Libreoffice-commits] core.git: forms/Library_frm.mk forms/source
Miklos Vajna
vmiklos at suse.cz
Tue Apr 23 02:58:53 PDT 2013
forms/Library_frm.mk | 1
forms/source/component/Button.cxx | 2
forms/source/component/CheckBox.cxx | 2
forms/source/component/ComboBox.cxx | 2
forms/source/component/Currency.cxx | 2
forms/source/component/DatabaseForm.cxx | 4
forms/source/component/Date.cxx | 2
forms/source/component/Edit.cxx | 2
forms/source/component/File.cxx | 2
forms/source/component/FixedText.cxx | 2
forms/source/component/FormattedFieldWrapper.cxx | 2
forms/source/component/FormsCollection.cxx | 2
forms/source/component/Grid.cxx | 2
forms/source/component/GroupBox.cxx | 2
forms/source/component/Hidden.cxx | 2
forms/source/component/ImageButton.cxx | 2
forms/source/component/ImageControl.cxx | 2
forms/source/component/ListBox.cxx | 2
forms/source/component/Numeric.cxx | 2
forms/source/component/Pattern.cxx | 2
forms/source/component/RadioButton.cxx | 2
forms/source/component/Time.cxx | 2
forms/source/component/navigationbar.cxx | 2
forms/source/component/scrollbar.cxx | 2
forms/source/component/spinbutton.cxx | 2
forms/source/helper/formnavigation.cxx | 38 -
forms/source/inc/frm_strings.hxx | 514 +++++++++++------------
forms/source/inc/services.hxx | 330 +++++++-------
forms/source/misc/frm_strings.cxx | 25 -
forms/source/misc/services.cxx | 28 -
forms/source/richtext/richtextmodel.cxx | 2
31 files changed, 472 insertions(+), 516 deletions(-)
New commits:
commit 8ed6f1c2bf1f3ffe7da79a5a8765de7b3ec8523f
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Tue Apr 23 11:48:24 2013 +0200
forms: FORMS_CONSTASCII_STRING is no longer needed
Change-Id: I2b666f0e48db4c97cc4c641480a82681f5057ac2
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index d751753..5dc85a9 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -103,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/helper/windowstateguard \
forms/source/misc/componenttools \
forms/source/misc/frm_module \
- forms/source/misc/frm_strings \
forms/source/misc/ids \
forms/source/misc/InterfaceContainer \
forms/source/misc/limitedformats \
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index d3db076..b7c759a 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -137,7 +137,7 @@ StringSequence OButtonModel::getSupportedServiceNames() throw()
//------------------------------------------------------------------------------
OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index dd24d44..3c79725 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -141,7 +141,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
//------------------------------------------------------------------------------
OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException)
{
- return FRM_COMPONENT_CHECKBOX; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_CHECKBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 8461365..b28d935 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -324,7 +324,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
//------------------------------------------------------------------------------
OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException)
{
- return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_COMBOBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index fecd337..c47f18d 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -198,7 +198,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
//------------------------------------------------------------------------------
OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 13bc624..0a49397 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2357,7 +2357,7 @@ void ODatabaseForm::invlidateParameters()
//------------------------------------------------------------------------------
void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException )
{
- if ((evt.PropertyName.equalsAsciiL(PROPERTY_ACTIVE_CONNECTION.ascii, PROPERTY_ACTIVE_CONNECTION.length)) && !m_bForwardingConnection)
+ if (evt.PropertyName == PROPERTY_ACTIVE_CONNECTION && !m_bForwardingConnection)
{
// the rowset changed its active connection itself (without interaction from our side), so
// we need to fire this event, too
@@ -3862,7 +3862,7 @@ const sal_uInt16 DONTAPPLYFILTER = 0x0002;
//------------------------------------------------------------------------------
OUString ODatabaseForm::getServiceName() throw( RuntimeException )
{
- return FRM_COMPONENT_FORM; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_FORM); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 7ebc20d..2ac56ab 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -162,7 +162,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
//------------------------------------------------------------------------------
OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility !
}
// XPropertySet
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index e3e3b76..e1556f3 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -340,7 +340,7 @@ void OEditModel::disposing()
//------------------------------------------------------------------------------
OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_EDIT; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_EDIT); // old (non-sun) name for compatibility !
}
// XServiceInfo
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 43798c4..fa580bc 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -200,7 +200,7 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps )
//------------------------------------------------------------------------------
OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_FILECONTROL); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index f45efc1..32738f1 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -93,7 +93,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre
//------------------------------------------------------------------------------
OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException)
{
- return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 2a21dec..db2af5c 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -189,7 +189,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException)
{
// return the old compatibility name for an EditModel
- return FRM_COMPONENT_EDIT;
+ return OUString(FRM_COMPONENT_EDIT);
}
//------------------------------------------------------------------
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 7a37b4e..f1dfbd6 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -46,7 +46,7 @@ InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServ
//------------------------------------------------------------------------------
OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException)
{
- return FRM_SUN_FORMS_COLLECTION;
+ return OUString(FRM_SUN_FORMS_COLLECTION);
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index be0bdbf..cfa4d1b 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -870,7 +870,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO
//------------------------------------------------------------------------------
OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_GRID; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_GRID); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 0779522..c97a5e7 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -97,7 +97,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
//------------------------------------------------------------------------------
OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException)
{
- return FRM_COMPONENT_GROUPBOX; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_GROUPBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 4271482..223c081 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -139,7 +139,7 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su
//------------------------------------------------------------------------------
OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException)
{
- return FRM_COMPONENT_HIDDEN; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_HIDDEN); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 7fa744c..e5f66ef 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -104,7 +104,7 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
//------------------------------------------------------------------------------
OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_IMAGEBUTTON); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 1991e32..9816599 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -359,7 +359,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
//------------------------------------------------------------------------------
OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_IMAGECONTROL); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 204d874..f26a574 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -516,7 +516,7 @@ namespace frm
//------------------------------------------------------------------------------
OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException)
{
- return FRM_COMPONENT_LISTBOX; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_LISTBOX); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 6799911..ac4542e 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -152,7 +152,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
//------------------------------------------------------------------------------
OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_NUMERICFIELD; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_NUMERICFIELD); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 8a6af8a..67335d0 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -143,7 +143,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
//------------------------------------------------------------------------------
OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_PATTERNFIELD; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_PATTERNFIELD); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 439462a..b0bcdfb 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -289,7 +289,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
//------------------------------------------------------------------------------
OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException)
{
- return FRM_COMPONENT_RADIOBUTTON; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_RADIOBUTTON); // old (non-sun) name for compatibility !
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 420a317..512b3f0 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -159,7 +159,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel )
//------------------------------------------------------------------------------
OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility !
+ return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility !
}
// XPropertySet
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 3d15e13..2138caf 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -203,7 +203,7 @@ namespace frm
//------------------------------------------------------------------
OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException )
{
- return FRM_SUN_COMPONENT_NAVTOOLBAR;
+ return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
}
//------------------------------------------------------------------
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 26035bd..fbab6e7 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -240,7 +240,7 @@ namespace frm
//--------------------------------------------------------------------
OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException )
{
- return FRM_SUN_COMPONENT_SCROLLBAR;
+ return OUString(FRM_SUN_COMPONENT_SCROLLBAR);
}
//--------------------------------------------------------------------
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index ced15e1..1faa874 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -196,7 +196,7 @@ namespace frm
//--------------------------------------------------------------------
OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException )
{
- return FRM_SUN_COMPONENT_SPINBUTTON;
+ return OUString(FRM_SUN_COMPONENT_SPINBUTTON);
}
//--------------------------------------------------------------------
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 460b10a..dc3004f 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -418,25 +418,25 @@ namespace frm
{
static const FeatureURL s_aFeatureURLs[] =
{
- FeatureURL( FormFeature::MoveAbsolute, URL_FORM_POSITION.ascii ),
- FeatureURL( FormFeature::TotalRecords, URL_FORM_RECORDCOUNT.ascii ),
- FeatureURL( FormFeature::MoveToFirst, URL_RECORD_FIRST.ascii ),
- FeatureURL( FormFeature::MoveToPrevious, URL_RECORD_PREV.ascii ),
- FeatureURL( FormFeature::MoveToNext, URL_RECORD_NEXT.ascii ),
- FeatureURL( FormFeature::MoveToLast, URL_RECORD_LAST.ascii ),
- FeatureURL( FormFeature::SaveRecordChanges, URL_RECORD_SAVE.ascii ),
- FeatureURL( FormFeature::UndoRecordChanges, URL_RECORD_UNDO.ascii ),
- FeatureURL( FormFeature::MoveToInsertRow, URL_RECORD_NEW.ascii ),
- FeatureURL( FormFeature::DeleteRecord, URL_RECORD_DELETE.ascii ),
- FeatureURL( FormFeature::ReloadForm, URL_FORM_REFRESH.ascii ),
- FeatureURL( FormFeature::RefreshCurrentControl, URL_FORM_REFRESH_CURRENT_CONTROL.ascii ),
- FeatureURL( FormFeature::SortAscending, URL_FORM_SORT_UP.ascii ),
- FeatureURL( FormFeature::SortDescending, URL_FORM_SORT_DOWN.ascii ),
- FeatureURL( FormFeature::InteractiveSort, URL_FORM_SORT.ascii ),
- FeatureURL( FormFeature::AutoFilter, URL_FORM_AUTO_FILTER.ascii ),
- FeatureURL( FormFeature::InteractiveFilter, URL_FORM_FILTER.ascii ),
- FeatureURL( FormFeature::ToggleApplyFilter, URL_FORM_APPLY_FILTER.ascii ),
- FeatureURL( FormFeature::RemoveFilterAndSort, URL_FORM_REMOVE_FILTER.ascii ),
+ FeatureURL( FormFeature::MoveAbsolute, URL_FORM_POSITION ),
+ FeatureURL( FormFeature::TotalRecords, URL_FORM_RECORDCOUNT ),
+ FeatureURL( FormFeature::MoveToFirst, URL_RECORD_FIRST ),
+ FeatureURL( FormFeature::MoveToPrevious, URL_RECORD_PREV ),
+ FeatureURL( FormFeature::MoveToNext, URL_RECORD_NEXT ),
+ FeatureURL( FormFeature::MoveToLast, URL_RECORD_LAST ),
+ FeatureURL( FormFeature::SaveRecordChanges, URL_RECORD_SAVE ),
+ FeatureURL( FormFeature::UndoRecordChanges, URL_RECORD_UNDO ),
+ FeatureURL( FormFeature::MoveToInsertRow, URL_RECORD_NEW ),
+ FeatureURL( FormFeature::DeleteRecord, URL_RECORD_DELETE ),
+ FeatureURL( FormFeature::ReloadForm, URL_FORM_REFRESH ),
+ FeatureURL( FormFeature::RefreshCurrentControl, URL_FORM_REFRESH_CURRENT_CONTROL ),
+ FeatureURL( FormFeature::SortAscending, URL_FORM_SORT_UP ),
+ FeatureURL( FormFeature::SortDescending, URL_FORM_SORT_DOWN ),
+ FeatureURL( FormFeature::InteractiveSort, URL_FORM_SORT ),
+ FeatureURL( FormFeature::AutoFilter, URL_FORM_AUTO_FILTER ),
+ FeatureURL( FormFeature::InteractiveFilter, URL_FORM_FILTER ),
+ FeatureURL( FormFeature::ToggleApplyFilter, URL_FORM_APPLY_FILTER ),
+ FeatureURL( FormFeature::RemoveFilterAndSort, URL_FORM_REMOVE_FILTER ),
FeatureURL( 0, NULL )
};
return s_aFeatureURLs;
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 05bc7ce..7de3f24 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -27,288 +27,270 @@
//..............................................................................
namespace frm
{
- using comphelper::string::ConstAsciiString;
-
- #ifndef FORMS_IMPLEMENT_STRINGS
- #define FORMS_CONSTASCII_STRING( ident, string ) \
- extern const ConstAsciiString ident
- #else
- #define FORMS_CONSTASCII_STRING( ident, string ) \
- extern const ConstAsciiString ident = {RTL_CONSTASCII_STRINGPARAM(string)}
- #endif
-
-//..............................................................................
-} // namespace frm
-//..............................................................................
-
-//..............................................................................
-namespace frm
-{
//..............................................................................
//--------------------------------------------------------------------------
//- properties
//--------------------------------------------------------------------------
- FORMS_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex" );
- FORMS_CONSTASCII_STRING( PROPERTY_TAG, "Tag" );
- FORMS_CONSTASCII_STRING( PROPERTY_NAME, "Name" );
- FORMS_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName" );
- FORMS_CONSTASCII_STRING( PROPERTY_CLASSID, "ClassId" );
- FORMS_CONSTASCII_STRING( PROPERTY_FETCHSIZE, "FetchSize" );
- FORMS_CONSTASCII_STRING( PROPERTY_VALUE, "Value" );
- FORMS_CONSTASCII_STRING( PROPERTY_TEXT, "Text" );
- FORMS_CONSTASCII_STRING( PROPERTY_LABEL, "Label" );
- FORMS_CONSTASCII_STRING( PROPERTY_CANINSERT, "CanInsert" );
- FORMS_CONSTASCII_STRING( PROPERTY_CANUPDATE, "CanUpdate" );
- FORMS_CONSTASCII_STRING( PROPERTY_CANDELETE, "CanDelete" );
- FORMS_CONSTASCII_STRING( PROPERTY_NAVIGATION, "NavigationBarMode" );
- FORMS_CONSTASCII_STRING( PROPERTY_HASNAVIGATION, "HasNavigationBar" );
- FORMS_CONSTASCII_STRING( PROPERTY_CYCLE, "Cycle" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE, "DataField" );
- FORMS_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
- FORMS_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
- FORMS_CONSTASCII_STRING( PROPERTY_READONLY, "ReadOnly" );
- FORMS_CONSTASCII_STRING( PROPERTY_RELEVANT, "Relevant" );
- FORMS_CONSTASCII_STRING( PROPERTY_ISREADONLY, "IsReadOnly" );
- FORMS_CONSTASCII_STRING( PROPERTY_FILTER, "Filter" );
- FORMS_CONSTASCII_STRING( PROPERTY_WIDTH, "Width" );
- FORMS_CONSTASCII_STRING( PROPERTY_SEARCHABLE, "IsSearchable" );
- FORMS_CONSTASCII_STRING( PROPERTY_MULTILINE, "MultiLine" );
- FORMS_CONSTASCII_STRING( PROPERTY_TARGET_URL, "TargetURL" );
- FORMS_CONSTASCII_STRING( PROPERTY_TARGET_FRAME, "TargetFrame" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULTCONTROL, "DefaultControl" );
- FORMS_CONSTASCII_STRING( PROPERTY_MAXTEXTLEN, "MaxTextLen" );
- FORMS_CONSTASCII_STRING( PROPERTY_EDITMASK, "EditMask" );
- FORMS_CONSTASCII_STRING( PROPERTY_SIZE, "Size" );
- FORMS_CONSTASCII_STRING( PROPERTY_SPIN, "Spin" );
- FORMS_CONSTASCII_STRING( PROPERTY_DATE, "Date" );
- FORMS_CONSTASCII_STRING( PROPERTY_TIME, "Time" );
- FORMS_CONSTASCII_STRING( PROPERTY_STATE, "State" );
- FORMS_CONSTASCII_STRING( PROPERTY_TRISTATE, "TriState" );
- FORMS_CONSTASCII_STRING( PROPERTY_HIDDEN_VALUE, "HiddenValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_BUTTONTYPE, "ButtonType" );
- FORMS_CONSTASCII_STRING( PROPERTY_STRINGITEMLIST, "StringItemList" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_TEXT, "DefaultText" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_STATE, "DefaultState" );
- FORMS_CONSTASCII_STRING( PROPERTY_FORMATKEY, "FormatKey" );
- FORMS_CONSTASCII_STRING( PROPERTY_FORMATSSUPPLIER, "FormatsSupplier" );
- FORMS_CONSTASCII_STRING( PROPERTY_SUBMIT_ACTION, "SubmitAction" );
- FORMS_CONSTASCII_STRING( PROPERTY_SUBMIT_TARGET, "SubmitTarget" );
- FORMS_CONSTASCII_STRING( PROPERTY_SUBMIT_METHOD, "SubmitMethod" );
- FORMS_CONSTASCII_STRING( PROPERTY_SUBMIT_ENCODING, "SubmitEncoding" );
- FORMS_CONSTASCII_STRING( PROPERTY_IMAGE_URL, "ImageURL" );
- FORMS_CONSTASCII_STRING( PROPERTY_GRAPHIC, "Graphic" );
- FORMS_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION, "ImagePosition" );
- FORMS_CONSTASCII_STRING( PROPERTY_EMPTY_IS_NULL, "ConvertEmptyToNull" );
- FORMS_CONSTASCII_STRING( PROPERTY_LISTSOURCETYPE, "ListSourceType" );
- FORMS_CONSTASCII_STRING( PROPERTY_LISTSOURCE, "ListSource" );
- FORMS_CONSTASCII_STRING( PROPERTY_SELECT_SEQ, "SelectedItems" );
- FORMS_CONSTASCII_STRING( PROPERTY_VALUE_SEQ, "ValueItemList" );
- FORMS_CONSTASCII_STRING( PROPERTY_SELECT_VALUE_SEQ, "SelectedValues" );
- FORMS_CONSTASCII_STRING( PROPERTY_SELECT_VALUE, "SelectedValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_SELECT_SEQ, "DefaultSelection" );
- FORMS_CONSTASCII_STRING( PROPERTY_MULTISELECTION, "MultiSelection" );
- FORMS_CONSTASCII_STRING( PROPERTY_ALIGN, "Align" );
- FORMS_CONSTASCII_STRING( PROPERTY_VERTICAL_ALIGN, "VerticalAlign" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_DATE, "DefaultDate" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_TIME, "DefaultTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_VALUE, "DefaultValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_DECIMAL_ACCURACY, "DecimalAccuracy" );
- FORMS_CONSTASCII_STRING( PROPERTY_CURSORSOURCE, "DataSelection" );
- FORMS_CONSTASCII_STRING( PROPERTY_CURSORSOURCETYPE, "DataSelectionType" );
- FORMS_CONSTASCII_STRING( PROPERTY_FIELDTYPE, "Type" );
- FORMS_CONSTASCII_STRING( PROPERTY_DECIMALS, "Decimals" );
- FORMS_CONSTASCII_STRING( PROPERTY_REFVALUE, "RefValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_UNCHECKED_REFVALUE, "SecondaryRefValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_VALUEMIN, "ValueMin" );
- FORMS_CONSTASCII_STRING( PROPERTY_VALUEMAX, "ValueMax" );
- FORMS_CONSTASCII_STRING( PROPERTY_STRICTFORMAT, "StrictFormat" );
- FORMS_CONSTASCII_STRING( PROPERTY_ALLOWADDITIONS, "AllowInserts" );
- FORMS_CONSTASCII_STRING( PROPERTY_ALLOWEDITS, "AllowUpdates" );
- FORMS_CONSTASCII_STRING( PROPERTY_ALLOWDELETIONS, "AllowDeletes" );
- FORMS_CONSTASCII_STRING( PROPERTY_MASTERFIELDS, "MasterFields" );
- FORMS_CONSTASCII_STRING( PROPERTY_ISPASSTHROUGH, "IsPassThrough" );
- FORMS_CONSTASCII_STRING( PROPERTY_QUERY, "Query" );
- FORMS_CONSTASCII_STRING( PROPERTY_LITERALMASK, "LiteralMask" );
- FORMS_CONSTASCII_STRING( PROPERTY_VALUESTEP, "ValueStep" );
- FORMS_CONSTASCII_STRING( PROPERTY_SHOWTHOUSANDSEP, "ShowThousandsSeparator" );
- FORMS_CONSTASCII_STRING( PROPERTY_CURRENCYSYMBOL, "CurrencySymbol" );
- FORMS_CONSTASCII_STRING( PROPERTY_DATEFORMAT, "DateFormat" );
- FORMS_CONSTASCII_STRING( PROPERTY_DATEMIN, "DateMin" );
- FORMS_CONSTASCII_STRING( PROPERTY_DATEMAX, "DateMax" );
- FORMS_CONSTASCII_STRING( PROPERTY_DATE_SHOW_CENTURY, "DateShowCentury" );
- FORMS_CONSTASCII_STRING( PROPERTY_TIMEFORMAT, "TimeFormat" );
- FORMS_CONSTASCII_STRING( PROPERTY_TIMEMIN, "TimeMin" );
- FORMS_CONSTASCII_STRING( PROPERTY_TIMEMAX, "TimeMax" );
- FORMS_CONSTASCII_STRING( PROPERTY_LINECOUNT, "LineCount" );
- FORMS_CONSTASCII_STRING( PROPERTY_BOUNDCOLUMN, "BoundColumn" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT, "FontDescriptor" );
- FORMS_CONSTASCII_STRING( PROPERTY_FILLCOLOR, "FillColor" );
- FORMS_CONSTASCII_STRING( PROPERTY_LINECOLOR, "LineColor" );
- FORMS_CONSTASCII_STRING( PROPERTY_DROPDOWN, "Dropdown" );
- FORMS_CONSTASCII_STRING( PROPERTY_HSCROLL, "HScroll" );
- FORMS_CONSTASCII_STRING( PROPERTY_VSCROLL, "VScroll" );
- FORMS_CONSTASCII_STRING( PROPERTY_TABSTOP, "Tabstop" );
- FORMS_CONSTASCII_STRING( PROPERTY_AUTOCOMPLETE, "Autocomplete" );
- FORMS_CONSTASCII_STRING( PROPERTY_HARDLINEBREAKS, "HardLineBreaks" );
- FORMS_CONSTASCII_STRING( PROPERTY_PRINTABLE, "Printable" );
- FORMS_CONSTASCII_STRING( PROPERTY_ECHO_CHAR, "EchoChar" );
- FORMS_CONSTASCII_STRING( PROPERTY_ROWHEIGHT, "RowHeight" );
- FORMS_CONSTASCII_STRING( PROPERTY_HELPTEXT, "HelpText" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_NAME, "FontName" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_STYLENAME, "FontStyleName" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_FAMILY, "FontFamily" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_CHARSET, "FontCharset" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_HEIGHT, "FontHeight" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_WEIGHT, "FontWeight" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_SLANT, "FontSlant" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_UNDERLINE, "FontUnderline" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_WORDLINEMODE, "FontWordLineMode" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_STRIKEOUT, "FontStrikeout" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONTEMPHASISMARK, "FontEmphasisMark" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONTRELIEF, "FontRelief" );
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_CHARWIDTH, "FontCharWidth");
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_KERNING, "FontKerning");
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_ORIENTATION, "FontOrientation");
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_PITCH, "FontPitch");
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_TYPE, "FontType");
- FORMS_CONSTASCII_STRING( PROPERTY_FONT_WIDTH, "FontWidth");
- FORMS_CONSTASCII_STRING( PROPERTY_HELPURL, "HelpURL" );
- FORMS_CONSTASCII_STRING( PROPERTY_RECORDMARKER, "HasRecordMarker" );
- FORMS_CONSTASCII_STRING( PROPERTY_BOUNDFIELD, "BoundField" );
- FORMS_CONSTASCII_STRING( PROPERTY_INPUT_REQUIRED, "InputRequired" );
- FORMS_CONSTASCII_STRING( PROPERTY_TREATASNUMERIC, "TreatAsNumber" );
- FORMS_CONSTASCII_STRING( PROPERTY_EFFECTIVE_VALUE, "EffectiveValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_EFFECTIVE_DEFAULT, "EffectiveDefault" );
- FORMS_CONSTASCII_STRING( PROPERTY_EFFECTIVE_MIN, "EffectiveMin" );
- FORMS_CONSTASCII_STRING( PROPERTY_EFFECTIVE_MAX, "EffectiveMax" );
- FORMS_CONSTASCII_STRING( PROPERTY_HIDDEN, "Hidden" );
- FORMS_CONSTASCII_STRING( PROPERTY_FILTERPROPOSAL, "UseFilterValueProposal" );
- FORMS_CONSTASCII_STRING( PROPERTY_FIELDSOURCE, "FieldSource" );
- FORMS_CONSTASCII_STRING( PROPERTY_TABLENAME, "TableName" );
- FORMS_CONSTASCII_STRING( PROPERTY_ISFILTERAPPLIED, "IsFilterApplied" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTROLLABEL, "LabelControl" );
- FORMS_CONSTASCII_STRING( PROPERTY_CURRSYM_POSITION, "PrependCurrencySymbol" );
- FORMS_CONSTASCII_STRING( PROPERTY_CURSORCOLOR, "CursorColor" );
- FORMS_CONSTASCII_STRING( PROPERTY_ALWAYSSHOWCURSOR, "AlwaysShowCursor" );
- FORMS_CONSTASCII_STRING( PROPERTY_DISPLAYSYNCHRON, "DisplayIsSynchron" );
- FORMS_CONSTASCII_STRING( PROPERTY_TEXTCOLOR, "TextColor" );
- FORMS_CONSTASCII_STRING( PROPERTY_DELAY, "RepeatDelay" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_SCROLL_VALUE, "DefaultScrollValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_SCROLL_VALUE, "ScrollValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_DEFAULT_SPIN_VALUE, "DefaultSpinValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_SPIN_VALUE, "SpinValue" );
- FORMS_CONSTASCII_STRING( PROPERTY_REFERENCE_DEVICE, "ReferenceDevice" );
- FORMS_CONSTASCII_STRING( PROPERTY_ISMODIFIED, "IsModified" );
- FORMS_CONSTASCII_STRING( PROPERTY_ISNEW, "IsNew" );
- FORMS_CONSTASCII_STRING( PROPERTY_PRIVILEGES, "Privileges" );
- FORMS_CONSTASCII_STRING( PROPERTY_COMMAND, "Command" );
- FORMS_CONSTASCII_STRING( PROPERTY_COMMANDTYPE, "CommandType" );
- FORMS_CONSTASCII_STRING( PROPERTY_RESULTSET_CONCURRENCY, "ResultSetConcurrency" );
- FORMS_CONSTASCII_STRING( PROPERTY_INSERTONLY, "IgnoreResult" );
- FORMS_CONSTASCII_STRING( PROPERTY_RESULTSET_TYPE, "ResultSetType" );
- FORMS_CONSTASCII_STRING( PROPERTY_ESCAPE_PROCESSING, "EscapeProcessing" );
- FORMS_CONSTASCII_STRING( PROPERTY_APPLYFILTER, "ApplyFilter" );
- FORMS_CONSTASCII_STRING( PROPERTY_ROWCOUNT, "RowCount" );
- FORMS_CONSTASCII_STRING( PROPERTY_ROWCOUNTFINAL, "IsRowCountFinal" );
+ #define PROPERTY_TABINDEX "TabIndex"
+ #define PROPERTY_TAG "Tag"
+ #define PROPERTY_NAME "Name"
+ #define PROPERTY_GROUP_NAME "GroupName"
+ #define PROPERTY_CLASSID "ClassId"
+ #define PROPERTY_FETCHSIZE "FetchSize"
+ #define PROPERTY_VALUE "Value"
+ #define PROPERTY_TEXT "Text"
+ #define PROPERTY_LABEL "Label"
+ #define PROPERTY_CANINSERT "CanInsert"
+ #define PROPERTY_CANUPDATE "CanUpdate"
+ #define PROPERTY_CANDELETE "CanDelete"
+ #define PROPERTY_NAVIGATION "NavigationBarMode"
+ #define PROPERTY_HASNAVIGATION "HasNavigationBar"
+ #define PROPERTY_CYCLE "Cycle"
+ #define PROPERTY_CONTROLSOURCE "DataField"
+ #define PROPERTY_ENABLED "Enabled"
+ #define PROPERTY_ENABLEVISIBLE "EnableVisible"
+ #define PROPERTY_READONLY "ReadOnly"
+ #define PROPERTY_RELEVANT "Relevant"
+ #define PROPERTY_ISREADONLY "IsReadOnly"
+ #define PROPERTY_FILTER "Filter"
+ #define PROPERTY_WIDTH "Width"
+ #define PROPERTY_SEARCHABLE "IsSearchable"
+ #define PROPERTY_MULTILINE "MultiLine"
+ #define PROPERTY_TARGET_URL "TargetURL"
+ #define PROPERTY_TARGET_FRAME "TargetFrame"
+ #define PROPERTY_DEFAULTCONTROL "DefaultControl"
+ #define PROPERTY_MAXTEXTLEN "MaxTextLen"
+ #define PROPERTY_EDITMASK "EditMask"
+ #define PROPERTY_SIZE "Size"
+ #define PROPERTY_SPIN "Spin"
+ #define PROPERTY_DATE "Date"
+ #define PROPERTY_TIME "Time"
+ #define PROPERTY_STATE "State"
+ #define PROPERTY_TRISTATE "TriState"
+ #define PROPERTY_HIDDEN_VALUE "HiddenValue"
+ #define PROPERTY_BUTTONTYPE "ButtonType"
+ #define PROPERTY_STRINGITEMLIST "StringItemList"
+ #define PROPERTY_DEFAULT_TEXT "DefaultText"
+ #define PROPERTY_DEFAULT_STATE "DefaultState"
+ #define PROPERTY_FORMATKEY "FormatKey"
+ #define PROPERTY_FORMATSSUPPLIER "FormatsSupplier"
+ #define PROPERTY_SUBMIT_ACTION "SubmitAction"
+ #define PROPERTY_SUBMIT_TARGET "SubmitTarget"
+ #define PROPERTY_SUBMIT_METHOD "SubmitMethod"
+ #define PROPERTY_SUBMIT_ENCODING "SubmitEncoding"
+ #define PROPERTY_IMAGE_URL "ImageURL"
+ #define PROPERTY_GRAPHIC "Graphic"
+ #define PROPERTY_IMAGE_POSITION "ImagePosition"
+ #define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull"
+ #define PROPERTY_LISTSOURCETYPE "ListSourceType"
+ #define PROPERTY_LISTSOURCE "ListSource"
+ #define PROPERTY_SELECT_SEQ "SelectedItems"
+ #define PROPERTY_VALUE_SEQ "ValueItemList"
+ #define PROPERTY_SELECT_VALUE_SEQ "SelectedValues"
+ #define PROPERTY_SELECT_VALUE "SelectedValue"
+ #define PROPERTY_DEFAULT_SELECT_SEQ "DefaultSelection"
+ #define PROPERTY_MULTISELECTION "MultiSelection"
+ #define PROPERTY_ALIGN "Align"
+ #define PROPERTY_VERTICAL_ALIGN "VerticalAlign"
+ #define PROPERTY_DEFAULT_DATE "DefaultDate"
+ #define PROPERTY_DEFAULT_TIME "DefaultTime"
+ #define PROPERTY_DEFAULT_VALUE "DefaultValue"
+ #define PROPERTY_DECIMAL_ACCURACY "DecimalAccuracy"
+ #define PROPERTY_CURSORSOURCE "DataSelection"
+ #define PROPERTY_CURSORSOURCETYPE "DataSelectionType"
+ #define PROPERTY_FIELDTYPE "Type"
+ #define PROPERTY_DECIMALS "Decimals"
+ #define PROPERTY_REFVALUE "RefValue"
+ #define PROPERTY_UNCHECKED_REFVALUE "SecondaryRefValue"
+ #define PROPERTY_VALUEMIN "ValueMin"
+ #define PROPERTY_VALUEMAX "ValueMax"
+ #define PROPERTY_STRICTFORMAT "StrictFormat"
+ #define PROPERTY_ALLOWADDITIONS "AllowInserts"
+ #define PROPERTY_ALLOWEDITS "AllowUpdates"
+ #define PROPERTY_ALLOWDELETIONS "AllowDeletes"
+ #define PROPERTY_MASTERFIELDS "MasterFields"
+ #define PROPERTY_ISPASSTHROUGH "IsPassThrough"
+ #define PROPERTY_QUERY "Query"
+ #define PROPERTY_LITERALMASK "LiteralMask"
+ #define PROPERTY_VALUESTEP "ValueStep"
+ #define PROPERTY_SHOWTHOUSANDSEP "ShowThousandsSeparator"
+ #define PROPERTY_CURRENCYSYMBOL "CurrencySymbol"
+ #define PROPERTY_DATEFORMAT "DateFormat"
+ #define PROPERTY_DATEMIN "DateMin"
+ #define PROPERTY_DATEMAX "DateMax"
+ #define PROPERTY_DATE_SHOW_CENTURY "DateShowCentury"
+ #define PROPERTY_TIMEFORMAT "TimeFormat"
+ #define PROPERTY_TIMEMIN "TimeMin"
+ #define PROPERTY_TIMEMAX "TimeMax"
+ #define PROPERTY_LINECOUNT "LineCount"
+ #define PROPERTY_BOUNDCOLUMN "BoundColumn"
+ #define PROPERTY_FONT "FontDescriptor"
+ #define PROPERTY_FILLCOLOR "FillColor"
+ #define PROPERTY_LINECOLOR "LineColor"
+ #define PROPERTY_DROPDOWN "Dropdown"
+ #define PROPERTY_HSCROLL "HScroll"
+ #define PROPERTY_VSCROLL "VScroll"
+ #define PROPERTY_TABSTOP "Tabstop"
+ #define PROPERTY_AUTOCOMPLETE "Autocomplete"
+ #define PROPERTY_HARDLINEBREAKS "HardLineBreaks"
+ #define PROPERTY_PRINTABLE "Printable"
+ #define PROPERTY_ECHO_CHAR "EchoChar"
+ #define PROPERTY_ROWHEIGHT "RowHeight"
+ #define PROPERTY_HELPTEXT "HelpText"
+ #define PROPERTY_FONT_NAME "FontName"
+ #define PROPERTY_FONT_STYLENAME "FontStyleName"
+ #define PROPERTY_FONT_FAMILY "FontFamily"
+ #define PROPERTY_FONT_CHARSET "FontCharset"
+ #define PROPERTY_FONT_HEIGHT "FontHeight"
+ #define PROPERTY_FONT_WEIGHT "FontWeight"
+ #define PROPERTY_FONT_SLANT "FontSlant"
+ #define PROPERTY_FONT_UNDERLINE "FontUnderline"
+ #define PROPERTY_FONT_WORDLINEMODE "FontWordLineMode"
+ #define PROPERTY_FONT_STRIKEOUT "FontStrikeout"
+ #define PROPERTY_FONTEMPHASISMARK "FontEmphasisMark"
+ #define PROPERTY_FONTRELIEF "FontRelief"
+ #define PROPERTY_FONT_CHARWIDTH "FontCharWidth"
+ #define PROPERTY_FONT_KERNING "FontKerning"
+ #define PROPERTY_FONT_ORIENTATION "FontOrientation"
+ #define PROPERTY_FONT_PITCH "FontPitch"
+ #define PROPERTY_FONT_TYPE "FontType"
+ #define PROPERTY_FONT_WIDTH "FontWidth"
+ #define PROPERTY_HELPURL "HelpURL"
+ #define PROPERTY_RECORDMARKER "HasRecordMarker"
+ #define PROPERTY_BOUNDFIELD "BoundField"
+ #define PROPERTY_INPUT_REQUIRED "InputRequired"
+ #define PROPERTY_TREATASNUMERIC "TreatAsNumber"
+ #define PROPERTY_EFFECTIVE_VALUE "EffectiveValue"
+ #define PROPERTY_EFFECTIVE_DEFAULT "EffectiveDefault"
+ #define PROPERTY_EFFECTIVE_MIN "EffectiveMin"
+ #define PROPERTY_EFFECTIVE_MAX "EffectiveMax"
+ #define PROPERTY_HIDDEN "Hidden"
+ #define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal"
+ #define PROPERTY_FIELDSOURCE "FieldSource"
+ #define PROPERTY_TABLENAME "TableName"
+ #define PROPERTY_ISFILTERAPPLIED "IsFilterApplied"
+ #define PROPERTY_CONTROLLABEL "LabelControl"
+ #define PROPERTY_CURRSYM_POSITION "PrependCurrencySymbol"
+ #define PROPERTY_CURSORCOLOR "CursorColor"
+ #define PROPERTY_ALWAYSSHOWCURSOR "AlwaysShowCursor"
+ #define PROPERTY_DISPLAYSYNCHRON "DisplayIsSynchron"
+ #define PROPERTY_TEXTCOLOR "TextColor"
+ #define PROPERTY_DELAY "RepeatDelay"
+ #define PROPERTY_DEFAULT_SCROLL_VALUE "DefaultScrollValue"
+ #define PROPERTY_SCROLL_VALUE "ScrollValue"
+ #define PROPERTY_DEFAULT_SPIN_VALUE "DefaultSpinValue"
+ #define PROPERTY_SPIN_VALUE "SpinValue"
+ #define PROPERTY_REFERENCE_DEVICE "ReferenceDevice"
+ #define PROPERTY_ISMODIFIED "IsModified"
+ #define PROPERTY_ISNEW "IsNew"
+ #define PROPERTY_PRIVILEGES "Privileges"
+ #define PROPERTY_COMMAND "Command"
+ #define PROPERTY_COMMANDTYPE "CommandType"
+ #define PROPERTY_RESULTSET_CONCURRENCY "ResultSetConcurrency"
+ #define PROPERTY_INSERTONLY "IgnoreResult"
+ #define PROPERTY_RESULTSET_TYPE "ResultSetType"
+ #define PROPERTY_ESCAPE_PROCESSING "EscapeProcessing"
+ #define PROPERTY_APPLYFILTER "ApplyFilter"
+ #define PROPERTY_ROWCOUNT "RowCount"
+ #define PROPERTY_ROWCOUNTFINAL "IsRowCountFinal"
- FORMS_CONSTASCII_STRING( PROPERTY_ISNULLABLE, "IsNullable" );
- FORMS_CONSTASCII_STRING( PROPERTY_ACTIVECOMMAND, "ActiveCommand" );
- FORMS_CONSTASCII_STRING( PROPERTY_ISCURRENCY, "IsCurrency" );
- FORMS_CONSTASCII_STRING( PROPERTY_URL, "URL" );
- FORMS_CONSTASCII_STRING( PROPERTY_TITLE, "Title" );
- FORMS_CONSTASCII_STRING( PROPERTY_ACTIVE_CONNECTION, "ActiveConnection" );
- FORMS_CONSTASCII_STRING( PROPERTY_SCALE, "Scale" );
- FORMS_CONSTASCII_STRING( PROPERTY_SORT, "Order" );
- FORMS_CONSTASCII_STRING( PROPERTY_DATASOURCE, "DataSourceName" );
- FORMS_CONSTASCII_STRING( PROPERTY_DETAILFIELDS, "DetailFields" );
+ #define PROPERTY_ISNULLABLE "IsNullable"
+ #define PROPERTY_ACTIVECOMMAND "ActiveCommand"
+ #define PROPERTY_ISCURRENCY "IsCurrency"
+ #define PROPERTY_URL "URL"
+ #define PROPERTY_TITLE "Title"
+ #define PROPERTY_ACTIVE_CONNECTION "ActiveConnection"
+ #define PROPERTY_SCALE "Scale"
+ #define PROPERTY_SORT "Order"
+ #define PROPERTY_DATASOURCE "DataSourceName"
+ #define PROPERTY_DETAILFIELDS "DetailFields"
- FORMS_CONSTASCII_STRING( PROPERTY_COLUMNSERVICENAME, "ColumnServiceName" );
- FORMS_CONSTASCII_STRING( PROPERTY_REALNAME, "RealName" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTROLSOURCEPROPERTY, "DataFieldProperty" );
- FORMS_CONSTASCII_STRING( PROPERTY_USER, "User" );
- FORMS_CONSTASCII_STRING( PROPERTY_PASSWORD, "Password" );
- FORMS_CONSTASCII_STRING( PROPERTY_DISPATCHURLINTERNAL, "DispatchURLInternal" );
- FORMS_CONSTASCII_STRING( PROPERTY_PERSISTENCE_MAXTEXTLENGTH,"PersistenceMaxTextLength" );
- FORMS_CONSTASCII_STRING( PROPERTY_RICH_TEXT, "RichText" );
- FORMS_CONSTASCII_STRING( PROPERTY_ENFORCE_FORMAT, "EnforceFormat" );
- FORMS_CONSTASCII_STRING( PROPERTY_LINEEND_FORMAT, "LineEndFormat" );
- FORMS_CONSTASCII_STRING( PROPERTY_WRITING_MODE, "WritingMode" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTEXT_WRITING_MODE, "ContextWritingMode" );
+ #define PROPERTY_COLUMNSERVICENAME "ColumnServiceName"
+ #define PROPERTY_REALNAME "RealName"
+ #define PROPERTY_CONTROLSOURCEPROPERTY "DataFieldProperty"
+ #define PROPERTY_USER "User"
+ #define PROPERTY_PASSWORD "Password"
+ #define PROPERTY_DISPATCHURLINTERNAL "DispatchURLInternal"
+ #define PROPERTY_PERSISTENCE_MAXTEXTLENGTH "PersistenceMaxTextLength"
+ #define PROPERTY_RICH_TEXT "RichText"
+ #define PROPERTY_ENFORCE_FORMAT "EnforceFormat"
+ #define PROPERTY_LINEEND_FORMAT "LineEndFormat"
+ #define PROPERTY_WRITING_MODE "WritingMode"
+ #define PROPERTY_CONTEXT_WRITING_MODE "ContextWritingMode"
- FORMS_CONSTASCII_STRING( PROPERTY_NATIVE_LOOK, "NativeWidgetLook" );
- FORMS_CONSTASCII_STRING( PROPERTY_BORDER, "Border" );
- FORMS_CONSTASCII_STRING( PROPERTY_BORDERCOLOR, "BorderColor" );
- FORMS_CONSTASCII_STRING( PROPERTY_BACKGROUNDCOLOR, "BackgroundColor" );
- FORMS_CONSTASCII_STRING( PROPERTY_ICONSIZE, "IconSize" );
- FORMS_CONSTASCII_STRING( PROPERTY_TEXTLINECOLOR, "TextLineColor" );
- FORMS_CONSTASCII_STRING( PROPERTY_HIDEINACTIVESELECTION, "HideInactiveSelection" );
+ #define PROPERTY_NATIVE_LOOK "NativeWidgetLook"
+ #define PROPERTY_BORDER "Border"
+ #define PROPERTY_BORDERCOLOR "BorderColor"
+ #define PROPERTY_BACKGROUNDCOLOR "BackgroundColor"
+ #define PROPERTY_ICONSIZE "IconSize"
+ #define PROPERTY_TEXTLINECOLOR "TextLineColor"
+ #define PROPERTY_HIDEINACTIVESELECTION "HideInactiveSelection"
- FORMS_CONSTASCII_STRING( PROPERTY_SHOW_POSITION, "ShowPosition" );
- FORMS_CONSTASCII_STRING( PROPERTY_SHOW_NAVIGATION, "ShowNavigation" );
- FORMS_CONSTASCII_STRING( PROPERTY_SHOW_RECORDACTIONS, "ShowRecordActions" );
- FORMS_CONSTASCII_STRING( PROPERTY_SHOW_FILTERSORT, "ShowFilterSort" );
+ #define PROPERTY_SHOW_POSITION "ShowPosition"
+ #define PROPERTY_SHOW_NAVIGATION "ShowNavigation"
+ #define PROPERTY_SHOW_RECORDACTIONS "ShowRecordActions"
+ #define PROPERTY_SHOW_FILTERSORT "ShowFilterSort"
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_WHITESPACE, "WhiteSpace" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_PATTERN, "Pattern" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_LENGTH, "Length" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_LENGTH, "MinLength" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_LENGTH, "MaxLength" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_TOTAL_DIGITS, "TotalDigits" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_FRACTION_DIGITS, "FractionDigits" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_INCLUSIVE_INT, "MaxInclusiveInt" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_EXCLUSIVE_INT, "MaxExclusiveInt" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_INCLUSIVE_INT, "MinInclusiveInt" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_EXCLUSIVE_INT, "MinExclusiveInt" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_INCLUSIVE_DOUBLE, "MaxInclusiveDouble" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_EXCLUSIVE_DOUBLE, "MaxExclusiveDouble" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_INCLUSIVE_DOUBLE, "MinInclusiveDouble" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_EXCLUSIVE_DOUBLE, "MinExclusiveDouble" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_INCLUSIVE_DATE, "MaxInclusiveDate" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_EXCLUSIVE_DATE, "MaxExclusiveDate" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_INCLUSIVE_DATE, "MinInclusiveDate" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_EXCLUSIVE_DATE, "MinExclusiveDate" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_INCLUSIVE_TIME, "MaxInclusiveTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_EXCLUSIVE_TIME, "MaxExclusiveTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_INCLUSIVE_TIME, "MinInclusiveTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_EXCLUSIVE_TIME, "MinExclusiveTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_INCLUSIVE_DATE_TIME, "MaxInclusiveDateTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MAX_EXCLUSIVE_DATE_TIME, "MaxExclusiveDateTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_INCLUSIVE_DATE_TIME, "MinInclusiveDateTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_MIN_EXCLUSIVE_DATE_TIME, "MinExclusiveDateTime" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_IS_BASIC, "IsBasic" );
- FORMS_CONSTASCII_STRING( PROPERTY_XSD_TYPE_CLASS, "TypeClass" );
+ #define PROPERTY_XSD_WHITESPACE "WhiteSpace"
+ #define PROPERTY_XSD_PATTERN "Pattern"
+ #define PROPERTY_XSD_LENGTH "Length"
+ #define PROPERTY_XSD_MIN_LENGTH "MinLength"
+ #define PROPERTY_XSD_MAX_LENGTH "MaxLength"
+ #define PROPERTY_XSD_TOTAL_DIGITS "TotalDigits"
+ #define PROPERTY_XSD_FRACTION_DIGITS "FractionDigits"
+ #define PROPERTY_XSD_MAX_INCLUSIVE_INT "MaxInclusiveInt"
+ #define PROPERTY_XSD_MAX_EXCLUSIVE_INT "MaxExclusiveInt"
+ #define PROPERTY_XSD_MIN_INCLUSIVE_INT "MinInclusiveInt"
+ #define PROPERTY_XSD_MIN_EXCLUSIVE_INT "MinExclusiveInt"
+ #define PROPERTY_XSD_MAX_INCLUSIVE_DOUBLE "MaxInclusiveDouble"
+ #define PROPERTY_XSD_MAX_EXCLUSIVE_DOUBLE "MaxExclusiveDouble"
+ #define PROPERTY_XSD_MIN_INCLUSIVE_DOUBLE "MinInclusiveDouble"
+ #define PROPERTY_XSD_MIN_EXCLUSIVE_DOUBLE "MinExclusiveDouble"
+ #define PROPERTY_XSD_MAX_INCLUSIVE_DATE "MaxInclusiveDate"
+ #define PROPERTY_XSD_MAX_EXCLUSIVE_DATE "MaxExclusiveDate"
+ #define PROPERTY_XSD_MIN_INCLUSIVE_DATE "MinInclusiveDate"
+ #define PROPERTY_XSD_MIN_EXCLUSIVE_DATE "MinExclusiveDate"
+ #define PROPERTY_XSD_MAX_INCLUSIVE_TIME "MaxInclusiveTime"
+ #define PROPERTY_XSD_MAX_EXCLUSIVE_TIME "MaxExclusiveTime"
+ #define PROPERTY_XSD_MIN_INCLUSIVE_TIME "MinInclusiveTime"
+ #define PROPERTY_XSD_MIN_EXCLUSIVE_TIME "MinExclusiveTime"
+ #define PROPERTY_XSD_MAX_INCLUSIVE_DATE_TIME "MaxInclusiveDateTime"
+ #define PROPERTY_XSD_MAX_EXCLUSIVE_DATE_TIME "MaxExclusiveDateTime"
+ #define PROPERTY_XSD_MIN_INCLUSIVE_DATE_TIME "MinInclusiveDateTime"
+ #define PROPERTY_XSD_MIN_EXCLUSIVE_DATE_TIME "MinExclusiveDateTime"
+ #define PROPERTY_XSD_IS_BASIC "IsBasic"
+ #define PROPERTY_XSD_TYPE_CLASS "TypeClass"
- FORMS_CONSTASCII_STRING( PROPERTY_DYNAMIC_CONTROL_BORDER, "DynamicControlBorder" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTROL_BORDER_COLOR_FOCUS, "ControlBorderColorOnFocus" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTROL_BORDER_COLOR_MOUSE, "ControlBorderColorOnHover" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTROL_BORDER_COLOR_INVALID,"ControlBorderColorOnInvalid" );
- FORMS_CONSTASCII_STRING( PROPERTY_GENERATEVBAEVENTS, "GenerateVbaEvents" );
+ #define PROPERTY_DYNAMIC_CONTROL_BORDER "DynamicControlBorder"
+ #define PROPERTY_CONTROL_BORDER_COLOR_FOCUS "ControlBorderColorOnFocus"
+ #define PROPERTY_CONTROL_BORDER_COLOR_MOUSE "ControlBorderColorOnHover"
+ #define PROPERTY_CONTROL_BORDER_COLOR_INVALID "ControlBorderColorOnInvalid"
+ #define PROPERTY_GENERATEVBAEVENTS "GenerateVbaEvents"
//--------------------------------------------------------------------------
//- URLs
//--------------------------------------------------------------------------
- FORMS_CONSTASCII_STRING( URL_FORM_POSITION, ".uno:FormController/positionForm" );
- FORMS_CONSTASCII_STRING( URL_FORM_RECORDCOUNT, ".uno:FormController/RecordCount" );
- FORMS_CONSTASCII_STRING( URL_RECORD_FIRST, ".uno:FormController/moveToFirst" );
- FORMS_CONSTASCII_STRING( URL_RECORD_PREV, ".uno:FormController/moveToPrev" );
- FORMS_CONSTASCII_STRING( URL_RECORD_NEXT, ".uno:FormController/moveToNext" );
- FORMS_CONSTASCII_STRING( URL_RECORD_LAST, ".uno:FormController/moveToLast" );
- FORMS_CONSTASCII_STRING( URL_RECORD_SAVE, ".uno:FormController/saveRecord" );
- FORMS_CONSTASCII_STRING( URL_RECORD_UNDO, ".uno:FormController/undoRecord" );
- FORMS_CONSTASCII_STRING( URL_RECORD_NEW, ".uno:FormController/moveToNew" );
- FORMS_CONSTASCII_STRING( URL_RECORD_DELETE, ".uno:FormController/deleteRecord" );
- FORMS_CONSTASCII_STRING( URL_FORM_REFRESH, ".uno:FormController/refreshForm" );
- FORMS_CONSTASCII_STRING( URL_FORM_REFRESH_CURRENT_CONTROL,
- ".uno:FormController/refreshCurrentControl" );
+ #define URL_FORM_POSITION ".uno:FormController/positionForm"
+ #define URL_FORM_RECORDCOUNT ".uno:FormController/RecordCount"
+ #define URL_RECORD_FIRST ".uno:FormController/moveToFirst"
+ #define URL_RECORD_PREV ".uno:FormController/moveToPrev"
+ #define URL_RECORD_NEXT ".uno:FormController/moveToNext"
+ #define URL_RECORD_LAST ".uno:FormController/moveToLast"
+ #define URL_RECORD_SAVE ".uno:FormController/saveRecord"
+ #define URL_RECORD_UNDO ".uno:FormController/undoRecord"
+ #define URL_RECORD_NEW ".uno:FormController/moveToNew"
+ #define URL_RECORD_DELETE ".uno:FormController/deleteRecord"
+ #define URL_FORM_REFRESH ".uno:FormController/refreshForm"
+ #define URL_FORM_REFRESH_CURRENT_CONTROL ".uno:FormController/refreshCurrentControl"
- FORMS_CONSTASCII_STRING( URL_FORM_SORT_UP, ".uno:FormController/sortUp" );
- FORMS_CONSTASCII_STRING( URL_FORM_SORT_DOWN, ".uno:FormController/sortDown" );
- FORMS_CONSTASCII_STRING( URL_FORM_SORT, ".uno:FormController/sort" );
- FORMS_CONSTASCII_STRING( URL_FORM_AUTO_FILTER, ".uno:FormController/autoFilter" );
- FORMS_CONSTASCII_STRING( URL_FORM_FILTER, ".uno:FormController/filter" );
- FORMS_CONSTASCII_STRING( URL_FORM_APPLY_FILTER, ".uno:FormController/applyFilter" );
- FORMS_CONSTASCII_STRING( URL_FORM_REMOVE_FILTER,".uno:FormController/removeFilterOrder" );
+ #define URL_FORM_SORT_UP ".uno:FormController/sortUp"
+ #define URL_FORM_SORT_DOWN ".uno:FormController/sortDown"
+ #define URL_FORM_SORT ".uno:FormController/sort"
+ #define URL_FORM_AUTO_FILTER ".uno:FormController/autoFilter"
+ #define URL_FORM_FILTER ".uno:FormController/filter"
+ #define URL_FORM_APPLY_FILTER ".uno:FormController/applyFilter"
+ #define URL_FORM_REMOVE_FILTER ".uno:FormController/removeFilterOrder"
//..............................................................................
} // namespace frm
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index c8f3ffb..57c1877 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -28,191 +28,191 @@ namespace frm
{
//.........................................................................
- FORMS_CONSTASCII_STRING( AWT_CONTROL_TEXTFIELD, "com.sun.star.awt.TextField" );
-
- FORMS_CONSTASCII_STRING( VCL_CONTROL_EDIT, "stardiv.vcl.control.Edit" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_LISTBOX, "stardiv.vcl.control.ListBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_COMBOBOX, "stardiv.vcl.control.ComboBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_RADIOBUTTON, "stardiv.vcl.control.RadioButton" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_GROUPBOX, "stardiv.vcl.control.GroupBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_FIXEDTEXT, "stardiv.vcl.control.FixedText" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_COMMANDBUTTON, "stardiv.vcl.control.Button" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_CHECKBOX, "stardiv.vcl.control.CheckBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_IMAGEBUTTON, "stardiv.vcl.control.ImageButton" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_FILECONTROL, "stardiv.vcl.control.FileControl" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_TIMEFIELD, "stardiv.vcl.control.TimeField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_DATEFIELD, "stardiv.vcl.control.DateField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_NUMERICFIELD, "stardiv.vcl.control.NumericField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_CURRENCYFIELD, "stardiv.vcl.control.CurrencyField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_PATTERNFIELD, "stardiv.vcl.control.PatternField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_FORMATTEDFIELD, "stardiv.vcl.control.FormattedField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_IMAGECONTROL, "stardiv.vcl.control.ImageControl" );
-
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_EDIT, "stardiv.vcl.controlmodel.Edit" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_LISTBOX, "stardiv.vcl.controlmodel.ListBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_COMBOBOX, "stardiv.vcl.controlmodel.ComboBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_RADIOBUTTON, "stardiv.vcl.controlmodel.RadioButton" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_GROUPBOX, "stardiv.vcl.controlmodel.GroupBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_FIXEDTEXT, "stardiv.vcl.controlmodel.FixedText" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_COMMANDBUTTON, "stardiv.vcl.controlmodel.Button" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_CHECKBOX, "stardiv.vcl.controlmodel.CheckBox" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_IMAGEBUTTON, "stardiv.vcl.controlmodel.ImageButton" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_FILECONTROL, "stardiv.vcl.controlmodel.FileControl" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_TIMEFIELD, "stardiv.vcl.controlmodel.TimeField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_DATEFIELD, "stardiv.vcl.controlmodel.DateField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_NUMERICFIELD, "stardiv.vcl.controlmodel.NumericField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_CURRENCYFIELD, "stardiv.vcl.controlmodel.CurrencyField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_PATTERNFIELD, "stardiv.vcl.controlmodel.PatternField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_FORMATTEDFIELD, "stardiv.vcl.controlmodel.FormattedField" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_IMAGECONTROL, "stardiv.vcl.controlmodel.ImageControl" );
-
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_SCROLLBAR, "com.sun.star.awt.UnoControlScrollBarModel" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_SCROLLBAR, "com.sun.star.awt.UnoControlScrollBar" );
- FORMS_CONSTASCII_STRING( VCL_CONTROLMODEL_SPINBUTTON, "com.sun.star.awt.UnoControlSpinButtonModel" );
- FORMS_CONSTASCII_STRING( VCL_CONTROL_SPINBUTTON, "com.sun.star.awt.UnoControlSpinButton" );
+ #define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField"
+
+ #define VCL_CONTROL_EDIT "stardiv.vcl.control.Edit"
+ #define VCL_CONTROL_LISTBOX "stardiv.vcl.control.ListBox"
+ #define VCL_CONTROL_COMBOBOX "stardiv.vcl.control.ComboBox"
+ #define VCL_CONTROL_RADIOBUTTON "stardiv.vcl.control.RadioButton"
+ #define VCL_CONTROL_GROUPBOX "stardiv.vcl.control.GroupBox"
+ #define VCL_CONTROL_FIXEDTEXT "stardiv.vcl.control.FixedText"
+ #define VCL_CONTROL_COMMANDBUTTON "stardiv.vcl.control.Button"
+ #define VCL_CONTROL_CHECKBOX "stardiv.vcl.control.CheckBox"
+ #define VCL_CONTROL_IMAGEBUTTON "stardiv.vcl.control.ImageButton"
+ #define VCL_CONTROL_FILECONTROL "stardiv.vcl.control.FileControl"
+ #define VCL_CONTROL_TIMEFIELD "stardiv.vcl.control.TimeField"
+ #define VCL_CONTROL_DATEFIELD "stardiv.vcl.control.DateField"
+ #define VCL_CONTROL_NUMERICFIELD "stardiv.vcl.control.NumericField"
+ #define VCL_CONTROL_CURRENCYFIELD "stardiv.vcl.control.CurrencyField"
+ #define VCL_CONTROL_PATTERNFIELD "stardiv.vcl.control.PatternField"
+ #define VCL_CONTROL_FORMATTEDFIELD "stardiv.vcl.control.FormattedField"
+ #define VCL_CONTROL_IMAGECONTROL "stardiv.vcl.control.ImageControl"
+
+ #define VCL_CONTROLMODEL_EDIT "stardiv.vcl.controlmodel.Edit"
+ #define VCL_CONTROLMODEL_LISTBOX "stardiv.vcl.controlmodel.ListBox"
+ #define VCL_CONTROLMODEL_COMBOBOX "stardiv.vcl.controlmodel.ComboBox"
+ #define VCL_CONTROLMODEL_RADIOBUTTON "stardiv.vcl.controlmodel.RadioButton"
+ #define VCL_CONTROLMODEL_GROUPBOX "stardiv.vcl.controlmodel.GroupBox"
+ #define VCL_CONTROLMODEL_FIXEDTEXT "stardiv.vcl.controlmodel.FixedText"
+ #define VCL_CONTROLMODEL_COMMANDBUTTON "stardiv.vcl.controlmodel.Button"
+ #define VCL_CONTROLMODEL_CHECKBOX "stardiv.vcl.controlmodel.CheckBox"
+ #define VCL_CONTROLMODEL_IMAGEBUTTON "stardiv.vcl.controlmodel.ImageButton"
+ #define VCL_CONTROLMODEL_FILECONTROL "stardiv.vcl.controlmodel.FileControl"
+ #define VCL_CONTROLMODEL_TIMEFIELD "stardiv.vcl.controlmodel.TimeField"
+ #define VCL_CONTROLMODEL_DATEFIELD "stardiv.vcl.controlmodel.DateField"
+ #define VCL_CONTROLMODEL_NUMERICFIELD "stardiv.vcl.controlmodel.NumericField"
+ #define VCL_CONTROLMODEL_CURRENCYFIELD "stardiv.vcl.controlmodel.CurrencyField"
+ #define VCL_CONTROLMODEL_PATTERNFIELD "stardiv.vcl.controlmodel.PatternField"
+ #define VCL_CONTROLMODEL_FORMATTEDFIELD "stardiv.vcl.controlmodel.FormattedField"
+ #define VCL_CONTROLMODEL_IMAGECONTROL "stardiv.vcl.controlmodel.ImageControl"
+
+ #define VCL_CONTROLMODEL_SCROLLBAR "com.sun.star.awt.UnoControlScrollBarModel"
+ #define VCL_CONTROL_SCROLLBAR "com.sun.star.awt.UnoControlScrollBar"
+ #define VCL_CONTROLMODEL_SPINBUTTON "com.sun.star.awt.UnoControlSpinButtonModel"
+ #define VCL_CONTROL_SPINBUTTON "com.sun.star.awt.UnoControlSpinButton"
// -----------------------
// service names for compatibility
// -----------------------
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_FORM, "stardiv.one.form.component.Form" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_EDIT, "stardiv.one.form.component.Edit" ); // compatibility
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_TEXTFIELD, "stardiv.one.form.component.TextField" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_LISTBOX, "stardiv.one.form.component.ListBox" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_COMBOBOX, "stardiv.one.form.component.ComboBox" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_RADIOBUTTON, "stardiv.one.form.component.RadioButton" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_GROUPBOX, "stardiv.one.form.component.GroupBox" ); // compatibility
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_FIXEDTEXT, "stardiv.one.form.component.FixedText" ); // compatibility
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_COMMANDBUTTON, "stardiv.one.form.component.CommandButton" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_CHECKBOX, "stardiv.one.form.component.CheckBox" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRID, "stardiv.one.form.component.Grid" ); // compatibility
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRIDCONTROL, "stardiv.one.form.component.GridControl" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_IMAGEBUTTON, "stardiv.one.form.component.ImageButton" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_FILECONTROL, "stardiv.one.form.component.FileControl" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_TIMEFIELD, "stardiv.one.form.component.TimeField" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_DATEFIELD, "stardiv.one.form.component.DateField" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_NUMERICFIELD, "stardiv.one.form.component.NumericField" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_CURRENCYFIELD, "stardiv.one.form.component.CurrencyField" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_PATTERNFIELD, "stardiv.one.form.component.PatternField" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_HIDDEN, "stardiv.one.form.component.Hidden" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_HIDDENCONTROL, "stardiv.one.form.component.HiddenControl" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_IMAGECONTROL, "stardiv.one.form.component.ImageControl" );
- FORMS_CONSTASCII_STRING( FRM_COMPONENT_FORMATTEDFIELD, "stardiv.one.form.component.FormattedField" );
+ #define FRM_COMPONENT_FORM "stardiv.one.form.component.Form"
+ #define FRM_COMPONENT_EDIT "stardiv.one.form.component.Edit" // compatibility
+ #define FRM_COMPONENT_TEXTFIELD "stardiv.one.form.component.TextField"
+ #define FRM_COMPONENT_LISTBOX "stardiv.one.form.component.ListBox"
+ #define FRM_COMPONENT_COMBOBOX "stardiv.one.form.component.ComboBox"
+ #define FRM_COMPONENT_RADIOBUTTON "stardiv.one.form.component.RadioButton"
+ #define FRM_COMPONENT_GROUPBOX "stardiv.one.form.component.GroupBox" // compatibility
+ #define FRM_COMPONENT_FIXEDTEXT "stardiv.one.form.component.FixedText" // compatibility
+ #define FRM_COMPONENT_COMMANDBUTTON "stardiv.one.form.component.CommandButton"
+ #define FRM_COMPONENT_CHECKBOX "stardiv.one.form.component.CheckBox"
+ #define FRM_COMPONENT_GRID "stardiv.one.form.component.Grid" // compatibility
+ #define FRM_COMPONENT_GRIDCONTROL "stardiv.one.form.component.GridControl"
+ #define FRM_COMPONENT_IMAGEBUTTON "stardiv.one.form.component.ImageButton"
+ #define FRM_COMPONENT_FILECONTROL "stardiv.one.form.component.FileControl"
+ #define FRM_COMPONENT_TIMEFIELD "stardiv.one.form.component.TimeField"
+ #define FRM_COMPONENT_DATEFIELD "stardiv.one.form.component.DateField"
+ #define FRM_COMPONENT_NUMERICFIELD "stardiv.one.form.component.NumericField"
+ #define FRM_COMPONENT_CURRENCYFIELD "stardiv.one.form.component.CurrencyField"
+ #define FRM_COMPONENT_PATTERNFIELD "stardiv.one.form.component.PatternField"
+ #define FRM_COMPONENT_HIDDEN "stardiv.one.form.component.Hidden"
+ #define FRM_COMPONENT_HIDDENCONTROL "stardiv.one.form.component.HiddenControl"
+ #define FRM_COMPONENT_IMAGECONTROL "stardiv.one.form.component.ImageControl"
+ #define FRM_COMPONENT_FORMATTEDFIELD "stardiv.one.form.component.FormattedField"
// <compatibility_I>
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_COMMANDBUTTON, "stardiv.one.form.control.CommandButton" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_RADIOBUTTON, "stardiv.one.form.control.RadioButton" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_CHECKBOX, "stardiv.one.form.control.CheckBox" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_EDIT, "stardiv.one.form.control.Edit" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_LISTBOX, "stardiv.one.form.control.ListBox" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_COMBOBOX, "stardiv.one.form.control.ComboBox" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_GROUPBOX, "stardiv.one.form.control.GroupBox" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_TEXTFIELD, "stardiv.one.form.control.TextField" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_GRID, "stardiv.one.form.control.Grid" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_IMAGEBUTTON, "stardiv.one.form.control.ImageButton" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_TIMEFIELD, "stardiv.one.form.control.TimeField" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_DATEFIELD, "stardiv.one.form.control.DateField" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_NUMERICFIELD, "stardiv.one.form.control.NumericField" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_CURRENCYFIELD, "stardiv.one.form.control.CurrencyField" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_PATTERNFIELD, "stardiv.one.form.control.PatternField" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_IMAGECONTROL, "stardiv.one.form.control.ImageControl" );
- FORMS_CONSTASCII_STRING( STARDIV_ONE_FORM_CONTROL_FORMATTEDFIELD, "stardiv.one.form.control.FormattedField");
+ #define STARDIV_ONE_FORM_CONTROL_COMMANDBUTTON "stardiv.one.form.control.CommandButton"
+ #define STARDIV_ONE_FORM_CONTROL_RADIOBUTTON "stardiv.one.form.control.RadioButton"
+ #define STARDIV_ONE_FORM_CONTROL_CHECKBOX "stardiv.one.form.control.CheckBox"
+ #define STARDIV_ONE_FORM_CONTROL_EDIT "stardiv.one.form.control.Edit"
+ #define STARDIV_ONE_FORM_CONTROL_LISTBOX "stardiv.one.form.control.ListBox"
+ #define STARDIV_ONE_FORM_CONTROL_COMBOBOX "stardiv.one.form.control.ComboBox"
+ #define STARDIV_ONE_FORM_CONTROL_GROUPBOX "stardiv.one.form.control.GroupBox"
+ #define STARDIV_ONE_FORM_CONTROL_TEXTFIELD "stardiv.one.form.control.TextField"
+ #define STARDIV_ONE_FORM_CONTROL_GRID "stardiv.one.form.control.Grid"
+ #define STARDIV_ONE_FORM_CONTROL_IMAGEBUTTON "stardiv.one.form.control.ImageButton"
+ #define STARDIV_ONE_FORM_CONTROL_TIMEFIELD "stardiv.one.form.control.TimeField"
+ #define STARDIV_ONE_FORM_CONTROL_DATEFIELD "stardiv.one.form.control.DateField"
+ #define STARDIV_ONE_FORM_CONTROL_NUMERICFIELD "stardiv.one.form.control.NumericField"
+ #define STARDIV_ONE_FORM_CONTROL_CURRENCYFIELD "stardiv.one.form.control.CurrencyField"
+ #define STARDIV_ONE_FORM_CONTROL_PATTERNFIELD "stardiv.one.form.control.PatternField"
+ #define STARDIV_ONE_FORM_CONTROL_IMAGECONTROL "stardiv.one.form.control.ImageControl"
+ #define STARDIV_ONE_FORM_CONTROL_FORMATTEDFIELD "stardiv.one.form.control.FormattedField"
// </compatibility_I>
// -----------------------
// new (sun) service names
// -----------------------
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_FORM, "com.sun.star.form.component.Form" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_HTMLFORM, "com.sun.star.form.component.HTMLForm" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATAFORM, "com.sun.star.form.component.DataForm" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_TEXTFIELD, "com.sun.star.form.component.TextField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_LISTBOX, "com.sun.star.form.component.ListBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_COMBOBOX, "com.sun.star.form.component.ComboBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_RADIOBUTTON, "com.sun.star.form.component.RadioButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_GROUPBOX, "com.sun.star.form.component.GroupBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_FIXEDTEXT, "com.sun.star.form.component.FixedText" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_COMMANDBUTTON, "com.sun.star.form.component.CommandButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_CHECKBOX, "com.sun.star.form.component.CheckBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_GRIDCONTROL, "com.sun.star.form.component.GridControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_IMAGEBUTTON, "com.sun.star.form.component.ImageButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_FILECONTROL, "com.sun.star.form.component.FileControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_TIMEFIELD, "com.sun.star.form.component.TimeField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATEFIELD, "com.sun.star.form.component.DateField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_NUMERICFIELD, "com.sun.star.form.component.NumericField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_CURRENCYFIELD, "com.sun.star.form.component.CurrencyField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_PATTERNFIELD, "com.sun.star.form.component.PatternField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_HIDDENCONTROL, "com.sun.star.form.component.HiddenControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_FORMATTEDFIELD, "com.sun.star.form.component.FormattedField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_SCROLLBAR, "com.sun.star.form.component.ScrollBar" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_SPINBUTTON, "com.sun.star.form.component.SpinButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_RICHTEXTCONTROL, "com.sun.star.form.component.RichTextControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_NAVTOOLBAR, "com.sun.star.form.component.NavigationToolBar" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_SUBMITBUTTON, "com.sun.star.form.component.SubmitButton" );
-
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_IMAGECONTROL, "com.sun.star.form.component.DatabaseImageControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON, "com.sun.star.form.component.DatabaseRadioButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_CHECKBOX, "com.sun.star.form.component.DatabaseCheckBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_LISTBOX, "com.sun.star.form.component.DatabaseListBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_COMBOBOX, "com.sun.star.form.component.DatabaseComboBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD, "com.sun.star.form.component.DatabaseFormattedField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_TEXTFIELD, "com.sun.star.form.component.DatabaseTextField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_DATEFIELD, "com.sun.star.form.component.DatabaseDateField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_TIMEFIELD, "com.sun.star.form.component.DatabaseTimeField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD, "com.sun.star.form.component.DatabaseNumericField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_CURRENCYFIELD, "com.sun.star.form.component.DatabaseCurrencyField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD, "com.sun.star.form.component.DatabasePatternField" );
-
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_TEXTFIELD, "com.sun.star.form.control.TextField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_LISTBOX, "com.sun.star.form.control.ListBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_COMBOBOX, "com.sun.star.form.control.ComboBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_RADIOBUTTON, "com.sun.star.form.control.RadioButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_GROUPBOX, "com.sun.star.form.control.GroupBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_FIXEDTEXT, "com.sun.star.form.control.FixedText" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_COMMANDBUTTON, "com.sun.star.form.control.CommandButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_CHECKBOX, "com.sun.star.form.control.CheckBox" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_GRIDCONTROL, "com.sun.star.form.control.GridControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_IMAGEBUTTON, "com.sun.star.form.control.ImageButton" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_TIMEFIELD, "com.sun.star.form.control.TimeField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_DATEFIELD, "com.sun.star.form.control.DateField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_NUMERICFIELD, "com.sun.star.form.control.NumericField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_CURRENCYFIELD, "com.sun.star.form.control.CurrencyField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_PATTERNFIELD, "com.sun.star.form.control.PatternField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_IMAGECONTROL, "com.sun.star.form.control.ImageControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_FORMATTEDFIELD, "com.sun.star.form.control.FormattedField" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_RICHTEXTCONTROL,"com.sun.star.form.control.RichTextControl" );
- FORMS_CONSTASCII_STRING( FRM_SUN_CONTROL_SUBMITBUTTON, "com.sun.star.form.control.SubmitButton" );
-
- FORMS_CONSTASCII_STRING( FRM_SUN_FORMS_COLLECTION, "com.sun.star.form.Forms" );
-
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_CHECK_BOX, "com.sun.star.form.binding.BindableDatabaseCheckBox" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_COMBO_BOX, "com.sun.star.form.binding.BindableDatabaseComboBox" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_FORMATTED_FIELD,"com.sun.star.form.binding.BindableDatabaseFormattedField" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_LIST_BOX, "com.sun.star.form.binding.BindableDatabaseListBox" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_NUMERIC_FIELD, "com.sun.star.form.binding.BindableDatabaseNumericField" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_RADIO_BUTTON, "com.sun.star.form.binding.BindableDatabaseRadioButton" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_TEXT_FIELD, "com.sun.star.form.binding.BindableDatabaseTextField" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_DATE_FIELD, "com.sun.star.form.binding.BindableDatabaseDateField" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATABASE_TIME_FIELD, "com.sun.star.form.binding.BindableDatabaseTimeField" );
-
- FORMS_CONSTASCII_STRING( BINDABLE_CONTROL_MODEL, "com.sun.star.form.binding.BindableControlModel" );
- FORMS_CONSTASCII_STRING( BINDABLE_INTEGER_VALUE_RANGE, "com.sun.star.form.binding.BindableIntegerValueRange" );
- FORMS_CONSTASCII_STRING( BINDABLE_DATA_AWARE_CONTROL_MODEL, "com.sun.star.form.binding.BindableDataAwareControlModel" );
- FORMS_CONSTASCII_STRING( DATA_AWARE_CONTROL_MODEL, "com.sun.star.form.binding.DataAwareControlModel" );
- FORMS_CONSTASCII_STRING( VALIDATABLE_CONTROL_MODEL, "com.sun.star.form.binding.ValidatableControlModel" );
- FORMS_CONSTASCII_STRING( VALIDATABLE_BINDABLE_CONTROL_MODEL,"com.sun.star.form.binding.ValidatableBindableControlModel" );
+ #define FRM_SUN_COMPONENT_FORM "com.sun.star.form.component.Form"
+ #define FRM_SUN_COMPONENT_HTMLFORM "com.sun.star.form.component.HTMLForm"
+ #define FRM_SUN_COMPONENT_DATAFORM "com.sun.star.form.component.DataForm"
+ #define FRM_SUN_COMPONENT_TEXTFIELD "com.sun.star.form.component.TextField"
+ #define FRM_SUN_COMPONENT_LISTBOX "com.sun.star.form.component.ListBox"
+ #define FRM_SUN_COMPONENT_COMBOBOX "com.sun.star.form.component.ComboBox"
+ #define FRM_SUN_COMPONENT_RADIOBUTTON "com.sun.star.form.component.RadioButton"
+ #define FRM_SUN_COMPONENT_GROUPBOX "com.sun.star.form.component.GroupBox"
+ #define FRM_SUN_COMPONENT_FIXEDTEXT "com.sun.star.form.component.FixedText"
+ #define FRM_SUN_COMPONENT_COMMANDBUTTON "com.sun.star.form.component.CommandButton"
+ #define FRM_SUN_COMPONENT_CHECKBOX "com.sun.star.form.component.CheckBox"
+ #define FRM_SUN_COMPONENT_GRIDCONTROL "com.sun.star.form.component.GridControl"
+ #define FRM_SUN_COMPONENT_IMAGEBUTTON "com.sun.star.form.component.ImageButton"
+ #define FRM_SUN_COMPONENT_FILECONTROL "com.sun.star.form.component.FileControl"
+ #define FRM_SUN_COMPONENT_TIMEFIELD "com.sun.star.form.component.TimeField"
+ #define FRM_SUN_COMPONENT_DATEFIELD "com.sun.star.form.component.DateField"
+ #define FRM_SUN_COMPONENT_NUMERICFIELD "com.sun.star.form.component.NumericField"
+ #define FRM_SUN_COMPONENT_CURRENCYFIELD "com.sun.star.form.component.CurrencyField"
+ #define FRM_SUN_COMPONENT_PATTERNFIELD "com.sun.star.form.component.PatternField"
+ #define FRM_SUN_COMPONENT_HIDDENCONTROL "com.sun.star.form.component.HiddenControl"
+ #define FRM_SUN_COMPONENT_FORMATTEDFIELD "com.sun.star.form.component.FormattedField"
+ #define FRM_SUN_COMPONENT_SCROLLBAR "com.sun.star.form.component.ScrollBar"
+ #define FRM_SUN_COMPONENT_SPINBUTTON "com.sun.star.form.component.SpinButton"
+ #define FRM_SUN_COMPONENT_RICHTEXTCONTROL "com.sun.star.form.component.RichTextControl"
+ #define FRM_SUN_COMPONENT_NAVTOOLBAR "com.sun.star.form.component.NavigationToolBar"
+ #define FRM_SUN_COMPONENT_SUBMITBUTTON "com.sun.star.form.component.SubmitButton"
+
+ #define FRM_SUN_COMPONENT_IMAGECONTROL "com.sun.star.form.component.DatabaseImageControl"
+ #define FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON "com.sun.star.form.component.DatabaseRadioButton"
+ #define FRM_SUN_COMPONENT_DATABASE_CHECKBOX "com.sun.star.form.component.DatabaseCheckBox"
+ #define FRM_SUN_COMPONENT_DATABASE_LISTBOX "com.sun.star.form.component.DatabaseListBox"
+ #define FRM_SUN_COMPONENT_DATABASE_COMBOBOX "com.sun.star.form.component.DatabaseComboBox"
+ #define FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD "com.sun.star.form.component.DatabaseFormattedField"
+ #define FRM_SUN_COMPONENT_DATABASE_TEXTFIELD "com.sun.star.form.component.DatabaseTextField"
+ #define FRM_SUN_COMPONENT_DATABASE_DATEFIELD "com.sun.star.form.component.DatabaseDateField"
+ #define FRM_SUN_COMPONENT_DATABASE_TIMEFIELD "com.sun.star.form.component.DatabaseTimeField"
+ #define FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD "com.sun.star.form.component.DatabaseNumericField"
+ #define FRM_SUN_COMPONENT_DATABASE_CURRENCYFIELD "com.sun.star.form.component.DatabaseCurrencyField"
+ #define FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD "com.sun.star.form.component.DatabasePatternField"
+
+ #define FRM_SUN_CONTROL_TEXTFIELD "com.sun.star.form.control.TextField"
+ #define FRM_SUN_CONTROL_LISTBOX "com.sun.star.form.control.ListBox"
+ #define FRM_SUN_CONTROL_COMBOBOX "com.sun.star.form.control.ComboBox"
+ #define FRM_SUN_CONTROL_RADIOBUTTON "com.sun.star.form.control.RadioButton"
+ #define FRM_SUN_CONTROL_GROUPBOX "com.sun.star.form.control.GroupBox"
+ #define FRM_SUN_CONTROL_FIXEDTEXT "com.sun.star.form.control.FixedText"
+ #define FRM_SUN_CONTROL_COMMANDBUTTON "com.sun.star.form.control.CommandButton"
+ #define FRM_SUN_CONTROL_CHECKBOX "com.sun.star.form.control.CheckBox"
+ #define FRM_SUN_CONTROL_GRIDCONTROL "com.sun.star.form.control.GridControl"
+ #define FRM_SUN_CONTROL_IMAGEBUTTON "com.sun.star.form.control.ImageButton"
+ #define FRM_SUN_CONTROL_TIMEFIELD "com.sun.star.form.control.TimeField"
+ #define FRM_SUN_CONTROL_DATEFIELD "com.sun.star.form.control.DateField"
+ #define FRM_SUN_CONTROL_NUMERICFIELD "com.sun.star.form.control.NumericField"
+ #define FRM_SUN_CONTROL_CURRENCYFIELD "com.sun.star.form.control.CurrencyField"
+ #define FRM_SUN_CONTROL_PATTERNFIELD "com.sun.star.form.control.PatternField"
+ #define FRM_SUN_CONTROL_IMAGECONTROL "com.sun.star.form.control.ImageControl"
+ #define FRM_SUN_CONTROL_FORMATTEDFIELD "com.sun.star.form.control.FormattedField"
+ #define FRM_SUN_CONTROL_RICHTEXTCONTROL "com.sun.star.form.control.RichTextControl"
+ #define FRM_SUN_CONTROL_SUBMITBUTTON "com.sun.star.form.control.SubmitButton"
+
+ #define FRM_SUN_FORMS_COLLECTION "com.sun.star.form.Forms"
+
+ #define BINDABLE_DATABASE_CHECK_BOX "com.sun.star.form.binding.BindableDatabaseCheckBox"
+ #define BINDABLE_DATABASE_COMBO_BOX "com.sun.star.form.binding.BindableDatabaseComboBox"
+ #define BINDABLE_DATABASE_FORMATTED_FIELD "com.sun.star.form.binding.BindableDatabaseFormattedField"
+ #define BINDABLE_DATABASE_LIST_BOX "com.sun.star.form.binding.BindableDatabaseListBox"
+ #define BINDABLE_DATABASE_NUMERIC_FIELD "com.sun.star.form.binding.BindableDatabaseNumericField"
+ #define BINDABLE_DATABASE_RADIO_BUTTON "com.sun.star.form.binding.BindableDatabaseRadioButton"
+ #define BINDABLE_DATABASE_TEXT_FIELD "com.sun.star.form.binding.BindableDatabaseTextField"
+ #define BINDABLE_DATABASE_DATE_FIELD "com.sun.star.form.binding.BindableDatabaseDateField"
+ #define BINDABLE_DATABASE_TIME_FIELD "com.sun.star.form.binding.BindableDatabaseTimeField"
+
+ #define BINDABLE_CONTROL_MODEL "com.sun.star.form.binding.BindableControlModel"
+ #define BINDABLE_INTEGER_VALUE_RANGE "com.sun.star.form.binding.BindableIntegerValueRange"
+ #define BINDABLE_DATA_AWARE_CONTROL_MODEL "com.sun.star.form.binding.BindableDataAwareControlModel"
+ #define DATA_AWARE_CONTROL_MODEL "com.sun.star.form.binding.DataAwareControlModel"
+ #define VALIDATABLE_CONTROL_MODEL "com.sun.star.form.binding.ValidatableControlModel"
+ #define VALIDATABLE_BINDABLE_CONTROL_MODEL "com.sun.star.form.binding.ValidatableBindableControlModel"
// -----------------------
// common
// -----------------------
- FORMS_CONSTASCII_STRING( FRM_SUN_FORMCOMPONENT, "com.sun.star.form.FormComponent" );
+ #define FRM_SUN_FORMCOMPONENT "com.sun.star.form.FormComponent"
// -----------------------
// misc
// -----------------------
- FORMS_CONSTASCII_STRING( SRV_AWT_POINTER, "com.sun.star.awt.Pointer" );
- FORMS_CONSTASCII_STRING( SRV_AWT_IMAGEPRODUCER, "com.sun.star.awt.ImageProducer" );
+ #define SRV_AWT_POINTER "com.sun.star.awt.Pointer"
+ #define SRV_AWT_IMAGEPRODUCER "com.sun.star.awt.ImageProducer"
- FORMS_CONSTASCII_STRING( SRV_SDB_ROWSET, "com.sun.star.sdb.RowSet" );
- FORMS_CONSTASCII_STRING( SRV_SDB_CONNECTION, "com.sun.star.sdb.Connection" );
+ #define SRV_SDB_ROWSET "com.sun.star.sdb.RowSet"
+ #define SRV_SDB_CONNECTION "com.sun.star.sdb.Connection"
//.........................................................................
diff --git a/forms/source/misc/frm_strings.cxx b/forms/source/misc/frm_strings.cxx
deleted file mode 100644
index 5e3710a..0000000
--- a/forms/source/misc/frm_strings.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#define FORMS_IMPLEMENT_STRINGS
-#include "frm_strings.hxx"
-#include "services.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index db4342b..dfbd656 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -130,31 +130,31 @@ void registerClassInfo(
//.......................................................................................
#define REGISTER_CLASS1(classImplName, service1) \
aServices.realloc(1); \
- aServices.getArray()[0] = frm::service1; \
+ aServices.getArray()[0] = service1; \
REGISTER_CLASS_CORE(classImplName)
//.......................................................................................
#define REGISTER_CLASS2(classImplName, service1, service2) \
aServices.realloc(2); \
- aServices.getArray()[0] = frm::service1; \
- aServices.getArray()[1] = frm::service2; \
+ aServices.getArray()[0] = service1; \
+ aServices.getArray()[1] = service2; \
REGISTER_CLASS_CORE(classImplName)
//.......................................................................................
#define REGISTER_CLASS3(classImplName, service1, service2, service3) \
aServices.realloc(3); \
- aServices.getArray()[0] = frm::service1; \
- aServices.getArray()[1] = frm::service2; \
- aServices.getArray()[2] = frm::service3; \
+ aServices.getArray()[0] = service1; \
+ aServices.getArray()[1] = service2; \
+ aServices.getArray()[2] = service3; \
REGISTER_CLASS_CORE(classImplName)
//.......................................................................................
#define REGISTER_CLASS4(classImplName, service1, service2, service3, service4) \
aServices.realloc(4); \
- aServices.getArray()[0] = frm::service1; \
- aServices.getArray()[1] = frm::service2; \
- aServices.getArray()[2] = frm::service3; \
- aServices.getArray()[3] = frm::service4; \
+ aServices.getArray()[0] = service1; \
+ aServices.getArray()[1] = service2; \
+ aServices.getArray()[2] = service3; \
+ aServices.getArray()[3] = service4; \
REGISTER_CLASS_CORE(classImplName)
//---------------------------------------------------------------------------------------
@@ -213,10 +213,10 @@ void ensureClassInfos()
// register the wrapper for the FormattedField, as it handles the XPersistObject::write
// so that version <= 5.1 are able to read it
aServices.realloc(4);
- aServices.getArray()[0] = frm::FRM_COMPONENT_FORMATTEDFIELD;
- aServices.getArray()[1] = frm::FRM_SUN_COMPONENT_FORMATTEDFIELD;
- aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
- aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD;
+ aServices.getArray()[0] = FRM_COMPONENT_FORMATTEDFIELD;
+ aServices.getArray()[1] = FRM_SUN_COMPONENT_FORMATTEDFIELD;
+ aServices.getArray()[2] = FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
+ aServices.getArray()[3] = BINDABLE_DATABASE_FORMATTED_FIELD;
registerClassInfo(OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
aServices,
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 292309e..b107a45 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -504,7 +504,7 @@ namespace frm
//--------------------------------------------------------------------
OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException)
{
- return FRM_SUN_COMPONENT_RICHTEXTCONTROL;
+ return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL);
}
//--------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list