extensions/inc/bitmaps.hlst                           |   66 +-
 extensions/inc/helpids.h                              |  566 +++++++++---------
 extensions/inc/propctrlr.h                            |  110 +--
 extensions/source/propctrlr/defaultforminspection.cxx |    2 
 extensions/source/propctrlr/eventhandler.cxx          |    2 
 extensions/source/propctrlr/eventhandler.hxx          |    4 
 extensions/source/propctrlr/formcomponenthandler.cxx  |   36 -
 extensions/source/propctrlr/formmetadata.cxx          |   10 
 extensions/source/propctrlr/formmetadata.hxx          |    2 
 extensions/source/propctrlr/formstrings.hxx           |  545 ++++++++---------
 extensions/source/propctrlr/pcrcommon.cxx             |    7 
 extensions/source/propctrlr/pcrcommon.hxx             |    2 
 extensions/source/propctrlr/pcrstrings.hxx            |    2 
 extensions/source/propctrlr/propertyinfo.hxx          |    2 
 extensions/source/propctrlr/selectlabeldialog.cxx     |    4 
 15 files changed, 677 insertions(+), 683 deletions(-)

New commits:
commit 260933744fe4572dae61c43467c7fb06fa5f888a
Author:     Noel Grandin <[email protected]>
AuthorDate: Wed Nov 24 13:27:38 2021 +0200
Commit:     Noel Grandin <[email protected]>
CommitDate: Thu Nov 25 12:11:01 2021 +0100

    loplugin:stringliteraldefine in extensions
    
    Change-Id: I9599fb3ca2fdcb30d8e1a52ecbfd954329762eae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125762
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <[email protected]>

diff --git a/extensions/inc/bitmaps.hlst b/extensions/inc/bitmaps.hlst
index c07bc6ec16d1..08a4d623bf58 100644
--- a/extensions/inc/bitmaps.hlst
+++ b/extensions/inc/bitmaps.hlst
@@ -10,43 +10,43 @@
 #ifndef INCLUDED_EXTENSIONS_INC_BITMAPS_HRC
 #define INCLUDED_EXTENSIONS_INC_BITMAPS_HRC
 
-#define RID_EXTBMP_CONTROL                  "res/sx10144.png"
-#define RID_EXTBMP_BUTTON                   "res/sx10594.png"
-#define RID_EXTBMP_RADIOBUTTON              "res/sx10595.png"
-#define RID_EXTBMP_CHECKBOX                 "res/sx10596.png"
-#define RID_EXTBMP_FIXEDTEXT                "res/sx10597.png"
-#define RID_EXTBMP_GROUPBOX                 "res/sx10598.png"
-#define RID_EXTBMP_EDITBOX                  "res/sx10599.png"
-#define RID_EXTBMP_LISTBOX                  "res/sx10600.png"
-#define RID_EXTBMP_COMBOBOX                 "res/sx10601.png"
-#define RID_EXTBMP_GRID                     "res/sx10603.png"
-#define RID_EXTBMP_IMAGEBUTTON              "res/sx10604.png"
-#define RID_EXTBMP_FILECONTROL              "res/sx10605.png"
-#define RID_EXTBMP_DATEFIELD                "res/sx10704.png"
-#define RID_EXTBMP_TIMEFIELD                "res/sx10705.png"
-#define RID_EXTBMP_NUMERICFIELD             "res/sx10706.png"
-#define RID_EXTBMP_CURRENCYFIELD            "res/sx10707.png"
-#define RID_EXTBMP_PATTERNFIELD             "res/sx10708.png"
-#define RID_EXTBMP_IMAGECONTROL             "res/sx10710.png"
-#define RID_EXTBMP_HIDDEN                   "res/sx18022.png"
+inline constexpr OUStringLiteral RID_EXTBMP_CONTROL = u"res/sx10144.png";
+inline constexpr OUStringLiteral RID_EXTBMP_BUTTON = u"res/sx10594.png";
+inline constexpr OUStringLiteral RID_EXTBMP_RADIOBUTTON = u"res/sx10595.png";
+inline constexpr OUStringLiteral RID_EXTBMP_CHECKBOX = u"res/sx10596.png";
+inline constexpr OUStringLiteral RID_EXTBMP_FIXEDTEXT = u"res/sx10597.png";
+inline constexpr OUStringLiteral RID_EXTBMP_GROUPBOX = u"res/sx10598.png";
+inline constexpr OUStringLiteral RID_EXTBMP_EDITBOX = u"res/sx10599.png";
+inline constexpr OUStringLiteral RID_EXTBMP_LISTBOX = u"res/sx10600.png";
+inline constexpr OUStringLiteral RID_EXTBMP_COMBOBOX = u"res/sx10601.png";
+inline constexpr OUStringLiteral RID_EXTBMP_GRID = u"res/sx10603.png";
+inline constexpr OUStringLiteral RID_EXTBMP_IMAGEBUTTON = u"res/sx10604.png";
+inline constexpr OUStringLiteral RID_EXTBMP_FILECONTROL = u"res/sx10605.png";
+inline constexpr OUStringLiteral RID_EXTBMP_DATEFIELD = u"res/sx10704.png";
+inline constexpr OUStringLiteral RID_EXTBMP_TIMEFIELD = u"res/sx10705.png";
+inline constexpr OUStringLiteral RID_EXTBMP_NUMERICFIELD = u"res/sx10706.png";
+inline constexpr OUStringLiteral RID_EXTBMP_CURRENCYFIELD = u"res/sx10707.png";
+inline constexpr OUStringLiteral RID_EXTBMP_PATTERNFIELD = u"res/sx10708.png";
+inline constexpr OUStringLiteral RID_EXTBMP_IMAGECONTROL = u"res/sx10710.png";
+inline constexpr OUStringLiteral RID_EXTBMP_HIDDEN = u"res/sx18022.png";
 #define RID_EXTBMP_FORMATTEDFIELD           "res/sx10728.png"
 #define RID_EXTBMP_FILTER                   "res/sx10715.png"
-#define RID_EXTBMP_FORMS                    "res/sx18013.png"
-#define RID_EXTBMP_FORM                     "res/sx10593.png"
+inline constexpr OUStringLiteral RID_EXTBMP_FORMS = u"res/sx18013.png";
+inline constexpr OUStringLiteral RID_EXTBMP_FORM = u"res/sx10593.png";
 #define RID_EXTBMP_COLLAPSEDNODE            "res/sx18002.png"
 #define RID_EXTBMP_EXPANDEDNODE             "res/sx18003.png"
-#define RID_EXTBMP_SCROLLBAR                "res/sx10768.png"
-#define RID_EXTBMP_SPINBUTTON               "res/sx10769.png"
-#define RID_EXTBMP_NAVIGATIONBAR            "res/sx10607.png"
-#define RID_SCANNER_HANDLE                  "extensions/res/scanner/handle.png"
-#define BMP_TABLE                           "res/sx03188.png"
-#define BMP_QUERY                           "res/sx03202.png"
-#define RID_EXTBMP_AUTOFILTER_SC            "res/sc10716.png"
-#define RID_EXTBMP_FILTERCRIT_SC            "res/sc10715.png"
-#define RID_EXTBMP_REMOVE_FILTER_SORT_SC    "res/sc10711.png"
-#define RID_EXTBMP_AUTOFILTER_LC            "res/lc10716.png"
-#define RID_EXTBMP_FILTERCRIT_LC            "res/lc10715.png"
-#define RID_EXTBMP_REMOVE_FILTER_SORT_LC    "res/lc10711.png"
+inline constexpr OUStringLiteral RID_EXTBMP_SCROLLBAR = u"res/sx10768.png";
+inline constexpr OUStringLiteral RID_EXTBMP_SPINBUTTON = u"res/sx10769.png";
+inline constexpr OUStringLiteral RID_EXTBMP_NAVIGATIONBAR = u"res/sx10607.png";
+inline constexpr OUStringLiteral RID_SCANNER_HANDLE = 
u"extensions/res/scanner/handle.png";
+inline constexpr OUStringLiteral BMP_TABLE = u"res/sx03188.png";
+inline constexpr OUStringLiteral BMP_QUERY = u"res/sx03202.png";
+inline constexpr OUStringLiteral RID_EXTBMP_AUTOFILTER_SC = u"res/sc10716.png";
+inline constexpr OUStringLiteral RID_EXTBMP_FILTERCRIT_SC = u"res/sc10715.png";
+inline constexpr OUStringLiteral RID_EXTBMP_REMOVE_FILTER_SORT_SC = 
u"res/sc10711.png";
+inline constexpr OUStringLiteral RID_EXTBMP_AUTOFILTER_LC = u"res/lc10716.png";
+inline constexpr OUStringLiteral RID_EXTBMP_FILTERCRIT_LC = u"res/lc10715.png";
+inline constexpr OUStringLiteral RID_EXTBMP_REMOVE_FILTER_SORT_LC = 
u"res/lc10711.png";
 #define SV_RESID_BITMAP_INFOBOX             "vcl/res/infobox.png"
 
 #endif
diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h
index e4a609aafc82..ea0e12ab1600 100644
--- a/extensions/inc/helpids.h
+++ b/extensions/inc/helpids.h
@@ -20,307 +20,307 @@
 #ifndef EXTENSIONS_HELPIDS_H
 #define EXTENSIONS_HELPIDS_H
 
-#define HID_ABSPILOT_PREVIOUS                           
"EXTENSIONS_HID_ABSPILOT_PREVIOUS"
-#define HID_ABSPILOT_NEXT                               
"EXTENSIONS_HID_ABSPILOT_NEXT"
-#define HID_ABSPILOT_CANCEL                             
"EXTENSIONS_HID_ABSPILOT_CANCEL"
-#define HID_ABSPILOT_FINISH                             
"EXTENSIONS_HID_ABSPILOT_FINISH"
-#define UID_ABSPILOT_HELP                               
"EXTENSIONS_UID_ABSPILOT_HELP"
-#define HID_ABSPILOT                                    
"EXTENSIONS_HID_ABSPILOT"
+inline constexpr OStringLiteral HID_ABSPILOT_PREVIOUS = 
"EXTENSIONS_HID_ABSPILOT_PREVIOUS";
+inline constexpr OStringLiteral HID_ABSPILOT_NEXT = 
"EXTENSIONS_HID_ABSPILOT_NEXT";
+inline constexpr OStringLiteral HID_ABSPILOT_CANCEL = 
"EXTENSIONS_HID_ABSPILOT_CANCEL";
+inline constexpr OStringLiteral HID_ABSPILOT_FINISH = 
"EXTENSIONS_HID_ABSPILOT_FINISH";
+inline constexpr OStringLiteral UID_ABSPILOT_HELP = 
"EXTENSIONS_UID_ABSPILOT_HELP";
+inline constexpr OStringLiteral HID_ABSPILOT = "EXTENSIONS_HID_ABSPILOT";
 
-#define HID_BIB_IDENTIFIER_POS                          
"EXTENSIONS_HID_BIB_IDENTIFIER_POS"
-#define HID_BIB_AUTHORITYTYPE_POS                       
"EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS"
-#define HID_BIB_AUTHOR_POS                              
"EXTENSIONS_HID_BIB_AUTHOR_POS"
-#define HID_BIB_TITLE_POS                               
"EXTENSIONS_HID_BIB_TITLE_POS"
-#define HID_BIB_YEAR_POS                                
"EXTENSIONS_HID_BIB_YEAR_POS"
-#define HID_BIB_ISBN_POS                                
"EXTENSIONS_HID_BIB_ISBN_POS"
-#define HID_BIB_BOOKTITLE_POS                           
"EXTENSIONS_HID_BIB_BOOKTITLE_POS"
-#define HID_BIB_CHAPTER_POS                             
"EXTENSIONS_HID_BIB_CHAPTER_POS"
-#define HID_BIB_EDITION_POS                             
"EXTENSIONS_HID_BIB_EDITION_POS"
-#define HID_BIB_EDITOR_POS                              
"EXTENSIONS_HID_BIB_EDITOR_POS"
-#define HID_BIB_HOWPUBLISHED_POS                        
"EXTENSIONS_HID_BIB_HOWPUBLISHED_POS"
-#define HID_BIB_INSTITUTION_POS                         
"EXTENSIONS_HID_BIB_INSTITUTION_POS"
-#define HID_BIB_JOURNAL_POS                             
"EXTENSIONS_HID_BIB_JOURNAL_POS"
-#define HID_BIB_MONTH_POS                               
"EXTENSIONS_HID_BIB_MONTH_POS"
-#define HID_BIB_NOTE_POS                                
"EXTENSIONS_HID_BIB_NOTE_POS"
-#define HID_BIB_ANNOTE_POS                              
"EXTENSIONS_HID_BIB_ANNOTE_POS"
-#define HID_BIB_NUMBER_POS                              
"EXTENSIONS_HID_BIB_NUMBER_POS"
-#define HID_BIB_ORGANIZATIONS_POS                       
"EXTENSIONS_HID_BIB_ORGANIZATIONS_POS"
-#define HID_BIB_PAGES_POS                               
"EXTENSIONS_HID_BIB_PAGES_POS"
-#define HID_BIB_PUBLISHER_POS                           
"EXTENSIONS_HID_BIB_PUBLISHER_POS"
-#define HID_BIB_ADDRESS_POS                             
"EXTENSIONS_HID_BIB_ADDRESS_POS"
-#define HID_BIB_SCHOOL_POS                              
"EXTENSIONS_HID_BIB_SCHOOL_POS"
-#define HID_BIB_SERIES_POS                              
"EXTENSIONS_HID_BIB_SERIES_POS"
-#define HID_BIB_REPORTTYPE_POS                          
"EXTENSIONS_HID_BIB_REPORTTYPE_POS"
-#define HID_BIB_VOLUME_POS                              
"EXTENSIONS_HID_BIB_VOLUME_POS"
-#define HID_BIB_URL_POS                                 
"EXTENSIONS_HID_BIB_URL_POS"
-#define HID_BIB_CUSTOM1_POS                             
"EXTENSIONS_HID_BIB_CUSTOM1_POS"
-#define HID_BIB_CUSTOM2_POS                             
"EXTENSIONS_HID_BIB_CUSTOM2_POS"
-#define HID_BIB_CUSTOM3_POS                             
"EXTENSIONS_HID_BIB_CUSTOM3_POS"
-#define HID_BIB_CUSTOM4_POS                             
"EXTENSIONS_HID_BIB_CUSTOM4_POS"
-#define HID_BIB_CUSTOM5_POS                             
"EXTENSIONS_HID_BIB_CUSTOM5_POS"
-#define HID_BIB_LOCAL_URL_POS                           
"EXTENSIONS_HID_BIB_LOCAL_URL_POS"
+inline constexpr OStringLiteral HID_BIB_IDENTIFIER_POS = 
"EXTENSIONS_HID_BIB_IDENTIFIER_POS";
+inline constexpr OStringLiteral HID_BIB_AUTHORITYTYPE_POS = 
"EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS";
+inline constexpr OStringLiteral HID_BIB_AUTHOR_POS = 
"EXTENSIONS_HID_BIB_AUTHOR_POS";
+inline constexpr OStringLiteral HID_BIB_TITLE_POS = 
"EXTENSIONS_HID_BIB_TITLE_POS";
+inline constexpr OStringLiteral HID_BIB_YEAR_POS = 
"EXTENSIONS_HID_BIB_YEAR_POS";
+inline constexpr OStringLiteral HID_BIB_ISBN_POS = 
"EXTENSIONS_HID_BIB_ISBN_POS";
+inline constexpr OStringLiteral HID_BIB_BOOKTITLE_POS = 
"EXTENSIONS_HID_BIB_BOOKTITLE_POS";
+inline constexpr OStringLiteral HID_BIB_CHAPTER_POS = 
"EXTENSIONS_HID_BIB_CHAPTER_POS";
+inline constexpr OStringLiteral HID_BIB_EDITION_POS = 
"EXTENSIONS_HID_BIB_EDITION_POS";
+inline constexpr OStringLiteral HID_BIB_EDITOR_POS = 
"EXTENSIONS_HID_BIB_EDITOR_POS";
+inline constexpr OStringLiteral HID_BIB_HOWPUBLISHED_POS = 
"EXTENSIONS_HID_BIB_HOWPUBLISHED_POS";
+inline constexpr OStringLiteral HID_BIB_INSTITUTION_POS = 
"EXTENSIONS_HID_BIB_INSTITUTION_POS";
+inline constexpr OStringLiteral HID_BIB_JOURNAL_POS = 
"EXTENSIONS_HID_BIB_JOURNAL_POS";
+inline constexpr OStringLiteral HID_BIB_MONTH_POS = 
"EXTENSIONS_HID_BIB_MONTH_POS";
+inline constexpr OStringLiteral HID_BIB_NOTE_POS = 
"EXTENSIONS_HID_BIB_NOTE_POS";
+inline constexpr OStringLiteral HID_BIB_ANNOTE_POS = 
"EXTENSIONS_HID_BIB_ANNOTE_POS";
+inline constexpr OStringLiteral HID_BIB_NUMBER_POS = 
"EXTENSIONS_HID_BIB_NUMBER_POS";
+inline constexpr OStringLiteral HID_BIB_ORGANIZATIONS_POS = 
"EXTENSIONS_HID_BIB_ORGANIZATIONS_POS";
+inline constexpr OStringLiteral HID_BIB_PAGES_POS = 
"EXTENSIONS_HID_BIB_PAGES_POS";
+inline constexpr OStringLiteral HID_BIB_PUBLISHER_POS = 
"EXTENSIONS_HID_BIB_PUBLISHER_POS";
+inline constexpr OStringLiteral HID_BIB_ADDRESS_POS = 
"EXTENSIONS_HID_BIB_ADDRESS_POS";
+inline constexpr OStringLiteral HID_BIB_SCHOOL_POS = 
"EXTENSIONS_HID_BIB_SCHOOL_POS";
+inline constexpr OStringLiteral HID_BIB_SERIES_POS = 
"EXTENSIONS_HID_BIB_SERIES_POS";
+inline constexpr OStringLiteral HID_BIB_REPORTTYPE_POS = 
"EXTENSIONS_HID_BIB_REPORTTYPE_POS";
+inline constexpr OStringLiteral HID_BIB_VOLUME_POS = 
"EXTENSIONS_HID_BIB_VOLUME_POS";
+inline constexpr OStringLiteral HID_BIB_URL_POS = "EXTENSIONS_HID_BIB_URL_POS";
+inline constexpr OStringLiteral HID_BIB_CUSTOM1_POS = 
"EXTENSIONS_HID_BIB_CUSTOM1_POS";
+inline constexpr OStringLiteral HID_BIB_CUSTOM2_POS = 
"EXTENSIONS_HID_BIB_CUSTOM2_POS";
+inline constexpr OStringLiteral HID_BIB_CUSTOM3_POS = 
"EXTENSIONS_HID_BIB_CUSTOM3_POS";
+inline constexpr OStringLiteral HID_BIB_CUSTOM4_POS = 
"EXTENSIONS_HID_BIB_CUSTOM4_POS";
+inline constexpr OStringLiteral HID_BIB_CUSTOM5_POS = 
"EXTENSIONS_HID_BIB_CUSTOM5_POS";
+inline constexpr OStringLiteral HID_BIB_LOCAL_URL_POS = 
"EXTENSIONS_HID_BIB_LOCAL_URL_POS";
 #define HID_BIB_DB_GRIDCTRL                             
