[Libreoffice-commits] .: basctl/source

[August Sodora]

 basctl/source/basicide/bastypes.cxx |   20 +++++++++-----------
 basctl/source/inc/bastypes.hxx      |   12 ++++++------
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit 7ffca8ed2ed7dda9d74edb498ec74620e9489c7a
Author: August Sodora <aug...@gmail.com>
Date:   Fri Dec 9 00:15:26 2011 -0500

    sal_Bool to bool

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 21dfce9..ca6b97a 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -756,7 +756,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey )
     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 aName( rName );
@@ -764,39 +764,37 @@ sal_Bool QueryDel( const String& rName, const ResId& rId, 
Window* pParent )
     aName.Insert( '\'', 0 );
     aQuery.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "XX" ) ), 
aName );
     QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
-    if ( aQueryBox.Execute() == RET_YES )
-        return sal_True;
-    return sal_False;
+    return ( aQueryBox.Execute() == RET_YES );
 }
 
-sal_Bool QueryDelMacro( const String& rName, Window* pParent )
+bool QueryDelMacro( const String& rName, Window* 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 );
 }
 
-sal_Bool QueryDelDialog( const String& rName, Window* pParent )
+bool QueryDelDialog( const String& rName, Window* 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 );
 }
 
-sal_Bool QueryDelModule( const String& rName, Window* pParent )
+bool QueryDelModule( const String& rName, Window* 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;
 
     do
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index fb24a2b..f65d1d6 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -274,12 +274,12 @@ void            CutLines( ::rtl::OUString& rStr, 
sal_Int32 nStartLine, sal_Int32
 String          CreateMgrAndLibStr( const String& rMgrName, const String& 
rLibName );
 sal_uLong           CalcLineCount( SvStream& rStream );
 
-sal_Bool            QueryReplaceMacro( const String& rName, Window* pParent = 
0 );
-sal_Bool            QueryDelMacro( const String& rName, Window* pParent = 0 );
-sal_Bool            QueryDelDialog( const String& rName, Window* pParent = 0 );
-sal_Bool            QueryDelModule( const String& rName, Window* pParent = 0 );
-sal_Bool            QueryDelLib( const String& rName, sal_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 QueryReplaceMacro( const String& rName, Window* pParent = 0 );
+bool QueryDelMacro( const String& rName, Window* pParent = 0 );
+bool QueryDelDialog( const String& rName, Window* pParent = 0 );
+bool QueryDelModule( const String& rName, Window* pParent = 0 );
+bool QueryDelLib( const String& rName, bool bRef = sal_False, Window* pParent 
= 0 );
+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
 {
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits