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

Kohei Yoshida kohei.yoshida at collabora.com
Fri Oct 31 12:34:06 PDT 2014


 svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx |  974 ++++++++----------
 1 file changed, 444 insertions(+), 530 deletions(-)

New commits:
commit b47342a8a382dc04d12bad4e628e9562036c01f8
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Oct 31 15:32:27 2014 -0400

    Remove repetitive namespace close / re-open & unindent.
    
    Change-Id: I453084b3b034a04305058da404b334c7016559ce

diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 43f3f09..4ca35ba 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -32,687 +32,601 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <sdr/primitive2d/sdrprimitivetools.hxx>
 
+using namespace com::sun::star;
 
+namespace sdr { namespace contact {
 
-using namespace com::sun::star;
+const SdrPage& ViewObjectContactOfPageSubObject::getPage() const
+{
+    return static_cast< ViewContactOfPageSubObject& >(GetViewContact()).getPage();
+}
 
+ViewObjectContactOfPageSubObject::ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContact(rObjectContact, rViewContact)
+{
+}
 
+ViewObjectContactOfPageSubObject::~ViewObjectContactOfPageSubObject()
+{
+}
 
-namespace sdr
+bool ViewObjectContactOfPageSubObject::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
 {
-    namespace contact
+    if(rDisplayInfo.GetSubContentActive())
     {
-        const SdrPage& ViewObjectContactOfPageSubObject::getPage() const
-        {
-            return static_cast< ViewContactOfPageSubObject& >(GetViewContact()).getPage();
-        }
+        return false;
+    }
 
-        ViewObjectContactOfPageSubObject::ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContact(rObjectContact, rViewContact)
-        {
-        }
+    if(rDisplayInfo.GetControlLayerProcessingActive())
+    {
+        return false;
+    }
 
-        ViewObjectContactOfPageSubObject::~ViewObjectContactOfPageSubObject()
-        {
-        }
+    if(!rDisplayInfo.GetPageProcessingActive())
+    {
+        return false;
+    }
 
-        bool ViewObjectContactOfPageSubObject::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(rDisplayInfo.GetSubContentActive())
-            {
-                return false;
-            }
+    if(GetObjectContact().isOutputToPrinter())
+    {
+        return false;
+    }
 
-            if(rDisplayInfo.GetControlLayerProcessingActive())
-            {
-                return false;
-            }
+    if(!GetObjectContact().TryToGetSdrPageView())
+    {
+        return false;
+    }
 
-            if(!rDisplayInfo.GetPageProcessingActive())
-            {
-                return false;
-            }
+    return true;
+}
 
-            if(GetObjectContact().isOutputToPrinter())
-            {
-                return false;
-            }
+bool ViewObjectContactOfPageSubObject::isPrimitiveGhosted(const DisplayInfo& /*rDisplayInfo*/) const
+{
+    // suppress ghosted for page parts
+    return false;
+}
 
-            if(!GetObjectContact().TryToGetSdrPageView())
-            {
-                return false;
-            }
+ViewObjectContactOfPageBackground::ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
 
-            return true;
-        }
+ViewObjectContactOfPageBackground::~ViewObjectContactOfPageBackground()
+{
+}
 
-        bool ViewObjectContactOfPageSubObject::isPrimitiveGhosted(const DisplayInfo& /*rDisplayInfo*/) const
-        {
-            // suppress ghosted for page parts
-            return false;
-        }
-    } // end of namespace contact
-} // end of namespace sdr
+bool ViewObjectContactOfPageBackground::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+    {
+        return false;
+    }
 
+    // no page background for preview renderers
+    if(GetObjectContact().IsPreviewRenderer())
+    {
+        return false;
+    }
 
+    return true;
+}
 
-namespace sdr
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageBackground::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
 {
-    namespace contact
+    // Initialize background. Dependent of IsPageVisible, use ApplicationBackgroundColor or ApplicationDocumentColor. Most
+    // old renderers for export (html, pdf, gallery, ...) set the page to not visible (SetPageVisible(false)). They expect the
+    // given OutputDevice to be initialized with the ApplicationDocumentColor then.
+    const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+    drawinglayer::primitive2d::Primitive2DSequence xRetval;
+
+    if(pPageView)
     {
-        ViewObjectContactOfPageBackground::ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
+        const SdrView& rView = pPageView->GetView();
+        Color aInitColor;
 
-        ViewObjectContactOfPageBackground::~ViewObjectContactOfPageBackground()
+        if(rView.IsPageVisible())
         {
+            aInitColor = pPageView->GetApplicationBackgroundColor();
         }
-
-        bool ViewObjectContactOfPageBackground::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+        else
         {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
+            aInitColor = pPageView->GetApplicationDocumentColor();
 
-            // no page background for preview renderers
-            if(GetObjectContact().IsPreviewRenderer())
+            if(Color(COL_AUTO) == aInitColor)
             {
-                return false;
+                const svtools::ColorConfig aColorConfig;
+                aInitColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
             }
-
-            return true;
         }
 
-        drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageBackground::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
-        {
-            // Initialize background. Dependent of IsPageVisible, use ApplicationBackgroundColor or ApplicationDocumentColor. Most
-            // old renderers for export (html, pdf, gallery, ...) set the page to not visible (SetPageVisible(false)). They expect the
-            // given OutputDevice to be initialized with the ApplicationDocumentColor then.
-            const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
-
-            if(pPageView)
-            {
-                const SdrView& rView = pPageView->GetView();
-                Color aInitColor;
-
-                if(rView.IsPageVisible())
-                {
-                    aInitColor = pPageView->GetApplicationBackgroundColor();
-                }
-                else
-                {
-                    aInitColor = pPageView->GetApplicationDocumentColor();
-
-                    if(Color(COL_AUTO) == aInitColor)
-                    {
-                        const svtools::ColorConfig aColorConfig;
-                        aInitColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
-                    }
-                }
-
-                // init background with InitColor
-                xRetval.realloc(1);
-                const basegfx::BColor aRGBColor(aInitColor.getBColor());
-                xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::BackgroundColorPrimitive2D(aRGBColor));
-            }
+        // init background with InitColor
+        xRetval.realloc(1);
+        const basegfx::BColor aRGBColor(aInitColor.getBColor());
+        xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::BackgroundColorPrimitive2D(aRGBColor));
+    }
 
-            return xRetval;
-        }
-    } // end of namespace contact
-} // end of namespace sdr
+    return xRetval;
+}
 
+ViewObjectContactOfMasterPage::ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
 
+ViewObjectContactOfMasterPage::~ViewObjectContactOfMasterPage()
+{
+}
 
-namespace sdr
+bool ViewObjectContactOfMasterPage::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
 {
-    namespace contact
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
     {
-        ViewObjectContactOfMasterPage::ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
+        return false;
+    }
 
-        ViewObjectContactOfMasterPage::~ViewObjectContactOfMasterPage()
-        {
-        }
+    // this object is only used for MasterPages. When not the MasterPage is
+    // displayed as a page, but another page is using it as sub-object, the
+    // geometry needs to be hidden
+    if(rDisplayInfo.GetSubContentActive())
+    {
+        return false;
+    }
 
-        bool ViewObjectContactOfMasterPage::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
+    return true;
+}
 
-            // this object is only used for MasterPages. When not the MasterPage is
-            // displayed as a page, but another page is using it as sub-object, the
-            // geometry needs to be hidden
-            if(rDisplayInfo.GetSubContentActive())
-            {
-                return false;
-            }
+ViewObjectContactOfPageFill::ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
 
-            return true;
-        }
-    } // end of namespace contact
-} // end of namespace sdr
+ViewObjectContactOfPageFill::~ViewObjectContactOfPageFill()
+{
+}
 
+bool ViewObjectContactOfPageFill::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+    {
+        return false;
+    }
 
+    SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
 
-namespace sdr
-{
-    namespace contact
+    if(!pSdrPageView)
     {
-        ViewObjectContactOfPageFill::ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
+        return false;
+    }
 
-        ViewObjectContactOfPageFill::~ViewObjectContactOfPageFill()
-        {
-        }
+    if(!pSdrPageView->GetView().IsPageVisible())
+    {
+        return false;
+    }
 
-        bool ViewObjectContactOfPageFill::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
+    return true;
+}
 
-            SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageFill::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+{
+    const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+    drawinglayer::primitive2d::Primitive2DSequence xRetval;
 
-            if(!pSdrPageView)
-            {
-                return false;
-            }
+    if(pPageView)
+    {
+        const SdrPage& rPage = getPage();
 
-            if(!pSdrPageView->GetView().IsPageVisible())
-            {
-                return false;
-            }
+        const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
+        const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange));
+        Color aPageFillColor;
 
-            return true;
+        if(pPageView->GetApplicationDocumentColor() != COL_AUTO)
+        {
+            aPageFillColor = pPageView->GetApplicationDocumentColor();
         }
-
-        drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageFill::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+        else
         {
-            const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
-
-            if(pPageView)
-            {
-                const SdrPage& rPage = getPage();
-
-                const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
-                const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange));
-                Color aPageFillColor;
-
-                if(pPageView->GetApplicationDocumentColor() != COL_AUTO)
-                {
-                    aPageFillColor = pPageView->GetApplicationDocumentColor();
-                }
-                else
-                {
-                    const svtools::ColorConfig aColorConfig;
-                    aPageFillColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
-                }
-
-                // create and add primitive
-                xRetval.realloc(1);
-                const basegfx::BColor aRGBColor(aPageFillColor.getBColor());
-                xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor));
-            }
-
-            return xRetval;
+            const svtools::ColorConfig aColorConfig;
+            aPageFillColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
         }
-    } // end of namespace contact
-} // end of namespace sdr
 
+        // create and add primitive
+        xRetval.realloc(1);
+        const basegfx::BColor aRGBColor(aPageFillColor.getBColor());
+        xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor));
+    }
 
+    return xRetval;
+}
 
-namespace sdr
+ViewObjectContactOfPageShadow::ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
 {
-    namespace contact
-    {
-        ViewObjectContactOfPageShadow::ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
+}
 
-        ViewObjectContactOfPageShadow::~ViewObjectContactOfPageShadow()
-        {
-        }
+ViewObjectContactOfPageShadow::~ViewObjectContactOfPageShadow()
+{
+}
 
-        bool ViewObjectContactOfPageShadow::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
+bool ViewObjectContactOfPageShadow::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+    {
+        return false;
+    }
 
-            SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+    SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
 
-            if(!pSdrPageView)
-            {
-                return false;
-            }
+    if(!pSdrPageView)
+    {
+        return false;
+    }
 
-            if(!pSdrPageView->GetView().IsPageVisible())
-            {
-                return false;
-            }
+    if(!pSdrPageView->GetView().IsPageVisible())
+    {
+        return false;
+    }
 
-            // no page shadow for preview renderers
-            if(GetObjectContact().IsPreviewRenderer())
-            {
-                return false;
-            }
+    // no page shadow for preview renderers
+    if(GetObjectContact().IsPreviewRenderer())
+    {
+        return false;
+    }
 
-            // no page shadow for high contrast mode
-            if(GetObjectContact().isDrawModeHighContrast())
-            {
-                return false;
-            }
+    // no page shadow for high contrast mode
+    if(GetObjectContact().isDrawModeHighContrast())
+    {
+        return false;
+    }
 
-            return true;
-        }
-    } // end of namespace contact
-} // end of namespace sdr
+    return true;
+}
 
+ViewObjectContactOfOuterPageBorder::ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
 
+ViewObjectContactOfOuterPageBorder::~ViewObjectContactOfOuterPageBorder()
+{
+}
 
-namespace sdr
+bool ViewObjectContactOfOuterPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
 {
-    namespace contact
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
     {
-        ViewObjectContactOfOuterPageBorder::ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
-
-        ViewObjectContactOfOuterPageBorder::~ViewObjectContactOfOuterPageBorder()
-        {
-        }
-
-        bool ViewObjectContactOfOuterPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
+        return false;
+    }
 
-            SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+    SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
 
-            if(!pSdrPageView)
-            {
-                return false;
-            }
+    if(!pSdrPageView)
+    {
+        return false;
+    }
 
-            const SdrView& rView = pSdrPageView->GetView();
+    const SdrView& rView = pSdrPageView->GetView();
 
-            if(!rView.IsPageVisible() && rView.IsPageBorderVisible())
-            {
-                return false;
-            }
+    if(!rView.IsPageVisible() && rView.IsPageBorderVisible())
+    {
+        return false;
+    }
 
-            return true;
-        }
-    } // end of namespace contact
-} // end of namespace sdr
+    return true;
+}
 
+ViewObjectContactOfInnerPageBorder::ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
 
+ViewObjectContactOfInnerPageBorder::~ViewObjectContactOfInnerPageBorder()
+{
+}
 
-namespace sdr
+bool ViewObjectContactOfInnerPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
 {
-    namespace contact
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
     {
-        ViewObjectContactOfInnerPageBorder::ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
+        return false;
+    }
 
-        ViewObjectContactOfInnerPageBorder::~ViewObjectContactOfInnerPageBorder()
-        {
-        }
+    SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
 
-        bool ViewObjectContactOfInnerPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
+    if(!pSdrPageView)
+    {
+        return false;
+    }
 
-            SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+    if(!pSdrPageView->GetView().IsBordVisible())
+    {
+        return false;
+    }
 
-            if(!pSdrPageView)
-            {
-                return false;
-            }
+    const SdrPage& rPage = getPage();
 
-            if(!pSdrPageView->GetView().IsBordVisible())
-            {
-                return false;
-            }
+    if(!rPage.GetLftBorder() && !rPage.GetUppBorder() && !rPage.GetRgtBorder() && !rPage.GetLwrBorder())
+    {
+        return false;
+    }
 
-            const SdrPage& rPage = getPage();
+    // no inner page border for preview renderers
+    if(GetObjectContact().IsPreviewRenderer())
+    {
+        return false;
+    }
 
-            if(!rPage.GetLftBorder() && !rPage.GetUppBorder() && !rPage.GetRgtBorder() && !rPage.GetLwrBorder())
-            {
-                return false;
-            }
+    return true;
+}
 
-            // no inner page border for preview renderers
-            if(GetObjectContact().IsPreviewRenderer())
-            {
-                return false;
-            }
+ViewObjectContactOfPageHierarchy::ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
 
-            return true;
-        }
-    } // end of namespace contact
-} // end of namespace sdr
+ViewObjectContactOfPageHierarchy::~ViewObjectContactOfPageHierarchy()
+{
+}
 
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
+{
+    drawinglayer::primitive2d::Primitive2DSequence xRetval;
 
+    // process local sub-hierarchy
+    const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
 
-namespace sdr
-{
-    namespace contact
+    if(nSubHierarchyCount)
     {
-        ViewObjectContactOfPageHierarchy::ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
+        xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
 
-        ViewObjectContactOfPageHierarchy::~ViewObjectContactOfPageHierarchy()
+        if(xRetval.hasElements())
         {
-        }
-
-        drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
-        {
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
-
-            // process local sub-hierarchy
-            const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+            // get ranges
+            const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
+            const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
+            const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
 
-            if(nSubHierarchyCount)
+            // check geometrical visibility
+            if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
             {
-                xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
-
-                if(xRetval.hasElements())
-                {
-                    // get ranges
-                    const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
-                    const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
-                    const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
-
-                    // check geometrical visibility
-                    if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
-                    {
-                        // not visible, release
-                        xRetval.realloc(0);
-                    }
-                }
+                // not visible, release
+                xRetval.realloc(0);
             }
-
-            return xRetval;
         }
-    } // end of namespace contact
-} // end of namespace sdr
-
+    }
 
+    return xRetval;
+}
 
-namespace sdr
+ViewObjectContactOfPageGrid::ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
 {
-    namespace contact
-    {
-        ViewObjectContactOfPageGrid::ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
-
-        ViewObjectContactOfPageGrid::~ViewObjectContactOfPageGrid()
-        {
-        }
+}
 
-        bool ViewObjectContactOfPageGrid::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
-
-            SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+ViewObjectContactOfPageGrid::~ViewObjectContactOfPageGrid()
+{
+}
 
-            if(!pSdrPageView)
-            {
-                return false;
-            }
+bool ViewObjectContactOfPageGrid::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+    {
+        return false;
+    }
 
-            const SdrView& rView = pSdrPageView->GetView();
+    SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
 
-            if(!rView.IsGridVisible())
-            {
-                return false;
-            }
+    if(!pSdrPageView)
+    {
+        return false;
+    }
 
-            // no page grid for preview renderers
-            if(GetObjectContact().IsPreviewRenderer())
-            {
-                return false;
-            }
+    const SdrView& rView = pSdrPageView->GetView();
 
-            if(static_cast< ViewContactOfGrid& >(GetViewContact()).getFront() != (bool)rView.IsGridFront())
-            {
-                return false;
-            }
+    if(!rView.IsGridVisible())
+    {
+        return false;
+    }
 
-            return true;
-        }
+    // no page grid for preview renderers
+    if(GetObjectContact().IsPreviewRenderer())
+    {
+        return false;
+    }
 
-        drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageGrid::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
-        {
-            const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
+    if(static_cast< ViewContactOfGrid& >(GetViewContact()).getFront() != (bool)rView.IsGridFront())
+    {
+        return false;
+    }
 
-            if(pPageView)
-            {
-                const SdrView& rView = pPageView->GetView();
-                const SdrPage& rPage = getPage();
-                const Color aGridColor(rView.GetGridColor());
-                const basegfx::BColor aRGBGridColor(aGridColor.getBColor());
-
-                basegfx::B2DHomMatrix aGridMatrix;
-                aGridMatrix.set(0, 0, (double)(rPage.GetWdt() - (rPage.GetRgtBorder() + rPage.GetLftBorder())));
-                aGridMatrix.set(1, 1, (double)(rPage.GetHgt() - (rPage.GetLwrBorder() + rPage.GetUppBorder())));
-                aGridMatrix.set(0, 2, (double)rPage.GetLftBorder());
-                aGridMatrix.set(1, 2, (double)rPage.GetUppBorder());
-
-                const Size aRaw(rView.GetGridCoarse());
-                const Size aFine(rView.GetGridFine());
-                const double fWidthX(aRaw.getWidth());
-                const double fWidthY(aRaw.getHeight());
-                const sal_uInt32 nSubdivisionsX(aFine.getWidth() ? aRaw.getWidth() / aFine.getWidth() : 0L);
-                const sal_uInt32 nSubdivisionsY(aFine.getHeight() ? aRaw.getHeight() / aFine.getHeight() : 0L);
-
-                xRetval.realloc(1);
-                xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::GridPrimitive2D(
-                    aGridMatrix, fWidthX, fWidthY, 10.0, 3.0, nSubdivisionsX, nSubdivisionsY, aRGBGridColor,
-                    drawinglayer::primitive2d::createDefaultCross_3x3(aRGBGridColor)));
-            }
+    return true;
+}
 
-            return xRetval;
-        }
-    } // end of namespace contact
-} // end of namespace sdr
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageGrid::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+{
+    const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+    drawinglayer::primitive2d::Primitive2DSequence xRetval;
 
+    if(pPageView)
+    {
+        const SdrView& rView = pPageView->GetView();
+        const SdrPage& rPage = getPage();
+        const Color aGridColor(rView.GetGridColor());
+        const basegfx::BColor aRGBGridColor(aGridColor.getBColor());
+
+        basegfx::B2DHomMatrix aGridMatrix;
+        aGridMatrix.set(0, 0, (double)(rPage.GetWdt() - (rPage.GetRgtBorder() + rPage.GetLftBorder())));
+        aGridMatrix.set(1, 1, (double)(rPage.GetHgt() - (rPage.GetLwrBorder() + rPage.GetUppBorder())));
+        aGridMatrix.set(0, 2, (double)rPage.GetLftBorder());
+        aGridMatrix.set(1, 2, (double)rPage.GetUppBorder());
+
+        const Size aRaw(rView.GetGridCoarse());
+        const Size aFine(rView.GetGridFine());
+        const double fWidthX(aRaw.getWidth());
+        const double fWidthY(aRaw.getHeight());
+        const sal_uInt32 nSubdivisionsX(aFine.getWidth() ? aRaw.getWidth() / aFine.getWidth() : 0L);
+        const sal_uInt32 nSubdivisionsY(aFine.getHeight() ? aRaw.getHeight() / aFine.getHeight() : 0L);
+
+        xRetval.realloc(1);
+        xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::GridPrimitive2D(
+            aGridMatrix, fWidthX, fWidthY, 10.0, 3.0, nSubdivisionsX, nSubdivisionsY, aRGBGridColor,
+            drawinglayer::primitive2d::createDefaultCross_3x3(aRGBGridColor)));
+    }
+
+    return xRetval;
+}
+
+ViewObjectContactOfPageHelplines::ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
 
