[Libreoffice-commits] .: desktop/source

[Tor Lillqvist]

 desktop/source/app/app.cxx |   37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

New commits:
commit 12f689687e3017bfe9ffaf6bbc4593eb3ca21c2b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Feb 15 13:22:50 2012 +0200

    Ifdefify temporary (?) Android hacks

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index dc490ed..53a19f6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,7 +102,13 @@
 #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)
@@ -1472,7 +1478,7 @@ int Desktop::Main()
 
     ResMgr::SetReadStringHook( ReplaceStringHookProc );
 
-//    ::plasma_now("after desktoppy bits"); - fine to here ...
+//    ::PLASMA_NOW("after desktoppy bits"); - fine to here ...
 
     // Startup screen
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main { OpenSplashScreen" );
@@ -1481,7 +1487,7 @@ int Desktop::Main()
 
     SetSplashScreenProgress(10);
 
-//    ::plasma_now("after splash open");
+//    ::PLASMA_NOW("after splash open");
     {
         UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
         if ( instErr_fin != UserInstall::E_None)
@@ -1509,7 +1515,7 @@ int Desktop::Main()
     {
         RegisterServices( xSMgr );
 
-//        ::plasma_now("registered services");
+//        ::PLASMA_NOW("registered services");
 
         SetSplashScreenProgress(25);
 
@@ -1555,7 +1561,7 @@ int Desktop::Main()
         if ( !InitializeConfiguration() )
             return EXIT_FAILURE;
 
-//        ::plasma_now("init configuration");
+//        ::PLASMA_NOW("init configuration");
 
         SetSplashScreenProgress(30);
 
@@ -1574,7 +1580,7 @@ int Desktop::Main()
         String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
         delete pLabelResMgr;
 
-//        ::plasma_now("after title string");
+//        ::PLASMA_NOW("after title string");
 
 #ifdef DBG_UTIL
         //include version ID in non product builds
@@ -1592,7 +1598,7 @@ int Desktop::Main()
         SetSplashScreenProgress(40);
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
 
-//        ::plasma_now("unrestricted folders"); -- got this.
+//        ::PLASMA_NOW("unrestricted folders"); -- got this.
 
         // Check special env variable
         std::vector< String > aUnrestrictedFolders;
@@ -1614,7 +1620,7 @@ int Desktop::Main()
             ( xSMgr->createInstance(
             DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY );
 
-        ::plasma_now("done global event broadcaster");
+        ::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
@@ -1653,7 +1659,7 @@ int Desktop::Main()
             pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
         }
 
-        ::plasma_now("invoked OnStartupApp");
+        ::PLASMA_NOW("invoked OnStartupApp");
 
         SetSplashScreenProgress(50);
 
@@ -1684,7 +1690,7 @@ int Desktop::Main()
             aMiscOptions.SetUseSystemFileDialog( sal_False );
         }
 
-        ::plasma_now("nearly there !");
+        ::PLASMA_NOW("nearly there !");
 
         if ( !pExecGlobals->bRestartRequested )
         {
@@ -1755,7 +1761,7 @@ int Desktop::Main()
     aOptions.SetVCLSettings();
     SetSplashScreenProgress(60);
 
-    ::plasma_now("setup appearance !");
+    ::PLASMA_NOW("setup appearance !");
 
     if ( !pExecGlobals->bRestartRequested )
     {
@@ -1790,7 +1796,7 @@ int Desktop::Main()
         // Release solar mutex just before we wait for our client to connect
         int nAcquireCount = Application::ReleaseSolarMutex();
 
-        ::plasma_now("wait client connect !");
+        ::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
@@ -1810,7 +1816,7 @@ 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 !");
+        ::PLASMA_NOW("before java foo !");
 
         try
         {
@@ -1827,15 +1833,16 @@ int Desktop::Main()
                 // if this run of the office is triggered by restart, some additional actions should be done
                 DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoQuickstart() );
 
-                ::plasma_now("pre hit execute!");
+#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!");
-
+                ::PLASMA_NOW("hit execute!");
+#endif
                 Execute();
             }
         }