diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-25 12:03:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-02 08:02:54 +0000 |
commit | 4978328534c0f759eea7d0c196046f1d53b06925 (patch) | |
tree | cf9dcd62c4f09dcd08115bbda2a8950678a38562 /sc/source/ui/docshell | |
parent | 1461ebbbb5d47d90e31f0945a4878a68fbee5213 (diff) |
convert method names in tools::SvRef to be more like our other..
reference classes, uno::Reference and rtl::Reference.
Specifically rename Is()->is() and Clear()->clear().
Change-Id: Icb7e05e2d09cb9977121508b837ba0961dabb4ae
Reviewed-on: https://gerrit.libreoffice.org/33576
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/pntlock.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/tablink.cxx | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index d76404bba990..61b412bfd819 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -248,7 +248,7 @@ void ScDocShell::UnlockPaint_Impl(bool bDoc) pPaintLockData = nullptr; // nicht weitersammeln ScRangeListRef xRangeList = pPaint->GetRangeList(); - if ( xRangeList.Is() ) + if ( xRangeList.is() ) { PaintPartFlags nParts = pPaint->GetParts(); for ( size_t i = 0, nCount = xRangeList->size(); i < nCount; i++ ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 3f11472077cf..6b2ee929d124 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -292,7 +292,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) bValid = true; } else - aRangeListRef.Clear(); + aRangeListRef.clear(); } ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 94b8752f429e..fa08f9492ae3 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2460,7 +2460,7 @@ ScDocument* ScExternalRefManager::getSrcDocument(sal_uInt16 nFileId) catch (const css::uno::Exception&) { } - if (!aSrcDoc.maShell.Is()) + if (!aSrcDoc.maShell.is()) { // source document could not be loaded. return nullptr; @@ -2559,7 +2559,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt if (!pNewShell->DoLoad(pMedium.release())) { aRef->DoClose(); - aRef.Clear(); + aRef.clear(); return aRef; } @@ -2913,7 +2913,7 @@ bool ScExternalRefManager::refreshSrcDocument(sal_uInt16 nFileId) } catch ( const css::uno::Exception& ) {} - if (!xDocShell.Is()) + if (!xDocShell.is()) // Failed to load the document. Bail out. return false; diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 138c4eb613a2..ed7aca968e17 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -33,7 +33,7 @@ ScPaintLockData::~ScPaintLockData() void ScPaintLockData::AddRange( const ScRange& rRange, PaintPartFlags nP ) { - if (!xRangeList.Is()) + if (!xRangeList.is()) xRangeList = new ScRangeList; xRangeList->Join( rRange ); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 5c2ff38af891..7c83260d88ba 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -534,7 +534,7 @@ ScDocumentLoader::ScDocumentLoader( const OUString& rFileName, ScDocumentLoader::~ScDocumentLoader() { - if ( aRef.Is() ) + if ( aRef.is() ) aRef->DoClose(); else if ( pMedium ) delete pMedium; @@ -542,14 +542,14 @@ ScDocumentLoader::~ScDocumentLoader() void ScDocumentLoader::ReleaseDocRef() { - if ( aRef.Is() ) + if ( aRef.is() ) { // release reference without calling DoClose - caller must // have another reference to the doc and call DoClose later pDocShell = nullptr; pMedium = nullptr; - aRef.Clear(); + aRef.clear(); } } |