summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-25 12:03:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-02 08:02:54 +0000
commit4978328534c0f759eea7d0c196046f1d53b06925 (patch)
treecf9dcd62c4f09dcd08115bbda2a8950678a38562 /sw
parent1461ebbbb5d47d90e31f0945a4878a68fbee5213 (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 'sw')
-rw-r--r--sw/inc/ndgrf.hxx6
-rw-r--r--sw/inc/section.hxx4
-rw-r--r--sw/qa/core/filters-test.cxx4
-rw-r--r--sw/qa/core/uwriter.cxx2
-rw-r--r--sw/source/core/crsr/bookmrk.cxx4
-rw-r--r--sw/source/core/doc/DocumentLinksAdministrationManager.cxx2
-rw-r--r--sw/source/core/doc/swserv.cxx2
-rw-r--r--sw/source/core/docnode/section.cxx18
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx2
-rw-r--r--sw/source/core/edit/edglss.cxx2
-rw-r--r--sw/source/core/fields/ddefld.cxx2
-rw-r--r--sw/source/core/graphic/ndgrf.cxx22
-rw-r--r--sw/source/core/inc/bookmrk.hxx2
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx2
-rw-r--r--sw/source/core/table/swtable.cxx4
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx2
-rw-r--r--sw/source/core/unocore/unoobj.cxx2
-rw-r--r--sw/source/filter/basflt/iodetect.cxx2
-rw-r--r--sw/source/filter/basflt/shellio.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx10
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx12
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx2
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/uibase/app/docsh.cxx2
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx28
-rw-r--r--sw/source/uibase/uiview/view2.cxx4
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx10
32 files changed, 83 insertions, 83 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 326f567bab0f..9b1faeff2999 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -178,7 +178,7 @@ public:
virtual bool RestorePersistentData() override;
/// Query link-data.
- bool IsGrfLink() const { return refLink.Is(); }
+ bool IsGrfLink() const { return refLink.is(); }
bool IsLinkedFile() const;
bool IsLinkedDDE() const;
const tools::SvRef<sfx2::SvBaseLink>& GetLink() const { return refLink; }
@@ -215,12 +215,12 @@ inline const SwGrfNode *SwNode::GetGrfNode() const
inline bool SwGrfNode::IsLinkedFile() const
{
- return refLink.Is() && OBJECT_CLIENT_GRF == refLink->GetObjType();
+ return refLink.is() && OBJECT_CLIENT_GRF == refLink->GetObjType();
}
inline bool SwGrfNode::IsLinkedDDE() const
{
- return refLink.Is() && OBJECT_CLIENT_DDE == refLink->GetObjType();
+ return refLink.is() && OBJECT_CLIENT_DDE == refLink->GetObjType();
}
#endif
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index bd0908db2871..1824460a5b0f 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -215,14 +215,14 @@ public:
void SetRefObject( SwServerObject* pObj );
const SwServerObject* GetObject() const { return m_RefObj.get(); }
SwServerObject* GetObject() { return m_RefObj.get(); }
- bool IsServer() const { return m_RefObj.Is(); }
+ bool IsServer() const { return m_RefObj.is(); }
// Methods for linked ranges.
SfxLinkUpdateMode GetUpdateType() const { return m_RefLink->GetUpdateMode(); }
void SetUpdateType(SfxLinkUpdateMode nType )
{ m_RefLink->SetUpdateMode(nType); }
- bool IsConnected() const { return m_RefLink.Is(); }
+ bool IsConnected() const { return m_RefLink.is(); }
void UpdateNow() { m_RefLink->Update(); }
void Disconnect() { m_RefLink->Disconnect(); }
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index b8cb7c506ac6..0eff13b14c06 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -110,7 +110,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL,
bool bLoaded = xDocShRef->DoLoad(pSrcMed);
if (!bExport)
{
- if (xDocShRef.Is())
+ if (xDocShRef.is())
xDocShRef->DoClose();
return bLoaded;
}
@@ -124,7 +124,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL,
SfxMedium aDstMed(aTempFile.GetURL(), StreamMode::STD_WRITE);
aDstMed.SetFilter(pExportFilter);
bool bSaved = xDocShRef->DoSaveAs(aDstMed);
- if (xDocShRef.Is())
+ if (xDocShRef.is())
xDocShRef->DoClose();
return bSaved;
}
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 7de5c5d946c2..e5b17891d802 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1699,7 +1699,7 @@ void SwDocTest::tearDown()
{
m_pDoc = nullptr; // deleted by DoClose()
m_xDocShRef->DoClose();
- m_xDocShRef.Clear();
+ m_xDocShRef.clear();
BootstrapFixture::tearDown();
}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 417a56baba7f..69add5f044c5 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -251,13 +251,13 @@ namespace sw { namespace mark
void DdeBookmark::DeregisterFromDoc(SwDoc* const pDoc)
{
- if(m_aRefObj.Is())
+ if(m_aRefObj.is())
pDoc->getIDocumentLinksAdministration().GetLinkManager().RemoveServer(m_aRefObj.get());
}
DdeBookmark::~DdeBookmark()
{
- if( m_aRefObj.Is() )
+ if( m_aRefObj.is() )
{
if(m_aRefObj->HasDataLinks())
{
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index ccbe757d2323..947e9f2ff8ff 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -416,7 +416,7 @@ bool DocumentLinksAdministrationManager::EmbedAllLinks()
xLink->Closed();
// if one forgot to remove itself
- if( xLink.Is() )
+ if( xLink.is() )
rLnkMgr.Remove( xLink.get() );
bRet = true;
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index ee851d45e80f..9c7432dbebaa 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -58,7 +58,7 @@ bool SwServerObject::GetData( uno::Any & rData,
default: break;
}
- if( xWrt.Is() )
+ if( xWrt.is() )
{
SwPaM* pPam = nullptr;
switch( eType )
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 275a534cae62..35d4158a00fa 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -246,7 +246,7 @@ SwSection::~SwSection()
pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
}
- if (m_RefObj.Is())
+ if (m_RefObj.is())
{
pDoc->getIDocumentLinksAdministration().GetLinkManager().RemoveServer( m_RefObj.get() );
}
@@ -261,7 +261,7 @@ SwSection::~SwSection()
pDoc->DelSectionFormat( pFormat );
}
}
- if (m_RefObj.Is())
+ if (m_RefObj.is())
{
m_RefObj->Closed();
}
@@ -544,7 +544,7 @@ void SwSection::SetCondHidden(bool const bFlag)
// Set/remove the linked FileName
OUString SwSection::GetLinkFileName() const
{
- if (m_RefLink.Is())
+ if (m_RefLink.is())
{
OUString sTmp;
switch (m_Data.GetType())
@@ -582,7 +582,7 @@ OUString SwSection::GetLinkFileName() const
void SwSection::SetLinkFileName(const OUString& rNew)
{
- if (m_RefLink.Is())
+ if (m_RefLink.is())
{
m_RefLink->SetLinkSourceName( rNew );
}
@@ -1309,7 +1309,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
{
tools::SvRef<SwServerObject> refObj( static_cast<SwServerObject*>(
pDoc->getIDocumentLinksAdministration().CreateLinkSource( sRange )));
- if( refObj.Is() )
+ if( refObj.is() )
{
bRecursion = refObj->IsLinkInServer( this ) ||
ChkNoDataFlag();
@@ -1385,7 +1385,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
// Update all Links in this Section
lcl_UpdateLinksInSect( *this, *pSectNd );
}
- if( xDocSh.Is() )
+ if( xDocSh.is() )
{
if( 2 == nRet )
xDocSh->DoClose();
@@ -1503,7 +1503,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
SfxLinkUpdateMode nUpdateType = SfxLinkUpdateMode::ALWAYS;
- if (!m_RefLink.Is())
+ if (!m_RefLink.is())
{
// create BaseLink
m_RefLink = new SwIntrnlSectRefLink( *pFormat, nUpdateType );
@@ -1569,7 +1569,7 @@ void SwSection::BreakLink()
}
// Release link, if it exists
- if (m_RefLink.Is())
+ if (m_RefLink.is())
{
SwSectionFormat *const pFormat( GetFormat() );
OSL_ENSURE(pFormat, "SwSection::BreakLink: no format?");
@@ -1577,7 +1577,7 @@ void SwSection::BreakLink()
{
pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
}
- m_RefLink.Clear();
+ m_RefLink.clear();
}
// change type
SetType( CONTENT_SECTION );
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 8602ef9a4173..4fbd3b7a5137 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -457,7 +457,7 @@ const SwNode* SwBaseLink::GetAnchor() const
bool SwBaseLink::IsRecursion( const SwBaseLink* pChkLnk ) const
{
tools::SvRef<SwServerObject> aRef( static_cast<SwServerObject*>(GetObj()) );
- if( aRef.Is() )
+ if( aRef.is() )
{
// As it's a ServerObject, we query all contained Links
// if we are contained in them. Else we have a recursion.
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 48ee031537c8..3dd2d8cfaca0 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -280,7 +280,7 @@ bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
#endif
WriterRef xWrt;
SwReaderWriter::GetWriter( FILTER_TEXT, OUString(), xWrt );
- if( xWrt.Is() )
+ if( xWrt.is() )
{
// write selected areas into a ASCII document
SwWriter aWriter( aStream, *this);
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 2c4e596d4ddb..e83b66c7ddec 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -283,7 +283,7 @@ void SwDDEFieldType::SetDoc( SwDoc* pNewDoc )
if( pNewDoc == pDoc )
return;
- if( pDoc && refLink.Is() )
+ if( pDoc && refLink.is() )
{
OSL_ENSURE( !nRefCnt, "How do we get the references?" );
pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 94142cfa8a68..13a1f87d6134 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -148,7 +148,7 @@ bool SwGrfNode::ReRead(
"GraphicNode without a name, Graphic or GraphicObject" );
// with name
- if( refLink.Is() )
+ if( refLink.is() )
{
OSL_ENSURE( !bInSwapIn, "ReRead: I am still in SwapIn" );
@@ -179,7 +179,7 @@ bool SwGrfNode::ReRead(
else // no name anymore, so remove link
{
GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
- refLink.Clear();
+ refLink.clear();
}
if( pGraphic )
@@ -202,7 +202,7 @@ bool SwGrfNode::ReRead(
Graphic aGrf; aGrf.SetDefaultType();
maGrfObj.SetGraphic( aGrf, rGrfName );
- if( refLink.Is() )
+ if( refLink.is() )
{
if( getLayoutFrame( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) )
{
@@ -296,7 +296,7 @@ SwGrfNode::~SwGrfNode()
mpThreadConsumer.reset();
SwDoc* pDoc = GetDoc();
- if( refLink.Is() )
+ if( refLink.is() )
{
OSL_ENSURE( !bInSwapIn, "DTOR: I am still in SwapIn" );
pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
@@ -608,7 +608,7 @@ bool SwGrfNode::SwapOut()
maGrfObj.GetType() != GraphicType::NONE &&
!maGrfObj.IsSwappedOut() && !bInSwapIn )
{
- if( refLink.Is() )
+ if( refLink.is() )
{
// written graphics and links are removed here
return maGrfObj.SwapOut( GRFMGR_AUTOSWAPSTREAM_LINK );
@@ -625,7 +625,7 @@ bool SwGrfNode::SwapOut()
bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
{
bool bRet = false;
- if( refLink.Is() && refLink->GetLinkManager() )
+ if( refLink.is() && refLink->GetLinkManager() )
{
sal_uInt16 nType = refLink->GetObjType();
if( OBJECT_CLIENT_GRF == nType )
@@ -656,7 +656,7 @@ bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
*/
bool SwGrfNode::SavePersistentData()
{
- if( refLink.Is() )
+ if( refLink.is() )
{
OSL_ENSURE( !bInSwapIn, "SavePersistentData: I am still in SwapIn" );
GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
@@ -684,7 +684,7 @@ bool SwGrfNode::SavePersistentData()
bool SwGrfNode::RestorePersistentData()
{
- if( refLink.Is() )
+ if( refLink.is() )
{
IDocumentLinksAdministration& rIDLA = getIDocumentLinksAdministration();
refLink->SetVisible( rIDLA.IsVisibleLinks() );
@@ -729,7 +729,7 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
void SwGrfNode::ReleaseLink()
{
- if( refLink.Is() )
+ if( refLink.is() )
{
const OUString aFileName(maGrfObj.GetLink());
const Graphic aLocalGraphic(maGrfObj.GetGraphic());
@@ -743,7 +743,7 @@ void SwGrfNode::ReleaseLink()
}
getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
- refLink.Clear();
+ refLink.clear();
maGrfObj.SetLink();
// #i15508# added extra processing after getting rid of the link. Use whatever is
@@ -962,7 +962,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, const GraphicObject*, pGrfObj, SvStream* )
// a DataChanged call lead to a paint of the graphic.
if( pGrfObj->IsInSwapOut() && (IsSelected() || bInSwapIn) )
pRet = GRFMGR_AUTOSWAPSTREAM_NONE;
- else if( refLink.Is() )
+ else if( refLink.is() )
{
if( pGrfObj->IsInSwapIn() )
{
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 6e1866002f0f..1528df16be72 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -142,7 +142,7 @@ namespace sw {
const SwServerObject* GetRefObject() const { return m_aRefObj.get(); }
SwServerObject* GetRefObject() { return m_aRefObj.get(); }
- bool IsServer() const { return m_aRefObj.Is(); }
+ bool IsServer() const { return m_aRefObj.is(); }
void SetRefObject( SwServerObject* pObj );
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index cb4aee07af82..5660a4cc4725 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -122,7 +122,7 @@ SwXMLTextBlocks::~SwXMLTextBlocks()
if ( bInfoChanged )
WriteInfo();
ResetBlockMode ();
- if(xDocShellRef.Is())
+ if(xDocShellRef.is())
xDocShellRef->DoClose();
xDocShellRef = nullptr;
if( pDoc && !pDoc->release() )
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index c2038745c6e7..4f48f916f24c 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -240,7 +240,7 @@ void DelBoxNode( SwTableSortBoxes& rSortCntBoxes )
SwTable::~SwTable()
{
- if( m_xRefObj.Is() )
+ if( m_xRefObj.is() )
{
SwDoc* pDoc = GetFrameFormat()->GetDoc();
if( !pDoc->IsInDtor() ) // then remove from the list
@@ -1937,7 +1937,7 @@ SwTableNode* SwTable::GetTableNode() const
void SwTable::SetRefObject( SwServerObject* pObj )
{
- if( m_xRefObj.Is() )
+ if( m_xRefObj.is() )
m_xRefObj->Closed();
m_xRefObj = pObj;
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 880ae23e4993..bb8048868038 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1045,7 +1045,7 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL,
SfxObjectShellRef aRef( pDocSh );
pMed->Download(); // if necessary: start the download
- if( aRef.Is() && 1 < aRef->GetRefCount() ) // Ref still valid?
+ if( aRef.is() && 1 < aRef->GetRefCount() ) // Ref still valid?
{
SwReader* pRdr;
SfxItemSet* pSet = pMed->GetItemSet();
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 8d0a03eb20b8..527cd59d13af 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -174,7 +174,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
WriterRef xWrt;
// TODO/MBA: looks like a BaseURL doesn't make sense here
SwReaderWriter::GetWriter( FILTER_TEXT_DLG, OUString(), xWrt );
- if( xWrt.Is() )
+ if( xWrt.is() )
{
SwWriter aWriter( aStream, rPam );
xWrt->bASCII_NoLastLineEnd = true;
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index c9cf78c2eac2..11d3a3152c77 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -202,7 +202,7 @@ std::shared_ptr<const SfxFilter> SwIoSystem::GetFileFilter(const OUString& rFile
{
}
- if( xStg.Is() && ( xStg->GetError() == SVSTREAM_OK ) )
+ if( xStg.is() && ( xStg->GetError() == SVSTREAM_OK ) )
{
while ( pFilter )
{
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index de743ce1620f..91c9d40440a1 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -854,7 +854,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
sal_uLong nError = 0;
if( pMedium )
nError = rxWriter->Write( *pPam, *pMedium, pRealFileName );
- else if( pStg.Is() )
+ else if( pStg.is() )
nError = rxWriter->Write( *pPam, *pStg, pRealFileName );
else if( pStrm )
nError = rxWriter->Write( *pPam, *pStrm, pRealFileName );
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 2b8a8b24a277..d92784001782 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -3158,7 +3158,7 @@ void SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo
sStorageName.append('_').append( static_cast<sal_Int64>( nObjId ));
tools::SvRef<SotStorage> xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear());
- if (!xOleStg.Is())
+ if (!xOleStg.is())
return;
OUString sUName;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 4710b544d616..7994b3d9b73e 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3369,7 +3369,7 @@ void WW8Export::ExportDocument_Impl()
xDataStrm->SetBufferSize( 0 );
if( 0 == pDataStrm->Seek( STREAM_SEEK_TO_END ))
{
- xDataStrm.Clear();
+ xDataStrm.clear();
pDataStrm = nullptr;
GetWriter().GetStorage().Remove(SL::aData);
}
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 959c9a2702d6..e90e349e851c 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -210,7 +210,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage(SL::aObjectPool);
- if( xObjStg.Is() )
+ if( xObjStg.is() )
{
uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef());
if( xObj.is() )
@@ -229,7 +229,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
OUString sStorageName('_');
sStorageName += OUString::number( nPictureId );
tools::SvRef<SotStorage> xOleStg = xObjStg->OpenSotStorage( sStorageName );
- if( xOleStg.Is() )
+ if( xOleStg.is() )
{
/*
If this object storage has been written already don't
@@ -247,7 +247,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
{
const sal_uInt8 pObjInfoData[] = { 0x40, 0x00, 0x03, 0x00 };
tools::SvRef<SotStorageStream> rObjInfoStream = xOleStg->OpenSotStream( aObjInfo );
- if ( rObjInfoStream.Is() && !rObjInfoStream->GetError() )
+ if ( rObjInfoStream.is() && !rObjInfoStream->GetError() )
{
rObjInfoStream->WriteBytes(pObjInfoData, sizeof(pObjInfoData));
xOleStg->Commit();
@@ -324,10 +324,10 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId )
tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage(SL::aObjectPool);
- if( xObjStg.Is() && xObjSrc.Is() )
+ if( xObjStg.is() && xObjSrc.is() )
{
tools::SvRef<SotStorage> xOleDst = xObjStg->OpenSotStorage( rOleId );
- if ( xOleDst.Is() )
+ if ( xOleDst.is() )
xObjSrc->CopyTo( xOleDst.get() );
if ( !xOleDst->GetError( ) )
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 24a13480f100..b441a0aed8b5 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -45,7 +45,7 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream> &refStrm, sal_uInt8 nVer
xTableStream = pStg->OpenSotStream(
aWwFib.m_fWhichTableStm ? SL::a1Table : SL::a0Table, StreamMode::STD_READ);
- if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
+ if (xTableStream.is() && SVSTREAM_OK == xTableStream->GetError())
{
xTableStream->SetEndian(SvStreamEndian::LITTLE);
pGlossary.reset( new WW8GlossaryFib(*refStrm, nVersion, *xTableStream, aWwFib) );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1a0be1031770..6bec800c8bce 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4886,7 +4886,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
tools::SvRef<SotStorageStream> xTableStream =
rRoot->OpenSotStream(aWwFib.m_fWhichTableStm ? SL::a1Table : SL::a0Table, StreamMode::STD_READ);
- if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
+ if (xTableStream.is() && SVSTREAM_OK == xTableStream->GetError())
{
xTableStream->SetEndian(SvStreamEndian::LITTLE);
WW8Customizations aGblCustomisations( xTableStream.get(), aWwFib );
@@ -5432,7 +5432,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(tools::SvRef<SotStorageStream> &rTableS
rDataStream = m_pStg->OpenSotStream(SL::aData, StreamMode::STD_READ);
- if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
+ if (rDataStream.is() && SVSTREAM_OK == rDataStream->GetError())
{
m_pDataStream = rDataStream.get();
m_pDataStream->SetEndian(SvStreamEndian::LITTLE);
@@ -6229,7 +6229,7 @@ sal_uLong WW8Reader::OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_u
OSL_ENSURE( pStg.get(), "Where is my Storage?" );
rRef = pStg->OpenSotStream( "WordDocument", StreamMode::READ | StreamMode::SHARE_DENYALL);
- if( rRef.Is() )
+ if( rRef.is() )
{
if( SVSTREAM_OK == rRef->GetError() )
{
@@ -6273,7 +6273,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, co
else if ( sFltName=="CWW7" )
nVersion = 7;
- if( pStg.Is() )
+ if( pStg.is() )
{
nRet = OpenMainStream( refStrm, nOldBuffSize );
pIn = refStrm.get();
@@ -6307,10 +6307,10 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, co
nRet = ERR_WW8_NO_WW8_FILE_ERR;
}
- if( refStrm.Is() )
+ if( refStrm.is() )
{
refStrm->SetBufferSize( nOldBuffSize );
- refStrm.Clear();
+ refStrm.clear();
}
else
{
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 8f23de26b177..7a4c6c002677 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -425,7 +425,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
{
tools::SvRef<SotStorageStream> xObjInfoSrc = xSrc1->OpenSotStream("\3ObjInfo",
StreamMode::STD_READ );
- if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
+ if ( xObjInfoSrc.is() && !xObjInfoSrc->GetError() )
{
sal_uInt8 nByte = 0;
xObjInfoSrc->ReadUChar( nByte );
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index efe2f0e88d39..278c8633b235 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -641,7 +641,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
"OLELinks", embed::ElementModes::WRITE );
tools::SvRef<SotStorage> xObjDst = SotStorage::OpenOLEStorage( xOleStg, sOleId );
- if ( xObjDst.Is() )
+ if ( xObjDst.is() )
{
xSrc1->CopyTo( xObjDst.get() );
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 7429a27cc954..ef108972ad20 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -145,7 +145,7 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami
ePropToken = XML_TABLE_CELL_PROPERTIES;
}
- if( xItemMap.Is() )
+ if( xItemMap.is() )
{
m_pTableItemMapper->setMapEntries( xItemMap );
m_pTableItemMapper->exportXML( *this,
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 42c2702c97d9..1b761e2a237b 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -535,7 +535,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
WriterRef xWriter;
SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter );
- if( !xWriter.Is() )
+ if( !xWriter.is() )
{ // Filter not available
ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR(STR_DLLNOTFOUND))->Execute();
return false;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 7808ab038c37..8aa945362474 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1587,7 +1587,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
if( !IsMergeError() && bMT_SHELL )
// leave docshell available for caller (e.g. MM wizard)
rMergeDescriptor.pMailMergeConfigItem->SetTargetView( pTargetView );
- else if( xTargetDocShell.Is() )
+ else if( xTargetDocShell.is() )
xTargetDocShell->DoClose();
rescheduleGui();
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index f7bc082018d2..8ddf1448c2bd 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -236,10 +236,10 @@ SwTransferable::~SwTransferable()
SolarMutexGuard aSolarGuard;
// the DDELink still needs the WrtShell!
- if( m_xDdeLink.Is() )
+ if( m_xDdeLink.is() )
{
static_cast<SwTrnsfrDdeLink*>( m_xDdeLink.get() )->Disconnect( true );
- m_xDdeLink.Clear();
+ m_xDdeLink.clear();
}
m_pWrtShell = nullptr;
@@ -515,7 +515,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
switch( nFormat )
{
case SotClipboardFormatId::LINK:
- if( m_xDdeLink.Is() )
+ if( m_xDdeLink.is() )
bOK = SetObject( m_xDdeLink.get(), SWTRANSFER_OBJECTTYPE_DDE, rFlavor );
break;
@@ -727,7 +727,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream,
case SWTRANSFER_OBJECTTYPE_STRING:
GetASCWriter( aEmptyOUStr, OUString(), xWrt );
- if( xWrt.Is() )
+ if( xWrt.is() )
{
SwAsciiOptions aAOpt;
aAOpt.SetCharSet( RTL_TEXTENCODING_UTF8 );
@@ -740,7 +740,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream,
default: break;
}
- if( xWrt.Is() )
+ if( xWrt.is() )
{
SwDoc* pDoc = static_cast<SwDoc*>(pObject);
xWrt->bWriteClipboardDoc = true;
@@ -1705,7 +1705,7 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
nResId = STR_CLPBRD_FORMAT_ERROR;
// Exist a SvMemoryStream? (data in the OUString and xStrm is empty)
- if( pStream && !xStrm.Is() )
+ if( pStream && !xStrm.is() )
delete pStream;
if( bMsg && nResId )
@@ -3677,7 +3677,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
{
// then we create our "server" and connect to it
refObj = pDocShell->DdeCreateLinkSource( sName );
- if( refObj.Is() )
+ if( refObj.is() )
{
refObj->AddConnectAdvise( this );
refObj->AddDataAdvise( this,
@@ -3691,7 +3691,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
SwTrnsfrDdeLink::~SwTrnsfrDdeLink()
{
- if( refObj.Is() )
+ if( refObj.is() )
Disconnect( true );
}
@@ -3710,7 +3710,7 @@ SwTrnsfrDdeLink::~SwTrnsfrDdeLink()
bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
{
- if( !refObj.Is() || !FindDocShell() )
+ if( !refObj.is() || !FindDocShell() )
return false;
rtl_TextEncoding eEncoding = DDE_TXT_ENCODING;
@@ -3782,7 +3782,7 @@ void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise )
bInDisconnect = true;
// destroy the unused bookmark again (without Undo!)?
- if( bDelBookmrk && refObj.Is() && FindDocShell() )
+ if( bDelBookmrk && refObj.is() && FindDocShell() )
{
SwDoc* pDoc = pDocShell->GetDoc();
::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
@@ -3804,7 +3804,7 @@ void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise )
bDelBookmrk = false;
}
- if( refObj.Is() )
+ if( refObj.is() )
{
refObj->SetUpdateTimeout( nOldTimeOut );
refObj->RemoveConnectAdvise( this );
@@ -3814,7 +3814,7 @@ void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise )
// (ADVISEMODE_ONLYONCE!!!!)
// but always in normal Disconnect!
refObj->RemoveAllDataAdvise( this );
- refObj.Clear();
+ refObj.clear();
}
bInDisconnect = bOldDisconnect;
}
@@ -3839,11 +3839,11 @@ bool SwTrnsfrDdeLink::FindDocShell()
void SwTrnsfrDdeLink::Closed()
{
- if( !bInDisconnect && refObj.Is() )
+ if( !bInDisconnect && refObj.is() )
{
refObj->RemoveAllDataAdvise( this );
refObj->RemoveConnectAdvise( this );
- refObj.Clear();
+ refObj.clear();
}
}
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 9b8392490a67..f66b7d0bee7b 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -2185,7 +2185,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
}
pMedium->Download(); // start download if needed
- if( aRef.Is() && 1 < aRef->GetRefCount() ) // still a valid ref?
+ if( aRef.is() && 1 < aRef->GetRefCount() ) // still a valid ref?
{
SwReader* pRdr;
Reader *pRead = pDocSh->StartConvertFrom( *pMedium, &pRdr, m_pWrtShell );
@@ -2275,7 +2275,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
vcl::Window* pWin = &GetEditWin();
ScopedVclPtrInstance<MessageDialog>(pWin, SW_RES(STR_NO_MERGE_ENTRY), VclMessageType::Info)->Execute();
}
- if( nRet==2 && xDocSh.Is() )
+ if( nRet==2 && xDocSh.is() )
xDocSh->DoClose();
}
}
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 00c0dc9c0ca6..a587bc08a5b3 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -713,7 +713,7 @@ SwXAutoTextEntry::~SwXAutoTextEntry()
void SwXAutoTextEntry::implFlushDocument( bool _bCloseDoc )
{
- if ( xDocSh.Is() )
+ if ( xDocSh.is() )
{
if ( xDocSh->GetDoc()->getIDocumentState().IsModified () )
xDocSh->Save();
@@ -724,7 +724,7 @@ void SwXAutoTextEntry::implFlushDocument( bool _bCloseDoc )
EndListening( *xDocSh );
xDocSh->DoClose();
- xDocSh.Clear();
+ xDocSh.clear();
}
}
}
@@ -740,7 +740,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint )
implFlushDocument();
mxBodyText.clear();
EndListening( *xDocSh );
- xDocSh.Clear();
+ xDocSh.clear();
}
}
else
@@ -752,7 +752,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint )
// stop listening at the docu
EndListening( *xDocSh );
// and release our reference
- xDocSh.Clear();
+ xDocSh.clear();
}
}
}
@@ -763,7 +763,7 @@ void SwXAutoTextEntry::GetBodyText ()
SolarMutexGuard aGuard;
xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, false );
- OSL_ENSURE( xDocSh.Is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" );
+ OSL_ENSURE( xDocSh.is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" );
// start listening at the document
StartListening( *xDocSh );