[Libreoffice-commits] .: unotools/source

[Michael Meeks]

 unotools/source/config/pathoptions.cxx |   33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

New commits:
commit baa36ed2f1f35f311e11aa630ea16e969f841303
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Sep 27 14:44:54 2011 +0100

    remove obsolete and unused defines

diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 7bfbf48..b760576 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
 {