diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-07-25 12:23:29 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-07-25 15:02:36 -0400 |
| commit | ead20e683c11cbc028de34bc475e8fa056cb7431 (patch) | |
| tree | 5140031b6f100a2cd6322846499c671b0de01d6c | |
| parent | e8853ab77b0a3b57848f0b0283d3c3ccef0837d5 (diff) | |
Move m_xInputStreamToLoadFrom to Impl.
Change-Id: I5d4c3976386570cc2688951178b42f7f3fae06b7
| -rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index aca768c556f9..2121bbc43341 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -75,9 +75,6 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase SvStream* pOutStream; SfxMedium_Impl* pImp; - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> - m_xInputStreamToLoadFrom; - #if _SOLAR__PRIVATE SAL_DLLPRIVATE void SetIsRemote_Impl(); SAL_DLLPRIVATE void CloseInStream_Impl(); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index e3969c98a11b..ae788ac13056 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -272,6 +272,7 @@ public: OUString m_aLongName; uno::Reference < embed::XStorage > xStorage; + uno::Reference<io::XInputStream> m_xInputStreamToLoadFrom; mutable SfxItemSet* m_pSet; const SfxFilter* m_pFilter; @@ -2295,9 +2296,9 @@ void SfxMedium::GetMedium_Impl() GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny(xInteractionHandler) ) ); } - if ( m_xInputStreamToLoadFrom.is() ) + if ( pImp->m_xInputStreamToLoadFrom.is() ) { - pImp->xInputStream = m_xInputStreamToLoadFrom; + pImp->xInputStream = pImp->m_xInputStreamToLoadFrom; pImp->xInputStream->skipBytes(0); if (pImp->m_bInputStreamIsReadOnly) GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); @@ -3059,7 +3060,7 @@ SfxFrame* SfxMedium::GetLoadTargetFrame() const void SfxMedium::setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,sal_Bool bIsReadOnly ) { - m_xInputStreamToLoadFrom = xInputStream; + pImp->m_xInputStreamToLoadFrom = xInputStream; pImp->m_bInputStreamIsReadOnly = bIsReadOnly; } |