diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/geometrycontrolmodel.cxx | 18 | ||||
| -rw-r--r-- | toolkit/source/controls/tabpagecontainer.cxx | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index c18f15f16495..9dcacd958c5e 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -64,7 +64,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace toolkit; -#define PROPERTY_RESOURCERESOLVER "ResourceResolver" +constexpr OUStringLiteral PROPERTY_RESOURCERESOLVER = u"ResourceResolver"; namespace diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index c53b6c808751..3b5b66b74126 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -59,9 +59,9 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -#define PROPERTY_DIALOGSOURCEURL "DialogSourceURL" -#define PROPERTY_IMAGEURL "ImageURL" -#define PROPERTY_GRAPHIC "Graphic" +constexpr OUStringLiteral PROPERTY_DIALOGSOURCEURL = u"DialogSourceURL"; +constexpr OUStringLiteral PROPERTY_IMAGEURL = u"ImageURL"; +constexpr OUStringLiteral PROPERTY_GRAPHIC = u"Graphic"; // we probably will need both a hash of control models and hash of controls diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index ee6dfb6d2a07..1a24fd417bc4 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -38,15 +38,15 @@ #define GCM_PROPERTY_ID_TAG 8 #define GCM_PROPERTY_ID_RESOURCERESOLVER 9 -#define GCM_PROPERTY_POS_X "PositionX" -#define GCM_PROPERTY_POS_Y "PositionY" -#define GCM_PROPERTY_WIDTH "Width" -#define GCM_PROPERTY_HEIGHT "Height" -#define GCM_PROPERTY_NAME "Name" -#define GCM_PROPERTY_TABINDEX "TabIndex" -#define GCM_PROPERTY_STEP "Step" -#define GCM_PROPERTY_TAG "Tag" -#define GCM_PROPERTY_RESOURCERESOLVER "ResourceResolver" +constexpr OUStringLiteral GCM_PROPERTY_POS_X = u"PositionX"; +constexpr OUStringLiteral GCM_PROPERTY_POS_Y = u"PositionY"; +constexpr OUStringLiteral GCM_PROPERTY_WIDTH = u"Width"; +constexpr OUStringLiteral GCM_PROPERTY_HEIGHT = u"Height"; +constexpr OUStringLiteral GCM_PROPERTY_NAME = u"Name"; +constexpr OUStringLiteral GCM_PROPERTY_TABINDEX = u"TabIndex"; +constexpr OUStringLiteral GCM_PROPERTY_STEP = u"Step"; +constexpr OUStringLiteral GCM_PROPERTY_TAG = u"Tag"; +constexpr OUStringLiteral GCM_PROPERTY_RESOURCERESOLVER = u"ResourceResolver"; #define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 979718e73865..64354b07f5ad 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::view; using ::com::sun::star::awt::tab::XTabPageModel; -#define WRONG_TYPE_EXCEPTION "Type must be css::awt::tab::XTabPageModel!" +constexpr OUStringLiteral WRONG_TYPE_EXCEPTION = u"Type must be css::awt::tab::XTabPageModel!"; UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XComponentContext >& i_factory ) |