cui/source/inc/page.hxx | 2 +-
include/svx/hdft.hxx | 2 +-
include/svx/pagectrl.hxx | 6 +++---
svx/source/dialog/pagectrl.cxx | 18 +++++++++---------
sw/source/uibase/frmdlg/colex.cxx | 8 ++++----
sw/source/uibase/inc/colex.hxx | 12 ++++++------
6 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 5a739fba62a300cd1926445462d6e2f1f08aaaaa
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Sep 5 21:25:48 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Sep 6 13:37:14 2018 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index da7ee7047391..74155a61b0d3 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -96,7 +96,7 @@ private:
bool mbDelPrinter : 1;
bool mbEnableDrawingLayerFillStyles : 1;
- PageWindow m_aBspWin;
+ SvxPageWindow m_aBspWin;
// paper format
std::unique_ptr<SvxPaperSizeListBox> m_xPaperSizeBox;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 6a0eeb7980a3..c5a92c5e01d3 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -68,7 +68,7 @@ protected:
bool mbDisableQueryBox : 1;
bool mbEnableDrawingLayerFillStyles : 1;
- PageWindow m_aBspWin;
+ SvxPageWindow m_aBspWin;
std::unique_ptr<weld::Label> m_xPageLbl;
std::unique_ptr<weld::CheckButton> m_xTurnOnBox;
std::unique_ptr<weld::CheckButton> m_xCntSharedBox;
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index f2db16bbaa9b..22cd0576a23c 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -28,7 +28,7 @@ class SvxBoxItem;
enum class SvxPageUsage;
enum class SvxFrameDirection;
-class SVX_DLLPUBLIC PageWindow : public weld::CustomWidgetController
+class SVX_DLLPUBLIC SvxPageWindow : public weld::CustomWidgetController
{
private:
Size aWinSize;
@@ -76,9 +76,9 @@ protected:
const tools::Rectangle& rPaintRange, const
tools::Rectangle& rDefineRange);
public:
- PageWindow();
+ SvxPageWindow();
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
- virtual ~PageWindow() override;
+ virtual ~SvxPageWindow() override;
void setHeaderFillAttributes(const
drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes)
{
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index bf244703b31b..e8db9c9fad0e 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -36,7 +36,7 @@
#define CELL_WIDTH 1600L
#define CELL_HEIGHT 800L
-PageWindow::PageWindow() :
+SvxPageWindow::SvxPageWindow() :
aWinSize(),
aSize(),
nTop(0),
@@ -66,11 +66,11 @@ PageWindow::PageWindow() :
{
}
-PageWindow::~PageWindow()
+SvxPageWindow::~SvxPageWindow()
{
}
-void PageWindow::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
+void SvxPageWindow::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
{
rRenderContext.Push(PushFlags::MAPMODE);
rRenderContext.SetMapMode(MapMode(MapUnit::MapTwip));
@@ -127,7 +127,7 @@ void PageWindow::Paint(vcl::RenderContext& rRenderContext,
const tools::Rectangl
rRenderContext.Pop();
}
-void PageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point&
rOrg, const bool bSecond, const bool bEnabled)
+void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point&
rOrg, const bool bSecond, const bool bEnabled)
{
const StyleSettings& rStyleSettings =
rRenderContext.GetSettings().GetStyleSettings();
const Color& rFieldColor = rStyleSettings.GetFieldColor();
@@ -320,7 +320,7 @@ void PageWindow::DrawPage(vcl::RenderContext&
rRenderContext, const Point& rOrg,
}
}
-void PageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext,
+void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext,
const
drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes,
const tools::Rectangle& rPaintRange,
const tools::Rectangle& rDefineRange)
@@ -378,22 +378,22 @@ void PageWindow::drawFillAttributes(vcl::RenderContext&
rRenderContext,
}
-void PageWindow::EnableFrameDirection(bool bEnable)
+void SvxPageWindow::EnableFrameDirection(bool bEnable)
{
bFrameDirection = bEnable;
}
-void PageWindow::SetFrameDirection(SvxFrameDirection nDirection)
+void SvxPageWindow::SetFrameDirection(SvxFrameDirection nDirection)
{
nFrameDirection = nDirection;
}
-void PageWindow::ResetBackground()
+void SvxPageWindow::ResetBackground()
{
bResetBackground = true;
}
-void PageWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void SvxPageWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
OutputDevice& rRefDevice = pDrawingArea->get_ref_device();
// Count in Twips by default
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);
}
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
