summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-05 21:25:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-06 13:37:14 +0200
commit5a739fba62a300cd1926445462d6e2f1f08aaaaa (patch)
treefe9811ab95dbf54a27921e9eee4be7950ecb4f6f /include/svx
parent587899f9ced03d02fbf8ffa9a3f52ba31be30818 (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 'include/svx')
-rw-r--r--include/svx/hdft.hxx2
-rw-r--r--include/svx/pagectrl.hxx6
2 files changed, 4 insertions, 4 deletions
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)
{