summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-24 17:04:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-24 17:04:15 +0100
commit32193abe8ff1dfec2b95e152d0c421af48bd1b84 (patch)
tree20cf6229cc27c267a1c89e3e85066490e0dfae52
parent3cc52de5d426785e0a6ef3e9a093f4adb004c303 (diff)
move m_bVertical down to SwPageExample from SwPageGridExample
Change-Id: I242d8e7296daff83d73c199f5f593200796607bc
-rw-r--r--sw/source/uibase/frmdlg/colex.cxx15
-rw-r--r--sw/source/uibase/inc/colex.hxx5
2 files changed, 11 insertions, 9 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);
}
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index 506b41601969..f15e80bf2aae 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -30,9 +30,12 @@ class SfxItemSet;
class SW_DLLPUBLIC SwPageExample : public SvxPageWindow
{
+protected:
+ bool m_bVertical;
public:
SwPageExample(vcl::Window* pPar)
: SvxPageWindow(pPar)
+ , m_bVertical(false)
{
SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4));
}
@@ -45,7 +48,6 @@ class SwTextGridItem;
class SW_DLLPUBLIC SwPageGridExample : public SwPageExample
{
SwTextGridItem* pGridItem;
- bool m_bVertical;
protected:
virtual void DrawPage(vcl::RenderContext& rRenderContext,
const Point& rPoint,
@@ -55,7 +57,6 @@ public:
SwPageGridExample(vcl::Window* pPar)
: SwPageExample(pPar)
, pGridItem(0)
- , m_bVertical(false)
{}
virtual ~SwPageGridExample();