diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2023-06-02 08:08:18 -0800 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2024-03-10 02:43:41 +0100 |
| commit | 1fd359790ed4a27902248d92ee343a4aeaf63c8e (patch) | |
| tree | bc4d578e8256ea545c7f88c8b3f3653eec5a50f9 /include | |
| parent | 3ba85b7786663da4f2de1a3c2fe7ee9a27657293 (diff) | |
tdf#90242 Navigator: Improve custom shape naming
This patch makes the Draw/Impress Navigator display the name retrieved
by SdrCustomShapeGeometryItem::GetPropertyValueByName("Type") for
custom shape objects when the custom shape is unnamed and the Navigator
is set to show all objects. For Writer and Calc, this patch makes
inserted fontwork custom shape objects be automatically named 'Fontwork
N'.
Change-Id: Ice34461fe7a4b26d01b2d93e871a956dc55392f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152568
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou <stephane.guillou@libreoffice.org>
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fontworkgallery.hxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 8e5eceb8f033..21c418584570 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -60,6 +60,8 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontWorkGalleryDialog final : public wel std::unique_ptr<weld::IconView> maCtlFavorites; std::unique_ptr<weld::Button> mxOKButton; + css::uno::Reference<css::frame::XFrame> mxFrame; + void initFavorites(sal_uInt16 nThemeId); void insertSelectedFontwork(); void fillFavorites(sal_uInt16 nThemeId); @@ -69,7 +71,8 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontWorkGalleryDialog final : public wel DECL_DLLPRIVATE_LINK(QueryTooltipHandler, const weld::TreeIter&, OUString); public: - FontWorkGalleryDialog(weld::Window* pParent, SdrView& rView); + FontWorkGalleryDialog(weld::Window* pParent, SdrView& rView, + css::uno::Reference<css::frame::XFrame> xFrame); virtual ~FontWorkGalleryDialog() override; // SJ: if the SdrObject** is set, the SdrObject is not inserted into the page when executing the dialog |