summaryrefslogtreecommitdiff
path: root/basic/source/uno
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/uno')
-rw-r--r--basic/source/uno/dlgcont.cxx14
-rw-r--r--basic/source/uno/namecont.cxx18
-rw-r--r--basic/source/uno/scriptcont.cxx14
3 files changed, 23 insertions, 23 deletions
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 004b61fbf198..f173ae5f18ff 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -139,7 +139,7 @@ bool writeOasis2OOoLibraryElement(
if (! xSMgr.is())
{
- return FALSE;
+ return sal_False;
}
Reference< xml::sax::XParser > xParser(
@@ -161,7 +161,7 @@ bool writeOasis2OOoLibraryElement(
if ( !xParser.is() || !xWriter.is() )
{
- return FALSE;
+ return sal_False;
}
Sequence<Any> aArgs( 1 );
@@ -182,7 +182,7 @@ bool writeOasis2OOoLibraryElement(
xParser->parseStream( source );
- return TRUE;
+ return sal_True;
}
void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
@@ -201,13 +201,13 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
Reference< XInputStream > xInput( xISP->createInputStream() );
- bool bComplete = FALSE;
+ bool bComplete = sal_False;
if ( mbOasis2OOoFormat )
{
bComplete = writeOasis2OOoLibraryElement( xInput, xOutput );
}
- if ( bComplete == FALSE )
+ if ( bComplete == sal_False )
{
Sequence< sal_Int8 > bytes;
sal_Int32 nRead = xInput->readBytes( bytes, xInput->available() );
@@ -246,7 +246,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
{
// if we cannot get the version then the
// Oasis2OOoTransformer will not be used
- OSL_ASSERT(FALSE);
+ OSL_ASSERT(sal_False);
}
}
@@ -329,7 +329,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
{
OSL_ENSURE( 0, "Parsing error\n" );
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
return aRetAny;
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index f44846972710..fbf1429f9753 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -736,7 +736,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
if( nPass == 0 )
{
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -758,7 +758,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
{
xInput.clear();
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1490,7 +1490,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
throw;
SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aElementPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1603,7 +1603,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
throw;
SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1678,7 +1678,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib,
if( !GbMigrationSuppressErrors )
{
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1705,7 +1705,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib,
// makeAny( e ) );
OSL_ENSURE( 0, "Parsing error\n" );
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
return sal_False;
}
@@ -2034,7 +2034,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
}
catch( uno::Exception& )
{
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -2056,7 +2056,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
{
xOut.clear();
SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
@@ -2086,7 +2086,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
catch( uno::Exception& )
{
OSL_ENSURE( sal_False, "Problem during storing of libraries!\n" );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index d99f98589b31..f51ce54cd7ee 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -299,7 +299,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
catch( Exception& )
{
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
@@ -653,7 +653,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
throw uno::RuntimeException();
SvMemoryStream aMemStream;
- /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+ /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
Sequence< sal_Int8 > aBinSeq( nSize );
@@ -794,7 +794,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
SvMemoryStream aMemStream;
- /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+ /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
Sequence< sal_Int8 > aBinSeq( nSize );
@@ -951,7 +951,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
if( !pMod )
{
pMod = pBasicLib->MakeModule( aElementName, String() );
- pBasicLib->SetModified( FALSE );
+ pBasicLib->SetModified( sal_False );
}
//OUString aCodeStreamName( RTL_CONSTASCII_USTRINGPARAM("code.bin") );
@@ -973,7 +973,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), nError );
}
- /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+ /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
// TODO: Check return value
delete pStream;
@@ -1063,7 +1063,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
if( !pMod )
{
pMod = pBasicLib->MakeModule( aElementName, String() );
- pBasicLib->SetModified( FALSE );
+ pBasicLib->SetModified( sal_False );
}
try {
@@ -1082,7 +1082,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
nError );
}
- /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+ /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
// TODO: Check return value
delete pStream;