diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-09-10 11:01:26 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-09-11 11:13:23 +0000 |
commit | a212ef2b6ebadb22a9abf6d042aa2b5fd9ac1cf0 (patch) | |
tree | aee754ccd8da5e209278c0ffe99c49e7a991f371 /cui/source/inc | |
parent | 88b6dd3ea77ca9f6d5fac2965cea6ff0634e6ba5 (diff) |
tdf#93901: apply handling in style/edit dialog improved
introduced SfxTabPage::ChangesApplied() to enable resetting values
to their initial state while editing styles
Change-Id: I60fd68d8464e12e795b0e0d2f2e53882a225c181
Reviewed-on: https://gerrit.libreoffice.org/18467
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/border.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/chardlg.hxx | 3 | ||||
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/paragrph.hxx | 4 |
4 files changed, 10 insertions, 0 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 23d107ba5371..f6d8abe305a8 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -54,6 +54,7 @@ public: virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; void HideShadowControls(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 42cc172fcb9b..4d5506ec54b6 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -151,6 +151,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); @@ -233,6 +234,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; void DisableControls( sal_uInt16 nDisable ); void EnableFlash(); @@ -316,6 +318,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index f3b003dd0ab9..29dbd031b830 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -163,6 +163,7 @@ public: virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual sfxpg DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; @@ -296,6 +297,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index ee5c1dda81c2..12e23f4dce93 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -109,6 +109,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; void SetPageWidth( sal_uInt16 nPageWidth ); @@ -172,6 +173,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; void EnableJustifyExt(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; @@ -207,6 +209,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; void DisablePageBreak(); @@ -288,6 +291,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ChangesApplied() SAL_OVERRIDE; }; |