8 files changed, 37 insertions, 0 deletions
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 666a81c92312..f4b959ce435d 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -28,6 +28,8 @@
 #include <set>
 #include <vector>
 
+namespace {
+
 //rhbz#1007697 do this in two loops, one to collect the candidates
 //and another to update them because updating a candidate can
 //trigger the candidate to be deleted, so asking for its
@@ -42,6 +44,8 @@ public:
     ~CandidateMgr();
 };
 
+}
+
 IMPL_LINK(CandidateMgr, WindowEventListener, VclWindowEvent&, rEvent, void)
 {
     vcl::Window* pWindow = rEvent.GetWindow();
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index f0836ed14f69..286b74bb5a23 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -757,6 +757,8 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
     }
 }
 
+namespace {
+
 // for distribution dialog function
 struct ImpDistributeEntry
 {
@@ -765,6 +767,8 @@ struct ImpDistributeEntry
     sal_Int32                       mnLength;
 };
 
+}
+
 typedef vector<ImpDistributeEntry> ImpDistributeEntryList;
 
 void SdrEditView::DistributeMarkedObjects(weld::Window* pParent)
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index e6fd42899721..fc1a6caf7d3a 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -70,6 +70,8 @@
 #include <memory>
 #include <bitmaps.hlst>
 
+namespace {
+
 // #i15222#
 // Due to the resource problems in Win95/98 with bitmap resources I
 // will change this handle bitmap providing class. Old version was splitting
@@ -95,6 +97,7 @@ public:
     const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
 };
 
+}
 
 #define KIND_COUNT          (14)
 #define INDEX_COUNT         (6)
@@ -1912,6 +1915,7 @@ static bool ImpSdrHdlListSorter(std::unique_ptr<SdrHdl> const& lhs, std::unique_
     }
 }
 
+namespace {
 
 // Helper struct for re-sorting handles
 struct ImplHdlAndIndex
@@ -1920,6 +1924,8 @@ struct ImplHdlAndIndex
     sal_uInt32                  mnIndex;
 };
 
+}
+
 extern "C" {
 
 // Helper method for sorting handles taking care of OrdNums, keeping order in
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index c104a33ae21a..7c5aa3bf9196 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -396,6 +396,8 @@ basegfx::B2DPolyPolygon SdrCircObj::TakeXorPoly() const
     return basegfx::B2DPolyPolygon(aCircPolygon);
 }
 
+namespace {
+
 struct ImpCircUser : public SdrDragStatUserData
 {
     tools::Rectangle                   aR;
@@ -416,6 +418,8 @@ public:
     void SetCreateParams(SdrDragStat const & rStat);
 };
 
+}
+
 sal_uInt32 SdrCircObj::GetHdlCount() const
 {
     if(SdrCircKind::Full != meCircleKind)
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index c992fadae228..ca047cde59af 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -270,12 +270,16 @@ struct ImpMeasureRec : public SdrDragStatUserData
     long                        nTextAutoAngleView;
 };
 
+namespace {
+
 struct ImpLineRec
 {
     Point                       aP1;
     Point                       aP2;
 };
 
+}
+
 struct ImpMeasurePoly
 {
     ImpLineRec                  aMainline1; // those with the 1st arrowhead
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 16617ecaf94f..6f4ed4edcb8e 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -108,6 +108,8 @@ static uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Ob
     return xFrame;
 }
 
+namespace {
+
 class SdrLightEmbeddedClient_Impl : public ::cppu::WeakImplHelper
                                                             < embed::XStateChangeListener
                                                             , document::XEventListener
@@ -175,6 +177,8 @@ private:
     virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() override;
 };
 
+}
+
 SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj )
 : mpObj( pObj )
 {
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 0ae3fe029ef7..b586d83b3079 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -74,6 +74,8 @@ static sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed)
     return nPnt;
 }
 
+namespace {
+
 struct ImpSdrPathDragData  : public SdrDragStatUserData
 {
     XPolygon                    aXP;            // section of the original polygon
@@ -112,6 +114,8 @@ public:
     bool IsMultiPointDrag() const { return mbMultiPointDrag; }
 };
 
+}
+
 ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, bool bMuPoDr, const SdrDragStat& rDrag)
     : aXP(5)
     , bValid(false)
@@ -224,6 +228,8 @@ void ImpSdrPathDragData::ResetPoly(const SdrPathObj& rPO)
     aXP[4]=aTmpXP[nNextNextPnt0];  aXP.SetFlags(4,aTmpXP.GetFlags(nNextNextPnt0));
 }
 
+namespace {
+
 struct ImpPathCreateUser  : public SdrDragStatUserData
 {
     Point                   aBezControl0;
@@ -273,6 +279,8 @@ public:
     XPolygon GetRectPoly() const;
 };
 
+}
+
 XPolygon ImpPathCreateUser::GetFormPoly() const
 {
     if (bBezier) return GetBezierPoly();
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index b392e9523f79..dee1f97d0223 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -110,10 +110,13 @@ long lcl_ToLogic(double value)
 double sqrt2(double a, double b) { return sqrt(a * a + b * b); }
 }
 
+namespace
+{
 struct FPDFBitmapDeleter
 {
     void operator()(FPDF_BITMAP bitmap) { FPDFBitmap_Destroy(bitmap); }
 };
+}
 
 using namespace com::sun::star;