"EXTENSIONS_HID_BIB_DB_GRIDCTRL"
 
-#define HID_GROUPWIZARD_PREVIOUS                        
"EXTENSIONS_HID_GROUPWIZARD_PREVIOUS"
-#define HID_GROUPWIZARD_NEXT                            
"EXTENSIONS_HID_GROUPWIZARD_NEXT"
-#define HID_GROUPWIZARD_CANCEL                          
"EXTENSIONS_HID_GROUPWIZARD_CANCEL"
-#define HID_GROUPWIZARD_FINISH                          
"EXTENSIONS_HID_GROUPWIZARD_FINISH"
-#define HID_LISTWIZARD_PREVIOUS                         
"EXTENSIONS_HID_LISTWIZARD_PREVIOUS"
-#define HID_LISTWIZARD_NEXT                             
"EXTENSIONS_HID_LISTWIZARD_NEXT"
-#define HID_LISTWIZARD_CANCEL                           
"EXTENSIONS_HID_LISTWIZARD_CANCEL"
-#define HID_LISTWIZARD_FINISH                           
"EXTENSIONS_HID_LISTWIZARD_FINISH"
-#define HID_GRIDWIZARD_PREVIOUS                         
"EXTENSIONS_HID_GRIDWIZARD_PREVIOUS"
-#define HID_GRIDWIZARD_NEXT                             
"EXTENSIONS_HID_GRIDWIZARD_NEXT"
-#define HID_GRIDWIZARD_CANCEL                           
"EXTENSIONS_HID_GRIDWIZARD_CANCEL"
-#define HID_GRIDWIZARD_FINISH                           
"EXTENSIONS_HID_GRIDWIZARD_FINISH"
+inline constexpr OStringLiteral HID_GROUPWIZARD_PREVIOUS = 
"EXTENSIONS_HID_GROUPWIZARD_PREVIOUS";
+inline constexpr OStringLiteral HID_GROUPWIZARD_NEXT = 
"EXTENSIONS_HID_GROUPWIZARD_NEXT";
+inline constexpr OStringLiteral HID_GROUPWIZARD_CANCEL = 
"EXTENSIONS_HID_GROUPWIZARD_CANCEL";
+inline constexpr OStringLiteral HID_GROUPWIZARD_FINISH = 
"EXTENSIONS_HID_GROUPWIZARD_FINISH";
+inline constexpr OStringLiteral HID_LISTWIZARD_PREVIOUS = 
"EXTENSIONS_HID_LISTWIZARD_PREVIOUS";
+inline constexpr OStringLiteral HID_LISTWIZARD_NEXT = 
"EXTENSIONS_HID_LISTWIZARD_NEXT";
+inline constexpr OStringLiteral HID_LISTWIZARD_CANCEL = 
"EXTENSIONS_HID_LISTWIZARD_CANCEL";
+inline constexpr OStringLiteral HID_LISTWIZARD_FINISH = 
"EXTENSIONS_HID_LISTWIZARD_FINISH";
+inline constexpr OStringLiteral HID_GRIDWIZARD_PREVIOUS = 
"EXTENSIONS_HID_GRIDWIZARD_PREVIOUS";
+inline constexpr OStringLiteral HID_GRIDWIZARD_NEXT = 
"EXTENSIONS_HID_GRIDWIZARD_NEXT";
+inline constexpr OStringLiteral HID_GRIDWIZARD_CANCEL = 
"EXTENSIONS_HID_GRIDWIZARD_CANCEL";
+inline constexpr OStringLiteral HID_GRIDWIZARD_FINISH = 
"EXTENSIONS_HID_GRIDWIZARD_FINISH";
 
-#define HID_PROP_INPUT_REQUIRED                         
"EXTENSIONS_HID_PROP_INPUT_REQUIRED"
+inline constexpr OUStringLiteral HID_PROP_INPUT_REQUIRED = 
u"EXTENSIONS_HID_PROP_INPUT_REQUIRED";
 #define HID_PROP_GROUPBOX                               
"EXTENSIONS_HID_PROP_GROUPBOX"
-#define HID_PROP_CONTROLSOURCE                          
"EXTENSIONS_HID_PROP_CONTROLSOURCE"
-#define HID_PROP_NAME                                   
"EXTENSIONS_HID_PROP_NAME"
-#define HID_PROP_TABINDEX                               
"EXTENSIONS_HID_PROP_TABINDEX"
-#define HID_PROP_MASTERFIELDS                           
"EXTENSIONS_HID_PROP_MASTERFIELDS"
-#define HID_PROP_SLAVEFIELDS                            
"EXTENSIONS_HID_PROP_SLAVEFIELDS"
-#define HID_PROP_DATASOURCE                             
"EXTENSIONS_HID_PROP_DATASOURCE"
-#define HID_PROP_CURSORSOURCE                           
"EXTENSIONS_HID_PROP_CURSORSOURCE"
-#define HID_PROP_CURSORSOURCETYPE                       
"EXTENSIONS_HID_PROP_CURSORSOURCETYPE"
+inline constexpr OUStringLiteral HID_PROP_CONTROLSOURCE = 
u"EXTENSIONS_HID_PROP_CONTROLSOURCE";
+inline constexpr OUStringLiteral HID_PROP_NAME = u"EXTENSIONS_HID_PROP_NAME";
+inline constexpr OUStringLiteral HID_PROP_TABINDEX = 
u"EXTENSIONS_HID_PROP_TABINDEX";
+inline constexpr OUStringLiteral HID_PROP_MASTERFIELDS = 
u"EXTENSIONS_HID_PROP_MASTERFIELDS";
+inline constexpr OUStringLiteral HID_PROP_SLAVEFIELDS = 
u"EXTENSIONS_HID_PROP_SLAVEFIELDS";
+inline constexpr OUStringLiteral HID_PROP_DATASOURCE = 
u"EXTENSIONS_HID_PROP_DATASOURCE";
+inline constexpr OUStringLiteral HID_PROP_CURSORSOURCE = 
u"EXTENSIONS_HID_PROP_CURSORSOURCE";
+inline constexpr OUStringLiteral HID_PROP_CURSORSOURCETYPE = 
u"EXTENSIONS_HID_PROP_CURSORSOURCETYPE";
 #define HID_PROP_CURSORTYPE                             
"EXTENSIONS_HID_PROP_CURSORTYPE"
-#define HID_PROP_READONLY                               
"EXTENSIONS_HID_PROP_READONLY"
-#define HID_PROP_DATAENTRY                              
"EXTENSIONS_HID_PROP_DATAENTRY"
-#define HID_PROP_NAVIGATION                             
"EXTENSIONS_HID_PROP_NAVIGATION"
-#define HID_PROP_CYCLE                                  
"EXTENSIONS_HID_PROP_CYCLE"
-#define HID_PROP_ALLOW_ADDITIONS                        
"EXTENSIONS_HID_PROP_ALLOW_ADDITIONS"
-#define HID_PROP_ALLOW_EDITS                            
"EXTENSIONS_HID_PROP_ALLOW_EDITS"
-#define HID_PROP_ALLOW_DELETIONS                        
"EXTENSIONS_HID_PROP_ALLOW_DELETIONS"
+inline constexpr OUStringLiteral HID_PROP_READONLY = 
u"EXTENSIONS_HID_PROP_READONLY";
+inline constexpr OUStringLiteral HID_PROP_DATAENTRY = 
u"EXTENSIONS_HID_PROP_DATAENTRY";
+inline constexpr OUStringLiteral HID_PROP_NAVIGATION = 
u"EXTENSIONS_HID_PROP_NAVIGATION";
+inline constexpr OUStringLiteral HID_PROP_CYCLE = u"EXTENSIONS_HID_PROP_CYCLE";
+inline constexpr OUStringLiteral HID_PROP_ALLOW_ADDITIONS = 
u"EXTENSIONS_HID_PROP_ALLOW_ADDITIONS";
+inline constexpr OUStringLiteral HID_PROP_ALLOW_EDITS = 
u"EXTENSIONS_HID_PROP_ALLOW_EDITS";
+inline constexpr OUStringLiteral HID_PROP_ALLOW_DELETIONS = 
u"EXTENSIONS_HID_PROP_ALLOW_DELETIONS";
 #define HID_PROP_DIRTY                                  
"EXTENSIONS_HID_PROP_DIRTY"
 #define HID_PROP_OLDVALUE                               
"EXTENSIONS_HID_PROP_OLDVALUE"
-#define HID_PROP_VALUE                                  
"EXTENSIONS_HID_PROP_VALUE"
+inline constexpr OUStringLiteral HID_PROP_VALUE = u"EXTENSIONS_HID_PROP_VALUE";
 #define HID_PROP_LOCKED                                 
"EXTENSIONS_HID_PROP_LOCKED"
-#define HID_PROP_FORMATKEY                              
"EXTENSIONS_HID_PROP_FORMATKEY"
+inline constexpr OUStringLiteral HID_PROP_FORMATKEY = 
u"EXTENSIONS_HID_PROP_FORMATKEY";
 #define HID_PROP_REQUIRED                               
"EXTENSIONS_HID_PROP_REQUIRED"
-#define HID_PROP_WHEEL_BEHAVIOR                         
"EXTENSIONS_HID_PROP_WHEEL_BEHAVIOR"
+inline constexpr OUStringLiteral HID_PROP_WHEEL_BEHAVIOR = 
u"EXTENSIONS_HID_PROP_WHEEL_BEHAVIOR";
 #define HID_PROP_UNIQUE                                 
"EXTENSIONS_HID_PROP_UNIQUE"
 #define HID_PROP_CLASSID                                
"EXTENSIONS_HID_PROP_CLASSID"
 #define HID_PROP_LEFT                                   
"EXTENSIONS_HID_PROP_LEFT"
 #define HID_PROP_RIGHT                                  
"EXTENSIONS_HID_PROP_RIGHT"
-#define HID_PROP_HEIGHT                                 
"EXTENSIONS_HID_PROP_HEIGHT"
-#define HID_PROP_WIDTH                                  
"EXTENSIONS_HID_PROP_WIDTH"
-#define HID_PROP_AUTOGROW                               
"EXTENSIONS_HID_PROP_AUTOGROW"
-#define HID_PROP_BOUNDCOLUMN                            
"EXTENSIONS_HID_PROP_BOUNDCOLUMN"
-#define HID_PROP_LISTSOURCETYPE                         
"EXTENSIONS_HID_PROP_LISTSOURCETYPE"
-#define HID_PROP_LISTSOURCE                             
"EXTENSIONS_HID_PROP_LISTSOURCE"
-#define HID_PROP_LISTINDEX                              
"EXTENSIONS_HID_PROP_LISTINDEX"
-#define HID_PROP_TEXT                                   
"EXTENSIONS_HID_PROP_TEXT"
-#define HID_PROP_LABEL                                  
"EXTENSIONS_HID_PROP_LABEL"
-#define HID_PROP_STRINGITEMLIST                         
"EXTENSIONS_HID_PROP_STRINGITEMLIST"
+inline constexpr OUStringLiteral HID_PROP_HEIGHT = 
u"EXTENSIONS_HID_PROP_HEIGHT";
+inline constexpr OUStringLiteral HID_PROP_WIDTH = u"EXTENSIONS_HID_PROP_WIDTH";
+inline constexpr OUStringLiteral HID_PROP_AUTOGROW = 
u"EXTENSIONS_HID_PROP_AUTOGROW";
+inline constexpr OUStringLiteral HID_PROP_BOUNDCOLUMN = 
u"EXTENSIONS_HID_PROP_BOUNDCOLUMN";
+inline constexpr OUStringLiteral HID_PROP_LISTSOURCETYPE = 
u"EXTENSIONS_HID_PROP_LISTSOURCETYPE";
+inline constexpr OUStringLiteral HID_PROP_LISTSOURCE = 
u"EXTENSIONS_HID_PROP_LISTSOURCE";
+inline constexpr OUStringLiteral HID_PROP_LISTINDEX = 
u"EXTENSIONS_HID_PROP_LISTINDEX";
+inline constexpr OUStringLiteral HID_PROP_TEXT = u"EXTENSIONS_HID_PROP_TEXT";
+inline constexpr OUStringLiteral HID_PROP_LABEL = u"EXTENSIONS_HID_PROP_LABEL";
+inline constexpr OUStringLiteral HID_PROP_STRINGITEMLIST = 
u"EXTENSIONS_HID_PROP_STRINGITEMLIST";
 #define HID_PROP_SEARCHING                              
