[Libreoffice-commits] .: 2 commits - desktop/source solenv/bin
Michael Meeks
michael at kemper.freedesktop.org
Wed Feb 15 07:17:19 PST 2012
desktop/source/app/app.cxx | 35 ----------------------------
solenv/bin/modules/installer/copyproject.pm | 3 ++
solenv/bin/modules/installer/exiter.pm | 3 ++
solenv/bin/modules/installer/files.pm | 5 +++-
solenv/bin/modules/installer/logger.pm | 3 ++
5 files changed, 13 insertions(+), 36 deletions(-)
New commits:
commit 0ebee1ef39a77c4394e7d0ec9346daf002e52884
Author: Michael Meeks <michael.meeks at suse.com>
Date: Wed Feb 15 15:16:02 2012 +0000
remove hideous plasma debugging bits from android branch
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4df6346..393db72 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,14 +102,6 @@
#include <sys/wait.h>
#endif
-#ifdef ANDROID
-// mmeeks debugging stuff?
-extern void VCL_DLLPUBLIC plasma_now(const char *msg);
-#define PLASMA_NOW(s) ::plasma_now(s)
-#else
-#define PLASMA_NOW(s)
-#endif
-
#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
@@ -1478,8 +1470,6 @@ int Desktop::Main()
ResMgr::SetReadStringHook( ReplaceStringHookProc );
-// PLASMA_NOW("after desktoppy bits"); - fine to here ...
-
// Startup screen
RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main { OpenSplashScreen" );
OpenSplashScreen();
@@ -1487,7 +1477,6 @@ int Desktop::Main()
SetSplashScreenProgress(10);
-// PLASMA_NOW("after splash open");
{
UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
if ( instErr_fin != UserInstall::E_None)
@@ -1515,8 +1504,6 @@ int Desktop::Main()
{
RegisterServices( xSMgr );
-// PLASMA_NOW("registered services");
-
SetSplashScreenProgress(25);
#ifndef UNX
@@ -1561,8 +1548,6 @@ int Desktop::Main()
if ( !InitializeConfiguration() )
return EXIT_FAILURE;
-// PLASMA_NOW("init configuration");
-
SetSplashScreenProgress(30);
// set static variable to enabled/disable crash reporter
@@ -1580,8 +1565,6 @@ int Desktop::Main()
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
delete pLabelResMgr;
-// PLASMA_NOW("after title string");
-
#ifdef DBG_UTIL
//include version ID in non product builds
::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
@@ -1598,8 +1581,6 @@ int Desktop::Main()
SetSplashScreenProgress(40);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
-// PLASMA_NOW("unrestricted folders"); -- got this.
-
// Check special env variable
std::vector< String > aUnrestrictedFolders;
svt::getUnrestrictedFolders( aUnrestrictedFolders );
@@ -1620,8 +1601,6 @@ int Desktop::Main()
( xSMgr->createInstance(
DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY );
- PLASMA_NOW("done global event broadcaster");
-
/* ensure existance of a default window that messages can be dispatched to
This is for the benefit of testtool which uses PostUserEvent extensively
and else can deadlock while creating this window from another tread while
@@ -1659,8 +1638,6 @@ int Desktop::Main()
pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
}
- PLASMA_NOW("invoked OnStartupApp");
-
SetSplashScreenProgress(50);
// Backing Component
@@ -1690,8 +1667,6 @@ int Desktop::Main()
aMiscOptions.SetUseSystemFileDialog( sal_False );
}
- PLASMA_NOW("nearly there !");
-
if ( !pExecGlobals->bRestartRequested )
{
if ((!rCmdLineArgs.WantsToLoadDocument() && !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsQuickstart()) &&
@@ -1761,8 +1736,6 @@ int Desktop::Main()
aOptions.SetVCLSettings();
SetSplashScreenProgress(60);
- PLASMA_NOW("setup appearance !");
-
if ( !pExecGlobals->bRestartRequested )
{
Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
@@ -1796,8 +1769,6 @@ int Desktop::Main()
// Release solar mutex just before we wait for our client to connect
int nAcquireCount = Application::ReleaseSolarMutex();
- PLASMA_NOW("wait client connect !");
-
// Post user event to startup first application component window
// We have to send this OpenClients message short before execute() to
// minimize the risk that this message overtakes type detection contruction!!
@@ -1816,8 +1787,6 @@ int Desktop::Main()
// call Application::Execute to process messages in vcl message loop
RTL_LOGFILE_PRODUCT_TRACE( "PERFORMANCE - enter Application::Execute()" );
- PLASMA_NOW("before java foo !");
-
try
{
// The JavaContext contains an interaction handler which is used when
@@ -1834,14 +1803,10 @@ int Desktop::Main()
DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoQuickstart() );
#ifdef ANDROID
- PLASMA_NOW("pre hit execute!");
-
// For some reason we're not getting a desktop frame or component [odd]
ErrorBox aKickStartVCL( NULL, WB_OK, rtl::OUString::createFromAscii("My very own title!") );
aKickStartVCL.SetText( rtl::OUString::createFromAscii("Delphic Utterance") );
aKickStartVCL.Show(); // don't execute - just leave it lying around ....
-
- PLASMA_NOW("hit execute!");
#endif
Execute();
}
commit dda1f40a64506ba66772ac7b6c9d58d7775db656
Author: Tim Retout <tim at retout.co.uk>
Date: Tue Feb 14 22:19:46 2012 +0000
Turn on strictures for some installer Perl modules.
diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm
index 8157db4..2e4f93a 100644
--- a/solenv/bin/modules/installer/copyproject.pm
+++ b/solenv/bin/modules/installer/copyproject.pm
@@ -27,6 +27,9 @@
package installer::copyproject;
+use strict;
+use warnings;
+
use installer::control;
use installer::converter;
use installer::files;
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index 18b3b31..243bef4 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -27,6 +27,9 @@
package installer::exiter;
+use strict;
+use warnings;
+
use installer::files;
use installer::globals;
use installer::logger;
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index 73ea267..379144e 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -27,6 +27,9 @@
package installer::files;
+use strict;
+use warnings;
+
use installer::exiter;
use installer::logger;
@@ -58,7 +61,7 @@ sub read_file
# Don't use "my @localfile = <IN>" here, because
# perl has a problem with the internal "large_and_huge_malloc" function
# when calling perl using MacOS 10.5 with a perl built with MacOS 10.4
- while ( $line = <IN> ) {
+ while ( my $line = <IN> ) {
push @localfile, $line;
}
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm
index c5982c6..0130369 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -27,6 +27,9 @@
package installer::logger;
+use strict;
+use warnings;
+
use installer::files;
use installer::globals;
More information about the Libreoffice-commits
mailing list