diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-07 13:42:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-08 15:07:22 +0200 |
| commit | 842c71a1fae1def3e8b694ae3b820b34ad26bce4 (patch) | |
| tree | 8b00253118bb278c5dda9b2a97897e93e2f9e691 /include | |
| parent | 97b6fd8e9ec4c655a5b73cbb4f64be06e7057242 (diff) | |
weld FontFeaturesDialog
Change-Id: I67ab7388593aceb00b660e4d40904a4eef247620
Reviewed-on: https://gerrit.libreoffice.org/60148
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fntctrl.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 518c392e805b..a3d00a3d9a01 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -90,10 +90,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public weld::CustomWidgetCo { private: std::unique_ptr<FontPrevWin_Impl> pImpl; - bool mbResetForeground : 1; - bool mbResetBackground : 1; - SVX_DLLPRIVATE void ResetSettings(); SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; SVX_DLLPRIVATE static void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); @@ -103,10 +100,9 @@ public: FontPrevWindow(); virtual ~FontPrevWindow() override; - virtual void StyleUpdated() override; - SvxFont& GetFont(); const SvxFont& GetFont() const; + void SetFont( const SvxFont& rNormalFont, const SvxFont& rCJKFont, const SvxFont& rCTLFont ); SvxFont& GetCJKFont(); SvxFont& GetCTLFont(); void SetBackColor( const Color& rColor ); diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 6ea83851ef85..9c0fa76468b8 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -138,6 +138,8 @@ public: virtual void vadjustment_set_value(int value) = 0; virtual int vadjustment_get_upper() const = 0; virtual void vadjustment_set_upper(int upper) = 0; + virtual void set_hpolicy(VclPolicyType eHPolicy) = 0; + virtual VclPolicyType get_hpolicy() const = 0; virtual void set_vpolicy(VclPolicyType eVPolicy) = 0; virtual VclPolicyType get_vpolicy() const = 0; void connect_vadjustment_changed(const Link<ScrolledWindow&, void>& rLink) |