diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-08 22:11:33 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-08 22:17:48 -0500 |
commit | 9229170920ab770624415c4330da57af5b1b5398 (patch) | |
tree | f919af4ad0ca25a297b2aae6518c13280f5ad50e /include | |
parent | xmloff: [loplugin:unusedvariablecheck] (diff) | |
download | core-9229170920ab770624415c4330da57af5b1b5398.tar.gz core-9229170920ab770624415c4330da57af5b1b5398.zip |
Unindent.
Change-Id: I98b5a0b91c92e58bae3caa69a4ed35c72dc839dd
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/sdr/contact/objectcontactofobjlistpainter.hxx | 165 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewcontactofe3d.hxx | 117 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewcontactofe3dscene.hxx | 131 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewcontactofpageobj.hxx | 53 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 65 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewcontactofsdrrectobj.hxx | 41 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewcontactoftextobj.hxx | 33 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewcontactofvirtobj.hxx | 52 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewobjectcontactofpageobj.hxx | 45 | ||||
-rw-r--r-- | include/svx/sdr/contact/viewobjectcontactredirector.hxx | 49 |
10 files changed, 328 insertions, 423 deletions
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 7489cfffe131..9ff322ff7e33 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -24,119 +24,96 @@ #include <svx/svxdllapi.h> #include <svx/svdpage.hxx> - -// predeclarations - class SdrPage; class SdrObject; +namespace sdr { namespace contact { - -namespace sdr +class SVX_DLLPUBLIC ObjectContactPainter : public ObjectContact { - namespace contact - { - class SVX_DLLPUBLIC ObjectContactPainter : public ObjectContact - { - protected: - // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const = 0; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const = 0; - - public: - // basic constructor/destructor - ObjectContactPainter(); - virtual ~ObjectContactPainter(); - }; - } // end of namespace contact -} // end of namespace sdr - - - -namespace sdr -{ - namespace contact - { - // typedef for transferring SdrObject - typedef ::std::vector< SdrObject* > SdrObjectVector; +protected: + // Hierarchy access methods + virtual sal_uInt32 GetPaintObjectCount() const = 0; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const = 0; - class SVX_DLLPUBLIC ObjectContactOfObjListPainter : public ObjectContactPainter - { - protected: - // Target OutputDevice - OutputDevice& mrTargetOutputDevice; +public: + // basic constructor/destructor + ObjectContactPainter(); + virtual ~ObjectContactPainter(); +}; - // Set StartPoint for next run, also given in constructor - SdrObjectVector maStartObjects; +// typedef for transferring SdrObject +typedef ::std::vector< SdrObject* > SdrObjectVector; - // the processed page which is the base e.g. for PageNumberFields - const SdrPage* mpProcessedPage; +class SVX_DLLPUBLIC ObjectContactOfObjListPainter : public ObjectContactPainter +{ +protected: + // Target OutputDevice + OutputDevice& mrTargetOutputDevice; - // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + // Set StartPoint for next run, also given in constructor + SdrObjectVector maStartObjects; - public: - // basic constructor/destructor - ObjectContactOfObjListPainter( - OutputDevice& rTargetDevice, - const SdrObjectVector& rObjects, - const SdrPage* pProcessedPage); - virtual ~ObjectContactOfObjListPainter(); + // the processed page which is the base e.g. for PageNumberFields + const SdrPage* mpProcessedPage; - // Process the whole displaying - virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; + // Hierarchy access methods + virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; - // VirtualDevice? Default is false - virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE; +public: + // basic constructor/destructor + ObjectContactOfObjListPainter( + OutputDevice& rTargetDevice, + const SdrObjectVector& rObjects, + const SdrPage* pProcessedPage); + virtual ~ObjectContactOfObjListPainter(); - // recording MetaFile? Default is false - virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE; + // Process the whole displaying + virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; - // pdf export? Default is false - virtual bool isOutputToPDFFile() const SAL_OVERRIDE; + // VirtualDevice? Default is false + virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE; - // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; - }; - } // end of namespace contact -} // end of namespace sdr + // recording MetaFile? Default is false + virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE; + // pdf export? Default is false + virtual bool isOutputToPDFFile() const SAL_OVERRIDE; + // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; +}; -namespace sdr +class ObjectContactOfPagePainter : public ObjectContactPainter { - namespace contact - { - class ObjectContactOfPagePainter : public ObjectContactPainter - { - protected: - // the original ObjectContact this painter is working on - ObjectContact& mrOriginalObjectContact; - - // Set StartPoint for next run, also given in constructor - SdrPageWeakRef mxStartPage; - - // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; - - public: - // basic constructor - ObjectContactOfPagePainter( - const SdrPage* pPage, - ObjectContact& rOriginalObjectContact); - virtual ~ObjectContactOfPagePainter(); - - // set another page - void SetStartPage(const SdrPage* pPage); - const SdrPage* GetStartPage() const { return mxStartPage.get(); } - - // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; - }; - } // end of namespace contact -} // end of namespace sdr +protected: + // the original ObjectContact this painter is working on + ObjectContact& mrOriginalObjectContact; + + // Set StartPoint for next run, also given in constructor + SdrPageWeakRef mxStartPage; + + // Hierarchy access methods + virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + +public: + // basic constructor + ObjectContactOfPagePainter( + const SdrPage* pPage, + ObjectContact& rOriginalObjectContact); + virtual ~ObjectContactOfPagePainter(); + + // set another page + void SetStartPage(const SdrPage* pPage); + const SdrPage* GetStartPage() const { return mxStartPage.get(); } + + // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; +}; + +}} diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index d30c3006a7dc..e59e1576dfaa 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -24,13 +24,6 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> - -// predeclarations - -namespace sdr { namespace contact { - class ViewContactOfE3dScene; -}} - namespace drawinglayer { namespace attribute { class SdrLineAttribute; }} @@ -40,66 +33,64 @@ namespace basegfx { class B3DHomMatrix; } +namespace sdr { namespace contact { +class ViewContactOfE3dScene; -namespace sdr +class ViewContactOfE3d : public ViewContactOfSdrObj { - namespace contact +protected: + // Create a Object-Specific ViewObjectContact, set ViewContact and + // ObjectContact. Always needs to return something. + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + +public: + // basic constructor, used from E3dObject. + explicit ViewContactOfE3d(E3dObject& rObj); + virtual ~ViewContactOfE3d(); + + // access to E3dObject + const E3dObject& GetE3dObject() const { - class ViewContactOfE3d : public ViewContactOfSdrObj - { - protected: - // Create a Object-Specific ViewObjectContact, set ViewContact and - // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - - public: - // basic constructor, used from E3dObject. - explicit ViewContactOfE3d(E3dObject& rObj); - virtual ~ViewContactOfE3d(); - - // access to E3dObject - const E3dObject& GetE3dObject() const - { - return static_cast<const E3dObject&>(GetSdrObject()); - } - - // public helpers - drawinglayer::primitive2d::Primitive2DSequence impCreateWithGivenPrimitive3DSequence( - const drawinglayer::primitive3d::Primitive3DSequence& rxContent3D) const; - - - // primitive stuff - - protected: - // Primitive3DSequence of the ViewContact. This contains all necessary information - // for the graphical visualisation and needs to be supported by all 3D VCs which - // can be visualized. It does NOT contain the object transformation to be able to - // buffer for all possible usages - drawinglayer::primitive3d::Primitive3DSequence mxViewIndependentPrimitive3DSequence; - - // This method is responsible for creating the graphical visualisation data which is - // stored in mxViewIndependentPrimitive3DSequence, but without object transformation - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const = 0; - - // This method is responsible for creating the graphical visualisation data derived ONLY from - // the model data. The default implementation will try to create a 3D to 2D embedding (will work - // when scene is known) which can then be used for 2D processing concerning ranges - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; - - public: - // access to the local primitive without the object's local 3D transform. This is e.g. needed - // to get the not-yet transformed BoundVolume for e.g. interactions - drawinglayer::primitive3d::Primitive3DSequence getVIP3DSWithoutObjectTransform() const; - - // access to the local primitive. This will ensure that the list is - // current in comparing the local list content with a fresh created incarnation. It will - // use getVIP3DSWithoutObjectTransform and embed to 3d transform primitive when object's - // local 3d transform is used - drawinglayer::primitive3d::Primitive3DSequence getViewIndependentPrimitive3DSequence() const; - }; - } // end of namespace contact -} // end of namespace sdr + return static_cast<const E3dObject&>(GetSdrObject()); + } + + // public helpers + drawinglayer::primitive2d::Primitive2DSequence impCreateWithGivenPrimitive3DSequence( + const drawinglayer::primitive3d::Primitive3DSequence& rxContent3D) const; + + + // primitive stuff + +protected: + // Primitive3DSequence of the ViewContact. This contains all necessary information + // for the graphical visualisation and needs to be supported by all 3D VCs which + // can be visualized. It does NOT contain the object transformation to be able to + // buffer for all possible usages + drawinglayer::primitive3d::Primitive3DSequence mxViewIndependentPrimitive3DSequence; + + // This method is responsible for creating the graphical visualisation data which is + // stored in mxViewIndependentPrimitive3DSequence, but without object transformation + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const = 0; + + // This method is responsible for creating the graphical visualisation data derived ONLY from + // the model data. The default implementation will try to create a 3D to 2D embedding (will work + // when scene is known) which can then be used for 2D processing concerning ranges + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + +public: + // access to the local primitive without the object's local 3D transform. This is e.g. needed + // to get the not-yet transformed BoundVolume for e.g. interactions + drawinglayer::primitive3d::Primitive3DSequence getVIP3DSWithoutObjectTransform() const; + + // access to the local primitive. This will ensure that the list is + // current in comparing the local list content with a fresh created incarnation. It will + // use getVIP3DSWithoutObjectTransform and embed to 3d transform primitive when object's + // local 3d transform is used + drawinglayer::primitive3d::Primitive3DSequence getViewIndependentPrimitive3DSequence() const; +}; + +}} diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index dca13e268269..ac47997c4a4e 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -28,85 +28,76 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> - -// predeclarations - namespace basegfx { class B3DRange; } +namespace sdr { namespace contact { - -namespace sdr +class SVX_DLLPUBLIC ViewContactOfE3dScene : public ViewContactOfSdrObj { - namespace contact +protected: + // Create a Object-Specific ViewObjectContact, set ViewContact and + // ObjectContact. Always needs to return something. Default is to create + // a standard ViewObjectContact containing the given ObjectContact and *this + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + +public: + // basic constructor, used from SdrObject. + explicit ViewContactOfE3dScene(E3dScene& rScene); + + // access to SdrObject + const E3dScene& GetE3dScene() const { - class SVX_DLLPUBLIC ViewContactOfE3dScene : public ViewContactOfSdrObj - { - protected: - // Create a Object-Specific ViewObjectContact, set ViewContact and - // ObjectContact. Always needs to return something. Default is to create - // a standard ViewObjectContact containing the given ObjectContact and *this - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - - public: - // basic constructor, used from SdrObject. - explicit ViewContactOfE3dScene(E3dScene& rScene); - - // access to SdrObject - const E3dScene& GetE3dScene() const - { - return static_cast<const E3dScene&>(GetSdrObject()); - } - - // React on changes of the object of this ViewContact - virtual void ActionChanged() SAL_OVERRIDE; - - // access to ViewInformation3D and ObjectTransformation - const drawinglayer::geometry::ViewInformation3D& getViewInformation3D(const ::basegfx::B3DRange& rContentRange) const; - const drawinglayer::geometry::ViewInformation3D& getViewInformation3D() const; - const basegfx::B2DHomMatrix& getObjectTransformation() const; - - // attribute providers - const drawinglayer::attribute::SdrSceneAttribute& getSdrSceneAttribute() const; - const drawinglayer::attribute::SdrLightingAttribute& getSdrLightingAttribute() const; - - // scene primitive creators. If pLayerVisibility is given, a visibility test with the LayerID and the - // given SetOfByte is done. - drawinglayer::primitive2d::Primitive2DSequence createScenePrimitive2DSequence(const SetOfByte* pLayerVisibility) const; - - // helpers to get the sequence of all contained 3D primitives and its range, - // regardless of layer or visibility constraints and using a neutral ViewInformation3D - drawinglayer::primitive3d::Primitive3DSequence getAllPrimitive3DSequence() const; - basegfx::B3DRange getAllContentRange3D() const; - - protected: - // the 3d transformation stack - drawinglayer::geometry::ViewInformation3D maViewInformation3D; - - // the object transformation - basegfx::B2DHomMatrix maObjectTransformation; - - // attributes - drawinglayer::attribute::SdrSceneAttribute maSdrSceneAttribute; - drawinglayer::attribute::SdrLightingAttribute maSdrLightingAttribute; - - // create methods for ViewInformation3D and ObjectTransformation - void createViewInformation3D(const ::basegfx::B3DRange& rContentRange); - void createObjectTransformation(); - - // attribute creators - void createSdrSceneAttribute(); - void createSdrLightingAttribute(); - - // This method is responsible for creating the graphical visualisation data - // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; - }; - } // end of namespace contact -} // end of namespace sdr + return static_cast<const E3dScene&>(GetSdrObject()); + } + + // React on changes of the object of this ViewContact + virtual void ActionChanged() SAL_OVERRIDE; + + // access to ViewInformation3D and ObjectTransformation + const drawinglayer::geometry::ViewInformation3D& getViewInformation3D(const ::basegfx::B3DRange& rContentRange) const; + const drawinglayer::geometry::ViewInformation3D& getViewInformation3D() const; + const basegfx::B2DHomMatrix& getObjectTransformation() const; + + // attribute providers + const drawinglayer::attribute::SdrSceneAttribute& getSdrSceneAttribute() const; + const drawinglayer::attribute::SdrLightingAttribute& getSdrLightingAttribute() const; + + // scene primitive creators. If pLayerVisibility is given, a visibility test with the LayerID and the + // given SetOfByte is done. + drawinglayer::primitive2d::Primitive2DSequence createScenePrimitive2DSequence(const SetOfByte* pLayerVisibility) const; + + // helpers to get the sequence of all contained 3D primitives and its range, + // regardless of layer or visibility constraints and using a neutral ViewInformation3D + drawinglayer::primitive3d::Primitive3DSequence getAllPrimitive3DSequence() const; + basegfx::B3DRange getAllContentRange3D() const; + +protected: + // the 3d transformation stack + drawinglayer::geometry::ViewInformation3D maViewInformation3D; + + // the object transformation + basegfx::B2DHomMatrix maObjectTransformation; + + // attributes + drawinglayer::attribute::SdrSceneAttribute maSdrSceneAttribute; + drawinglayer::attribute::SdrLightingAttribute maSdrLightingAttribute; + + // create methods for ViewInformation3D and ObjectTransformation + void createViewInformation3D(const ::basegfx::B3DRange& rContentRange); + void createObjectTransformation(); + + // attribute creators + void createSdrSceneAttribute(); + void createSdrLightingAttribute(); + // This method is responsible for creating the graphical visualisation data + // ONLY based on model data + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; +}; +}} #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index a495f091542c..d4a5d5177d62 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -24,42 +24,35 @@ #include <svx/svxdllapi.h> #include <svx/svdopage.hxx> - -// predeclarations - class SdrPage; +namespace sdr { namespace contact { - -namespace sdr +class SVX_DLLPUBLIC ViewContactOfPageObj : public ViewContactOfSdrObj { - namespace contact +protected: + // Create a Object-Specific ViewObjectContact, set ViewContact and + // ObjectContact. Always needs to return something. + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + + // create graphical visualisation data + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; +public: + // basic constructor, used from SdrObject. + explicit ViewContactOfPageObj(SdrPageObj& rPageObj); + virtual ~ViewContactOfPageObj(); + + // #WIP# React on changes of the object of this ViewContact + virtual void ActionChanged() SAL_OVERRIDE; + + // access to SdrObject + const SdrPageObj& GetPageObj() const { - class SVX_DLLPUBLIC ViewContactOfPageObj : public ViewContactOfSdrObj - { - protected: - // Create a Object-Specific ViewObjectContact, set ViewContact and - // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - - // create graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; - public: - // basic constructor, used from SdrObject. - explicit ViewContactOfPageObj(SdrPageObj& rPageObj); - virtual ~ViewContactOfPageObj(); - - // #WIP# React on changes of the object of this ViewContact - virtual void ActionChanged() SAL_OVERRIDE; + return static_cast<const SdrPageObj&>(GetSdrObject()); + } +}; - // access to SdrObject - const SdrPageObj& GetPageObj() const - { - return static_cast<const SdrPageObj&>(GetSdrObject()); - } - }; - } // end of namespace contact -} // end of namespace sdr +}} diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 223eff49c9b4..07b82f51f46c 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -25,56 +25,49 @@ #include <svx/svdomedia.hxx> #include <tools/gen.hxx> - -// predeclarations - namespace avmedia { class MediaItem; } +namespace sdr { namespace contact { - -namespace sdr +class SVX_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj { - namespace contact - { - class SVX_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj - { - friend class ViewObjectContactOfSdrMediaObj; + friend class ViewObjectContactOfSdrMediaObj; + +public: - public: + // basic constructor, used from SdrObject. + explicit ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ); + virtual ~ViewContactOfSdrMediaObj(); - // basic constructor, used from SdrObject. - explicit ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ); - virtual ~ViewContactOfSdrMediaObj(); +public: - public: + // access to SdrMediaObj + const SdrMediaObj& GetSdrMediaObj() const + { + return static_cast<const SdrMediaObj&>(GetSdrObject()); + } - // access to SdrMediaObj - const SdrMediaObj& GetSdrMediaObj() const - { - return static_cast<const SdrMediaObj&>(GetSdrObject()); - } + Size getPreferredSize() const; - Size getPreferredSize() const; + void updateMediaItem( ::avmedia::MediaItem& rItem ) const; + void executeMediaItem( const ::avmedia::MediaItem& rItem ); - void updateMediaItem( ::avmedia::MediaItem& rItem ) const; - void executeMediaItem( const ::avmedia::MediaItem& rItem ); +protected: - protected: + // Create a Object-Specific ViewObjectContact, set ViewContact and + // ObjectContact. Always needs to return something. + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - // Create a Object-Specific ViewObjectContact, set ViewContact and - // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + // get notified if some properties have changed + virtual void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); - // get notified if some properties have changed - virtual void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); +protected: + // This method is responsible for creating the graphical visualisation data + // ONLY based on model data + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; +}; - protected: - // This method is responsible for creating the graphical visualisation data - // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; - }; - } // end of namespace contact -} // end of namespace sdr +}} diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 9bad53a0d0d1..2b6e02e848e8 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -23,34 +23,29 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdorect.hxx> +namespace sdr { namespace contact { -namespace sdr +class ViewContactOfSdrRectObj : public ViewContactOfTextObj { - namespace contact +protected: + // internal access to SdrRectObj + const SdrRectObj& GetRectObj() const { - class ViewContactOfSdrRectObj : public ViewContactOfTextObj - { - protected: - // internal access to SdrRectObj - const SdrRectObj& GetRectObj() const - { - return static_cast<const SdrRectObj&>(GetSdrObject()); - } - - public: - // basic constructor, used from SdrObject. - explicit ViewContactOfSdrRectObj(SdrRectObj& rTextObj); - virtual ~ViewContactOfSdrRectObj(); - - protected: - // This method is responsible for creating the graphical visualisation data - // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; - }; - } // end of namespace contact -} // end of namespace sdr + return static_cast<const SdrRectObj&>(GetSdrObject()); + } +public: + // basic constructor, used from SdrObject. + explicit ViewContactOfSdrRectObj(SdrRectObj& rTextObj); + virtual ~ViewContactOfSdrRectObj(); +protected: + // This method is responsible for creating the graphical visualisation data + // ONLY based on model data + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; +}; + +}} #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx index fb07c4c52cc4..56c472285938 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx @@ -21,31 +21,24 @@ #define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -#include <svx/svdotext.hxx> +class SdrTextObj; -namespace sdr +namespace sdr { namespace contact { + +class ViewContactOfTextObj : public ViewContactOfSdrObj { - namespace contact - { - class ViewContactOfTextObj : public ViewContactOfSdrObj - { - protected: - // internal access to SdrTextObj - const SdrTextObj& GetTextObj() const - { - return static_cast<const SdrTextObj&>(GetSdrObject()); - } - - public: - // basic constructor, used from SdrObject. - explicit ViewContactOfTextObj(SdrTextObj& rTextObj); - virtual ~ViewContactOfTextObj(); - }; - } // end of namespace contact -} // end of namespace sdr +protected: + // internal access to SdrTextObj + const SdrTextObj& GetTextObj() const; +public: + // basic constructor, used from SdrObject. + explicit ViewContactOfTextObj(SdrTextObj& rTextObj); + virtual ~ViewContactOfTextObj(); +}; +}} #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index dd8eb218e5a6..b9cef1c2736b 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -22,40 +22,32 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> - -// predeclarations class SdrVirtObj; +namespace sdr { namespace contact { - -namespace sdr +class SVX_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj { - namespace contact - { - class SVX_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj - { - protected: - // internal access to SdrObject. Iplementation in *.cxx to avoid - // including SdrVirtObj here. - SdrVirtObj& GetVirtObj() const; - - public: - // basic constructor, used from SdrObject. - explicit ViewContactOfVirtObj(SdrVirtObj& rObj); - virtual ~ViewContactOfVirtObj(); - - // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; - - protected: - // This method is responsible for creating the graphical visualisation data - // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; - }; - } // end of namespace contact -} // end of namespace sdr - - +protected: + // internal access to SdrObject. Iplementation in *.cxx to avoid + // including SdrVirtObj here. + SdrVirtObj& GetVirtObj() const; + +public: + // basic constructor, used from SdrObject. + explicit ViewContactOfVirtObj(SdrVirtObj& rObj); + virtual ~ViewContactOfVirtObj(); + + // Access to possible sub-hierarchy + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + +protected: + // This method is responsible for creating the graphical visualisation data + // ONLY based on model data + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; +}; + +}} #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 1074ce651f03..129d4355e68a 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -22,39 +22,30 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> - -// predeclarations +class SdrPage; namespace sdr { namespace contact { - class PagePrimitiveExtractor; -}} -class SdrPage; +class PagePrimitiveExtractor; +class SVX_DLLPUBLIC ViewObjectContactOfPageObj : public ViewObjectContactOfSdrObj +{ +private: + // the page painter helper + PagePrimitiveExtractor* mpExtractor; +protected: + // This method is responsible for creating the graphical visualisation data which is + // stored/cached in the local primitive. + // This method will not handle included hierarchies and not check geometric visibility. + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; -namespace sdr -{ - namespace contact - { - class SVX_DLLPUBLIC ViewObjectContactOfPageObj : public ViewObjectContactOfSdrObj - { - private: - // the page painter helper - PagePrimitiveExtractor* mpExtractor; - - protected: - // This method is responsible for creating the graphical visualisation data which is - // stored/cached in the local primitive. - // This method will not handle included hierarchies and not check geometric visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; - - public: - ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageObj(); - }; - } // end of namespace contact -} // end of namespace sdr +public: + ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); + virtual ~ViewObjectContactOfPageObj(); +}; + +}} diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx index 40f4e617413d..84b168946122 100644 --- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -23,43 +23,32 @@ #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> - -// predeclarations - namespace sdr { namespace contact { - class DisplayInfo; - class ViewObjectContact; -}} +class DisplayInfo; +class ViewObjectContact; - -namespace sdr +// This class provides a mechanism to redirect the paint mechanism for all or +// single ViewObjectContacts. An own derivation may be set at single ViewContacts +// or at the ObjectContact for redirecting all. If both is used, the one at single +// objects will have priority. +class SVX_DLLPUBLIC ViewObjectContactRedirector { - namespace contact - { - // This class provides a mechanism to redirect the paint mechanism for all or - // single ViewObjectContacts. An own derivation may be set at single ViewContacts - // or at the ObjectContact for redirecting all. If both is used, the one at single - // objects will have priority. - class SVX_DLLPUBLIC ViewObjectContactRedirector - { - public: - // basic constructor. - ViewObjectContactRedirector(); - - // The destructor. - virtual ~ViewObjectContactRedirector(); +public: + // basic constructor. + ViewObjectContactRedirector(); - // all default implementations just call the same methods at the original. To do something - // different, overload the method and at least do what the method does. - virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( - const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo); - }; - } // end of namespace contact -} // end of namespace sdr + // The destructor. + virtual ~ViewObjectContactRedirector(); + // all default implementations just call the same methods at the original. To do something + // different, overload the method and at least do what the method does. + virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( + const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::DisplayInfo& rDisplayInfo); +}; +}} #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX |