Revert "Fall back to old bootstrap.ini [Win32] section, for backwards compatibility"

This reverts commit ebd3f0971b843527ed493a35b2303c8c15b94109.
Conflicts:
desktop/win32/source/loader.cxx
vcl/win/window/salframe.cxx

Reason for revert:  This fallback functionality was documented as deprecated at
<https://wiki.documentfoundation.org/index.php?title=ReleaseNotes/24.8&oldid=738731>
"fundamental.override.ini", to "be removed in a later version", which is
happening now for LO 25.2.

Change-Id: I40a1800f6a05fc7fd7188917083b269ce6a9f1d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163394
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>

1 files changed, 0 insertions, 24 deletions

diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx
index ca74c13ab92d..5374c286aa41 100644
--- a/desktop/win32/source/loader.cxx
+++ b/desktop/win32/source/loader.cxx
@@ -218,8 +218,6 @@ int officeloader_impl(bool bAllowConsole)
     // read limit values from fundamental.override.ini
     unsigned int nMaxMemoryInMB = 0;
     bool bExcludeChildProcesses = true;
-    bool fallbackForMaxMemoryInMB = true;
-    bool fallbackForExcludeChildProcesses = true;
 
     try
     {
@@ -227,34 +225,12 @@ int officeloader_impl(bool bAllowConsole)
         std::ifstream aFile(szIniDirectory + L"\\fundamental.override.ini");
         boost::property_tree::ini_parser::read_ini(aFile, pt);
         nMaxMemoryInMB = pt.get("Bootstrap.LimitMaximumMemoryInMB", nMaxMemoryInMB);
-        fallbackForMaxMemoryInMB = !pt.get_child_optional("Bootstrap.LimitMaximumMemoryInMB");
         bExcludeChildProcesses = pt.get("Bootstrap.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
-        fallbackForExcludeChildProcesses
-            = !pt.get_child_optional("Bootstrap.ExcludeChildProcessesFromLimit");
     }
     catch (...)
     {
         nMaxMemoryInMB = 0;
     }
-    // For backwards compatibility, for now also try to read the values from bootstrap.ini if
-    // fundamental.override.ini does not provide them:
-    if (fallbackForMaxMemoryInMB || fallbackForExcludeChildProcesses) {
-        try
-        {
-            boost::property_tree::ptree pt;
-            std::ifstream aFile(szIniDirectory + L"\\bootstrap.ini");
-            boost::property_tree::ini_parser::read_ini(aFile, pt);
-            if (fallbackForMaxMemoryInMB) {
-                nMaxMemoryInMB = pt.get("Win32.LimitMaximumMemoryInMB", nMaxMemoryInMB);
-            }
-            if (fallbackForExcludeChildProcesses) {
-                bExcludeChildProcesses = pt.get("Win32.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
-            }
-        }
-        catch (...)
-        {
-        }
-    }
 
     // create a Windows JobObject with a memory limit
     HANDLE hJobObject = nullptr;