Unindent.

Change-Id: I40f97fb81993ea59e23430d4680981c6b2ed35ad

2 files changed, 386 insertions, 394 deletions

diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 67241aa45cd2..77ed1cc8a23d 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -29,269 +29,266 @@
 
 using namespace com::sun::star;
 
-namespace sdr
+namespace sdr { namespace contact {
+
+ObjectContact::ObjectContact()
+:   maViewObjectContactVector(),
+    maPrimitiveAnimator(),
+    mpEventHandler(0),
+    mpViewObjectContactRedirector(0),
+    maViewInformation2D(uno::Sequence< beans::PropertyValue >()),
+    mbIsPreviewRenderer(false)
 {
-    namespace contact
+}
+
+ObjectContact::~ObjectContact()
+{
+    // get rid of all registered contacts
+    // #i84257# To avoid that each 'delete pCandidate' again uses
+    // the local RemoveViewObjectContact with a search and removal in the
+    // vector, simply copy and clear local vector.
+    std::vector< ViewObjectContact* > aLocalVOCList(maViewObjectContactVector);
+    maViewObjectContactVector.clear();
+
+    while(!aLocalVOCList.empty())
+    {
+        ViewObjectContact* pCandidate = aLocalVOCList.back();
+        aLocalVOCList.pop_back();
+        DBG_ASSERT(pCandidate, "Corrupted ViewObjectContactList (!)");
+
+        // ViewObjectContacts only make sense with View and Object contacts.
+        // When the contact to the SdrObject is deleted like in this case,
+        // all ViewObjectContacts can be deleted, too.
+        delete pCandidate;
+    }
+
+    // assert when there were new entries added during deletion
+    DBG_ASSERT(maViewObjectContactVector.empty(), "Corrupted ViewObjectContactList (!)");
+
+    // delete the EventHandler. This will destroy all still contained events.
+    DeleteEventHandler();
+}
+
+// LazyInvalidate request. Default implementation directly handles
+// this by calling back triggerLazyInvalidate() at the VOC
+void ObjectContact::setLazyInvalidate(ViewObjectContact& rVOC)
+{
+    rVOC.triggerLazyInvalidate();
+}
+
+// call this to support evtl. preparations for repaint. Default does nothing
+void ObjectContact::PrepareProcessDisplay()
+{
+}
+
+// A new ViewObjectContact was created and shall be remembered.
+void ObjectContact::AddViewObjectContact(ViewObjectContact& rVOContact)
+{
+    maViewObjectContactVector.push_back(&rVOContact);
+}
+
+// A ViewObjectContact was deleted and shall be forgotten.
+void ObjectContact::RemoveViewObjectContact(ViewObjectContact& rVOContact)
+{
+    std::vector< ViewObjectContact* >::iterator aFindResult = std::find(maViewObjectContactVector.begin(), maViewObjectContactVector.end(), &rVOContact);
+
+    if(aFindResult != maViewObjectContactVector.end())
+    {
+        maViewObjectContactVector.erase(aFindResult);
+    }
+}
+
+// Process the whole displaying
+void ObjectContact::ProcessDisplay(DisplayInfo& /*rDisplayInfo*/)
+{
+    // default does nothing
+}
+
+// test if visualizing of entered groups is switched on at all
+bool ObjectContact::DoVisualizeEnteredGroup() const
+{
+    // Don not do that as default
+    return false;
+}
+
+// get active group's (the entered group) ViewContact
+const ViewContact* ObjectContact::getActiveViewContact() const
+{
+    // default has no active VC
+    return 0;
+}
+
+// Invalidate given rectangle at the window/output which is represented by
+// this ObjectContact.
+void ObjectContact::InvalidatePartOfView(const basegfx::B2DRange& /*rRange*/) const
+{
+    // nothing to do here in the default version
+}
+
+// Get info if given Rectangle is visible in this view
+bool ObjectContact::IsAreaVisible(const basegfx::B2DRange& /*rRange*/) const
+{
+    // always visible in default version
+    return true;
+}
+
+// Get info about the need to visualize GluePoints
+bool ObjectContact::AreGluePointsVisible() const
+{
+    return false;
+}
+
+// method to create a EventHandler. Needs to give a result.
+sdr::event::TimerEventHandler* ObjectContact::CreateEventHandler()
+{
+    // Create and return a new EventHandler
+    return new sdr::event::TimerEventHandler();
+}
+
+// method to get the primitiveAnimator
+
+// method to get the EventHandler. It will
+// return a existing one or create a new one using CreateEventHandler().
+sdr::event::TimerEventHandler& ObjectContact::GetEventHandler() const
+{
+    if(!HasEventHandler())
+    {
+        const_cast< ObjectContact* >(this)->mpEventHandler = const_cast< ObjectContact* >(this)->CreateEventHandler();
+        DBG_ASSERT(mpEventHandler, "ObjectContact::GetEventHandler(): Got no EventHandler (!)");
+    }
+
+    return *mpEventHandler;
+}
+
+// delete the EventHandler
+void ObjectContact::DeleteEventHandler()
+{
+    if(mpEventHandler)
+    {
+        // If there are still Events registered, something has went wrong
+        delete mpEventHandler;
+        mpEventHandler = 0L;
+    }
+}
+
+// test if there is an EventHandler without creating one on demand
+bool ObjectContact::HasEventHandler() const
+{
+    return (0L != mpEventHandler);
+}
+
+// check if text animation is allowed. Default is sal_true.
+bool ObjectContact::IsTextAnimationAllowed() const
+{
+    return true;
+}
+
+// check if graphic animation is allowed. Default is sal_true.
+bool ObjectContact::IsGraphicAnimationAllowed() const
+{
+    return true;
+}
+
+// check if asynchronous graphics loading is allowed. Default is false.
+bool ObjectContact::IsAsynchronGraphicsLoadingAllowed() const
+{
+    return false;
+}
+
+void ObjectContact::SetViewObjectContactRedirector(ViewObjectContactRedirector* pNew)
+{
+    if(mpViewObjectContactRedirector != pNew)
+    {
+        mpViewObjectContactRedirector = pNew;
+    }
+}
+
+// check if buffering of MasterPages is allowed. Default is false.
+bool ObjectContact::IsMasterPageBufferingAllowed() const
+{
+    return false;
+}
+
+// print? Default is false
+bool ObjectContact::isOutputToPrinter() const
+{
+    return false;
+}
+
+// window? Default is true
+bool ObjectContact::isOutputToWindow() const
+{
+    return true;
+}
+
+// VirtualDevice? Default is false
+bool ObjectContact::isOutputToVirtualDevice() const
+{
+    return false;
+}
+
+// recording MetaFile? Default is false
+bool ObjectContact::isOutputToRecordingMetaFile() const
+{
+    return false;
+}
+
+// pdf export? Default is false
+bool ObjectContact::isOutputToPDFFile() const
+{
+    return false;
+}
+
+// gray display mode
+bool ObjectContact::isDrawModeGray() const
+{
+    return false;
+}
+
+// gray display mode
+bool ObjectContact::isDrawModeBlackWhite() const
+{
+    return false;
+}
+
+// high contrast display mode
+bool ObjectContact::isDrawModeHighContrast() const
+{
+    return false;
+}
+
+// access to SdrPageView. Default implementation returns NULL
+SdrPageView* ObjectContact::TryToGetSdrPageView() const
+{
+    return 0;
+}
+
+// access to OutputDevice. Default implementation returns NULL
+OutputDevice* ObjectContact::TryToGetOutputDevice() const
+{
+    return 0;
+}
+
+void ObjectContact::resetViewPort()
+{
+    const drawinglayer::geometry::ViewInformation2D& rCurrentVI2D = getViewInformation2D();
+
+    if(!rCurrentVI2D.getViewport().isEmpty())
     {
-        ObjectContact::ObjectContact()
-        :   maViewObjectContactVector(),
-            maPrimitiveAnimator(),
-            mpEventHandler(0),
-            mpViewObjectContactRedirector(0),
-            maViewInformation2D(uno::Sequence< beans::PropertyValue >()),
-            mbIsPreviewRenderer(false)
-        {
-        }
-
-        ObjectContact::~ObjectContact()
-        {
-            // get rid of all registered contacts
-            // #i84257# To avoid that each 'delete pCandidate' again uses
-            // the local RemoveViewObjectContact with a search and removal in the
-            // vector, simply copy and clear local vector.
-            std::vector< ViewObjectContact* > aLocalVOCList(maViewObjectContactVector);
-            maViewObjectContactVector.clear();
-
-            while(!aLocalVOCList.empty())
-            {
-                ViewObjectContact* pCandidate = aLocalVOCList.back();
-                aLocalVOCList.pop_back();
-                DBG_ASSERT(pCandidate, "Corrupted ViewObjectContactList (!)");
-
-                // ViewObjectContacts only make sense with View and Object contacts.
-                // When the contact to the SdrObject is deleted like in this case,
-                // all ViewObjectContacts can be deleted, too.
-                delete pCandidate;
-            }
-
-            // assert when there were new entries added during deletion
-            DBG_ASSERT(maViewObjectContactVector.empty(), "Corrupted ViewObjectContactList (!)");
-
-            // delete the EventHandler. This will destroy all still contained events.
-            DeleteEventHandler();
-        }
-
-        // LazyInvalidate request. Default implementation directly handles
-        // this by calling back triggerLazyInvalidate() at the VOC
-        void ObjectContact::setLazyInvalidate(ViewObjectContact& rVOC)
-        {
-            rVOC.triggerLazyInvalidate();
-        }
-
-        // call this to support evtl. preparations for repaint. Default does nothing
-        void ObjectContact::PrepareProcessDisplay()
-        {
-        }
-
-        // A new ViewObjectContact was created and shall be remembered.
-        void ObjectContact::AddViewObjectContact(ViewObjectContact& rVOContact)
-        {
-            maViewObjectContactVector.push_back(&rVOContact);
-        }
-
-        // A ViewObjectContact was deleted and shall be forgotten.
-        void ObjectContact::RemoveViewObjectContact(ViewObjectContact& rVOContact)
-        {
-            std::vector< ViewObjectContact* >::iterator aFindResult = std::find(maViewObjectContactVector.begin(), maViewObjectContactVector.end(), &rVOContact);
-
-            if(aFindResult != maViewObjectContactVector.end())
-            {
-                maViewObjectContactVector.erase(aFindResult);
-            }
-        }
-
-        // Process the whole displaying
-        void ObjectContact::ProcessDisplay(DisplayInfo& /*rDisplayInfo*/)
-        {
-            // default does nothing
-        }
-
-        // test if visualizing of entered groups is switched on at all
-        bool ObjectContact::DoVisualizeEnteredGroup() const
-        {
-            // Don not do that as default
-            return false;
-        }
-
-        // get active group's (the entered group) ViewContact
-        const ViewContact* ObjectContact::getActiveViewContact() const
-        {
-            // default has no active VC
-            return 0;
-        }
-
-        // Invalidate given rectangle at the window/output which is represented by
-        // this ObjectContact.
-        void ObjectContact::InvalidatePartOfView(const basegfx::B2DRange& /*rRange*/) const
-        {
-            // nothing to do here in the default version
-        }
-
-        // Get info if given Rectangle is visible in this view
-        bool ObjectContact::IsAreaVisible(const basegfx::B2DRange& /*rRange*/) const
-        {
-            // always visible in default version
-            return true;
-        }
-
-        // Get info about the need to visualize GluePoints
-        bool ObjectContact::AreGluePointsVisible() const
-        {
-            return false;
-        }
-
-        // method to create a EventHandler. Needs to give a result.
-        sdr::event::TimerEventHandler* ObjectContact::CreateEventHandler()
-        {
-            // Create and return a new EventHandler
-            return new sdr::event::TimerEventHandler();
-        }
-
-        // method to get the primitiveAnimator
-
-        // method to get the EventHandler. It will
-        // return a existing one or create a new one using CreateEventHandler().
-        sdr::event::TimerEventHandler& ObjectContact::GetEventHandler() const
-        {
-            if(!HasEventHandler())
-            {
-                const_cast< ObjectContact* >(this)->mpEventHandler = const_cast< ObjectContact* >(this)->CreateEventHandler();
-                DBG_ASSERT(mpEventHandler, "ObjectContact::GetEventHandler(): Got no EventHandler (!)");
-            }
-
-            return *mpEventHandler;
-        }
-
-        // delete the EventHandler
-        void ObjectContact::DeleteEventHandler()
-        {
-            if(mpEventHandler)
-            {
-                // If there are still Events registered, something has went wrong
-                delete mpEventHandler;
-                mpEventHandler = 0L;
-            }
-        }
-
-        // test if there is an EventHandler without creating one on demand
-        bool ObjectContact::HasEventHandler() const
-        {
-            return (0L != mpEventHandler);
-        }
-
-        // check if text animation is allowed. Default is sal_true.
-        bool ObjectContact::IsTextAnimationAllowed() const
-        {
-            return true;
-        }
-
-        // check if graphic animation is allowed. Default is sal_true.
-        bool ObjectContact::IsGraphicAnimationAllowed() const
-        {
-            return true;
-        }
-
-        // check if asynchronous graphics loading is allowed. Default is false.
-        bool ObjectContact::IsAsynchronGraphicsLoadingAllowed() const
-        {
-            return false;
-        }
-
-        void ObjectContact::SetViewObjectContactRedirector(ViewObjectContactRedirector* pNew)
-        {
-            if(mpViewObjectContactRedirector != pNew)
-            {
-                mpViewObjectContactRedirector = pNew;
-            }
-        }
-
-        // check if buffering of MasterPages is allowed. Default is false.
-        bool ObjectContact::IsMasterPageBufferingAllowed() const
-        {
-            return false;
-        }
-
-        // print? Default is false
-        bool ObjectContact::isOutputToPrinter() const
-        {
-            return false;
-        }
-
-        // window? Default is true
-        bool ObjectContact::isOutputToWindow() const
-        {
-            return true;
-        }
-
-        // VirtualDevice? Default is false
-        bool ObjectContact::isOutputToVirtualDevice() const
-        {
-            return false;
-        }
-
-        // recording MetaFile? Default is false
-        bool ObjectContact::isOutputToRecordingMetaFile() const
-        {
-            return false;
-        }
-
-        // pdf export? Default is false
-        bool ObjectContact::isOutputToPDFFile() const
-        {
-            return false;
-        }
-
-        // gray display mode
-        bool ObjectContact::isDrawModeGray() const
-        {
-            return false;
-        }
-
-        // gray display mode
-        bool ObjectContact::isDrawModeBlackWhite() const
-        {
-            return false;
-        }
-
-        // high contrast display mode
-        bool ObjectContact::isDrawModeHighContrast() const
-        {
-            return false;
-        }
-
-        // access to SdrPageView. Default implementation returns NULL
-        SdrPageView* ObjectContact::TryToGetSdrPageView() const
-        {
-            return 0;
-        }
-
-        // access to OutputDevice. Default implementation returns NULL
-        OutputDevice* ObjectContact::TryToGetOutputDevice() const
-        {
-            return 0;
-        }
-
-        void ObjectContact::resetViewPort()
-        {
-            const drawinglayer::geometry::ViewInformation2D& rCurrentVI2D = getViewInformation2D();
-
-            if(!rCurrentVI2D.getViewport().isEmpty())
-            {
-                const basegfx::B2DRange aEmptyRange;
-
-                drawinglayer::geometry::ViewInformation2D aNewVI2D(
-                    rCurrentVI2D.getObjectTransformation(),
-                    rCurrentVI2D.getViewTransformation(),
-                    aEmptyRange,
-                    rCurrentVI2D.getVisualizedPage(),
-                    rCurrentVI2D.getViewTime(),
-                    rCurrentVI2D.getExtendedInformationSequence());
-
-                updateViewInformation2D(aNewVI2D);
-            }
-        }
-
-    } // end of namespace contact
-} // end of namespace sdr
+        const basegfx::B2DRange aEmptyRange;
+
+        drawinglayer::geometry::ViewInformation2D aNewVI2D(
+            rCurrentVI2D.getObjectTransformation(),
+            rCurrentVI2D.getViewTransformation(),
+            aEmptyRange,
+            rCurrentVI2D.getVisualizedPage(),
+            rCurrentVI2D.getViewTime(),
+            rCurrentVI2D.getExtendedInformationSequence());
+
+        updateViewInformation2D(aNewVI2D);
+    }
+}
+
+}}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 3da45e783d6a..ac74b2f22d48 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -34,170 +34,165 @@
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/svdhdl.hxx>
 
+namespace sdr { namespace contact {
 
+// Create a Object-Specific ViewObjectContact, set ViewContact and
+// ObjectContact. Always needs to return something.
+ViewObjectContact& ViewContactOfSdrObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact)
+{
+    ViewObjectContact* pRetval = new ViewObjectContactOfSdrObj(rObjectContact, *this);
+    DBG_ASSERT(pRetval, "ViewContactOfSdrObj::CreateObjectSpecificViewObjectContact() failed (!)");
+
+    return *pRetval;
+}
 
-namespace sdr
+ViewContactOfSdrObj::ViewContactOfSdrObj(SdrObject& rObj)
+:   ViewContact(),
+    mrObject(rObj),
+    meRememberedAnimationKind(SDRTEXTANI_NONE)
 {
-    namespace contact
+    // init AnimationKind
+    if(GetSdrObject().ISA(SdrTextObj))
     {
-        // Create a Object-Specific ViewObjectContact, set ViewContact and
-        // ObjectContact. Always needs to return something.
-        ViewObjectContact& ViewContactOfSdrObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact)
-        {
-            ViewObjectContact* pRetval = new ViewObjectContactOfSdrObj(rObjectContact, *this);
-            DBG_ASSERT(pRetval, "ViewContactOfSdrObj::CreateObjectSpecificViewObjectContact() failed (!)");
+        SdrTextObj& rTextObj = static_cast<SdrTextObj&>(GetSdrObject());
+        meRememberedAnimationKind = rTextObj.GetTextAniKind();
+    }
+}
 
-            return *pRetval;
-        }
+ViewContactOfSdrObj::~ViewContactOfSdrObj()
+{
+}
 
