diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-24 17:04:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-24 17:04:15 +0100 |
commit | 32193abe8ff1dfec2b95e152d0c421af48bd1b84 (patch) | |
tree | 20cf6229cc27c267a1c89e3e85066490e0dfae52 /sw/source/uibase/frmdlg | |
parent | 3cc52de5d426785e0a6ef3e9a093f4adb004c303 (diff) |
move m_bVertical down to SwPageExample from SwPageGridExample
Change-Id: I242d8e7296daff83d73c199f5f593200796607bc
Diffstat (limited to 'sw/source/uibase/frmdlg')
-rw-r--r-- | sw/source/uibase/frmdlg/colex.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 4da20e88026c..1bf196312b0b 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -44,6 +44,14 @@ // Taking the updated values from the set void SwPageExample::UpdateExample( const SfxItemSet& rSet ) { + if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR, true)) + { + const SvxFrameDirectionItem& rDirItem = + static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)); + m_bVertical = rDirItem.GetValue() == FRMDIR_VERT_TOP_RIGHT|| + rDirItem.GetValue() == FRMDIR_VERT_TOP_LEFT; + } + SfxItemPool* pPool = rSet.GetPool(); sal_uInt16 nWhich = pPool->GetWhich( SID_ATTR_PAGE ); if ( rSet.GetItemState( nWhich, false ) == SfxItemState::SET ) @@ -590,13 +598,6 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet ) //get the grid information if(SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID, true)) pGridItem = static_cast<SwTextGridItem*>(static_cast<const SwTextGridItem&>(rSet.Get(RES_TEXTGRID)).Clone()); - if( SfxItemState::DEFAULT <= rSet.GetItemState( RES_FRAMEDIR, true )) - { - const SvxFrameDirectionItem& rDirItem = - static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)); - m_bVertical = rDirItem.GetValue() == FRMDIR_VERT_TOP_RIGHT|| - rDirItem.GetValue() == FRMDIR_VERT_TOP_LEFT; - } SwPageExample::UpdateExample(rSet); } |