Kaydet (Commit) 036ed05f authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

MWS_SRX644: migrate branch mws_srx644 -> HEAD

üst 945abd8c
......@@ -2,9 +2,9 @@
*
* $RCSfile: app.hxx,v $
*
* $Revision: 1.14 $
* $Revision: 1.15 $
*
* last change: $Author: lo $ $Date: 2002-11-06 14:32:44 $
* last change: $Author: hr $ $Date: 2003-03-25 13:50:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -62,6 +62,9 @@
#ifndef _DESKTOP_APP_HXX_
#define _DESKTOP_APP_HXX_
// stl includes first
#include <map>
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
......@@ -69,12 +72,32 @@
#ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
#endif
#ifndef _VCL_TIMER_HXX_
#include <vcl/timer.hxx>
#endif
#ifndef _TOOLS_RESMGR_HXX
#include <tools/resmgr.hxx>
#endif
#ifndef _UTL_BOOTSTRAP_HXX
#include <unotools/bootstrap.hxx>
#endif
#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
#include <com/sun/star/lang/XInitialization.hpp>
#endif
#ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATOR_HPP_
#include <com/sun/star/task/XStatusIndicator.hpp>
#endif
#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
#include <com/sun/star/uno/Reference.h>
#endif
#ifndef _OSL_MUTEX_HXX_
#include <osl/mutex.hxx>
#endif
using namespace com::sun::star::task;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace rtl;
namespace desktop
{
......@@ -83,10 +106,10 @@ namespace desktop
Description: Application-class
--------------------------------------------------------------------*/
class IntroWindow_Impl;
class OOfficeAcceptorThread;
class PluginAcceptThread;
class CommandLineArgs;
class Lockfile;
class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {};
class Desktop : public Application
{
public:
......@@ -112,6 +135,9 @@ class Desktop : public Application
static void OpenClients();
static void OpenDefault();
DECL_LINK( EnableAcceptors_Impl, void*);
static void HandleAppEvent( const ApplicationEvent& rAppEvent );
static ResMgr* GetDesktopResManager();
static CommandLineArgs* GetCommandLineArgs();
......@@ -138,7 +164,6 @@ class Desktop : public Application
sal_Bool InitializeInstallation( const rtl::OUString& rAppFilename );
sal_Bool InitializeConfiguration();
sal_Bool InitializeQuickstartMode( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr );
sal_Bool InitializePluginMode( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr );
void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg );
void StartSetup( const ::rtl::OUString& aParameters );
......@@ -151,6 +176,7 @@ class Desktop : public Application
const ::rtl::OUString& aFileURL );
void OpenStartupScreen();
Reference<XStatusIndicator> getSplashScreen();
void CloseStartupScreen();
void EnableOleAutomation();
DECL_LINK( AsyncInitFirstRun, void* );
......@@ -164,6 +190,13 @@ class Desktop : public Application
/// does initializations which are necessary for the first run of the office
void DoFirstRunInitializations();
// on-demand acceptors
static AcceptorMap m_acceptorMap;
static osl::Mutex m_mtxAccMap;
static void createAcceptor(const OUString& aDescription);
static void enableAcceptors();
static void destroyAcceptor(const OUString& aDescription);
sal_Bool m_bMinimized;
sal_Bool m_bInvisible;
USHORT m_nAppEvents;
......@@ -171,10 +204,9 @@ class Desktop : public Application
BootstrapError m_aBootstrapError;
Lockfile *m_pLockfile;
Timer m_firstRunTimer;
static ResMgr* pResMgr;
static PluginAcceptThread* pPluginAcceptThread;
static OOfficeAcceptorThread* pOfficeAcceptThread;
};
}
......
......@@ -2,12 +2,15 @@ dt desktop : sc sd sw NULL
dt desktop usr1 - all dt_mkout NULL
dt desktop\inc get - all dt_inc NULL
dt desktop\prj get - all dt_prj NULL
dt desktop\jobs get - all dt_jobs NULL
dt desktop\jobs get - all dt_jobs NULL
dt desktop\res get - all dt_res NULL
dt desktop\source\app nmake - all dt_app NULL
dt desktop\source\offwrp nmake - all dt_offwrp NULL
dt desktop\source\so_comp nmake - all dt_so_comp NULL
dt desktop\win32\source nmake - w dt_wrapper NULL
dt desktop\source\javaldx nmake - u dt_javaldx NULL
dt desktop\source\pkgchk nmake - all dt_pkgchk NULL
dt desktop\util nmake - all dt_util dt_app dt_offwrp dt_so_comp dt_wrapper.w NULL
dt desktop\source\app nmake - all dt_app NULL
dt desktop\source\offwrp nmake - all dt_offwrp NULL
dt desktop\source\so_comp nmake - all dt_so_comp NULL
dt desktop\source\offacc nmake - all dt_offac NULL
dt desktop\source\splash nmake - all dt_spl NULL
dt desktop\win32\source nmake - w dt_wrapper NULL
dt desktop\source\javaldx nmake - u dt_javaldx NULL
dt desktop\source\pkgchk nmake - all dt_pkgchk NULL
dt desktop\scripts nmake - u dt_scripts NULL
dt desktop\util nmake - all dt_util dt_app dt_offwrp dt_so_comp dt_spl dt_wrapper.w NULL
......@@ -2,6 +2,8 @@ mkdir: %_DEST%\bin%_EXT%\local
mkdir: %_DEST%\bin%_EXT%\remote2
..\%__SRC%\bin\soffice.exe %_DEST%\bin%_EXT%\soffice.bin
..\%__SRC%\bin\so\soffice.exe %_DEST%\bin%_EXT%\so\soffice.exe
..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin
..\%__SRC%\bin\soremote.exe %_DEST%\bin%_EXT%\remote\soffice.exe
..\%__SRC%\bin\solocal.exe %_DEST%\bin%_EXT%\local\soffice.exe
......@@ -14,14 +16,20 @@ mkdir: %_DEST%\bin%_EXT%\remote2
..\%__SRC%\bin\solocal.exe %_DEST%\bin%_EXT%\local\jvmsetup.exe
..\%__SRC%\bin\soffice.exe %_DEST%\bin%_EXT%\soffice.exe
..\%__SRC%\bin\*.exe.manifest %_DEST%\bin%_EXT%\*.exe.manifest
..\%__SRC%\bin\wrp?????.dll %_DEST%\bin%_EXT%\wrp?????.dll
..\%__SRC%\bin\spl?????.dll %_DEST%\bin%_EXT%\spl?????.dll
..\%__SRC%\bin\eval.dll %_DEST%\bin%_EXT%\eval.dll
..\%__SRC%\lib\libwrp?????.so %_DEST%\lib%_EXT%\libwrp?????.so
..\%__SRC%\lib\libdsk?????.so %_DEST%\lib%_EXT%\libdsk?????.so
..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib%_EXT%\libwrp*.dylib
..\%__SRC%\lib\libspl?????.so %_DEST%\lib%_EXT%\libspl?????.so
..\%__SRC%\lib\libspl*.dylib %_DEST%\lib%_EXT%\libspl*.dylib
..\%__SRC%\lib\libeval.so %_DEST%\lib%_EXT%\libeval.so
..\%__SRC%\bin\offacc?????.dll %_DEST%\bin%_EXT%\offacc?????.dll
..\%__SRC%\lib\liboffacc?????.so %_DEST%\lib%_EXT%\liboffacc?????.so
..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin
..\%__SRC%\bin\sweb %_DEST%\bin%_EXT%\sweb.bin
..\%__SRC%\bin\javaldx %_DEST%\bin%_EXT%\javaldx
......@@ -38,5 +46,22 @@ mkdir: %_DEST%\bin%_EXT%\remote2
..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx
..\%__SRC%\misc\*staticdatamembers.h* %_DEST%\inc%_EXT%\*staticdatamembers.h*
..\%__SRC%\misc\soffice.sh %_DEST%\bin%_EXT%\soffice
..\%__SRC%\misc\sagenda.sh %_DEST%\bin%_EXT%\sagenda
..\%__SRC%\misc\scalc.sh %_DEST%\bin%_EXT%\scalc
..\%__SRC%\misc\sdraw.sh %_DEST%\bin%_EXT%\sdraw
..\%__SRC%\misc\sfax.sh %_DEST%\bin%_EXT%\sfax
..\%__SRC%\misc\simpress.sh %_DEST%\bin%_EXT%\simpress
..\%__SRC%\misc\slabel.sh %_DEST%\bin%_EXT%\slabel
..\%__SRC%\misc\sletter.sh %_DEST%\bin%_EXT%\sletter
..\%__SRC%\misc\smaster.sh %_DEST%\bin%_EXT%\smaster
..\%__SRC%\misc\smath.sh %_DEST%\bin%_EXT%\smath
..\%__SRC%\misc\smemo.sh %_DEST%\bin%_EXT%\smemo
..\%__SRC%\misc\svcard.sh %_DEST%\bin%_EXT%\svcard
..\%__SRC%\misc\sweb.sh %_DEST%\bin%_EXT%\sweb
..\%__SRC%\misc\swriter.sh %_DEST%\bin%_EXT%\swriter
..\%__SRC%\misc\fromTemplate.sh %_DEST%\bin%_EXT%\fromtemplate
..\%__SRC%\misc\nswrapper.sh %_DEST%\bin%_EXT%\nswrapper
dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
dos: sh -c "if test %OS% = MACOSX; then create-libstatic-link %_DEST%\lib%_EXT%; fi"
#*************************************************************************
#
# $RCSfile: makefile.mk,v $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
#
# - GNU Lesser General Public License Version 2.1
# - Sun Industry Standards Source License Version 1.1
#
# Sun Microsystems Inc., October, 2000
#
# GNU Lesser General Public License Version 2.1
# =============================================
# Copyright 2000 by Sun Microsystems, Inc.
# 901 San Antonio Road, Palo Alto, CA 94303, USA
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License version 2.1, as published by the Free Software Foundation.
#
# This library 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 for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
#
# Sun Industry Standards Source License Version 1.1
# =================================================
# The contents of this file are subject to the Sun Industry Standards
# Source License Version 1.1 (the "License"); You may not use this file
# except in compliance with the License. You may obtain a copy of the
# License at http://www.openoffice.org/license.html.
#
# Software provided under this License is provided on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
# See the License for the specific provisions governing your rights and
# obligations concerning the Software.
#
# The Initial Developer of the Original Code is: Sun Microsystems, Inc.
#
# Copyright: 2000 by Sun Microsystems, Inc.
#
# All Rights Reserved.
#
# Contributor(s): _______________________________________
#
#
#
#*************************************************************************
PRJ=..
PRJNAME=desktop
TARGET=scripts
# --- Settings -----------------------------------------------------------
.INCLUDE : settings.mk
# --- Targets -------------------------------------------------------------
UNIXTEXT= \
$(MISC)$/nswrapper.sh \
$(MISC)$/fromTemplate.sh \
$(MISC)$/sagenda.sh \
$(MISC)$/soffice.sh \
$(MISC)$/scalc.sh \
$(MISC)$/sdraw.sh \
$(MISC)$/sfax.sh \
$(MISC)$/simpress.sh \
$(MISC)$/slabel.sh \
$(MISC)$/sletter.sh \
$(MISC)$/smaster.sh \
$(MISC)$/smath.sh \
$(MISC)$/smemo.sh \
$(MISC)$/svcard.sh \
$(MISC)$/sweb.sh \
$(MISC)$/swriter.sh
.INCLUDE : target.mk
#!/bin/sh
cmd=`dirname "$0"`/soffice
exec "$cmd" -calc "$@"
#!/bin/sh
cmd=`dirname "$0"`/soffice
exec "$cmd" -draw "$@"
#!/bin/sh
cmd=`dirname "$0"`/soffice
exec "$cmd" -impress "$@"
#!/bin/sh
cmd=`dirname "$0"`/soffice
exec "$cmd" -global "$@"
#!/bin/sh
cmd=`dirname "$0"`/soffice
exec "$cmd" -math "$@"
#!/bin/sh
#*************************************************************************
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
#
# - GNU Lesser General Public License Version 2.1
# - Sun Industry Standards Source License Version 1.1
#
# Sun Microsystems Inc., October, 2000
#
# GNU Lesser General Public License Version 2.1
# =============================================
# Copyright 2000 by Sun Microsystems, Inc.
# 901 San Antonio Road, Palo Alto, CA 94303, USA
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License version 2.1, as published by the Free Software Foundation.
#
# This library 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 for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
#
# Sun Industry Standards Source License Version 1.1
# =================================================
# The contents of this file are subject to the Sun Industry Standards
# Source License Version 1.1 (the "License"); You may not use this file
# except in compliance with the License. You may obtain a copy of the
# License at http://www.openoffice.org/license.html.
#
# Software provided under this License is provided on an "AS IS" basis,
# WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
# WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
# See the License for the specific provisions governing your rights and
# obligations concerning the Software.
#
# The Initial Developer of the Original Code is: Sun Microsystems, Inc..
#
# Copyright: 2000 by Sun Microsystems, Inc.
#
# All Rights Reserved.
#
# Contributor(s): _______________________________________
#
#
#
#*************************************************************************
#
# STAR_PROFILE_LOCKING_DISABLED=1
# export STAR_PROFILE_LOCKING_DISABLED
#
#
# SAL_ENABLE_FILE_LOCKING=1
# export SAL_ENABLE_FILE_LOCKING
#
# uncomment this to remote start soffice on hostname
# SO_REMOTE_START=rsh
# SO_REMOTE_APPLICATION=hostname:/fully_quallified_path/soffice
# set -x
# resolve installation directory
sd_cwd="`pwd`"
if [ -h "$0" ] ; then
sd_basename=`basename "$0"`
sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
sd_sub=`echo $sd_script | cut -f1 -d/`
if [ "$sd_sub" = ".." -a "$SO_MODE" = "" ]; then
SO_MODE="remote"
fi
cd "`dirname "$0"`"
cd "`dirname "$sd_script"`"
else
cd "`dirname "$0"`"
fi
sd_prog="`pwd`"
if [ "$SO_MODE" = "" ]; then
SO_MODE="local";
fi
export SO_MODE
sd_progsub=$sd_prog/$SO_MODE
cd ..
sd_binary=`basename "$0"`".bin"
sd_inst="`pwd`"
# change back directory
cd "$sd_cwd"
# check if all required patches are installed
if [ -x "$sd_prog/sopatchlevel.sh" ]; then
"$sd_prog/sopatchlevel.sh"
if [ $? -eq 1 ]; then
exit 0
fi
fi
# set search path for shared libraries
sd_platform=`uname -s`
case $sd_platform in
SunOS)
LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":/usr/openwin/lib:/usr/dt/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
;;
AIX)
LIBPATH="$sd_progsub":"$sd_prog":$LIBPATH
export LIBPATH
;;
HP-UX)
SHLIB_PATH="$sd_progsub":"$sd_prog":/usr/openwin/lib:$SHLIB_PATH
export SHLIB_PATH
;;
IRIX*)
LD_LIBRARYN32_PATH=:"$sd_progsub":"$sd_prog":$LD_LIBRARYN32_PATH
export LD_LIBRARYN32_PATH
;;
*)
LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
;;
esac
# extend the ld_library_path for java: javaldx checks the sofficerc for us
java_ld_library_path=`"$sd_prog/javaldx" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"`
if [ "$java_ld_library_path" != "" ] ; then
case $sd_platform in
AIX)
LIBPATH=${java_ld_library_path}:${LIBPATH}
;;
HP-UX)
SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
;;
IRIX*)
LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
;;
*)
LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
;;
esac
fi
# set java environment variables
THREADS_TYPE=native_threads
# misc. environment variables
OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
unset XENVIRONMENT
export OPENOFFICE_MOZILLA_FIVE_HOME
# uncomment line below to disable anti aliasing of fonts
#SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
# error message function
err () {
echo "`basename $0`: $@" 1>&2
exit 1
}
#
# parse command line arguments
#
plugin_mode=false
for DUMMY in ${1+"$@"}
do
case $1 in
?display)
if [ $# -lt 2 ]; then
err "$1 option requires a display name"
fi
DISPLAY=$2
export DISPLAY
shift; shift
;;
?plugin)
plugin_mode=true
shift
;;
*)
break;
;;
esac
done
# start soffice by remote shell
if [ "X${SO_REMOTE_START}" = "Xrsh" ]; then
remote_server=`echo ${SO_REMOTE_APPLICATION} | sed 's/:.*//g'`
remote_path=`echo ${SO_REMOTE_APPLICATION} | sed 's/.*://g'`
echo remote_server=\"${remote_server}\" remote_path=\"${remote_path}\"
if [ "X${DISPLAY}" = "X" ]; then
local_display=`uname -n`:0
else
local_display=${DISPLAY}
fi
if [ "X${remote_server}" != "X" -a "X${remote_path}" != "X" ]; then
rsh ${remote_server} ${remote_path} -norsh -display ${local_display}
exit 0
else
err "invalid rsh arguments host=\"$remote_server\", command=\"${remote_path}\""
fi
fi
# set path so that other apps can be started from soffice just by name
PATH="$sd_prog":$PATH
export PATH
# execute soffice binary
if [ "X${plugin_mode}" = "Xtrue" ]; then
SAL_IGNOREXERRORS=true
export SAL_IGNOREXERRORS
exec "$sd_prog/$sd_binary" -plugin "$@"
else
exec "$sd_prog/$sd_binary" "$@"
fi
#!/bin/sh
cmd=`dirname "$0"`/soffice
exec "$cmd" -web "$@"
#!/bin/sh
cmd=`dirname "$0"`/soffice
exec "$cmd" -writer "$@"
This diff is collapsed.
......@@ -2,9 +2,9 @@
*
* $RCSfile: appinit.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: lo $ $Date: 2002-11-06 14:31:21 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -59,9 +59,10 @@
*
************************************************************************/
#include <algorithm>
#include "app.hxx"
#include "cmdlineargs.hxx"
#include "officeacceptthread.hxx"
#ifndef _COM_SUN_STAR_REGISTRY_XSIMPLEREGISTRY_HPP_
#include <com/sun/star/registry/XSimpleRegistry.hpp>
......@@ -75,6 +76,10 @@
#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP_
#include <com/sun/star/uno/Exception.hpp>
#endif
#ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
......@@ -104,6 +109,9 @@
#ifndef _RTL_USTRBUF_HXX_
#include <rtl/ustrbuf.hxx>
#endif
#ifndef _RTL_BOOTSTRAP_HXX_
#include <rtl/bootstrap.hxx>
#endif
#ifndef _COMPHELPER_REGPATHHELPER_HXX_
#include <comphelper/regpathhelper.hxx>
#endif
......@@ -244,6 +252,27 @@ Reference< XMultiServiceFactory > Desktop::CreateApplicationServiceManager()
{
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createApplicationServiceManager" );
OUString aUserDir;
if ( GetCommandLineArgs()->GetUserDir( aUserDir ))
{
OUString aUserDirURL;
if ( osl::FileBase::getFileURLFromSystemPath( aUserDir, aUserDirURL ) == 0 )
{
// now must be a valid file URL. For best results make absolute using
OUString aProcessWorkDirURL;
oslProcessError nProcessError = osl_getProcessWorkingDir( &aProcessWorkDirURL.pData );
if ( nProcessError == osl_Process_E_None )
{
osl::FileBase::getAbsoluteFileURL( aProcessWorkDirURL, aUserDirURL, aUserDirURL );
// now override the bootstrap setting:
rtl::Bootstrap::set( OUString::createFromAscii( "UserInstallation" ), aUserDirURL );
}
}
}
try
{
Reference<XComponentContext> xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
......@@ -312,9 +341,8 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr )
if ( conDcp.getLength() > 0 )
{
// accept incoming connections (scripting and one rvp)
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::OOfficeAcceptorThread::OOfficeAcceptorThread" );
pOfficeAcceptThread = new OOfficeAcceptorThread( xSMgr, conDcp, bHeadlessMode, aClientDisplay, aUserDir );
pOfficeAcceptThread->create();
RTL_LOGFILE_CONTEXT( aLog, "desktop (lo119109) desktop::Desktop::createAcceptor()" );
createAcceptor(conDcp);
}
// improves parallel processing on Sun ONE Webtop
......@@ -358,19 +386,97 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr )
CreateTemporaryDirectory();
}
void Desktop::DeregisterServices()
AcceptorMap Desktop::m_acceptorMap;
osl::Mutex Desktop::m_mtxAccMap;
static sal_Bool bAccept = sal_False;
void Desktop::createAcceptor(const OUString& aAcceptString)
{
if( pOfficeAcceptThread )
// make sure nobody adds an acceptor whle we create one...
osl::MutexGuard aGuard(m_mtxAccMap);
// check whether the requested acceptor already exists
AcceptorMap::const_iterator pIter = m_acceptorMap.find(aAcceptString);
if (pIter == m_acceptorMap.end() ) {
Sequence< Any > aSeq( 2 );
aSeq[0] <<= aAcceptString;
aSeq[1] <<= bAccept;
Reference<XInitialization> rAcceptor(
::comphelper::getProcessServiceFactory()->createInstance(
OUString::createFromAscii( "com.sun.star.office.Acceptor" )), UNO_QUERY );
if ( rAcceptor.is() ) {
try{
rAcceptor->initialize( aSeq );
m_acceptorMap.insert(AcceptorMap::value_type(aAcceptString, rAcceptor));
} catch (com::sun::star::uno::Exception&) {
// no error handling needed...
// acceptor just won't come up
OSL_ENSURE(sal_False, "Acceptor could not be created.");
}
} else {
// there is already an acceptor with this description
OSL_ENSURE(sal_False, "Acceptor already exists.");
}
}
}
class enable
{
private:
Sequence<Any> m_aSeq;
public:
enable() : m_aSeq(1) {
m_aSeq[0] <<= sal_True;
}
void operator() (const AcceptorMap::value_type& val) {
if (val.second.is()) {
val.second->initialize(m_aSeq);
}
}
};
void Desktop::enableAcceptors()
{
RTL_LOGFILE_CONTEXT(aLog, "desktop (lo119109) Desktop::enableAcceptors");
osl::MutexGuard aGuard(m_mtxAccMap);
if (!bAccept)
{
pOfficeAcceptThread->stopAccepting();
#ifndef LINUX
Desktop::pOfficeAcceptThread->join();
delete pOfficeAcceptThread;
#endif
pOfficeAcceptThread = 0;
// from now on, all new acceptors are enabled
bAccept = sal_True;
// enable existing acceptors by calling initialize(true)
// on all existing acceptors
std::for_each(m_acceptorMap.begin(), m_acceptorMap.end(), enable());
}
}
void Desktop::destroyAcceptor(const OUString& aAcceptString)
{
osl::MutexGuard aGuard(m_mtxAccMap);
// special case stop all acceptors
if (aAcceptString.compareToAscii("all") == 0) {
m_acceptorMap.clear();
} else {
// try to remove acceptor from map
AcceptorMap::const_iterator pIter = m_acceptorMap.find(aAcceptString);
if (pIter != m_acceptorMap.end() ) {
// remove reference from map
// this is the last reference and the acceptor will be destructed
m_acceptorMap.erase(aAcceptString);
} else {
OSL_ENSURE(sal_False, "Found no acceptor to remove");
}
}
}
void Desktop::DeregisterServices()
{
// stop all acceptors by clearing the map
m_acceptorMap.clear();
}
void Desktop::CreateTemporaryDirectory()
{
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createTemporaryDirectory" );
......
......@@ -2,9 +2,9 @@
*
* $RCSfile: cmdlineargs.cxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: cd $ $Date: 2002-10-24 15:39:14 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -156,7 +156,6 @@ void CommandLineArgs::ParseCommandLine_String( const ::rtl::OUString& aCmdLineSt
sal_Bool bForceNewEvent = sal_False;
sal_Int32 nIndex = 0;
do
{
::rtl::OUString aArg = aCmdLineString.getToken( 0, '|', nIndex );
......@@ -208,7 +207,7 @@ void CommandLineArgs::ParseCommandLine_String( const ::rtl::OUString& aCmdLineSt
}
else if ( aArgStr.EqualsIgnoreCaseAscii( "-view" ))
{
// Print to default printer
// open in viewmode
bOpenEvent = sal_False;
bViewEvent = sal_True;
bPrintEvent = sal_False;
......@@ -216,7 +215,6 @@ void CommandLineArgs::ParseCommandLine_String( const ::rtl::OUString& aCmdLineSt
bForceNewEvent = sal_False;
bForceOpenEvent = sal_False;
}
}
else
{
......@@ -231,6 +229,8 @@ void CommandLineArgs::ParseCommandLine_String( const ::rtl::OUString& aCmdLineSt
// handle this argument as a filename
if ( bOpenEvent )
AddStringListParam_Impl( CMD_STRINGPARAM_OPENLIST, aArgStr );
else if ( bViewEvent )
AddStringListParam_Impl( CMD_STRINGPARAM_VIEWLIST, aArgStr );
else if ( bPrintEvent )
AddStringListParam_Impl( CMD_STRINGPARAM_PRINTLIST, aArgStr );
else if ( bPrintToEvent )
......@@ -239,8 +239,6 @@ void CommandLineArgs::ParseCommandLine_String( const ::rtl::OUString& aCmdLineSt
AddStringListParam_Impl( CMD_STRINGPARAM_FORCENEWLIST, aArgStr );
else if ( bForceOpenEvent )
AddStringListParam_Impl( CMD_STRINGPARAM_FORCEOPENLIST, aArgStr );
else if ( bViewEvent )
AddStringListParam_Impl( CMD_STRINGPARAM_VIEWLIST, aArgStr );
}
}
}
......@@ -268,6 +266,11 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
SetBoolParam_Impl( CMD_BOOLPARAM_NORESTORE, sal_True );
return sal_True;
}
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-nodefault" )) == sal_True )
{
SetBoolParam_Impl( CMD_BOOLPARAM_NODEFAULT, sal_True );
return sal_True;
}
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-bean" )) == sal_True )
{
SetBoolParam_Impl( CMD_BOOLPARAM_BEAN, sal_True );
......@@ -310,11 +313,23 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
SetBoolParam_Impl( CMD_BOOLPARAM_NOLOCKCHECK, sal_True );
return sal_True;
}
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-help" ))
|| aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ))
|| aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-?" )))
{
SetBoolParam_Impl( CMD_BOOLPARAM_HELP, sal_True );
return sal_True;
}
else if ( aArgStr.Copy(0, 8).EqualsIgnoreCaseAscii( "-accept=" ))
{
AddStringListParam_Impl( CMD_STRINGPARAM_ACCEPT, aArgStr.Copy( 8 ) );
return sal_True;
}
else if ( aArgStr.Copy(0, 10).EqualsIgnoreCaseAscii( "-unaccept=" ))
{
AddStringListParam_Impl( CMD_STRINGPARAM_UNACCEPT, aArgStr.Copy( 10 ) );
return sal_True;
}
else if ( aArgStr.CompareIgnoreCaseToAscii( "-portal," ,
RTL_CONSTASCII_LENGTH( "-portal," )) == COMPARE_EQUAL )
{
......@@ -323,15 +338,12 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
}
else if ( aArgStr.Copy( 0, 7 ).EqualsIgnoreCaseAscii( "-userid" ))
{
::rtl::OUString aUserId = aArgStr;
sal_Int32 nPos = aUserId.indexOf( '[' );
sal_Int32 nEndpos = aUserId.lastIndexOf( ']' );
if( nPos != -1 && nEndpos != -1 )
if ( aArgStr.Len() > 8 )
{
rtl::OUString aUserDir = aArgStr;
AddStringListParam_Impl(
CMD_STRINGPARAM_USERDIR,
::rtl::Uri::decode( aUserId.copy( nPos + 1, nEndpos - nPos - 1 ),
::rtl::Uri::decode( aUserDir.copy( 8 ),
rtl_UriDecodeWithCharset,
RTL_TEXTENCODING_UTF8 ) );
}
......@@ -347,11 +359,6 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
AddStringListParam_Impl( CMD_STRINGPARAM_VERSION, aArgStr.Copy( 15 ) );
return sal_True;
}
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-master" )) == sal_True )
{
SetBoolParam_Impl( CMD_BOOLPARAM_MASTER, sal_True );
return sal_True;
}
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-writer" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WRITER );
......@@ -420,8 +427,7 @@ sal_Bool CommandLineArgs::CheckGroupMembers( GroupParamId nGroupId, BoolParam nE
void CommandLineArgs::ResetParamValues()
{
int i;
for ( i = 0; i < CMD_BOOLPARAM_COUNT; i++ )
for ( int i = 0; i < CMD_BOOLPARAM_COUNT; i++ )
m_aBoolParams[i] = sal_False;
for ( i = 0; i < CMD_STRINGPARAM_COUNT; i++ )
m_aStrSetParams[i] = sal_False;
......@@ -459,12 +465,6 @@ void CommandLineArgs::SetStringParam( BoolParam eParam, const rtl::OUString& aNe
m_aStrParams[eParam] = aNewValue;
}
sal_Bool CommandLineArgs::IsMaster() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
return m_aBoolParams[ CMD_BOOLPARAM_MASTER ];
}
sal_Bool CommandLineArgs::IsMinimized() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
......@@ -483,6 +483,12 @@ sal_Bool CommandLineArgs::IsNoRestore() const
return m_aBoolParams[ CMD_BOOLPARAM_NORESTORE ];
}
sal_Bool CommandLineArgs::IsNoDefault() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
return m_aBoolParams[ CMD_BOOLPARAM_NODEFAULT ];
}
sal_Bool CommandLineArgs::IsBean() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
......@@ -531,6 +537,12 @@ sal_Bool CommandLineArgs::IsNoLockcheck() const
return m_aBoolParams[ CMD_BOOLPARAM_NOLOCKCHECK ];
}
sal_Bool CommandLineArgs::IsHelp() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
return m_aBoolParams[ CMD_BOOLPARAM_HELP ];
}
sal_Bool CommandLineArgs::IsWriter() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
......@@ -593,6 +605,13 @@ sal_Bool CommandLineArgs::GetAcceptString( ::rtl::OUString& rPara ) const
return m_aStrSetParams[ CMD_STRINGPARAM_ACCEPT ];
}
sal_Bool CommandLineArgs::GetUnAcceptString( ::rtl::OUString& rPara ) const
{
osl::MutexGuard aMutexGuard( m_aMutex );
rPara = m_aStrParams[ CMD_STRINGPARAM_UNACCEPT ];
return m_aStrSetParams[ CMD_STRINGPARAM_UNACCEPT ];
}
sal_Bool CommandLineArgs::GetUserDir( ::rtl::OUString& rPara) const
{
osl::MutexGuard aMutexGuard( m_aMutex );
......@@ -614,18 +633,18 @@ sal_Bool CommandLineArgs::GetOpenList( ::rtl::OUString& rPara) const
return m_aStrSetParams[ CMD_STRINGPARAM_OPENLIST ];
}
sal_Bool CommandLineArgs::GetForceOpenList( ::rtl::OUString& rPara) const
sal_Bool CommandLineArgs::GetViewList( ::rtl::OUString& rPara) const
{
osl::MutexGuard aMutexGuard( m_aMutex );
rPara = m_aStrParams[ CMD_STRINGPARAM_FORCEOPENLIST ];
return m_aStrSetParams[ CMD_STRINGPARAM_FORCEOPENLIST ];
rPara = m_aStrParams[ CMD_STRINGPARAM_VIEWLIST ];
return m_aStrSetParams[ CMD_STRINGPARAM_VIEWLIST ];
}
sal_Bool CommandLineArgs::GetViewList( ::rtl::OUString& rPara) const
sal_Bool CommandLineArgs::GetForceOpenList( ::rtl::OUString& rPara) const
{
osl::MutexGuard aMutexGuard( m_aMutex );
rPara = m_aStrParams[ CMD_STRINGPARAM_VIEWLIST ];
return m_aStrSetParams[ CMD_STRINGPARAM_VIEWLIST ];
rPara = m_aStrParams[ CMD_STRINGPARAM_FORCEOPENLIST ];
return m_aStrSetParams[ CMD_STRINGPARAM_FORCEOPENLIST ];
}
sal_Bool CommandLineArgs::GetForceNewList( ::rtl::OUString& rPara) const
......
......@@ -2,9 +2,9 @@
*
* $RCSfile: cmdlineargs.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: cd $ $Date: 2002-10-24 15:39:22 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -92,7 +92,8 @@ class CommandLineArgs
CMD_BOOLPARAM_TERMINATEAFTERINIT,
CMD_BOOLPARAM_NOLOGO,
CMD_BOOLPARAM_NOLOCKCHECK,
CMD_BOOLPARAM_MASTER,
CMD_BOOLPARAM_NODEFAULT,
CMD_BOOLPARAM_HELP,
CMD_BOOLPARAM_WRITER,
CMD_BOOLPARAM_CALC,
CMD_BOOLPARAM_DRAW,
......@@ -107,11 +108,12 @@ class CommandLineArgs
{
CMD_STRINGPARAM_PORTAL,
CMD_STRINGPARAM_ACCEPT,
CMD_STRINGPARAM_UNACCEPT,
CMD_STRINGPARAM_USERDIR,
CMD_STRINGPARAM_CLIENTDISPLAY,
CMD_STRINGPARAM_OPENLIST,
CMD_STRINGPARAM_FORCEOPENLIST,
CMD_STRINGPARAM_VIEWLIST,
CMD_STRINGPARAM_FORCEOPENLIST,
CMD_STRINGPARAM_FORCENEWLIST,
CMD_STRINGPARAM_PRINTLIST,
CMD_STRINGPARAM_VERSION,
......@@ -138,10 +140,10 @@ class CommandLineArgs
void SetStringParam( BoolParam eParam, const rtl::OUString& bNewValue );
// Access to bool parameters
sal_Bool IsMaster() const;
sal_Bool IsMinimized() const;
sal_Bool IsInvisible() const;
sal_Bool IsNoRestore() const;
sal_Bool IsNoDefault() const;
sal_Bool IsBean() const;
sal_Bool IsPlugin() const;
sal_Bool IsServer() const;
......@@ -150,6 +152,7 @@ class CommandLineArgs
sal_Bool IsTerminateAfterInit() const;
sal_Bool IsNoLogo() const;
sal_Bool IsNoLockcheck() const;
sal_Bool IsHelp() const;
sal_Bool IsWriter() const;
sal_Bool IsCalc() const;
sal_Bool IsDraw() const;
......@@ -162,13 +165,14 @@ class CommandLineArgs
// Access to string parameters
sal_Bool GetPortalConnectString( ::rtl::OUString& rPara) const;
sal_Bool GetAcceptString( ::rtl::OUString& rPara) const;
sal_Bool GetUnAcceptString( ::rtl::OUString& rPara) const;
sal_Bool GetUserDir( ::rtl::OUString& rPara) const;
sal_Bool GetClientDisplay( ::rtl::OUString& rPara) const;
sal_Bool GetOpenList( ::rtl::OUString& rPara) const;
sal_Bool GetViewList( ::rtl::OUString& rPara) const;
sal_Bool GetForceOpenList( ::rtl::OUString& rPara) const;
sal_Bool GetForceNewList( ::rtl::OUString& rPara) const;
sal_Bool GetPrintList( ::rtl::OUString& rPara) const;
sal_Bool GetViewList( ::rtl::OUString& rPara) const;
sal_Bool GetVersionString( ::rtl::OUString& rPara) const;
sal_Bool GetPrintToList( ::rtl::OUString& rPara ) const;
sal_Bool GetPrinterName( ::rtl::OUString& rPara ) const;
......
#include <stdlib.h>
#ifdef UNX
#include <stdio.h>
#endif
#include <sal/types.h>
#include <tools/string.hxx>
#include <vcl/msgbox.hxx>
#include <rtl/bootstrap.hxx>
#include <app.hxx>
#include "desktopresid.hxx"
#include "desktop.hrc"
#include "cmdlinehelp.hxx"
namespace desktop
{
// to be able to display the help nicely in a dialog box with propotional font,
// we need to split it in chunks...
// ___HEAD___
// LEFT RIGHT
// LEFT RIGHT
// LEFT RIGHT
// __BOTTOM__
// [OK]
const char *aCmdLineHelp_head =
"%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION %BUILDID\n"\
"\n"\
"Usage: %CMDNAME [options] [documents...]\n"\
"\n"\
"Options:\n";
const char *aCmdLineHelp_left =
"-minimized \n"\
"-invisible \n"\
"-norestore \n"\
"-quickstart \n"\
"-nologo \n"\
"-nolockcheck \n"\
"-nodefault \n"\
"-headless \n"\
"-help/-h/-? \n"\
"-writer \n"\
"-calc \n"\
"-draw \n"\
"-impress \n"\
"-math \n"\
"-global \n"\
"-web \n"\
"-o \n"\
"-n \n";
const char *aCmdLineHelp_right =
"keep startup bitmap minimized.\n"\
"no startup screen, no default document and no UI.\n"\
"suppress restart/restore after fatal errors.\n"\
"starts the quickstart service\n"\
"don't show startup screen.\n"\
"don't check for remote instances using the installation\n"\
"don't start with an empty document\n"\
"like invisible but no userinteraction at all.\n"\
"show this message and exit.\n"\
"create new text document.\n"\
"create new spreadsheet document.\n"\
"create new drawing.\n"\
"create new presentation.\n"\
"create new formula.\n"\
"create new global document.\n"\
"create new HTML document.\n"\
"open documents regardless whether they are templates or not.\n"\
"always open documents as new files (use as template).\n";
const char *aCmdLineHelp_bottom =
"-display <display>\n"\
" Specify X-Display to use in Unix/X11 versions.\n"
"-p <documents...>\n"\
" print the specified documents on the default printer.\n"\
"-pt <printer> <documents...>\n"\
" print the specified documents on the specified printer.\n"\
"-view <documents...>\n"\
" open the specified documents in viewer-(readonly-)mode.\n"\
"-accept=<accept-string>\n"\
" Specify an UNO connect-string to create an UNO acceptor through which\n"\
" other programs can connect to access the API\n"\
"-unaccept=<accept-sring>\n"\
" Close an acceptor that was created with -accept=<accept-string>\n"\
" Use -unnaccept=all to close all open acceptors\n"\
"Remaining arguments will be treated as filenames or URLs of documents to open.\n";
void ReplaceStringHookProc( UniString& rStr );
void displayCmdlineHelp()
{
// if you put variables in other chunks don't forget to call the replace routines
// for those chunks...
String aHelpMessage_head(aCmdLineHelp_head, RTL_TEXTENCODING_ASCII_US);
String aHelpMessage_left(aCmdLineHelp_left, RTL_TEXTENCODING_ASCII_US);
String aHelpMessage_right(aCmdLineHelp_right, RTL_TEXTENCODING_ASCII_US);
String aHelpMessage_bottom(aCmdLineHelp_bottom, RTL_TEXTENCODING_ASCII_US);
ReplaceStringHookProc(aHelpMessage_head);
::rtl::OUString aDefault;
String aVerId( ::utl::Bootstrap::getBuildIdData( aDefault ));
aHelpMessage_head.SearchAndReplaceAscii( "%BUILDID", aVerId );
aHelpMessage_head.SearchAndReplaceAscii( "%CMDNAME", String( "soffice", RTL_TEXTENCODING_ASCII_US) );
#ifdef UNX
// on unix use console for output
fprintf(stderr, "%s\n", ByteString(aHelpMessage_head,
RTL_TEXTENCODING_ASCII_US).GetBuffer());
// merge left and right column
int n = aHelpMessage_left.GetTokenCount ('\n');
ByteString bsLeft(aHelpMessage_left, RTL_TEXTENCODING_ASCII_US);
ByteString bsRight(aHelpMessage_right, RTL_TEXTENCODING_ASCII_US);
for ( int i = 0; i < n; i++ )
{
fprintf(stderr, "%s", bsLeft.GetToken(i, '\n').GetBuffer());
fprintf(stderr, "%s\n", bsRight.GetToken(i, '\n').GetBuffer());
}
fprintf(stderr, "%s", ByteString(aHelpMessage_bottom,
RTL_TEXTENCODING_ASCII_US).GetBuffer());
#else
// rest gets a dialog box
CmdlineHelpDialog aDlg;
aDlg.m_ftHead.SetText(aHelpMessage_head);
aDlg.m_ftLeft.SetText(aHelpMessage_left);
aDlg.m_ftRight.SetText(aHelpMessage_right);
aDlg.m_ftBottom.SetText(aHelpMessage_bottom);
aDlg.Execute();
#endif
}
CmdlineHelpDialog::CmdlineHelpDialog (void)
: ModalDialog( NULL, DesktopResId( DLG_CMDLINEHELP ) )
, m_ftHead( this, DesktopResId( TXT_DLG_CMDLINEHELP_HEADER ) )
, m_ftLeft( this, DesktopResId( TXT_DLG_CMDLINEHELP_LEFT ) )
, m_ftRight( this, DesktopResId( TXT_DLG_CMDLINEHELP_RIGHT ) )
, m_ftBottom( this, DesktopResId( TXT_DLG_CMDLINEHELP_BOTTOM ) )
, m_btOk( this, DesktopResId( BTN_DLG_CMDLINEHELP_OK ) )
{
FreeResource();
}
}
#ifndef _SV_DIALOG_HXX
#include <vcl/dialog.hxx>
#endif
#ifndef _SV_FIXED_HXX
#include <vcl/fixed.hxx>
#endif
#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
#endif
namespace desktop
{
void displayCmdlineHelp( void );
class CmdlineHelpDialog : public ModalDialog
{
public:
CmdlineHelpDialog ( void );
FixedText m_ftHead;
FixedText m_ftLeft;
FixedText m_ftRight;
FixedText m_ftBottom;
OKButton m_btOk;
};
}
\ No newline at end of file
/*
* copyright text to see as text in the soffice binary
*
*/
extern const char copyright_text_1[] = "Copyright © 2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved.";
extern const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
extern const char copyright_text_21[] = "Copyright © 2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, États-Unis. Tous droits réservés.";
extern const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propriété intellectuels relatants à la technologie incorporée dans ce produit. En particulier, et sans la limitation, ces droits de propriété intellectuels peuvent inclure un ou plus des brevets américains énumérés à http://www.sun.com/patents et un ou les brevets plus supplémentaires ou les applications de brevet en attente dans les États - Unis et les autres pays.";
This diff is collapsed.
......@@ -2,9 +2,9 @@
*
* $RCSfile: desktop.hrc,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: obo $ $Date: 2002-11-22 13:17:10 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -77,6 +77,8 @@
#define WARNINGBOX_JAVALDXNOTSTARTED (RID_DESKTOP_DIALOG_START+5)
#define INFOBOX_PLEASERESTARTOFFICE (RID_DESKTOP_DIALOG_START+50)
#define INFOBOX_CMDLINEHELP (RID_DESKTOP_DIALOG_START+51)
#define INFOBOX_EXPIRED (RID_DESKTOP_DIALOG_START+52)
#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100)
......@@ -87,6 +89,8 @@
#define TXT_DLG_CMDLINEHELP_BOTTOM (RID_DESKTOP_DIALOG_START+105)
#define BTN_DLG_CMDLINEHELP_OK (RID_DESKTOP_DIALOG_START+106)
#define QBX_CONFIG_IMPORTSETTINGS (RID_DESKTOP_DIALOG_START+180)
#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0)
#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1)
#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2)
......@@ -102,16 +106,20 @@
#define STR_BOOTSTRAP_ERR_NO_SERVICE (RID_DESKTOP_STRING_START+120)
#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121)
#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122)
#define STR_ASK_START_SETUP_REPAIR (RID_DESKTOP_STRING_START+150)
#define STR_ASK_START_SETUP (RID_DESKTOP_STRING_START+151)
#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152)
#define STR_SETUP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+160)
#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161)
#define STR_SSO_REQUEST (RID_DESKTOP_STRING_START+170)
#define STR_SSO_RELOGIN (RID_DESKTOP_STRING_START+171)
#define STR_TITLE_CONFIG_MSGBOX (RID_DESKTOP_STRING_START+175)
#define STR_CONFIG_WARN_LOCAL_FALLBACK (RID_DESKTOP_STRING_START+180)
#define STR_CONFIG_WARN_OFFLINE (RID_DESKTOP_STRING_START+181)
#define STR_CONFIG_ERR_SETTINGS_INCOMPLETE (RID_DESKTOP_STRING_START+182)
......@@ -129,5 +137,6 @@
#define STR_WARNING_CANNOTSTARTJVMSETUP (RID_DESKTOP_STRING_START+204)
#define STR_WARNING_CANNOTSTARTJAVALDX (RID_DESKTOP_STRING_START+205)
#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206)
#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207)
#endif // _DESKTOP_HRC_
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,9 +2,9 @@
*
* $RCSfile: dispatchwatcher.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: cd $ $Date: 2002-11-01 10:04:47 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -71,6 +71,12 @@
#include <comphelper/processfactory.hxx>
#endif
#ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_
#include <com/sun/star/util/XCloseable.hpp>
#endif
#ifndef _COM_SUN_STAR_UTIL_CLOSEVETOEXCEPTION_HPP_
#include <com/sun/star/util/CloseVetoException.hpp>
#endif
#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
#include <com/sun/star/task/XInteractionHandler.hpp>
#endif
......@@ -304,7 +310,7 @@ void DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
{
INetURLObject aObj( aName );
if ( aObj.GetProtocol() == INET_PROT_PRIVATE )
aTarget = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") );
aTarget = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_default") );
// Set "AsTemplate" argument according to request type
if ( aDispatchRequest.aRequestType == REQUEST_FORCENEW ||
......@@ -364,9 +370,21 @@ void DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
}
// remove the document
Reference < XComponent > xComp( xDoc, UNO_QUERY );
if ( xComp.is() )
xComp->dispose();
try
{
Reference < XCloseable > xClose( xDoc, UNO_QUERY );
if ( xClose.is() )
xClose->close( sal_True );
else
{
Reference < XComponent > xComp( xDoc, UNO_QUERY );
if ( xComp.is() )
xComp->dispose();
}
}
catch ( com::sun::star::util::CloseVetoException& )
{
}
// request is completed
OfficeIPCThread::RequestsCompleted( 1 );
......
......@@ -2,9 +2,9 @@
*
* $RCSfile: intro.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: cd $ $Date: 2002-11-01 10:06:07 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -84,11 +84,6 @@ void IntroWindow_Impl::Init()
Size aSize = m_aIntroBmp.GetSizePixel();
SetOutputSizePixel( aSize );
Size aScreenSize( GetDesktopRectPixel().GetSize() );
Size aWinSize( GetSizePixel() );
Point aWinPos( ( aScreenSize.Width() - aWinSize.Width() ) / 2,
( aScreenSize.Height() - aWinSize.Height() ) / 2 );
SetPosPixel( aWinPos );
if ( GetColorCount() >= 16 )
{
......@@ -119,7 +114,7 @@ IMPL_LINK( IntroWindow_Impl, AppEventListenerHdl, VclWindowEvent *, inEvent )
// -----------------------------------------------------------------------
IntroWindow_Impl::IntroWindow_Impl( const Bitmap& aIntroBitmap ) :
WorkWindow( NULL, (WinBits)0 ),
IntroWindow(),
m_aIntroBmp( aIntroBitmap )
{
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::IntroWindow_Impl::IntroWindowImpl" );
......
......@@ -2,9 +2,9 @@
*
* $RCSfile: intro.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: cd $ $Date: 2002-11-01 10:06:07 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -64,7 +64,7 @@
// include ---------------------------------------------------------------
#ifndef _SV_WRKWIN_HXX
#include <vcl/wrkwin.hxx>
#include <vcl/introwin.hxx>
#endif
#ifndef _SV_BITMAP_HXX
#include <vcl/bitmap.hxx>
......@@ -74,7 +74,7 @@
namespace desktop
{
class IntroWindow_Impl : public WorkWindow
class IntroWindow_Impl : public IntroWindow
{
private:
Bitmap m_aIntroBmp;
......
......@@ -2,9 +2,9 @@
*
* $RCSfile: lockfile.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: lo $ $Date: 2002-11-06 14:44:49 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -107,7 +107,7 @@ namespace desktop {
int tmpByte = 0;
for (int i = 0; i<nIdBytes; i++) {
tmpByte = rand( ) % 0xFF;
sprintf( tmpId+i*2, "%02X", tmpByte );
sprintf( tmpId+i*2, "%02X", tmpByte ); // #100211# - checked
}
tmpId[nIdBytes*2]=0x00;
m_aId = OUString::createFromAscii( tmpId );
......@@ -134,7 +134,7 @@ namespace desktop {
if (m_bIsLocked) {
// lock existed, ask user what to do
if (execWarning( ) == RET_YES) {
if (isStale() || execWarning( ) == RET_YES) {
// remove file and create new
File::remove( m_aLockname );
File aFile(m_aLockname);
......@@ -154,6 +154,32 @@ namespace desktop {
}
}
sal_Bool Lockfile::isStale( void ) const
{
// this checks whether the lockfile was created on the same
// host by the same user. Should this be the case it is safe
// to assume that it is a stale lookfile which can be overwritten
String aLockname = m_aLockname;
Config aConfig(aLockname);
aConfig.SetGroup(m_aGroup);
ByteString aHost = aConfig.ReadKey( m_aHostkey );
ByteString aUser = aConfig.ReadKey( m_aUserkey );
// lockfile from same host?
oslSocketResult sRes;
ByteString myHost = OUStringToOString(
SocketAddr::getLocalHostname( &sRes ), RTL_TEXTENCODING_ASCII_US );
if (aHost == myHost) {
// lockfile by same UID
OUString myUserName;
Security aSecurity;
aSecurity.getUserName( myUserName );
ByteString myUser = OUStringToOString( myUserName, RTL_TEXTENCODING_ASCII_US );
if (aUser == myUser)
return sal_True;
}
return sal_False;
}
void Lockfile::syncToFile( void ) const
{
String aLockname = m_aLockname;
......
......@@ -2,9 +2,9 @@
*
* $RCSfile: lockfile.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: lo $ $Date: 2002-11-06 14:44:48 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -113,6 +113,7 @@ namespace desktop {
// access to data in file
void syncToFile(void) const;
short execWarning(void) const;
sal_Bool isStale(void) const;
};
}
......@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.21 $
# $Revision: 1.22 $
#
# last change: $Author: cd $ $Date: 2002-11-01 14:49:58 $
# last change: $Author: hr $ $Date: 2003-03-25 13:51:16 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
......@@ -74,65 +74,41 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : $(UPD)minor.mk
RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
.IF "$(BUILD_SOSL)" == ""
CDEFS += "-DTIMEBOMB"
.ELSE
CDEFS += "-DBUILD_SOSL"
.ENDIF
# --- Files --------------------------------------------------------
OBJFILES = \
$(OBJ)$/app.obj \
$(OBJ)$/lockfile.obj \
$(OBJ)$/intro.obj \
$(OBJ)$/officeipcthread.obj \
$(OBJ)$/appinit.obj \
$(OBJ)$/cmdlineargs.obj \
$(OBJ)$/pluginacceptthread.obj \
$(OBJ)$/officeacceptthread.obj \
$(OBJ)$/oinstanceprovider.obj \
$(OBJ)$/opluginframefactory.obj \
$(OBJ)$/appsys.obj \
$(OBJ)$/desktopresid.obj \
$(OBJ)$/dispatchwatcher.obj \
$(OBJ)$/ssodlg.obj \
$(OBJ)$/ssoinit.obj \
$(OBJ)$/configinit.obj \
$(OBJ)$/officeipcmanager.obj \
$(OBJ)$/app.obj \
$(OBJ)$/copyright_ascii_sun.obj \
$(OBJ)$/copyright_ascii_ooo.obj \
$(OBJ)$/lockfile.obj \
$(OBJ)$/intro.obj \
$(OBJ)$/officeipcthread.obj \
$(OBJ)$/appinit.obj \
$(OBJ)$/cmdlineargs.obj \
$(OBJ)$/oinstanceprovider.obj \
$(OBJ)$/opluginframefactory.obj \
$(OBJ)$/appsys.obj \
$(OBJ)$/desktopresid.obj \
$(OBJ)$/dispatchwatcher.obj \
$(OBJ)$/ssodlg.obj \
$(OBJ)$/ssoinit.obj \
$(OBJ)$/configinit.obj \
$(OBJ)$/javainteractionhandler.obj \
$(OBJ)$/oempreload.obj \
$(OBJ)$/testtool.obj \
$(OBJ)$/checkinstall.obj
.IF "$(OS)" == "SOLARIS"
SLOFILES = \
$(SLO)$/app.obj \
$(SLO)$/intro.obj \
$(SLO)$/officeipcthread.obj \
$(SLO)$/appinit.obj \
$(SLO)$/cmdlineargs.obj \
$(SLO)$/pluginacceptthread.obj \
$(SLO)$/officeacceptthread.obj \
$(SLO)$/oinstanceprovider.obj \
$(SLO)$/opluginframefactory.obj \
$(SLO)$/appsys.obj \
$(SLO)$/desktopresid.obj \
$(SLO)$/dispatchwatcher.obj \
$(SLO)$/ssodlg.obj \
$(SLO)$/ssoinit.obj \
$(SLO)$/configinit.obj \
$(SLO)$/officeipcmanager.obj \
$(SLO)$/javainteractionhandler.obj \
$(SLO)$/lockfile.obj \
$(SLO)$/oempreload.obj \
$(SLO)$/testtool.obj \
$(SLO)$/checkinstall.obj
$(OBJ)$/oempreload.obj \
$(OBJ)$/testtool.obj \
$(OBJ)$/checkinstall.obj \
$(OBJ)$/cmdlinehelp.obj
.IF "$(GUI)" == "UNX"
.IF "$(OS)" != "MACOSX"
OBJFILES+= $(OBJ)$/icon_resource_ooo.obj \
$(OBJ)$/icon_resource_sun.obj
.ENDIF
.ENDIF
SRC1FILES= desktop.src
SRC1FILES= desktop.src \
ssodlg.src
SRS1NAME= desktop
# --- Targets ------------------------------------------------------
......
......@@ -2,9 +2,9 @@
*
* $RCSfile: officeipcthread.hxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: lo $ $Date: 2002-10-17 10:46:33 $
* last change: $Author: hr $ $Date: 2003-03-25 13:51:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -72,11 +72,9 @@
#ifndef _VOS_PIPE_HXX_
#include <vos/pipe.hxx>
#endif
#ifndef SOLARIS
#ifndef _VOS_SECURITY_HXX_
#include <vos/security.hxx>
#endif
#endif
#ifndef _VOS_THREAD_HXX_
#include <vos/thread.hxx>
#endif
......@@ -106,14 +104,13 @@ class SalMainPipeExchangeSignalHandler : public vos::OSignalHandler
struct ProcessDocumentsRequest
{
::rtl::OUString aOpenList; // Documents that should be opened in the default way
::rtl::OUString aViewList; // Documents that should be opened in viewmode
::rtl::OUString aViewList; // Documents that should be opened in viewmode
::rtl::OUString aPrintList; // Documents that should be printed on default printer
::rtl::OUString aForceOpenList; // Documents that should be forced to open for editing (even templates)
::rtl::OUString aForceNewList; // Documents that should be forced to create a new document
::rtl::OUString aPrinterName; // The printer name that should be used for printing
::rtl::OUString aPrintToList; // Documents that should be printed on the given printer
::osl::Condition cProcessed; // condition to be set when the request has been processed
};
class DispatchWatcher;
......@@ -125,9 +122,7 @@ class OfficeIPCThread : public vos::OThread
vos::OPipe maPipe;
vos::OStreamPipe maStreamPipe;
#ifndef SOLARIS
static vos::OSecurity maSecurity;
#endif
rtl::OUString maPipeIdent;
sal_Bool mbBlockRequests;
int mnPendingRequests;
......@@ -135,7 +130,6 @@ class OfficeIPCThread : public vos::OThread
sal_Bool mbShutdownInProgress;
static ::osl::Mutex& GetMutex();
static const char *sc_aTerminationSequence;
static const int sc_nTSeqLength;
static const char *sc_aShowSequence;
......@@ -167,12 +161,7 @@ class OfficeIPCThread : public vos::OThread
static void ExecuteCmdLineRequests( ProcessDocumentsRequest& );
// return FALSE if second office
#ifdef SOLARIS
static Status EnableOfficeIPCThread(
sal_Bool useParent = sal_True );
#else
static Status EnableOfficeIPCThread();
#endif
static void DisableOfficeIPCThread();
};
......
This diff is collapsed.
/*************************************************************************
*
* $RCSfile: acceptor.hxx,v $
*
* $Revision: 1.2 $
*
* last change: $Author: hr $ $Date: 2003-03-25 13:52:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
*
* - GNU Lesser General Public License Version 2.1
* - Sun Industry Standards Source License Version 1.1
*
* Sun Microsystems Inc., October, 2000
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library 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 for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
*
* Sun Industry Standards Source License Version 1.1
* =================================================
* The contents of this file are subject to the Sun Industry Standards
* Source License Version 1.1 (the "License"); You may not use this file
* except in compliance with the License. You may obtain a copy of the
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
*
************************************************************************/
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
#endif
#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP_
#include <com/sun/star/uno/Exception.hpp>
#endif
#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
#include <com/sun/star/uno/Reference.h>
#endif
#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
#include <com/sun/star/lang/XComponent.hpp>
#endif
#ifndef _COM_SUN_STAR_CONNECTION_XACCEPTOR_HPP_
#include <com/sun/star/connection/XAcceptor.hpp>
#endif
#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
#include <com/sun/star/lang/XInitialization.hpp>
#endif
#ifndef _COM_SUN_STAR_BRIDGE_XINSTANCEPROVIDER_HPP_
#include <com/sun/star/bridge/XInstanceProvider.hpp>
#endif
#ifndef _COM_SUN_STAR_BRIDGE_XBRIDGEFACTORY_HPP_
#include <com/sun/star/bridge/XBridgeFactory.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
#endif
#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase1.hxx>
#endif
#ifndef _CPPUHELPER_IMPLBASE2_HXX_
#include <cppuhelper/implbase2.hxx>
#endif
#ifndef _CPPUHELPER_INTERFACECONTAINER_H_
#include <cppuhelper/interfacecontainer.h>
#endif
#ifndef _SFX_HELP_HXX
#include <sfx2/sfxhelp.hxx>
#endif
#ifndef _SFX_UNO_HXX
#include <sfx2/sfxuno.hxx>
#endif
#ifndef _RTL_LOGFILE_HXX_
#include <rtl/logfile.hxx>
#endif
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::bridge;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::connection;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::registry;
namespace desktop {
class Acceptor
: public ::cppu::WeakImplHelper2<XServiceInfo, XInitialization>
{
private:
static const sal_Char *serviceName;
static const sal_Char *implementationName;
static const sal_Char *supportedServiceNames[];
static Mutex m_aMutex;
Condition m_cEnable;
Reference< XMultiServiceFactory > m_rSMgr;
Reference< XInterface > m_rContext;
Reference< XAcceptor > m_rAcceptor;
Reference< XBridgeFactory > m_rBridgeFactory;
OUString m_aAcceptString;
OUString m_aConnectString;
OUString m_aProtocol;
sal_Bool m_bInit;
oslThread m_aThread;
public:
Acceptor( const Reference< XMultiServiceFactory >& aFactory );
virtual ~Acceptor();
void SAL_CALL run();
// XService info
static OUString impl_getImplementationName();
virtual OUString SAL_CALL getImplementationName()
throw (RuntimeException);
static Sequence<OUString> impl_getSupportedServiceNames();
virtual Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (RuntimeException);
static sal_Bool impl_supportsService( const OUString& aName );
virtual sal_Bool SAL_CALL supportsService( const OUString& aName )
throw (RuntimeException);
// XInitialize
virtual void SAL_CALL initialize( const Sequence<Any>& aArguments )
throw ( Exception );
static Reference<XInterface> impl_getInstance( const Reference< XMultiServiceFactory >& aFactory );
};
class AccInstanceProvider : public ::cppu::WeakImplHelper1<XInstanceProvider>
{
private:
Reference<XMultiServiceFactory> m_rSMgr;
Reference<XConnection> m_rConnection;
public:
AccInstanceProvider(const Reference< XMultiServiceFactory >& aFactory,
const Reference< XConnection >& rConnection);
virtual ~AccInstanceProvider();
// XInstanceProvider
virtual Reference<XInterface> SAL_CALL getInstance (const OUString& aName )
throw ( NoSuchElementException );
};
} //namespace desktop
#*************************************************************************
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
#
# last change: $Author: hr $ $Date: 2003-03-25 13:52:41 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
#
# - GNU Lesser General Public License Version 2.1
# - Sun Industry Standards Source License Version 1.1
#
# Sun Microsystems Inc., October, 2000
#
# GNU Lesser General Public License Version 2.1
# =============================================
# Copyright 2000 by Sun Microsystems, Inc.
# 901 San Antonio Road, Palo Alto, CA 94303, USA
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License version 2.1, as published by the Free Software Foundation.
#
# This library 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 for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
#
# Sun Industry Standards Source License Version 1.1
# =================================================
# The contents of this file are subject to the Sun Industry Standards
# Source License Version 1.1 (the "License"); You may not use this file
# except in compliance with the License. You may obtain a copy of the
# License at http://www.openoffice.org/license.html.
#
# Software provided under this License is provided on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
# See the License for the specific provisions governing your rights and
# obligations concerning the Software.
#
# The Initial Developer of the Original Code is: Sun Microsystems, Inc.
#
# Copyright: 2000 by Sun Microsystems, Inc.
#
# All Rights Reserved.
#
# Contributor(s): _______________________________________
#
#
#
#*************************************************************************
PRJ=..$/..
PRJNAME=officeacceptor
TARGET=offacc
LIBTARGET=NO
AUTOSEG=true
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : $(UPD)minor.mk
RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
# --- Files --------------------------------------------------------
SLOFILES = $(SLO)$/acceptor.obj
SHL1OBJS= $(SLOFILES)
SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
SHL1IMPLIB= ispl
SHL1STDLIBS= \
$(SFX2LIB) \
$(FWELIB) \
$(BASICLIB) \
$(SO2LIB) \
$(SJLIB) \
$(TKLIB) \
$(SVTOOLLIB) \
$(SVLLIB) \
$(SVMEMLIB) \
$(OFALIB) \
$(ONELIB) \
$(VCLLIB) \
$(SOTLIB) \
$(SALLIB) \
$(VOSLIB) \
$(TOOLSLIB) \
$(UNOLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SCHLIB) \
$(SMLIB) \
$(SWLIB) \
$(SDLIB) \
$(SCLIB) \
$(SVXLIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB)
SHL1DEPN= makefile.mk
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
# --- Targets ------------------------------------------------------
.IF "$(depend)" != ""
SRCFILES=$(SRC1FILES)
.ENDIF
.INCLUDE : target.mk
??0UNO_PackagesManager@pkgchk@@QAE@ABVBootstrap@rtl@@_N11ABVOUString@3@@Z
??1UNO_PackagesManager@pkgchk@@QAE@XZ
?balance@UNO_PackagesManager@pkgchk@@QAEXXZ
?check@UNO_PackagesManager@pkgchk@@QAE_NXZ
?copy@UNO_PackagesManager@pkgchk@@QAEXABVOUString@rtl@@@Z
?remove_all@UNO_PackagesManager@pkgchk@@QAEXXZ
??0Exception@uno@star@sun@com@@QAE@ABV01234@@Z
??0RuntimeException@uno@star@sun@com@@QAE@ABV01234@@Z
??1OUString@rtl@@QAE@XZ
??1RuntimeException@uno@star@sun@com@@QAE@XZ
??H@YA?AVOUString@rtl@@ABV01@0@Z
??_C@_0BN@FLDH@com?4sun?4star?4lang?4XComponent?$AA@
??_C@_0BP@FGMI@?$CD?$CD?$CD?5illegal?5index?5of?5sequence?$CB?$AA@
??_C@_0CA@BHCN@com?4sun?4star?4beans?4XPropertySet?$AA@
??_C@_0CD@DEHE@com?4sun?4star?4uno?4XComponentConte@
??_C@_0CD@DPHI@com?4sun?4star?4ucb?4XSimpleFileAcce@
??_C@_0CG@JHKC@com?4sun?4star?4registry?4XSimpleReg@
??_C@_0CH@OMML@com?4sun?4star?4lang?4XMultiServiceF@
??_C@_0DC@BHBK@com?4sun?4star?4registry?4XImplement@
??_C@_0DF@MFLN@o?3?2SRX643?2wntmsci7?2inc?2com?1sun?1s@
??_R0?AVException@uno@star@sun@com@@@8
??_R0?AVRuntimeException@uno@star@sun@com@@@8
?OUStringToOString@rtl@@YA?AVOString@1@ABVOUString@1@GK@Z
?concat@OUString@rtl@@QBE?AV12@ABV12@@Z
?cpp_acquire@uno@star@sun@com@@YAXPAX@Z
?cpp_release@uno@star@sun@com@@YAXPAX@Z
?makeStringAndClear@OUStringBuffer@rtl@@QAE?AVOUString@2@XZ
?path_concat@pkgchk@@YA?AVOUString@rtl@@ABV23@PBDJ@Z
__CT??_R0?AVException@uno@star@sun@com@@@8??0Exception@uno@star@sun@com@@QAE@ABV01234@@Z8
__CT??_R0?AVRuntimeException@uno@star@sun@com@@@8??0RuntimeException@uno@star@sun@com@@QAE@ABV01234@@Z8
__CTA2?AVRuntimeException@uno@star@sun@com@@
??1OString@rtl@@QAE@XZ
??1OStringBuffer@rtl@@QAE@XZ
?makeStringAndClear@OStringBuffer@rtl@@QAE?AVOString@2@XZ
??0OUString@rtl@@QAE@ABV01@@Z
??1OUStringBuffer@rtl@@QAE@XZ
?append@OStringBuffer@rtl@@QAEAAV12@PBDJ@Z
?append@OUStringBuffer@rtl@@QAEAAV12@PBGJ@Z
?close@File@osl@@QAE?AW4RC@FileBase@2@XZ
?compareTo@OUString@rtl@@QBEJABV12@@Z
?getToken@OString@rtl@@QBE?AV12@JDAAJ@Z
?trim@OString@rtl@@QBE?AV12@XZ
??1InputSource@sax@xml@star@sun@com@@QAE@XZ
??_C@_0BN@DOLA@com?4sun?4star?4xml?4sax?4XParser?$AA@
??_C@_0CC@INEH@com?4sun?4star?4io?4XActiveDataSourc@
??_C@_0CO@KDMD@com?4sun?4star?4xml?4sax?4XExtendedDo@
?copy@OUString@rtl@@QBE?AV12@JJ@Z
?get@DirectoryItem@osl@@SA?AW4RC@FileBase@2@ABVOUString@rtl@@AAV12@@Z
??1Directory@osl@@QAE@XZ
??1DirectoryItem@osl@@QAE@XZ
??1FileStatus@osl@@QAE@XZ
??_C@_0M@LMHD@?1dialog?4xlb?$AA@
??_R0?AVCannotRegisterImplementationException@registry@star@sun@com@@@8
??_R0?AVInvalidRegistryException@registry@star@sun@com@@@8
??_R0?AVMergeConflictException@registry@star@sun@com@@@8
?appendAscii@OUStringBuffer@rtl@@QAEAAV12@PBDJ@Z
?close@Directory@osl@@QAE?AW4RC@FileBase@2@XZ
?copy@OUString@rtl@@QBE?AV12@J@Z
?ends_with_ignore_ascii_case@pkgchk@@YA_NABVOUString@rtl@@PBDJ@Z
?equalsIgnoreAsciiCase@OUString@rtl@@QBEEABV12@@Z
?getFileURL@FileStatus@osl@@QBE?AVOUString@rtl@@XZ
?lastIndexOf@OUString@rtl@@QBEJG@Z
?path_concat@pkgchk@@YA?AVOUString@rtl@@ABV23@0@Z
?path_exists@pkgchk@@YA_NABVOUString@rtl@@@Z
?valueOf@OUString@rtl@@SA?AV12@_JF@Z
??1File@osl@@QAE@XZ
??_GOString@rtl@@QAEPAXI@Z
?check_unorc@pkgchk@@YAXPAPAX_N1@Z
?copy@OString@rtl@@QBE?AV12@J@Z
?getToken@OUString@rtl@@QBE?AV12@JGAAJ@Z
?trim@OUString@rtl@@QBE?AV12@XZ
??0Any@uno@star@sun@com@@QAE@ABV01234@@Z
??1Command@ucb@star@sun@com@@QAE@XZ
??1GlobalTransferCommandArgument@ucb@star@sun@com@@QAE@XZ
??_C@_0CP@NJPE@com?4sun?4star?4ucb?4GlobalTransferC@
??_R0?AVCommandAbortedException@ucb@star@sun@com@@@8
?dir_create@pkgchk@@YAXABVOUString@rtl@@@Z
?dir_open@pkgchk@@YAXAAVDirectory@osl@@ABVOUString@rtl@@_N@Z
?diritem_get_status@pkgchk@@YAXPAVFileStatus@osl@@AAVDirectoryItem@3@@Z
?encode@Uri@rtl@@SA?AVOUString@2@ABV32@PBEW4rtl_UriEncodeMechanism@@G@Z
?file_status_get_encoded_name@pkgchk@@YA?AVOUString@rtl@@ABVFileStatus@osl@@@Z
?file_write@pkgchk@@YAXPAXABVOString@rtl@@ABVOUString@3@@Z
?getFileName@FileStatus@osl@@QBE?AVOUString@rtl@@XZ
?getFromBstrap@pkgchk@@YA?AVOUString@rtl@@ABV23@ABVBootstrap@3@@Z
?makeAny@uno@star@sun@com@@YA?AVAny@1234@ABUGlobalTransferCommandArgument@ucb@234@@Z
?office_is_running@pkgchk@@YA_NABVBootstrap@rtl@@@Z
?path_get_executable@pkgchk@@YAABVOUString@rtl@@XZ
?path_get_status@pkgchk@@YA_NPAVFileStatus@osl@@ABVOUString@rtl@@@Z
?path_make_absolute@pkgchk@@YA?AVOUString@rtl@@ABV23@@Z
?append@OUStringBuffer@rtl@@QAEAAV12@ABVOUString@2@@Z
??_C@_0DF@GJJM@o?3?2SRC659?2wntmsci7?2inc?2com?1sun?1s@
??0OUString@rtl@@QAE@PBDJGK@Z
??_C@_0DF@HDNL@o?3?2SRC660?2wntmsci7?2inc?2com?1sun?1s@
??_C@_0DF@HIAK@o?3?2SRC661?2wntmsci7?2inc?2com?1sun?1s@
??_C@_0DF@PCBN@o?3?2SRC641?2wntmsci7?2inc?2com?1sun?1s@
??_C@_0DF@GEHJ@o?3?2SRC662?2wntmsci7?2inc?2com?1sun?1s@
??_C@_0DF@GPKI@o?3?2SRC663?2wntmsci7?2inc?2com?1sun?1s@
??0UNO_PackagesManager@pkgchk@@QAE@ABVBootstrap@rtl@@ABVOptionsContainer@1@@Z
??1OptionsContainer@pkgchk@@UAE@XZ
??_7OptionsContainer@pkgchk@@6B@
??_GOptionsContainer@pkgchk@@UAEPAXI@Z
?get_argument@OptionsContainer@pkgchk@@UBE_NPAVAny@uno@star@sun@com@@ABVOUString@rtl@@G@Z
?get_option@OptionsContainer@pkgchk@@UBE_NABVOUString@rtl@@G@Z
??1Any@uno@star@sun@com@@QAE@XZ
??_C@_0DF@FMJO@o?3?2SRC664?2wntmsci7?2inc?2com?1sun?1s@
??_C@_0DF@FHEP@o?3?2SRC665?2wntmsci7?2inc?2com?1sun?1s@
?path_get_status@pkgchk@@YAXPAVFileStatus@osl@@ABVOUString@rtl@@@Z
......@@ -2,9 +2,9 @@
*
* $RCSfile: evaluation.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: cd $ $Date: 2002-11-01 09:43:28 $
* last change: $Author: hr $ $Date: 2003-03-25 13:52:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -86,6 +86,14 @@
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
#endif
#ifndef _TOOLS_RESMGR_HXX
#include <tools/resmgr.hxx>
#endif
#ifndef _TOOLS_RESID_HXX
#include <tools/resid.hxx>
#endif
#include "../app/desktop.hrc"
using namespace rtl;
using namespace ::com::sun::star::uno;
......@@ -266,8 +274,23 @@ rtl::OUString SAL_CALL SOEvaluation::getExactName( const rtl::OUString& rApproxi
if ( bExpired )
{
InfoBox aBox( NULL, aTitle );
aBox.Execute();
// get destop resource manager
ResMgr* pResMgr = ResMgr::CreateResMgr(
OString("dkt")+OString::valueOf((long int)SUPD));
InfoBox* pBox;
if(pResMgr != NULL){
pBox = new InfoBox( NULL, ResId(INFOBOX_EXPIRED, pResMgr));
String aText(ResId(STR_TITLE_EXPIRED, pResMgr));
pBox->SetText(aText);
} else {
pBox = new InfoBox( NULL, aTitle);
}
pBox->Execute();
delete pBox;
delete pResMgr;
throw RuntimeException();
}
......@@ -280,11 +303,15 @@ Any SAL_CALL SOEvaluation::getMaterial() throw( RuntimeException )
// Time bomb implementation. Return empty Any to do nothing or
// provide a com::sun::star::util::Date with the time bomb date.
Any a;
/*
// Code for providing time bomb date!
com::sun::star::util::Date aDate( 31, 03, 2003 );
#ifdef TIMEBOMB
// Code for extracting/providing time bomb date!
int nDay = TIMEBOMB % 100;
int nMonth = ( TIMEBOMB % 10000 ) / 100;
int nYear = TIMEBOMB / 10000;
com::sun::star::util::Date aDate( nDay, nMonth, nYear );
a <<= aDate;
*/
#endif
return a;
}
......
......@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.1 $
# $Revision: 1.2 $
#
# last change: $Author: cd $ $Date: 2002-11-01 09:43:29 $
# last change: $Author: hr $ $Date: 2003-03-25 13:52:48 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
......@@ -74,6 +74,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : $(UPD)minor.mk
RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
# --- Define time bomb date. Not active for OOo --------------------
# --- You must use the yyyymmdd format!!! --------------------------
CDEFS+=-DTIMEBOMB=20030930
# --- Files --------------------------------------------------------
SLOFILES = $(SLO)$/evaluation.obj
......
#*************************************************************************
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
#
# last change: $Author: hr $ $Date: 2003-03-25 13:52:50 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
#
# - GNU Lesser General Public License Version 2.1
# - Sun Industry Standards Source License Version 1.1
#
# Sun Microsystems Inc., October, 2000
#
# GNU Lesser General Public License Version 2.1
# =============================================
# Copyright 2000 by Sun Microsystems, Inc.
# 901 San Antonio Road, Palo Alto, CA 94303, USA
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License version 2.1, as published by the Free Software Foundation.
#
# This library 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 for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
#
# Sun Industry Standards Source License Version 1.1
# =================================================
# The contents of this file are subject to the Sun Industry Standards
# Source License Version 1.1 (the "License"); You may not use this file
# except in compliance with the License. You may obtain a copy of the
# License at http://www.openoffice.org/license.html.
#
# Software provided under this License is provided on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
# See the License for the specific provisions governing your rights and
# obligations concerning the Software.
#
# The Initial Developer of the Original Code is: Sun Microsystems, Inc.
#
# Copyright: 2000 by Sun Microsystems, Inc.
#
# All Rights Reserved.
#
# Contributor(s): _______________________________________
#
#
#
#*************************************************************************
PRJ=..$/..
PRJNAME=splashscreen
TARGET=spl
LIBTARGET=NO
AUTOSEG=true
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : $(UPD)minor.mk
RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR))
# --- Files --------------------------------------------------------
SLOFILES = $(SLO)$/splash.obj
SHL1OBJS= $(SLOFILES)
SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
SHL1IMPLIB= ispl
SHL1STDLIBS= \
$(SFX2LIB) \
$(FWELIB) \
$(BASICLIB) \
$(SO2LIB) \
$(SJLIB) \
$(TKLIB) \
$(SVTOOLLIB) \
$(SVLLIB) \
$(SVMEMLIB) \
$(OFALIB) \
$(ONELIB) \
$(VCLLIB) \
$(SOTLIB) \
$(SALLIB) \
$(VOSLIB) \
$(TOOLSLIB) \
$(UNOLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SCHLIB) \
$(SMLIB) \
$(SWLIB) \
$(SDLIB) \
$(SCLIB) \
$(SVXLIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB)
SHL1DEPN= makefile.mk
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
# --- Targets ------------------------------------------------------
.IF "$(depend)" != ""
SRCFILES=$(SRC1FILES)
.ENDIF
.INCLUDE : target.mk
This diff is collapsed.
/*************************************************************************
*
* $RCSfile: splash.hxx,v $
*
* $Revision: 1.2 $
*
* last change: $Author: hr $ $Date: 2003-03-25 13:52:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
*
* - GNU Lesser General Public License Version 2.1
* - Sun Industry Standards Source License Version 1.1
*
* Sun Microsystems Inc., October, 2000
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library 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 for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
*
* Sun Industry Standards Source License Version 1.1
* =================================================
* The contents of this file are subject to the Sun Industry Standards
* Source License Version 1.1 (the "License"); You may not use this file
* except in compliance with the License. You may obtain a copy of the
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
*
************************************************************************/
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
#endif
#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP_
#include <com/sun/star/uno/Exception.hpp>
#endif
#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
#include <com/sun/star/uno/Reference.h>
#endif
#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
#include <com/sun/star/lang/XComponent.hpp>
#endif
#ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATOR_HPP_
#include <com/sun/star/task/XStatusIndicator.hpp>
#endif
#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
#include <com/sun/star/lang/XInitialization.hpp>
#endif
#ifndef _CPPUHELPER_IMPLBASE2_HXX_
#include <cppuhelper/implbase2.hxx>
#endif
#ifndef _CPPUHELPER_INTERFACECONTAINER_H_
#include <cppuhelper/interfacecontainer.h>
#endif
#ifndef _SFX_HELP_HXX
#include <sfx2/sfxhelp.hxx>
#endif
#ifndef _SV_INTROWIN_HXX
#include <vcl/introwin.hxx>
#endif
#ifndef _SV_BITMAP_HXX
#include <vcl/bitmap.hxx>
#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <osl/mutex.hxx>
#include <sfx2/sfxuno.hxx>
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::task;
namespace desktop {
class SplashScreen
: public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization >
, public IntroWindow
{
private:
// don't allow anybody but ourselves to create instances of this class
SplashScreen(const SplashScreen&);
SplashScreen(void);
operator =(const SplashScreen&);
SplashScreen(const Reference< XMultiServiceFactory >& xFactory);
DECL_LINK( AppEventListenerHdl, VclWindowEvent * );
virtual ~SplashScreen();
void initBitmap();
void updateStatus();
static SplashScreen *_pINSTANCE;
static const sal_Char *serviceName;
static const sal_Char *implementationName;
static const sal_Char *supportedServiceNames[];
static osl::Mutex _aMutex;
Reference< XMultiServiceFactory > _rFactory;
Bitmap _aIntroBmp;
sal_Int32 _iMax;
sal_Int32 _iProgress;
sal_Bool _bPaintBitmap;
sal_Bool _bPaintProgress;
sal_Bool _bVisible;
long _height, _width, _tlx, _tly, _barwidth;
const long _xoffset, _yoffset, _barheight, _barspace;
public:
static Reference< XInterface > getInstance(const Reference < XMultiServiceFactory >& xFactory);
// static service info
static OUString impl_getImplementationName();
static Sequence<OUString> impl_getSupportedServiceNames();
// XStatusIndicator
virtual void SAL_CALL end() throw ( RuntimeException );
virtual void SAL_CALL reset() throw ( RuntimeException );
virtual void SAL_CALL setText(const OUString& aText) throw ( RuntimeException );
virtual void SAL_CALL setValue(sal_Int32 nValue) throw ( RuntimeException );
virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw ( RuntimeException );
// XInitialize
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
throw ( RuntimeException );
// workwindow
virtual void Paint( const Rectangle& );
};
}
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice" type="win32" />
<description>http://www.openoffice.org</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="x86"/>
</dependentAssembly>
</dependency>
</assembly>
......@@ -2,9 +2,9 @@
#
# $RCSfile: verinfo.rc,v $
#
# $Revision: 1.8 $
# $Revision: 1.9 $
#
# last change: $Author: hro $ $Date: 2002-11-29 11:39:47 $
# last change: $Author: hr $ $Date: 2003-03-25 13:52:54 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
......@@ -198,4 +198,3 @@ VS_VERSION_INFO rcdata
17 ICON "icons\\017_macrolibrary.ico"
18 ICON "icons\\018_configuration.ico"
19 ICON "icons\\019_open_document.ico"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment