summaryrefslogtreecommitdiff
path: root/shell/inc
diff options
context:
space:
mode:
authorDirk Voelzke <dv@openoffice.org>2010-01-20 14:07:34 +0100
committerDirk Voelzke <dv@openoffice.org>2010-01-20 14:07:34 +0100
commit6993558d3a80dedb94bb6eaffe76ebc2cfb096fe (patch)
treed5b58ce4c64f6efba115b4fe43f69b00f472f4ed /shell/inc
parent85e0cc246d4350122b17fbe2bfd15635a190ad77 (diff)
parentb0c799c7fbaa93f707bf18a87eb9aef5d86be52c (diff)
dv17: merge with DEV300_m69
Diffstat (limited to 'shell/inc')
-rw-r--r--shell/inc/internal/config.hxx5
-rwxr-xr-xshell/inc/internal/utilities.hxx21
-rw-r--r--shell/inc/internal/xml_parser.hxx11
-rw-r--r--shell/inc/kde_headers.h97
4 files changed, 123 insertions, 11 deletions
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 47394730c761..e9b3e0fd59ac 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -39,8 +39,13 @@
#include <tchar.h>
#endif
+#ifdef _AMD64_
+#define MODULE_NAME TEXT("shlxthdl_x64.dll")
+#define MODULE_NAME_FILTER TEXT("ooofilt_x64.dll")
+#else
#define MODULE_NAME TEXT("shlxthdl.dll")
#define MODULE_NAME_FILTER TEXT("ooofilt.dll")
+#endif
#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Column Handler")
#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Infotip Handler")
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index a552516400bc..4da6d6ce1eca 100755
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -47,6 +47,8 @@
#include "internal/types.hxx"
#include <string>
+#define STRSAFE_NO_DEPRECATE
+#include <strsafe.h>
//---------------------------------
/** Convert a string to a wstring
@@ -89,4 +91,23 @@ bool HasOnlySpaces(const std::wstring& String);
LCID LocaleSetToLCID( const LocaleSet_t & Locale );
#endif
+//----------------------------------------------------------
+#ifdef DEBUG
+inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
+{
+ CHAR buffer[1024];
+ va_list args;
+
+ va_start( args, pFormat );
+ StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
+ OutputDebugStringA( buffer );
+}
+#else
+static inline void OutputDebugStringFormat( LPCSTR, ... )
+{
+}
+#endif
+//----------------------------------------------------------
+
+
#endif
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