summaryrefslogtreecommitdiff
path: root/extensions/source/abpilot
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-30 11:46:15 +0200
committerNoel Grandin <noel@peralex.com>2014-05-02 08:49:22 +0200
commit7ae4102f171c5f0d452fa78c5c17722bc9649fc5 (patch)
tree40ff03aeaabe4adfdd90bdb82cb6ef6b80381795 /extensions/source/abpilot
parent7d2cf383667106efe3e2ea6099fe52206b685c5d (diff)
extensions: sal_Bool->bool
Change-Id: I1730f99c08690138e9aa7aba54304fd7bc51491d
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx16
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx2
-rw-r--r--extensions/source/abpilot/abpservices.cxx4
-rw-r--r--extensions/source/abpilot/abspilot.cxx4
-rw-r--r--extensions/source/abpilot/abspilot.hxx10
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx8
-rw-r--r--extensions/source/abpilot/admininvokationimpl.hxx2
-rw-r--r--extensions/source/abpilot/admininvokationpage.cxx6
-rw-r--r--extensions/source/abpilot/admininvokationpage.hxx2
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx30
-rw-r--r--extensions/source/abpilot/datasourcehandling.hxx8
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx12
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.hxx2
13 files changed, 53 insertions, 53 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 871f4be90a81..8fd56ab149d3 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -66,19 +66,19 @@ namespace abp
}
- sal_Bool FinalPage::isValidName() const
+ bool FinalPage::isValidName() const
{
OUString sCurrentName(m_aName.GetText());
if (sCurrentName.isEmpty())
// the name must not be empty
- return sal_False;
+ return false;
if ( m_aInvalidDataSourceNames.find( sCurrentName ) != m_aInvalidDataSourceNames.end() )
// there already is a data source with this name
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
@@ -180,9 +180,9 @@ namespace abp
void FinalPage::implCheckName()
{
- sal_Bool bValidName = isValidName();
- sal_Bool bEmptyName = m_aName.GetText().isEmpty();
- sal_Bool bEmptyLocation = m_aLocation.GetText().isEmpty();
+ bool bValidName = isValidName();
+ bool bEmptyName = m_aName.GetText().isEmpty();
+ bool bEmptyLocation = m_aLocation.GetText().isEmpty();
// enable or disable the finish button
getDialog()->enableButtons( WZB_FINISH, !bEmptyLocation && (!m_aRegisterName.IsChecked() || bValidName) );
@@ -201,7 +201,7 @@ namespace abp
IMPL_LINK_NOARG(FinalPage, OnRegister)
{
- sal_Bool bEnable = m_aRegisterName.IsChecked();
+ bool bEnable = m_aRegisterName.IsChecked();
m_aNameLabel.Enable(bEnable);
m_aName.Enable(bEnable);
implCheckName();
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index eb77393ae17f..d972c46ef628 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -71,7 +71,7 @@ namespace abp
DECL_LINK( OnNameModified, Edit* );
DECL_LINK(OnRegister, void *);
- sal_Bool isValidName() const;
+ bool isValidName() const;
void implCheckName();
void setFields();
};
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index efa0867c4441..06e9ffdf6eee 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -27,12 +27,12 @@ using namespace ::com::sun::star::registry;
extern "C" void SAL_CALL abp_initializeModule()
{
- static sal_Bool s_bInit = sal_False;
+ static bool s_bInit = false;
if (!s_bInit)
{
createRegistryInfo_OABSPilotUno();
::abp::OModule::setResourceFilePrefix("abp");
- s_bInit = sal_True;
+ s_bInit = true;
}
}
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index cfad994c9d7a..d4445b0da1de 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -263,7 +263,7 @@ namespace abp
// no break here
case STATE_INVOKE_ADMIN_DIALOG:
- if ( !connectToDataSource( sal_False ) )
+ if ( !connectToDataSource( false ) )
{
// connecting did not succeed -> do not allow proceeding
bAllow = false;
@@ -401,7 +401,7 @@ namespace abp
}
- sal_Bool OAddessBookSourcePilot::connectToDataSource( sal_Bool _bForceReConnect )
+ bool OAddessBookSourcePilot::connectToDataSource( bool _bForceReConnect )
{
DBG_ASSERT( m_aNewDataSource.isValid(), "OAddessBookSourcePilot::implConnect: invalid current data source!" );
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 3ffa3b19b74f..9a83389b193e 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -60,7 +60,7 @@ namespace abp
const ODataSource& getDataSource() const { return m_aNewDataSource; }
- sal_Bool connectToDataSource( sal_Bool _bForceReConnect );
+ bool connectToDataSource( bool _bForceReConnect );
void travelNext( ) { OAddessBookSourcePilot_Base::travelNext(); }
@@ -93,26 +93,26 @@ namespace abp
/// guesses a default for the table name, if no valid table is selected
void implDefaultTableName();
- inline sal_Bool needAdminInvokationPage( AddressSourceType _eType ) const
+ inline bool needAdminInvokationPage( AddressSourceType _eType ) const
{
return ( ( AST_LDAP == _eType )
|| ( AST_OTHER == _eType )
);
}
/// check if with the current settings, we would need to invoke he administration dialog for more details about the data source
- inline sal_Bool needAdminInvokationPage() const
+ inline bool needAdminInvokationPage() const
{
return needAdminInvokationPage( m_aSettings.eType );
}
- inline sal_Bool needManualFieldMapping( AddressSourceType _eType ) const
+ inline bool needManualFieldMapping( AddressSourceType _eType ) const
{
return ( AST_OTHER == _eType ) || ( AST_KAB == _eType ) ||
( AST_EVOLUTION == _eType ) || ( AST_EVOLUTION_GROUPWISE == _eType ) ||
( AST_EVOLUTION_LDAP == _eType );
}
/// checks if we need a manual (user-guided) field mapping
- inline sal_Bool needManualFieldMapping() const
+ inline bool needManualFieldMapping() const
{
return needManualFieldMapping( m_aSettings.eType );
}
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 6ad36a948437..955c10952e17 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -59,10 +59,10 @@ namespace abp
}
- sal_Bool OAdminDialogInvokation::invokeAdministration( sal_Bool _bFixedType )
+ bool OAdminDialogInvokation::invokeAdministration( bool _bFixedType )
{
if (!m_xContext.is())
- return sal_False;
+ return false;
try
{
@@ -107,7 +107,7 @@ namespace abp
if (xDialog.is())
{ // execute it
if (xDialog->execute())
- return sal_True;
+ return true;
}
else
ShowServiceNotAvailableError(m_pMessageParent, s_sAdministrationServiceName, true);
@@ -116,7 +116,7 @@ namespace abp
{
OSL_FAIL("OAdminDialogInvokation::invokeAdministration: caught an exception while executing the dialog!");
}
- return sal_False;
+ return false;
}
diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx
index c24487d2d372..32d895e0a367 100644
--- a/extensions/source/abpilot/admininvokationimpl.hxx
+++ b/extensions/source/abpilot/admininvokationimpl.hxx
@@ -45,7 +45,7 @@ namespace abp
Window* _pMessageParent
);
- sal_Bool invokeAdministration( sal_Bool _bFixedType );
+ bool invokeAdministration( bool _bFixedType );
};
}
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index a237eb365f88..b1e6a8f608b6 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -35,7 +35,7 @@ namespace abp
,m_aExplanation (this, ModuleRes(FT_ADMINEXPLANATION))
,m_aInvokeAdminDialog (this, ModuleRes(PB_INVOKE_ADMIN_DIALOG))
,m_aErrorMessage (this, ModuleRes(FT_ERROR))
- ,m_bSuccessfullyExecutedDialog(sal_False)
+ ,m_bSuccessfullyExecutedDialog(false)
{
FreeResource();
@@ -52,7 +52,7 @@ namespace abp
void AdminDialogInvokationPage::implUpdateErrorMessage()
{
- const sal_Bool bIsConnected = getDialog()->getDataSource().isConnected();
+ const bool bIsConnected = getDialog()->getDataSource().isConnected();
m_aErrorMessage.Show( !bIsConnected );
}
@@ -67,7 +67,7 @@ namespace abp
void AdminDialogInvokationPage::implTryConnect()
{
- getDialog()->connectToDataSource( sal_True );
+ getDialog()->connectToDataSource( true );
// show our error message if and only if we could not connect
implUpdateErrorMessage();
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 69517bbe71d6..8de6e52e3478 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -37,7 +37,7 @@ namespace abp
PushButton m_aInvokeAdminDialog;
FixedText m_aErrorMessage;
- sal_Bool m_bSuccessfullyExecutedDialog;
+ bool m_bSuccessfullyExecutedDialog;
public:
AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent );
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index c8372da0895e..c9e71eaaea2c 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -306,11 +306,11 @@ namespace abp
xConnection;
StringBag aTables; // the cached table names
OUString sName;
- sal_Bool bTablesUpToDate; // table name cache up-to-date?
+ bool bTablesUpToDate; // table name cache up-to-date?
ODataSourceImpl( const Reference< XComponentContext >& _rxORB )
:xORB( _rxORB )
- ,bTablesUpToDate( sal_False )
+ ,bTablesUpToDate( false )
{
}
@@ -433,14 +433,14 @@ namespace abp
}
- sal_Bool ODataSource::rename( const OUString& _rName ) SAL_THROW (( ))
+ bool ODataSource::rename( const OUString& _rName ) SAL_THROW (( ))
{
if (!isValid())
// nothing to do
- return sal_False;
+ return false;
m_pImpl->sName = _rName;
- return sal_True;
+ return true;
}
@@ -497,16 +497,16 @@ namespace abp
}
// now the table cache is up-to-date
- m_pImpl->bTablesUpToDate = sal_True;
+ m_pImpl->bTablesUpToDate = true;
return m_pImpl->aTables;
}
- sal_Bool ODataSource::connect( Window* _pMessageParent ) SAL_THROW (( ))
+ bool ODataSource::connect( Window* _pMessageParent ) SAL_THROW (( ))
{
if ( isConnected( ) )
// nothing to do
- return sal_True;
+ return true;
// create the interaction handler (needed for authentication and error handling)
@@ -528,7 +528,7 @@ namespace abp
OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
if ( _pMessageParent )
ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, true );
- return sal_False;
+ return false;
}
@@ -581,15 +581,15 @@ namespace abp
}
if ( !xConnection.is() )
- return sal_False;
+ return false;
// success
m_pImpl->xConnection.reset( xConnection );
m_pImpl->aTables.clear();
- m_pImpl->bTablesUpToDate = sal_False;
+ m_pImpl->bTablesUpToDate = false;
- return sal_True;
+ return true;
}
@@ -597,17 +597,17 @@ namespace abp
{
m_pImpl->xConnection.clear();
m_pImpl->aTables.clear();
- m_pImpl->bTablesUpToDate = sal_False;
+ m_pImpl->bTablesUpToDate = false;
}
- sal_Bool ODataSource::isConnected( ) const SAL_THROW (( ))
+ bool ODataSource::isConnected( ) const SAL_THROW (( ))
{
return m_pImpl->xConnection.is();
}
- sal_Bool ODataSource::isValid() const SAL_THROW (( ))
+ bool ODataSource::isValid() const SAL_THROW (( ))
{
return m_pImpl && m_pImpl->xDataSource.is();
}
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index b4d71ffa4ab0..1991d291b5d0 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -133,7 +133,7 @@ namespace abp
/// checks whether or not the object represents a valid data source
- sal_Bool isValid() const SAL_THROW (( ));
+ bool isValid() const SAL_THROW (( ));
/// removes the data source represented by the object from the data source context
@@ -145,7 +145,7 @@ namespace abp
getName() const SAL_THROW (( ));
/// renames the data source
- sal_Bool rename( const OUString& _rName ) SAL_THROW (( ));
+ bool rename( const OUString& _rName ) SAL_THROW (( ));
// TODO: put this into the context class
@@ -157,10 +157,10 @@ namespace abp
at all.
@see isConnected
*/
- sal_Bool connect( Window* _pMessageParent ) SAL_THROW (( ));
+ bool connect( Window* _pMessageParent ) SAL_THROW (( ));
/// returns <TRUE/> if the object has a valid connection, obtained from it's data source
- sal_Bool isConnected( ) const SAL_THROW (( ));
+ bool isConnected( ) const SAL_THROW (( ));
/// disconnects from the data source (i.e. disposes the UNO connection hold internally)
void disconnect( ) SAL_THROW (( ));
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 0104374b2a05..1f72151daf05 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -69,7 +69,7 @@ namespace abp
- sal_Bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent,
+ bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent,
const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) SAL_THROW ( ( ) )
{
_rSettings.aFieldMapping.clear();
@@ -77,7 +77,7 @@ namespace abp
DBG_ASSERT( _rxORB.is(), "fieldmapping::invokeDialog: invalid service factory!" );
DBG_ASSERT( _rxDataSource.is(), "fieldmapping::invokeDialog: invalid data source!" );
if ( !_rxORB.is() || !_rxDataSource.is() )
- return sal_False;
+ return false;
try
{
@@ -102,7 +102,7 @@ namespace abp
Sequence< AliasProgrammaticPair > aMapping;
#ifdef DBG_UTIL
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
xDialogProps->getPropertyValue("FieldMapping") >>= aMapping;
DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" );
@@ -113,7 +113,7 @@ namespace abp
for (;pMapping != pMappingEnd; ++pMapping)
_rSettings.aFieldMapping[ pMapping->ProgrammaticName ] = pMapping->Alias;
- return sal_True;
+ return true;
}
}
@@ -121,7 +121,7 @@ namespace abp
{
OSL_FAIL("fieldmapping::invokeDialog: caught an exception while executing the dialog!");
}
- return sal_False;
+ return false;
}
@@ -326,7 +326,7 @@ namespace abp
_rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
// set the flag
- aAddressBookSettings.setNodeValue( OUString( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) );
+ aAddressBookSettings.setNodeValue( OUString( "AutoPilotCompleted" ), makeAny( true ) );
// commit the changes done
aAddressBookSettings.commit();
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index 4e56ca3d422c..2fca1952dd1d 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -59,7 +59,7 @@ namespace abp
structure will be filled with the settings the user did in the
field mapping dialog.
*/
- sal_Bool invokeDialog(
+ bool invokeDialog(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
class Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource,