Merge branch 'master' into feature/gnumake4

Conflicts:
basebmp/prj/d.lst
basebmp/test/basictest.cxx
basebmp/test/makefile.mk
basegfx/inc/basegfx/basegfxdllapi.h
basegfx/inc/basegfx/tools/debugplotter.hxx
basegfx/inc/basegfx/tuple/b2ituple.hxx
basegfx/prj/d.lst
basegfx/source/numeric/makefile.mk
basegfx/source/polygon/makefile.mk
basegfx/source/range/makefile.mk
basegfx/source/raster/makefile.mk
basegfx/source/tuple/makefile.mk
basegfx/source/vector/makefile.mk
basegfx/test/basegfx1d.cxx
basegfx/test/makefile.mk
basegfx/util/makefile.mk
canvas/Library_canvasfactory.mk
canvas/Module_canvas.mk
canvas/prj/build.lst
canvas/prj/d.lst
canvas/source/cairo/cairo_canvashelper_texturefill.cxx
canvas/source/cairo/makefile.mk
canvas/source/tools/makefile.mk
comphelper/qa/string/makefile.mk
cppcanvas/Module_cppcanvas.mk
cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
cppcanvas/prj/build.lst
cppcanvas/prj/d.lst
cppcanvas/source/mtfrenderer/makefile.mk
cppcanvas/util/makefile.mk
i18npool/source/search/makefile.mk
regexp/Library_regexp.mk
regexp/prj/d.lst
sax/CppunitTest_sax.mk
sax/Library_sax.mk
sax/prj/d.lst
sax/qa/cppunit/test_converter.cxx
sax/source/expatwrap/attrlistimpl.hxx
sax/util/makefile.mk
svtools/Library_svt.mk
tools/Executable_sspretty.mk
ucbhelper/prj/d.lst
ucbhelper/source/provider/configureucb.cxx
ucbhelper/source/provider/provconf.cxx
ucbhelper/util/makefile.mk
unotools/Library_utl.mk
unotools/Module_unotools.mk
unotools/Package_inc.mk
unotools/prj/build.lst
vcl/Library_desktop_detector.mk
vcl/Library_vcl.mk
vcl/Library_vclplug_gtk.mk
vcl/aqua/source/gdi/salprn.cxx
vcl/inc/aqua/saldata.hxx
vcl/unx/generic/gdi/salgdi3.cxx

2 files changed, 17 insertions, 21 deletions

diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index bed4451ea2d1..a5015a8aeca2 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.cxx
@@ -1215,14 +1215,14 @@ Regexpr::regex_compile()
       if (c == (sal_Unicode)':' && *p == (sal_Unicode)']') {
         sal_Int32 ch;
         // no support for GRAPH, PUNCT, or XDIGIT yet
-        sal_Bool is_alnum = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"alnum").getStr());
-        sal_Bool is_alpha = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"alpha").getStr());
-        sal_Bool is_cntrl = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"cntrl").getStr());
-        sal_Bool is_digit = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"digit").getStr());
-        sal_Bool is_lower = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"lower").getStr());
-        sal_Bool is_print = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"print").getStr());
-        sal_Bool is_space = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"space").getStr());
-        sal_Bool is_upper = STREQ(str, ::rtl::OUString::createFromAscii((const sal_Char*)"upper").getStr());
+        sal_Bool is_alnum = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("alnum")).getStr());
+        sal_Bool is_alpha = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("alpha")).getStr());
+        sal_Bool is_cntrl = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cntrl")).getStr());
+        sal_Bool is_digit = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("digit")).getStr());
+        sal_Bool is_lower = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lower")).getStr());
+        sal_Bool is_print = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("print")).getStr());
+        sal_Bool is_space = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("space")).getStr());
+        sal_Bool is_upper = STREQ(str, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("upper")).getStr());
 
         if (!(is_alnum || is_alpha || is_cntrl ||
           is_digit || is_lower || is_print || is_space || is_upper) )
@@ -1684,7 +1684,7 @@ Regexpr::regex_compile()
             sal_Unicode tmp = translit->transliterateChar2Char(c);
             BUF_PUSH(tmp);
             (*pending_exact)++;
-        } catch (::com::sun::star::i18n::MultipleCharsOutputException e) {
+        } catch (const ::com::sun::star::i18n::MultipleCharsOutputException&) {
             ::rtl::OUString o2( translit->transliterateChar2String( c));
             sal_Int32 len2 = o2.getLength();
             const sal_Unicode * k2 = o2.getStr();
@@ -2768,6 +2768,9 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
     POP_FAILURE_POINT(sdummy, pdummy,
               dummy_low_reg, dummy_high_reg,
               reg_dummy, reg_dummy, reg_info_dummy);
+
+    (void)sdummy;
+    (void)pdummy;
       }
       /* Note fall through.  */
 
@@ -2926,7 +2929,7 @@ Regexpr::set_list_bit(sal_Unicode c, sal_Unicode *b)
     try {
         sal_Unicode tmp = translit->transliterateChar2Char(c);
         b[tmp / BYTEWIDTH] |= 1 << (tmp % BYTEWIDTH);
-    } catch (::com::sun::star::i18n::MultipleCharsOutputException e) {
+    } catch (const ::com::sun::star::i18n::MultipleCharsOutputException&) {
         ::rtl::OUString o2( translit->transliterateChar2String( c));
         sal_Int32 len2 = o2.getLength();
         const sal_Unicode * k2 = o2.getStr();
@@ -2939,4 +2942,4 @@ Regexpr::set_list_bit(sal_Unicode c, sal_Unicode *b)
   }
 }
 
-/* vim: set ts=8 sw=2 noexpandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/regexp/source/reclass.hxx b/regexp/source/reclass.hxx
index e97c87019341..34d1c27aa0bd 100644
--- a/regexp/source/reclass.hxx
+++ b/regexp/source/reclass.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
    Copyright (C) 1985,89,90,91,92,93,95,96,97,98 Free Software Foundation, Inc.
@@ -27,21 +28,11 @@
 #ifndef INCLUDED_REGEXP_RECLASS_HXX
 #define INCLUDED_REGEXP_RECLASS_HXX
 
-#ifndef INCLUDED_I18NUTIL_UNICODE_HXX
 #include <i18nutil/unicode.hxx>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_SEARCHFLAGS_HPP_
 #include <com/sun/star/util/SearchFlags.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_SEARCHOPTIONS_HPP_
 #include <com/sun/star/util/SearchOptions.hpp>
-#endif
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDTRANSLITERATION_HPP_
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
-#endif
 
 /* If any error codes are removed, changed, or added, update the
    `re_error_msg' table in regex.c.  */
@@ -393,3 +384,5 @@ public:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */