diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-05-19 00:18:15 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-05-19 19:24:05 +0200 |
| commit | 48906a5e899e517af76e04afb5659232b336e206 (patch) | |
| tree | 3e6159253675799bbed9948164f78510ddef86ab /include | |
| parent | a3f9f03f52c2134058dff87eb1528a19450c566c (diff) | |
Watermark: extended configuration
* it is possible to set font family,
color, angle and transparency
Change-Id: Idea2fb9ee748394bb3d706fa790e109238584cdb
Reviewed-on: https://gerrit.libreoffice.org/37793
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 8 | ||||
| -rw-r--r-- | include/sfx2/watermarkitem.hxx | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index c17b2e850c20..3384b0558287 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -330,7 +330,10 @@ #define SID_INSERT_FLOATINGFRAME (SID_SFX_START + 563) #define SID_CLASSIFICATION_APPLY (SID_SFX_START + 672) #define SID_WATERMARK (SID_SFX_START + 676) -// FREE (SID_SFX_START + 677) +#define SID_WATERMARK_FONT (SID_SFX_START + 677) +#define SID_WATERMARK_TRANSPARENCY (SID_SFX_START + 805) +#define SID_WATERMARK_COLOR (SID_SFX_START + 806) +#define SID_WATERMARK_ANGLE (SID_SFX_START + 807) #define SID_HYPERLINK_DIALOG (SID_SFX_START + 678) @@ -394,9 +397,6 @@ #define SID_PASTE_ONLY_TEXT (SID_SFX_START + 802) #define SID_PASTE_ONLY_FORMULA (SID_SFX_START + 803) #define SID_PASTE_ONLY_VALUE (SID_SFX_START + 804) - // FREE: SID_SFX_START + 805 - // FREE: SID_SFX_START + 806 - // FREE: SID_SFX_START + 807 // FREE: SID_SFX_START + 808 // FREE: SID_SFX_START + 809 // FREE: SID_SFX_START + 810 diff --git a/include/sfx2/watermarkitem.hxx b/include/sfx2/watermarkitem.hxx index 760aab3b0285..9fd7a91415a4 100644 --- a/include/sfx2/watermarkitem.hxx +++ b/include/sfx2/watermarkitem.hxx @@ -17,17 +17,29 @@ class SFX2_DLLPUBLIC SfxWatermarkItem: public SfxPoolItem public: static SfxPoolItem* CreateDefault(); SfxWatermarkItem(); - SfxWatermarkItem( sal_uInt16 nWhich, const OUString &rText ); SfxWatermarkItem( const SfxWatermarkItem& ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - const OUString& GetText() const { return m_aText; } + const OUString GetText() const { return m_aText; } + void SetText(const OUString& aText) { m_aText = aText; } + const OUString GetFont() const { return m_aFont; } + void SetFont(const OUString& aFont) { m_aFont = aFont; } + sal_Int16 GetAngle() const { return m_nAngle; } + void SetAngle(const sal_Int16 nAngle) { m_nAngle = nAngle; } + sal_Int16 GetTransparency() const { return m_nTransparency; } + void SetTransparency(const sal_Int16 nTransparency) { m_nTransparency = nTransparency; } + sal_uInt32 GetColor() const { return m_nColor; } + void SetColor(const sal_uInt32 nColor) { m_nColor = nColor; } private: OUString m_aText; + OUString m_aFont; + sal_Int16 m_nAngle; + sal_Int16 m_nTransparency; + sal_uInt32 m_nColor; }; #endif |