ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#172275 tdf#172831 vcl: Drop obsolete "sfxlo-OptionalBox" workaround

Browse Source 
This workaround was introduced in

    commit f9eea76438
    Date:   Mon Aug 10 15:55:50 2020 +0100

        tdf#135495 builder file format has annoyingly escaped into user config

, but is no longer needed now that obsolete .ui files for
the Notebookbar are no longer read from the user profile since

    Change-Id: I35ab9f4254050262e18470befd03c921cce92c76
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Mon Jul 27 13:46:40 2026 +0200

        tdf#172275 tdf#172831 vcl: Stop loading customized NotebookBar .ui file

(The discussion in tdf#135495 already mentioned
problems with the previous Notebookbar customization
approach relying on modified .ui files and how
a better solution should be found. Potential alternatives
are discussed in the context of tdf#172275 now.)

Change-Id: I76b7ec75a453ff654acbccba687e046f17be485b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208675
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-07-28 23:21:05 +02:00
parent eeeaa9057d
commit 1f1ba33a82
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/source/window/builder.cxx
+1 -2
View File
@@ -1359,9 +1359,8 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OUString
xWindow = xListBox;
}
}
else if (name == "VclOptionalBox" || name == "sfxlo-OptionalBox")
else if (name == "VclOptionalBox")
{
// tdf#135495 fallback sfxlo-OptionalBox to VclOptionalBox as a stopgap
xWindow = VclPtr<OptionalBox>::Create(pParent);
}
else if (name == "svtlo-ManagedMenuButton")