summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
Diffstat (limited to 'basic')
-rw-r--r--basic/qa/cppunit/basic_coverage.cxx2
-rw-r--r--basic/qa/cppunit/basictest.cxx2
-rw-r--r--basic/qa/cppunit/test_vba.cxx4
-rw-r--r--basic/source/basmgr/basmgr.cxx34
-rw-r--r--basic/source/classes/eventatt.cxx8
-rw-r--r--basic/source/classes/image.cxx8
-rw-r--r--basic/source/classes/sb.cxx12
-rw-r--r--basic/source/classes/sbunoobj.cxx20
-rw-r--r--basic/source/classes/sbxmod.cxx24
-rw-r--r--basic/source/runtime/methods.cxx2
-rw-r--r--basic/source/runtime/methods1.cxx2
-rw-r--r--basic/source/runtime/runtime.cxx66
-rw-r--r--basic/source/sbx/sbxarray.cxx22
-rw-r--r--basic/source/sbx/sbxexec.cxx34
-rw-r--r--basic/source/sbx/sbxobj.cxx2
-rw-r--r--basic/source/sbx/sbxvar.cxx16
16 files changed, 129 insertions, 129 deletions
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx
index 17612c4f749c..1f336b482819 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -77,7 +77,7 @@ void Coverage::run_test(const OUString& sFileURL)
if( !testMacro.HasError() )
{
SbxVariableRef pResult = testMacro.Run();
- if( pResult.Is() && pResult->GetInteger() == 1 )
+ if( pResult.is() && pResult->GetInteger() == 1 )
{
bResult = true;
}
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index 2c4e86f0ea17..ebd97d8c7ef4 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -78,7 +78,7 @@ SbxVariableRef MacroSnippet::Run( const css::uno::Sequence< css::uno::Any >& rAr
SbxVariableRef pReturn = nullptr;
if ( !Compile() )
return pReturn;
- SbMethod* pMeth = mpMod.Is() ? static_cast<SbMethod*>(mpMod->Find( "doUnitTest", SbxClassType::Method )) : nullptr;
+ SbMethod* pMeth = mpMod.is() ? static_cast<SbMethod*>(mpMod->Find( "doUnitTest", SbxClassType::Method )) : nullptr;
if ( pMeth )
{
if ( rArgs.getLength() )
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 91b26d8f6eb7..a0f3f3208cd1 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -74,7 +74,7 @@ void VBATest::testMiscVBAFunctions()
MacroSnippet myMacro;
myMacro.LoadSourceFromFile( sMacroURL );
SbxVariableRef pReturn = myMacro.Run();
- if ( pReturn.Is() )
+ if ( pReturn.is() )
{
fprintf(stderr, "macro result for %s\n", macroSource[ i ] );
fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -152,7 +152,7 @@ void VBATest::testMiscOLEStuff()
MacroSnippet myMacro;
myMacro.LoadSourceFromFile( sMacroURL );
SbxVariableRef pReturn = myMacro.Run( aArgs );
- if ( pReturn.Is() )
+ if ( pReturn.is() )
{
fprintf(stderr, "macro result for %s\n", macroSource[ i ] );
fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 56cf96adebb6..de6381071a73 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -667,7 +667,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase
OUString aStorName( rStorage.GetName() );
// #i13114 removed, DBG_ASSERT( aStorName.Len(), "No Storage Name!" );
- if ( !xManagerStream.Is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) )
+ if ( !xManagerStream.is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) )
{
ImpMgrNotLoaded( aStorName );
return;
@@ -749,7 +749,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase
xManagerStream->Seek( nEndPos );
xManagerStream->SetBufferSize( 0 );
- xManagerStream.Clear();
+ xManagerStream.clear();
}
void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
@@ -759,7 +759,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
OUString aStorName( rStorage.GetName() );
DBG_ASSERT( aStorName.getLength(), "No Storage Name!" );
- if ( !xManagerStream.Is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) )
+ if ( !xManagerStream.is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) )
{
ImpMgrNotLoaded( aStorName );
return;
@@ -783,7 +783,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator
OUString aLibs = xManagerStream->ReadUniOrByteString(xManagerStream->GetStreamCharSet());
xManagerStream->SetBufferSize( 0 );
- xManagerStream.Clear(); // Close stream
+ xManagerStream.clear(); // Close stream
if ( !aLibs.isEmpty() )
{
@@ -818,7 +818,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
xStorageRef = new SotStorage( false, aLibRelStorage.
GetMainURL( INetURLObject::DecodeMechanism::NONE ), eStorageReadMode );
}
- if ( xStorageRef.Is() )
+ if ( xStorageRef.is() )
{
AddLib( *xStorageRef, aLibName, false );
}
@@ -899,13 +899,13 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
}
}
- if ( !xStorage.Is() )
+ if ( !xStorage.is() )
{
xStorage = new SotStorage( false, aStorageName, eStorageReadMode );
}
tools::SvRef<SotStorage> xBasicStorage = xStorage->OpenSotStorage( szBasicStorage, eStorageReadMode, false );
- if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
+ if ( !xBasicStorage.is() || xBasicStorage->GetError() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, xStorage->GetName(), ERRCODE_BUTTON_OK );
aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE));
@@ -914,7 +914,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
{
// In the Basic-Storage every lib is in a Stream...
tools::SvRef<SotStorageStream> xBasicStream = xBasicStorage->OpenSotStream( pLibInfo->GetLibName(), eStreamReadMode );
- if ( !xBasicStream.Is() || xBasicStream->GetError() )
+ if ( !xBasicStream.is() || xBasicStream->GetError() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD , pLibInfo->GetLibName(), ERRCODE_BUTTON_OK );
aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTREAM));
@@ -924,7 +924,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
bool bLoaded = false;
if ( xBasicStream->Seek( STREAM_SEEK_TO_END ) != 0 )
{
- if ( !pLibInfo->GetLib().Is() )
+ if ( !pLibInfo->GetLib().is() )
{
pLibInfo->SetLib( new StarBASIC( GetStdLib(), mbDocMgr ) );
}
@@ -992,12 +992,12 @@ bool BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con
bool bProtected = ImplEncryptStream( rStrm );
SbxBaseRef xNew = SbxBase::Load( rStrm );
bool bLoaded = false;
- if( xNew.Is() )
+ if( xNew.is() )
{
if( auto pNew = dynamic_cast<StarBASIC*>( xNew.get() ) )
{
// Use the Parent of the old BASICs
- if( rOldBasic.Is() )
+ if( rOldBasic.is() )
{
pNew->SetParent( rOldBasic->GetParent() );
if( pNew->GetParent() )
@@ -1152,12 +1152,12 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
SAL_WARN("basic", "BasicManager::RemoveLib: Caught exception: " << e.Message);
}
- if (xStorage.Is() && xStorage->IsStorage(szBasicStorage))
+ if (xStorage.is() && xStorage->IsStorage(szBasicStorage))
{
tools::SvRef<SotStorage> xBasicStorage = xStorage->OpenSotStorage
( szBasicStorage, StreamMode::STD_READWRITE, false );
- if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
+ if ( !xBasicStorage.is() || xBasicStorage->GetError() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, OUString(), ERRCODE_BUTTON_OK );
aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE));
@@ -1173,7 +1173,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
xBasicStorage->FillInfoList( &aInfoList );
if ( aInfoList.empty() )
{
- xBasicStorage.Clear();
+ xBasicStorage.clear();
xStorage->Remove( szBasicStorage );
xStorage->Commit();
// If no further Streams or SubStorages available,
@@ -1183,7 +1183,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
if ( aInfoList.empty() )
{
//OUString aName_( xStorage->GetName() );
- xStorage.Clear();
+ xStorage.clear();
//*** TODO: Replace if still necessary
//SfxContentHelper::Kill( aName );
//*** TODO-End
@@ -1192,7 +1192,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
}
}
}
- if ((*itLibInfo)->GetLib().Is())
+ if ((*itLibInfo)->GetLib().is())
{
GetStdLib()->Remove( (*itLibInfo)->GetLib().get() );
}
@@ -1390,7 +1390,7 @@ bool BasicManager::IsBasicModified() const
{
for (auto const& rpLib : mpImpl->aLibs)
{
- if (rpLib->GetLib().Is() && rpLib->GetLib()->IsModified())
+ if (rpLib->GetLib().is() && rpLib->GetLib()->IsModified())
{
return true;
}
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index e900fa9bf527..49a0163d26bf 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -247,7 +247,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
}
SbxVariable* pMethVar = nullptr;
// Be still tolerant and make default search if no search basic exists
- if( bSearchLib && xLibSearchBasic.Is() )
+ if( bSearchLib && xLibSearchBasic.is() )
{
sal_Int16 nCount = xLibSearchBasic->GetObjects()->Count();
for( sal_Int16 nObj = -1; nObj < nCount ; nObj++ )
@@ -279,7 +279,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
}
// Default: Be tolerant and search everywhere
- if( (!pMethVar || nullptr == dynamic_cast<const SbMethod*>( pMethVar)) && maBasicRef.Is() )
+ if( (!pMethVar || nullptr == dynamic_cast<const SbMethod*>( pMethVar)) && maBasicRef.is() )
{
pMethVar = maBasicRef->FindQualified( aMacro, SbxClassType::DontCare );
}
@@ -305,7 +305,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
// Call method
SbxVariableRef xValue = pRet ? new SbxVariable : nullptr;
- if( xArray.Is() )
+ if( xArray.is() )
{
pMeth->SetParameters( xArray.get() );
}
@@ -427,7 +427,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
// Get dialog
SbxBaseRef pObj = rPar.Get( 1 )->GetObject();
- if( !(pObj.Is() && nullptr != dynamic_cast<const SbUnoObject*>( pObj.get() )) )
+ if( !(pObj.is() && nullptr != dynamic_cast<const SbUnoObject*>( pObj.get() )) )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 7c079a8b531c..9e9e4c6d6602 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -462,7 +462,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
SbiCloseRecord( r, nPos );
}
// User defined types
- if ( rTypes.Is() )
+ if ( rTypes.is() )
{
sal_uInt16 nTypes = rTypes->Count();
if (nTypes > 0 )
@@ -620,7 +620,7 @@ void SbiImage::AddCode( char* p, sal_uInt32 s )
// Add user type
void SbiImage::AddType(SbxObject* pObject)
{
- if( !rTypes.Is() )
+ if( !rTypes.is() )
{
rTypes = new SbxArray;
}
@@ -630,7 +630,7 @@ void SbiImage::AddType(SbxObject* pObject)
void SbiImage::AddEnum(SbxObject* pObject) // Register enum type
{
- if( !rEnums.Is() )
+ if( !rEnums.is() )
{
rEnums = new SbxArray;
}
@@ -674,7 +674,7 @@ OUString SbiImage::GetString( short nId ) const
const SbxObject* SbiImage::FindType (const OUString& aTypeName) const
{
- return rTypes.Is() ? static_cast<SbxObject*>(rTypes->Find(aTypeName,SbxClassType::Object)) : nullptr;
+ return rTypes.is() ? static_cast<SbxObject*>(rTypes->Find(aTypeName,SbxClassType::Object)) : nullptr;
}
sal_uInt16 SbiImage::CalcLegacyOffset( sal_Int32 nOffset )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 168842bc74db..fa5019e05e0a 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -114,7 +114,7 @@ DocBasicItem::~DocBasicItem()
try
{
stopListening();
- mxClassModules.Clear(); // release with SolarMutex locked
+ mxClassModules.clear(); // release with SolarMutex locked
}
catch (...)
{
@@ -232,7 +232,7 @@ StarBASIC* lclGetDocBasicForModule( SbModule* pModule )
SbxObject* StarBASIC::getVBAGlobals( )
{
- if ( !pVBAGlobals.Is() )
+ if ( !pVBAGlobals.is() )
{
Any aThisDoc;
if ( GetUNOConstant("ThisComponent", aThisDoc) )
@@ -996,7 +996,7 @@ StarBASIC::~StarBASIC()
}
// #100326 Set Parent NULL in registered listeners
- if( xUnoListeners.Is() )
+ if( xUnoListeners.is() )
{
sal_uInt16 uCount = xUnoListeners->Count();
for( sal_uInt16 i = 0 ; i < uCount ; i++ )
@@ -1809,7 +1809,7 @@ void StarBASIC::SetGlobalBreakHdl( const Link<StarBASIC*,BasicDebugFlags>& rLink
SbxArrayRef const & StarBASIC::getUnoListeners()
{
- if( !xUnoListeners.Is() )
+ if( !xUnoListeners.is() )
{
xUnoListeners = new SbxArray();
}
@@ -2036,7 +2036,7 @@ void BasicCollection::Initialize()
p->SetFlag( SbxFlagBits::DontStore );
p = Make( pRemoveStr, SbxClassType::Method, SbxEMPTY );
p->SetFlag( SbxFlagBits::DontStore );
- if ( !xAddInfo.Is() )
+ if ( !xAddInfo.is() )
{
xAddInfo = new SbxInfo;
xAddInfo->AddParam( "Item", SbxVARIANT );
@@ -2044,7 +2044,7 @@ void BasicCollection::Initialize()
xAddInfo->AddParam( "Before", SbxVARIANT, SbxFlagBits::Read | SbxFlagBits::Optional );
xAddInfo->AddParam( "After", SbxVARIANT, SbxFlagBits::Read | SbxFlagBits::Optional );
}
- if ( !xItemInfo.Is() )
+ if ( !xItemInfo.is() )
{
xItemInfo = new SbxInfo;
xItemInfo->AddParam( "Index", SbxVARIANT, SbxFlagBits::Read | SbxFlagBits::Optional);
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index dd3ea516a0f8..028bc74c75ea 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -860,7 +860,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal )
if( eBaseType == SbxOBJECT )
{
SbxBaseRef xObj = pVal->GetObject();
- if( !xObj.Is() )
+ if( !xObj.is() )
{
aRetType = cppu::UnoType<XInterface>::get();
return aRetType;
@@ -983,7 +983,7 @@ Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType
if( eBaseType == SbxOBJECT )
{
SbxBaseRef xObj = pVar->GetObject();
- if( xObj.Is() )
+ if( xObj.is() )
{
if( auto obj = dynamic_cast<SbUnoAnyObject*>( xObj.get() ) )
return obj->getValue();
@@ -2522,7 +2522,7 @@ SbUnoMethod::~SbUnoMethod()
SbxInfo* SbUnoMethod::GetInfo()
{
- if( !pInfo.Is() && m_xUnoMethod.is() )
+ if( !pInfo.is() && m_xUnoMethod.is() )
{
SbiInstance* pInst = GetSbData()->pInst;
if( pInst && pInst->IsCompatibility() )
@@ -2931,7 +2931,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
// try to create Struct with the same name
SbUnoObjectRef xUnoObj = Impl_CreateUnoStruct( aClassName );
- if( !xUnoObj.Is() )
+ if( !xUnoObj.is() )
{
return;
}
@@ -3843,7 +3843,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
{
SolarMutexGuard guard;
- if( xSbxObj.Is() )
+ if( xSbxObj.is() )
{
OUString aMethodName = aPrefixName;
aMethodName = aMethodName + Event.MethodName;
@@ -3908,7 +3908,7 @@ void BasicAllListener_Impl ::disposing(const EventObject& )
{
SolarMutexGuard guard;
- xSbxObj.Clear();
+ xSbxObj.clear();
}
@@ -4255,7 +4255,7 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject
, m_xScopeObj( xScopeObj )
, m_aListeners( m_aMutex )
{
- m_bProxyIsClassModuleObject = xScopeObj.Is() && nullptr != dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() );
+ m_bProxyIsClassModuleObject = xScopeObj.is() && nullptr != dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() );
}
Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection()
@@ -4347,7 +4347,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
Any aRet;
SbxObjectRef xScopeObj = m_xScopeObj;
- if( !xScopeObj.Is() )
+ if( !xScopeObj.is() )
{
return aRet;
}
@@ -4393,7 +4393,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
// Call method
SbxVariableRef xValue = new SbxVariable;
- if( xArray.Is() )
+ if( xArray.is() )
pMeth->SetParameters( xArray.get() );
pMeth->Call( xValue.get() );
aRet = sbxToUnoValue( xValue.get() );
@@ -4638,7 +4638,7 @@ bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal )
if( pUnoObj->isNativeCOMObject() )
{
SbxVariableRef pMeth = pObj->Find( "toString", SbxClassType::Method );
- if ( pMeth.Is() )
+ if ( pMeth.is() )
{
SbxValues aRes;
pMeth->Get( aRes );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index dce7d98cdded..f964ef2dd32d 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -207,7 +207,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >&
if ( m_xAggInv.is() && m_xAggInv->hasMethod( aFunctionName ) )
return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam );
SbMethodRef pMethod = getMethod( aFunctionName );
- if ( !pMethod.Is() )
+ if ( !pMethod.is() )
throw RuntimeException();
// check number of parameters
sal_Int32 nParamsCount = aParams.getLength();
@@ -246,7 +246,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >&
xSbxVar->SetFlag( SbxFlagBits::Fixed );
}
}
- if ( xSbxParams.Is() )
+ if ( xSbxParams.is() )
pMethod->SetParameters( xSbxParams.get() );
// call method
@@ -255,7 +255,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >&
pMethod->Call( xReturn.get() );
Any aReturn;
// get output parameters
- if ( xSbxParams.Is() )
+ if ( xSbxParams.is() )
{
SbxInfo* pInfo_ = pMethod->GetInfo();
if ( pInfo_ )
@@ -302,7 +302,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue )
return m_xAggInv->setValue( aPropertyName, aValue );
SbPropertyRef pProperty = getProperty( aPropertyName );
- if ( !pProperty.Is() )
+ if ( !pProperty.is() )
throw UnknownPropertyException();
unoToSbxValue( pProperty.get(), aValue );
}
@@ -314,7 +314,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName )
return m_xAggInv->getValue( aPropertyName );
SbPropertyRef pProperty = getProperty( aPropertyName );
- if ( !pProperty.Is() )
+ if ( !pProperty.is() )
throw UnknownPropertyException();
SbxVariable* pProp = pProperty.get();
@@ -330,7 +330,7 @@ DocObjectWrapper::hasMethod( const OUString& aName )
{
if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) )
return true;
- return getMethod( aName ).Is();
+ return getMethod( aName ).is();
}
sal_Bool SAL_CALL
@@ -339,7 +339,7 @@ DocObjectWrapper::hasProperty( const OUString& aName )
bool bRes = false;
if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) )
bRes = true;
- else bRes = getProperty( aName ).Is();
+ else bRes = getProperty( aName ).is();
return bRes;
}
@@ -668,7 +668,7 @@ SbxVariable* SbModule::Find( const OUString& rName, SbxClassType t )
// Put enum types as objects into module,
// allows MyEnum.First notation
SbxArrayRef xArray = pImage->GetEnums();
- if( xArray.Is() )
+ if( xArray.is() )
{
SbxVariable* pEnumVar = xArray->Find( rName, SbxClassType::DontCare );
SbxObject* pEnumObject = dynamic_cast<SbxObject*>( pEnumVar );
@@ -1286,7 +1286,7 @@ void SbModule::RemoveVars()
// SbUserform because it could trigger say an initialise event
// which would cause basic to be re-run in the middle of the init ( and remember RemoveVars is called from compile and we don't want code to run as part of the compile )
SbxVariableRef p = SbModule::Find( rModuleVariableName, SbxClassType::Property );
- if( p.Is() )
+ if( p.is() )
Remove( p.get() );
}
}
@@ -2122,7 +2122,7 @@ void SbMethod::Broadcast( SfxHintId nHintId )
pCst = nullptr;
SbMethod* pThisCopy = new SbMethod( *this );
SbMethodRef xHolder = pThisCopy;
- if( mpPar.Is() )
+ if( mpPar.is() )
{
// Enregister this as element 0, but don't reset the parent!
if( GetType() != SbxVOID ) {
@@ -2563,7 +2563,7 @@ void SbUserFormModule::Load()
{
SAL_INFO("basic", "** load() ");
// forces a load
- if ( !pDocObject.Is() )
+ if ( !pDocObject.is() )
InitObject();
}
@@ -2689,7 +2689,7 @@ void SbUserFormModule::InitObject()
SbxVariable*
SbUserFormModule::Find( const OUString& rName, SbxClassType t )
{
- if ( !pDocObject.Is() && !GetSbData()->bRunInit && GetSbData()->pInst )
+ if ( !pDocObject.is() && !GetSbData()->bRunInit && GetSbData()->pInst )
InitObject();
return SbObjModule::Find( rName, t );
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ac4351cf62cd..1a4c12b4f1bb 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -185,7 +185,7 @@ RTLFUNC(CreateObject)
OUString aClass( rPar.Get( 1 )->GetOUString() );
SbxObjectRef p = SbxBase::CreateObject( aClass );
- if( !p.Is() )
+ if( !p.is() )
StarBASIC::Error( ERRCODE_BASIC_CANNOT_LOAD );
else
{
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index bad68c593f84..eee8de4a90aa 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -214,7 +214,7 @@ RTLFUNC(CallByName)
// Call method
SbxVariableRef refVar = rPar.Get(0);
- if( xArray.Is() )
+ if( xArray.is() )
pMeth->SetParameters( xArray.get() );
pMeth->Call( refVar.get() );
pMeth->SetParameters( nullptr );
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 139d154828f4..2f9284ef8254 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1069,7 +1069,7 @@ void SbiRuntime::PushArgv()
{
pArgvStk.emplace_back(refArgv, nArgc);
nArgc = 1;
- refArgv.Clear();
+ refArgv.clear();
}
void SbiRuntime::PopArgv()
@@ -1116,7 +1116,7 @@ void SbiRuntime::PushForEach()
pForStk = p;
SbxVariableRef xObjVar = PopVar();
- SbxBase* pObj = xObjVar.Is() ? xObjVar->GetObject() : nullptr;
+ SbxBase* pObj = xObjVar.is() ? xObjVar->GetObject() : nullptr;
if( pObj == nullptr )
{
Error( ERRCODE_BASIC_NO_OBJECT );
@@ -1221,7 +1221,7 @@ SbiForStack* SbiRuntime::FindForStackItemForCollection( class BasicCollection* p
{
for (SbiForStack *p = pForStk; p; p = p->pNext)
{
- SbxVariable* pVar = p->refEnd.Is() ? p->refEnd.get() : nullptr;
+ SbxVariable* pVar = p->refEnd.is() ? p->refEnd.get() : nullptr;
if( p->eForType == ForType::EachCollection
&& pVar != nullptr
&& dynamic_cast<BasicCollection*>( pVar) == pCollection )
@@ -1591,7 +1591,7 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef& refVal, SbxVariableRe
return false;
SbxObjectRef xValObj = static_cast<SbxObject*>(refVal->GetObject());
- if( !xValObj.Is() || nullptr != dynamic_cast<const SbUnoAnyObject*>( xValObj.get() ) )
+ if( !xValObj.is() || nullptr != dynamic_cast<const SbUnoAnyObject*>( xValObj.get() ) )
return false;
SbUnoObject* pUnoVal = dynamic_cast<SbUnoObject*>( xValObj.get() );
@@ -1779,7 +1779,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
{
SbxVariableRef refObjVal = dynamic_cast<SbxObject*>( pObjVarObj );
- if( refObjVal.Is() )
+ if( refObjVal.is() )
{
refVal = refObjVal;
}
@@ -1793,7 +1793,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
// #52896 refVal can be invalid here, if uno-sequences - or more
// general arrays - are assigned to variables that are declared
// as an object!
- if( !refVal.Is() )
+ if( !refVal.is() )
{
Error( ERRCODE_BASIC_INVALID_USAGE_OBJECT );
}
@@ -1907,7 +1907,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
SbxBase* pValObjBase = refVal->GetObject();
if( pValObjBase == nullptr )
{
- if( xPrevVarObj.Is() )
+ if( xPrevVarObj.is() )
{
// Object is overwritten with NULL, instantiate init object
DimAsNewRecoverHash &rDimAsNewRecoverHash = GaDimAsNewRecoverHash::get();
@@ -1935,7 +1935,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
else
{
// Does old value exist?
- bool bFirstInit = !xPrevVarObj.Is();
+ bool bFirstInit = !xPrevVarObj.is();
if( bFirstInit )
{
// Store information to instantiate object later
@@ -2087,9 +2087,9 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
// If refDim then this DIM statement is terminating a ReDIM and
// previous StepERASE_CLEAR for an array, the following actions have
// been delayed from ( StepERASE_CLEAR ) 'till here
- if ( refRedim.Is() )
+ if ( refRedim.is() )
{
- if ( !refRedimpArray.Is() ) // only erase the array not ReDim Preserve
+ if ( !refRedimpArray.is() ) // only erase the array not ReDim Preserve
{
lcl_eraseImpl( refVar, bVBAEnabled );
}
@@ -2189,7 +2189,7 @@ void SbiRuntime::StepREDIMP()
DimImpl( refVar );
// Now check, if we can copy from the old array
- if( refRedimpArray.Is() )
+ if( refRedimpArray.is() )
{
SbxBase* pElemObj = refVar->GetObject();
SbxDimArray* pNewArray = dynamic_cast<SbxDimArray*>( pElemObj );
@@ -2341,7 +2341,7 @@ void SbiRuntime::StepERASE_CLEAR()
void SbiRuntime::StepARRAYACCESS()
{
- if( !refArgv.Is() )
+ if( !refArgv.is() )
{
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
}
@@ -2378,7 +2378,7 @@ void SbiRuntime::StepARGC()
void SbiRuntime::StepARGV()
{
- if( !refArgv.Is() )
+ if( !refArgv.is() )
{
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
}
@@ -2561,7 +2561,7 @@ void SbiRuntime::StepNEXT()
void SbiRuntime::StepCASE()
{
- if( !refCaseStk.Is() )
+ if( !refCaseStk.is() )
{
refCaseStk = new SbxArray;
}
@@ -2573,7 +2573,7 @@ void SbiRuntime::StepCASE()
void SbiRuntime::StepENDCASE()
{
- if( !refCaseStk.Is() || !refCaseStk->Count() )
+ if( !refCaseStk.is() || !refCaseStk->Count() )
{
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
}
@@ -2790,7 +2790,7 @@ void SbiRuntime::StepLOADI( sal_uInt32 nOp1 )
void SbiRuntime::StepARGN( sal_uInt32 nOp1 )
{
- if( !refArgv.Is() )
+ if( !refArgv.is() )
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
else
{
@@ -2817,7 +2817,7 @@ void SbiRuntime::StepARGN( sal_uInt32 nOp1 )
void SbiRuntime::StepARGTYP( sal_uInt32 nOp1 )
{
- if( !refArgv.Is() )
+ if( !refArgv.is() )
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
else
{
@@ -3061,7 +3061,7 @@ void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
void SbiRuntime::StepCASETO( sal_uInt32 nOp1 )
{
- if( !refCaseStk.Is() || !refCaseStk->Count() )
+ if( !refCaseStk.is() || !refCaseStk->Count() )
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
else
{
@@ -3452,7 +3452,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt
if( bFatalError )
{
// #39108 use dummy variable instead of fatal error
- if( !xDummyVar.Is() )
+ if( !xDummyVar.is() )
{
xDummyVar = new SbxVariable( SbxVARIANT );
}
@@ -3555,7 +3555,7 @@ SbxBase* SbiRuntime::FindElementExtern( const OUString& rName )
{
return nullptr;
}
- if( refLocals.Is() )
+ if( refLocals.is() )
{
pElem = refLocals->Find( rName, SbxClassType::DontCare );
}
@@ -3570,7 +3570,7 @@ SbxBase* SbiRuntime::FindElementExtern( const OUString& rName )
if( !pElem && pMeth )
{
SbxInfo* pInfo = pMeth->GetInfo();
- if( pInfo && refParams.Is() )
+ if( pInfo && refParams.is() )
{
sal_uInt16 nParamCount = refParams->Count();
sal_uInt16 j = 1;
@@ -3612,7 +3612,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 )
{
if( nOp1 & 0x8000 )
{
- if( !refArgv.Is() )
+ if( !refArgv.is() )
{
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
}
@@ -3795,7 +3795,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
{
// is it an uno-object?
SbxBaseRef pObj = pElem->GetObject();
- if( pObj.Is() )
+ if( pObj.is() )
{
if (SbUnoObject* pUnoObj = dynamic_cast<SbUnoObject*>( pObj.get()))
{
@@ -3861,7 +3861,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
{
pDflt->Broadcast( SfxHintId::BasicDataWanted );
SbxBaseRef pDfltObj = pDflt->GetObject();
- if( pDfltObj.Is() )
+ if( pDfltObj.is() )
{
if (SbUnoObject* pSbObj = dynamic_cast<SbUnoObject*>(pDfltObj.get()))
{
@@ -3890,7 +3890,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
{
SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxClassType::Method );
SbxVariableRef refTemp = meth;
- if ( refTemp.Is() )
+ if ( refTemp.is() )
{
meth->SetParameters( pPar );
SbxVariable* pNew = new SbxMethod( *static_cast<SbxMethod*>(meth) );
@@ -3934,7 +3934,7 @@ void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
void SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2,
SbError nNotFound, bool bStatic )
{
- if( !refLocals.Is() )
+ if( !refLocals.is() )
{
refLocals = new SbxArray;
}
@@ -4085,7 +4085,7 @@ void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
void SbiRuntime::StepCASEIS( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- if( !refCaseStk.Is() || !refCaseStk->Count() )
+ if( !refCaseStk.is() || !refCaseStk->Count() )
{
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
}
@@ -4154,7 +4154,7 @@ void SbiRuntime::StepSTMNT( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
SbxVariable* p = refExprStk->Get( 0 );
if( p->GetRefCount() > 1 &&
- refLocals.Is() && refLocals->Find( p->GetName(), p->GetClass() ) )
+ refLocals.is() && refLocals->Find( p->GetName(), p->GetClass() ) )
{
sUnknownMethodName = p->GetName();
bFatalExpr = true;
@@ -4314,7 +4314,7 @@ void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
// fill the array with instances of the requested class
SbxBaseRef xObj = refVar->GetObject();
- if( !xObj.Is() )
+ if( !xObj.is() )
{
StarBASIC::Error( ERRCODE_BASIC_INVALID_OBJECT );
return;
@@ -4462,7 +4462,7 @@ void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt3
void SbiRuntime::StepLOCAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- if( !refLocals.Is() )
+ if( !refLocals.is() )
{
refLocals = new SbxArray;
}
@@ -4486,7 +4486,7 @@ void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedFo
bool bFlag = pMod->IsSet( SbxFlagBits::NoModify );
pMod->SetFlag( SbxFlagBits::NoModify );
SbxVariableRef p = pMod->Find( aName, SbxClassType::Property );
- if( p.Is() )
+ if( p.is() )
{
pMod->Remove (p.get());
}
@@ -4549,7 +4549,7 @@ void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
bool bFlag = pStorage->IsSet( SbxFlagBits::NoModify );
rBasic.SetFlag( SbxFlagBits::NoModify );
SbxVariableRef p = pStorage->Find( aName, SbxClassType::Property );
- if( p.Is() )
+ if( p.is() )
{
pStorage->Remove (p.get());
}
@@ -4558,7 +4558,7 @@ void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
pStorage->ResetFlag( SbxFlagBits::NoModify );
}
- if( p.Is() )
+ if( p.is() )
{
p->SetFlag( SbxFlagBits::DontStore );
// from 2.7.1996: HACK because of 'reference can't be saved'
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 8bf551adc4c1..5fc4775fd00a 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -61,7 +61,7 @@ SbxArray& SbxArray::operator=( const SbxArray& rArray )
for( const auto& rpSrcRef : rArray.mVarEntries )
{
SbxVariableRef pSrc_ = rpSrcRef.mpVar;
- if( !pSrc_.Is() )
+ if( !pSrc_.is() )
continue;
if( eType != SbxVARIANT )
@@ -150,7 +150,7 @@ SbxVariable* SbxArray::Get32( sal_uInt32 nIdx )
}
SbxVariableRef& rRef = GetRef32( nIdx );
- if ( !rRef.Is() )
+ if ( !rRef.is() )
rRef = new SbxVariable( eType );
return rRef.get();
@@ -165,7 +165,7 @@ SbxVariable* SbxArray::Get( sal_uInt16 nIdx )
}
SbxVariableRef& rRef = GetRef( nIdx );
- if ( !rRef.Is() )
+ if ( !rRef.is() )
rRef = new SbxVariable( eType );
return rRef.get();
@@ -311,7 +311,7 @@ void SbxArray::Merge( SbxArray* p )
for (auto& rEntry1: p->mVarEntries)
{
- if (!rEntry1.mpVar.Is())
+ if (!rEntry1.mpVar.is())
continue;
OUString aName = rEntry1.mpVar->GetName();
@@ -321,7 +321,7 @@ void SbxArray::Merge( SbxArray* p )
// Then overwrite!
for (auto& rEntry2: mVarEntries)
{
- if (!rEntry2.mpVar.Is())
+ if (!rEntry2.mpVar.is())
continue;
if (rEntry2.mpVar->GetHashCode() == nHash &&
@@ -329,12 +329,12 @@ void SbxArray::Merge( SbxArray* p )
{
// Take this element and clear the original.
rEntry2.mpVar = rEntry1.mpVar;
- rEntry1.mpVar.Clear();
+ rEntry1.mpVar.clear();
break;
}
}
- if (rEntry1.mpVar.Is())
+ if (rEntry1.mpVar.is())
{
// We don't have element with the same name. Add a new entry.
SbxVarEntry aNewEntry;
@@ -354,7 +354,7 @@ SbxVariable* SbxArray::FindUserData( sal_uInt32 nData )
SbxVariable* p = nullptr;
for (auto& rEntry : mVarEntries)
{
- if (!rEntry.mpVar.Is())
+ if (!rEntry.mpVar.is())
continue;
if (rEntry.mpVar->IsVisible() && rEntry.mpVar->GetUserData() == nData)
@@ -408,7 +408,7 @@ SbxVariable* SbxArray::Find( const OUString& rName, SbxClassType t )
sal_uInt16 nHash = SbxVariable::MakeHashCode( rName );
for (auto& rEntry : mVarEntries)
{
- if (!rEntry.mpVar.Is() || !rEntry.mpVar->IsVisible())
+ if (!rEntry.mpVar.is() || !rEntry.mpVar->IsVisible())
continue;
// The very secure search works as well, if there is no hashcode!
@@ -489,14 +489,14 @@ bool SbxArray::StoreData( SvStream& rStrm ) const
// Which elements are even defined?
for( auto& rEntry: mVarEntries )
{
- if (rEntry.mpVar.Is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore))
+ if (rEntry.mpVar.is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore))
nElem++;
}
rStrm.WriteUInt16( nElem );
for( size_t n = 0; n < mVarEntries.size(); n++ )
{
const SbxVarEntry& rEntry = mVarEntries[n];
- if (rEntry.mpVar.Is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore))
+ if (rEntry.mpVar.is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore))
{
rStrm.WriteUInt16( n );
if (!rEntry.mpVar->Store(rStrm))
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index 24afd3388d0b..1a671a654512 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -90,7 +90,7 @@ static SbxVariableRef QualifiedName
{
// Read in the element
refVar = Element( pObj, pGbl, &p, t );
- while( refVar.Is() && (*p == '.' || *p == '!') )
+ while( refVar.is() && (*p == '.' || *p == '!') )
{
// It follows still an objectelement. The current element
// had to be a SBX-Object or had to deliver such an object!
@@ -98,7 +98,7 @@ static SbxVariableRef QualifiedName
if( !pObj )
// Then it had to deliver an object
pObj = dynamic_cast<SbxObject*>( refVar->GetObject() );
- refVar.Clear();
+ refVar.clear();
if( !pObj )
break;
p++;
@@ -129,7 +129,7 @@ static SbxVariableRef Operand
sal_uInt16 nLen;
if( !refVar->Scan( OUString( p ), &nLen ) )
{
- refVar.Clear();
+ refVar.clear();
}
else
{
@@ -176,11 +176,11 @@ static SbxVariableRef MulDiv( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod
const sal_Unicode* p = *ppBuf;
SbxVariableRef refVar( Operand( pObj, pGbl, &p, false ) );
p = SkipWhitespace( p );
- while( refVar.Is() && ( *p == '*' || *p == '/' ) )
+ while( refVar.is() && ( *p == '*' || *p == '/' ) )
{
sal_Unicode cOp = *p++;
SbxVariableRef refVar2( Operand( pObj, pGbl, &p, false ) );
- if( refVar2.Is() )
+ if( refVar2.is() )
{
// temporary variable!
SbxVariable* pVar = refVar.get();
@@ -193,7 +193,7 @@ static SbxVariableRef MulDiv( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod
}
else
{
- refVar.Clear();
+ refVar.clear();
break;
}
}
@@ -206,11 +206,11 @@ static SbxVariableRef PlusMinus( SbxObject* pObj, SbxObject* pGbl, const sal_Uni
const sal_Unicode* p = *ppBuf;
SbxVariableRef refVar( MulDiv( pObj, pGbl, &p ) );
p = SkipWhitespace( p );
- while( refVar.Is() && ( *p == '+' || *p == '-' ) )
+ while( refVar.is() && ( *p == '+' || *p == '-' ) )
{
sal_Unicode cOp = *p++;
SbxVariableRef refVar2( MulDiv( pObj, pGbl, &p ) );
- if( refVar2.Is() )
+ if( refVar2.is() )
{
// temporaere Variable!
SbxVariable* pVar = refVar.get();
@@ -223,7 +223,7 @@ static SbxVariableRef PlusMinus( SbxObject* pObj, SbxObject* pGbl, const sal_Uni
}
else
{
- refVar.Clear();
+ refVar.clear();
break;
}
}
@@ -236,7 +236,7 @@ static SbxVariableRef Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod
const sal_Unicode* p = *ppBuf;
SbxVariableRef refVar( Operand( pObj, pGbl, &p, true ) );
p = SkipWhitespace( p );
- if( refVar.Is() )
+ if( refVar.is() )
{
if( *p == '=' )
{
@@ -244,13 +244,13 @@ static SbxVariableRef Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod
if( refVar->GetClass() != SbxClassType::Property )
{
SbxBase::SetError( ERRCODE_SBX_BAD_ACTION );
- refVar.Clear();
+ refVar.clear();
}
else
{
p++;
SbxVariableRef refVar2( PlusMinus( pObj, pGbl, &p ) );
- if( refVar2.Is() )
+ if( refVar2.is() )
{
SbxVariable* pVar = refVar.get();
SbxVariable* pVar2 = refVar2.get();
@@ -287,7 +287,7 @@ static SbxVariableRef Element
}
refVar = pObj->Find( aSym, t );
pObj->SetFlags( nOld );
- if( refVar.Is() )
+ if( refVar.is() )
{
refVar->SetParameters( nullptr );
// Follow still parameter?
@@ -303,10 +303,10 @@ static SbxVariableRef Element
while( *p && *p != ')' && *p != ']' )
{
SbxVariableRef refArg = PlusMinus( pGbl, pGbl, &p );
- if( !refArg.Is() )
+ if( !refArg.is() )
{
// Error during the parsing
- refVar.Clear(); break;
+ refVar.clear(); break;
}
else
{
@@ -321,7 +321,7 @@ static SbxVariableRef Element
}
if( *p == ')' )
p++;
- if( refVar.Is() )
+ if( refVar.is() )
refVar->SetParameters( refPar.get() );
}
}
@@ -350,7 +350,7 @@ SbxVariable* SbxObject::Execute( const OUString& rTxt )
SetError( ERRCODE_SBX_SYNTAX ); break;
}
pVar = Assign( this, this, &p );
- if( !pVar.Is() )
+ if( !pVar.is() )
{
break;
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index e33e6b390a50..69533d97ccf4 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -564,7 +564,7 @@ void SbxObject::Remove( SbxVariable* pVar )
static bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
{
SbxArrayRef p = static_cast<SbxArray*>( SbxBase::Load( rStrm ) );
- if( !p.Is() )
+ if( !p.is() )
{
return false;
}
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index cf56cd738f8e..097b04c0b1a6 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -185,7 +185,7 @@ void SbxVariable::Broadcast( SfxHintId nHintId )
pCst = nullptr;
SbxFlagBits nSaveFlags = GetFlags();
SetFlag( SbxFlagBits::ReadWrite );
- if( mpPar.Is() )
+ if( mpPar.is() )
{
// Register this as element 0, but don't change over the parent!
mpPar->GetRef( 0 ) = this;
@@ -199,10 +199,10 @@ void SbxVariable::Broadcast( SfxHintId nHintId )
SbxInfo* SbxVariable::GetInfo()
{
- if( !pInfo.Is() )
+ if( !pInfo.is() )
{
Broadcast( SfxHintId::BasicInfoWanted );
- if( pInfo.Is() )
+ if( pInfo.is() )
{
SetModified( true );
}
@@ -239,7 +239,7 @@ const OUString& SbxVariable::GetName( SbxNameType t ) const
// Request parameter-information (not for objects)
const_cast<SbxVariable*>(this)->GetInfo();
// Append nothing, if it is a simple property (no empty brackets)
- if (!pInfo.Is() || (pInfo->m_Params.empty() && GetClass() == SbxClassType::Property))
+ if (!pInfo.is() || (pInfo->m_Params.empty() && GetClass() == SbxClassType::Property))
{
return maName;
}
@@ -619,7 +619,7 @@ bool SbxVariable::StoreData( SvStream& rStrm ) const
write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, maName,
RTL_TEXTENCODING_ASCII_US);
rStrm.WriteUInt32( nUserData );
- if( pInfo.Is() )
+ if( pInfo.is() )
{
rStrm.WriteUChar( 2 ); // Version 2: with UserData!
pInfo->StoreData( rStrm );
@@ -656,7 +656,7 @@ SbxAlias& SbxAlias::operator=( const SbxAlias& r )
SbxAlias::~SbxAlias()
{
- if( xAlias.Is() )
+ if( xAlias.is() )
{
EndListening( xAlias->GetBroadcaster() );
}
@@ -664,7 +664,7 @@ SbxAlias::~SbxAlias()
void SbxAlias::Broadcast( SfxHintId nHt )
{
- if( xAlias.Is() )
+ if( xAlias.is() )
{
xAlias->SetParameters( GetParameters() );
if( nHt == SfxHintId::BasicDataWanted )
@@ -688,7 +688,7 @@ void SbxAlias::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p && p->GetId() == SfxHintId::BasicDying )
{
- xAlias.Clear();
+ xAlias.clear();
// delete the alias?
if( pParent )
{
generated by cgit (git 2.34.1) at 2024-08-04 05:52:40 +0000