+ViewObjectContactOfPageHelplines::~ViewObjectContactOfPageHelplines()
+{
+}
 
-namespace sdr
+bool ViewObjectContactOfPageHelplines::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
 {
-    namespace contact
+    if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
     {
-        ViewObjectContactOfPageHelplines::ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
-        {
-        }
+        return false;
+    }
 
-        ViewObjectContactOfPageHelplines::~ViewObjectContactOfPageHelplines()
-        {
-        }
+    SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
 
-        bool ViewObjectContactOfPageHelplines::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
-        {
-            if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
-            {
-                return false;
-            }
+    if(!pSdrPageView)
+    {
+        return false;
+    }
 
-            SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+    const SdrView& rView = pSdrPageView->GetView();
 
-            if(!pSdrPageView)
-            {
-                return false;
-            }
+    if(!rView.IsHlplVisible())
+    {
+        return false;
+    }
 
-            const SdrView& rView = pSdrPageView->GetView();
+    // no helplines for preview renderers
+    if(GetObjectContact().IsPreviewRenderer())
+    {
+        return false;
+    }
 
-            if(!rView.IsHlplVisible())
-            {
-                return false;
-            }
+    if(static_cast< ViewContactOfHelplines& >(GetViewContact()).getFront() != (bool)rView.IsHlplFront())
+    {
+        return false;
+    }
 
-            // no helplines for preview renderers
-            if(GetObjectContact().IsPreviewRenderer())
-            {
-                return false;
-            }
+    return true;
+}
 
-            if(static_cast< ViewContactOfHelplines& >(GetViewContact()).getFront() != (bool)rView.IsHlplFront())
-            {
-                return false;
-            }
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHelplines::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+{
+    drawinglayer::primitive2d::Primitive2DSequence xRetval;
+    const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
 
-            return true;
-        }
+    if(pPageView)
+    {
+        const SdrHelpLineList& rHelpLineList = pPageView->GetHelpLines();
+        const sal_uInt32 nCount(rHelpLineList.GetCount());
 
-        drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHelplines::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+        if(nCount)
         {
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
-            const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+            const basegfx::BColor aRGBColorA(1.0, 1.0, 1.0);
+            const basegfx::BColor aRGBColorB(0.0, 0.0, 0.0);
+            xRetval.realloc(nCount);
 
-            if(pPageView)
+            for(sal_uInt32 a(0L); a < nCount; a++)
             {
-                const SdrHelpLineList& rHelpLineList = pPageView->GetHelpLines();
-                const sal_uInt32 nCount(rHelpLineList.GetCount());
+                const SdrHelpLine& rHelpLine = rHelpLineList[(sal_uInt16)a];
+                const basegfx::B2DPoint aPosition((double)rHelpLine.GetPos().X(), (double)rHelpLine.GetPos().Y());
+                const double fDiscreteDashLength(4.0);
 
-                if(nCount)
+                switch(rHelpLine.GetKind())
                 {
-                    const basegfx::BColor aRGBColorA(1.0, 1.0, 1.0);
-                    const basegfx::BColor aRGBColorB(0.0, 0.0, 0.0);
-                    xRetval.realloc(nCount);
-
-                    for(sal_uInt32 a(0L); a < nCount; a++)
+                    default : // SDRHELPLINE_POINT
                     {
-                        const SdrHelpLine& rHelpLine = rHelpLineList[(sal_uInt16)a];
-                        const basegfx::B2DPoint aPosition((double)rHelpLine.GetPos().X(), (double)rHelpLine.GetPos().Y());
-                        const double fDiscreteDashLength(4.0);
-
-                        switch(rHelpLine.GetKind())
-                        {
-                            default : // SDRHELPLINE_POINT
-                            {
-                                xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
-                                    aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_POINT,
-                                    aRGBColorA, aRGBColorB, fDiscreteDashLength));
-                                break;
-                            }
-                            case SDRHELPLINE_VERTICAL :
-                            {
-                                xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
-                                    aPosition, basegfx::B2DVector(0.0, 1.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
-                                    aRGBColorA, aRGBColorB, fDiscreteDashLength));
-                                break;
-                            }
-                            case SDRHELPLINE_HORIZONTAL :
-                            {
-                                xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
-                                    aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
-                                    aRGBColorA, aRGBColorB, fDiscreteDashLength));
-                                break;
-                            }
-                        }
+                        xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
+                            aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_POINT,
+                            aRGBColorA, aRGBColorB, fDiscreteDashLength));
+                        break;
+                    }
+                    case SDRHELPLINE_VERTICAL :
+                    {
+                        xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
+                            aPosition, basegfx::B2DVector(0.0, 1.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
+                            aRGBColorA, aRGBColorB, fDiscreteDashLength));
+                        break;
+                    }
+                    case SDRHELPLINE_HORIZONTAL :
+                    {
+                        xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
+                            aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
+                            aRGBColorA, aRGBColorB, fDiscreteDashLength));
+                        break;
                     }
                 }
             }
-
-            return xRetval;
         }
-    } // end of namespace contact
-} // end of namespace sdr
+    }
 
+    return xRetval;
+}
 
+ViewObjectContactOfSdrPage::ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
+:   ViewObjectContact(rObjectContact, rViewContact)
+{
+}
 
-namespace sdr
+ViewObjectContactOfSdrPage::~ViewObjectContactOfSdrPage()
 {
-    namespace contact
+}
+
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
+{
+    drawinglayer::primitive2d::Primitive2DSequence xRetval;
+
+    // process local sub-hierarchy
+    const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+
+    if(nSubHierarchyCount)
     {
-        ViewObjectContactOfSdrPage::ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
-        :   ViewObjectContact(rObjectContact, rViewContact)
-        {
-        }
+        const bool bDoGhostedDisplaying(
+            GetObjectContact().DoVisualizeEnteredGroup()
+            && !GetObjectContact().isOutputToPrinter()
+            && GetObjectContact().getActiveViewContact() == &GetViewContact());
 
-        ViewObjectContactOfSdrPage::~ViewObjectContactOfSdrPage()
+        if(bDoGhostedDisplaying)
         {
+            rDisplayInfo.ClearGhostedDrawMode();
         }
 
-        drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
-        {
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
+        // create object hierarchy
+        xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
 
-            // process local sub-hierarchy
-            const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+        if(xRetval.hasElements())
+        {
+            // get ranges
+            const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
+            const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
+            const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
 
-            if(nSubHierarchyCount)
+            // check geometrical visibility
+            if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
             {
-                const bool bDoGhostedDisplaying(
-                    GetObjectContact().DoVisualizeEnteredGroup()
-                    && !GetObjectContact().isOutputToPrinter()
-                    && GetObjectContact().getActiveViewContact() == &GetViewContact());
-
-                if(bDoGhostedDisplaying)
-                {
-                    rDisplayInfo.ClearGhostedDrawMode();
-                }
-
-                // create object hierarchy
-                xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
-
-                if(xRetval.hasElements())
-                {
-                    // get ranges
-                    const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
-                    const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
-                    const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
-
-                    // check geometrical visibility
-                    if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
-                    {
-                        // not visible, release
-                        xRetval.realloc(0);
-                    }
-                }
-
-                if(bDoGhostedDisplaying)
-                {
-                    rDisplayInfo.SetGhostedDrawMode();
-                }
+                // not visible, release
+                xRetval.realloc(0);
             }
+        }
 
-            return xRetval;
+        if(bDoGhostedDisplaying)
+        {
+            rDisplayInfo.SetGhostedDrawMode();
         }
-    } // end of namespace contact
-} // end of namespace sdr
+    }
+
+    return xRetval;
+}
+
+}}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list