diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-14 12:55:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-14 12:55:05 +0100 |
| commit | 29b7b7711860ed520f7a49c0f3f19afc92a0a1cf (patch) | |
| tree | fd736f9fd25481792840f05abf402d259074b2f1 /sfx2/inc/sfx2/frame.hxx | |
| parent | 544e9391f09ec87c6fc82917fb1a60c59b717cbc (diff) | |
autorecovery: replace some SfxFrameItem occurences by SfxUnoFrameItem
As a consequence, replace some occurences of SfxFrame with XFrame.
This allows getting rid of yet some more Sfx code in the (SFX) doc loader. Also, it prevents premature
creations of SfxFrame instances during loading, since now the frame is really created when it is needed only.
Diffstat (limited to 'sfx2/inc/sfx2/frame.hxx')
| -rw-r--r-- | sfx2/inc/sfx2/frame.hxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index a5b8d81ff2..e051384e6e 100644 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -157,7 +157,8 @@ public: static SfxFrame* GetFirst(); static SfxFrame* GetNext( SfxFrame& ); - const SfxPoolItem* LoadDocumentSynchron( SfxItemSet& aSet ); + static const SfxPoolItem* + OpenDocumentSynchron( SfxItemSet& aSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rTargetFrame ); SfxBroadcaster& GetBroadcaster() const; SfxObjectShell* GetCurrentDocument() const; @@ -286,7 +287,24 @@ public: ::com::sun::star::uno::Any GetValue() const { return aValue; } virtual int operator==( const SfxPoolItem& ) const; - virtual String GetValueText() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); +}; + +class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem +{ + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > + m_xFrame; + +public: + TYPEINFO(); + SfxUnoFrameItem(); + SfxUnoFrameItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& + GetFrame() const + { return m_xFrame; } + virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); |