diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-07-25 10:18:12 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-07-25 15:02:34 -0400 |
| commit | 4cfb14c56eb8732bbac7cdc1cff3016f56b51de3 (patch) | |
| tree | f43e34385d4b03b6996f7e04add979c0366295aa | |
| parent | f0bc016955d7f0b2b31639fc28256167fe61c7f0 (diff) | |
Moved bSetFilter to Impl. BTW this flag is probably not used at all.
Change-Id: I21fbcffc472408476897c388aafccf658e8144a8
| -rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index 6c50fe151b26..7a5104f377c2 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -69,7 +69,6 @@ class DateTime; class SFX2_DLLPUBLIC SfxMedium : public SvRefBase { sal_uInt32 eError; - bool bSetFilter:1; bool bTriedStorage:1; bool bRemote:1; StreamMode nStorOpenMode; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a33d97e0aa58..532699b653e2 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -261,6 +261,7 @@ public: bool m_bRemoveBackup:1; bool m_bOriginallyReadOnly:1; bool m_bRoot:1; + bool m_bSetFilter:1; uno::Reference < embed::XStorage > xStorage; @@ -328,6 +329,7 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) m_bRemoveBackup( false ), m_bOriginallyReadOnly(false), m_bRoot(false), + m_bSetFilter(false), pAntiImpl( pAntiImplP ), nFileVersion( 0 ), pOrigFilter( 0 ), @@ -1479,7 +1481,7 @@ void SfxMedium::SetOpenMode( StreamMode nStorOpen, } } - bSetFilter = false; + pImp->m_bSetFilter = false; } //------------------------------------------------------------------ @@ -2481,7 +2483,6 @@ void SfxMedium::Init_Impl() //------------------------------------------------------------------ SfxMedium::SfxMedium() : eError( SVSTREAM_OK ), - bSetFilter( false ), bTriedStorage( false ), nStorOpenMode( SFX_STREAM_READWRITE ), pURLObj(0), @@ -2830,7 +2831,6 @@ void SfxMedium::CompleteReOpen() SfxMedium::SfxMedium(const String &rName, StreamMode nOpenMode, const SfxFilter *pFlt, SfxItemSet *pInSet) : eError( SVSTREAM_OK ), - bSetFilter( false ), bTriedStorage( false ), nStorOpenMode( SFX_STREAM_READWRITE ), pURLObj(0), @@ -2847,7 +2847,6 @@ SfxMedium::SfxMedium(const String &rName, StreamMode nOpenMode, const SfxFilter SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) : - bSetFilter( false ), bTriedStorage( false ), nStorOpenMode( SFX_STREAM_READWRITE ), pURLObj(0), @@ -2908,7 +2907,6 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b //------------------------------------------------------------------ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const SfxItemSet* p, sal_Bool bRootP ) : - bSetFilter( false ), bTriedStorage( false ), nStorOpenMode( SFX_STREAM_READWRITE ), pURLObj(0), @@ -2934,7 +2932,6 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str } SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const String& rTypeName, const SfxItemSet* p, sal_Bool bRootP ) : - bSetFilter( false ), bTriedStorage( false ), nStorOpenMode( SFX_STREAM_READWRITE ), pURLObj(0), |