[Libreoffice-commits] .: 3 commits - desktop/win32 framework/inc framework/qa framework/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue Mar 29 13:34:30 PDT 2011
desktop/win32/source/officeloader/officeloader.cxx | 7 +-
framework/inc/commands.h | 58 -----------------
framework/qa/complex/broken_document/LoadDocument.java | 2
framework/source/classes/framecontainer.cxx | 2
framework/source/services/autorecovery.cxx | 4 -
5 files changed, 8 insertions(+), 65 deletions(-)
New commits:
commit ba4357c5d1009bf13ec326bfd9d72973f7aab0ff
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 29 14:04:20 2011 -0500
cosmetic comments change regarding using --xxx instead of -xxx
diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java
index 789544c..c003ca5 100755
--- a/framework/qa/complex/broken_document/LoadDocument.java
+++ b/framework/qa/complex/broken_document/LoadDocument.java
@@ -62,7 +62,7 @@ public class LoadDocument {
// }
/**
- * Start Office with "-headless" parameter, then
+ * Start Office with "--headless" parameter, then
* load the broken document "dbf.dbf.emf", that brings a message box up in
* the ui, see if the headless mode of SOffice changes.
*/
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 9b77c6b..3420a4f 100755
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -840,7 +840,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
WriteGuard aWriteLock(m_aLock);
// Changes of the configuration must be ignored if AutoSave/Recovery was disabled for this
- // office session. That can happen if e.g. the command line arguments "-norestore" or "-headless"
+ // office session. That can happen if e.g. the command line arguments "--norestore" or "--headless"
// was set.
if ((m_eJob & AutoRecovery::E_DISABLE_AUTORECOVERY) == AutoRecovery::E_DISABLE_AUTORECOVERY)
return;
@@ -1530,7 +1530,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
implts_stopTimer();
// The timer must be ignored if AutoSave/Recovery was disabled for this
- // office session. That can happen if e.g. the command line arguments "-norestore" or "-headless"
+ // office session. That can happen if e.g. the command line arguments "--norestore" or "--headless"
// was set. But normaly the timer was disabled if recovery was disabled ...
// But so we are more "safe" .-)
// SAFE -> ----------------------------------
commit 127deb15f47d4e99cf1b6e7c6f124a19f70721ba
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 29 14:03:49 2011 -0500
support --headless
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 0654e0d..f61b562 100755
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -356,7 +356,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
BOOL bHeadlessMode( FALSE );
{
- // Check command line arguments for "-headless" parameter. We only
+ // Check command line arguments for "--headless" parameter. We only
// set the environment variable "ATTACHED_PARENT_PROCESSID" for the headless
// mode as self-destruction of the soffice.bin process can lead to
// certain side-effects (log-off can result in data-loss, ".lock" is not deleted.
@@ -370,8 +370,11 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
for ( n = 1; n < argc; n++ )
{
- if ( 0 == _tcsnicmp( argv[n], _T("-headless"), 9 ) )
+ if ( 0 == _tcsnicmp( argv[n], _T("-headless"), 9 ) ||
+ 0 == _tcsnicmp( argv[n], _T("--headless"), 9 ) )
+ {
bHeadlessMode = TRUE;
+ }
}
}
}
commit 63dd80a32801d4e9353f3499038751e46e93c5c3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 29 14:03:31 2011 -0500
binned inc/command.h, not used and defined "-headless" vs --headless
diff --git a/framework/inc/commands.h b/framework/inc/commands.h
deleted file mode 100755
index a5a064e..0000000
--- a/framework/inc/commands.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_COMMANDS_H_
-#define __FRAMEWORK_COMMANDS_H_
-
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
-
-#include <macros/generic.hxx>
-#include <rtl/ustring.hxx>
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-/*-************************************************************************************************************//**
- @short These values describe some command line arguments of our office.
- We need it e.g. to detect running mode of it - plugin, headless ...
-*//*-*************************************************************************************************************/
-
-#define COMMAND_PLUGIN DECLARE_ASCII("-plugin" ) /// office is plugged into a browser
-#define COMMAND_HEADLESS DECLARE_ASCII("-headless" ) /// office runs in headless mode for scripting
-#define COMMAND_INVISIBLE DECLARE_ASCII("-invisible" ) /// office runs in invisible mode which supress splash screen and first empry document
-#define COMMAND_SERVER DECLARE_ASCII("-server" ) /// office runs as server
-} // namespace framework
-
-#endif // #ifndef __FRAMEWORK_TARGETS_H_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index dc79ae4..ddf923c 100755
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -37,8 +37,6 @@
#include <threadhelp/writeguard.hxx>
#include <threadhelp/readguard.hxx>
-#include <commands.h>
-
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
More information about the Libreoffice-commits
mailing list