"EXTENSIONS_HID_PROP_SEARCHING"
-#define HID_PROP_FONT                                   
"EXTENSIONS_HID_PROP_FONT"
-#define HID_PROP_ROWHEIGHT                              
"EXTENSIONS_HID_PROP_ROWHEIGHT"
-#define HID_PROP_BACKGROUNDCOLOR                        
"EXTENSIONS_HID_PROP_BACKGROUNDCOLOR"
-#define HID_PROP_FILLCOLOR                              
"EXTENSIONS_HID_PROP_FILLCOLOR"
-#define HID_PROP_LINECOLOR                              
"EXTENSIONS_HID_PROP_LINECOLOR"
-#define HID_PROP_BORDER                                 
"EXTENSIONS_HID_PROP_BORDER"
-#define HID_PROP_ALIGN                                  
"EXTENSIONS_HID_PROP_ALIGN"
-#define HID_PROP_VERTICAL_ALIGN                         
"EXTENSIONS_HID_PROP_VERTICAL_ALIGN"
-#define HID_PROP_DROPDOWN                               
"EXTENSIONS_HID_PROP_DROPDOWN"
-#define HID_PROP_MULTILINE                              
"EXTENSIONS_HID_PROP_MULTILINE"
-#define HID_PROP_HSCROLL                                
"EXTENSIONS_HID_PROP_HSCROLL"
-#define HID_PROP_VSCROLL                                
"EXTENSIONS_HID_PROP_VSCROLL"
-#define HID_PROP_TABSTOP                                
"EXTENSIONS_HID_PROP_TABSTOP"
-#define HID_PROP_REFVALUE                               
"EXTENSIONS_HID_PROP_REFVALUE"
-#define HID_PROP_BUTTONTYPE                             
"EXTENSIONS_HID_PROP_BUTTONTYPE"
-#define HID_PROP_SUBMIT_ACTION                          
"EXTENSIONS_HID_PROP_SUBMIT_ACTION"
-#define HID_PROP_SUBMIT_METHOD                          
"EXTENSIONS_HID_PROP_SUBMIT_METHOD"
-#define HID_PROP_SUBMIT_ENCODING                        
"EXTENSIONS_HID_PROP_SUBMIT_ENCODING"
-#define HID_PROP_DEFAULTVALUE                           
"EXTENSIONS_HID_PROP_DEFAULTVALUE"
-#define HID_PROP_SUBMIT_TARGET                          
"EXTENSIONS_HID_PROP_SUBMIT_TARGET"
-#define HID_PROP_DEFAULT_STATE                          
"EXTENSIONS_HID_PROP_DEFAULT_STATE"
-#define HID_PROP_IMAGE_URL                              
"EXTENSIONS_HID_PROP_IMAGE_URL"
-#define HID_PROP_DEFAULT_SELECT_SEQ                     
"EXTENSIONS_HID_PROP_DEFAULT_SELECT_SEQ"
-#define HID_PROP_MULTISELECTION                         
"EXTENSIONS_HID_PROP_MULTISELECTION"
-#define HID_PROP_DATE                                   
"EXTENSIONS_HID_PROP_DATE"
-#define HID_PROP_DATEMIN                                
"EXTENSIONS_HID_PROP_DATEMIN"
-#define HID_PROP_DATEMAX                                
"EXTENSIONS_HID_PROP_DATEMAX"
-#define HID_PROP_DATEFORMAT                             
"EXTENSIONS_HID_PROP_DATEFORMAT"
-#define HID_PROP_TIME                                   
"EXTENSIONS_HID_PROP_TIME"
-#define HID_PROP_TIMEMIN                                
"EXTENSIONS_HID_PROP_TIMEMIN"
-#define HID_PROP_TIMEMAX                                
"EXTENSIONS_HID_PROP_TIMEMAX"
-#define HID_PROP_TIMEFORMAT                             
"EXTENSIONS_HID_PROP_TIMEFORMAT"
-#define HID_PROP_VALUEMIN                               
"EXTENSIONS_HID_PROP_VALUEMIN"
-#define HID_PROP_VALUEMAX                               
"EXTENSIONS_HID_PROP_VALUEMAX"
-#define HID_PROP_VALUESTEP                              
"EXTENSIONS_HID_PROP_VALUESTEP"
-#define HID_PROP_CURRENCYSYMBOL                         
"EXTENSIONS_HID_PROP_CURRENCYSYMBOL"
-#define HID_PROP_EDITMASK                               
"EXTENSIONS_HID_PROP_EDITMASK"
-#define HID_PROP_LITERALMASK                            
"EXTENSIONS_HID_PROP_LITERALMASK"
-#define HID_PROP_ENABLED                                
"EXTENSIONS_HID_PROP_ENABLED"
-#define HID_PROP_AUTOCOMPLETE                           
"EXTENSIONS_HID_PROP_AUTOCOMPLETE"
-#define HID_PROP_LINECOUNT                              
"EXTENSIONS_HID_PROP_LINECOUNT"
-#define HID_PROP_MAXTEXTLEN                             
"EXTENSIONS_HID_PROP_MAXTEXTLEN"
-#define HID_PROP_SPIN                                   
"EXTENSIONS_HID_PROP_SPIN"
-#define HID_PROP_STRICTFORMAT                           
"EXTENSIONS_HID_PROP_STRICTFORMAT"
-#define HID_PROP_SHOWTHOUSANDSEP                        
"EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP"
-#define HID_PROP_PRINTABLE                              
"EXTENSIONS_HID_PROP_PRINTABLE"
-#define HID_PROP_TARGET_URL                             
"EXTENSIONS_HID_PROP_TARGET_URL"
-#define HID_PROP_TARGET_FRAME                           
"EXTENSIONS_HID_PROP_TARGET_FRAME"
-#define HID_PROP_TAG                                    
"EXTENSIONS_HID_PROP_TAG"
-#define HID_PROP_ECHO_CHAR                              
"EXTENSIONS_HID_PROP_ECHO_CHAR"
-#define HID_PROP_EMPTY_IS_NULL                          
"EXTENSIONS_HID_PROP_EMPTY_IS_NULL"
-#define HID_PROP_DECIMAL_ACCURACY                       
"EXTENSIONS_HID_PROP_DECIMAL_ACCURACY"
-#define HID_PROP_ENABLE_VISIBLE                         
"EXTENSIONS_HID_PROP_ENABLE_VISIBLE"
-#define HID_PROP_DEFAULT_BUTTON                         
"EXTENSIONS_HID_PROP_DEFAULT_BUTTON"
-#define HID_PROP_HIDDEN_VALUE                           
"EXTENSIONS_HID_PROP_HIDDEN_VALUE"
-#define HID_PROP_TRISTATE                               
"EXTENSIONS_HID_PROP_TRISTATE"
-#define HID_PROP_NAVIGATIONBAR                          
"EXTENSIONS_HID_PROP_NAVIGATIONBAR"
-#define HID_PROP_FILTER                                 
"EXTENSIONS_HID_PROP_FILTER"
-#define HID_PROP_SORT_CRITERIA                          
"EXTENSIONS_HID_PROP_SORT_CRITERIA"
-#define HID_PROP_DEFAULT_LONG_VALUE                     
"EXTENSIONS_HID_PROP_DEFAULT_LONG_VALUE"
-#define HID_PROP_DEFAULT_TIME                           
"EXTENSIONS_HID_PROP_DEFAULT_TIME"
-#define HID_PROP_DEFAULT_DATE                           
"EXTENSIONS_HID_PROP_DEFAULT_DATE"
-#define HID_PROP_HELPTEXT                               
"EXTENSIONS_HID_PROP_HELPTEXT"
-#define HID_PROP_HELPURL                                
"EXTENSIONS_HID_PROP_HELPURL"
-#define HID_PROP_RECORDMARKER                           
"EXTENSIONS_HID_PROP_RECORDMARKER"
-#define HID_PROP_FILTERPROPOSAL                         
"EXTENSIONS_HID_PROP_FILTERPROPOSAL"
-#define HID_PROP_EFFECTIVEMIN                           
"EXTENSIONS_HID_PROP_EFFECTIVEMIN"
-#define HID_PROP_EFFECTIVEMAX                           
"EXTENSIONS_HID_PROP_EFFECTIVEMAX"
-#define HID_PROP_EFFECTIVEDEFAULT                       
"EXTENSIONS_HID_PROP_EFFECTIVEDEFAULT"
-#define HID_PROP_CONTROLLABEL                           
"EXTENSIONS_HID_PROP_CONTROLLABEL"
-#define HID_PROP_CURRSYM_POSITION                       
"EXTENSIONS_HID_PROP_CURRSYM_POSITION"
-#define HID_PROP_ESCAPE_PROCESSING                      
"EXTENSIONS_HID_PROP_ESCAPE_PROCESSING"
-#define HID_PROP_TITLE                                  
"EXTENSIONS_HID_PROP_TITLE"
-#define HID_PROP_STEP                                   
"EXTENSIONS_HID_PROP_STEP"
-#define HID_PROP_PROGRESSVALUE                          
"EXTENSIONS_HID_PROP_PROGRESSVALUE"
-#define HID_PROP_PROGRESSVALUE_MIN                      
"EXTENSIONS_HID_PROP_PROGRESSVALUE_MIN"
-#define HID_PROP_PROGRESSVALUE_MAX                      
"EXTENSIONS_HID_PROP_PROGRESSVALUE_MAX"
-#define HID_PROP_SCROLLVALUE                            
"EXTENSIONS_HID_PROP_SCROLLVALUE"
-#define HID_PROP_SCROLLVALUE_MAX                        
"EXTENSIONS_HID_PROP_SCROLLVALUE_MAX"
-#define HID_PROP_SCROLL_WIDTH                           
"EXTENSIONS_HID_PROP_SCROLL_WIDTH"
-#define HID_PROP_SCROLL_HEIGHT                          
"EXTENSIONS_HID_PROP_SCROLL_HEIGHT"
-#define HID_PROP_SCROLL_TOP                             
"EXTENSIONS_HID_PROP_SCROLL_TOP"
-#define HID_PROP_SCROLL_LEFT                            
"EXTENSIONS_HID_PROP_SCROLL_LEFT"
-#define HID_PROP_LINEINCREMENT                          
"EXTENSIONS_HID_PROP_LINEINCREMENT"
-#define HID_PROP_BLOCKINCREMENT                         
"EXTENSIONS_HID_PROP_BLOCKINCREMENT"
-#define HID_PROP_VISIBLESIZE                            
"EXTENSIONS_HID_PROP_VISIBLESIZE"
-#define HID_PROP_ORIENTATION                            
"EXTENSIONS_HID_PROP_ORIENTATION"
-#define HID_PROP_POSITIONX                              
"EXTENSIONS_HID_PROP_POSITIONX"
-#define HID_PROP_POSITIONY                              
"EXTENSIONS_HID_PROP_POSITIONY"
-#define HID_PROP_PUSHBUTTONTYPE                         
"EXTENSIONS_HID_PROP_PUSHBUTTONTYPE"
-#define HID_PROP_STATE                                  
"EXTENSIONS_HID_PROP_STATE"
-#define HID_PROP_SCALEIMAGE                             
"EXTENSIONS_HID_PROP_SCALEIMAGE"
-#define HID_PROP_BOUND_CELL                             
"EXTENSIONS_HID_PROP_BOUND_CELL"
-#define HID_PROP_LIST_CELL_RANGE                        
"EXTENSIONS_HID_PROP_LIST_CELL_RANGE"
-#define HID_PROP_CELL_EXCHANGE_TYPE                     
"EXTENSIONS_HID_PROP_CELL_EXCHANGE_TYPE"
-#define HID_PROP_SELECTEDITEMS                          
"EXTENSIONS_HID_PROP_SELECTEDITEMS"
-#define HID_PROP_SCROLLVALUE_MIN                        
"EXTENSIONS_HID_PROP_SCROLLVALUE_MIN"
-#define HID_PROP_DEFAULT_SCROLLVALUE                    
"EXTENSIONS_HID_PROP_DEFAULT_SCROLLVALUE"
-#define HID_PROP_REPEAT_DELAY                           
"EXTENSIONS_HID_PROP_REPEAT_DELAY"
-#define HID_PROP_SYMBOLCOLOR                            
"EXTENSIONS_HID_PROP_SYMBOLCOLOR"
-#define HID_PROP_SPINVALUE                              
"EXTENSIONS_HID_PROP_SPINVALUE"
-#define HID_PROP_SPINVALUE_MIN                          
"EXTENSIONS_HID_PROP_SPINVALUE_MIN"
-#define HID_PROP_SPINVALUE_MAX                          
"EXTENSIONS_HID_PROP_SPINVALUE_MAX"
-#define HID_PROP_DEFAULT_SPINVALUE                      
"EXTENSIONS_HID_PROP_DEFAULT_SPINVALUE"
-#define HID_PROP_SPININCREMENT                          
"EXTENSIONS_HID_PROP_SPININCREMENT"
-#define HID_PROP_REPEAT                                 
"EXTENSIONS_HID_PROP_REPEAT"
-#define HID_PROP_WORDBREAK                              
"EXTENSIONS_HID_PROP_WORDBREAK"
-#define HID_PROP_SHOW_SCROLLBARS                        
"EXTENSIONS_HID_PROP_SHOW_SCROLLBARS"
-#define HID_PROP_ICONSIZE                               
"EXTENSIONS_HID_PROP_ICONSIZE"
-#define HID_PROP_SHOW_POSITION                          
"EXTENSIONS_HID_PROP_SHOW_POSITION"
-#define HID_PROP_SHOW_NAVIGATION                        
"EXTENSIONS_HID_PROP_SHOW_NAVIGATION"
-#define HID_PROP_SHOW_RECORDACTIONS                     
"EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS"
-#define HID_PROP_SHOW_FILTERSORT                        
"EXTENSIONS_HID_PROP_SHOW_FILTERSORT"
+inline constexpr OUStringLiteral HID_PROP_FONT = u"EXTENSIONS_HID_PROP_FONT";
+inline constexpr OUStringLiteral HID_PROP_ROWHEIGHT = 
u"EXTENSIONS_HID_PROP_ROWHEIGHT";
+inline constexpr OUStringLiteral HID_PROP_BACKGROUNDCOLOR = 
u"EXTENSIONS_HID_PROP_BACKGROUNDCOLOR";
+inline constexpr OUStringLiteral HID_PROP_FILLCOLOR = 
u"EXTENSIONS_HID_PROP_FILLCOLOR";
+inline constexpr OUStringLiteral HID_PROP_LINECOLOR = 
u"EXTENSIONS_HID_PROP_LINECOLOR";
+inline constexpr OUStringLiteral HID_PROP_BORDER = 
u"EXTENSIONS_HID_PROP_BORDER";
+inline constexpr OUStringLiteral HID_PROP_ALIGN = u"EXTENSIONS_HID_PROP_ALIGN";
+inline constexpr OUStringLiteral HID_PROP_VERTICAL_ALIGN = 
u"EXTENSIONS_HID_PROP_VERTICAL_ALIGN";
+inline constexpr OUStringLiteral HID_PROP_DROPDOWN = 
u"EXTENSIONS_HID_PROP_DROPDOWN";
+inline constexpr OUStringLiteral HID_PROP_MULTILINE = 
u"EXTENSIONS_HID_PROP_MULTILINE";
+inline constexpr OUStringLiteral HID_PROP_HSCROLL = 
u"EXTENSIONS_HID_PROP_HSCROLL";
+inline constexpr OUStringLiteral HID_PROP_VSCROLL = 
u"EXTENSIONS_HID_PROP_VSCROLL";
+inline constexpr OUStringLiteral HID_PROP_TABSTOP = 
u"EXTENSIONS_HID_PROP_TABSTOP";
+inline constexpr OUStringLiteral HID_PROP_REFVALUE = 
u"EXTENSIONS_HID_PROP_REFVALUE";
+inline constexpr OUStringLiteral HID_PROP_BUTTONTYPE = 
u"EXTENSIONS_HID_PROP_BUTTONTYPE";
+inline constexpr OUStringLiteral HID_PROP_SUBMIT_ACTION = 
u"EXTENSIONS_HID_PROP_SUBMIT_ACTION";
+inline constexpr OUStringLiteral HID_PROP_SUBMIT_METHOD = 
u"EXTENSIONS_HID_PROP_SUBMIT_METHOD";
+inline constexpr OUStringLiteral HID_PROP_SUBMIT_ENCODING = 
u"EXTENSIONS_HID_PROP_SUBMIT_ENCODING";
+inline constexpr OUStringLiteral HID_PROP_DEFAULTVALUE = 
u"EXTENSIONS_HID_PROP_DEFAULTVALUE";
+inline constexpr OUStringLiteral HID_PROP_SUBMIT_TARGET = 
u"EXTENSIONS_HID_PROP_SUBMIT_TARGET";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_STATE = 
u"EXTENSIONS_HID_PROP_DEFAULT_STATE";
+inline constexpr OUStringLiteral HID_PROP_IMAGE_URL = 
u"EXTENSIONS_HID_PROP_IMAGE_URL";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_SELECT_SEQ = 
u"EXTENSIONS_HID_PROP_DEFAULT_SELECT_SEQ";
+inline constexpr OUStringLiteral HID_PROP_MULTISELECTION = 
u"EXTENSIONS_HID_PROP_MULTISELECTION";
+inline constexpr OUStringLiteral HID_PROP_DATE = u"EXTENSIONS_HID_PROP_DATE";
+inline constexpr OUStringLiteral HID_PROP_DATEMIN = 
u"EXTENSIONS_HID_PROP_DATEMIN";
+inline constexpr OUStringLiteral HID_PROP_DATEMAX = 
u"EXTENSIONS_HID_PROP_DATEMAX";
+inline constexpr OUStringLiteral HID_PROP_DATEFORMAT = 
u"EXTENSIONS_HID_PROP_DATEFORMAT";
+inline constexpr OUStringLiteral HID_PROP_TIME = u"EXTENSIONS_HID_PROP_TIME";
+inline constexpr OUStringLiteral HID_PROP_TIMEMIN = 
u"EXTENSIONS_HID_PROP_TIMEMIN";
+inline constexpr OUStringLiteral HID_PROP_TIMEMAX = 
u"EXTENSIONS_HID_PROP_TIMEMAX";
+inline constexpr OUStringLiteral HID_PROP_TIMEFORMAT = 
u"EXTENSIONS_HID_PROP_TIMEFORMAT";
+inline constexpr OUStringLiteral HID_PROP_VALUEMIN = 
u"EXTENSIONS_HID_PROP_VALUEMIN";
+inline constexpr OUStringLiteral HID_PROP_VALUEMAX = 
u"EXTENSIONS_HID_PROP_VALUEMAX";
+inline constexpr OUStringLiteral HID_PROP_VALUESTEP = 
u"EXTENSIONS_HID_PROP_VALUESTEP";
+inline constexpr OUStringLiteral HID_PROP_CURRENCYSYMBOL = 
u"EXTENSIONS_HID_PROP_CURRENCYSYMBOL";
+inline constexpr OUStringLiteral HID_PROP_EDITMASK = 
u"EXTENSIONS_HID_PROP_EDITMASK";
+inline constexpr OUStringLiteral HID_PROP_LITERALMASK = 
u"EXTENSIONS_HID_PROP_LITERALMASK";
+inline constexpr OUStringLiteral HID_PROP_ENABLED = 
u"EXTENSIONS_HID_PROP_ENABLED";
+inline constexpr OUStringLiteral HID_PROP_AUTOCOMPLETE = 
u"EXTENSIONS_HID_PROP_AUTOCOMPLETE";
+inline constexpr OUStringLiteral HID_PROP_LINECOUNT = 
u"EXTENSIONS_HID_PROP_LINECOUNT";
+inline constexpr OUStringLiteral HID_PROP_MAXTEXTLEN = 
u"EXTENSIONS_HID_PROP_MAXTEXTLEN";
+inline constexpr OUStringLiteral HID_PROP_SPIN = u"EXTENSIONS_HID_PROP_SPIN";
+inline constexpr OUStringLiteral HID_PROP_STRICTFORMAT = 
u"EXTENSIONS_HID_PROP_STRICTFORMAT";
+inline constexpr OUStringLiteral HID_PROP_SHOWTHOUSANDSEP = 
u"EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP";
+inline constexpr OUStringLiteral HID_PROP_PRINTABLE = 
u"EXTENSIONS_HID_PROP_PRINTABLE";
+inline constexpr OUStringLiteral HID_PROP_TARGET_URL = 
u"EXTENSIONS_HID_PROP_TARGET_URL";
+inline constexpr OUStringLiteral HID_PROP_TARGET_FRAME = 
u"EXTENSIONS_HID_PROP_TARGET_FRAME";
+inline constexpr OUStringLiteral HID_PROP_TAG = u"EXTENSIONS_HID_PROP_TAG";
+inline constexpr OUStringLiteral HID_PROP_ECHO_CHAR = 
u"EXTENSIONS_HID_PROP_ECHO_CHAR";
+inline constexpr OUStringLiteral HID_PROP_EMPTY_IS_NULL = 
u"EXTENSIONS_HID_PROP_EMPTY_IS_NULL";
+inline constexpr OUStringLiteral HID_PROP_DECIMAL_ACCURACY = 
u"EXTENSIONS_HID_PROP_DECIMAL_ACCURACY";
+inline constexpr OUStringLiteral HID_PROP_ENABLE_VISIBLE = 
u"EXTENSIONS_HID_PROP_ENABLE_VISIBLE";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_BUTTON = 
u"EXTENSIONS_HID_PROP_DEFAULT_BUTTON";
+inline constexpr OUStringLiteral HID_PROP_HIDDEN_VALUE = 
u"EXTENSIONS_HID_PROP_HIDDEN_VALUE";
+inline constexpr OUStringLiteral HID_PROP_TRISTATE = 
u"EXTENSIONS_HID_PROP_TRISTATE";
+inline constexpr OUStringLiteral HID_PROP_NAVIGATIONBAR = 
u"EXTENSIONS_HID_PROP_NAVIGATIONBAR";
+inline constexpr OUStringLiteral HID_PROP_FILTER = 
u"EXTENSIONS_HID_PROP_FILTER";
+inline constexpr OUStringLiteral HID_PROP_SORT_CRITERIA = 
u"EXTENSIONS_HID_PROP_SORT_CRITERIA";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_LONG_VALUE = 
u"EXTENSIONS_HID_PROP_DEFAULT_LONG_VALUE";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_TIME = 
u"EXTENSIONS_HID_PROP_DEFAULT_TIME";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_DATE = 
u"EXTENSIONS_HID_PROP_DEFAULT_DATE";
+inline constexpr OUStringLiteral HID_PROP_HELPTEXT = 
u"EXTENSIONS_HID_PROP_HELPTEXT";
+inline constexpr OUStringLiteral HID_PROP_HELPURL = 
u"EXTENSIONS_HID_PROP_HELPURL";
+inline constexpr OUStringLiteral HID_PROP_RECORDMARKER = 
u"EXTENSIONS_HID_PROP_RECORDMARKER";
+inline constexpr OUStringLiteral HID_PROP_FILTERPROPOSAL = 
u"EXTENSIONS_HID_PROP_FILTERPROPOSAL";
+inline constexpr OUStringLiteral HID_PROP_EFFECTIVEMIN = 
u"EXTENSIONS_HID_PROP_EFFECTIVEMIN";
+inline constexpr OUStringLiteral HID_PROP_EFFECTIVEMAX = 
u"EXTENSIONS_HID_PROP_EFFECTIVEMAX";
+inline constexpr OUStringLiteral HID_PROP_EFFECTIVEDEFAULT = 
u"EXTENSIONS_HID_PROP_EFFECTIVEDEFAULT";
+inline constexpr OUStringLiteral HID_PROP_CONTROLLABEL = 
u"EXTENSIONS_HID_PROP_CONTROLLABEL";
+inline constexpr OUStringLiteral HID_PROP_CURRSYM_POSITION = 
u"EXTENSIONS_HID_PROP_CURRSYM_POSITION";
+inline constexpr OUStringLiteral HID_PROP_ESCAPE_PROCESSING = 
u"EXTENSIONS_HID_PROP_ESCAPE_PROCESSING";
+inline constexpr OUStringLiteral HID_PROP_TITLE = u"EXTENSIONS_HID_PROP_TITLE";
+inline constexpr OUStringLiteral HID_PROP_STEP = u"EXTENSIONS_HID_PROP_STEP";
+inline constexpr OUStringLiteral HID_PROP_PROGRESSVALUE = 
u"EXTENSIONS_HID_PROP_PROGRESSVALUE";
+inline constexpr OUStringLiteral HID_PROP_PROGRESSVALUE_MIN = 
u"EXTENSIONS_HID_PROP_PROGRESSVALUE_MIN";
+inline constexpr OUStringLiteral HID_PROP_PROGRESSVALUE_MAX = 
u"EXTENSIONS_HID_PROP_PROGRESSVALUE_MAX";
+inline constexpr OUStringLiteral HID_PROP_SCROLLVALUE = 
u"EXTENSIONS_HID_PROP_SCROLLVALUE";
+inline constexpr OUStringLiteral HID_PROP_SCROLLVALUE_MAX = 
u"EXTENSIONS_HID_PROP_SCROLLVALUE_MAX";
+inline constexpr OUStringLiteral HID_PROP_SCROLL_WIDTH = 
u"EXTENSIONS_HID_PROP_SCROLL_WIDTH";
+inline constexpr OUStringLiteral HID_PROP_SCROLL_HEIGHT = 
u"EXTENSIONS_HID_PROP_SCROLL_HEIGHT";
+inline constexpr OUStringLiteral HID_PROP_SCROLL_TOP = 
u"EXTENSIONS_HID_PROP_SCROLL_TOP";
+inline constexpr OUStringLiteral HID_PROP_SCROLL_LEFT = 
u"EXTENSIONS_HID_PROP_SCROLL_LEFT";
+inline constexpr OUStringLiteral HID_PROP_LINEINCREMENT = 
u"EXTENSIONS_HID_PROP_LINEINCREMENT";
+inline constexpr OUStringLiteral HID_PROP_BLOCKINCREMENT = 
u"EXTENSIONS_HID_PROP_BLOCKINCREMENT";
+inline constexpr OUStringLiteral HID_PROP_VISIBLESIZE = 
u"EXTENSIONS_HID_PROP_VISIBLESIZE";
+inline constexpr OUStringLiteral HID_PROP_ORIENTATION = 
u"EXTENSIONS_HID_PROP_ORIENTATION";
+inline constexpr OUStringLiteral HID_PROP_POSITIONX = 
u"EXTENSIONS_HID_PROP_POSITIONX";
+inline constexpr OUStringLiteral HID_PROP_POSITIONY = 
u"EXTENSIONS_HID_PROP_POSITIONY";
+inline constexpr OUStringLiteral HID_PROP_PUSHBUTTONTYPE = 
u"EXTENSIONS_HID_PROP_PUSHBUTTONTYPE";
+inline constexpr OUStringLiteral HID_PROP_STATE = u"EXTENSIONS_HID_PROP_STATE";
+inline constexpr OUStringLiteral HID_PROP_SCALEIMAGE = 
u"EXTENSIONS_HID_PROP_SCALEIMAGE";
+inline constexpr OUStringLiteral HID_PROP_BOUND_CELL = 
u"EXTENSIONS_HID_PROP_BOUND_CELL";
+inline constexpr OUStringLiteral HID_PROP_LIST_CELL_RANGE = 
u"EXTENSIONS_HID_PROP_LIST_CELL_RANGE";
+inline constexpr OUStringLiteral HID_PROP_CELL_EXCHANGE_TYPE = 
u"EXTENSIONS_HID_PROP_CELL_EXCHANGE_TYPE";
+inline constexpr OUStringLiteral HID_PROP_SELECTEDITEMS = 
u"EXTENSIONS_HID_PROP_SELECTEDITEMS";
+inline constexpr OUStringLiteral HID_PROP_SCROLLVALUE_MIN = 
u"EXTENSIONS_HID_PROP_SCROLLVALUE_MIN";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_SCROLLVALUE = 
u"EXTENSIONS_HID_PROP_DEFAULT_SCROLLVALUE";
+inline constexpr OUStringLiteral HID_PROP_REPEAT_DELAY = 
u"EXTENSIONS_HID_PROP_REPEAT_DELAY";
+inline constexpr OUStringLiteral HID_PROP_SYMBOLCOLOR = 
u"EXTENSIONS_HID_PROP_SYMBOLCOLOR";
+inline constexpr OUStringLiteral HID_PROP_SPINVALUE = 
u"EXTENSIONS_HID_PROP_SPINVALUE";
+inline constexpr OUStringLiteral HID_PROP_SPINVALUE_MIN = 
u"EXTENSIONS_HID_PROP_SPINVALUE_MIN";
+inline constexpr OUStringLiteral HID_PROP_SPINVALUE_MAX = 
u"EXTENSIONS_HID_PROP_SPINVALUE_MAX";
+inline constexpr OUStringLiteral HID_PROP_DEFAULT_SPINVALUE = 
u"EXTENSIONS_HID_PROP_DEFAULT_SPINVALUE";
+inline constexpr OUStringLiteral HID_PROP_SPININCREMENT = 
u"EXTENSIONS_HID_PROP_SPININCREMENT";
+inline constexpr OUStringLiteral HID_PROP_REPEAT = 
u"EXTENSIONS_HID_PROP_REPEAT";
+inline constexpr OUStringLiteral HID_PROP_WORDBREAK = 
u"EXTENSIONS_HID_PROP_WORDBREAK";
+inline constexpr OUStringLiteral HID_PROP_SHOW_SCROLLBARS = 
u"EXTENSIONS_HID_PROP_SHOW_SCROLLBARS";
+inline constexpr OUStringLiteral HID_PROP_ICONSIZE = 
u"EXTENSIONS_HID_PROP_ICONSIZE";
+inline constexpr OUStringLiteral HID_PROP_SHOW_POSITION = 
u"EXTENSIONS_HID_PROP_SHOW_POSITION";
+inline constexpr OUStringLiteral HID_PROP_SHOW_NAVIGATION = 
u"EXTENSIONS_HID_PROP_SHOW_NAVIGATION";
+inline constexpr OUStringLiteral HID_PROP_SHOW_RECORDACTIONS = 
u"EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS";
+inline constexpr OUStringLiteral HID_PROP_SHOW_FILTERSORT = 
u"EXTENSIONS_HID_PROP_SHOW_FILTERSORT";
 #define HID_PROP_AUTOLINEBREAK                          
"EXTENSIONS_HID_PROP_AUTOLINEBREAK"
-#define HID_PROP_TEXTTYPE                               
"EXTENSIONS_HID_PROP_TEXTTYPE"
-#define HID_PROP_LINEEND_FORMAT                         
"EXTENSIONS_HID_PROP_LINEEND_FORMAT"
-#define HID_PROP_XSD_TOTAL_DIGITS                       
"EXTENSIONS_HID_PROP_XSD_TOTAL_DIGITS"
-#define HID_PROP_XSD_FRACTION_DIGITS                    
"EXTENSIONS_HID_PROP_XSD_FRACTION_DIGITS"
-#define HID_PROP_XSD_MAX_INCLUSIVE                      
"EXTENSIONS_HID_PROP_XSD_MAX_INCLUSIVE"
-#define HID_PROP_XSD_MAX_EXCLUSIVE                      
"EXTENSIONS_HID_PROP_XSD_MAX_EXCLUSIVE"
-#define HID_PROP_XSD_MIN_INCLUSIVE                      
"EXTENSIONS_HID_PROP_XSD_MIN_INCLUSIVE"
-#define HID_PROP_XSD_MIN_EXCLUSIVE                      
"EXTENSIONS_HID_PROP_XSD_MIN_EXCLUSIVE"
-#define HID_PROP_UNCHECKEDREFVALUE                      
"EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE"
-#define HID_PROP_SUBMISSION_ID                          
"EXTENSIONS_HID_PROP_SUBMISSION_ID"
-#define HID_PROP_XML_DATA_MODEL                         
"EXTENSIONS_HID_PROP_XML_DATA_MODEL"
-#define HID_PROP_BIND_EXPRESSION                        
"EXTENSIONS_HID_PROP_BIND_EXPRESSION"
-#define HID_PROP_XSD_REQUIRED                           
"EXTENSIONS_HID_PROP_XSD_REQUIRED"
-#define HID_PROP_XSD_RELEVANT                           
"EXTENSIONS_HID_PROP_XSD_RELEVANT"
-#define HID_PROP_XSD_READONLY                           
"EXTENSIONS_HID_PROP_XSD_READONLY"
-#define HID_PROP_XSD_CONSTRAINT                         
"EXTENSIONS_HID_PROP_XSD_CONSTRAINT"
-#define HID_PROP_XSD_CALCULATION                        
"EXTENSIONS_HID_PROP_XSD_CALCULATION"
-#define HID_PROP_XSD_DATA_TYPE                          
"EXTENSIONS_HID_PROP_XSD_DATA_TYPE"
-#define HID_PROP_XSD_WHITESPACES                        
"EXTENSIONS_HID_PROP_XSD_WHITESPACES"
-#define HID_PROP_URL                                    
"EXTENSIONS_HID_PROP_URL"
-#define HID_PROP_XSD_PATTERN                            
"EXTENSIONS_HID_PROP_XSD_PATTERN"
-#define HID_PROP_XSD_LENGTH                             
"EXTENSIONS_HID_PROP_XSD_LENGTH"
-#define HID_PROP_XSD_MIN_LENGTH                         
"EXTENSIONS_HID_PROP_XSD_MIN_LENGTH"
-#define HID_PROP_XSD_MAX_LENGTH                         
"EXTENSIONS_HID_PROP_XSD_MAX_LENGTH"
-#define HID_PROP_LIST_BINDING                           
"EXTENSIONS_HID_PROP_LIST_BINDING"
-#define HID_PROP_BINDING_NAME                           
"EXTENSIONS_HID_PROP_BINDING_NAME"
-#define HID_PROP_SELECTION_TYPE                         
"EXTENSIONS_HID_PROP_SELECTION_TYPE"
-#define HID_PROP_ROOT_DISPLAYED                         
"EXTENSIONS_HID_PROP_ROOT_DISPLAYED"
-#define HID_PROP_SHOWS_HANDLES                          
"EXTENSIONS_HID_PROP_SHOWS_HANDLES"
-#define HID_PROP_SHOWS_ROOT_HANDLES                     
"EXTENSIONS_HID_PROP_SHOWS_ROOT_HANDLES"
-#define HID_PROP_EDITABLE                               
"EXTENSIONS_HID_PROP_EDITABLE"
-#define HID_PROP_INVOKES_STOP_NOT_EDITING               
"EXTENSIONS_HID_PROP_INVOKES_STOP_NOT_EDITING"
+inline constexpr OUStringLiteral HID_PROP_TEXTTYPE = 
u"EXTENSIONS_HID_PROP_TEXTTYPE";
+inline constexpr OUStringLiteral HID_PROP_LINEEND_FORMAT = 
u"EXTENSIONS_HID_PROP_LINEEND_FORMAT";
+inline constexpr OUStringLiteral HID_PROP_XSD_TOTAL_DIGITS = 
u"EXTENSIONS_HID_PROP_XSD_TOTAL_DIGITS";
+inline constexpr OUStringLiteral HID_PROP_XSD_FRACTION_DIGITS = 
u"EXTENSIONS_HID_PROP_XSD_FRACTION_DIGITS";
+inline constexpr OUStringLiteral HID_PROP_XSD_MAX_INCLUSIVE = 
u"EXTENSIONS_HID_PROP_XSD_MAX_INCLUSIVE";
+inline constexpr OUStringLiteral HID_PROP_XSD_MAX_EXCLUSIVE = 
u"EXTENSIONS_HID_PROP_XSD_MAX_EXCLUSIVE";
+inline constexpr OUStringLiteral HID_PROP_XSD_MIN_INCLUSIVE = 
u"EXTENSIONS_HID_PROP_XSD_MIN_INCLUSIVE";
+inline constexpr OUStringLiteral HID_PROP_XSD_MIN_EXCLUSIVE = 
u"EXTENSIONS_HID_PROP_XSD_MIN_EXCLUSIVE";
+inline constexpr OUStringLiteral HID_PROP_UNCHECKEDREFVALUE = 
u"EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE";
+inline constexpr OUStringLiteral HID_PROP_SUBMISSION_ID = 
u"EXTENSIONS_HID_PROP_SUBMISSION_ID";
+inline constexpr OUStringLiteral HID_PROP_XML_DATA_MODEL = 
u"EXTENSIONS_HID_PROP_XML_DATA_MODEL";
+inline constexpr OUStringLiteral HID_PROP_BIND_EXPRESSION = 
u"EXTENSIONS_HID_PROP_BIND_EXPRESSION";
+inline constexpr OUStringLiteral HID_PROP_XSD_REQUIRED = 
u"EXTENSIONS_HID_PROP_XSD_REQUIRED";
+inline constexpr OUStringLiteral HID_PROP_XSD_RELEVANT = 
u"EXTENSIONS_HID_PROP_XSD_RELEVANT";
+inline constexpr OUStringLiteral HID_PROP_XSD_READONLY = 
u"EXTENSIONS_HID_PROP_XSD_READONLY";
+inline constexpr OUStringLiteral HID_PROP_XSD_CONSTRAINT = 
u"EXTENSIONS_HID_PROP_XSD_CONSTRAINT";
+inline constexpr OUStringLiteral HID_PROP_XSD_CALCULATION = 
u"EXTENSIONS_HID_PROP_XSD_CALCULATION";
+inline constexpr OUStringLiteral HID_PROP_XSD_DATA_TYPE = 
u"EXTENSIONS_HID_PROP_XSD_DATA_TYPE";
+inline constexpr OUStringLiteral HID_PROP_XSD_WHITESPACES = 
u"EXTENSIONS_HID_PROP_XSD_WHITESPACES";
+inline constexpr OUStringLiteral HID_PROP_URL = u"EXTENSIONS_HID_PROP_URL";
+inline constexpr OUStringLiteral HID_PROP_XSD_PATTERN = 
u"EXTENSIONS_HID_PROP_XSD_PATTERN";
+inline constexpr OUStringLiteral HID_PROP_XSD_LENGTH = 
u"EXTENSIONS_HID_PROP_XSD_LENGTH";
+inline constexpr OUStringLiteral HID_PROP_XSD_MIN_LENGTH = 
u"EXTENSIONS_HID_PROP_XSD_MIN_LENGTH";
+inline constexpr OUStringLiteral HID_PROP_XSD_MAX_LENGTH = 
u"EXTENSIONS_HID_PROP_XSD_MAX_LENGTH";
+inline constexpr OUStringLiteral HID_PROP_LIST_BINDING = 
u"EXTENSIONS_HID_PROP_LIST_BINDING";
+inline constexpr OUStringLiteral HID_PROP_BINDING_NAME = 
u"EXTENSIONS_HID_PROP_BINDING_NAME";
+inline constexpr OUStringLiteral HID_PROP_SELECTION_TYPE = 
u"EXTENSIONS_HID_PROP_SELECTION_TYPE";
+inline constexpr OUStringLiteral HID_PROP_ROOT_DISPLAYED = 
u"EXTENSIONS_HID_PROP_ROOT_DISPLAYED";
+inline constexpr OUStringLiteral HID_PROP_SHOWS_HANDLES = 
u"EXTENSIONS_HID_PROP_SHOWS_HANDLES";
+inline constexpr OUStringLiteral HID_PROP_SHOWS_ROOT_HANDLES = 
u"EXTENSIONS_HID_PROP_SHOWS_ROOT_HANDLES";
+inline constexpr OUStringLiteral HID_PROP_EDITABLE = 
u"EXTENSIONS_HID_PROP_EDITABLE";
+inline constexpr OUStringLiteral HID_PROP_INVOKES_STOP_NOT_EDITING = 
u"EXTENSIONS_HID_PROP_INVOKES_STOP_NOT_EDITING";
 #define HID_PROP_ROW_HEIGHT                             
"EXTENSIONS_HID_PROP_ROW_HEIGHT"
-#define HID_PROP_DECORATION                             
"EXTENSIONS_HID_PROP_DECORATION"
-#define HID_EVT_ACTIONPERFORMED                         
"EXTENSIONS_HID_EVT_ACTIONPERFORMED"
-#define HID_EVT_AFTERUPDATE                             
"EXTENSIONS_HID_EVT_AFTERUPDATE"
-#define HID_EVT_BEFOREUPDATE                            
"EXTENSIONS_HID_EVT_BEFOREUPDATE"
-#define HID_EVT_CONFIRMDELETE                           
"EXTENSIONS_HID_EVT_CONFIRMDELETE"
-#define HID_EVT_ERROROCCURRED                           
"EXTENSIONS_HID_EVT_ERROROCCURRED"
-#define HID_EVT_FOCUSGAINED                             
"EXTENSIONS_HID_EVT_FOCUSGAINED"
-#define HID_EVT_FOCUSLOST                               
"EXTENSIONS_HID_EVT_FOCUSLOST"
-#define HID_EVT_ITEMSTATECHANGED                        
"EXTENSIONS_HID_EVT_ITEMSTATECHANGED"
-#define HID_EVT_KEYTYPED                                
"EXTENSIONS_HID_EVT_KEYTYPED"
-#define HID_EVT_LOADED                                  
"EXTENSIONS_HID_EVT_LOADED"
-#define HID_EVT_MOUSEDRAGGED                            
"EXTENSIONS_HID_EVT_MOUSEDRAGGED"
-#define HID_EVT_MOUSEENTERED                            
"EXTENSIONS_HID_EVT_MOUSEENTERED"
-#define HID_EVT_MOUSEEXITED                             
"EXTENSIONS_HID_EVT_MOUSEEXITED"
-#define HID_EVT_MOUSEMOVED                              
"EXTENSIONS_HID_EVT_MOUSEMOVED"
-#define HID_EVT_MOUSEPRESSED                            
"EXTENSIONS_HID_EVT_MOUSEPRESSED"
-#define HID_EVT_MOUSERELEASED                           
"EXTENSIONS_HID_EVT_MOUSERELEASED"
-#define HID_EVT_POSITIONED                              
"EXTENSIONS_HID_EVT_POSITIONED"
-#define HID_EVT_RESETTED                                
"EXTENSIONS_HID_EVT_RESETTED"
-#define HID_EVT_SUBMITTED                               
"EXTENSIONS_HID_EVT_SUBMITTED"
-#define HID_EVT_TEXTCHANGED                             
"EXTENSIONS_HID_EVT_TEXTCHANGED"
-#define HID_EVT_UNLOADED                                
"EXTENSIONS_HID_EVT_UNLOADED"
-#define HID_EVT_CHANGED                                 
"EXTENSIONS_HID_EVT_CHANGED"
-#define HID_EVT_APPROVEACTIONPERFORMED                  
"EXTENSIONS_HID_EVT_APPROVEACTIONPERFORMED"
-#define HID_EVT_APPROVERESETTED                         
"EXTENSIONS_HID_EVT_APPROVERESETTED"
-#define HID_EVT_KEYUP                                   
"EXTENSIONS_HID_EVT_KEYUP"
-#define HID_EVT_APPROVEPARAMETER                        
"EXTENSIONS_HID_EVT_APPROVEPARAMETER"
-#define HID_EVT_POSITIONING                             
"EXTENSIONS_HID_EVT_POSITIONING"
-#define HID_EVT_RELOADED                                
"EXTENSIONS_HID_EVT_RELOADED"
-#define HID_EVT_APPROVEROWCHANGE                        
"EXTENSIONS_HID_EVT_APPROVEROWCHANGE"
-#define HID_EVT_ROWCHANGE                               
"EXTENSIONS_HID_EVT_ROWCHANGE"
-#define HID_EVT_RELOADING                               
"EXTENSIONS_HID_EVT_RELOADING"
-#define HID_EVT_UNLOADING                               
"EXTENSIONS_HID_EVT_UNLOADING"
-#define HID_EVT_ADJUSTMENTVALUECHANGED                  
"EXTENSIONS_HID_EVT_ADJUSTMENTVALUECHANGED"
-#define HID_PROP_TOGGLE                                 
"EXTENSIONS_HID_PROP_TOGGLE"
-#define HID_PROP_FOCUSONCLICK                           
"EXTENSIONS_HID_PROP_FOCUSONCLICK"
-#define HID_PROP_HIDEINACTIVESELECTION                  
"EXTENSIONS_HID_PROP_HIDEINACTIVESELECTION"
-#define HID_PROP_VISUALEFFECT                           
"EXTENSIONS_HID_PROP_VISUALEFFECT"
-#define HID_PROP_BORDERCOLOR                            
"EXTENSIONS_HID_PROP_BORDERCOLOR"
-#define HID_PROP_IMAGEPOSITION                          
"EXTENSIONS_HID_PROP_IMAGEPOSITION"
-#define HID_PROP_NOLABEL                                
"EXTENSIONS_HID_PROP_NOLABEL"
-#define HID_PROP_WRITING_MODE                           
"EXTENSIONS_HID_PROP_WRITING_MODE"
-#define HID_PROP_ANCHOR_TYPE                            
"EXTENSIONS_HID_PROP_ANCHOR_TYPE"
-#define HID_FM_PROPDLG_TABCTR                           
"EXTENSIONS_HID_FM_PROPDLG_TABCTR"
-#define HID_FM_PROPDLG_TAB_GENERAL                      
"EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL"
-#define HID_FM_PROPDLG_TAB_DATA                         
"EXTENSIONS_HID_FM_PROPDLG_TAB_DATA"
-#define HID_FM_PROPDLG_TAB_EVT                          
"EXTENSIONS_HID_FM_PROPDLG_TAB_EVT"
-#define HID_PROP_GROUP_NAME                             
"EXTENSIONS_HID_PROP_GROUP_NAME"
+inline constexpr OUStringLiteral HID_PROP_DECORATION = 
u"EXTENSIONS_HID_PROP_DECORATION";
+inline constexpr OUStringLiteral HID_EVT_ACTIONPERFORMED = 
u"EXTENSIONS_HID_EVT_ACTIONPERFORMED";
+inline constexpr OUStringLiteral HID_EVT_AFTERUPDATE = 
u"EXTENSIONS_HID_EVT_AFTERUPDATE";
+inline constexpr OUStringLiteral HID_EVT_BEFOREUPDATE = 
u"EXTENSIONS_HID_EVT_BEFOREUPDATE";
+inline constexpr OUStringLiteral HID_EVT_CONFIRMDELETE = 
u"EXTENSIONS_HID_EVT_CONFIRMDELETE";
+inline constexpr OUStringLiteral HID_EVT_ERROROCCURRED = 
u"EXTENSIONS_HID_EVT_ERROROCCURRED";
+inline constexpr OUStringLiteral HID_EVT_FOCUSGAINED = 
u"EXTENSIONS_HID_EVT_FOCUSGAINED";
+inline constexpr OUStringLiteral HID_EVT_FOCUSLOST = 
u"EXTENSIONS_HID_EVT_FOCUSLOST";
+inline constexpr OUStringLiteral HID_EVT_ITEMSTATECHANGED = 
u"EXTENSIONS_HID_EVT_ITEMSTATECHANGED";
+inline constexpr OUStringLiteral HID_EVT_KEYTYPED = 
u"EXTENSIONS_HID_EVT_KEYTYPED";
+inline constexpr OUStringLiteral HID_EVT_LOADED = u"EXTENSIONS_HID_EVT_LOADED";
+inline constexpr OUStringLiteral HID_EVT_MOUSEDRAGGED = 
u"EXTENSIONS_HID_EVT_MOUSEDRAGGED";
+inline constexpr OUStringLiteral HID_EVT_MOUSEENTERED = 
u"EXTENSIONS_HID_EVT_MOUSEENTERED";
+inline constexpr OUStringLiteral HID_EVT_MOUSEEXITED = 
u"EXTENSIONS_HID_EVT_MOUSEEXITED";
+inline constexpr OUStringLiteral HID_EVT_MOUSEMOVED = 
u"EXTENSIONS_HID_EVT_MOUSEMOVED";
+inline constexpr OUStringLiteral HID_EVT_MOUSEPRESSED = 
u"EXTENSIONS_HID_EVT_MOUSEPRESSED";
+inline constexpr OUStringLiteral HID_EVT_MOUSERELEASED = 
u"EXTENSIONS_HID_EVT_MOUSERELEASED";
+inline constexpr OUStringLiteral HID_EVT_POSITIONED = 
u"EXTENSIONS_HID_EVT_POSITIONED";
+inline constexpr OUStringLiteral HID_EVT_RESETTED = 
u"EXTENSIONS_HID_EVT_RESETTED";
+inline constexpr OUStringLiteral HID_EVT_SUBMITTED = 
u"EXTENSIONS_HID_EVT_SUBMITTED";
+inline constexpr OUStringLiteral HID_EVT_TEXTCHANGED = 
u"EXTENSIONS_HID_EVT_TEXTCHANGED";
+inline constexpr OUStringLiteral HID_EVT_UNLOADED = 
u"EXTENSIONS_HID_EVT_UNLOADED";
+inline constexpr OUStringLiteral HID_EVT_CHANGED = 
u"EXTENSIONS_HID_EVT_CHANGED";
+inline constexpr OUStringLiteral HID_EVT_APPROVEACTIONPERFORMED = 
u"EXTENSIONS_HID_EVT_APPROVEACTIONPERFORMED";
+inline constexpr OUStringLiteral HID_EVT_APPROVERESETTED = 
u"EXTENSIONS_HID_EVT_APPROVERESETTED";
+inline constexpr OUStringLiteral HID_EVT_KEYUP = u"EXTENSIONS_HID_EVT_KEYUP";
+inline constexpr OUStringLiteral HID_EVT_APPROVEPARAMETER = 
u"EXTENSIONS_HID_EVT_APPROVEPARAMETER";
+inline constexpr OUStringLiteral HID_EVT_POSITIONING = 
u"EXTENSIONS_HID_EVT_POSITIONING";
+inline constexpr OUStringLiteral HID_EVT_RELOADED = 
u"EXTENSIONS_HID_EVT_RELOADED";
+inline constexpr OUStringLiteral HID_EVT_APPROVEROWCHANGE = 
u"EXTENSIONS_HID_EVT_APPROVEROWCHANGE";
+inline constexpr OUStringLiteral HID_EVT_ROWCHANGE = 
u"EXTENSIONS_HID_EVT_ROWCHANGE";
+inline constexpr OUStringLiteral HID_EVT_RELOADING = 
u"EXTENSIONS_HID_EVT_RELOADING";
+inline constexpr OUStringLiteral HID_EVT_UNLOADING = 
u"EXTENSIONS_HID_EVT_UNLOADING";
+inline constexpr OUStringLiteral HID_EVT_ADJUSTMENTVALUECHANGED = 
u"EXTENSIONS_HID_EVT_ADJUSTMENTVALUECHANGED";
+inline constexpr OUStringLiteral HID_PROP_TOGGLE = 
u"EXTENSIONS_HID_PROP_TOGGLE";
+inline constexpr OUStringLiteral HID_PROP_FOCUSONCLICK = 
u"EXTENSIONS_HID_PROP_FOCUSONCLICK";
+inline constexpr OUStringLiteral HID_PROP_HIDEINACTIVESELECTION = 
u"EXTENSIONS_HID_PROP_HIDEINACTIVESELECTION";
+inline constexpr OUStringLiteral HID_PROP_VISUALEFFECT = 
u"EXTENSIONS_HID_PROP_VISUALEFFECT";
+inline constexpr OUStringLiteral HID_PROP_BORDERCOLOR = 
u"EXTENSIONS_HID_PROP_BORDERCOLOR";
+inline constexpr OUStringLiteral HID_PROP_IMAGEPOSITION = 
u"EXTENSIONS_HID_PROP_IMAGEPOSITION";
+inline constexpr OUStringLiteral HID_PROP_NOLABEL = 
u"EXTENSIONS_HID_PROP_NOLABEL";
+inline constexpr OUStringLiteral HID_PROP_WRITING_MODE = 
u"EXTENSIONS_HID_PROP_WRITING_MODE";
+inline constexpr OUStringLiteral HID_PROP_ANCHOR_TYPE = 
u"EXTENSIONS_HID_PROP_ANCHOR_TYPE";
+inline constexpr OStringLiteral HID_FM_PROPDLG_TABCTR = 
"EXTENSIONS_HID_FM_PROPDLG_TABCTR";
+inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_GENERAL = 
u"EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL";
+inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_DATA = 
u"EXTENSIONS_HID_FM_PROPDLG_TAB_DATA";
+inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_EVT = 
u"EXTENSIONS_HID_FM_PROPDLG_TAB_EVT";
+inline constexpr OUStringLiteral HID_PROP_GROUP_NAME = 
u"EXTENSIONS_HID_PROP_GROUP_NAME";
 
-#define HID_PROP_SELECTIONMODEL                         
"EXTENSIONS_HID_PROP_SELECTIONMODEL"
-#define HID_PROP_USEGRIDLINE                            
"EXTENSIONS_HID_PROP_USEGRIDLINE"
-#define HID_PROP_GRIDLINECOLOR                          
"EXTENSIONS_HID_PROP_GRIDLINECOLOR"
-#define HID_PROP_SHOWCOLUMNHEADER                       
"EXTENSIONS_HID_PROP_SHOWCOLUMNHEADER"
-#define HID_PROP_SHOWROWHEADER                          
"EXTENSIONS_HID_PROP_SHOWROWHEADER"
-#define HID_PROP_HEADERBACKGROUNDCOLOR                  
"EXTENSIONS_HID_PROP_HEADERBACKGROUNDCOLOR"
-#define HID_PROP_HEADERTEXTCOLOR                        
"EXTENSIONS_HID_PROP_HEADERTEXTCOLOR"
-#define HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR         
"EXTENSIONS_HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR"
-#define HID_PROP_ACTIVESELECTIONTEXTCOLOR               
"EXTENSIONS_HID_PROP_ACTIVESELECTIONTEXTCOLOR"
-#define HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR       
"EXTENSIONS_HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR"
-#define HID_PROP_INACTIVESELECTIONTEXTCOLOR             
"EXTENSIONS_HID_PROP_INACTIVESELECTIONTEXTCOLOR"
+inline constexpr OUStringLiteral HID_PROP_SELECTIONMODEL = 
u"EXTENSIONS_HID_PROP_SELECTIONMODEL";
+inline constexpr OUStringLiteral HID_PROP_USEGRIDLINE = 
u"EXTENSIONS_HID_PROP_USEGRIDLINE";
+inline constexpr OUStringLiteral HID_PROP_GRIDLINECOLOR = 
u"EXTENSIONS_HID_PROP_GRIDLINECOLOR";
+inline constexpr OUStringLiteral HID_PROP_SHOWCOLUMNHEADER = 
u"EXTENSIONS_HID_PROP_SHOWCOLUMNHEADER";
+inline constexpr OUStringLiteral HID_PROP_SHOWROWHEADER = 
u"EXTENSIONS_HID_PROP_SHOWROWHEADER";
+inline constexpr OUStringLiteral HID_PROP_HEADERBACKGROUNDCOLOR = 
u"EXTENSIONS_HID_PROP_HEADERBACKGROUNDCOLOR";
+inline constexpr OUStringLiteral HID_PROP_HEADERTEXTCOLOR = 
u"EXTENSIONS_HID_PROP_HEADERTEXTCOLOR";
+inline constexpr OUStringLiteral HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR = 
u"EXTENSIONS_HID_PROP_ACTIVESELECTIONBACKGROUNDCOLOR";
+inline constexpr OUStringLiteral HID_PROP_ACTIVESELECTIONTEXTCOLOR = 
u"EXTENSIONS_HID_PROP_ACTIVESELECTIONTEXTCOLOR";
+inline constexpr OUStringLiteral HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR = 
u"EXTENSIONS_HID_PROP_INACTIVESELECTIONBACKGROUNDCOLOR";
+inline constexpr OUStringLiteral HID_PROP_INACTIVESELECTIONTEXTCOLOR = 
u"EXTENSIONS_HID_PROP_INACTIVESELECTIONTEXTCOLOR";
 
 #define HID_CHECK_FOR_UPD_DLG                           
"EXTENSIONS_HID_CHECK_FOR_UPD_DLG"
 #define HID_CHECK_FOR_UPD_CLOSE                         
"EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE"
diff --git a/extensions/inc/propctrlr.h b/extensions/inc/propctrlr.h
index 9a819cc08c25..41d2330727fb 100644
--- a/extensions/inc/propctrlr.h
+++ b/extensions/inc/propctrlr.h
@@ -20,64 +20,64 @@
 #ifndef EXTENSIONS_PROPCTRLR_H
 #define EXTENSIONS_PROPCTRLR_H
 
-#define UID_PROP_DLG_FONT_TYPE                          
"EXTENSIONS_UID_PROP_DLG_FONT_TYPE"
+inline constexpr OUStringLiteral UID_PROP_DLG_FONT_TYPE = 
u"EXTENSIONS_UID_PROP_DLG_FONT_TYPE";
 #define UID_PROP_DLG_IMAGE_URL                          
"EXTENSIONS_UID_PROP_DLG_IMAGE_URL"
-#define UID_PROP_DLG_BACKGROUNDCOLOR                    
"EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR"
-#define UID_PROP_DLG_SYMBOLCOLOR                        
"EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR"
-#define UID_PROP_DLG_ATTR_DATASOURCE                    
"EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE"
+inline constexpr OUStringLiteral UID_PROP_DLG_BACKGROUNDCOLOR = 
u"EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR";
+inline constexpr OUStringLiteral UID_PROP_DLG_SYMBOLCOLOR = 
u"EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR";
+inline constexpr OUStringLiteral UID_PROP_DLG_ATTR_DATASOURCE = 
u"EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE";
 #define UID_PROP_DLG_ATTR_TARGET_URL                    
"EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL"
-#define UID_PROP_DLG_NUMBER_FORMAT                      
"EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT"
-#define UID_PROP_DLG_CONTROLLABEL                       
"EXTENSIONS_UID_PROP_DLG_CONTROLLABEL"
-#define UID_PROP_DLG_FILLCOLOR                          
"EXTENSIONS_UID_PROP_DLG_FILLCOLOR"
-#define UID_PROP_DLG_TABINDEX                           
"EXTENSIONS_UID_PROP_DLG_TABINDEX"
-#define UID_PROP_DLG_SQLCOMMAND                         
"EXTENSIONS_UID_PROP_DLG_SQLCOMMAND"
-#define UID_PROP_DLG_FORMLINKFIELDS                     
"EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS"
-#define UID_PROP_DLG_FILTER                             
"EXTENSIONS_UID_PROP_DLG_FILTER"
-#define UID_PROP_DLG_ORDER                              
"EXTENSIONS_UID_PROP_DLG_ORDER"
-#define UID_PROP_DLG_SELECTION                          
"EXTENSIONS_UID_PROP_DLG_SELECTION"
-#define UID_PROP_DLG_BIND_EXPRESSION                    
"EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION"
-#define UID_PROP_DLG_XSD_REQUIRED                       
"EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED"
-#define UID_PROP_DLG_XSD_RELEVANT                       
"EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT"
-#define UID_PROP_DLG_XSD_READONLY                       
"EXTENSIONS_UID_PROP_DLG_XSD_READONLY"
-#define UID_PROP_DLG_XSD_CONSTRAINT                     
"EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT"
-#define UID_PROP_DLG_XSD_CALCULATION                    
"EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION"
-#define UID_PROP_ADD_DATA_TYPE                          
"EXTENSIONS_UID_PROP_ADD_DATA_TYPE"
-#define UID_PROP_REMOVE_DATA_TYPE                       
"EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE"
-#define UID_PROP_DLG_BORDERCOLOR                        
"EXTENSIONS_UID_PROP_DLG_BORDERCOLOR"
+inline constexpr OUStringLiteral UID_PROP_DLG_NUMBER_FORMAT = 
u"EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT";
+inline constexpr OUStringLiteral UID_PROP_DLG_CONTROLLABEL = 
u"EXTENSIONS_UID_PROP_DLG_CONTROLLABEL";
+inline constexpr OUStringLiteral UID_PROP_DLG_FILLCOLOR = 
u"EXTENSIONS_UID_PROP_DLG_FILLCOLOR";
+inline constexpr OUStringLiteral UID_PROP_DLG_TABINDEX = 
u"EXTENSIONS_UID_PROP_DLG_TABINDEX";
+inline constexpr OUStringLiteral UID_PROP_DLG_SQLCOMMAND = 
u"EXTENSIONS_UID_PROP_DLG_SQLCOMMAND";
+inline constexpr OUStringLiteral UID_PROP_DLG_FORMLINKFIELDS = 
u"EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS";
+inline constexpr OUStringLiteral UID_PROP_DLG_FILTER = 
u"EXTENSIONS_UID_PROP_DLG_FILTER";
+inline constexpr OUStringLiteral UID_PROP_DLG_ORDER = 
u"EXTENSIONS_UID_PROP_DLG_ORDER";
+inline constexpr OUStringLiteral UID_PROP_DLG_SELECTION = 
u"EXTENSIONS_UID_PROP_DLG_SELECTION";
+inline constexpr OUStringLiteral UID_PROP_DLG_BIND_EXPRESSION = 
u"EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION";
+inline constexpr OUStringLiteral UID_PROP_DLG_XSD_REQUIRED = 
u"EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED";
+inline constexpr OUStringLiteral UID_PROP_DLG_XSD_RELEVANT = 
u"EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT";
+inline constexpr OUStringLiteral UID_PROP_DLG_XSD_READONLY = 
u"EXTENSIONS_UID_PROP_DLG_XSD_READONLY";
+inline constexpr OUStringLiteral UID_PROP_DLG_XSD_CONSTRAINT = 
u"EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT";
+inline constexpr OUStringLiteral UID_PROP_DLG_XSD_CALCULATION = 
u"EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION";
+inline constexpr OUStringLiteral UID_PROP_ADD_DATA_TYPE = 
u"EXTENSIONS_UID_PROP_ADD_DATA_TYPE";
+inline constexpr OUStringLiteral UID_PROP_REMOVE_DATA_TYPE = 
u"EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE";
+inline constexpr OUStringLiteral UID_PROP_DLG_BORDERCOLOR = 
u"EXTENSIONS_UID_PROP_DLG_BORDERCOLOR";
 
-#define UID_BRWEVT_APPROVEACTIONPERFORMED               
"EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED"
-#define UID_BRWEVT_ACTIONPERFORMED                      
"EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED"
-#define UID_BRWEVT_CHANGED                              
"EXTENSIONS_UID_BRWEVT_CHANGED"
-#define UID_BRWEVT_TEXTCHANGED                          
"EXTENSIONS_UID_BRWEVT_TEXTCHANGED"
-#define UID_BRWEVT_ITEMSTATECHANGED                     
"EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED"
-#define UID_BRWEVT_FOCUSGAINED                          
"EXTENSIONS_UID_BRWEVT_FOCUSGAINED"
-#define UID_BRWEVT_FOCUSLOST                            
"EXTENSIONS_UID_BRWEVT_FOCUSLOST"
-#define UID_BRWEVT_KEYTYPED                             
"EXTENSIONS_UID_BRWEVT_KEYTYPED"
-#define UID_BRWEVT_KEYUP                                
"EXTENSIONS_UID_BRWEVT_KEYUP"
-#define UID_BRWEVT_MOUSEENTERED                         
"EXTENSIONS_UID_BRWEVT_MOUSEENTERED"
-#define UID_BRWEVT_MOUSEDRAGGED                         
"EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED"
-#define UID_BRWEVT_MOUSEMOVED                           
"EXTENSIONS_UID_BRWEVT_MOUSEMOVED"
-#define UID_BRWEVT_MOUSEPRESSED                         
"EXTENSIONS_UID_BRWEVT_MOUSEPRESSED"
-#define UID_BRWEVT_MOUSERELEASED                        
"EXTENSIONS_UID_BRWEVT_MOUSERELEASED"
-#define UID_BRWEVT_MOUSEEXITED                          
"EXTENSIONS_UID_BRWEVT_MOUSEEXITED"
-#define UID_BRWEVT_APPROVERESETTED                      
"EXTENSIONS_UID_BRWEVT_APPROVERESETTED"
-#define UID_BRWEVT_RESETTED                             
"EXTENSIONS_UID_BRWEVT_RESETTED"
-#define UID_BRWEVT_SUBMITTED                            
"EXTENSIONS_UID_BRWEVT_SUBMITTED"
-#define UID_BRWEVT_BEFOREUPDATE                         
"EXTENSIONS_UID_BRWEVT_BEFOREUPDATE"
-#define UID_BRWEVT_AFTERUPDATE                          
"EXTENSIONS_UID_BRWEVT_AFTERUPDATE"
-#define UID_BRWEVT_LOADED                               
"EXTENSIONS_UID_BRWEVT_LOADED"
-#define UID_BRWEVT_RELOADING                            
"EXTENSIONS_UID_BRWEVT_RELOADING"
-#define UID_BRWEVT_RELOADED                             
"EXTENSIONS_UID_BRWEVT_RELOADED"
-#define UID_BRWEVT_UNLOADING                            
"EXTENSIONS_UID_BRWEVT_UNLOADING"
-#define UID_BRWEVT_UNLOADED                             
"EXTENSIONS_UID_BRWEVT_UNLOADED"
-#define UID_BRWEVT_CONFIRMDELETE                        
"EXTENSIONS_UID_BRWEVT_CONFIRMDELETE"
-#define UID_BRWEVT_APPROVEROWCHANGE                     
"EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE"
-#define UID_BRWEVT_ROWCHANGE                            
"EXTENSIONS_UID_BRWEVT_ROWCHANGE"
-#define UID_BRWEVT_POSITIONING                          
"EXTENSIONS_UID_BRWEVT_POSITIONING"
-#define UID_BRWEVT_POSITIONED                           
"EXTENSIONS_UID_BRWEVT_POSITIONED"
-#define UID_BRWEVT_APPROVEPARAMETER                     
"EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER"
-#define UID_BRWEVT_ERROROCCURRED                        
"EXTENSIONS_UID_BRWEVT_ERROROCCURRED"
-#define UID_BRWEVT_ADJUSTMENTVALUECHANGED               
"EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED"
+inline constexpr OStringLiteral UID_BRWEVT_APPROVEACTIONPERFORMED = 
"EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED";
+inline constexpr OStringLiteral UID_BRWEVT_ACTIONPERFORMED = 
"EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED";
+inline constexpr OStringLiteral UID_BRWEVT_CHANGED = 
"EXTENSIONS_UID_BRWEVT_CHANGED";
+inline constexpr OStringLiteral UID_BRWEVT_TEXTCHANGED = 
"EXTENSIONS_UID_BRWEVT_TEXTCHANGED";
+inline constexpr OStringLiteral UID_BRWEVT_ITEMSTATECHANGED = 
"EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED";
+inline constexpr OStringLiteral UID_BRWEVT_FOCUSGAINED = 
"EXTENSIONS_UID_BRWEVT_FOCUSGAINED";
+inline constexpr OStringLiteral UID_BRWEVT_FOCUSLOST = 
"EXTENSIONS_UID_BRWEVT_FOCUSLOST";
+inline constexpr OStringLiteral UID_BRWEVT_KEYTYPED = 
"EXTENSIONS_UID_BRWEVT_KEYTYPED";
+inline constexpr OStringLiteral UID_BRWEVT_KEYUP = 
"EXTENSIONS_UID_BRWEVT_KEYUP";
+inline constexpr OStringLiteral UID_BRWEVT_MOUSEENTERED = 
"EXTENSIONS_UID_BRWEVT_MOUSEENTERED";
+inline constexpr OStringLiteral UID_BRWEVT_MOUSEDRAGGED = 
"EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED";
+inline constexpr OStringLiteral UID_BRWEVT_MOUSEMOVED = 
"EXTENSIONS_UID_BRWEVT_MOUSEMOVED";
+inline constexpr OStringLiteral UID_BRWEVT_MOUSEPRESSED = 
"EXTENSIONS_UID_BRWEVT_MOUSEPRESSED";
+inline constexpr OStringLiteral UID_BRWEVT_MOUSERELEASED = 
"EXTENSIONS_UID_BRWEVT_MOUSERELEASED";
+inline constexpr OStringLiteral UID_BRWEVT_MOUSEEXITED = 
"EXTENSIONS_UID_BRWEVT_MOUSEEXITED";
+inline constexpr OStringLiteral UID_BRWEVT_APPROVERESETTED = 
"EXTENSIONS_UID_BRWEVT_APPROVERESETTED";
+inline constexpr OStringLiteral UID_BRWEVT_RESETTED = 
"EXTENSIONS_UID_BRWEVT_RESETTED";
+inline constexpr OStringLiteral UID_BRWEVT_SUBMITTED = 
"EXTENSIONS_UID_BRWEVT_SUBMITTED";
+inline constexpr OStringLiteral UID_BRWEVT_BEFOREUPDATE = 
"EXTENSIONS_UID_BRWEVT_BEFOREUPDATE";
+inline constexpr OStringLiteral UID_BRWEVT_AFTERUPDATE = 
"EXTENSIONS_UID_BRWEVT_AFTERUPDATE";
+inline constexpr OStringLiteral UID_BRWEVT_LOADED = 
"EXTENSIONS_UID_BRWEVT_LOADED";
+inline constexpr OStringLiteral UID_BRWEVT_RELOADING = 
"EXTENSIONS_UID_BRWEVT_RELOADING";
+inline constexpr OStringLiteral UID_BRWEVT_RELOADED = 
"EXTENSIONS_UID_BRWEVT_RELOADED";
+inline constexpr OStringLiteral UID_BRWEVT_UNLOADING = 
"EXTENSIONS_UID_BRWEVT_UNLOADING";
+inline constexpr OStringLiteral UID_BRWEVT_UNLOADED = 
"EXTENSIONS_UID_BRWEVT_UNLOADED";
+inline constexpr OStringLiteral UID_BRWEVT_CONFIRMDELETE = 
"EXTENSIONS_UID_BRWEVT_CONFIRMDELETE";
+inline constexpr OStringLiteral UID_BRWEVT_APPROVEROWCHANGE = 
"EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE";
+inline constexpr OStringLiteral UID_BRWEVT_ROWCHANGE = 
"EXTENSIONS_UID_BRWEVT_ROWCHANGE";
+inline constexpr OStringLiteral UID_BRWEVT_POSITIONING = 
"EXTENSIONS_UID_BRWEVT_POSITIONING";
+inline constexpr OStringLiteral UID_BRWEVT_POSITIONED = 
"EXTENSIONS_UID_BRWEVT_POSITIONED";
+inline constexpr OStringLiteral UID_BRWEVT_APPROVEPARAMETER = 
"EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER";
+inline constexpr OStringLiteral UID_BRWEVT_ERROROCCURRED = 
"EXTENSIONS_UID_BRWEVT_ERROROCCURRED";
+inline constexpr OStringLiteral UID_BRWEVT_ADJUSTMENTVALUECHANGED = 
"EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED";
 
 #endif // EXTENSIONS_PROPCTRLR_HRC
 
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx 
b/extensions/source/propctrlr/defaultforminspection.cxx
index 0ecb9815ac4a..4819435360be 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -131,7 +131,7 @@ namespace pcr
         {
             const char* programmaticName;
             TranslateId uiNameResId;
-            const char* helpId;
+            OUString helpId;
         } const aCategories[] = {
             { "General",    RID_STR_PROPPAGE_DEFAULT,   
HID_FM_PROPDLG_TAB_GENERAL },
             { "Data",       RID_STR_PROPPAGE_DATA,      
HID_FM_PROPDLG_TAB_DATA },
diff --git a/extensions/source/propctrlr/eventhandler.cxx 
b/extensions/source/propctrlr/eventhandler.cxx
index 75a37e9c0dd0..34b07b5888ac 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -124,7 +124,7 @@ namespace pcr
     namespace FormComponentType = css::form::FormComponentType;
 
     EventDescription::EventDescription( EventId _nId, const char* 
_pListenerNamespaceAscii, const char* _pListenerClassAsciiName,
-            const char* _pListenerMethodAsciiName, TranslateId 
pDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId )
+            const char* _pListenerMethodAsciiName, TranslateId 
pDisplayNameResId, const OUString& _sHelpId, const OString& _sUniqueBrowseId )
         :sDisplayName(PcrRes( pDisplayNameResId ))
         ,sListenerMethodName( OUString::createFromAscii( 
_pListenerMethodAsciiName ) )
         ,sHelpId( _sHelpId )
