dba33b: merge CWS head with head resulting from pulling DEV300_m67

1 files changed, 6 insertions, 47 deletions

diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 854466ca72f1..d55097f21dc2 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -65,6 +65,8 @@ namespace sdr { namespace contact {
         ::rtl::Reference< ViewObjectContactOfUnoControl_Impl >    m_pImpl;
 
     public:
+        ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
+
         /// determines whether an XControl already exists, and is currently visible
         bool    isControlVisible() const;
 
@@ -103,52 +105,24 @@ namespace sdr { namespace contact {
         void onControlChangedOrModified( ImplAccess ) { impl_onControlChangedOrModified(); }
 
     protected:
-        ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
         ~ViewObjectContactOfUnoControl();
 
         // support for Primitive2D
         virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
 
+        // visibility check
+        virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const;
+
         /// to be called when any aspect of the control which requires view updates changed
         void impl_onControlChangedOrModified();
 
     private:
-        ViewObjectContactOfUnoControl();                                                  // never implemented
+        ViewObjectContactOfUnoControl();                                                    // never implemented
         ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& );              // never implemented
         ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& );   // never implemented
     };
 
     //====================================================================
-    //= UnoControlDefaultContact
-    //====================================================================
-    class SVX_DLLPRIVATE UnoControlDefaultContact : public ViewObjectContactOfUnoControl
-    {
-    public:
-        UnoControlDefaultContact( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-        ~UnoControlDefaultContact();
-
-    private:
-        UnoControlDefaultContact();                                             // never implemented
-        UnoControlDefaultContact( const UnoControlDefaultContact& );            // never implemented
-        UnoControlDefaultContact& operator=( const UnoControlDefaultContact& ); // never implemented
-    };
-
-    //====================================================================
-    //= UnoControlWindowContact
-    //====================================================================
-    class SVX_DLLPRIVATE UnoControlWindowContact : public ViewObjectContactOfUnoControl
-    {
-    public:
-        UnoControlWindowContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-        ~UnoControlWindowContact();
-
-    private:
-        UnoControlWindowContact();                                              // never implemented
-        UnoControlWindowContact( const UnoControlWindowContact& );              // never implemented
-        UnoControlWindowContact& operator=( const UnoControlWindowContact& );   // never implemented
-    };
-
-    //====================================================================
     //= UnoControlPrintOrPreviewContact
     //====================================================================
     class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl
@@ -165,21 +139,6 @@ namespace sdr { namespace contact {
         virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const;
     };
 
-    //====================================================================
-    //= UnoControlPDFExportContact
-    //====================================================================
-    class SVX_DLLPRIVATE UnoControlPDFExportContact : public ViewObjectContactOfUnoControl
-    {
-    public:
-        UnoControlPDFExportContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-        ~UnoControlPDFExportContact();
-
-    private:
-        UnoControlPDFExportContact();                                               // never implemented
-        UnoControlPDFExportContact( const UnoControlPDFExportContact& );            // never implemented
-        UnoControlPDFExportContact& operator=( const UnoControlPDFExportContact& ); // never implemented
-    };
-
 //........................................................................
 } } // namespace sdr::contact
 //........................................................................