diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-09-27 14:44:54 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-09-27 14:44:54 +0100 |
| commit | baa36ed2f1f35f311e11aa630ea16e969f841303 (patch) | |
| tree | 8d255dbfd9bb38476fb2674497708f66a72bb172 /unotools | |
| parent | 0e3361c0aee39c72e4f85d408676ac38efcf9bd0 (diff) | |
remove obsolete and unused defines
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/pathoptions.cxx | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 7bfbf487e164..b760576c47a1 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -70,32 +70,17 @@ using ::rtl::OUString; using ::rtl::OString; using ::rtl::OStringToOUString; -// define ---------------------------------------------------------------- - -#define SEARCHPATH_DELIMITER ';' - -#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) - -#define SIGN_STARTVARIABLE ASCII_STR("$(") -#define SIGN_ENDVARIABLE ASCII_STR(")") +#define SEARCHPATH_DELIMITER ';' +#define SIGN_STARTVARIABLE OUString( RTL_CONSTASCII_USTRINGPARAM( "$(" ) ) +#define SIGN_ENDVARIABLE OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) // Supported variables by the old SvtPathOptions implementation -#define SUBSTITUTE_INST "$(inst)" -#define SUBSTITUTE_PROG "$(prog)" -#define SUBSTITUTE_USER "$(user)" -#define SUBSTITUTE_INSTPATH "$(instpath)" -#define SUBSTITUTE_PROGPATH "$(progpath)" -#define SUBSTITUTE_USERPATH "$(userpath)" -#define SUBSTITUTE_INSTURL "$(insturl)" -#define SUBSTITUTE_PROGURL "$(progurl)" -#define SUBSTITUTE_USERURL "$(userurl)" -#define SUBSTITUTE_PATH "$(path)" -//#define SUBSTITUTE_LANG "$(lang)" -#define SUBSTITUTE_LANGID "$(langid)" -#define SUBSTITUTE_VLANG "$(vlang)" -#define SUBSTITUTE_WORKDIRURL "$(workdirurl)" - -#define STRPOS_NOTFOUND -1 +#define SUBSTITUTE_INSTPATH "$(instpath)" +#define SUBSTITUTE_PROGPATH "$(progpath)" +#define SUBSTITUTE_USERPATH "$(userpath)" +#define SUBSTITUTE_PATH "$(path)" + +#define STRPOS_NOTFOUND -1 struct OUStringHashCode { |