diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-02 23:43:23 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-03 00:48:15 +0100 |
| commit | fd95f1ab6220c6a530fd2e4e727417f504a5db51 (patch) | |
| tree | b378d6e72698a8329f41d7919016574a301016e2 /svx/inc | |
| parent | SdrModel: remove unused pModelStorage (diff) | |
| download | core-fd95f1ab6220c6a530fd2e4e727417f504a5db51.tar.gz core-fd95f1ab6220c6a530fd2e4e727417f504a5db51.zip | |
refactor SdrModel::GetDocumentStream
Remove 3 ~identical implementations of GetDocumentStream and the associated
struct SdrDocumentStreamInfo.
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/svdmodel.hxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 3cf998fec409..567c821e5f4e 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -91,10 +91,13 @@ class SotStorage; class SdrOutlinerCache; class SotStorageRef; class SdrUndoFactory; -namespace comphelper{ +namespace comphelper +{ class IEmbeddedHelper; + class LifecycleProxy; } -namespace sfx2{ +namespace sfx2 +{ class LinkManager; } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -156,13 +159,6 @@ public: // neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv #define LOADREFCOUNTS (false) -struct SdrDocumentStreamInfo -{ - bool mbDeleteAfterUse; - String maUserData; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef; -}; - struct SdrModelImpl; class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase< SdrModel > @@ -330,7 +326,12 @@ public: // Datei angelegt. // Geliefert werden muss der Stream, aus dem das Model geladen wurde // bzw. in den es zuletzt gespeichert wurde. - virtual SvStream* GetDocumentStream( SdrDocumentStreamInfo& rStreamInfo ) const; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::embed::XStorage> GetDocumentStorage() const; + ::com::sun::star::uno::Reference< + ::com::sun::star::io::XInputStream > + GetDocumentStream(::rtl::OUString const& rURL, + ::comphelper::LifecycleProxy & rProxy) const; // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln. void BurnInStyleSheetAttributes(); // Wer sich von SdrPage ableitet muss sich auch von SdrModel ableiten |