diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
commit | 07b3d083b49b4cbb248b5ba0aeba2bbdd3cc487d (patch) | |
tree | 5f80a6862e44b938c4e7f62f457d1b48f5a0195b /shell/source | |
parent | 007f16ef7ad40ae932df884ba04f0de71928b852 (diff) |
TDE integration
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
Diffstat (limited to 'shell/source')
-rw-r--r-- | shell/source/backends/kdebe/kdeaccess.cxx | 2 | ||||
-rw-r--r-- | shell/source/backends/kdebe/kdebackend.cxx | 2 | ||||
-rw-r--r-- | shell/source/backends/kdebe/makefile.mk | 45 | ||||
-rw-r--r-- | shell/source/backends/kdebe/tdebe1.component | 34 | ||||
-rw-r--r-- | shell/source/unix/misc/makefile.mk | 1 | ||||
-rw-r--r-- | shell/source/unix/misc/tde-open-url.sh | 10 |
6 files changed, 87 insertions, 7 deletions
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index 0d7ad8ddd27a..ed9df8fa417e 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -35,7 +35,7 @@ #include "rtl/string.h" #include "rtl/ustring.hxx" -#include "kde_headers.h" +#include "shell/kde_headers.h" #include "kdeaccess.hxx" diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 64321545111b..4faf91106560 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -58,7 +58,7 @@ #include "uno/current_context.hxx" #include "uno/lbnames.h" -#include "kde_headers.h" +#include "shell/kde_headers.h" #include "kdeaccess.hxx" diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index 265a3b691267..948d1a590f3e 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -27,8 +27,8 @@ PRJ=..$/..$/.. PRJNAME=shell -TARGET=kdebe +TARGET=kdebe LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE VISIBILITY_HIDDEN=TRUE @@ -47,7 +47,39 @@ CFLAGSCXX+=-Wno-shadow # no "lib" prefix DLLPRE = +.IF "$(ENABLE_TDE)" == "TRUE" +TARGET=tdebe + +CFLAGS+=$(TDE_CFLAGS) +CFLAGS+=-DENABLE_TDE +CFLAGSCXX+=-DENABLE_TDE + +# --- Files --- + +SLOFILES=\ + $(SLO)$/kdeaccess.obj \ + $(SLO)$/kdebackend.obj + +SHL1NOCHECK=TRUE +SHL1TARGET=$(TARGET)1.uno +SHL1OBJS=$(SLOFILES) +SHL1DEF=$(MISC)$/$(SHL1TARGET).def + +SHL1IMPLIB=i$(SHL1TARGET) +SHL1STDLIBS= \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(TDE_LIBS) \ + -lkio + +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + +.ENDIF # "$(ENABLE_TDE)" == "TRUE" + .IF "$(ENABLE_KDE)" == "TRUE" +TARGET=kdebe CFLAGS+=$(KDE_CFLAGS) @@ -79,10 +111,13 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk -ALLTAR : $(MISC)/kdebe1.component +.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_TDE)" == "TRUE" + +ALLTAR : $(MISC)/$(TARGET)1.component -$(MISC)/kdebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - kdebe1.component +$(MISC)/$(TARGET)1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + $(TARGET)1.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt kdebe1.component + $(SOLARENV)/bin/createcomponent.xslt $(TARGET)1.component +.ENDIF diff --git a/shell/source/backends/kdebe/tdebe1.component b/shell/source/backends/kdebe/tdebe1.component new file mode 100644 index 000000000000..55a3776898a4 --- /dev/null +++ b/shell/source/backends/kdebe/tdebe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.TDEBackend"> + <service name="com.sun.star.configuration.backend.TDEBackend"/> + </implementation> +</component> diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk index 6805ad41a9f4..39752bdc4644 100644 --- a/shell/source/unix/misc/makefile.mk +++ b/shell/source/unix/misc/makefile.mk @@ -52,6 +52,7 @@ SCRIPTFILES = \ $(BIN)$/open-url \ $(BIN)$/cde-open-url \ $(BIN)$/gnome-open-url \ + $(BIN)$/tde-open-url \ $(BIN)$/kde-open-url APP1TARGET = gnome-open-url.bin diff --git a/shell/source/unix/misc/tde-open-url.sh b/shell/source/unix/misc/tde-open-url.sh new file mode 100644 index 000000000000..fa05bdecbda4 --- /dev/null +++ b/shell/source/unix/misc/tde-open-url.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# special handling for mailto: uris +if echo $1 | grep '^mailto:' > /dev/null; then + kmailservice "$1" & +else + kfmclient openURL "$1" & +fi + +exit 0 |