diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2022-06-16 08:52:13 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2022-06-22 16:54:21 +0200 |
| commit | ecfb133598df609037263e06949acbbf520622b3 (patch) | |
| tree | 929b760023fb25b5eb0ba7b9de4d278279af30ab /include | |
| parent | 1f820cd30b3014c72f6711d80679faa8488ffcda (diff) | |
tdf#128150 Adapt sidebar to new "use slide background" property
Change-Id: Idce049a7498f98b0079c708236cfeff7fddd6e95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135963
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sidebar/AreaPropertyPanelBase.hxx | 5 | ||||
| -rw-r--r-- | include/svx/strings.hrc | 1 | ||||
| -rw-r--r-- | include/svx/svxids.hrc | 2 | ||||
| -rw-r--r-- | include/svx/xfilluseslidebackgrounditem.hxx | 9 |
4 files changed, 11 insertions, 6 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index 12fcebe16581..00519eed91e6 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -24,6 +24,7 @@ #include <sfx2/sidebar/ControllerItem.hxx> #include <svx/colorbox.hxx> #include <svx/xgrad.hxx> +#include <svx/xfilluseslidebackgrounditem.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> @@ -35,6 +36,7 @@ class ToolbarUnoDispatcher; class XFillFloatTransparenceItem; +class XFillUseSlideBackgroundItem; class XFillTransparenceItem; class XFillStyleItem; class XFillGradientItem; @@ -84,6 +86,7 @@ public: virtual void setFillStyleAndGradient(const XFillStyleItem* pStyleItem, const XFillGradientItem& aGradientItem) = 0; virtual void setFillStyleAndHatch(const XFillStyleItem* pStyleItem, const XFillHatchItem& aHatchItem) = 0; virtual void setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, const XFillBitmapItem& aHatchItem) = 0; + virtual void setFillUseBackground(const XFillStyleItem* pStyleItem, const XFillUseSlideBackgroundItem& rItem) = 0; void updateFillTransparence(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState); void updateFillFloatTransparence(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState); @@ -92,6 +95,7 @@ public: void updateFillHatch(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState); void updateFillColor(bool bDefaultOrSet, const SfxPoolItem* pState); void updateFillBitmap(bool BDisabled, bool bDefaultOrSet, const SfxPoolItem* pState); + void updateFillUseBackground(bool BDisabled, bool bDefaultOrSet, const SfxPoolItem* pState); private: void Initialize(); @@ -145,6 +149,7 @@ protected: OUString maImgLinear; std::unique_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem; + std::unique_ptr< XFillUseSlideBackgroundItem > mpUseSlideBackgroundItem; std::unique_ptr< SfxUInt16Item > mpTransparenceItem; DECL_DLLPRIVATE_LINK(SelectFillTypeHdl, weld::ComboBox&, void ); diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 6df58387733f..d3e08640350b 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -543,6 +543,7 @@ #define RID_SVXSTR_GRADIENT NC_("RID_SVXSTR_GRADIENT", "Gradient") #define RID_SVXSTR_BITMAP NC_("RID_SVXSTR_BITMAP", "Bitmap") #define RID_SVXSTR_PATTERN NC_("RID_SVXSTR_PATTERN", "Pattern") +#define RID_SVXSTR_USE_BACKGROUND NC_("RID_SVXSTR_USE_BACKGROUND", "Use Slide Background") #define RID_SVXSTR_PATTERN_UNTITLED NC_("RID_SVXSTR_PATTERN_UNTITLED", "Untitled Pattern") #define RID_SVXSTR_LINESTYLE NC_("RID_SVXSTR_LINESTYLE", "Line Style") #define RID_SVXSTR_INVISIBLE NC_("RID_SVXSTR_INVISIBLE", "None") diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index d50be073c40d..96122a66bc10 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -966,7 +966,7 @@ class XFillGradientItem; #define SID_CELL_FORMAT_BORDER ( SID_SVX_START + 1132 ) #define SID_CHAR_DLG_EFFECT ( SID_SVX_START + 1133 ) #define SID_CHAR_DLG_POSITION ( SID_SVX_START + 1134 ) - +#define SID_ATTR_FILL_USE_SLIDE_BACKGROUND ( SID_SVX_START + 1135 ) #define FN_SVX_SET_NUMBER ( SID_SVX_START + 1136 ) #define FN_SVX_SET_BULLET ( SID_SVX_START + 1137 ) #define FN_SVX_SET_OUTLINE ( SID_SVX_START + 1138 ) diff --git a/include/svx/xfilluseslidebackgrounditem.hxx b/include/svx/xfilluseslidebackgrounditem.hxx index 5a5cba891554..86317a903ee4 100644 --- a/include/svx/xfilluseslidebackgrounditem.hxx +++ b/include/svx/xfilluseslidebackgrounditem.hxx @@ -19,12 +19,11 @@ class SVXCORE_DLLPUBLIC XFillUseSlideBackgroundItem final : public SfxBoolItem public: XFillUseSlideBackgroundItem(bool bFill = false); - SVX_DLLPRIVATE virtual XFillUseSlideBackgroundItem* Clone(SfxItemPool* pPool - = nullptr) const override; + virtual XFillUseSlideBackgroundItem* Clone(SfxItemPool* pPool = nullptr) const override; - SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, - MapUnit ePresMetric, OUString& rText, - const IntlWrapper&) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, + MapUnit ePresMetric, OUString& rText, + const IntlWrapper&) const override; void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; |