Don't rely on icons in otherwise unused hyperlinkdialog.ui
commit 1c6eb5324d
Date: Sun Dec 7 18:46:28 2025 +0000
tdf#147630 Transform Hyperlink dialog into a standard SfxTabDialog
had introduced cui/uiconfig/ui/hyperlinkdlg.ui for the new
.ui file to be used for the hyperlink dialog
instead of cui/uiconfig/ui/hyperlinkdialog.ui.
However, the logic to make the tab icons available
was still relying on them being extracted from the
otherwise obsolete .ui file.
Change that by defining the icon names in an .hlst
file and adding that to the list of .hlst files
to consider for bitmaps/images in the corresponding
makefile.
This prepares for upcoming commit
Change-Id: I42b2ca3facde4b0338d0e897a06a68c8cb7323f5
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Tue Mar 10 10:51:44 2026 +0100
Don't rely on icons in otherwise unused hyperlinkdialog.ui
(Without this preparatory commit here, icons would no longer
be shown in the "Insert" -> "Hyperlink" dialog after
the above commit any more.)
Change-Id: I42b2ca3facde4b0338d0e897a06a68c8cb7323f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201358
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
@@ -0,0 +1,17 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
||||
/*
|
||||
* This file is part of the LibreOffice project.
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <rtl/ustring.hxx>
|
||||
|
||||
inline constexpr OUString RID_BITMAP_HLDOC = u"res/hldoctp.png"_ustr;
|
||||
inline constexpr OUString RID_BITMAP_HLDOCN = u"res/hldocntp.png"_ustr;
|
||||
inline constexpr OUString RID_BITMAP_HLMAIL = u"res/hlmailtp.png"_ustr;
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|
||||
@@ -13,6 +13,7 @@
|
||||
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <unotools/resmgr.hxx>
|
||||
#include <vcl/bitmaps.hlst>
|
||||
|
||||
struct TabData
|
||||
{
|
||||
@@ -154,9 +155,9 @@ inline constexpr TabData RID_TAB_EVENTS{ NC_("RID_TAB_EVENTS", "Events"), u"choo
|
||||
// ui mode
|
||||
inline constexpr TabData RID_TAB_UIMODE{ NC_("RID_TAB_UIMODE", "UI Mode"), u"toggletabbarvisibility.png"_ustr };
|
||||
inline constexpr TabData RID_TAB_HLINTERNET{ NC_("RID_TAB_HLINTERNET", "~Internet"), u"res/hlinettp.png"_ustr };
|
||||
inline constexpr TabData RID_TAB_HLMAIL{ NC_("RID_TAB_HLMAIL", "~Mail"), u"res/hlmailtp.png"_ustr };
|
||||
inline constexpr TabData RID_TAB_HLDOC{ NC_("RID_TAB_HLDOC", "~Document"), u"res/hldoctp.png"_ustr };
|
||||
inline constexpr TabData RID_TAB_HLDOCN{ NC_("RID_TAB_HLDOCN", "~New Document"), u"res/hldocntp.png"_ustr };
|
||||
inline constexpr TabData RID_TAB_HLMAIL{ NC_("RID_TAB_HLMAIL", "~Mail"), RID_BITMAP_HLMAIL };
|
||||
inline constexpr TabData RID_TAB_HLDOC{ NC_("RID_TAB_HLDOC", "~Document"), RID_BITMAP_HLDOC };
|
||||
inline constexpr TabData RID_TAB_HLDOCN{ NC_("RID_TAB_HLDOCN", "~New Document"), RID_BITMAP_HLDOCN };
|
||||
// envelope
|
||||
inline constexpr TabData RID_TAB_ENVELOPE{ NC_("RID_TAB_ENVELOPE", "Envelope"), u"insertenvelope.png"_ustr };
|
||||
inline constexpr TabData RID_TAB_ENV_FORMAT{ NC_("RID_TAB_ENV_FORMAT", "Format"), u"distributeverttop.png"_ustr };
|
||||
|
||||
@@ -78,6 +78,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
|
||||
$(SRCDIR)/formula/inc/bitmaps.hlst \
|
||||
$(SRCDIR)/fpicker/inc/bitmaps.hlst \
|
||||
$(SRCDIR)/framework/inc/bitmaps.hlst \
|
||||
$(SRCDIR)/include/vcl/bitmaps.hlst \
|
||||
$(SRCDIR)/reportdesign/inc/bitmaps.hlst \
|
||||
$(SRCDIR)/sc/inc/bitmaps.hlst \
|
||||
$(SRCDIR)/sd/inc/bitmaps.hlst \
|
||||
|
||||
Reference in New Issue
Block a user