summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/basereader.hxx5
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/columninfo.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/config.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/contentreader.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/dbgmacros.hxx11
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/fileextensions.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/global.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/i_xml_parser_event_handler.hxx2
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/infotips.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/iso8601_converter.hxx3
-rwxr-xr-xshell/inc/internal/metainforeader.hxx3
-rwxr-xr-xshell/inc/internal/propertyhdl.hxx6
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/propsheets.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/registry.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/resource.h3
-rwxr-xr-xshell/inc/internal/shlxthdl.hxx3
-rwxr-xr-xshell/inc/internal/stream_helper.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/thumbviewer.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/types.hxx3
-rwxr-xr-xshell/inc/internal/utilities.hxx3
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/xml_parser.hxx2
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/zipfile.hxx2
-rwxr-xr-x[-rw-r--r--]shell/inc/kde_headers.h6
-rwxr-xr-x[-rw-r--r--]shell/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/inc/pch/precompiled_shell.cxx2
-rwxr-xr-x[-rw-r--r--]shell/inc/pch/precompiled_shell.hxx2
-rwxr-xr-x[-rw-r--r--]shell/prj/d.lst0
-rwxr-xr-x[-rw-r--r--]shell/qa/i_xml_parser_event_handler.hxx2
-rwxr-xr-xshell/qa/makefile.mk2
-rwxr-xr-xshell/qa/recent_docs.cxx49
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/autostyletag.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/autostyletag.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/basereader.cxx5
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/contentreader.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/dummytag.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/itag.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/keywordstag.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/keywordstag.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/metainforeader.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/simpletag.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/simpletag.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/xml_parser.cxx5
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/zipexcptn.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/zipexcptn.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/zipfile.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/backends/desktopbe/desktopbackend.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/backends/desktopbe/desktopbe1.component0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/desktopbe/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/gconfaccess.cxx194
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/gconfaccess.hxx4
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/gconfbackend.cxx12
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/gconfbe1.component0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/orbit.h3
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/kde4access.cxx15
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/kde4access.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/kde4backend.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/kde4be1.component0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdeaccess.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdeaccess.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdebackend.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdebe1.component0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebackend.cxx147
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebackend.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebe.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebe1.component0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebecdef.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbackend.cxx7
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbackend.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbe.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbe1.component0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbecdef.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbackend.cxx5
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbackend.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbe.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbe1.component0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbecdef.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmail.component0
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmail.xml0
-rwxr-xr-xshell/source/cmdmail/cmdmailentry.cxx3
-rwxr-xr-xshell/source/cmdmail/cmdmailmsg.cxx17
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmailmsg.hxx5
-rwxr-xr-xshell/source/cmdmail/cmdmailsuppl.cxx14
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmailsuppl.hxx7
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/exports.dxp0
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/mingw_intel.map0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/cmdline.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/cmdline.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/defs.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/lngconvex.cxx6
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/regsvrex/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/regsvrex/regsvrex.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/shellexec.cxx16
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/shellexec.hxx5
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/shellexecentry.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/syssh.component0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/syssh.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/urltest.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/urltest.sh0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/urltest.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/gnome-open-url.c10
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/gnome-open-url.sh0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/makefile.mk3
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/open-url.c2
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/open-url.def0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/senddoc.c2
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/senddoc.def0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/senddoc.sh13
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/uri-encode.c3
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/makefile.mk3
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/recently_used_file.cxx6
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/recently_used_file.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/recently_used_file_handler.cxx7
-rwxr-xr-x[-rw-r--r--]shell/source/win32/SysShExec.cxx21
-rwxr-xr-x[-rw-r--r--]shell/source/win32/SysShExec.hxx5
-rwxr-xr-x[-rw-r--r--]shell/source/win32/SysShentry.cxx5
-rwxr-xr-x[-rw-r--r--]shell/source/win32/exports.dxp0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/makefile.mk0
-rwxr-xr-xshell/source/win32/shlxthandler/classfactory.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/classfactory.hxx3
-rwxr-xr-xshell/source/win32/shlxthandler/columninfo/columninfo.cxx6
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/columninfo/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/exports.dxp0
-rwxr-xr-xshell/source/win32/shlxthandler/infotips/infotips.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/infotips/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/makefile.mk2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/exports.dxp0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/makefile.mk9
-rwxr-xr-xshell/source/win32/shlxthandler/ooofilt/ooofilt.cxx4
-rwxr-xr-xshell/source/win32/shlxthandler/ooofilt/ooofilt.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/propspec.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/propspec.hxx2
-rwxr-xr-xshell/source/win32/shlxthandler/ooofilt/stream_helper.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/prophdl/makefile.mk0
-rwxr-xr-xshell/source/win32/shlxthandler/prophdl/propertyhdl.cxx6
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/document_statistic.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/document_statistic.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/makefile.mk0
-rwxr-xr-xshell/source/win32/shlxthandler/propsheets/propsheets.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/ctrylnglist.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/prop_img.bmpbin958 -> 958 bytes
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/rcfooter.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/rcheader.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/rctmpl.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/shlxthdl.manifest0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/shlxthdl.ulf0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/signet.pngbin4836 -> 4836 bytes
-rwxr-xr-xshell/source/win32/shlxthandler/shlxthdl.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/thumbviewer/makefile.mk1
-rwxr-xr-xshell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/dbgmacros.cxx2
-rwxr-xr-xshell/source/win32/shlxthandler/util/fileextensions.cxx5
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/iso8601_converter.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/makefile.mk1
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/registry.cxx3
-rwxr-xr-xshell/source/win32/shlxthandler/util/utilities.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/exports.dxp0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/senddoc.cxx37
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/simplemapi.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/simplemapi.hxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmail.component0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmail.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailclient.cxx31
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailclient.hxx5
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailentry.cxx5
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailmsg.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailmsg.hxx5
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailsuppl.cxx6
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailsuppl.hxx7
-rwxr-xr-x[-rw-r--r--]shell/source/win32/syssh.component0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/syssh.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/TestProxySet.cxx11
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/TestSmplMail.cxx23
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/TestSysShExec.cxx11
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/makefile.mk0
189 files changed, 672 insertions, 349 deletions
diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx
index fcdf1cdd7dff..bb5c27645e2a 100644..100755
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
#include "internal/utilities.hxx"
#include "internal/i_xml_parser_event_handler.hxx"
-#ifndef XML_PARSER_HXX_INCLUDED
#include "internal/xml_parser.hxx"
-#endif
#include "internal/zipfile.hxx"
class CBaseReader : public i_xml_parser_event_handler
@@ -78,3 +77,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx
index 4e392dd76f4d..32cc89680a88 100644..100755
--- a/shell/inc/internal/columninfo.hxx
+++ b/shell/inc/internal/columninfo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 3c10e7db26a7..915d26aba006 100644..100755
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@
#define CONTENT_STYLE_PROPERTIES_COUNTRYASIAN L"country-asian"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx
index 63b0c550c534..3d1650c559bc 100644..100755
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,3 +125,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/dbgmacros.hxx b/shell/inc/internal/dbgmacros.hxx
index fbab023664ac..0fe72b4aceb2 100644..100755
--- a/shell/inc/internal/dbgmacros.hxx
+++ b/shell/inc/internal/dbgmacros.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,21 +32,15 @@
void DbgAssert(bool condition, const char* message);
#if OSL_DEBUG_LEVEL > 0
-
#define PRE_CONDITION(x, msg) DbgAssert(x, msg)
-
#define POST_CONDITION(x, msg) DbgAssert(x, msg)
-
#define ENSURE(x ,msg) DbgAssert(x, msg)
-
#else // OSL_DEBUG_LEVEL == 0
-
#define PRE_CONDITION(x, msg) ((void)0)
-
#define POST_CONDITION(x, msg) ((void)0)
-
#define ENSURE(x, msg) ((void)0)
-
#endif
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx
index 48d6f283ea1d..4005258d8ac7 100644..100755
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/internal/fileextensions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ enum File_Type_t { UNKNOWN, WRITER, CALC, DRAW, IMPRESS, MATH, WEB, DATABASE };
File_Type_t get_file_type(const std::string& file_name);
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx
index ebf3305934bd..b711c34b8b1d 100644..100755
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/internal/global.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@
extern long g_DllRefCnt;
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx
index 5164f2236522..af0844d2654f 100644..100755
--- a/shell/inc/internal/i_xml_parser_event_handler.hxx
+++ b/shell/inc/internal/i_xml_parser_event_handler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx
index 8193615a505f..d4e5de2582b1 100644..100755
--- a/shell/inc/internal/infotips.hxx
+++ b/shell/inc/internal/infotips.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/iso8601_converter.hxx b/shell/inc/internal/iso8601_converter.hxx
index f7f00bbe1c53..9e59a50feddf 100644..100755
--- a/shell/inc/internal/iso8601_converter.hxx
+++ b/shell/inc/internal/iso8601_converter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ std::wstring iso8601_date_to_local_date(const std::wstring& iso8601date);
std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601duration);
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx
index ea29dff07c80..516224571078 100755
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -146,3 +147,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx
index 6379fdf0137b..c430c2f5778e 100755
--- a/shell/inc/internal/propertyhdl.hxx
+++ b/shell/inc/internal/propertyhdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6,9 +7,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: PropertyHdl.hxx,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -124,3 +122,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx
index 0159379e3127..e3e38dd84350 100644..100755
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/internal/propsheets.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/registry.hxx b/shell/inc/internal/registry.hxx
index 25f1749a6a3c..dc1b2488e188 100644..100755
--- a/shell/inc/internal/registry.hxx
+++ b/shell/inc/internal/registry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName,
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/resource.h b/shell/inc/internal/resource.h
index 3685ac5f66fc..338e1f0114ae 100644..100755
--- a/shell/inc/internal/resource.h
+++ b/shell/inc/internal/resource.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef RESOURCE_H_INCLUDED
#define RESOURCE_H_INCLUDED
@@ -55,3 +56,5 @@
#define IDP_SIGNET 2000
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/internal/shlxthdl.hxx
index b13a142b6e2c..310d54f9d5d4 100755
--- a/shell/inc/internal/shlxthdl.hxx
+++ b/shell/inc/internal/shlxthdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ const CLSID CLSID_THUMBVIEWER_HANDLER =
{ 0x3b092f0c, 0x7696, 0x40e3, { 0xa8, 0xf, 0x68, 0xd7, 0x4d, 0xa8, 0x42, 0x10 } };
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx
index 2ef4529b54ce..bd31ee111315 100755
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,3 +34,5 @@
IStream* PrepareIStream( IStream* pStream, zlib_filefunc_def &zFileFunc );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index 8c4a8979a181..73f6ba8de010 100644..100755
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index c11692912aec..bf6c5d1536f7 100644..100755
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ typedef ::std::map<StyleName_t, LocaleSet_t> StyleLocaleMap_t;
const StyleLocalePair_t EMPTY_STYLELOCALE_PAIR = ::std::make_pair(::std::wstring(), EMPTY_LOCALE );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index c67787c5cb9d..fd608d6d4870 100755
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,5 @@ static inline void OutputDebugStringFormat( LPCSTR, ... )
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 57e8a4fd6d88..d57110deaf29 100644..100755
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index a3e3575082c0..6d8d24b0538c 100644..100755
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -160,3 +161,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/kde_headers.h b/shell/inc/kde_headers.h
index 772a5382fe81..7ec45fdc383d 100644..100755
--- a/shell/inc/kde_headers.h
+++ b/shell/inc/kde_headers.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,6 +32,8 @@
/* ********* Suppress warnings if needed */
#include "sal/config.h"
+#include <cstddef>
+
#if defined __GNUC__
#pragma GCC system_header
#endif
@@ -90,5 +93,6 @@
#include <kabc/field.h>
#include <kabc/stdaddressbook.h>
-
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/makefile.mk b/shell/inc/makefile.mk
index c297cb4f77e9..c297cb4f77e9 100644..100755
--- a/shell/inc/makefile.mk
+++ b/shell/inc/makefile.mk
diff --git a/shell/inc/pch/precompiled_shell.cxx b/shell/inc/pch/precompiled_shell.cxx
index 778ff4e4578e..749acbe4ed3f 100644..100755
--- a/shell/inc/pch/precompiled_shell.cxx
+++ b/shell/inc/pch/precompiled_shell.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_shell.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/pch/precompiled_shell.hxx b/shell/inc/pch/precompiled_shell.hxx
index a3ea4e27b4bb..487d27d55cd2 100644..100755
--- a/shell/inc/pch/precompiled_shell.hxx
+++ b/shell/inc/pch/precompiled_shell.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
#ifdef PRECOMPILED_HEADERS
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index 3ef183dbdf42..3ef183dbdf42 100644..100755
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
diff --git a/shell/qa/i_xml_parser_event_handler.hxx b/shell/qa/i_xml_parser_event_handler.hxx
index 1758e2075b55..e929989bff48 100644..100755
--- a/shell/qa/i_xml_parser_event_handler.hxx
+++ b/shell/qa/i_xml_parser_event_handler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index 290798bab18e..1420d3881d09 100755
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -42,7 +42,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj
SHL1TARGET=recent_docs
-SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "UNX"
..$/unxsols4.pro$/slb$/libsysshell.a \
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index b4408e2f7737..f90154e24727 100755
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,16 +41,17 @@
//########################################
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
namespace syssh = SystemShell;
//########################################
-const OUString SXW_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.writer");
-const OUString SXC_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.calc");
-const OUString SXI_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.impress");
-const OUString SXD_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.draw");
-const OUString SXM_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.math");
+const OUString SXW_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.writer"));
+const OUString SXC_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.calc"));
+const OUString SXI_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.impress"));
+const OUString SXD_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.draw"));
+const OUString SXM_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.math"));
class Test_AddToRecentDocs : public CppUnit::TestFixture
{
@@ -65,19 +67,19 @@ public:
system("rm $HOME/.recently-used");
system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
- rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
+ rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxc");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxc"));
syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxi");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxi"));
syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxd");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxd"));
syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxm");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxm"));
syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
}
@@ -87,7 +89,7 @@ public:
system("rm $HOME/.recently-used");
system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n<RecentItem>\n<URI>file:///home/federico/gedit2.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
- rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
+ rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
}
@@ -96,19 +98,19 @@ public:
{
int ret = system("rm $HOME/.recently-used");
- rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
+ rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxc");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxc"));
syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxi");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxi"));
syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxd");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxd"));
syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
- url = rtl::OUString::createFromAscii("file:///home_athene/test.sxm");
+ url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxm"));
syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
ret = system("ls $HOME/.recently-used");
@@ -126,9 +128,9 @@ public:
if ((recently_used_url.getLength() > 0) &&
('/' != recently_used_url.pData->buffer[recently_used_url.getLength() - 1]))
- recently_used_url += rtl::OUString::createFromAscii("/");
+ recently_used_url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- recently_used_url += rtl::OUString::createFromAscii(".recently-used");
+ recently_used_url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".recently-used"));
return recently_used_url;
}
@@ -136,7 +138,7 @@ public:
void read_recently_used(void* buffer, size_t size)
{
File ruf(get_recently_used_url());
- FileBase::RC rc = ruf.open(OpenFlag_Read);
+ FileBase::RC rc = ruf.open(osl_File_OpenFlag_Read);
CPPUNIT_ASSERT_MESSAGE("Cannot open ~/.recently-used", FileBase::E_None == rc);
@@ -158,7 +160,7 @@ public:
memset(cnt_before, 0, sizeof(cnt_before));
read_recently_used(cnt_before, sizeof(cnt_before));
- OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
+ OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
char cnt_after[128];
@@ -177,7 +179,7 @@ public:
sprintf(cmd, "echo '%s' > $HOME/.recently-used", xml_unknown);
system(cmd);
- OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
+ OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
char buffer[256];
@@ -193,7 +195,7 @@ public:
system("rm $HOME/.recently-used");
system("touch $HOME/.recently-used");
- OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
+ OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
char buffer[256];
@@ -222,3 +224,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_AddToRecentDocs, "Test_AddToRecentDoc
NOADDITIONAL;
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/autostyletag.cxx b/shell/source/all/ooofilereader/autostyletag.cxx
index 6d51259345df..3cf81a7bd5f9 100644..100755
--- a/shell/source/all/ooofilereader/autostyletag.cxx
+++ b/shell/source/all/ooofilereader/autostyletag.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,4 @@ void CAutoStyleTag::clearStyleLocalePair( )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/autostyletag.hxx b/shell/source/all/ooofilereader/autostyletag.hxx
index 3957dd1b09b8..c392b53bb0cb 100644..100755
--- a/shell/source/all/ooofilereader/autostyletag.hxx
+++ b/shell/source/all/ooofilereader/autostyletag.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,3 +71,5 @@ class CAutoStyleTag : public ITag
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/basereader.cxx b/shell/source/all/ooofilereader/basereader.cxx
index 2fc4a0c79297..39752fe70515 100644..100755
--- a/shell/source/all/ooofilereader/basereader.cxx
+++ b/shell/source/all/ooofilereader/basereader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#include "precompiled_shell.hxx"
#include "internal/basereader.hxx"
-#ifndef XML_PARSER_HXX_INCLUDED
#include "internal/xml_parser.hxx"
-#endif
#include "assert.h"
#include <memory>
@@ -104,3 +103,5 @@ void CBaseReader::Initialize( const std::string& ContentName)
ENSURE(false, "Unknown error");
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/contentreader.cxx b/shell/source/all/ooofilereader/contentreader.cxx
index 4afb278ff2c8..360d3dcfd3b6 100644..100755
--- a/shell/source/all/ooofilereader/contentreader.cxx
+++ b/shell/source/all/ooofilereader/contentreader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -233,3 +234,4 @@ void CContentReader::characters( const std::wstring& character )
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/dummytag.hxx b/shell/source/all/ooofilereader/dummytag.hxx
index cbd4382e84e3..b7007f5acf7c 100644..100755
--- a/shell/source/all/ooofilereader/dummytag.hxx
+++ b/shell/source/all/ooofilereader/dummytag.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ class CDummyTag : public ITag
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/itag.hxx b/shell/source/all/ooofilereader/itag.hxx
index 97c09ed35b32..c4a7eeacf8f5 100644..100755
--- a/shell/source/all/ooofilereader/itag.hxx
+++ b/shell/source/all/ooofilereader/itag.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ class ITag
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/keywordstag.cxx b/shell/source/all/ooofilereader/keywordstag.cxx
index 2ffccfddaff2..695bfe8b5a60 100644..100755
--- a/shell/source/all/ooofilereader/keywordstag.cxx
+++ b/shell/source/all/ooofilereader/keywordstag.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,4 @@ std::wstring CKeywordsTag::getTagContent( )
return ret_KeyWord_String;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/keywordstag.hxx b/shell/source/all/ooofilereader/keywordstag.hxx
index 634810febd31..9a761acf8072 100644..100755
--- a/shell/source/all/ooofilereader/keywordstag.hxx
+++ b/shell/source/all/ooofilereader/keywordstag.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ class CKeywordsTag : public ITag
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk
index bf6365526eec..bf6365526eec 100644..100755
--- a/shell/source/all/ooofilereader/makefile.mk
+++ b/shell/source/all/ooofilereader/makefile.mk
diff --git a/shell/source/all/ooofilereader/metainforeader.cxx b/shell/source/all/ooofilereader/metainforeader.cxx
index 24e59f6845da..be6ad746569d 100644..100755
--- a/shell/source/all/ooofilereader/metainforeader.cxx
+++ b/shell/source/all/ooofilereader/metainforeader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -300,3 +301,4 @@ void CMetaInfoReader::characters( const std::wstring& character )
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/simpletag.cxx b/shell/source/all/ooofilereader/simpletag.cxx
index 8fad2dc618ed..fa9f28796869 100644..100755
--- a/shell/source/all/ooofilereader/simpletag.cxx
+++ b/shell/source/all/ooofilereader/simpletag.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ std::wstring CSimpleTag::getTagContent( )
else
return ( ::std::wstring( EMPTY_STRING ) );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/ooofilereader/simpletag.hxx b/shell/source/all/ooofilereader/simpletag.hxx
index 8e251c4329ab..fb4b5d8399ce 100644..100755
--- a/shell/source/all/ooofilereader/simpletag.hxx
+++ b/shell/source/all/ooofilereader/simpletag.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ class CSimpleTag : public ITag
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index b7f73d2404a8..71665ce9fd0d 100644..100755
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-#ifndef XML_PARSER_HXX_INCLUDED
#include "internal/xml_parser.hxx"
-#endif
#include "internal/i_xml_parser_event_handler.hxx"
#include <assert.h>
@@ -213,3 +212,5 @@ i_xml_parser_event_handler* xml_parser::get_document_handler() const
{
return document_handler_;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/zipfile/makefile.mk b/shell/source/all/zipfile/makefile.mk
index 4e0af2891027..4e0af2891027 100644..100755
--- a/shell/source/all/zipfile/makefile.mk
+++ b/shell/source/all/zipfile/makefile.mk
diff --git a/shell/source/all/zipfile/zipexcptn.cxx b/shell/source/all/zipfile/zipexcptn.cxx
index fcbbf54382bf..c5501d5b6213 100644..100755
--- a/shell/source/all/zipfile/zipexcptn.cxx
+++ b/shell/source/all/zipfile/zipexcptn.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@ IOException::IOException(int Error) :
Win32Exception(Error)
{
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/zipfile/zipexcptn.hxx b/shell/source/all/zipfile/zipexcptn.hxx
index b98dc6df594f..80ddfe9702bc 100644..100755
--- a/shell/source/all/zipfile/zipexcptn.hxx
+++ b/shell/source/all/zipfile/zipexcptn.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
// ZipException.h: interface for the ZipException class.
//
//////////////////////////////////////////////////////////////////////
@@ -76,3 +77,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx
index 96dd7922ec08..0b4ac7fd7fc2 100644..100755
--- a/shell/source/all/zipfile/zipfile.cxx
+++ b/shell/source/all/zipfile/zipfile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -249,3 +250,4 @@ long ZipFile::GetFileLongestFileNameLength() const
return lmax;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index e628e8e1b830..61f37d9eef24 100644..100755
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -282,3 +283,6 @@ component_getImplementationEnvironment(
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component
index 9ef142107698..9ef142107698 100644..100755
--- a/shell/source/backends/desktopbe/desktopbe1.component
+++ b/shell/source/backends/desktopbe/desktopbe1.component
diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk
index 66ad8cf99e1e..66ad8cf99e1e 100644..100755
--- a/shell/source/backends/desktopbe/makefile.mk
+++ b/shell/source/backends/desktopbe/makefile.mk
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 64d0e2e94eae..9b93c737cd2e 100644..100755
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,8 @@
************************************************************************/
#include "precompiled_shell.hxx"
-#include "sal/config.h"
+#include <sal/macros.h>
+#include <sal/config.h>
#include <string.h>
@@ -36,6 +38,7 @@
#include "osl/thread.h"
#include "rtl/strbuf.hxx"
#include "rtl/ustrbuf.hxx"
+#include "sal/macros.h"
#include "gconfaccess.hxx"
@@ -48,7 +51,11 @@ namespace {
namespace css = com::sun::star ;
namespace uno = css::uno ;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringBuffer;
GConfClient* getGconfClient()
{
@@ -73,8 +80,8 @@ GConfClient* getGconfClient()
mClient = gconf_client_get_default();
if (!mClient)
{
- throw uno::RuntimeException(rtl::OUString::createFromAscii
- ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL);
+ throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+ ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection")),NULL);
}
static const char * const PreloadValuesList[] =
@@ -114,7 +121,7 @@ static OUString xdg_user_dir_lookup (const char *type)
if (!aSecurity.getHomeDir( aHomeDirURL ) )
{
- osl::FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii("/tmp"), aDocumentsDirURL);
+ osl::FileBase::getFileURLFromSystemPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp")), aDocumentsDirURL);
return aDocumentsDirURL;
}
@@ -122,12 +129,12 @@ static OUString xdg_user_dir_lookup (const char *type)
if (config_home == NULL || config_home[0] == 0)
{
aConfigFileURL = OUString(aHomeDirURL);
- aConfigFileURL += OUString::createFromAscii( "/.config/user-dirs.dirs" );
+ aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/.config/user-dirs.dirs"));
}
else
{
aConfigFileURL = OUString::createFromAscii(config_home);
- aConfigFileURL += OUString::createFromAscii( "/user-dirs.dirs" );
+ aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/user-dirs.dirs"));
}
if(osl_File_E_None == osl_openFile(aConfigFileURL.pData, &handle, osl_File_OpenFlag_Read))
@@ -225,19 +232,19 @@ static OUString xdg_user_dir_lookup (const char *type)
//------------------------------------------------------------------------------
-uno::Any makeAnyOfGconfValue( GConfValue *aGconfValue )
+uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue )
{
- switch( aGconfValue->type )
+ switch( pGconfValue->type )
{
case GCONF_VALUE_BOOL:
- return uno::makeAny( (sal_Bool) gconf_value_get_bool( aGconfValue ) );
+ return uno::makeAny( (sal_Bool) gconf_value_get_bool( pGconfValue ) );
case GCONF_VALUE_INT:
- return uno::makeAny( (sal_Int32) gconf_value_get_int( aGconfValue ) );
+ return uno::makeAny( (sal_Int32) gconf_value_get_int( pGconfValue ) );
case GCONF_VALUE_STRING:
return uno::makeAny( OStringToOUString( rtl::OString(
- gconf_value_get_string(aGconfValue) ), RTL_TEXTENCODING_UTF8 ) );
+ gconf_value_get_string(pGconfValue) ), RTL_TEXTENCODING_UTF8 ) );
default:
fprintf( stderr, "makeAnyOfGconfValue: Type not handled.\n" );
@@ -249,9 +256,9 @@ uno::Any makeAnyOfGconfValue( GConfValue *aGconfValue )
//------------------------------------------------------------------------------
-static void splitFontName( GConfValue *aGconfValue, rtl::OUString &rName, sal_Int16 &rHeight)
+static void splitFontName( GConfValue *pGconfValue, rtl::OUString &rName, sal_Int16 &rHeight)
{
- rtl::OString aFont( gconf_value_get_string( aGconfValue ) );
+ rtl::OString aFont( gconf_value_get_string( pGconfValue ) );
aFont.trim();
sal_Int32 nIdx = aFont.lastIndexOf( ' ' );
if (nIdx < 1) { // urk
@@ -267,20 +274,20 @@ static void splitFontName( GConfValue *aGconfValue, rtl::OUString &rName, sal_In
//------------------------------------------------------------------------------
-uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValue )
+uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfValue )
{
- switch( aValue.nSettingId )
+ switch( rValue.nSettingId )
{
case SETTING_PROXY_MODE:
{
rtl::OUString aProxyMode;
- uno::Any aOriginalValue = makeAnyOfGconfValue( aGconfValue );
+ uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
aOriginalValue >>= aProxyMode;
- if( aProxyMode.equals( rtl::OUString::createFromAscii( "manual" ) ) )
+ if( aProxyMode.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("manual")) ) )
return uno::makeAny( (sal_Int32) 1 );
- else if( aProxyMode.equals( rtl::OUString::createFromAscii( "none" ) ) )
+ else if( aProxyMode.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none")) ) )
return uno::makeAny( (sal_Int32) 0 );
}
break;
@@ -288,9 +295,9 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
case SETTING_NO_PROXY_FOR:
{
rtl::OStringBuffer aBuffer;
- if( (GCONF_VALUE_LIST == aGconfValue->type) && (GCONF_VALUE_STRING == gconf_value_get_list_type(aGconfValue)) )
+ if( (GCONF_VALUE_LIST == pGconfValue->type) && (GCONF_VALUE_STRING == gconf_value_get_list_type(pGconfValue)) )
{
- GSList * list = gconf_value_get_list(aGconfValue);
+ GSList * list = gconf_value_get_list(pGconfValue);
for(; list; list = g_slist_next(list))
{
aBuffer.append(gconf_value_get_string((GConfValue *) list->data));
@@ -308,7 +315,7 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
case SETTING_MAILER_PROGRAM:
{
rtl::OUString aMailer;
- uno::Any aOriginalValue = makeAnyOfGconfValue( aGconfValue );
+ uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
aOriginalValue >>= aMailer;
sal_Int32 nIndex = 0;
return uno::makeAny( aMailer.getToken( 0, ' ', nIndex ) );
@@ -319,8 +326,8 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
case SETTING_FONT_ANTI_ALIASING_MIN_PIXEL:
case SETTING_SYMBOL_SET:
{
- sal_Int32 nShortValue;
- uno::Any aOriginalValue = makeAnyOfGconfValue( aGconfValue );
+ sal_Int32 nShortValue(0);
+ uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
aOriginalValue >>= nShortValue;
return uno::makeAny( (sal_Int16) nShortValue );
}
@@ -334,7 +341,7 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
#endif // ENABLE_LOCKDOWN
{
sal_Bool bBooleanValue = false;
- uno::Any aOriginalValue = makeAnyOfGconfValue( aGconfValue );
+ uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
aOriginalValue >>= bBooleanValue;
return uno::makeAny( rtl::OUString::valueOf( (sal_Bool) bBooleanValue ) );
}
@@ -379,8 +386,8 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
rtl::OUString aName;
sal_Int16 nHeight;
- splitFontName (aGconfValue, aName, nHeight);
- if (aValue.nSettingId == SETTING_SOURCEVIEWFONT_NAME)
+ splitFontName (pGconfValue, aName, nHeight);
+ if (rValue.nSettingId == SETTING_SOURCEVIEWFONT_NAME)
return uno::makeAny( aName );
else
return uno::makeAny( nHeight );
@@ -397,18 +404,18 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const ConfigurationValue aValue )
+sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const ConfigurationValue &rValue )
{
- switch( aValue.nDependsOn )
+ switch( rValue.nDependsOn )
{
case SETTING_PROXY_MODE:
{
- GConfValue* aGconfValue = gconf_client_get( aClient, GCONF_PROXY_MODE_KEY, NULL );
+ GConfValue* pGconfValue = gconf_client_get( pClient, GCONF_PROXY_MODE_KEY, NULL );
- if ( aGconfValue != NULL )
+ if ( pGconfValue != NULL )
{
- bool bOk = g_strcasecmp( "manual", gconf_value_get_string( aGconfValue ) ) == 0;
- gconf_value_free( aGconfValue );
+ bool bOk = g_strcasecmp( "manual", gconf_value_get_string( pGconfValue ) ) == 0;
+ gconf_value_free( pGconfValue );
if (bOk) return sal_True;
}
}
@@ -428,7 +435,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
{
rtl::OUString aCompleteName( rtl::OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
- if( !aCompleteName.equalsAscii( "Unknown" ) )
+ if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) )
return sal_True;
}
break;
@@ -437,9 +444,9 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
{
rtl::OUString aCompleteName( rtl::OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
- if( !aCompleteName.equalsAscii( "Unknown" ) )
+ if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) )
{
- if( aCompleteName.trim().indexOf(rtl::OUString::createFromAscii(" "), 0) != -1 )
+ if( aCompleteName.trim().indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")), 0) != -1 )
return sal_True;
}
}
@@ -448,12 +455,12 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
#ifdef ENABLE_LOCKDOWN
case SETTING_AUTO_SAVE:
{
- GConfValue* aGconfValue = gconf_client_get( aClient, GCONF_AUTO_SAVE_KEY, NULL );
+ GConfValue* pGconfValue = gconf_client_get( pClient, GCONF_AUTO_SAVE_KEY, NULL );
- if( ( aGconfValue != NULL ) )
+ if( ( pGconfValue != NULL ) )
{
- bool bOk = gconf_value_get_bool( aGconfValue );
- gconf_value_free( aGconfValue );
+ bool bOk = gconf_value_get_bool( pGconfValue );
+ gconf_value_free( pGconfValue );
if (bOk) return sal_True;
}
}
@@ -475,7 +482,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_ENABLE_ACCESSIBILITY,
"/desktop/gnome/interface/accessibility",
- "EnableATToolSupport",
+ RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport"),
sal_True,
SETTINGS_LAST
},
@@ -483,7 +490,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_MODE,
GCONF_PROXY_MODE_KEY,
- "ooInetProxyType",
+ RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"),
sal_True,
SETTINGS_LAST
},
@@ -491,7 +498,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTP_HOST,
"/system/http_proxy/host",
- "ooInetHTTPProxyName",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName"),
sal_False,
SETTING_PROXY_MODE
},
@@ -499,7 +506,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTP_PORT,
"/system/http_proxy/port",
- "ooInetHTTPProxyPort",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort"),
sal_False,
SETTING_PROXY_MODE
},
@@ -507,7 +514,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTPS_HOST,
"/system/proxy/secure_host",
- "ooInetHTTPSProxyName",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName"),
sal_False,
SETTING_PROXY_MODE
},
@@ -515,7 +522,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTPS_PORT,
"/system/proxy/secure_port",
- "ooInetHTTPSProxyPort",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort"),
sal_False,
SETTING_PROXY_MODE
},
@@ -523,7 +530,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_FTP_HOST,
"/system/proxy/ftp_host",
- "ooInetFTPProxyName",
+ RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName"),
sal_False,
SETTING_PROXY_MODE
},
@@ -531,7 +538,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_FTP_PORT,
"/system/proxy/ftp_port",
- "ooInetFTPProxyPort",
+ RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort"),
sal_False,
SETTING_PROXY_MODE
},
@@ -539,7 +546,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_NO_PROXY_FOR,
"/system/http_proxy/ignore_hosts",
- "ooInetNoProxy",
+ RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"),
sal_True,
SETTING_PROXY_MODE
},
@@ -547,21 +554,21 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_MAILER_PROGRAM,
"/desktop/gnome/url-handlers/mailto/command",
- "ExternalMailer",
+ RTL_CONSTASCII_STRINGPARAM("ExternalMailer"),
sal_True,
SETTINGS_LAST
},
{
SETTING_SOURCEVIEWFONT_NAME,
"/desktop/gnome/interface/monospace_font_name",
- "SourceViewFontName",
+ RTL_CONSTASCII_STRINGPARAM("SourceViewFontName"),
sal_True,
SETTINGS_LAST
},
{
SETTING_SOURCEVIEWFONT_HEIGHT,
"/desktop/gnome/interface/monospace_font_name",
- "SourceViewFontHeight",
+ RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight"),
sal_True,
SETTINGS_LAST
},
@@ -569,7 +576,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WORK_DIRECTORY,
"/desktop/gnome/url-handlers/mailto/command", // dummy
- "WorkPathVariable",
+ RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"),
sal_True,
SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked
},
@@ -578,7 +585,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WRITER_DEFAULT_DOC_FORMAT,
"/apps/openoffice/writer_default_document_format",
- "TextDocumentSetupFactoryDefaultFilter",
+ RTL_CONSTASCII_STRINGPARAM("TextDocumentSetupFactoryDefaultFilter"),
sal_False,
SETTINGS_LAST
},
@@ -586,7 +593,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
"/apps/openoffice/impress_default_document_format",
- "PresentationDocumentSetupFactoryDefaultFilter",
+ RTL_CONSTASCII_STRINGPARAM("PresentationDocumentSetupFactoryDefaultFilter"),
sal_False,
SETTINGS_LAST
},
@@ -594,7 +601,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_CALC_DEFAULT_DOC_FORMAT,
"/apps/openoffice/calc_default_document_format",
- "SpreadsheetDocumentSetupFactoryDefaultFilter",
+ RTL_CONSTASCII_STRINGPARAM("SpreadsheetDocumentSetupFactoryDefaultFilter"),
sal_False,
SETTINGS_LAST
},
@@ -602,7 +609,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_AUTO_SAVE,
GCONF_AUTO_SAVE_KEY,
- "AutoSaveEnabled",
+ RTL_CONSTASCII_STRINGPARAM("AutoSaveEnabled"),
sal_False,
SETTINGS_LAST
},
@@ -610,7 +617,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_AUTO_SAVE_INTERVAL,
"/apps/openoffice/auto_save_interval",
- "AutoSaveTimeIntervall",
+ RTL_CONSTASCII_STRINGPARAM("AutoSaveTimeIntervall"),
sal_False,
SETTING_AUTO_SAVE
},
@@ -618,7 +625,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USER_GIVENNAME,
"/desktop/gnome/url-handlers/mailto/command", // dummy
- "givenname",
+ RTL_CONSTASCII_STRINGPARAM("givenname"),
sal_True,
SETTING_USER_GIVENNAME
},
@@ -626,7 +633,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USER_SURNAME,
"/desktop/gnome/url-handlers/mailto/command", // dummy
- "sn",
+ RTL_CONSTASCII_STRINGPARAM("sn"),
sal_True,
SETTING_USER_SURNAME
},
@@ -634,7 +641,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_DISABLE_PRINTING,
"/desktop/gnome/lockdown/disable_printing",
- "DisablePrinting",
+ RTL_CONSTASCII_STRINGPARAM("DisablePrinting"),
sal_True,
SETTINGS_LAST
},
@@ -642,7 +649,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USE_SYSTEM_FILE_DIALOG,
"/apps/openoffice/use_system_file_dialog",
- "UseSystemFileDialog",
+ RTL_CONSTASCII_STRINGPARAM("UseSystemFileDialog"),
sal_False,
SETTINGS_LAST
},
@@ -650,7 +657,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PRINTING_MODIFIES_DOCUMENT,
"/apps/openoffice/printing_modifies_doc",
- "PrintingModifiesDocument",
+ RTL_CONSTASCII_STRINGPARAM("PrintingModifiesDocument"),
sal_False,
SETTINGS_LAST
},
@@ -658,7 +665,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_ICONS_IN_MENUS,
"/apps/openoffice/show_menu_icons",
- "ShowIconsInMenues",
+ RTL_CONSTASCII_STRINGPARAM("ShowIconsInMenues"),
sal_False,
SETTINGS_LAST
},
@@ -666,7 +673,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_INACTIVE_MENUITEMS,
"/apps/openoffice/show_menu_inactive_items",
- "DontHideDisabledEntry",
+ RTL_CONSTASCII_STRINGPARAM("DontHideDisabledEntry"),
sal_False,
SETTINGS_LAST
},
@@ -674,7 +681,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_FONT_PREVIEW,
"/apps/openoffice/show_font_preview",
- "ShowFontBoxWYSIWYG",
+ RTL_CONSTASCII_STRINGPARAM("ShowFontBoxWYSIWYG"),
sal_False,
SETTINGS_LAST
},
@@ -682,7 +689,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_FONT_HISTORY,
"/apps/openoffice/show_font_history",
- "FontViewHistory",
+ RTL_CONSTASCII_STRINGPARAM("FontViewHistory"),
sal_False,
SETTINGS_LAST
},
@@ -690,7 +697,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_ENABLE_OPENGL,
"/apps/openoffice/use_opengl",
- "OpenGL",
+ RTL_CONSTASCII_STRINGPARAM("OpenGL"),
sal_False,
SETTINGS_LAST
},
@@ -698,7 +705,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_OPTIMIZE_OPENGL,
"/apps/openoffice/optimize_opengl",
- "OpenGL_Faster",
+ RTL_CONSTASCII_STRINGPARAM("OpenGL_Faster"),
sal_False,
SETTINGS_LAST
},
@@ -706,7 +713,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USE_SYSTEM_FONT,
"/apps/openoffice/use_system_font",
- "AccessibilityIsSystemFont",
+ RTL_CONSTASCII_STRINGPARAM("AccessibilityIsSystemFont"),
sal_False,
SETTINGS_LAST
},
@@ -714,7 +721,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USE_FONT_ANTI_ALIASING,
"/apps/openoffice/use_font_anti_aliasing",
- "FontAntiAliasingEnabled",
+ RTL_CONSTASCII_STRINGPARAM("FontAntiAliasingEnabled"),
sal_False,
SETTINGS_LAST
},
@@ -722,7 +729,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
"/apps/openoffice/font_anti_aliasing_min_pixel",
- "FontAntiAliasingMinPixelHeight",
+ RTL_CONSTASCII_STRINGPARAM("FontAntiAliasingMinPixelHeight"),
sal_True,
SETTINGS_LAST
},
@@ -730,7 +737,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_CREATE_PDF,
"/apps/openoffice/lockdown/warn_info_create_pdf",
- "WarnCreatePDF",
+ RTL_CONSTASCII_STRINGPARAM("WarnCreatePDF"),
sal_False,
SETTINGS_LAST
},
@@ -738,7 +745,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_PRINT_DOC,
"/apps/openoffice/lockdown/warn_info_printing",
- "WarnPrintDoc",
+ RTL_CONSTASCII_STRINGPARAM("WarnPrintDoc"),
sal_False,
SETTINGS_LAST
},
@@ -746,7 +753,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_SAVEORSEND_DOC,
"/apps/openoffice/lockdown/warn_info_saving",
- "WarnSaveOrSendDoc",
+ RTL_CONSTASCII_STRINGPARAM("WarnSaveOrSendDoc"),
sal_False,
SETTINGS_LAST
},
@@ -754,7 +761,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_SIGN_DOC,
"/apps/openoffice/lockdown/warn_info_signing",
- "WarnSignDoc",
+ RTL_CONSTASCII_STRINGPARAM("WarnSignDoc"),
sal_False,
SETTINGS_LAST
},
@@ -762,7 +769,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_REMOVE_PERSONAL_INFO,
"/apps/openoffice/lockdown/remove_personal_info_on_save",
- "Scripting/RemovePersonalInfoOnSaving",
+ RTL_CONSTASCII_STRINGPARAM("RemovePersonalInfoOnSaving"),
sal_False,
SETTINGS_LAST
},
@@ -770,7 +777,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_RECOMMEND_PASSWORD,
"/apps/openoffice/lockdown/recommend_password_on_save",
- "RecommendPasswordProtection",
+ RTL_CONSTASCII_STRINGPARAM("RecommendPasswordProtection"),
sal_False,
SETTINGS_LAST
},
@@ -778,7 +785,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_UNDO_STEPS,
"/apps/openoffice/undo_steps",
- "UndoSteps",
+ RTL_CONSTASCII_STRINGPARAM("UndoSteps"),
sal_False,
SETTINGS_LAST
},
@@ -786,7 +793,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SYMBOL_SET,
"/apps/openoffice/icon_size",
- "SymbolSet",
+ RTL_CONSTASCII_STRINGPARAM("SymbolSet"),
sal_True,
SETTINGS_LAST
},
@@ -794,7 +801,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_MACRO_SECURITY_LEVEL,
"/apps/openoffice/lockdown/macro_security_level",
- "MacroSecurityLevel",
+ RTL_CONSTASCII_STRINGPARAM("MacroSecurityLevel"),
sal_False,
SETTINGS_LAST
},
@@ -802,7 +809,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_CREATE_BACKUP,
"/apps/openoffice/create_backup",
- "CreateBackup",
+ RTL_CONSTASCII_STRINGPARAM("CreateBackup"),
sal_False,
SETTINGS_LAST
},
@@ -810,7 +817,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_ALIEN_FORMAT,
"/apps/openoffice/warn_alien_format",
- "WarnAlienFormat",
+ RTL_CONSTASCII_STRINGPARAM("WarnAlienFormat"),
sal_False,
SETTINGS_LAST
},
@@ -818,26 +825,25 @@ ConfigurationValue const ConfigurationValues[] =
#endif // ENABLE_LOCKDOWN
};
-std::size_t const nConfigurationValues =
- sizeof ConfigurationValues / sizeof ConfigurationValues[0];
+std::size_t const nConfigurationValues = SAL_N_ELEMENTS(ConfigurationValues);
css::beans::Optional< css::uno::Any > getValue(ConfigurationValue const & data)
{
- GConfClient* aClient = getGconfClient();
- GConfValue* aGconfValue;
- if( ( data.nDependsOn == SETTINGS_LAST ) || isDependencySatisfied( aClient, data ) )
+ GConfClient* pClient = getGconfClient();
+ GConfValue* pGconfValue;
+ if( ( data.nDependsOn == SETTINGS_LAST ) || isDependencySatisfied( pClient, data ) )
{
- aGconfValue = gconf_client_get( aClient, data.GconfItem, NULL );
+ pGconfValue = gconf_client_get( pClient, data.GconfItem, NULL );
- if( aGconfValue != NULL )
+ if( pGconfValue != NULL )
{
css::uno::Any value;
if( data.bNeedsTranslation )
- value = translateToOOo( data, aGconfValue );
+ value = translateToOOo( data, pGconfValue );
else
- value = makeAnyOfGconfValue( aGconfValue );
+ value = makeAnyOfGconfValue( pGconfValue );
- gconf_value_free( aGconfValue );
+ gconf_value_free( pGconfValue );
return css::beans::Optional< css::uno::Any >(true, value);
}
@@ -846,3 +852,5 @@ css::beans::Optional< css::uno::Any > getValue(ConfigurationValue const & data)
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx
index 7fdd82ff05e7..d2e560c86c03 100644..100755
--- a/shell/source/backends/gconfbe/gconfaccess.hxx
+++ b/shell/source/backends/gconfbe/gconfaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,6 +104,7 @@ struct ConfigurationValue
const ConfigurationSetting nSettingId;
const gchar *GconfItem;
const char *OOoConfItem;
+ const sal_Int32 nOOoConfItemLen;
const sal_Bool bNeedsTranslation;
const ConfigurationSetting nDependsOn;
};
@@ -117,3 +119,5 @@ com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue(
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index fb3fdb114305..711f41dc7dff 100644..100755
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -189,9 +190,11 @@ css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
css::uno::RuntimeException)
{
- for (std::size_t i = 0; i < gconfaccess::nConfigurationValues; ++i) {
- if (PropertyName.equalsAscii(
- gconfaccess::ConfigurationValues[i].OOoConfItem))
+ for (std::size_t i = 0; i < gconfaccess::nConfigurationValues; ++i)
+ {
+ if (PropertyName.equalsAsciiL(
+ gconfaccess::ConfigurationValues[i].OOoConfItem,
+ gconfaccess::ConfigurationValues[i].nOOoConfItemLen))
{
return css::uno::makeAny(
enabled_
@@ -231,3 +234,6 @@ component_getImplementationEnvironment(
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component
index 7638e05b544a..7638e05b544a 100644..100755
--- a/shell/source/backends/gconfbe/gconfbe1.component
+++ b/shell/source/backends/gconfbe/gconfbe1.component
diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk
index 9e77a0867ab0..9e77a0867ab0 100644..100755
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
diff --git a/shell/source/backends/gconfbe/orbit.h b/shell/source/backends/gconfbe/orbit.h
index 2858e8100dc8..82673a3e284c 100644..100755
--- a/shell/source/backends/gconfbe/orbit.h
+++ b/shell/source/backends/gconfbe/orbit.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
#include <orbit/orbit.h>
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
index 336d2d4a458e..03ffb03ed261 100644..100755
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,7 +127,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") );
+ aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -153,7 +154,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") );
+ aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -180,7 +181,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org") );
+ aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -207,7 +208,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org") );
+ aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -234,7 +235,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org") );
+ aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -261,7 +262,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org") );
+ aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org") );
break;
default: // No proxy is used
break;
@@ -317,3 +318,5 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/kde4be/kde4access.hxx b/shell/source/backends/kde4be/kde4access.hxx
index bfb7bc1ac945..4b6f405b8ba5 100644..100755
--- a/shell/source/backends/kde4be/kde4access.hxx
+++ b/shell/source/backends/kde4be/kde4access.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue(
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 2bf3d144a5dc..706785c50e53 100644..100755
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -250,3 +251,6 @@ component_getImplementationEnvironment(
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component
index 8ea7ae121088..8ea7ae121088 100644..100755
--- a/shell/source/backends/kde4be/kde4be1.component
+++ b/shell/source/backends/kde4be/kde4be1.component
diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk
index 477e47ca6100..477e47ca6100 100644..100755
--- a/shell/source/backends/kde4be/makefile.mk
+++ b/shell/source/backends/kde4be/makefile.mk
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx
index 618d74b5eacf..22f110be96cf 100644..100755
--- a/shell/source/backends/kdebe/kdeaccess.cxx
+++ b/shell/source/backends/kdebe/kdeaccess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -313,3 +314,5 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/kdebe/kdeaccess.hxx b/shell/source/backends/kdebe/kdeaccess.hxx
index 36a22e23db9a..76a4b85447d9 100644..100755
--- a/shell/source/backends/kdebe/kdeaccess.hxx
+++ b/shell/source/backends/kdebe/kdeaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue(
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index ad38a6cfc854..0c374460a2ed 100644..100755
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -250,3 +251,6 @@ component_getImplementationEnvironment(
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component
index 393fbc80d538..393fbc80d538 100644..100755
--- a/shell/source/backends/kdebe/kdebe1.component
+++ b/shell/source/backends/kdebe/kdebe1.component
diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk
index b1b12ad3c6f3..b1b12ad3c6f3 100644..100755
--- a/shell/source/backends/kdebe/makefile.mk
+++ b/shell/source/backends/kdebe/makefile.mk
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 1335d4a7fa50..ba8e4ff66ac9 100644..100755
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,54 +35,37 @@
#include <stdio.h>
-#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#ifdef WNT
-#include <rtl/ustrbuf.hxx>
-#include <locale.h>
-#include <string.h>
+#ifdef WINVER
+#undef WINVER
+#endif
+#define WINVER 0x0501
-/*
- * Note: setlocale is not at all thread safe, so is this code. It could
- * especially interfere with the stuff VCL is doing, so make sure this
- * is called from the main thread only.
- */
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
-static rtl::OUString ImplGetLocale(int category)
+rtl::OUString ImplGetLocale(LCID lcid)
{
- const char *locale = setlocale(category, "");
-
- // Return "en-US" for C locales
- if( (locale == NULL) || ( locale[0] == 'C' && locale[1] == '\0' ) )
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en-US" ) );
-
-
- const char *cp;
- const char *uscore = NULL;
+ TCHAR buffer[8];
+ LPTSTR cp = buffer;
- // locale string have the format lang[_ctry][.encoding][@modifier]
- // we are only interested in the first two items, so we handle
- // '.' and '@' as string end.
- for (cp = locale; *cp; cp++)
+ cp += GetLocaleInfo( lcid, LOCALE_SISO639LANGNAME , buffer, 4 );
+ if( cp > buffer )
{
- if (*cp == '_')
- uscore = cp;
- if (*cp == '.' || *cp == '@')
- break;
- }
+ if( 0 < GetLocaleInfo( lcid, LOCALE_SISO3166CTRYNAME, cp, buffer + 8 - cp) )
+ // #i50822# minus character must be written before cp
+ *(cp - 1) = '-';
- rtl::OUStringBuffer aLocaleBuffer;
- if( uscore != NULL )
- {
- aLocaleBuffer.appendAscii(locale, uscore++ - locale);
- aLocaleBuffer.appendAscii("-");
- aLocaleBuffer.appendAscii(uscore, cp - uscore);
- }
- else
- {
- aLocaleBuffer.appendAscii(locale, cp - locale);
+ return rtl::OUString::createFromAscii(buffer);
}
- return aLocaleBuffer.makeStringAndClear();
+ return rtl::OUString();
}
#elif defined(MACOSX)
@@ -183,44 +167,57 @@ namespace /* private */
} // namespace /* private */
-#endif
+#else
-// -------------------------------------------------------------------------------
+#include <rtl/ustrbuf.hxx>
+#include <locale.h>
+#include <string.h>
-#ifdef WNT
+/*
+ * Note: setlocale is not at all thread safe, so is this code. It could
+ * especially interfere with the stuff VCL is doing, so make sure this
+ * is called from the main thread only.
+ */
-#ifdef WINVER
-#undef WINVER
-#endif
-#define WINVER 0x0501
+static rtl::OUString ImplGetLocale(int category)
+{
+ const char *locale = setlocale(category, "");
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
+ // Return "en-US" for C locales
+ if( (locale == NULL) || ( locale[0] == 'C' && locale[1] == '\0' ) )
+ return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en-US" ) );
-rtl::OUString ImplGetLocale(LCID lcid)
-{
- TCHAR buffer[8];
- LPTSTR cp = buffer;
- cp += GetLocaleInfo( lcid, LOCALE_SISO639LANGNAME , buffer, 4 );
- if( cp > buffer )
+ const char *cp;
+ const char *uscore = NULL;
+
+ // locale string have the format lang[_ctry][.encoding][@modifier]
+ // we are only interested in the first two items, so we handle
+ // '.' and '@' as string end.
+ for (cp = locale; *cp; cp++)
{
- if( 0 < GetLocaleInfo( lcid, LOCALE_SISO3166CTRYNAME, cp, buffer + 8 - cp) )
- // #i50822# minus character must be written before cp
- *(cp - 1) = '-';
+ if (*cp == '_')
+ uscore = cp;
+ if (*cp == '.' || *cp == '@')
+ break;
+ }
- return rtl::OUString::createFromAscii(buffer);
+ rtl::OUStringBuffer aLocaleBuffer;
+ if( uscore != NULL )
+ {
+ aLocaleBuffer.appendAscii(locale, uscore++ - locale);
+ aLocaleBuffer.appendAscii("-");
+ aLocaleBuffer.appendAscii(uscore, cp - uscore);
+ }
+ else
+ {
+ aLocaleBuffer.appendAscii(locale, cp - locale);
}
- return rtl::OUString();
+ return aLocaleBuffer.makeStringAndClear();
}
-#endif // WNT
+#endif
// -------------------------------------------------------------------------------
@@ -245,12 +242,12 @@ LocaleBackend* LocaleBackend::createInstance()
rtl::OUString LocaleBackend::getLocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
- return ImplGetLocale(LC_CTYPE);
+#if defined WNT
+ return ImplGetLocale( GetUserDefaultLCID() );
#elif defined (MACOSX)
return ImplGetLocale("AppleLocale");
-#elif defined WNT
- return ImplGetLocale( GetUserDefaultLCID() );
+#else
+ return ImplGetLocale(LC_CTYPE);
#endif
}
@@ -258,12 +255,12 @@ rtl::OUString LocaleBackend::getLocale(void)
rtl::OUString LocaleBackend::getUILocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
- return ImplGetLocale(LC_MESSAGES);
+#if defined WNT
+ return ImplGetLocale( MAKELCID(GetUserDefaultUILanguage(), SORT_DEFAULT) );
#elif defined(MACOSX)
return ImplGetLocale("AppleLanguages");
-#elif defined WNT
- return ImplGetLocale( MAKELCID(GetUserDefaultUILanguage(), SORT_DEFAULT) );
+#else
+ return ImplGetLocale(LC_MESSAGES);
#endif
}
@@ -324,7 +321,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
//------------------------------------------------------------------------------
rtl::OUString SAL_CALL LocaleBackend::getBackendName(void) {
- return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.LocaleBackend") ;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LocaleBackend")) ;
}
//------------------------------------------------------------------------------
@@ -365,3 +362,5 @@ uno::Sequence<rtl::OUString> SAL_CALL LocaleBackend::getSupportedServiceNames(vo
{
return getBackendServiceNames() ;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx
index 29950a3df913..ee4259e26efa 100644..100755
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,3 +148,5 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 <
#endif // _FIXEDVALUEBACKEND_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/localebe/localebe.xml b/shell/source/backends/localebe/localebe.xml
index 3c22a4970881..3c22a4970881 100644..100755
--- a/shell/source/backends/localebe/localebe.xml
+++ b/shell/source/backends/localebe/localebe.xml
diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component
index 7236a6198281..7236a6198281 100644..100755
--- a/shell/source/backends/localebe/localebe1.component
+++ b/shell/source/backends/localebe/localebe1.component
diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index 0ec9c0665125..340b4cf4fc06 100644..100755
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include <localebackend.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <com/sun/star/uno/XComponentContext.hpp>
namespace css = com::sun::star ;
@@ -85,3 +84,4 @@ extern "C" void *component_getFactory( const sal_Char *aImplementationName,
//------------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk
index 1efe3ed5e498..1efe3ed5e498 100644..100755
--- a/shell/source/backends/localebe/makefile.mk
+++ b/shell/source/backends/localebe/makefile.mk
diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index b07afb2e6701..fee3e696a04c 100644..100755
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -427,7 +428,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
CFStringRef rException = (CFStringRef) CFArrayGetValueAtIndex(rExceptionsList, idx);
if (idx>0)
- aProxyBypassList += rtl::OUString::createFromAscii( ";" );
+ aProxyBypassList += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
aProxyBypassList += CFStringToOUString(rException);
}
@@ -455,7 +456,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void)
{
- return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.MacOSXBackend");
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.MacOSXBackend"));
}
//------------------------------------------------------------------------------
@@ -497,3 +498,5 @@ uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(vo
{
return getBackendServiceNames();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index de4f9eee1ff6..5aabb2c2b092 100644..100755
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -136,3 +137,5 @@ protected:
};
#endif // _MACBACKEND_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/macbe/macbe.xml b/shell/source/backends/macbe/macbe.xml
index 7cee5bb14de5..7cee5bb14de5 100644..100755
--- a/shell/source/backends/macbe/macbe.xml
+++ b/shell/source/backends/macbe/macbe.xml
diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component
index 10bac2e2b6a0..10bac2e2b6a0 100644..100755
--- a/shell/source/backends/macbe/macbe1.component
+++ b/shell/source/backends/macbe/macbe1.component
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index ab49bbb779f3..584b4d3452d8 100644..100755
--- a/shell/source/backends/macbe/macbecdef.cxx
+++ b/shell/source/backends/macbe/macbecdef.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include "macbackend.hxx"
#include <com/sun/star/registry/XRegistryKey.hpp>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <com/sun/star/uno/XComponentContext.hpp>
namespace css = com::sun::star;
@@ -85,3 +84,4 @@ extern "C" void *component_getFactory( const sal_Char *aImplementationName, void
//------------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk
index dd20834b2635..dd20834b2635 100644..100755
--- a/shell/source/backends/macbe/makefile.mk
+++ b/shell/source/backends/macbe/makefile.mk
diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk
index 7d8a6be14b21..7d8a6be14b21 100644..100755
--- a/shell/source/backends/wininetbe/makefile.mk
+++ b/shell/source/backends/wininetbe/makefile.mk
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index af6f1036496d..fe9a37459157 100644..100755
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -359,7 +360,7 @@ css::uno::Any WinInetBackend::getPropertyValue(
//------------------------------------------------------------------------------
rtl::OUString SAL_CALL WinInetBackend::getBackendName(void) {
- return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.WinInetBackend") ;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.WinInetBackend")) ;
}
//------------------------------------------------------------------------------
@@ -401,3 +402,5 @@ uno::Sequence<rtl::OUString> SAL_CALL WinInetBackend::getSupportedServiceNames(v
{
return getBackendServiceNames() ;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx
index 5fe4d5625a9a..aebe1e874c65 100644..100755
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -155,3 +156,5 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 <
#endif // _FIXEDVALUEBACKEND_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/wininetbe/wininetbe.xml b/shell/source/backends/wininetbe/wininetbe.xml
index 1bf4bd2cd053..1bf4bd2cd053 100644..100755
--- a/shell/source/backends/wininetbe/wininetbe.xml
+++ b/shell/source/backends/wininetbe/wininetbe.xml
diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component
index d8930280fb2a..d8930280fb2a 100644..100755
--- a/shell/source/backends/wininetbe/wininetbe1.component
+++ b/shell/source/backends/wininetbe/wininetbe1.component
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index ed6cdceb4a3e..9cec4c199445 100644..100755
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <wininetbackend.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <com/sun/star/uno/XComponentContext.hpp>
namespace css = com::sun::star ;
@@ -86,3 +85,4 @@ extern "C" void *component_getFactory( const sal_Char *aImplementationName,
//------------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component
index 7e56741d16c1..7e56741d16c1 100644..100755
--- a/shell/source/cmdmail/cmdmail.component
+++ b/shell/source/cmdmail/cmdmail.component
diff --git a/shell/source/cmdmail/cmdmail.xml b/shell/source/cmdmail/cmdmail.xml
index 51de9cc1e4da..51de9cc1e4da 100644..100755
--- a/shell/source/cmdmail/cmdmail.xml
+++ b/shell/source/cmdmail/cmdmail.xml
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index 740f87cd76f1..578d67c85db6 100755
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /
}
} // extern "C"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index 77de429ed771..6b0a37d31c21 100755
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -212,7 +213,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
else if( 0 == aName.compareToAscii( "attachment" ) && m_Attachments.getLength() )
return makeAny( m_Attachments );
- throw NoSuchElementException( OUString::createFromAscii( "key not found: ") + aName,
+ throw NoSuchElementException( OUString(RTL_CONSTASCII_USTRINGPARAM("key not found: ")) + aName,
static_cast < XNameAccess * > (this) );
}
@@ -229,22 +230,22 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( )
Sequence< OUString > aRet( 6 );
if( m_aOriginator.getLength() )
- aRet[nItems++] = OUString::createFromAscii( "from" );
+ aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("from"));
if( m_aRecipient.getLength() )
- aRet[nItems++] = OUString::createFromAscii( "to" );
+ aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("to"));
if( m_CcRecipients.getLength() )
- aRet[nItems++] = OUString::createFromAscii( "cc" );
+ aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("cc"));
if( m_BccRecipients.getLength() )
- aRet[nItems++] = OUString::createFromAscii( "bcc" );
+ aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("bcc"));
if( m_aSubject.getLength() )
- aRet[nItems++] = OUString::createFromAscii( "subject" );
+ aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("subject"));
if( m_Attachments.getLength() )
- aRet[nItems++] = OUString::createFromAscii( "attachment" );
+ aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("attachment"));
aRet.realloc( nItems );
return aRet;
@@ -300,3 +301,5 @@ sal_Bool SAL_CALL CmdMailMsg::hasElements( )
{
return 0 != getElementNames().getLength();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx
index 520bd0acbb56..e7ca0d9cf4f5 100644..100755
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSimpleMailMessage.hpp>
-#endif
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -126,3 +125,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 4878f8d7783f..7b1b1c1b2b8b 100755
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,7 +88,7 @@ namespace // private
Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii("com.sun.star.system.SimpleCommandMail");
+ aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SimpleCommandMail"));
return aRet;
}
@@ -105,7 +106,7 @@ CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
if ( xServiceManager.is() ) {
m_xConfigurationProvider = Reference< XMultiServiceFactory > (
xServiceManager->createInstanceWithContext(
- OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), xContext ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), xContext ),
UNO_QUERY );
}
}
@@ -177,7 +178,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/ExternalMailer" ) );
PropertyValue aProperty;
- aProperty.Name = OUString::createFromAscii( "nodepath" );
+ aProperty.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
aProperty.Value = makeAny( aConfigRoot );
Sequence< Any > aArgumentList( 1 );
@@ -186,7 +187,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
Reference< XNameAccess > xNameAccess =
Reference< XNameAccess > (
m_xConfigurationProvider->createInstanceWithArguments(
- OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
aArgumentList ),
UNO_QUERY );
@@ -196,7 +197,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
// Retrieve the value for "Program" node and append it feed senddoc with it
// using the (undocumented) --mailclient switch
- xNameAccess->getByName( OUString::createFromAscii( "Program" ) ) >>= aMailer;
+ xNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("Program")) ) >>= aMailer;
if( aMailer.getLength() )
{
@@ -297,7 +298,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
OUString SAL_CALL CmdMailSuppl::getImplementationName( )
throw( RuntimeException )
{
- return OUString::createFromAscii( COMP_IMPL_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_IMPL_NAME ));
}
// -------------------------------------------------
@@ -326,3 +327,4 @@ Sequence< OUString > SAL_CALL CmdMailSuppl::getSupportedServiceNames( )
return Component_getSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index 343de67cb68c..8728a2db469a 100644..100755
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,13 +38,9 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSimpleMailClient.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
-#endif
//----------------------------------------------------------
// class declaration
@@ -93,3 +90,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp
index f0e1c69934bc..f0e1c69934bc 100644..100755
--- a/shell/source/cmdmail/exports.dxp
+++ b/shell/source/cmdmail/exports.dxp
diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk
index e4d5ec48b925..e4d5ec48b925 100644..100755
--- a/shell/source/cmdmail/makefile.mk
+++ b/shell/source/cmdmail/makefile.mk
diff --git a/shell/source/mingw_intel.map b/shell/source/mingw_intel.map
index 7713d456aba5..7713d456aba5 100644..100755
--- a/shell/source/mingw_intel.map
+++ b/shell/source/mingw_intel.map
diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx
index 8e51e0b203e1..c31685ac3ea5 100644..100755
--- a/shell/source/tools/lngconvex/cmdline.cxx
+++ b/shell/source/tools/lngconvex/cmdline.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -173,3 +174,5 @@ bool CommandLine::is_arg_name(const std::string& Argument) const
{
return (0 == Argument.compare(0, m_argprefix.length(), m_argprefix));
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx
index b7c5e5453136..c12f0fb31aba 100644..100755
--- a/shell/source/tools/lngconvex/cmdline.hxx
+++ b/shell/source/tools/lngconvex/cmdline.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef _CMDLINE_HXX_
#define _CMDLINE_HXX_
@@ -102,3 +103,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/tools/lngconvex/defs.hxx b/shell/source/tools/lngconvex/defs.hxx
index 4304a434b486..8b2dbb218cae 100644..100755
--- a/shell/source/tools/lngconvex/defs.hxx
+++ b/shell/source/tools/lngconvex/defs.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef _DEFS_HXX_
#define _DEFS_HXX_
@@ -12,3 +13,5 @@ typedef std::vector<int> IntegerList_t;
typedef std::auto_ptr<IntegerList_t> IntegerListPtr_t;
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 1d8862153230..ada243f1edd4 100644..100755
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,6 +26,10 @@
*
************************************************************************/
+#ifdef AIX
+# undef _THREAD_SAFE
+#endif
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
@@ -603,3 +608,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
return 0;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index 3ee6298e744f..3ee6298e744f 100644..100755
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
diff --git a/shell/source/tools/regsvrex/makefile.mk b/shell/source/tools/regsvrex/makefile.mk
index 2eb8dbf48481..2eb8dbf48481 100644..100755
--- a/shell/source/tools/regsvrex/makefile.mk
+++ b/shell/source/tools/regsvrex/makefile.mk
diff --git a/shell/source/tools/regsvrex/regsvrex.cxx b/shell/source/tools/regsvrex/regsvrex.cxx
index 516e386e5e06..907d7e9e055d 100644..100755
--- a/shell/source/tools/regsvrex/regsvrex.cxx
+++ b/shell/source/tools/regsvrex/regsvrex.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ int main(int argc, char* argv[])
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index 1a26d377b142..1a26d377b142 100644..100755
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index e6aca26922da..3ec2536af2ff 100644..100755
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <osl/file.hxx>
#include <rtl/ustrbuf.hxx>
-#ifndef _RTL_URI_H_
#include <rtl/uri.hxx>
-#endif
#include "shellexec.hxx"
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
@@ -82,7 +81,7 @@ namespace // private
Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SystemShellExecute");
+ aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SystemShellExecute"));
return aRet;
}
}
@@ -283,7 +282,13 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
pDesktopLaunch = NULL;
}
- OString cmd = aBuffer.makeStringAndClear();
+ OString cmd =
+#ifdef LINUX
+ // avoid blocking (call it in background)
+ OStringBuffer().append( "( " ).append( aBuffer ).append( " ) &" ).makeStringAndClear();
+#else
+ aBuffer.makeStringAndClear();
+#endif
if ( 0 != pclose(popen(cmd.getStr(), "w")) )
{
int nerr = errno;
@@ -300,7 +305,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
OUString SAL_CALL ShellExec::getImplementationName( )
throw( RuntimeException )
{
- return OUString::createFromAscii( SHELLEXEC_IMPL_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( SHELLEXEC_IMPL_NAME ));
}
// -------------------------------------------------
@@ -329,3 +334,4 @@ Sequence< OUString > SAL_CALL ShellExec::getSupportedServiceNames( )
return ShellExec_getSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index d7955cc135fd..ebc729886a26 100644..100755
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSystemShellExecute.hpp>
-#endif
//----------------------------------------------------------
// class declaration
@@ -77,3 +76,5 @@ public:
void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL);
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index d1eff582ea59..d7816c2df66b 100644..100755
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* /
}
} // extern "C"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component
index 030240dff3bf..030240dff3bf 100644..100755
--- a/shell/source/unix/exec/syssh.component
+++ b/shell/source/unix/exec/syssh.component
diff --git a/shell/source/unix/exec/syssh.xml b/shell/source/unix/exec/syssh.xml
index 5c72befa9141..5c72befa9141 100644..100755
--- a/shell/source/unix/exec/syssh.xml
+++ b/shell/source/unix/exec/syssh.xml
diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx
index 1de12766e650..e79a321eff36 100644..100755
--- a/shell/source/unix/exec/urltest.cxx
+++ b/shell/source/unix/exec/urltest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,3 +150,5 @@ int main(int argc, const char *argv[])
return ret;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/exec/urltest.sh b/shell/source/unix/exec/urltest.sh
index ce55ee694114..ce55ee694114 100644..100755
--- a/shell/source/unix/exec/urltest.sh
+++ b/shell/source/unix/exec/urltest.sh
diff --git a/shell/source/unix/exec/urltest.txt b/shell/source/unix/exec/urltest.txt
index e69a8cfaf92b..e69a8cfaf92b 100644..100755
--- a/shell/source/unix/exec/urltest.txt
+++ b/shell/source/unix/exec/urltest.txt
diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c
index 3bd7a61e6546..b914cfcb7b5c 100644..100755
--- a/shell/source/unix/misc/gnome-open-url.c
+++ b/shell/source/unix/misc/gnome-open-url.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,6 +110,7 @@ int main(int argc, char *argv[] )
GError *error = NULL;
char *fallback;
char *index;
+ int retcode = -1;
if( argc != 2 )
{
@@ -136,11 +138,11 @@ int main(int argc, char *argv[] )
args[0] = fallback;
args[1] = argv[1];
args[2] = NULL;
- return execv(fallback, args);
+ retcode = execv(fallback, args);
}
+ free(fallback);
- return -1;
+ return retcode;
}
-
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/misc/gnome-open-url.sh b/shell/source/unix/misc/gnome-open-url.sh
index ab730d169a49..ab730d169a49 100644..100755
--- a/shell/source/unix/misc/gnome-open-url.sh
+++ b/shell/source/unix/misc/gnome-open-url.sh
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 67fcc708c615..6ad3797e6521 100644..100755
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -68,7 +68,8 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj
APP1LIBS =
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \
+ "$(OS)"!="DRAGONFLY"
APP1STDLIBS=-ldl
.ENDIF
diff --git a/shell/source/unix/misc/open-url.c b/shell/source/unix/misc/open-url.c
index 91f4aeaff398..7d7230f040ff 100644..100755
--- a/shell/source/unix/misc/open-url.c
+++ b/shell/source/unix/misc/open-url.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -170,3 +171,4 @@ int main(int argc, char *argv[] )
return 0;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/misc/open-url.def b/shell/source/unix/misc/open-url.def
index 3a26831e2a65..3a26831e2a65 100644..100755
--- a/shell/source/unix/misc/open-url.def
+++ b/shell/source/unix/misc/open-url.def
diff --git a/shell/source/unix/misc/senddoc.c b/shell/source/unix/misc/senddoc.c
index 5a21ef1ec50f..46f5ff825f0b 100644..100755
--- a/shell/source/unix/misc/senddoc.c
+++ b/shell/source/unix/misc/senddoc.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -202,3 +203,4 @@ int main(int argc, char *argv[] )
return 0;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/misc/senddoc.def b/shell/source/unix/misc/senddoc.def
index 0abf1553a4a9..0abf1553a4a9 100644..100755
--- a/shell/source/unix/misc/senddoc.def
+++ b/shell/source/unix/misc/senddoc.def
diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
index 3d2690379134..9d63ae3df63b 100644..100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -1,15 +1,22 @@
#!/bin/sh
URI_ENCODE="`dirname $0`/uri-encode"
FOPTS=""
+sd_platform=`uname -s`
# linux file utility needs -L option to resolve symlinks
-if [ "`uname -s`" = "Linux" ]
-then
+if [ "$sd_platform" = "Linux" ] ; then
FOPTS="-L"
fi
# do not confuse the system mail clients with OOo and Java libraries
-unset LD_LIBRARY_PATH
+case $sd_platform in
+ AIX)
+ unset LIBPATH
+ ;;
+ *)
+ unset LD_LIBRARY_PATH
+ ;;
+esac
# tries to locate the executable specified
# as first parameter in the user's path.
diff --git a/shell/source/unix/misc/uri-encode.c b/shell/source/unix/misc/uri-encode.c
index e93bd61e6675..97ebc4c33755 100644..100755
--- a/shell/source/unix/misc/uri-encode.c
+++ b/shell/source/unix/misc/uri-encode.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@ int main() {
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 3d8a55d4377f..2656fdb8557e 100644..100755
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -52,9 +52,6 @@ SHL1TARGET=recentfile
SHL1IMPLIB=i$(TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
-
-.ELSE
-#SHL1IMPLIB=
.ENDIF
SHL1STDLIBS=$(EXPATASCII3RDLIB)\
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 8a9de90c8b16..3f6f7b4d398a 100644..100755
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,8 @@
#include <unistd.h>
-const rtl::OUString RECENTLY_USED_FILE_NAME = rtl::OUString::createFromAscii(".recently-used");
-const rtl::OUString SLASH = rtl::OUString::createFromAscii("/");
+const rtl::OUString RECENTLY_USED_FILE_NAME(RTL_CONSTASCII_USTRINGPARAM(".recently-used"));
+const rtl::OUString SLASH(RTL_CONSTASCII_USTRINGPARAM("/"));
namespace /* private */ {
@@ -145,3 +146,4 @@ bool recently_used_file::eof() const
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index 346541a7efda..b34da5bc86ae 100644..100755
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ private:
};
#endif // INCLUDED_RECENTLY_USED_FILE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index b124d03b589c..1ef8c621dd3b 100644..100755
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -395,8 +396,8 @@ namespace /* private */ {
uri_(uri)
{}
- bool operator() (const recently_used_item* item)
- { return (item->uri_ == uri_); }
+ bool operator() (const recently_used_item* item) const
+ { return (item->uri_ == uri_); }
private:
string_t uri_;
};
@@ -524,3 +525,5 @@ extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, co
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 7264afaac109..46ca21240d57 100644..100755
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,10 +35,9 @@
#include <osl/diagnose.h>
#include "SysShExec.hxx"
#include <osl/file.hxx>
+#include <sal/macros.h>
-#ifndef _COM_SUN_STAR_SYS_SHELL_SYSTEMSHELLEXECUTEFLAGS_HPP_
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#endif
#define WIN32_LEAN_AND_MEAN
#if defined _MSC_VER
@@ -84,7 +84,7 @@ namespace // private
Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SystemShellExecute");
+ aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SystemShellExecute"));
return aRet;
}
@@ -146,7 +146,7 @@ namespace // private
};
/* size of the table */
- #define ERRTABLESIZE (sizeof(errtable)/sizeof(errtable[0]))
+ #define ERRTABLESIZE (SAL_N_ELEMENTS(errtable))
/* The following two constants must be the minimum and maximum
values in the (contiguous) range of osl_File_E_xec Failure errors. */
@@ -202,8 +202,8 @@ namespace // private
// trying to identify a jump mark
//-----------------------------------------
- const OUString JUMP_MARK_HTM = OUString::createFromAscii(".htm#");
- const OUString JUMP_MARK_HTML = OUString::createFromAscii(".html#");
+ const OUString JUMP_MARK_HTM(RTL_CONSTASCII_USTRINGPARAM(".htm#"));
+ const OUString JUMP_MARK_HTML(RTL_CONSTASCII_USTRINGPARAM(".html#"));
const sal_Unicode HASH_MARK = (sal_Unicode)'#';
bool has_jump_mark(const OUString& system_path, sal_Int32* jmp_mark_start = NULL)
@@ -288,13 +288,13 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
// parameter checking
if (0 == aCommand.getLength())
throw IllegalArgumentException(
- OUString::createFromAscii( "Empty command" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command")),
static_cast< XSystemShellExecute* >( this ),
1 );
if (!(nFlags >= DEFAULTS && nFlags <= NO_SYSTEM_ERROR_MESSAGE))
throw IllegalArgumentException(
- OUString::createFromAscii( "Invalid Flags specified" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid Flags specified")),
static_cast< XSystemShellExecute* >( this ),
3 );
@@ -344,7 +344,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
psxErr = MapError(psxErr);
throw SystemShellExecuteException(
- OUString::createFromAscii("Error executing command"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing command")),
static_cast< XSystemShellExecute* >(this),
psxErr);
}
@@ -357,7 +357,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
OUString SAL_CALL CSysShExec::getImplementationName( )
throw( RuntimeException )
{
- return OUString::createFromAscii( SYSSHEXEC_IMPL_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_IMPL_NAME ));
}
// -------------------------------------------------
@@ -386,3 +386,4 @@ Sequence< OUString > SAL_CALL CSysShExec::getSupportedServiceNames( )
return SysShExec_getSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index b4d5f18b7899..84b9a746d076 100644..100755
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSystemShellExecute.hpp>
-#endif
//----------------------------------------------------------
// class declaration
@@ -81,3 +80,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index 727cfe269f07..514b7f84375f 100644..100755
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,7 +98,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, SYSSHEXEC_IMPL_NAME ) ) )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray( )[0] = OUString::createFromAscii( SYSSHEXEC_SERVICE_NAME );
+ aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_SERVICE_NAME ));
Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -115,3 +116,5 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
}
} // extern "C"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp
index f0e1c69934bc..f0e1c69934bc 100644..100755
--- a/shell/source/win32/exports.dxp
+++ b/shell/source/win32/exports.dxp
diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk
index 7a01eefed89e..7a01eefed89e 100644..100755
--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index e19dd68383b4..20ba047f3844 100755
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -169,3 +170,5 @@ bool CClassFactory::IsLocked()
{
return (s_ServerLocks > 0);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx
index f0a8b84ae6ee..a57af8b7bab1 100644..100755
--- a/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/shell/source/win32/shlxthandler/classfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index ab6c8bae2922..7531d14eb9ba 100755
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,6 +35,7 @@
#include "internal/utilities.hxx"
#include "internal/config.hxx"
+#include <sal/macros.h>
#include <malloc.h>
//----------------------------
@@ -52,7 +54,7 @@ namespace /* private */
{{PSGUID_SUMMARYINFORMATION, PIDSI_PAGECOUNT},VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Pagecount", L"Pagecount"}
};
- size_t ColumnInfoTableSize = sizeof(ColumnInfoTable)/sizeof(ColumnInfoTable[0]);
+ size_t ColumnInfoTableSize = SAL_N_ELEMENTS(ColumnInfoTable);
}
//----------------------------
@@ -230,3 +232,5 @@ bool CColumnInfo::IsOOFileExtension(wchar_t* Extension) const
return false;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk
index 868a711e005c..868a711e005c 100644..100755
--- a/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk
diff --git a/shell/source/win32/shlxthandler/exports.dxp b/shell/source/win32/shlxthandler/exports.dxp
index 953039ccc957..953039ccc957 100644..100755
--- a/shell/source/win32/shlxthandler/exports.dxp
+++ b/shell/source/win32/shlxthandler/exports.dxp
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index c6bf925ac6a9..b88defc42aa5 100755
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -402,3 +403,5 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetCurFile(LPOLESTR __RPC_FAR * /*ppszFileNa
{
return E_NOTIMPL;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk
index f69f2cf2fd78..f69f2cf2fd78 100644..100755
--- a/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/shell/source/win32/shlxthandler/infotips/makefile.mk
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index b6c9a45a9515..fdaa1c43d92c 100644..100755
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -35,7 +35,7 @@ USE_DEFFILE=TRUE
USE_DEFFILE_X64=TRUE
.ENDIF
NO_DEFAULT_STL=TRUE
-USE_STLP_DEBUG=
+USE_DEBUG_RUNTIME=
# --- Settings -----------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/ooofilt/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/exports.dxp
index 953039ccc957..953039ccc957 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/exports.dxp
+++ b/shell/source/win32/shlxthandler/ooofilt/exports.dxp
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 9111069ab889..fd1bc503cc33 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -32,9 +32,6 @@ LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
-# Do not use the dynamic STLport library.
-NO_DEFAULT_STL=YES
-
# Do not use the uwinapi library
UWINAPILIB=
@@ -46,7 +43,6 @@ UWINAPILIB=
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS+=-D_WIN32_IE=0x501
-# SCPCDEFS+=-D_STLP_USE_STATIC_LIB
# --- Files --------------------------------------------------------
@@ -54,9 +50,6 @@ SLOFILES=$(SLO)$/ooofilt.obj\
$(SLO)$/propspec.obj\
$(SLO)$/stream_helper.obj
-# $(SLO)$/utilities.obj
-# $(SLO)$/dbgmacros.obj
-
SHL1TARGET=$(TARGET)
.IF "$(COM)"=="GCC"
SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB)
@@ -84,8 +77,6 @@ SHL1STDLIBS+=msvcrt.lib
.ENDIF
-# $(LIBSTLPORTST)
-
SHL1LIBS+=$(SLB)$/util.lib\
$(SLB)$/ooofilereader.lib
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 30151fc5dd75..98289cb06420 100755
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,6 @@
//--------------------------------------------------------------------------
#include "internal/contentreader.hxx"
#include "internal/metainforeader.hxx"
-//#include "internal/utilities.hxx"
#include "internal/registry.hxx"
#include "internal/fileextensions.hxx"
@@ -1489,3 +1489,5 @@ STDAPI DllUnregisterServer()
*/
return S_OK;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index b68863523b28..bc637a3be577 100755
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -216,3 +217,5 @@ private:
long m_lRefs; // Reference count
};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index fd7a24f2711a..33a2f1c42e60 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -236,3 +237,4 @@ int CFullPropSpec::operator!=( CFullPropSpec const & prop ) const
return( 1 );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
index ba4c34233d64..bfe6f8becab1 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -157,3 +158,4 @@ inline BOOL CFullPropSpec::IsPropertyPropid() const
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index e12f95a88e50..9542eae8e381 100755
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -179,3 +180,5 @@ extern "C" {
pzlib_filefunc_def->zerror_file = cb_serror;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index dc6d0e159046..dc6d0e159046 100644..100755
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 13d1a57fefd8..dc8d8e4585fa 100755
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,6 +37,7 @@
#include <propkey.h>
#include <propvarutil.h>
+#include <sal/macros.h>
#include <malloc.h>
#include <strsafe.h>
@@ -67,7 +69,7 @@ PROPERTYMAP g_rgPROPERTYMAP[] =
{ PKEY_Comment, L"OpenOffice.org", L"Comments" },
};
-size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
+size_t gPropertyMapTableSize = SAL_N_ELEMENTS(g_rgPROPERTYMAP);
//----------------------------
//
@@ -461,3 +463,5 @@ BOOL WINAPI DllMain( HINSTANCE hInst, ULONG /*ul_reason_for_call*/, LPVOID /*lpR
g_hModule = hInst;
return TRUE;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index 1e41f478b95b..6f4587f85b3e 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -168,3 +169,5 @@ void draw_impress_math_document_statistic_reader::fill_description_section(
group_list->push_back(statistic_group_t(GetResString(IDS_DESCRIPTION), il));
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 0b3a3dd96c07..ee884c94fe44 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,3 +148,5 @@ protected:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 5d3d365beb62..9a2cedeb4e53 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -279,3 +280,5 @@ void winxp_list_view_builder::insert_item(
row_count_++;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
index c764ff9809ad..a66747903329 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index 55a31c9c59d3..55a31c9c59d3 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index d668479d5ff5..7cf38d4fe7b5 100755
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "internal/config.hxx"
#include "internal/global.hxx"
-#ifndef PROPSEETS_HXX_INCLUDED
#include "internal/propsheets.hxx"
-#endif
#include "internal/utilities.hxx"
#include "internal/resource.h"
#include "listviewbuilder.hxx"
@@ -383,3 +382,4 @@ void CPropertySheet::InitPropPageStatistics(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/
{
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/res/ctrylnglist.txt b/shell/source/win32/shlxthandler/res/ctrylnglist.txt
index ec2196e4da43..ec2196e4da43 100644..100755
--- a/shell/source/win32/shlxthandler/res/ctrylnglist.txt
+++ b/shell/source/win32/shlxthandler/res/ctrylnglist.txt
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk
index ec0529015179..ec0529015179 100644..100755
--- a/shell/source/win32/shlxthandler/res/makefile.mk
+++ b/shell/source/win32/shlxthandler/res/makefile.mk
diff --git a/shell/source/win32/shlxthandler/res/prop_img.bmp b/shell/source/win32/shlxthandler/res/prop_img.bmp
index 1849a8bb62f4..1849a8bb62f4 100644..100755
--- a/shell/source/win32/shlxthandler/res/prop_img.bmp
+++ b/shell/source/win32/shlxthandler/res/prop_img.bmp
Binary files differ
diff --git a/shell/source/win32/shlxthandler/res/rcfooter.txt b/shell/source/win32/shlxthandler/res/rcfooter.txt
index ce333b32a1d5..ce333b32a1d5 100644..100755
--- a/shell/source/win32/shlxthandler/res/rcfooter.txt
+++ b/shell/source/win32/shlxthandler/res/rcfooter.txt
diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt b/shell/source/win32/shlxthandler/res/rcheader.txt
index fac9fa31f256..fac9fa31f256 100644..100755
--- a/shell/source/win32/shlxthandler/res/rcheader.txt
+++ b/shell/source/win32/shlxthandler/res/rcheader.txt
diff --git a/shell/source/win32/shlxthandler/res/rctmpl.txt b/shell/source/win32/shlxthandler/res/rctmpl.txt
index a512c69dd9d7..a512c69dd9d7 100644..100755
--- a/shell/source/win32/shlxthandler/res/rctmpl.txt
+++ b/shell/source/win32/shlxthandler/res/rctmpl.txt
diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.manifest b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
index a785006a9601..a785006a9601 100644..100755
--- a/shell/source/win32/shlxthandler/res/shlxthdl.manifest
+++ b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.ulf b/shell/source/win32/shlxthandler/res/shlxthdl.ulf
index c0e879724e5d..c0e879724e5d 100644..100755
--- a/shell/source/win32/shlxthandler/res/shlxthdl.ulf
+++ b/shell/source/win32/shlxthandler/res/shlxthdl.ulf
diff --git a/shell/source/win32/shlxthandler/res/signet.png b/shell/source/win32/shlxthandler/res/signet.png
index bccaaff817d1..bccaaff817d1 100644..100755
--- a/shell/source/win32/shlxthandler/res/signet.png
+++ b/shell/source/win32/shlxthandler/res/signet.png
Binary files differ
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 6263c98ea749..00d9e60a1a53 100755
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -425,3 +426,5 @@ BOOL WINAPI DllMain(HINSTANCE hInst, ULONG /*ul_reason_for_call*/, LPVOID /*lpRe
g_hModule = hInst;
return TRUE;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index 1b7dd103026e..01936460fae7 100644..100755
--- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
@@ -36,7 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 62fd306317be..a72c8e04b561 100755
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "internal/global.hxx"
-#ifndef INFOTIPS_HXX_INCLUDED
#include "internal/thumbviewer.hxx"
-#endif
#include "internal/shlxthdl.hxx"
#include "internal/registry.hxx"
#include "internal/fileextensions.hxx"
@@ -531,3 +530,4 @@ Gdiplus::Rect CThumbviewer::CalcScaledAspectRatio(Gdiplus::Rect src, Gdiplus::Re
return result;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
index 01ef1d47c083..c657335e5eeb 100644..100755
--- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx
+++ b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,4 @@ void DbgAssert(bool /*condition*/, const char* /*message*/)
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index 13e3535c7aa7..1e67bcf0e418 100755
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,6 +30,7 @@
#include "precompiled_shell.hxx"
#include "algorithm"
#include "internal/fileextensions.hxx"
+#include <sal/macros.h>
//------------------------------------
//
@@ -68,7 +70,7 @@ FileExtensionEntry OOFileExtensionTable[] = {
};
-size_t OOFileExtensionTableSize = sizeof(OOFileExtensionTable)/sizeof(OOFileExtensionTable[0]);
+size_t OOFileExtensionTableSize = SAL_N_ELEMENTS(OOFileExtensionTable);
//---------------------------------
/** Return the extension of a file
@@ -118,3 +120,4 @@ File_Type_t get_file_type(const std::string& file_name)
return UNKNOWN;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index dcd779098865..1fc6f52668cc 100644..100755
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -180,3 +181,4 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat
#endif
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk
index 8ccf50602f93..195bf9fac6fe 100644..100755
--- a/shell/source/win32/shlxthandler/util/makefile.mk
+++ b/shell/source/win32/shlxthandler/util/makefile.mk
@@ -28,7 +28,6 @@
PRJ=..$/..$/..$/..
PRJNAME=shell
TARGET=util
-#LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index bac126bb0504..4cf7184845a6 100644..100755
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -203,3 +204,5 @@ bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName,
return (ERROR_SUCCESS == rc);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 005e4689cdce..278e4e29840b 100755
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -597,3 +598,5 @@ LCID LocaleSetToLCID( const LocaleSet_t & Locale )
return MAKELCID( MAKELANGID( usPrimaryLang, usSubLang ), SORT_DEFAULT );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp
index f0e1c69934bc..f0e1c69934bc 100644..100755
--- a/shell/source/win32/simplemail/exports.dxp
+++ b/shell/source/win32/simplemail/exports.dxp
diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk
index abd35e408e2d..abd35e408e2d 100644..100755
--- a/shell/source/win32/simplemail/makefile.mk
+++ b/shell/source/win32/simplemail/makefile.mk
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index bb743960afc5..7a16e81bbc4b 100644..100755
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,10 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
#include <osl/diagnose.h>
+#include <sal/macros.h>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/uri.hxx>
+#include <osl/thread.hxx>
-#ifndef _RTL_STRING_HXX_
-//#include <rtl/string.hxx>
-#endif
#include "simplemapi.hxx"
#define WIN32_LEAN_AND_MEAN
@@ -167,7 +170,17 @@ void initMapiMessage(
{
ZeroMemory(pMapiMessage, sizeof(MapiMessage));
+ try {
+ rtl_uString *subject = NULL;
+ rtl_uString_newFromAscii(&subject, const_cast<char*>(gSubject.c_str()));
+ rtl_uString *decoded_subject = NULL;
+ rtl_uriDecode(subject, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &decoded_subject);
+ rtl::OUString ou_subject(decoded_subject);
+ pMapiMessage->lpszSubject = strdup(OUStringToOString(ou_subject, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr());
+ }
+ catch (...) {
pMapiMessage->lpszSubject = const_cast<char*>(gSubject.c_str());
+ }
pMapiMessage->lpszNoteText = (gBody.length() ? const_cast<char*>(gBody.c_str()) : NULL);
pMapiMessage->lpOriginator = aMapiOriginator;
pMapiMessage->lpRecips = aMapiRecipientList.size() ? &aMapiRecipientList[0] : 0;
@@ -189,7 +202,7 @@ char* KnownParameter[] =
"--mapi-logon-ui"
};
-const size_t nKnownParameter = (sizeof(KnownParameter)/sizeof(KnownParameter[0]));
+const size_t nKnownParameter = (SAL_N_ELEMENTS(KnownParameter));
/** @internal */
bool isKnownParameter(const char* aParameterName)
@@ -288,6 +301,20 @@ int main(int argc, char* argv[])
ulRet = mapi.MAPISendMail(hSession, 0, &mapiMsg, gMapiFlags, 0);
+ // There is no point in treating an aborted mail sending
+ // dialog as an error to be returned as our exit
+ // status. If the user decided to abort sending a document
+ // as mail, OK, that is not an error.
+
+ // Also, it seems that GroupWise makes MAPISendMail()
+ // return MAPI_E_USER_ABORT even if the mail sending
+ // dialog was not aborted by the user, and the mail was
+ // actually sent just fine. See bnc#660241 (visible to
+ // Novell people only, sorry).
+
+ if (ulRet == MAPI_E_USER_ABORT)
+ ulRet = SUCCESS_SUCCESS;
+
mapi.MAPILogoff(hSession, 0, 0, 0);
}
}
@@ -345,3 +372,5 @@ int main(int argc, char* argv[])
MessageBox(NULL, oss.str().c_str(), "Arguments", MB_OK | MB_ICONINFORMATION);
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/simplemapi.cxx b/shell/source/win32/simplemail/simplemapi.cxx
index faf383f580aa..3886233e767e 100644..100755
--- a/shell/source/win32/simplemail/simplemapi.cxx
+++ b/shell/source/win32/simplemail/simplemapi.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,4 @@ ULONG CSimpleMapi::MAPISendMail(
return m_lpfnMapiSendMail(lhSession, ulUIParam, lpMessage, flFlags, ulReserved);
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx
index e4feb3524ed3..33dc906c5c88 100644..100755
--- a/shell/source/win32/simplemail/simplemapi.hxx
+++ b/shell/source/win32/simplemail/simplemapi.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component
index 59246c6d1551..59246c6d1551 100644..100755
--- a/shell/source/win32/simplemail/smplmail.component
+++ b/shell/source/win32/simplemail/smplmail.component
diff --git a/shell/source/win32/simplemail/smplmail.xml b/shell/source/win32/simplemail/smplmail.xml
index 8176f094acad..8176f094acad 100644..100755
--- a/shell/source/win32/simplemail/smplmail.xml
+++ b/shell/source/win32/simplemail/smplmail.xml
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 49c546e5721d..e47a767c0aeb 100644..100755
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,15 +63,15 @@ using css::system::SimpleMailClientFlags::NO_LOGON_DIALOG;
typedef std::vector<rtl::OUString> StringList_t;
typedef StringList_t::const_iterator StringListIterator_t;
-const rtl::OUString TO = rtl::OUString::createFromAscii("--to");
-const rtl::OUString CC = rtl::OUString::createFromAscii("--cc");
-const rtl::OUString BCC = rtl::OUString::createFromAscii("--bcc");
-const rtl::OUString FROM = rtl::OUString::createFromAscii("--from");
-const rtl::OUString SUBJECT = rtl::OUString::createFromAscii("--subject");
-const rtl::OUString BODY = rtl::OUString::createFromAscii("--body");
-const rtl::OUString ATTACH = rtl::OUString::createFromAscii("--attach");
-const rtl::OUString FLAG_MAPI_DIALOG = rtl::OUString::createFromAscii("--mapi-dialog");
-const rtl::OUString FLAG_MAPI_LOGON_UI = rtl::OUString::createFromAscii("--mapi-logon-ui");
+const rtl::OUString TO(RTL_CONSTASCII_USTRINGPARAM("--to"));
+const rtl::OUString CC(RTL_CONSTASCII_USTRINGPARAM("--cc"));
+const rtl::OUString BCC(RTL_CONSTASCII_USTRINGPARAM("--bcc"));
+const rtl::OUString FROM(RTL_CONSTASCII_USTRINGPARAM("--from"));
+const rtl::OUString SUBJECT(RTL_CONSTASCII_USTRINGPARAM("--subject"));
+const rtl::OUString BODY(RTL_CONSTASCII_USTRINGPARAM("--body"));
+const rtl::OUString ATTACH(RTL_CONSTASCII_USTRINGPARAM("--attach"));
+const rtl::OUString FLAG_MAPI_DIALOG(RTL_CONSTASCII_USTRINGPARAM("--mapi-dialog"));
+const rtl::OUString FLAG_MAPI_LOGON_UI(RTL_CONSTASCII_USTRINGPARAM("--mapi-logon-ui"));
namespace /* private */
{
@@ -231,7 +232,7 @@ void CSmplMailClient::assembleCommandLine(
osl::FileBase::RC err = osl::FileBase::getSystemPathFromFileURL(attachments[i], sysPath);
if (err != osl::FileBase::E_None)
throw IllegalArgumentException(
- rtl::OUString::createFromAscii("Invalid attachment file URL"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid attachment file URL")),
static_cast<XSimpleMailClient*>(this),
1);
@@ -257,7 +258,7 @@ void SAL_CALL CSmplMailClient::sendSimpleMailMessage(
if (!executeSenddoc(senddocParams))
throw Exception(
- rtl::OUString::createFromAscii("Send email failed"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Send email failed")),
static_cast<XSimpleMailClient*>(this));
}
@@ -266,7 +267,7 @@ void CSmplMailClient::validateParameter(
{
if (!xSimpleMailMessage.is())
throw IllegalArgumentException(
- rtl::OUString::createFromAscii("Empty mail message reference"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty mail message reference")),
static_cast<XSimpleMailClient*>(this),
1);
@@ -276,14 +277,16 @@ void CSmplMailClient::validateParameter(
// check the flags, the allowed range is 0 - (2^n - 1)
if (aFlag < 0 || aFlag > 3)
throw IllegalArgumentException(
- rtl::OUString::createFromAscii("Invalid flag value"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid flag value")),
static_cast<XSimpleMailClient*>(this),
2);
// check if a recipient is specified of the flags NO_USER_INTERFACE is specified
if ((aFlag & NO_USER_INTERFACE) && !xSimpleMailMessage->getRecipient().getLength())
throw IllegalArgumentException(
- rtl::OUString::createFromAscii("No recipient specified"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No recipient specified")),
static_cast<XSimpleMailClient*>(this),
1);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx
index 5457dffbffd9..59e6db285fa9 100644..100755
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <cppuhelper/compbase1.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSimpleMailClient.hpp>
-#endif
namespace css = ::com::sun::star;
@@ -52,3 +51,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index 9970baa28122..5acd36f50266 100644..100755
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,7 +98,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, COMP_IMPL_NAME ) ) )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray( )[0] = OUString::createFromAscii( COMP_SERVICE_NAME );
+ aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_SERVICE_NAME ));
Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -115,3 +116,5 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
}
} // extern "C"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index 088d84a050ad..354485b38ef3 100644..100755
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -177,3 +178,5 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement( )
{
return m_Attachements;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index caeb0710de90..315a9ea49a39 100644..100755
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSimpleMailMessage.hpp>
-#endif
//----------------------------------------------------------
// class declaration
@@ -120,3 +119,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index 375da5b07856..9202df97efb8 100644..100755
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@ namespace // private
Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SimpleSystemMail");
+ aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SimpleSystemMail"));
return aRet;
}
@@ -84,7 +85,7 @@ Reference<XSimpleMailClient> SAL_CALL CSmplMailSuppl::querySimpleMailClient()
OUString SAL_CALL CSmplMailSuppl::getImplementationName()
throw(RuntimeException)
{
- return OUString::createFromAscii(COMP_IMPL_NAME);
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(COMP_IMPL_NAME));
}
sal_Bool SAL_CALL CSmplMailSuppl::supportsService(const OUString& ServiceName)
@@ -105,3 +106,4 @@ Sequence<OUString> SAL_CALL CSmplMailSuppl::getSupportedServiceNames()
return Component_getSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx
index e945556c6f8b..819ef2e50b59 100644..100755
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,13 +33,9 @@
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
-#endif
-#ifndef _SIMPLEMAPI_HXX_
#include "simplemapi.hxx"
-#endif
class CSmplMailSupplBase
@@ -73,3 +70,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component
index 1e783f5221ae..1e783f5221ae 100644..100755
--- a/shell/source/win32/syssh.component
+++ b/shell/source/win32/syssh.component
diff --git a/shell/source/win32/syssh.xml b/shell/source/win32/syssh.xml
index 3af4c73dc111..3af4c73dc111 100644..100755
--- a/shell/source/win32/syssh.xml
+++ b/shell/source/win32/syssh.xml
diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index ab0d89e945d2..5cad1a2bd28d 100644..100755
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,7 +98,7 @@ int SAL_CALL main(int, char*, char* )
OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) );
Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
- // Print a message if an error occured.
+ // Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
@@ -113,7 +114,7 @@ int SAL_CALL main(int, char*, char* )
try
{
Reference< XProxySettings > xProxySettings(
- g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SystemProxySettings" ) ), UNO_QUERY );
+ g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemProxySettings")) ), UNO_QUERY );
if ( !xProxySettings.is() )
{
@@ -140,7 +141,7 @@ int SAL_CALL main(int, char*, char* )
printf( "Test of SystemProxySettings successful\n" );
xProxySettings = Reference< XProxySettings >(
- g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SOProxySettings" ) ), UNO_QUERY );
+ g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SOProxySettings")) ), UNO_QUERY );
if ( !xProxySettings.is() )
{
@@ -183,7 +184,7 @@ int SAL_CALL main(int, char*, char* )
// Cast factory to XComponent
Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
- // Print a message if an error occured.
+ // Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
OSL_ENSURE(sal_False, "Error shuting down");
@@ -198,3 +199,5 @@ int SAL_CALL main(int, char*, char* )
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index a9b04a9f4e05..d12a9708abca 100644..100755
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,7 +93,7 @@ int SAL_CALL main(int , char*, char* )
OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) );
Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
- // Print a message if an error occured.
+ // Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
@@ -108,7 +109,7 @@ int SAL_CALL main(int , char*, char* )
try
{
Reference< XSimpleMailClientSupplier > xSmplMailClientSuppl(
- g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SimpleSystemMail" ) ), UNO_QUERY );
+ g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SimpleSystemMail")) ), UNO_QUERY );
if ( !xSmplMailClientSuppl.is() )
{
@@ -126,30 +127,30 @@ int SAL_CALL main(int , char*, char* )
if ( xSmplMailMsg.is( ) )
{
- xSmplMailMsg->setRecipient( OUString::createFromAscii("tino.rachui@germany.sun.com") );
- xSmplMailMsg->setOriginator( OUString::createFromAscii( "tino.rachui@germany.sun.com" ) );
+ xSmplMailMsg->setRecipient( OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com")) );
+ xSmplMailMsg->setOriginator( OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com")) );
Sequence< OUString > ccRecips( 1 );
- ccRecips[0] = OUString::createFromAscii( "tino.rachui@germany.sun.com" );
+ ccRecips[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com"));
xSmplMailMsg->setCcRecipient( ccRecips );
Sequence< OUString > bccRecips( 1 );
- bccRecips[0] = OUString::createFromAscii( "tino.rachui@germany.sun.com" );
+ bccRecips[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com"));
xSmplMailMsg->setBccRecipient( bccRecips );
- xSmplMailMsg->setSubject( OUString::createFromAscii( "Mapi Test" ) );
+ xSmplMailMsg->setSubject( OUString(RTL_CONSTASCII_USTRINGPARAM("Mapi Test")) );
Sequence< OUString > attachements( 2 );
- OUString aFile = OUString::createFromAscii( "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testprx.exe" );
+ OUString aFile(RTL_CONSTASCII_USTRINGPARAM("D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testprx.exe"));
OUString aFileURL;
osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
attachements[0] = aFileURL;
- aFile = OUString::createFromAscii( "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe" );
+ aFile = OUString(RTL_CONSTASCII_USTRINGPARAM("D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe"));
osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
attachements[1] = aFile;
@@ -171,7 +172,7 @@ int SAL_CALL main(int , char*, char* )
// Cast factory to XComponent
Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
- // Print a message if an error occured.
+ // Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
OSL_ENSURE(sal_False, "Error shuting down");
@@ -186,3 +187,5 @@ int SAL_CALL main(int , char*, char* )
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index c459408d3802..b37059f5fdf5 100644..100755
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSystemShellExecute.hpp>
-#endif
#include <cppuhelper/servicefactory.hxx>
@@ -104,7 +103,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) );
Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
- // Print a message if an error occured.
+ // Print a message if an error occurred.
if ( g_xFactory.is() == sal_False )
{
OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
@@ -118,7 +117,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
//-------------------------------------------------
Reference< XSystemShellExecute > xSysShExec(
- g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
+ g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute")) ), UNO_QUERY );
if ( !xSysShExec.is() )
{
@@ -150,7 +149,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
// Cast factory to XComponent
Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
- // Print a message if an error occured.
+ // Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
OSL_ENSURE(sal_False, "Error shuting down");
@@ -165,3 +164,5 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/workbench/makefile.mk b/shell/source/win32/workbench/makefile.mk
index 9d9c7945b9bf..9d9c7945b9bf 100644..100755
--- a/shell/source/win32/workbench/makefile.mk
+++ b/shell/source/win32/workbench/makefile.mk