-        ViewContactOfSdrObj::ViewContactOfSdrObj(SdrObject& rObj)
-        :   ViewContact(),
-            mrObject(rObj),
-            meRememberedAnimationKind(SDRTEXTANI_NONE)
-        {
-            // init AnimationKind
-            if(GetSdrObject().ISA(SdrTextObj))
-            {
-                SdrTextObj& rTextObj = static_cast<SdrTextObj&>(GetSdrObject());
-                meRememberedAnimationKind = rTextObj.GetTextAniKind();
-            }
-        }
+// Access to possible sub-hierarchy
+sal_uInt32 ViewContactOfSdrObj::GetObjectCount() const
+{
+    if(GetSdrObject().GetSubList())
+    {
+        return GetSdrObject().GetSubList()->GetObjCount();
+    }
+
+    return 0L;
+}
 
-        ViewContactOfSdrObj::~ViewContactOfSdrObj()
+ViewContact& ViewContactOfSdrObj::GetViewContact(sal_uInt32 nIndex) const
+{
+    assert(GetSdrObject().GetSubList() &&
+        "ViewContactOfSdrObj::GetViewContact: Access to non-existent Sub-List (!)");
+    SdrObject* pObj = GetSdrObject().GetSubList()->GetObj(nIndex);
+    assert(pObj && "ViewContactOfSdrObj::GetViewContact: Corrupt SdrObjList (!)");
+    return pObj->GetViewContact();
+}
+
+ViewContact* ViewContactOfSdrObj::GetParentContact() const
+{
+    ViewContact* pRetval = 0L;
+    SdrObjList* pObjList = GetSdrObject().GetObjList();
+
+    if(pObjList)
+    {
+        if(pObjList->ISA(SdrPage))
         {
+            // Is a page
+            pRetval = &(static_cast<SdrPage*>(pObjList)->GetViewContact());
         }
-
-        // Access to possible sub-hierarchy
-        sal_uInt32 ViewContactOfSdrObj::GetObjectCount() const
+        else
         {
-            if(GetSdrObject().GetSubList())
+            // Is a group?
+            if(pObjList->GetOwnerObj())
             {
-                return GetSdrObject().GetSubList()->GetObjCount();
+                pRetval = &(pObjList->GetOwnerObj()->GetViewContact());
             }
-
-            return 0L;
         }
+    }
 
-        ViewContact& ViewContactOfSdrObj::GetViewContact(sal_uInt32 nIndex) const
-        {
-            assert(GetSdrObject().GetSubList() &&
-                "ViewContactOfSdrObj::GetViewContact: Access to non-existent Sub-List (!)");
-            SdrObject* pObj = GetSdrObject().GetSubList()->GetObj(nIndex);
-            assert(pObj && "ViewContactOfSdrObj::GetViewContact: Corrupt SdrObjList (!)");
-            return pObj->GetViewContact();
-        }
-
-        ViewContact* ViewContactOfSdrObj::GetParentContact() const
-        {
-            ViewContact* pRetval = 0L;
-            SdrObjList* pObjList = GetSdrObject().GetObjList();
+    return pRetval;
+}
 
-            if(pObjList)
-            {
-                if(pObjList->ISA(SdrPage))
-                {
-                    // Is a page
-                    pRetval = &(static_cast<SdrPage*>(pObjList)->GetViewContact());
-                }
-                else
-                {
-                    // Is a group?
-                    if(pObjList->GetOwnerObj())
-                    {
-                        pRetval = &(pObjList->GetOwnerObj()->GetViewContact());
-                    }
-                }
-            }
+// React on changes of the object of this ViewContact
+void ViewContactOfSdrObj::ActionChanged()
+{
+    // look for own changes
+    if(GetSdrObject().ISA(SdrTextObj))
+    {
+        SdrTextObj& rTextObj = static_cast<SdrTextObj&>(GetSdrObject());
 
-            return pRetval;
+        if(rTextObj.GetTextAniKind() != meRememberedAnimationKind)
+        {
+            // #i38135# now remember new type
+            meRememberedAnimationKind = rTextObj.GetTextAniKind();
         }
+    }
 
-        // React on changes of the object of this ViewContact
-        void ViewContactOfSdrObj::ActionChanged()
-        {
-            // look for own changes
-            if(GetSdrObject().ISA(SdrTextObj))
-            {
-                SdrTextObj& rTextObj = static_cast<SdrTextObj&>(GetSdrObject());
+    // call parent
+    ViewContact::ActionChanged();
+}
 
-                if(rTextObj.GetTextAniKind() != meRememberedAnimationKind)
-                {
-                    // #i38135# now remember new type
-                    meRememberedAnimationKind = rTextObj.GetTextAniKind();
-                }
-            }
+// overload for acessing the SdrObject
+SdrObject* ViewContactOfSdrObj::TryToGetSdrObject() const
+{
+    return &GetSdrObject();
+}
 
-            // call parent
-            ViewContact::ActionChanged();
-        }
 
-        // overload for acessing the SdrObject
-        SdrObject* ViewContactOfSdrObj::TryToGetSdrObject() const
-        {
-            return &GetSdrObject();
-        }
+// primitive stuff
 
+// add Gluepoints (if available)
+drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::createGluePointPrimitive2DSequence() const
+{
+    drawinglayer::primitive2d::Primitive2DSequence xRetval;
+    const SdrGluePointList* pGluePointList = GetSdrObject().GetGluePointList();
 
-        // primitive stuff
+    if(pGluePointList)
+    {
+        const sal_uInt32 nCount(pGluePointList->GetCount());
 
-        // add Gluepoints (if available)
-        drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::createGluePointPrimitive2DSequence() const
+        if(nCount)
         {
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
-            const SdrGluePointList* pGluePointList = GetSdrObject().GetGluePointList();
+            // prepare point vector
+            std::vector< basegfx::B2DPoint > aGluepointVector;
 
-            if(pGluePointList)
+            // create GluePoint primitives. ATM these are relative to the SnapRect
+            for(sal_uInt32 a(0L); a < nCount; a++)
             {
-                const sal_uInt32 nCount(pGluePointList->GetCount());
-
-                if(nCount)
-                {
-                    // prepare point vector
-                    std::vector< basegfx::B2DPoint > aGluepointVector;
-
-                    // create GluePoint primitives. ATM these are relative to the SnapRect
-                    for(sal_uInt32 a(0L); a < nCount; a++)
-                    {
-                        const SdrGluePoint& rCandidate = (*pGluePointList)[(sal_uInt16)a];
-                        const Point aPosition(rCandidate.GetAbsolutePos(GetSdrObject()));
-
-                        aGluepointVector.push_back(basegfx::B2DPoint(aPosition.X(), aPosition.Y()));
-                    }
-
-                    if(!aGluepointVector.empty())
-                    {
-                        const drawinglayer::primitive2d::Primitive2DReference xReference(
-                                new drawinglayer::primitive2d::MarkerArrayPrimitive2D(
-                                        aGluepointVector, SdrHdl::createGluePointBitmap()));
-                        xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
-                    }
-                }
-            }
+                const SdrGluePoint& rCandidate = (*pGluePointList)[(sal_uInt16)a];
+                const Point aPosition(rCandidate.GetAbsolutePos(GetSdrObject()));
 
-            return xRetval;
-        }
+                aGluepointVector.push_back(basegfx::B2DPoint(aPosition.X(), aPosition.Y()));
+            }
 
-        drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const
-        {
-            if(rSource.hasElements() &&
-                (!GetSdrObject().GetName().isEmpty() ||
-                 !GetSdrObject().GetTitle().isEmpty() ||
-                 !GetSdrObject().GetDescription().isEmpty()))
+            if(!aGluepointVector.empty())
             {
-                const drawinglayer::primitive2d::Primitive2DReference xRef(
-                    new drawinglayer::primitive2d::ObjectInfoPrimitive2D(
-                        rSource,
-                        GetSdrObject().GetName(),
-                        GetSdrObject().GetTitle(),
-                        GetSdrObject().GetDescription()));
-
-                return drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1);
+                const drawinglayer::primitive2d::Primitive2DReference xReference(
+                        new drawinglayer::primitive2d::MarkerArrayPrimitive2D(
+                                aGluepointVector, SdrHdl::createGluePointBitmap()));
+                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
             }
-
-            return rSource;
         }
+    }
+
+    return xRetval;
+}
+
+drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const
+{
+    if(rSource.hasElements() &&
+        (!GetSdrObject().GetName().isEmpty() ||
+         !GetSdrObject().GetTitle().isEmpty() ||
+         !GetSdrObject().GetDescription().isEmpty()))
+    {
+        const drawinglayer::primitive2d::Primitive2DReference xRef(
+            new drawinglayer::primitive2d::ObjectInfoPrimitive2D(
+                rSource,
+                GetSdrObject().GetName(),
+                GetSdrObject().GetTitle(),
+                GetSdrObject().GetDescription()));
+
+        return drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1);
+    }
+
+    return rSource;
+}
 
-    } // end of namespace contact
-} // end of namespace sdr
+}}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */