3 files changed, 17 insertions, 17 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 88232baaf86e..31932eba7c55 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -148,8 +148,8 @@ class SvxTransparenceTabPage : public SfxTabPage
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
 
-    XRectPreview     m_aCtlBitmapPreview;
-    XRectPreview     m_aCtlXRectPreview;
+    SvxXRectPreview     m_aCtlBitmapPreview;
+    SvxXRectPreview     m_aCtlXRectPreview;
 
     // main selection
     std::unique_ptr<weld::RadioButton> m_xRbtTransOff;
@@ -367,7 +367,7 @@ private:
     XFillAttrSetItem    m_aXFillAttr;
     SfxItemSet&         m_rXFSet;
 
-    XRectPreview m_aCtlPreview;
+    SvxXRectPreview m_aCtlPreview;
     std::unique_ptr<weld::ComboBox> m_xLbGradientType;
     std::unique_ptr<weld::Label> m_xFtCenter;
     std::unique_ptr<weld::MetricSpinButton> m_xMtrCenterX;
@@ -448,7 +448,7 @@ private:
 
     MapUnit             m_ePoolUnit;
 
-    XRectPreview m_aCtlPreview;
+    SvxXRectPreview m_aCtlPreview;
     std::unique_ptr<weld::MetricSpinButton> m_xMtrDistance;
     std::unique_ptr<weld::MetricSpinButton> m_xMtrAngle;
     std::unique_ptr<weld::Scale> m_xSliderAngle;
@@ -529,7 +529,7 @@ private:
     Size                       rFilledSize;
     Size                       rZoomedSize;
 
-    XRectPreview m_aCtlBitmapPreview;
+    SvxXRectPreview m_aCtlBitmapPreview;
     std::unique_ptr<PresetListBox>   m_xBitmapLB;
     std::unique_ptr<weld::ComboBox> m_xBitmapStyleLB;
     std::unique_ptr<weld::Container> m_xSizeBox;
@@ -599,7 +599,7 @@ private:
     XFillAttrSetItem    m_aXFillAttr;
     SfxItemSet&         m_rXFSet;
 
-    XRectPreview m_aCtlPreview;
+    SvxXRectPreview m_aCtlPreview;
     std::unique_ptr<SvxPixelCtl> m_xCtlPixel;
     std::unique_ptr<ColorListBox> m_xLbColor;
     std::unique_ptr<ColorListBox> m_xLbBackgroundColor;
@@ -676,8 +676,8 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_context;
 
     PaletteManager maPaletteManager;
-    XRectPreview m_aCtlPreviewOld;
-    XRectPreview m_aCtlPreviewNew;
+    SvxXRectPreview m_aCtlPreviewOld;
+    SvxXRectPreview m_aCtlPreviewNew;
     std::unique_ptr<ColorValueSet> m_xValSetColorList;
     std::unique_ptr<ColorValueSet> m_xValSetRecentList;
     std::unique_ptr<weld::ComboBox> m_xSelectPalette;
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index a6a1910956ab..90c4fc6e8f6d 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -398,15 +398,15 @@ public:
     virtual Size GetOptimalSize() const override;
 };
 
-class SAL_WARN_UNUSED SVX_DLLPUBLIC XRectPreview : public PreviewBase
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXRectPreview : public PreviewBase
 {
 private:
     SdrObject* mpRectangleObject;
 
 public:
-    XRectPreview();
+    SvxXRectPreview();
     virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
-    virtual ~XRectPreview() override;
+    virtual ~SvxXRectPreview() override;
 
     void SetAttributes(const SfxItemSet& rItemSet);
 
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 4850967c52fd..0750a5355853 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1626,7 +1626,7 @@ void PreviewBase::StyleUpdated()
     CustomWidgetController::StyleUpdated();
 }
 
-XRectPreview::XRectPreview()
+SvxXRectPreview::SvxXRectPreview()
     : mpRectangleObject(nullptr)
 {
 }
@@ -1637,7 +1637,7 @@ tools::Rectangle PreviewBase::GetPreviewSize() const
     return aObjectSize;
 }
 
-void XRectPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void SvxXRectPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
     PreviewBase::SetDrawingArea(pDrawingArea);
     InitSettings();
@@ -1646,7 +1646,7 @@ void XRectPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
     mpRectangleObject = new SdrRectObj(getModel(), GetPreviewSize());
 }
 
-void XRectPreview::Resize()
+void SvxXRectPreview::Resize()
 {
     SdrObject *pOrigObject = mpRectangleObject;
     if (pOrigObject)
@@ -1658,18 +1658,18 @@ void XRectPreview::Resize()
     PreviewBase::Resize();
 }
 
-XRectPreview::~XRectPreview()
+SvxXRectPreview::~SvxXRectPreview()
 {
     SdrObject::Free(mpRectangleObject);
 }
 
-void XRectPreview::SetAttributes(const SfxItemSet& rItemSet)
+void SvxXRectPreview::SetAttributes(const SfxItemSet& rItemSet)
 {
     mpRectangleObject->SetMergedItemSet(rItemSet, true);
     mpRectangleObject->SetMergedItem(XLineStyleItem(drawing::LineStyle_NONE));
 }
 
-void XRectPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
+void SvxXRectPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     rRenderContext.Push(PushFlags::MAPMODE);
     rRenderContext.SetMapMode(MapMode(MapUnit::Map100thMM));