[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Caolán McNamara]

 sw/source/ui/misc/outline.cxx     |    2 +-
 sw/source/uibase/inc/num.hxx      |    2 +-
 sw/source/uibase/inc/numprevw.hxx |    6 +++---
 sw/source/uibase/inc/outline.hxx  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 95dc6c49348496210d3178f20e4460ad4471ea02
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 14 13:26:45 2018 +0100

    rename SwNumberingPreview back to NumberingPreview now
    
    Change-Id: I1b6fe3ea2ef17bd35de1e8d4d124bc7adf9861de
    Reviewed-on: https://gerrit.libreoffice.org/55815
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index e1d428e23ef8..ea75b1761586 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -851,7 +851,7 @@ static long lcl_DrawGraphic(vcl::RenderContext* pVDev, const SwNumFormat &rForma
     return nRet;
 }
 
-void SwNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
+void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     const Size aSize(rRenderContext.PixelToLogic(GetOutputSizePixel()));
 
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index f882c1d8ee3f..d17a6894647e 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -49,7 +49,7 @@ class SwNumPositionTabPage : public SfxTabPage
     bool                bInInintControl     : 1;  // work around modify-error; should be resolved from 391 on
     bool                bLabelAlignmentPosAndSpaceModeActive;
 
-    SwNumberingPreview  m_aPreviewWIN;
+    NumberingPreview  m_aPreviewWIN;
 
     std::unique_ptr<weld::TreeView> m_xLevelLB;
     std::unique_ptr<weld::Widget> m_xPositionFrame;
diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx
index cb8cc0b4dedd..6f74db1aa01c 100644
--- a/sw/source/uibase/inc/numprevw.hxx
+++ b/sw/source/uibase/inc/numprevw.hxx
@@ -26,7 +26,7 @@
 class SwNumRule;
 namespace rtl { class OUString; }
 
-class SwNumberingPreview : public weld::CustomWidgetController
+class NumberingPreview : public weld::CustomWidgetController
 {
     const SwNumRule*    pActNum;
     vcl::Font           aStdFont;
@@ -39,8 +39,8 @@ private:
     virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
 
 public:
-    SwNumberingPreview()
-       : pActNum(nullptr)
+    NumberingPreview()
+        : pActNum(nullptr)
         , nPageWidth(0)
         , pOutlineNames(nullptr)
         , bPosition(false)
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 223d6f226d4f..d009b1d60226 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -84,7 +84,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
     SwNumRule*          pNumRule;
     OUString*           pCollNames;
     sal_uInt16          nActLevel;
-    SwNumberingPreview  m_aPreviewWIN;
+    NumberingPreview  m_aPreviewWIN;
 
     std::unique_ptr<weld::TreeView> m_xLevelLB;
     std::unique_ptr<weld::ComboBoxText> m_xCollBox;