diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-27 11:54:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-27 13:32:50 +0100 |
| commit | 247607727986df0fd0fef198459eb6646e056ea3 (patch) | |
| tree | f952b11c9dd4e17a2e110e983d29a40d877f51d0 /cui | |
| parent | 620d032b1807477ef1e2b547ce772c284aa0da50 (diff) | |
Related: tdf#109289 move PushButton::IsValueChangedFromSaved to consumer
inheriting the IsValueChangedFromSaved from PushButton has allowed
undesirable behaviour to be selected
Change-Id: Ifccb1657d2565005e6f9e239c6118f2e5ae7970c
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/textanim.hxx | 5 | ||||
| -rw-r--r-- | cui/source/tabpages/textanim.cxx | 31 |
2 files changed, 21 insertions, 15 deletions
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 9b4a635d4568..37ff6561b9e3 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -74,6 +74,11 @@ private: void SelectDirection( SdrTextAniDirection nValue ); sal_uInt16 GetSelectedDirection(); + TriState m_aUpState; + TriState m_aLeftState; + TriState m_aRightState; + TriState m_aDownState; + public: SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAnimationPage() override; diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index fbf8302b6a47..4670e462f455 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -88,13 +88,14 @@ void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) |* \************************************************************************/ -SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pWindow - ,"TextAnimation" - ,"cui/ui/textanimtabpage.ui" - ,&rInAttrs ), - rOutAttrs ( rInAttrs ), - eAniKind ( SdrTextAniKind::NONE ) +SvxTextAnimationPage::SvxTextAnimationPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) + : SfxTabPage(pWindow, "TextAnimation", "cui/ui/textanimtabpage.ui", &rInAttrs) + , rOutAttrs(rInAttrs) + , eAniKind(SdrTextAniKind::NONE) + , m_aUpState(TRISTATE_INDET) + , m_aLeftState(TRISTATE_INDET) + , m_aRightState(TRISTATE_INDET) + , m_aDownState(TRISTATE_INDET) { get(m_pLbEffect, "LB_EFFECT"); get(m_pBoxDirection,"boxDIRECTION"); @@ -200,10 +201,10 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) m_pBtnRight->Check( false ); m_pBtnDown->Check( false ); } - m_pBtnUp->SaveValue(); - m_pBtnLeft->SaveValue(); - m_pBtnRight->SaveValue(); - m_pBtnDown->SaveValue(); + m_aUpState = m_pBtnUp->GetState(); + m_aLeftState = m_pBtnLeft->GetState(); + m_aRightState = m_pBtnRight->GetState(); + m_aDownState = m_pBtnDown->GetState(); // Start inside pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANISTARTINSIDE ); @@ -375,10 +376,10 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) } // animation direction - if( m_pBtnUp->IsValueChangedFromSaved() || - m_pBtnLeft->IsValueChangedFromSaved() || - m_pBtnRight->IsValueChangedFromSaved() || - m_pBtnDown->IsValueChangedFromSaved() ) + if (m_aUpState != m_pBtnUp->GetState() || + m_aLeftState != m_pBtnLeft->GetState() || + m_aRightState != m_pBtnRight->GetState() || + m_aDownState != m_pBtnDown->GetState()) { SdrTextAniDirection eValue = (SdrTextAniDirection) GetSelectedDirection(); rAttrs->Put( SdrTextAniDirectionItem( eValue ) ); |