diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-05 21:25:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-06 13:37:14 +0200 |
| commit | 5a739fba62a300cd1926445462d6e2f1f08aaaaa (patch) | |
| tree | fe9811ab95dbf54a27921e9eee4be7950ecb4f6f /sw/source | |
| parent | 587899f9ced03d02fbf8ffa9a3f52ba31be30818 (diff) | |
rename back now originals are fully replaced
Change-Id: I1911055f9bf6bd636561209cadfb1dbf5650affa
Reviewed-on: https://gerrit.libreoffice.org/60057
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/frmdlg/colex.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/inc/colex.hxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 3c632852be21..4b10642a0ed5 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -40,7 +40,7 @@ #include <svx/unobrushitemhelper.hxx> #include <svx/svxids.hrc> -void PageExample::UpdateExample( const SfxItemSet& rSet ) +void SwPageExample::UpdateExample( const SfxItemSet& rSet ) { if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR)) { @@ -196,7 +196,7 @@ void PageExample::UpdateExample( const SfxItemSet& rSet ) void SwColExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOrg, const bool bSecond, const bool bEnabled) { - PageExample::DrawPage(rRenderContext, rOrg, bSecond, bEnabled); + SwPageExample::DrawPage(rRenderContext, rOrg, bSecond, bEnabled); if (!pColMgr) return; sal_uInt16 nColumnCount = pColMgr->GetCount(); @@ -506,7 +506,7 @@ SwPageGridExample::SwPageGridExample() void SwPageGridExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOrg, const bool bSecond, const bool bEnabled) { - PageExample::DrawPage(rRenderContext, rOrg, bSecond, bEnabled); + SwPageExample::DrawPage(rRenderContext, rOrg, bSecond, bEnabled); if (!pGridItem || !pGridItem->GetGridType()) return; @@ -609,7 +609,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet ) //get the grid information if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID)) pGridItem.reset(static_cast<SwTextGridItem*>(rSet.Get(RES_TEXTGRID).Clone())); - PageExample::UpdateExample(rSet); + SwPageExample::UpdateExample(rSet); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 0be060df7103..16794c818ee5 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -29,12 +29,12 @@ class SwColMgr; class SfxItemSet; -class SW_DLLPUBLIC PageExample : public PageWindow +class SW_DLLPUBLIC SwPageExample : public SvxPageWindow { protected: bool m_bVertical; public: - PageExample() + SwPageExample() : m_bVertical(false) { SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4)); @@ -43,7 +43,7 @@ public: void UpdateExample( const SfxItemSet& rSet ); }; -class SW_DLLPUBLIC SwPageGridExample : public PageExample +class SW_DLLPUBLIC SwPageGridExample : public SwPageExample { std::unique_ptr<SwTextGridItem> pGridItem; protected: @@ -58,11 +58,11 @@ public: }; -class SW_DLLPUBLIC SwColExample : public PageExample +class SW_DLLPUBLIC SwColExample : public SwPageExample { SwColMgr* pColMgr; - using PageExample::UpdateExample; + using SwPageExample::UpdateExample; protected: virtual void DrawPage(vcl::RenderContext& rRenderContext, @@ -79,7 +79,7 @@ public: void UpdateExample( const SfxItemSet& rSet, SwColMgr* pMgr ) { pColMgr = pMgr; - PageExample::UpdateExample(rSet); + SwPageExample::UpdateExample(rSet); } }; |