summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-27 08:29:04 +0200
committerNoel Grandin <noel@peralex.com>2015-10-27 08:56:38 +0200
commitc22ec49de497fd65b4dac901d6bc1f06d5a9a3c7 (patch)
treed411290345081775749ea3d799f0f7e7da59425e /sfx2
parent14fc882e5c01e110d0fea7fb08489a0f0e98dbe6 (diff)
inline SfxMediumRef typedef
Change-Id: Id6dc03a5957adf657d12db7941273593a9f7c10f
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/fileobj.cxx8
-rw-r--r--sfx2/source/appl/fileobj.hxx14
2 files changed, 11 insertions, 11 deletions
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;