summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/inc/internal/utilities.hxx1
-rw-r--r--shell/inc/internal/xml_parser.hxx11
-rw-r--r--shell/inc/kde_headers.h97
-rw-r--r--shell/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]shell/prj/d.lst1
-rwxr-xr-xshell/qa/makefile.mk12
-rwxr-xr-xshell/qa/recent_docs.cxx2
-rw-r--r--shell/source/all/xml_parser.cxx14
-rw-r--r--shell/source/backends/kdebe/kdeaccess.cxx3
-rw-r--r--shell/source/backends/kdebe/kdebackend.cxx3
-rw-r--r--shell/source/backends/localebe/localebackend.cxx6
-rw-r--r--shell/source/tools/lngconvex/lngconvex.cxx13
-rw-r--r--shell/source/unix/sysshell/recently_used_file.cxx6
-rw-r--r--shell/source/unix/sysshell/recently_used_file.hxx3
-rw-r--r--shell/source/unix/sysshell/recently_used_file_handler.cxx20
15 files changed, 115 insertions, 79 deletions
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index f0f7022dc02c..4da6d6ce1eca 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -47,6 +47,7 @@
#include "internal/types.hxx"
#include <string>
+#define STRSAFE_NO_DEPRECATE
#include <strsafe.h>
//---------------------------------
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 5c52fcb7cd13..ff9842c18208 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -31,11 +31,7 @@
#ifndef _XML_PARSER_HXX_
#define _XML_PARSER_HXX_
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include <external/expat/xmlparse.h>
-#endif
#include <stdexcept>
//-----------------------------------------------------
@@ -76,9 +72,6 @@ public:
xml_parser(const XML_Char* EncodingName = 0);
//########################################################
- xml_parser(const XML_Char* EncodingName, XML_Char NamespaceSeparator);
-
- //########################################################
~xml_parser();
//########################################################
@@ -126,10 +119,6 @@ public:
/** Returns the currently used document handler or null if
no document handler was set before. */
i_xml_parser_event_handler* get_document_handler() const;
-
- //############################################
- void set_encoding(const XML_Char* Encoding);
-
private:
void init();
diff --git a/shell/inc/kde_headers.h b/shell/inc/kde_headers.h
new file mode 100644
index 000000000000..ccbffc99cb99
--- /dev/null
+++ b/shell/inc/kde_headers.h
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: kde_headers.h,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_VCL_KDE_HEADERS_H
+#define INCLUDED_VCL_KDE_HEADERS_H
+
+/* ********* Suppress warnings if needed */
+#include "sal/config.h"
+
+#if defined __GNUC__
+#pragma GCC system_header
+#endif
+
+
+/* ********* Hack, but needed because of conflicting types... */
+#define Region QtXRegion
+
+
+/* ********* Qt headers */
+#include <qaccessible.h>
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qfont.h>
+#include <qframe.h>
+#include <qlineedit.h>
+#include <qlistview.h>
+#include <qmainwindow.h>
+#include <qmenudata.h>
+#include <qpaintdevice.h>
+#include <qpainter.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
+#include <qrangecontrol.h>
+#include <qstring.h>
+#include <qtabbar.h>
+#include <qtabwidget.h>
+#include <qtoolbar.h>
+#include <qtoolbutton.h>
+#include <qwidget.h>
+#include <qprogressbar.h>
+
+/* ********* See hack on top of this file */
+#undef Region
+
+
+/* ********* KDE base headers */
+#include <kaboutdata.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <kconfig.h>
+#include <kdeversion.h>
+#include <kemailsettings.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
+#include <kmainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
+#include <kstyle.h>
+
+
+/* ********* KDE address book connectivity headers */
+#include <kabc/addressbook.h>
+#include <kabc/addressee.h>
+#include <kabc/field.h>
+#include <kabc/stdaddressbook.h>
+
+
+#endif
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index ed4fbca7e3f5..0fdf02409682 100644
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -1,4 +1,4 @@
-sl shell : l10n offuh rdbmaker tools sal vcl EXPAT:expat NULL
+sl shell : l10n offuh rdbmaker tools sal EXPAT:expat NULL
sl shell\inc nmake - all sl_inc NULL
sl shell\source\win32 nmake - w sl_win32 sl_inc NULL
sl shell\source\win32\simplemail nmake - w sl_win32_simplemail sl_inc NULL
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index d623a55c2d6c..eee13ef34fe9 100644..100755
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -21,3 +21,4 @@
..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml
..\%__SRC%\misc\*-ucd.txt %_DEST%\bin%_EXT%\*-ucd.txt
+..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index 70c42e646391..e935abd1c0d6 100755
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -42,17 +42,13 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
+# auto generated Target:testjob by codegen.pl
-SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj
+SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj
SHL1TARGET=recent_docs
-SHL1STDLIBS=$(SALLIB)
+SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \
..$/unxsols4.pro$/slb$/libsysshell.a \
$(EXPATASCII3RDLIB)
.ENDIF
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index df0266d24156..5936c8c033b1 100755
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include "systemshell.hxx"
#include "osl/file.hxx"
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 1c898afde0a2..046397f64b8b 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -90,14 +90,6 @@ xml_parser::xml_parser(const XML_Char* EncodingName) :
}
//###################################################
-xml_parser::xml_parser(const XML_Char* EncodingName, XML_Char /*NamespaceSeparator*/) :
- document_handler_(0),
- xml_parser_(XML_ParserCreate(EncodingName))
-{
- init();
-}
-
-//###################################################
xml_parser::~xml_parser()
{
XML_ParserFree(xml_parser_);
@@ -224,9 +216,3 @@ i_xml_parser_event_handler* xml_parser::get_document_handler() const
{
return document_handler_;
}
-
-//###################################################
-void xml_parser::set_encoding(const XML_Char* Encoding)
-{
- XML_SetEncoding(xml_parser_, Encoding);
-}
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx
index dcb1df9c95b0..2058cc6271b9 100644
--- a/shell/source/backends/kdebe/kdeaccess.cxx
+++ b/shell/source/backends/kdebe/kdeaccess.cxx
@@ -36,7 +36,8 @@
#include "osl/file.h"
#include "rtl/string.h"
#include "rtl/ustring.hxx"
-#include "vcl/kde_headers.h"
+
+#include "kde_headers.h"
#include "kdeaccess.hxx"
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 743971a0d9e2..7bbbab169de8 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -59,7 +59,8 @@
#include "sal/types.h"
#include "uno/current_context.hxx"
#include "uno/lbnames.h"
-#include "vcl/kde_headers.h"
+
+#include "kde_headers.h"
#include "kdeaccess.hxx"
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 75544c6d7f05..c22b626ad79c 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -37,7 +37,7 @@
#include <stdio.h>
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
#include <rtl/ustrbuf.hxx>
#include <locale.h>
@@ -248,7 +248,7 @@ LocaleBackend* LocaleBackend::createInstance()
rtl::OUString LocaleBackend::getLocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
return ImplGetLocale(LC_CTYPE);
#elif defined (MACOSX)
return ImplGetLocale("AppleLocale");
@@ -261,7 +261,7 @@ rtl::OUString LocaleBackend::getLocale(void)
rtl::OUString LocaleBackend::getUILocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
return ImplGetLocale(LC_MESSAGES);
#elif defined(MACOSX)
return ImplGetLocale("AppleLanguages");
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 43fbd410dbe3..f605d6f340d9 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -31,12 +31,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-#endif
-
#include <tools/presys.h>
#if defined _MSC_VER
#pragma warning(push, 1)
@@ -60,7 +54,6 @@
#include <iostream>
#include <fstream>
-#include <assert.h>
#include <map>
#include <sstream>
#include <iterator>
@@ -283,7 +276,7 @@ public:
void substitute(std::string& Text)
{
replacement_table_t* prt = get_replacement_table(active_iso_lang_.make_std_string());
- assert(prt);
+ OSL_ASSERT(prt);
replacement_table_t::iterator iter = prt->find(Text);
if (iter != prt->end())
Text = iter->second;
@@ -293,7 +286,7 @@ public:
const std::string& Placeholder, const std::string& Substitute)
{
replacement_table_t* prt = get_replacement_table(active_iso_lang_.make_std_string());
- assert(prt);
+ OSL_ASSERT(prt);
prt->insert(std::make_pair(Placeholder, Substitute));
}
@@ -333,7 +326,7 @@ void add_group_entries(
const ByteString& GroupName,
Substitutor& Substitutor)
{
- assert(aConfig.HasGroup(GroupName));
+ OSL_ASSERT(aConfig.HasGroup(GroupName));
aConfig.SetGroup(GroupName);
size_t key_count = aConfig.GetKeyCount();
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 9126f1829ed7..6de067a62936 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -115,12 +115,6 @@ void recently_used_file::reset() const
}
//------------------------------------------------
-void recently_used_file::flush()
-{
- fflush(file_);
-}
-
-//------------------------------------------------
void recently_used_file::truncate(off_t length)
{
ftruncate(fileno(file_), length);
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index 93d0027a0d3e..ec27e5458cf0 100644
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -54,9 +54,6 @@ public:
void truncate(off_t length = 0);
//----------------------------
- void flush();
-
- //----------------------------
size_t read(
char* buffer,
size_t size) const;
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index faf8118d7f8d..80d22501ed46 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -49,18 +49,6 @@
#include <string.h>
namespace /* private */ {
-
- const rtl::OUString ENVV_UPDATE_RECENTLY_USED =
- rtl::OUString::createFromAscii("ENABLE_UPDATE_RECENTLY_USED");
-
- //########################################
- inline rtl::OString get_file_extension(const rtl::OString& file_url)
- {
- sal_Int32 index = file_url.lastIndexOf('.');
- OSL_ENSURE((index != -1) && ((index + 1) < file_url.getLength()), "Invalid file url");
- return file_url.copy(index + 1);
- }
-
//########################################
typedef std::vector<string_t> string_container_t;
@@ -475,14 +463,6 @@ namespace /* private */ {
greater_recently_used_item());
}
- //##############################
- bool update_recently_used_enabled()
- {
- rtl::OUString tmp;
- osl_getEnvironment(ENVV_UPDATE_RECENTLY_USED.pData, &tmp.pData);
- return (tmp.getLength() > 0);
- }
-
//------------------------------------------------
struct cleanup_guard
{
generated by cgit (git 2.34.1) at 2025-01-07 21:00:40 +0000