diff --git a/extensions/source/propctrlr/eventhandler.hxx 
b/extensions/source/propctrlr/eventhandler.hxx
index 1447276a3b62..4506f1b066d8 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -45,7 +45,7 @@ namespace pcr
         OUString sDisplayName;
         OUString sListenerClassName;
         OUString sListenerMethodName;
-        OString  sHelpId;
+        OUString sHelpId;
         OString  sUniqueBrowseId;
         EventId         nId;
 
@@ -60,7 +60,7 @@ namespace pcr
             const char* _pListenerClassAsciiName,
             const char* _pListenerMethodAsciiName,
             TranslateId pDisplayNameResId,
-            const OString& _sHelpId,
+            const OUString& _sHelpId,
             const OString& _sUniqueBrowseId );
     };
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 5d4625db8f10..fe4d69dcb52d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -666,7 +666,7 @@ namespace pcr
             {
                 OUString sLabel;
                 if( ! (xSet->getPropertyValue( PROPERTY_LABEL) >>= sLabel) )
-                    SAL_WARN("extensions.propctrlr", "convertToPropertyValue: 
unable to get property " PROPERTY_LABEL);
+                    SAL_WARN("extensions.propctrlr", "convertToPropertyValue: 
unable to get property " << PROPERTY_LABEL);
                 sControlValue = "<" + sLabel + ">";
             }
 
@@ -1795,7 +1795,7 @@ namespace pcr
             {
                 ListSourceType eLSType = ListSourceType_VALUELIST;
                 if( ! (impl_getPropertyValue_throw( PROPERTY_LISTSOURCETYPE ) 
>>= eLSType) )
-                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " 
PROPERTY_LISTSOURCETYPE);
+                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " << 
PROPERTY_LISTSOURCETYPE);
 
                 OUString sListSource;
                 {
@@ -1808,7 +1808,7 @@ namespace pcr
                     }
                     else
                         if( ! (aListSourceValue >>= sListSource) )
-                            SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " 
PROPERTY_LISTSOURCE);
+                            SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " << 
PROPERTY_LISTSOURCE);
                 }
 
                 bool bIsEnabled =   (  ( eLSType == ListSourceType_VALUELIST )
@@ -1830,7 +1830,7 @@ namespace pcr
             {
                 ListSourceType eLSType = ListSourceType_VALUELIST;
                 if( ! (impl_getPropertyValue_throw( PROPERTY_LISTSOURCETYPE ) 
>>= eLSType) )
-                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " 
PROPERTY_LISTSOURCETYPE);
+                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " << 
PROPERTY_LISTSOURCETYPE);
 
                 _rxInspectorUI->enablePropertyUI( PROPERTY_BOUNDCOLUMN,
                         ( eLSType != ListSourceType_VALUELIST )
@@ -1860,13 +1860,13 @@ namespace pcr
             {
                 OUString sControlSource;
                 if( ! (impl_getPropertyValue_throw( PROPERTY_CONTROLSOURCE ) 
>>= sControlSource) )
-                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " 
PROPERTY_CONTROLSOURCE);
+                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " << 
PROPERTY_CONTROLSOURCE);
 
                 bool bEmptyIsNULL = false;
                 bool bHasEmptyIsNULL = impl_componentHasProperty_throw( 
PROPERTY_EMPTY_IS_NULL );
                 if ( bHasEmptyIsNULL )
                     if( ! (impl_getPropertyValue_throw( PROPERTY_EMPTY_IS_NULL 
) >>= bEmptyIsNULL) )
-                        SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " 
PROPERTY_EMPTY_IS_NULL);
+                        SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " << 
PROPERTY_EMPTY_IS_NULL);
 
                 // if the control is not bound to a DB field, there is no 
sense in having the "Input required"
                 // property
@@ -1907,7 +1907,7 @@ namespace pcr
                 if ( 0 != m_nClassId )
                 {
                     if( ! (impl_getPropertyValue_throw( PROPERTY_BUTTONTYPE ) 
>>= eButtonType) )
-                        SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " 
PROPERTY_BUTTONTYPE);
+                        SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " << 
PROPERTY_BUTTONTYPE);
                 }
                 // if m_nClassId is 0, then we're inspecting a form. In this 
case, eButtonType is always
                 // FormButtonType_URL here
@@ -1949,7 +1949,7 @@ namespace pcr
             {
                 sal_Int32   nCommandType( CommandType::COMMAND );
                 if( ! (impl_getPropertyValue_throw( PROPERTY_COMMANDTYPE ) >>= 
nCommandType) )
-                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " 
PROPERTY_COMMANDTYPE);
+                    SAL_WARN("extensions.propctrlr", 
"impl_updateDependentProperty_nothrow: unable to get property " << 
PROPERTY_COMMANDTYPE);
 
                 impl_ensureRowsetConnection_nothrow();
                 Reference< XConnection > xConnection = 
m_xRowSetConnection.getTyped();
@@ -2083,7 +2083,7 @@ namespace pcr
         if ( impl_componentHasProperty_throw( PROPERTY_CLASSID ) )
         {
             if( ! (m_xComponent->getPropertyValue( PROPERTY_CLASSID ) >>= 
m_nClassId) )
-                SAL_WARN("extensions.propctrlr", 
"impl_classifyControlModel_throw: unable to get property " PROPERTY_CLASSID);
+                SAL_WARN("extensions.propctrlr", 
"impl_classifyControlModel_throw: unable to get property " << PROPERTY_CLASSID);
         }
         else if ( eDialogControl == m_eComponentClass )
         {
@@ -2348,16 +2348,16 @@ namespace pcr
 
             OUString sObjectName;
             if( ! (xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= 
sObjectName) )
-                SAL_WARN("extensions.propctrlr", "impl_initFieldList_nothrow: 
unable to get property " PROPERTY_COMMAND);
+                SAL_WARN("extensions.propctrlr", "impl_initFieldList_nothrow: 
unable to get property " << PROPERTY_COMMAND);
             // when there is no command we don't need to ask for columns
             if ( !sObjectName.isEmpty() && 
impl_ensureRowsetConnection_nothrow() )
             {
                 OUString aDatabaseName;
                 if( ! (xFormSet->getPropertyValue( PROPERTY_DATASOURCE ) >>= 
aDatabaseName) )
-                    SAL_WARN("extensions.propctrlr", 
"impl_initFieldList_nothrow: unable to get property " PROPERTY_DATASOURCE);
+                    SAL_WARN("extensions.propctrlr", 
"impl_initFieldList_nothrow: unable to get property " << PROPERTY_DATASOURCE);
                 sal_Int32 nObjectType = CommandType::COMMAND;
                 if( ! (xFormSet->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= 
nObjectType) )
-                    SAL_WARN("extensions.propctrlr", 
"impl_initFieldList_nothrow: unable to get property " PROPERTY_COMMANDTYPE);
+                    SAL_WARN("extensions.propctrlr", 
"impl_initFieldList_nothrow: unable to get property " << PROPERTY_COMMANDTYPE);
 
                 const Sequence<OUString> aNames = 
::dbtools::getFieldNamesByCommandDescriptor( m_xRowSetConnection, nObjectType, 
sObjectName );
                 _rFieldNames.insert( _rFieldNames.end(), aNames.begin(), 
aNames.end() );
@@ -2777,7 +2777,7 @@ namespace pcr
 
         OUString sCurValue;
         if( ! (impl_getPropertyValue_throw( PROPERTY_IMAGE_URL ) >>= 
sCurValue) )
-            SAL_WARN("extensions.propctrlr", "impl_browseForImage_nothrow: 
unable to get property " PROPERTY_IMAGE_URL);
+            SAL_WARN("extensions.propctrlr", "impl_browseForImage_nothrow: 
unable to get property " << PROPERTY_IMAGE_URL);
         if (!sCurValue.isEmpty())
         {
             aFileDlg.SetDisplayDirectory( sCurValue );
@@ -2818,7 +2818,7 @@ namespace pcr
 
         OUString sURL;
         if( ! (impl_getPropertyValue_throw( PROPERTY_TARGET_URL ) >>= sURL) )
-            SAL_WARN("extensions.propctrlr", "impl_browseForTargetURL_nothrow: 
unable to get property " PROPERTY_TARGET_URL);
+            SAL_WARN("extensions.propctrlr", "impl_browseForTargetURL_nothrow: 
unable to get property " << PROPERTY_TARGET_URL);
         INetURLObject aParser( sURL );
         if ( INetProtocol::File == aParser.GetProtocol() )
             // set the initial directory only for file-URLs. Everything else
@@ -2874,7 +2874,7 @@ namespace pcr
 
         OUString sDataSource;
         if( ! (impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= 
sDataSource) )
-            SAL_WARN("extensions.propctrlr", 
"impl_browseForDatabaseDocument_throw: unable to get property " 
PROPERTY_DATASOURCE);
+            SAL_WARN("extensions.propctrlr", 
"impl_browseForDatabaseDocument_throw: unable to get property " << 
PROPERTY_DATASOURCE);
         INetURLObject aParser( sDataSource );
         if ( INetProtocol::File == aParser.GetProtocol() )
             // set the initial directory only for file-URLs. Everything else
@@ -3009,7 +3009,7 @@ namespace pcr
         {
             OUString sCommand;
             if( ! (m_xObject->getPropertyValue( PROPERTY_COMMAND ) >>= 
sCommand) )
-                SAL_WARN("extensions.propctrlr", "getSQLCommand: unable to get 
property " PROPERTY_COMMAND);
+                SAL_WARN("extensions.propctrlr", "getSQLCommand: unable to get 
property " << PROPERTY_COMMAND);
             return sCommand;
         }
 
@@ -3018,7 +3018,7 @@ namespace pcr
         {
             bool bEscapeProcessing( false );
             if( ! (m_xObject->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) 
>>= bEscapeProcessing) )
-                SAL_WARN("extensions.propctrlr", "getSQLCommand: unable to get 
property " PROPERTY_ESCAPE_PROCESSING);
+                SAL_WARN("extensions.propctrlr", "getSQLCommand: unable to get 
property " << PROPERTY_ESCAPE_PROCESSING);
             return bEscapeProcessing;
         }
 
@@ -3105,7 +3105,7 @@ namespace pcr
         {
             ListSourceType eType = ListSourceType_SQL;
             if( ! (m_xObject->getPropertyValue( PROPERTY_LISTSOURCETYPE ) >>= 
eType) )
-                SAL_WARN("extensions.propctrlr", "getEscapeProcessing: unable 
to get property " PROPERTY_LISTSOURCETYPE);
+                SAL_WARN("extensions.propctrlr", "getEscapeProcessing: unable 
to get property " << PROPERTY_LISTSOURCETYPE);
             OSL_ENSURE( ( eType == ListSourceType_SQL ) || ( eType == 
ListSourceType_SQLPASSTHROUGH ),
                 "ValueListCommandUI::getEscapeProcessing: unexpected list 
source type!" );
             return ( eType == ListSourceType_SQL );
diff --git a/extensions/source/propctrlr/formmetadata.cxx 
b/extensions/source/propctrlr/formmetadata.cxx
index f9147cb4469a..1f51ee3994ed 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -40,7 +40,7 @@ namespace pcr
     {
         OUString        sName;
         OUString        sTranslation;
-        OString         sHelpId;
+        OUString         sHelpId;
         sal_Int32       nId;
         sal_uInt16      nPos;
         sal_uInt32      nUIFlags;
@@ -50,13 +50,13 @@ namespace pcr
                         sal_Int32                   _nId,
                         const OUString&             aTranslation,
                         sal_uInt16                  nPosId,
-                        const OString&,
+                        const OUString&,
                         sal_uInt32                  _nUIFlags);
     };
 
 
     OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 
_nId,
-                                   const OUString& aString, sal_uInt16 nP, 
const OString& sHid, sal_uInt32 _nUIFlags)
+                                   const OUString& aString, sal_uInt16 nP, 
const OUString& sHid, sal_uInt32 _nUIFlags)
        :sName(_rName)
        ,sTranslation(aString)
        ,sHelpId(sHid)
@@ -387,10 +387,10 @@ namespace pcr
         return pInfo ? pInfo->sTranslation : OUString();
     }
 
-    OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
+    OUString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
-        return pInfo ? pInfo->sHelpId : OString();
+        return pInfo ? pInfo->sHelpId : OUString();
     }
 
     sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const
diff --git a/extensions/source/propctrlr/formmetadata.hxx 
b/extensions/source/propctrlr/formmetadata.hxx
index 121e0bfde4c4..0f7aa67d2c59 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -43,7 +43,7 @@ namespace pcr
         // IPropertyInfoService
         virtual sal_Int32                      getPropertyId(const OUString& 
_rName) const override;
         virtual OUString                       
getPropertyTranslation(sal_Int32 _nId) const override;
-        virtual OString                        getPropertyHelpId(sal_Int32 
_nId) const override;
+        virtual OUString                       getPropertyHelpId(sal_Int32 
_nId) const override;
         virtual sal_Int16                      getPropertyPos(sal_Int32 _nId) 
const override;
         virtual sal_uInt32                     getPropertyUIFlags(sal_Int32 
_nId) const override;
         virtual std::vector< OUString >      
getPropertyEnumRepresentations(sal_Int32 _nId) const override;
diff --git a/extensions/source/propctrlr/formstrings.hxx 
b/extensions/source/propctrlr/formstrings.hxx
index 4a55cd8280a8..060a608add8b 100644
--- a/extensions/source/propctrlr/formstrings.hxx
+++ b/extensions/source/propctrlr/formstrings.hxx
@@ -19,294 +19,289 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
 
-namespace pcr
-{
+inline constexpr OUStringLiteral PROPERTY_DEFAULTCONTROL = u"DefaultControl";
+inline constexpr OUStringLiteral PROPERTY_INTROSPECTEDOBJECT = 
u"IntrospectedObject";
+inline constexpr OUStringLiteral PROPERTY_CURRENTPAGE = u"CurrentPage";
+inline constexpr OUStringLiteral PROPERTY_CONTROLCONTEXT = u"ControlContext";
 
+// properties
+inline constexpr OUStringLiteral PROPERTY_CLASSID = u"ClassId";
+inline constexpr OUStringLiteral PROPERTY_CONTROLLABEL = u"LabelControl";
+inline constexpr OUStringLiteral PROPERTY_LABEL = u"Label";
+inline constexpr OUStringLiteral PROPERTY_TABINDEX = u"TabIndex";
+inline constexpr OUStringLiteral PROPERTY_WHEEL_BEHAVIOR = 
u"MouseWheelBehavior";
+inline constexpr OUStringLiteral PROPERTY_TAG = u"Tag";
+inline constexpr OUStringLiteral PROPERTY_NAME = u"Name";
+inline constexpr OUStringLiteral PROPERTY_GROUP_NAME = u"GroupName";
+inline constexpr OUStringLiteral PROPERTY_VALUE = u"Value";
+inline constexpr OUStringLiteral PROPERTY_TEXT = u"Text";
+inline constexpr OUStringLiteral PROPERTY_NAVIGATION = u"NavigationBarMode";
+inline constexpr OUStringLiteral PROPERTY_CYCLE = u"Cycle";
+inline constexpr OUStringLiteral PROPERTY_CONTROLSOURCE = u"DataField";
+inline constexpr OUStringLiteral PROPERTY_INPUT_REQUIRED = u"InputRequired";
+inline constexpr OUStringLiteral PROPERTY_ENABLED = u"Enabled";
+inline constexpr OUStringLiteral PROPERTY_ENABLE_VISIBLE = u"EnableVisible";
+inline constexpr OUStringLiteral PROPERTY_READONLY = u"ReadOnly";
+#define PROPERTY_ISREADONLY              "IsReadOnly"
+inline constexpr OUStringLiteral PROPERTY_FILTER = u"Filter";
+inline constexpr OUStringLiteral PROPERTY_WIDTH = u"Width";
+inline constexpr OUStringLiteral PROPERTY_MULTILINE = u"MultiLine";
+inline constexpr OUStringLiteral PROPERTY_WORDBREAK = u"WordBreak";
+inline constexpr OUStringLiteral PROPERTY_TARGET_URL = u"TargetURL";
+inline constexpr OUStringLiteral PROPERTY_TARGET_FRAME = u"TargetFrame";
+inline constexpr OUStringLiteral PROPERTY_MAXTEXTLEN = u"MaxTextLen";
+inline constexpr OUStringLiteral PROPERTY_EDITMASK = u"EditMask";
+inline constexpr OUStringLiteral PROPERTY_SPIN = u"Spin";
+inline constexpr OUStringLiteral PROPERTY_TRISTATE = u"TriState";
+inline constexpr OUStringLiteral PROPERTY_HIDDEN_VALUE = u"HiddenValue";
+inline constexpr OUStringLiteral PROPERTY_BUTTONTYPE = u"ButtonType";
+inline constexpr OUStringLiteral PROPERTY_XFORMS_BUTTONTYPE = 
u"XFormsButtonType";
+inline constexpr OUStringLiteral PROPERTY_STRINGITEMLIST = u"StringItemList";
+inline constexpr OUStringLiteral PROPERTY_TYPEDITEMLIST = u"TypedItemList";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_TEXT = u"DefaultText";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_STATE = u"DefaultState";
+inline constexpr OUStringLiteral PROPERTY_FORMATKEY = u"FormatKey";
+inline constexpr OUStringLiteral PROPERTY_FORMATSSUPPLIER = u"FormatsSupplier";
+inline constexpr OUStringLiteral PROPERTY_SUBMIT_ACTION = u"SubmitAction";
+inline constexpr OUStringLiteral PROPERTY_SUBMIT_TARGET = u"SubmitTarget";
+inline constexpr OUStringLiteral PROPERTY_SUBMIT_METHOD = u"SubmitMethod";
+inline constexpr OUStringLiteral PROPERTY_SUBMIT_ENCODING = u"SubmitEncoding";
+inline constexpr OUStringLiteral PROPERTY_IMAGE_URL = u"ImageURL";
+inline constexpr OUStringLiteral PROPERTY_GRAPHIC = u"Graphic";
+inline constexpr OUStringLiteral PROPERTY_EMPTY_IS_NULL = 
u"ConvertEmptyToNull";
+inline constexpr OUStringLiteral PROPERTY_LISTSOURCETYPE = u"ListSourceType";
+inline constexpr OUStringLiteral PROPERTY_LISTSOURCE = u"ListSource";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_SELECT_SEQ = 
u"DefaultSelection";
+inline constexpr OUStringLiteral PROPERTY_MULTISELECTION = u"MultiSelection";
+inline constexpr OUStringLiteral PROPERTY_ALIGN = u"Align";
+inline constexpr OUStringLiteral PROPERTY_VERTICAL_ALIGN = u"VerticalAlign";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_DATE = u"DefaultDate";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_TIME = u"DefaultTime";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_VALUE = u"DefaultValue";
+inline constexpr OUStringLiteral PROPERTY_DECIMAL_ACCURACY = 
u"DecimalAccuracy";
+inline constexpr OUStringLiteral PROPERTY_REFVALUE = u"RefValue";
+inline constexpr OUStringLiteral PROPERTY_UNCHECKEDREFVALUE = 
u"SecondaryRefValue";
+inline constexpr OUStringLiteral PROPERTY_VALUEMIN = u"ValueMin";
+inline constexpr OUStringLiteral PROPERTY_VALUEMAX = u"ValueMax";
+inline constexpr OUStringLiteral PROPERTY_STRICTFORMAT = u"StrictFormat";
+inline constexpr OUStringLiteral PROPERTY_ALLOWADDITIONS = u"AllowInserts";
+inline constexpr OUStringLiteral PROPERTY_ALLOWEDITS = u"AllowUpdates";
+inline constexpr OUStringLiteral PROPERTY_ALLOWDELETIONS = u"AllowDeletes";
+inline constexpr OUStringLiteral PROPERTY_MASTERFIELDS = u"MasterFields";
+inline constexpr OUStringLiteral PROPERTY_LITERALMASK = u"LiteralMask";
+inline constexpr OUStringLiteral PROPERTY_VALUESTEP = u"ValueStep";
+inline constexpr OUStringLiteral PROPERTY_SHOWTHOUSANDSEP = 
u"ShowThousandsSeparator";
+inline constexpr OUStringLiteral PROPERTY_CURRENCYSYMBOL = u"CurrencySymbol";
+inline constexpr OUStringLiteral PROPERTY_DATEFORMAT = u"DateFormat";
+inline constexpr OUStringLiteral PROPERTY_DATEMIN = u"DateMin";
+inline constexpr OUStringLiteral PROPERTY_DATEMAX = u"DateMax";
+inline constexpr OUStringLiteral PROPERTY_TIMEFORMAT = u"TimeFormat";
+inline constexpr OUStringLiteral PROPERTY_TIMEMIN = u"TimeMin";
+inline constexpr OUStringLiteral PROPERTY_TIMEMAX = u"TimeMax";
+inline constexpr OUStringLiteral PROPERTY_LINECOUNT = u"LineCount";
+inline constexpr OUStringLiteral PROPERTY_BOUNDCOLUMN = u"BoundColumn";
+inline constexpr OUStringLiteral PROPERTY_BACKGROUNDCOLOR = u"BackgroundColor";
+inline constexpr OUStringLiteral PROPERTY_FILLCOLOR = u"FillColor";
+inline constexpr OUStringLiteral PROPERTY_TEXTCOLOR = u"TextColor";
+inline constexpr OUStringLiteral PROPERTY_LINECOLOR = u"LineColor";
+inline constexpr OUStringLiteral PROPERTY_BORDER = u"Border";
+inline constexpr OUStringLiteral PROPERTY_ICONSIZE = u"IconSize";
+inline constexpr OUStringLiteral PROPERTY_DROPDOWN = u"Dropdown";
+inline constexpr OUStringLiteral PROPERTY_HSCROLL = u"HScroll";
+inline constexpr OUStringLiteral PROPERTY_VSCROLL = u"VScroll";
+inline constexpr OUStringLiteral PROPERTY_SHOW_SCROLLBARS = u"ShowScrollbars";
+inline constexpr OUStringLiteral PROPERTY_TABSTOP = u"Tabstop";
+inline constexpr OUStringLiteral PROPERTY_AUTOCOMPLETE = u"Autocomplete";
+inline constexpr OUStringLiteral PROPERTY_PRINTABLE = u"Printable";
+inline constexpr OUStringLiteral PROPERTY_ECHO_CHAR = u"EchoChar";
+inline constexpr OUStringLiteral PROPERTY_ROWHEIGHT = u"RowHeight";
+inline constexpr OUStringLiteral PROPERTY_HELPTEXT = u"HelpText";
+inline constexpr OUStringLiteral PROPERTY_FONT = u"FontDescriptor";
+inline constexpr OUStringLiteral PROPERTY_FONT_NAME = u"FontName";
+inline constexpr OUStringLiteral PROPERTY_FONT_STYLENAME = u"FontStyleName";
+inline constexpr OUStringLiteral PROPERTY_FONT_FAMILY = u"FontFamily";
+inline constexpr OUStringLiteral PROPERTY_FONT_CHARSET = u"FontCharset";
+inline constexpr OUStringLiteral PROPERTY_FONT_HEIGHT = u"FontHeight";
+inline constexpr OUStringLiteral PROPERTY_FONT_WEIGHT = u"FontWeight";
+inline constexpr OUStringLiteral PROPERTY_FONT_SLANT = u"FontSlant";
+inline constexpr OUStringLiteral PROPERTY_FONT_UNDERLINE = u"FontUnderline";
+inline constexpr OUStringLiteral PROPERTY_FONT_STRIKEOUT = u"FontStrikeout";
+inline constexpr OUStringLiteral PROPERTY_FONT_RELIEF = u"FontRelief";
+inline constexpr OUStringLiteral PROPERTY_FONT_EMPHASIS_MARK = 
u"FontEmphasisMark";
+inline constexpr OUStringLiteral PROPERTY_TEXTLINECOLOR = u"TextLineColor";
+inline constexpr OUStringLiteral PROPERTY_HELPURL = u"HelpURL";
+inline constexpr OUStringLiteral PROPERTY_RECORDMARKER = u"HasRecordMarker";
+inline constexpr OUStringLiteral PROPERTY_EFFECTIVE_DEFAULT = 
u"EffectiveDefault";
+inline constexpr OUStringLiteral PROPERTY_EFFECTIVE_MIN = u"EffectiveMin";
+inline constexpr OUStringLiteral PROPERTY_EFFECTIVE_MAX = u"EffectiveMax";
+inline constexpr OUStringLiteral PROPERTY_FILTERPROPOSAL = 
u"UseFilterValueProposal";
+inline constexpr OUStringLiteral PROPERTY_CURRSYM_POSITION = 
u"PrependCurrencySymbol";
+inline constexpr OUStringLiteral PROPERTY_COMMAND = u"Command";
+inline constexpr OUStringLiteral PROPERTY_COMMANDTYPE = u"CommandType";
+inline constexpr OUStringLiteral PROPERTY_INSERTONLY = u"IgnoreResult";
+inline constexpr OUStringLiteral PROPERTY_ESCAPE_PROCESSING = 
u"EscapeProcessing";
+inline constexpr OUStringLiteral PROPERTY_TITLE = u"Title";
+inline constexpr OUStringLiteral PROPERTY_SORT = u"Order";
+inline constexpr OUStringLiteral PROPERTY_DATASOURCE = u"DataSourceName";
+inline constexpr OUStringLiteral PROPERTY_DETAILFIELDS = u"DetailFields";
+inline constexpr OUStringLiteral PROPERTY_DEFAULTBUTTON = u"DefaultButton";
+inline constexpr OUStringLiteral PROPERTY_LISTINDEX = u"ListIndex";
+inline constexpr OUStringLiteral PROPERTY_HEIGHT = u"Height";
+inline constexpr OUStringLiteral PROPERTY_HASNAVIGATION = u"HasNavigationBar";
+inline constexpr OUStringLiteral PROPERTY_POSITIONX = u"PositionX";
+inline constexpr OUStringLiteral PROPERTY_POSITIONY = u"PositionY";
+inline constexpr OUStringLiteral PROPERTY_AUTOGROW = u"AutoGrow";
+inline constexpr OUStringLiteral PROPERTY_STEP = u"Step";
+inline constexpr OUStringLiteral PROPERTY_WORDLINEMODE = u"FontWordLineMode";
+inline constexpr OUStringLiteral PROPERTY_PROGRESSVALUE = u"ProgressValue";
+inline constexpr OUStringLiteral PROPERTY_PROGRESSVALUE_MIN = 
u"ProgressValueMin";
+inline constexpr OUStringLiteral PROPERTY_PROGRESSVALUE_MAX = 
u"ProgressValueMax";
+inline constexpr OUStringLiteral PROPERTY_SCROLLVALUE = u"ScrollValue";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_SCROLLVALUE = 
u"DefaultScrollValue";
+inline constexpr OUStringLiteral PROPERTY_SCROLLVALUE_MIN = u"ScrollValueMin";
+inline constexpr OUStringLiteral PROPERTY_SCROLLVALUE_MAX = u"ScrollValueMax";
+inline constexpr OUStringLiteral PROPERTY_SCROLL_WIDTH = u"ScrollWidth";
+inline constexpr OUStringLiteral PROPERTY_SCROLL_HEIGHT = u"ScrollHeight";
+inline constexpr OUStringLiteral PROPERTY_SCROLL_TOP = u"ScrollTop";
+inline constexpr OUStringLiteral PROPERTY_SCROLL_LEFT = u"ScrollLeft";
+inline constexpr OUStringLiteral PROPERTY_LINEINCREMENT = u"LineIncrement";
+inline constexpr OUStringLiteral PROPERTY_BLOCKINCREMENT = u"BlockIncrement";
+inline constexpr OUStringLiteral PROPERTY_VISIBLESIZE = u"VisibleSize";
+inline constexpr OUStringLiteral PROPERTY_ORIENTATION = u"Orientation";
+inline constexpr OUStringLiteral PROPERTY_IMAGEPOSITION = u"ImagePosition";
+inline constexpr OUStringLiteral PROPERTY_ACTIVE_CONNECTION = 
u"ActiveConnection";
+inline constexpr OUStringLiteral PROPERTY_ACTIVECOMMAND = u"ActiveCommand";
+inline constexpr OUStringLiteral PROPERTY_DATE = u"Date";
+inline constexpr OUStringLiteral PROPERTY_STATE = u"State";
+inline constexpr OUStringLiteral PROPERTY_TIME = u"Time";
+inline constexpr OUStringLiteral PROPERTY_SCALEIMAGE = u"ScaleImage";
+inline constexpr OUStringLiteral PROPERTY_SCALE_MODE = u"ScaleMode";
+inline constexpr OUStringLiteral PROPERTY_PUSHBUTTONTYPE = u"PushButtonType";
+inline constexpr OUStringLiteral PROPERTY_EFFECTIVE_VALUE = u"EffectiveValue";
+inline constexpr OUStringLiteral PROPERTY_SELECTEDITEMS = u"SelectedItems";
+inline constexpr OUStringLiteral PROPERTY_REPEAT = u"Repeat";
+inline constexpr OUStringLiteral PROPERTY_REPEAT_DELAY = u"RepeatDelay";
+inline constexpr OUStringLiteral PROPERTY_SYMBOLCOLOR = u"SymbolColor";
+inline constexpr OUStringLiteral PROPERTY_SPINVALUE = u"SpinValue";
+inline constexpr OUStringLiteral PROPERTY_SPINVALUE_MIN = u"SpinValueMin";
+inline constexpr OUStringLiteral PROPERTY_SPINVALUE_MAX = u"SpinValueMax";
+inline constexpr OUStringLiteral PROPERTY_DEFAULT_SPINVALUE = 
u"DefaultSpinValue";
+inline constexpr OUStringLiteral PROPERTY_SPININCREMENT = u"SpinIncrement";
+inline constexpr OUStringLiteral PROPERTY_SHOW_POSITION = u"ShowPosition";
+inline constexpr OUStringLiteral PROPERTY_SHOW_NAVIGATION = u"ShowNavigation";
+inline constexpr OUStringLiteral PROPERTY_SHOW_RECORDACTIONS = 
u"ShowRecordActions";
+inline constexpr OUStringLiteral PROPERTY_SHOW_FILTERSORT = u"ShowFilterSort";
+inline constexpr OUStringLiteral PROPERTY_LINEEND_FORMAT = u"LineEndFormat";
+inline constexpr OUStringLiteral PROPERTY_DECORATION = u"Decoration";
+inline constexpr OUStringLiteral PROPERTY_NOLABEL = u"NoLabel";
+inline constexpr OUStringLiteral PROPERTY_URL = u"URL";
 
-    #define PROPERTY_DEFAULTCONTROL          "DefaultControl"
-    #define PROPERTY_INTROSPECTEDOBJECT      "IntrospectedObject"
-    #define PROPERTY_CURRENTPAGE             "CurrentPage"
-    #define PROPERTY_CONTROLCONTEXT          "ControlContext"

... etc. - the rest is truncated

Reply via email to