mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Bool to bool

Browse Source
This commit is contained in:
August Sodora
2011-12-09 00:15:26 -05:00
parent 5a61ac273b
commit 7ffca8ed2e
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
basctl/source/basicide/bastypes.cxx
View File

@@ -756,7 +756,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey )
return pItem; return pItem;
} }
sal_Bool QueryDel( const String& rName, const ResId& rId, Window* pParent ) bool QueryDel( const String& rName, const ResId& rId, Window* pParent )
{ {
String aQuery( rId ); String aQuery( rId );
String aName( rName ); String aName( rName );
@@ -764,39 +764,37 @@ sal_Bool QueryDel( const String& rName, const ResId& rId, Window* pParent )
aName.Insert( '\'', 0 ); aName.Insert( '\'', 0 );
aQuery.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "XX" ) ), aName ); aQuery.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "XX" ) ), aName );
QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery ); QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
if ( aQueryBox.Execute() == RET_YES ) return ( aQueryBox.Execute() == RET_YES );
return sal_True;
return sal_False;
} }
sal_Bool QueryDelMacro( const String& rName, Window* pParent ) bool QueryDelMacro( const String& rName, Window* pParent )
{ {
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent ); return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
} }
sal_Bool QueryReplaceMacro( const String& rName, Window* pParent ) bool QueryReplaceMacro( const String& rName, Window* pParent )
{ {
return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent ); return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
} }
sal_Bool QueryDelDialog( const String& rName, Window* pParent ) bool QueryDelDialog( const String& rName, Window* pParent )
{ {
return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent ); return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
} }
sal_Bool QueryDelLib( const String& rName, sal_Bool bRef, Window* pParent ) bool QueryDelLib( const String& rName, bool bRef, Window* pParent )
{ {
return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent ); return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent );
} }
sal_Bool QueryDelModule( const String& rName, Window* pParent ) bool QueryDelModule( const String& rName, Window* pParent )
{ {
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent ); return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent );
} }
sal_Bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, sal_Bool bRepeat, sal_Bool bNewTitle ) bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, bool bRepeat, bool bNewTitle )
{ {
sal_Bool bOK = sal_False; bool bOK = false;
sal_uInt16 nRet = 0; sal_uInt16 nRet = 0;
do do

12
basctl/source/inc/bastypes.hxx
View File

@@ -274,12 +274,12 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32
String CreateMgrAndLibStr( const String& rMgrName, const String& rLibName ); String CreateMgrAndLibStr( const String& rMgrName, const String& rLibName );
sal_uLong CalcLineCount( SvStream& rStream ); sal_uLong CalcLineCount( SvStream& rStream );
sal_Bool QueryReplaceMacro( const String& rName, Window* pParent = 0 ); bool QueryReplaceMacro( const String& rName, Window* pParent = 0 );
sal_Bool QueryDelMacro( const String& rName, Window* pParent = 0 ); bool QueryDelMacro( const String& rName, Window* pParent = 0 );
sal_Bool QueryDelDialog( const String& rName, Window* pParent = 0 ); bool QueryDelDialog( const String& rName, Window* pParent = 0 );
sal_Bool QueryDelModule( const String& rName, Window* pParent = 0 ); bool QueryDelModule( const String& rName, Window* pParent = 0 );
sal_Bool QueryDelLib( const String& rName, sal_Bool bRef = sal_False, Window* pParent = 0 ); bool QueryDelLib( const String& rName, bool bRef = sal_False, Window* pParent = 0 );
sal_Bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, sal_Bool bRepeat = sal_False, sal_Bool bNewTitle = sal_False ); bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, bool bRepeat = false, bool bNewTitle = false );
class ModuleInfoHelper class ModuleInfoHelper
{ {