[Libreoffice-commits] core.git: cui/source include/svx svx/source

[Libreoffice Gerrit user]

 cui/source/inc/cuitabline.hxx |    6 +++---
 include/svx/dlgctrl.hxx       |    6 +++---
 svx/source/dialog/dlgctrl.cxx |   16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 40e157e2a838fd8cecd0e45109b7e62e056d642b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 1 13:57:44 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 1 20:36:28 2018 +0200

    rename XLinePreview back to SvxXLinePreview
    
    Change-Id: I833c4ae6e2944b484bb32532c20f5ef09917e712
    Reviewed-on: https://gerrit.libreoffice.org/61190
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index b873f8ae1ec7..36edebfd8330 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -135,7 +135,7 @@ private:
 
     sal_Int32           m_nActLineWidth;
 
-    XLinePreview m_aCtlPreview;
+    SvxXLinePreview m_aCtlPreview;
     std::unique_ptr<weld::Widget> m_xBoxColor;
     std::unique_ptr<SvxLineLB> m_xLbLineStyle;
     std::unique_ptr<ColorListBox> m_xLbColor;
@@ -262,7 +262,7 @@ private:
     MapUnit             ePoolUnit;
     FieldUnit           eFUnit;
 
-    XLinePreview m_aCtlPreview;
+    SvxXLinePreview m_aCtlPreview;
     std::unique_ptr<SvxLineLB> m_xLbLineStyles;
     std::unique_ptr<weld::ComboBox> m_xLbType1;
     std::unique_ptr<weld::ComboBox> m_xLbType2;
@@ -345,7 +345,7 @@ private:
     sal_uInt16          nDlgType;
     sal_Int32*          pPosLineEndLb;
 
-    XLinePreview m_aCtlPreview;
+    SvxXLinePreview m_aCtlPreview;
     std::unique_ptr<weld::Entry> m_xEdtName;
     std::unique_ptr<SvxLineEndLB> m_xLbLineEnds;
     std::unique_ptr<weld::Button> m_xBtnAdd;
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 4827842df60a..6238c4a3c21d 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -423,7 +423,7 @@ public:
 |*
 \************************************************************************/
 
-class SAL_WARN_UNUSED SVX_DLLPUBLIC XLinePreview : public PreviewBase
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXLinePreview : public PreviewBase
 {
 private:
     SdrPathObj*                                     mpLineObjA;
@@ -435,9 +435,9 @@ private:
     Size                                            maSymbolSize;
 
 public:
-    XLinePreview();
+    SvxXLinePreview();
     virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
-    virtual ~XLinePreview() override;
+    virtual ~SvxXLinePreview() override;
 
     void SetLineAttributes(const SfxItemSet& rItemSet);
 
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 35f1964313f1..dbf5be9a034f 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1336,7 +1336,7 @@ void SvxPreviewBase::DataChanged(const DataChangedEvent& rDCEvt)
     }
 }
 
-void XLinePreview::Resize()
+void SvxXLinePreview::Resize()
 {
     PreviewBase::Resize();
 
@@ -1376,7 +1376,7 @@ void XLinePreview::Resize()
     mpLineObjC->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonC));
 }
 
-XLinePreview::XLinePreview()
+SvxXLinePreview::SvxXLinePreview()
     : mpLineObjA(nullptr)
     , mpLineObjB(nullptr)
     , mpLineObjC(nullptr)
@@ -1385,7 +1385,7 @@ XLinePreview::XLinePreview()
 {
 }
 
-void XLinePreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void SvxXLinePreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
     PreviewBase::SetDrawingArea(pDrawingArea);
 
@@ -1397,7 +1397,7 @@ void XLinePreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
     Invalidate();
 }
 
-XLinePreview::~XLinePreview()
+SvxXLinePreview::~SvxXLinePreview()
 {
     SdrObject *pFoo = mpLineObjA;
     SdrObject::Free( pFoo );
@@ -1407,13 +1407,13 @@ XLinePreview::~XLinePreview()
     SdrObject::Free( pFoo );
 }
 
-void XLinePreview::SetSymbol(Graphic* p,const Size& s)
+void SvxXLinePreview::SetSymbol(Graphic* p,const Size& s)
 {
     mpGraphic = p;
     maSymbolSize = s;
 }
 
-void XLinePreview::ResizeSymbol(const Size& s)
+void SvxXLinePreview::ResizeSymbol(const Size& s)
 {
     if ( s != maSymbolSize )
     {
@@ -1422,7 +1422,7 @@ void XLinePreview::ResizeSymbol(const Size& s)
     }
 }
 
-void XLinePreview::SetLineAttributes(const SfxItemSet& rItemSet)
+void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet)
 {
     // Set ItemSet at objects
     mpLineObjA->SetMergedItemSet(rItemSet);
@@ -1436,7 +1436,7 @@ void XLinePreview::SetLineAttributes(const SfxItemSet& rItemSet)
     mpLineObjC->SetMergedItemSet(aTempSet);
 }
 
-void XLinePreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
+void SvxXLinePreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     LocalPrePaint(rRenderContext);