diff options
| -rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 2 | ||||
| -rw-r--r-- | include/sfx2/docfile.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/fileobj.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/appl/fileobj.hxx | 14 | ||||
| -rw-r--r-- | sw/source/core/inc/SwXMLTextBlocks.hxx | 12 |
6 files changed, 19 insertions, 21 deletions
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 194349c9bdd3..14e2db16179d 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -295,7 +295,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) { uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); - SfxMediumRef pMedium(0); + tools::SvRef<SfxMedium> pMedium(0); if (!xStorage.is()) { OUString sStreamRelPath; diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index c19cc35dfaa8..f1192b3e8c58 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -264,8 +264,6 @@ public: static sal_uInt32 CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter ); }; -typedef tools::SvRef<SfxMedium> SfxMediumRef; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 8c86749cbb89..f75a5bddf096 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -459,7 +459,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) { uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); - SfxMediumRef pMedium = new SfxMedium( + tools::SvRef<SfxMedium> pMedium = new SfxMedium( sFileName, ( StreamMode::READ | StreamMode::NOCREATE ) ); if( pMedium ) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 6d97ba0d31a4..70e53b2c0e59 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -96,7 +96,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, case FILETYPE_GRF: if( !bLoadError ) { - SfxMediumRef xTmpMed; + tools::SvRef<SfxMedium> xTmpMed; if( SotClipboardFormatId::GDIMETAFILE == nFmt || SotClipboardFormatId::BITMAP == nFmt || SotClipboardFormatId::SVXB == nFmt ) @@ -266,7 +266,7 @@ bool SvFileObject::LoadFile_Impl() bLoadAgain = bDataReady = bInNewData = false; bWaitForData = true; - SfxMediumRef xTmpMed = xMed; + tools::SvRef<SfxMedium> xTmpMed = xMed; bInCallDownload = true; xMed->Download( LINK( this, SvFileObject, LoadGrfReady_Impl ) ); bInCallDownload = false; @@ -485,7 +485,7 @@ IMPL_LINK_NOARG_TYPED( SvFileObject, LoadGrfReady_Impl, void*, void ) if( xMed.Is() ) { xMed->SetDoneLink( Link<void*,void>() ); - pDelMed = new SfxMediumRef(xMed); + pDelMed = new tools::SvRef<SfxMedium>(xMed); nPostUserEventId = Application::PostUserEvent( LINK( this, SvFileObject, DelMedium_Impl ), pDelMed); @@ -496,7 +496,7 @@ IMPL_LINK_NOARG_TYPED( SvFileObject, LoadGrfReady_Impl, void*, void ) IMPL_LINK_TYPED( SvFileObject, DelMedium_Impl, void*, p, void ) { - SfxMediumRef* deleteMedium = static_cast<SfxMediumRef*>(p); + tools::SvRef<SfxMedium>* deleteMedium = static_cast<tools::SvRef<SfxMedium>*>(p); nPostUserEventId = 0; assert(pDelMed == deleteMedium); pDelMed = NULL; diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index 397bd76bf6b4..bad1ddde0b8e 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -28,14 +28,14 @@ namespace sfx2 { class FileDialogHelper; } class SvFileObject : public sfx2::SvLinkSource { - OUString sFileNm; - OUString sFilter; - OUString sReferer; + OUString sFileNm; + OUString sFilter; + OUString sReferer; Link<const OUString&, void> aEndEditLink; - SfxMediumRef xMed; - ImplSVEvent* nPostUserEventId; - SfxMediumRef* pDelMed; - VclPtr<vcl::Window> pOldParent; + tools::SvRef<SfxMedium> xMed; + ImplSVEvent* nPostUserEventId; + tools::SvRef<SfxMedium>* pDelMed; + VclPtr<vcl::Window> pOldParent; sal_uInt8 nType; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 2767df653223..9c7bc8639813 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -34,12 +34,12 @@ class SvxMacroTableDtor; class SwXMLTextBlocks : public SwImpBlocks { protected: - bool bAutocorrBlock; - bool bBlock; - SfxObjectShellRef xDocShellRef; - sal_uInt16 nFlags; - OUString aPackageName; - SfxMediumRef xMedium; + bool bAutocorrBlock; + bool bBlock; + SfxObjectShellRef xDocShellRef; + sal_uInt16 nFlags; + OUString aPackageName; + tools::SvRef<SfxMedium> xMedium; void ReadInfo(); void WriteInfo(); |