[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - include/svx

[Kohei Yoshida]

 include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx |   65 ++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

New commits:
commit f158bf604e60b55051c9bab3945c59cf8c459263
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Sat Nov 1 13:45:12 2014 -0400

    Unindent.
    
    Change-Id: I911de1c7b47768233bdd9580361b8cf430b3684e

diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index 45cd0d9..e4def23 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -28,42 +28,39 @@ class SdrObject;
 class SetOfByte;
 class OutputDevice;
 
+namespace sdr { namespace contact {
 
-namespace sdr
+class SVX_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact
 {
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact
-        {
-            /** Test whether the primitive is visible on any layer from @c aLayers
-
-                This should be overridden by ViewObjectContacts of SDR classes
-                that have subparts which can be on different layers (that is,
-                SdrObjGroup .-)
-              */
-            virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const;
-
-        protected:
-            const SdrObject& getSdrObject() const;
-
-        public:
-            ViewObjectContactOfSdrObj(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfSdrObj();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-            /** retrieves the device which a PageView belongs to, starting from its ObjectContactOfPageView
-
-                Since #i72752#, the PaintWindow (and thus the OutputDevice) associated with a PageView is not
-                constant over its lifetime. Instead, during some paint operations, the PaintWindow/OutputDevice
-                might be temporarily patched.
-
-                This method cares for this, by retrieving the very original OutputDevice.
-            */
-            boost::optional<const OutputDevice&> getPageViewOutputDevice() const;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
+    /** Test whether the primitive is visible on any layer from @c aLayers
+
+        This should be overridden by ViewObjectContacts of SDR classes
+        that have subparts which can be on different layers (that is,
+        SdrObjGroup .-)
+      */
+    virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const;
+
+protected:
+    const SdrObject& getSdrObject() const;
+
+public:
+    ViewObjectContactOfSdrObj(ObjectContact& rObjectContact, ViewContact& rViewContact);
+    virtual ~ViewObjectContactOfSdrObj();
+
+    virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
+
+    /** retrieves the device which a PageView belongs to, starting from its ObjectContactOfPageView
+
+        Since #i72752#, the PaintWindow (and thus the OutputDevice) associated with a PageView is not
+        constant over its lifetime. Instead, during some paint operations, the PaintWindow/OutputDevice
+        might be temporarily patched.
+
+        This method cares for this, by retrieving the very original OutputDevice.
+    */
+    boost::optional<const OutputDevice&> getPageViewOutputDevice() const;
+};
+
+}}