diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-06 17:39:20 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-06 20:08:07 +0200 |
commit | 0c68a8e8fd4323d46d71ff852909389c37dda1e8 (patch) | |
tree | a3d1d77e994493d2db0b78a5c15b2c818bfe29b1 /svx | |
parent | fix target rule (diff) | |
download | core-0c68a8e8fd4323d46d71ff852909389c37dda1e8.tar.gz core-0c68a8e8fd4323d46d71ff852909389c37dda1e8.zip |
svx: get rid of DECLARE_ASCII macro and related cleanup
Change-Id: Ic6e39b81c04d5e416d1a000def39b3a127fa7940
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/form/datanavi.cxx | 48 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbxcolor.cxx | 5 | ||||
-rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 8 |
3 files changed, 30 insertions, 31 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 4a09e4b18122..c48dbbf42615 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -82,36 +82,36 @@ namespace svxform //............................................................................ // properties of instance - #define PN_INSTANCE_MODEL ::rtl::OUString( "Instance" ) - #define PN_INSTANCE_ID ::rtl::OUString( "ID" ) - #define PN_INSTANCE_URL ::rtl::OUString( "URL" ) + #define PN_INSTANCE_MODEL "Instance" + #define PN_INSTANCE_ID "ID" + #define PN_INSTANCE_URL "URL" // properties of binding - #define PN_BINDING_ID ::rtl::OUString( "BindingID" ) - #define PN_BINDING_EXPR ::rtl::OUString( "BindingExpression" ) - #define PN_BINDING_MODEL ::rtl::OUString( "Model" ) - #define PN_BINDING_NAMESPACES ::rtl::OUString( "ModelNamespaces" ) - #define PN_READONLY_EXPR ::rtl::OUString( "ReadonlyExpression" ) - #define PN_RELEVANT_EXPR ::rtl::OUString( "RelevantExpression" ) - #define PN_REQUIRED_EXPR ::rtl::OUString( "RequiredExpression" ) - #define PN_CONSTRAINT_EXPR ::rtl::OUString( "ConstraintExpression" ) - #define PN_CALCULATE_EXPR ::rtl::OUString( "CalculateExpression" ) - #define PN_BINDING_TYPE ::rtl::OUString( "Type" ) + #define PN_BINDING_ID "BindingID" + #define PN_BINDING_EXPR "BindingExpression" + #define PN_BINDING_MODEL "Model" + #define PN_BINDING_NAMESPACES "ModelNamespaces" + #define PN_READONLY_EXPR "ReadonlyExpression" + #define PN_RELEVANT_EXPR "RelevantExpression" + #define PN_REQUIRED_EXPR "RequiredExpression" + #define PN_CONSTRAINT_EXPR "ConstraintExpression" + #define PN_CALCULATE_EXPR "CalculateExpression" + #define PN_BINDING_TYPE "Type" // properties of submission - #define PN_SUBMISSION_ID ::rtl::OUString( "ID" ) - #define PN_SUBMISSION_BIND ::rtl::OUString( "Bind" ) - #define PN_SUBMISSION_REF ::rtl::OUString( "Ref" ) - #define PN_SUBMISSION_ACTION ::rtl::OUString( "Action" ) - #define PN_SUBMISSION_METHOD ::rtl::OUString( "Method" ) - #define PN_SUBMISSION_REPLACE ::rtl::OUString( "Replace" ) + #define PN_SUBMISSION_ID "ID" + #define PN_SUBMISSION_BIND "Bind" + #define PN_SUBMISSION_REF "Ref" + #define PN_SUBMISSION_ACTION "Action" + #define PN_SUBMISSION_METHOD "Method" + #define PN_SUBMISSION_REPLACE "Replace" // other const strings - #define TRUE_VALUE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true()" ) ) - #define NEW_ELEMENT ::rtl::OUString( "newElement" ) - #define NEW_ATTRIBUTE ::rtl::OUString( "newAttribute" ) - #define EVENTTYPE_CHARDATA ::rtl::OUString( "DOMCharacterDataModified" ) - #define EVENTTYPE_ATTR ::rtl::OUString( "DOMAttrModified" ) + #define TRUE_VALUE "true()" + #define NEW_ELEMENT "newElement" + #define NEW_ATTRIBUTE "newAttribute" + #define EVENTTYPE_CHARDATA "DOMCharacterDataModified" + #define EVENTTYPE_ATTR "DOMAttrModified" #define MIN_PAGE_COUNT 3 // at least one instance, one submission and one binding page diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 49f85f926b59..4c33fbb9bf26 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -31,9 +31,8 @@ namespace svx using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; - #define DECLARE_ASCII(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) - #define TOOLBAR_RESNAME DECLARE_ASCII("private:resource/toolbar/") - #define PROPNAME_LAYOUTMANAGER DECLARE_ASCII("LayoutManager") + #define TOOLBAR_RESNAME "private:resource/toolbar/" + #define PROPNAME_LAYOUTMANAGER "LayoutManager" //==================================================================== //= ToolboxAccess diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index bd2b56f2a9c0..221665dfb7ba 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -30,10 +30,10 @@ #include <vcl/FilterConfigItem.hxx> #include <vcl/graphicfilter.hxx> -#define FORMAT_BMP String(RTL_CONSTASCII_USTRINGPARAM("bmp")) -#define FORMAT_GIF String(RTL_CONSTASCII_USTRINGPARAM("gif")) -#define FORMAT_JPG String(RTL_CONSTASCII_USTRINGPARAM("jpg")) -#define FORMAT_PNG String(RTL_CONSTASCII_USTRINGPARAM("png")) +#define FORMAT_BMP OUString("bmp") +#define FORMAT_GIF OUString("gif") +#define FORMAT_JPG OUString("jpg") +#define FORMAT_PNG OUString("png") GraphicFilter* XOutBitmap::pGrfFilter = NULL; |