summaryrefslogtreecommitdiff
path: root/basctl
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 /basctl
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 'basctl')
-rw-r--r--basctl/source/basicide/baside2.cxx34
-rw-r--r--basctl/source/basicide/baside2b.cxx12
-rw-r--r--basctl/source/basicide/macrodlg.cxx2
3 files changed, 24 insertions, 24 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index aa6b7b080527..7a5b1a5a0829 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -200,7 +200,7 @@ SbModuleRef const & ModulWindow::XModule()
// for m_xModule it may not yet be available, here we keep trying to access
// the module until such time as it exists
- if ( !m_xModule.Is() )
+ if ( !m_xModule.is() )
{
BasicManager* pBasMgr = GetDocument().getBasicManager();
if ( pBasMgr )
@@ -258,7 +258,7 @@ void ModulWindow::Resize()
void ModulWindow::CheckCompileBasic()
{
- if ( XModule().Is() )
+ if ( XModule().is() )
{
// never compile while running!
bool const bRunning = StarBASIC::IsRunning();
@@ -311,14 +311,14 @@ void ModulWindow::BasicExecute()
CheckCompileBasic();
- if ( XModule().Is() && m_xModule->IsCompiled() && !m_aStatus.bError )
+ if ( XModule().is() && m_xModule->IsCompiled() && !m_aStatus.bError )
{
if ( GetBreakPoints().size() )
m_aStatus.nBasicFlags = m_aStatus.nBasicFlags | BasicDebugFlags::Break;
if ( !m_aStatus.bIsRunning )
{
- DBG_ASSERT( m_xModule.Is(), "Kein Modul!" );
+ DBG_ASSERT( m_xModule.is(), "Kein Modul!" );
AddStatus( BASWIN_RUNNINGBASIC );
sal_uInt16 nStart, nEnd;
TextSelection aSel = GetEditView()->GetSelection();
@@ -364,7 +364,7 @@ void ModulWindow::CompileBasic()
{
CheckCompileBasic();
- XModule().Is() && m_xModule->IsCompiled();
+ XModule().is() && m_xModule->IsCompiled();
}
void ModulWindow::BasicRun()
@@ -488,9 +488,9 @@ void ModulWindow::ImportDialog()
void ModulWindow::ToggleBreakPoint( sal_uLong nLine )
{
- DBG_ASSERT( XModule().Is(), "Kein Modul!" );
+ DBG_ASSERT( XModule().is(), "Kein Modul!" );
- if ( XModule().Is() )
+ if ( XModule().is() )
{
CheckCompileBasic();
if ( m_aStatus.bError )
@@ -525,9 +525,9 @@ void ModulWindow::ToggleBreakPoint( sal_uLong nLine )
void ModulWindow::UpdateBreakPoint( const BreakPoint& rBrk )
{
- DBG_ASSERT( XModule().Is(), "Kein Modul!" );
+ DBG_ASSERT( XModule().is(), "Kein Modul!" );
- if ( XModule().Is() )
+ if ( XModule().is() )
{
CheckCompileBasic();
@@ -696,9 +696,9 @@ void ModulWindow::BasicAddWatch()
void ModulWindow::EditMacro( const OUString& rMacroName )
{
- DBG_ASSERT( XModule().Is(), "Kein Modul!" );
+ DBG_ASSERT( XModule().is(), "Kein Modul!" );
- if ( XModule().Is() )
+ if ( XModule().is() )
{
CheckCompileBasic();
@@ -757,11 +757,11 @@ bool ModulWindow::AllowUndo()
void ModulWindow::UpdateData()
{
- DBG_ASSERT( XModule().Is(), "Kein Modul!" );
+ DBG_ASSERT( XModule().is(), "Kein Modul!" );
// UpdateData is called when the source has changed from outside
// => interrupts undesired!
- if ( XModule().Is() )
+ if ( XModule().is() )
{
SetModule( m_xModule->GetSource32() );
@@ -1155,7 +1155,7 @@ bool ModulWindow::IsModified()
OUString ModulWindow::GetSbModuleName()
{
OUString aModuleName;
- if ( XModule().Is() )
+ if ( XModule().is() )
aModuleName = m_xModule->GetName();
return aModuleName;
}
@@ -1268,7 +1268,7 @@ SearchOptionFlags ModulWindow::GetSearchOptions()
void ModulWindow::BasicStarted()
{
- if ( XModule().Is() )
+ if ( XModule().is() )
{
m_aStatus.bIsRunning = true;
BreakPointList& rList = GetBreakPoints();
@@ -1299,7 +1299,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor()
LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
OUString aModName( GetName() );
OUString aLibSubName;
- if( m_xBasic.Is() && aDocument.isInVBAMode() && XModule().Is() )
+ if( m_xBasic.is() && aDocument.isInVBAMode() && XModule().is() )
{
switch( m_xModule->GetModuleType() )
{
@@ -1395,7 +1395,7 @@ void ModulWindow::UpdateModule ()
OUString const aModule = getTextEngineText(*GetEditEngine());
// update module in basic
- assert(m_xModule.Is());
+ assert(m_xModule.is());
// update module in module window
SetModule(aModule);
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 72d656feec2b..d2d96b8f184a 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1701,7 +1701,7 @@ WatchItem* WatchItem::GetRootItem()
WatchItem* pItem = mpArrayParentItem;
while( pItem )
{
- if( pItem->mpArray.Is() )
+ if( pItem->mpArray.is() )
break;
pItem = pItem->mpArrayParentItem;
}
@@ -2261,7 +2261,7 @@ bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
if (IsSbxVariable(pSbx) || bArrayElement)
{
// Accept no objects and only end nodes of arrays for editing
- if( !pItem->mpObject.Is() && ( !pItem->mpArray.Is() || pItem->nDimLevel == pItem->nDimCount ) )
+ if( !pItem->mpObject.is() && ( !pItem->mpArray.is() || pItem->nDimLevel == pItem->nDimCount ) )
{
aEditingRes = SvHeaderTabListBox::GetEntryText( pEntry, ITEM_ID_VALUE-1 );
aEditingRes = comphelper::string::strip(aEditingRes, ' ');
@@ -2483,7 +2483,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
{
if (SbxObject* pObj = dynamic_cast<SbxObject*>(pVar->GetObject()))
{
- if ( pItem->mpObject.Is() && !pItem->maMemberList.empty() )
+ if ( pItem->mpObject.is() && !pItem->maMemberList.empty() )
{
bool bObjChanged = false; // Check if member list has changed
SbxArray* pProps = pObj->GetProperties();
@@ -2511,7 +2511,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
else
{
aWatchStr = "Null";
- if( pItem->mpObject.Is() )
+ if( pItem->mpObject.is() )
{
bCollapse = true;
pItem->clearWatchItem();
@@ -2522,7 +2522,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
}
else
{
- if( pItem->mpObject.Is() )
+ if( pItem->mpObject.is() )
{
bCollapse = true;
pItem->clearWatchItem();
@@ -2564,7 +2564,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
}
else if( bBasicStopped )
{
- if( pItem->mpObject.Is() || pItem->mpArray.Is() )
+ if( pItem->mpObject.is() || pItem->mpArray.is() )
{
implCollapseModifiedObjectEntry( pEntry, this );
pItem->mpObject = nullptr;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 2f417b10e4fb..ff3e49c9a31e 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -845,7 +845,7 @@ OUString MacroChooser::GetInfo( SbxVariable* pVar )
{
OUString aComment;
SbxInfoRef xInfo = pVar->GetInfo();
- if ( xInfo.Is() )
+ if ( xInfo.is() )
aComment = xInfo->GetComment();
return aComment;
}