[Libreoffice-commits] core.git: chart2/source dbaccess/source filter/source framework/source include/comphelper include/framework reportdesign/source sc/source sfx2/source svx/source
Noel Grandin
noelgrandin at gmail.com
Tue May 19 00:43:18 PDT 2015
chart2/source/inc/servicenames.hxx | 14 ++--
chart2/source/model/filter/XMLFilter.cxx | 4 -
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
filter/source/svg/svgwriter.hxx | 6 -
framework/source/classes/menumanager.cxx | 5 -
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/uielement/menubarmanager.cxx | 5 -
include/comphelper/documentconstants.hxx | 6 -
include/framework/addonsoptions.hxx | 2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 2
sc/source/filter/inc/excdefs.hxx | 4 -
sc/source/filter/inc/xlconst.hxx | 8 +-
sc/source/filter/inc/xlpivot.hxx | 2
sfx2/source/menu/virtmenu.cxx | 4 -
svx/source/inc/docrecovery.hxx | 22 +++---
svx/source/inc/fmservs.hxx | 38 ++++++------
16 files changed, 55 insertions(+), 71 deletions(-)
New commits:
commit 10749bbf8247f0b17201b33f95a090dfc4fc3211
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Sun May 17 09:47:07 2015 +0200
remove the last of the OUString #defines in header files
Change-Id: Id9e8ce7987e055e83b52c7024413570f262e6e8d
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index 212632e..c34870c 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -22,28 +22,28 @@
namespace chart
{
-#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartModel" )
+#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartModel"
#define CHART_MODEL_SERVICE_NAME "com.sun.star.chart2.ChartDocument"
//@todo create your own service containing the service com.sun.star.document.OfficeDocument
-#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartController" )
+#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartController"
#define CHART_CONTROLLER_SERVICE_NAME "com.sun.star.chart2.ChartController"
//@todo create your own service containing the service com.sun.star.frame.Controller
-#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartView" )
+#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartView"
#define CHART_VIEW_SERVICE_NAME "com.sun.star.chart2.ChartView"
-#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartFrameLoader" )
+#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartFrameLoader"
#define CHART_FRAMELOADER_SERVICE_NAME "com.sun.star.frame.SynchronousFrameLoader"
-#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.WizardDialog" )
+#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.WizardDialog"
#define CHART_WIZARD_DIALOG_SERVICE_NAME "com.sun.star.chart2.WizardDialog"
-#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartTypeDialog" )
+#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartTypeDialog"
#define CHART_TYPE_DIALOG_SERVICE_NAME "com.sun.star.chart2.ChartTypeDialog"
// wrapper for old UNO API (com.sun.star.chart)
-#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartDocumentWrapper" )
+#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartDocumentWrapper"
#define CHART_CHARTAPIWRAPPER_SERVICE_NAME "com.sun.star.chart2.ChartDocumentWrapper"
// accessibility
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 0712508..a12c1f6 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -775,7 +775,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes
}
OUString XMLFilter::getMediaType(bool _bOasis)
{
- return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART;
+ return _bOasis ? OUString(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII) : OUString(MIMETYPE_VND_SUN_XML_CHART_ASCII);
}
OUString SAL_CALL XMLFilter::getImplementationName()
@@ -809,7 +809,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >
}
OUString XMLReportFilterHelper::getMediaType(bool )
{
- return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART;
+ return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII;
}
} // namespace chart
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 7028a9d..926b1b2 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1654,7 +1654,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
aDelegatorArguments[nArgsLen++] <<= xInfoSet;
Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
- xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( OUString(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE) ) );
+ xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( OUString(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) ) );
OUString aVersion;
SvtSaveOptions::ODFDefaultVersion const nDefVersion =
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 7d279a7..42efe63 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -72,10 +72,10 @@ using namespace ::com::sun::star::xml::sax;
-#define SVG_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" )
+#define SVG_DTD_STRING "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">"
-#define SVGWRITER_WRITE_FILL 0x00000001
-#define SVGWRITER_WRITE_TEXT 0x00000002
+#define SVGWRITER_WRITE_FILL 0x00000001
+#define SVGWRITER_WRITE_TEXT 0x00000002
#define SVGWRITER_NO_SHAPE_COMMENTS 0x01000000
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 610c970..7cd0e7d 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -119,8 +119,6 @@ MenuManager::MenuManager(
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
- sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
-
sal_uInt16 nItemCount = pMenu->GetItemCount();
m_aMenuItemHandlerVector.reserve(nItemCount);
OUString aItemCommand;
@@ -140,8 +138,7 @@ MenuManager::MenuManager(
if ( pPopupMenu )
{
AddMenu(pPopupMenu,aItemCommand,nItemId,bDeleteChildren,bDeleteChildren);
- if (! ( aItemCommand.getLength() > nAddonsURLPrefixLength &&
- aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX ) ) )
+ if (! ( aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ) ) )
{
// Create addon popup menu if there exist elements and this is the tools popup menu
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 925bb43..f99a4f1 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -317,7 +317,7 @@ AddonsOptions_Impl::AddonsOptions_Impl()
: ConfigItem( ROOTNODE_ADDONMENU ),
m_nRootAddonPopupMenuId( 0 ),
m_aPathDelimiter( PATHDELIMITER ),
- m_aRootAddonPopupMenuURLPrexfix( ADDONSPOPUPMENU_URL_PREFIX )
+ m_aRootAddonPopupMenuURLPrexfix( ADDONSPOPUPMENU_URL_PREFIX_STR )
{
// initialize array with fixed property names
m_aPropNames[ INDEX_URL ] = PROPERTYNAME_URL;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 594e8bb..ad424fdc2 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1127,8 +1127,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
m_bRetrieveImages = false;
- sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
-
// Add root as ui configuration listener
RetrieveImageManagers();
@@ -1219,8 +1217,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
}
lcl_CheckForChildren(pMenu, nItemId);
}
- else if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
- ( aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX ) ))
+ else if ( aItemCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ) )
{
// A special addon popup menu, must be created with a different ctor
MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer,
diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx
index 9cadc39..d747a9e 100644
--- a/include/comphelper/documentconstants.hxx
+++ b/include/comphelper/documentconstants.hxx
@@ -33,8 +33,6 @@
#define MIMETYPE_VND_SUN_XML_MATH_ASCII "application/vnd.sun.xml.math"
#define MIMETYPE_VND_SUN_XML_BASE_ASCII "application/vnd.sun.xml.base"
-#define MIMETYPE_VND_SUN_XML_CHART OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII )
-
// template formats of SO6/7
#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII "application/vnd.sun.xml.writer.template"
#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII "application/vnd.sun.xml.draw.template"
@@ -54,10 +52,6 @@
#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII "application/vnd.sun.xml.report"
#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII "application/vnd.sun.xml.report.chart"
-#define MIMETYPE_OASIS_OPENDOCUMENT_CHART OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )
-
// template formats of SO8
#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII "application/vnd.oasis.opendocument.text-template"
#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII "application/vnd.oasis.opendocument.text-master-template"
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 4cb339a..25adf10 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -41,8 +41,6 @@
#define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon"
-#define ADDONSPOPUPMENU_URL_PREFIX OUString( ADDONSPOPUPMENU_URL_PREFIX_STR )
-
namespace framework
{
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index d15bb05..64fbc33 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -169,7 +169,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const
if ( !bEscapeProcessing )
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_ESCAPE_PROCESSING),::xmloff::token::GetXMLToken( XML_FALSE ));
- pList->AddAttribute(lcl_createAttribute(XML_NP_OFFICE,XML_MIMETYPE),MIMETYPE_OASIS_OPENDOCUMENT_CHART);
+ pList->AddAttribute(lcl_createAttribute(XML_NP_OFFICE,XML_MIMETYPE),MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII);
m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),xNewAttribs);
diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx
index 121b7a2..7b8b3e6 100644
--- a/sc/source/filter/inc/excdefs.hxx
+++ b/sc/source/filter/inc/excdefs.hxx
@@ -59,8 +59,8 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06;
// defines for change tracking ================================================
-#define EXC_STREAM_USERNAMES OUString( "User Names" )
-#define EXC_STREAM_REVLOG OUString( "Revision Log" )
+#define EXC_STREAM_USERNAMES "User Names"
+#define EXC_STREAM_REVLOG "Revision Log"
// opcodes
#define EXC_CHTR_OP_COLFLAG 0x0001
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index b402f00..1f1f8ee 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -76,13 +76,13 @@ const SCTAB SCTAB_GLOBAL = SCTAB_MAX; /// A Calc sheet
// Storage/stream names -------------------------------------------------------
-#define EXC_STORAGE_OLE_LINKED OUString( "LNK" )
-#define EXC_STORAGE_OLE_EMBEDDED OUString( "MBD" )
-#define EXC_STORAGE_VBA_PROJECT OUString( "_VBA_PROJECT_CUR" )
+#define EXC_STORAGE_OLE_LINKED "LNK"
+#define EXC_STORAGE_OLE_EMBEDDED "MBD"
+#define EXC_STORAGE_VBA_PROJECT "_VBA_PROJECT_CUR"
#define EXC_STREAM_BOOK "Book"
#define EXC_STREAM_WORKBOOK "Workbook"
-#define EXC_STREAM_CTLS OUString( "Ctls" )
+#define EXC_STREAM_CTLS "Ctls"
// Encoded URLs ---------------------------------------------------------------
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 1fb8317..a064e57 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -41,7 +41,7 @@ class XclExpStream;
// misc -----------------------------------------------------------------------
-#define EXC_STORAGE_PTCACHE OUString( "_SX_DB_CUR" )
+#define EXC_STORAGE_PTCACHE "_SX_DB_CUR"
// strings
const sal_uInt16 EXC_PT_NOSTRING = 0xFFFF;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 121dd94..e14bb24 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -623,7 +623,6 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
// Search , as SV with 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' always
// returns 0. It is like this, since the Event-Forwarding has nothing to do
// with the Parent-Menus CurItem.
- sal_uInt32 nAddonsPopupPrefixLen = ADDONSPOPUPMENU_URL_PREFIX.getLength();
for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
{
@@ -646,8 +645,7 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
OUString aCommand = pSVMenu->GetItemCommand( nSID );
if ( ( nSID == SID_ADDONS ) ||
( nSID == SID_ADDONHELP ) ||
- (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) &&
- ( aCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX ) ) ) )
+ ( aCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ) ) )
bIsAddonPopupMenu = true;
// Create VirtualMenu for Sub-Menu
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 6fe4566..1df6a1d 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -44,25 +44,25 @@
#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE "/doEmergencySave"
#define RECOVERY_CMDPART_DO_RECOVERY "/doAutoRecovery"
-#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave")
+#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE "vnd.sun.star.autorecovery:/doPrepareEmergencySave"
#define RECOVERY_CMD_DO_EMERGENCY_SAVE "vnd.sun.star.autorecovery:/doEmergencySave"
#define RECOVERY_CMD_DO_RECOVERY "vnd.sun.star.autorecovery:/doAutoRecovery"
-#define RECOVERY_CMD_DO_ENTRY_BACKUP OUString( "vnd.sun.star.autorecovery:/doEntryBackup" )
-#define RECOVERY_CMD_DO_ENTRY_CLEANUP OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" )
+#define RECOVERY_CMD_DO_ENTRY_BACKUP "vnd.sun.star.autorecovery:/doEntryBackup"
+#define RECOVERY_CMD_DO_ENTRY_CLEANUP "vnd.sun.star.autorecovery:/doEntryCleanUp"
#define PROP_STATUSINDICATOR "StatusIndicator"
#define PROP_DISPATCHASYNCHRON "DispatchAsynchron"
#define PROP_SAVEPATH "SavePath"
#define PROP_ENTRYID "EntryID"
-#define STATEPROP_ID OUString( "ID" )
-#define STATEPROP_STATE OUString( "DocumentState")
-#define STATEPROP_ORGURL OUString( "OriginalURL" )
-#define STATEPROP_TEMPURL OUString( "TempURL" )
-#define STATEPROP_FACTORYURL OUString( "FactoryURL" )
-#define STATEPROP_TEMPLATEURL OUString( "TemplateURL" )
-#define STATEPROP_TITLE OUString( "Title" )
-#define STATEPROP_MODULE OUString( "Module" )
+#define STATEPROP_ID "ID"
+#define STATEPROP_STATE "DocumentState"
+#define STATEPROP_ORGURL "OriginalURL"
+#define STATEPROP_TEMPURL "TempURL"
+#define STATEPROP_FACTORYURL "FactoryURL"
+#define STATEPROP_TEMPLATEURL "TemplateURL"
+#define STATEPROP_TITLE "Title"
+#define STATEPROP_MODULE "Module"
#define RECOVERY_OPERATIONSTATE_START "start"
#define RECOVERY_OPERATIONSTATE_STOP "stop"
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 479b5da..edc6a01 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -52,27 +52,27 @@ namespace com { namespace sun { namespace star { namespace lang {
#define FM_COMPONENT_IMAGECONTROL "stardiv.one.form.component.ImageControl"
#define FM_CONTROL_GRID "stardiv.one.form.control.Grid"
#define FM_CONTROL_GRIDCONTROL "stardiv.one.form.control.GridControl"
-#define SRV_SDB_CONNECTION OUString( "com.sun.star.sdb.Connection" )
-#define FM_SUN_COMPONENT_FORM OUString( "com.sun.star.form.component.Form" )
-#define FM_SUN_COMPONENT_TEXTFIELD OUString( "com.sun.star.form.component.TextField" )
-#define FM_SUN_COMPONENT_LISTBOX OUString( "com.sun.star.form.component.ListBox" )
-#define FM_SUN_COMPONENT_COMBOBOX OUString( "com.sun.star.form.component.ComboBox" )
-#define FM_SUN_COMPONENT_RADIOBUTTON OUString( "com.sun.star.form.component.RadioButton" )
-#define FM_SUN_COMPONENT_GROUPBOX OUString( "com.sun.star.form.component.GroupBox" )
-#define FM_SUN_COMPONENT_FIXEDTEXT OUString( "com.sun.star.form.component.FixedText" )
-#define FM_SUN_COMPONENT_COMMANDBUTTON OUString( "com.sun.star.form.component.CommandButton" )
+#define SRV_SDB_CONNECTION "com.sun.star.sdb.Connection"
+#define FM_SUN_COMPONENT_FORM "com.sun.star.form.component.Form"
+#define FM_SUN_COMPONENT_TEXTFIELD "com.sun.star.form.component.TextField"
+#define FM_SUN_COMPONENT_LISTBOX "com.sun.star.form.component.ListBox"
+#define FM_SUN_COMPONENT_COMBOBOX "com.sun.star.form.component.ComboBox"
+#define FM_SUN_COMPONENT_RADIOBUTTON "com.sun.star.form.component.RadioButton"
+#define FM_SUN_COMPONENT_GROUPBOX "com.sun.star.form.component.GroupBox"
+#define FM_SUN_COMPONENT_FIXEDTEXT "com.sun.star.form.component.FixedText"
+#define FM_SUN_COMPONENT_COMMANDBUTTON "com.sun.star.form.component.CommandButton"
#define FM_SUN_COMPONENT_CHECKBOX "com.sun.star.form.component.CheckBox"
-#define FM_SUN_COMPONENT_GRIDCONTROL OUString( "com.sun.star.form.component.GridControl" )
-#define FM_SUN_COMPONENT_IMAGEBUTTON OUString( "com.sun.star.form.component.ImageButton" )
-#define FM_SUN_COMPONENT_FILECONTROL OUString( "com.sun.star.form.component.FileControl" )
-#define FM_SUN_COMPONENT_TIMEFIELD OUString( "com.sun.star.form.component.TimeField" )
-#define FM_SUN_COMPONENT_DATEFIELD OUString( "com.sun.star.form.component.DateField" )
+#define FM_SUN_COMPONENT_GRIDCONTROL "com.sun.star.form.component.GridControl"
+#define FM_SUN_COMPONENT_IMAGEBUTTON "com.sun.star.form.component.ImageButton"
+#define FM_SUN_COMPONENT_FILECONTROL "com.sun.star.form.component.FileControl"
+#define FM_SUN_COMPONENT_TIMEFIELD "com.sun.star.form.component.TimeField"
+#define FM_SUN_COMPONENT_DATEFIELD "com.sun.star.form.component.DateField"
#define FM_SUN_COMPONENT_NUMERICFIELD "com.sun.star.form.component.NumericField"
-#define FM_SUN_COMPONENT_CURRENCYFIELD OUString( "com.sun.star.form.component.CurrencyField" )
-#define FM_SUN_COMPONENT_PATTERNFIELD OUString( "com.sun.star.form.component.PatternField" )
-#define FM_SUN_COMPONENT_HIDDENCONTROL OUString( "com.sun.star.form.component.HiddenControl" )
-#define FM_SUN_COMPONENT_IMAGECONTROL OUString( "com.sun.star.form.component.DatabaseImageControl" )
-#define FM_SUN_COMPONENT_FORMATTEDFIELD OUString( "com.sun.star.form.component.FormattedField" )
+#define FM_SUN_COMPONENT_CURRENCYFIELD "com.sun.star.form.component.CurrencyField"
+#define FM_SUN_COMPONENT_PATTERNFIELD "com.sun.star.form.component.PatternField"
+#define FM_SUN_COMPONENT_HIDDENCONTROL "com.sun.star.form.component.HiddenControl"
+#define FM_SUN_COMPONENT_IMAGECONTROL "com.sun.star.form.component.DatabaseImageControl"
+#define FM_SUN_COMPONENT_FORMATTEDFIELD "com.sun.star.form.component.FormattedField"
#define FM_SUN_COMPONENT_SCROLLBAR "com.sun.star.form.component.ScrollBar"
#define FM_SUN_COMPONENT_SPINBUTTON "com.sun.star.form.component.SpinButton"
#define FM_SUN_COMPONENT_NAVIGATIONBAR "com.sun.star.form.component.NavigationToolBar"
More information about the Libreoffice-commits
mailing list