desktop/source/app/app.cxx |   19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 9da94ebd6de92841ce83d8b584edeabbe67f2d23
Author:     Patrick Luby <guibomac...@gmail.com>
AuthorDate: Sun Mar 9 16:38:05 2025 +0100
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Mar 10 01:40:16 2025 +0100

    Revert "Related: tdf#41775 show Start Center even if loading a document"
    
    This reverts commit 9e3d8d0176bb1e95414e4a578065c2e1035a8dd6.
    
    Reason for revert: after testing, I found that only command line arguments 
go through this patch's path. It is extremely difficult trying to find where 
opening from the Finder or Dock is occurring since I cannot launch LibreOffice 
from the command line to test in my local build.
    
    Change-Id: Ica339cb4b76c1943ad04c8f3dd7f987c97dfe164
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182696
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Reviewed-by: Patrick Luby <guibomac...@gmail.com>
    Tested-by: Jenkins

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3dfce24bc118..cb4a4de7db9e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1594,24 +1594,7 @@ int Desktop::Main()
     pExecGlobals->bRestartRequested = 
xRestartManager->isRestartRequested(true);
     if ( !pExecGlobals->bRestartRequested )
     {
-#ifdef MACOSX
-        // Related: tdf#41775 show Start Center even if loading a document
-        // If LibreOffice is launched by opening a document from the
-        // Finder, dragging it to the Dock, or including it in the
-        // command line arguments, the Start Center doesn't get created
-        // when all of the document windows are closed. So, the old
-        // "File only" menubar is displayed.
-        // On macOS, the Start Center's menubar is the "no windows open"
-        // menubar. This is done by making a native copy of the Start
-        // Center's menubar each time it is opened (note: on macOS the
-        // Start Center window can be closed and reopened repeatedly)
-        // so pre-populate the "no windows open" menubar by opening the
-        // Start Center even if a document is going to be loaded.
-        if ((/* !rCmdLineArgs.WantsToLoadDocument() && */
-#else
-        if ((!rCmdLineArgs.WantsToLoadDocument() &&
-#endif
-            !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsHeadless() && 
!rCmdLineArgs.IsQuickstart()) &&
+        if ((!rCmdLineArgs.WantsToLoadDocument() && 
!rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsHeadless() && 
!rCmdLineArgs.IsQuickstart()) &&
             
(SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE)) 
&&
             (!bExistsRecoveryData                                              
    ) &&
             (!bExistsSessionData                                               
    ) &&

Reply via email to