summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-01 09:53:24 +0200
committerNoel Grandin <noel@peralex.com>2014-04-03 09:17:47 +0200
commit8d6a99f67edc3be61f1294f963c3bbbd2b7344f6 (patch)
tree821b205fa3e96d0f6478dbd3c8de6d36cad83a1d
parent0a1cc7826beade023be930ac966a465c11819d55 (diff)
dbaccess: sal_Bool->bool
Change-Id: Ida8ee14bb6350fad815d741ca7a2b7db04a8ed11
-rw-r--r--dbaccess/source/ui/app/AppController.cxx50
-rw-r--r--dbaccess/source/ui/app/AppController.hxx8
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx4
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx32
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx52
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx10
-rw-r--r--dbaccess/source/ui/inc/JoinController.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationController.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx4
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx2
-rw-r--r--dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx40
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx20
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx8
-rw-r--r--include/dbaccess/IController.hxx6
-rw-r--r--include/dbaccess/dbsubcomponentcontroller.hxx18
-rw-r--r--include/dbaccess/genericcontroller.hxx36
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx2
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx36
22 files changed, 173 insertions, 173 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 8fde9e336416..b5cbdbb6e599 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -428,17 +428,17 @@ void SAL_CALL OApplicationController::disposing()
OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5
}
-sal_Bool OApplicationController::Construct(Window* _pParent)
+bool OApplicationController::Construct(Window* _pParent)
{
setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) );
getView()->SetUniqueId(UID_APP_VIEW);
// late construction
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
try
{
getContainer()->Construct();
- bSuccess = sal_True;
+ bSuccess = true;
}
catch(const SQLException&)
{
@@ -454,7 +454,7 @@ sal_Bool OApplicationController::Construct(Window* _pParent)
::std::auto_ptr< Window> aTemp( getView() );
SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
- return sal_False;
+ return false;
}
// now that we have a view we can create the clipboard listener
@@ -468,7 +468,7 @@ sal_Bool OApplicationController::Construct(Window* _pParent)
OApplicationController_CBASE::Construct( _pParent );
getView()->Show();
- return sal_True;
+ return true;
}
void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) throw( RuntimeException, std::exception )
@@ -570,7 +570,7 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( Runt
FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
{
FeatureState aReturn;
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
// check this first
if ( !getContainer() || m_bReadOnly )
return aReturn;
@@ -580,7 +580,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
switch (_nId)
{
case SID_OPENURL:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
if ( m_xModel.is() )
aReturn.sTitle = m_xModel->getURL();
break;
@@ -614,13 +614,13 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
break;
case SID_OPENDOC:
case SID_HELP_INDEX:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case ID_BROWSER_SAVEDOC:
aReturn.bEnabled = !isDataSourceReadOnly() && m_xDocumentModify.is() && m_xDocumentModify->isModified();
break;
case ID_BROWSER_SAVEASDOC:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case ID_BROWSER_SORTUP:
aReturn.bEnabled = getContainer()->isFilled() && getContainer()->getElementCount();
@@ -656,19 +656,19 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
}
break;
case SID_DB_APP_VIEW_TABLES:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getContainer()->getElementType() == E_TABLE;
break;
case SID_DB_APP_VIEW_QUERIES:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getContainer()->getElementType() == E_QUERY;
break;
case SID_DB_APP_VIEW_FORMS:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getContainer()->getElementType() == E_FORM;
break;
case SID_DB_APP_VIEW_REPORTS:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getContainer()->getElementType() == E_REPORT;
break;
case ID_NEW_QUERY_DESIGN:
@@ -692,7 +692,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = !isDataSourceReadOnly() && !isConnectionReadOnly();
break;
case ID_DIRECT_SQL:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case ID_MIGRATE_SCRIPTS:
{
@@ -772,7 +772,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
break;
case SID_DB_APP_EDIT_SQL_VIEW:
if ( isDataSourceReadOnly() )
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
else
{
switch ( getContainer()->getElementType() )
@@ -782,7 +782,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
&& ( getContainer()->isALeafSelected() );
break;
case E_TABLE:
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
// there's one exception: views which support altering their underlying
// command can be edited in SQL view, too
if ( ( getContainer()->getSelectionCount() > 0 )
@@ -818,7 +818,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = !m_aTypeCollection.isEmbeddedDatabase(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL)));
break;
case SID_DB_APP_DSRELDESIGN:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case SID_DB_APP_TABLEFILTER:
aReturn.bEnabled = !isDataSourceReadOnly();
@@ -849,7 +849,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
}
break;
case SID_DB_APP_DISABLE_PREVIEW:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getContainer()->getPreviewMode() == E_PREVIEWNONE;
break;
case SID_DB_APP_VIEW_DOCINFO_PREVIEW:
@@ -860,14 +860,14 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
}
break;
case SID_DB_APP_VIEW_DOC_PREVIEW:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getContainer()->getPreviewMode() == E_DOCUMENT;
break;
case ID_BROWSER_UNDO:
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
break;
case SID_MAIL_SENDDOC:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case SID_DB_APP_SENDREPORTASMAIL:
{
@@ -877,7 +877,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
break;
case SID_DB_APP_SENDREPORTTOWRITER:
case SID_DB_APP_DBADMIN:
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
break;
case SID_DB_APP_STATUS_TYPE:
aReturn.bEnabled = m_xDataSource.is();
@@ -1173,7 +1173,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
}
/*updateTitle();*/
- m_bCurrentlyModified = sal_False;
+ m_bCurrentlyModified = false;
InvalidateFeature(ID_BROWSER_SAVEDOC);
if ( getContainer()->getElementType() == E_NONE )
{
@@ -2346,12 +2346,12 @@ void OApplicationController::executeChecked(sal_uInt16 _nCommandId, const Sequen
OApplicationController_CBASE::executeChecked( _nCommandId, aArgs );
}
-sal_Bool OApplicationController::isCommandEnabled(sal_uInt16 _nCommandId) const
+bool OApplicationController::isCommandEnabled(sal_uInt16 _nCommandId) const
{
return OApplicationController_CBASE::isCommandEnabled( _nCommandId );
}
-sal_Bool OApplicationController::isCommandEnabled( const OUString& _rCompleteCommandURL ) const
+bool OApplicationController::isCommandEnabled( const OUString& _rCompleteCommandURL ) const
{
return OApplicationController_CBASE::isCommandEnabled( _rCompleteCommandURL );
}
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index c2738ac29479..56959e3c4a9e 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -508,11 +508,11 @@ namespace dbaui
virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
- virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE;
- virtual sal_Bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const SAL_OVERRIDE;
+ virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE;
+ virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const SAL_OVERRIDE;
virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) SAL_OVERRIDE;
virtual void notifyHiContrastChanged() SAL_OVERRIDE;
- virtual sal_Bool isDataSourceReadOnly() const SAL_OVERRIDE;
+ virtual bool isDataSourceReadOnly() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
getXController(void) throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE;
@@ -546,7 +546,7 @@ namespace dbaui
virtual void disconnect();
// late construction
- virtual sal_Bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(Window* pParent) SAL_OVERRIDE;
virtual void describeSupportedFeatures() SAL_OVERRIDE;
protected:
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 8decf1d74f80..118582a16fef 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -409,7 +409,7 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL
return m_xDataSourceConnection;
}
-sal_Bool OApplicationController::isDataSourceReadOnly() const
+bool OApplicationController::isDataSourceReadOnly() const
{
Reference<XStorable> xStore(m_xModel,UNO_QUERY);
return !xStore.is() || xStore->isReadonly();
@@ -417,7 +417,7 @@ sal_Bool OApplicationController::isDataSourceReadOnly() const
sal_Bool OApplicationController::isConnectionReadOnly() const
{
- sal_Bool bIsConnectionReadOnly = sal_True;
+ sal_Bool bIsConnectionReadOnly = true;
if ( m_xMetaData.is() )
{
try
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 6873b3ef07de..2986d9a05183 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -721,24 +721,24 @@ void SbaXDataBrowserController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:FormSlots/insertRecord", ID_BROWSER_INSERT_ROW, CommandGroup::INSERT );
}
-sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
+bool SbaXDataBrowserController::Construct(Window* pParent)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Construct" );
// create/initialize the form and the grid model
m_xRowSet = CreateForm();
if (!m_xRowSet.is())
- return sal_False;
+ return false;
m_xColumnsSupplier.set(m_xRowSet,UNO_QUERY);
m_xLoadable.set(m_xRowSet,UNO_QUERY);
Reference< XPropertySet > xFormProperties( m_xRowSet, UNO_QUERY );
if ( !InitializeForm( xFormProperties ) )
- return sal_False;
+ return false;
m_xGridModel = CreateGridModel();
if (!m_xGridModel.is())
- return sal_False;
+ return false;
// set the formatter if available
initFormatter();
@@ -759,14 +759,14 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
// create the view
setView( * new UnoDataBrowserView( pParent, *this, getORB() ) );
if (!getBrowserView())
- return sal_False;
+ return false;
// late construction
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
try
{
getBrowserView()->Construct(getControlModel());
- bSuccess = sal_True;
+ bSuccess = true;
}
catch(SQLException&)
{
@@ -779,7 +779,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
if (!bSuccess)
{
// deleteView();
- return sal_False;
+ return false;
}
// now that we have a view we can create the clipboard listener
@@ -1558,7 +1558,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
case ID_BROWSER_FILTERCRIT:
if ( m_bCannotSelectUnfiltered && m_xParser.is() )
{
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
}
// no break
@@ -1574,11 +1574,11 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
break;
case ID_BROWSER_REFRESH:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case ID_BROWSER_REDO:
- aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible.
+ aReturn.bEnabled = false; // simply forget it ;). no redo possible.
break;
case ID_BROWSER_UNDORECORD:
@@ -1591,7 +1591,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
aReturn.bEnabled = ::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ISMODIFIED));
}
else
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.sTitle = (ID_BROWSER_UNDORECORD == nId) ? m_sStateUndoRecord : m_sStateSaveRecord;
}
@@ -1613,7 +1613,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
if (!isValidCursor() || !isLoaded())
break; // no cursor -> no edit mode
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
sal_Int16 nGridMode = getBrowserView()->getVclControl()->GetOptions();
aReturn.bChecked = nGridMode > DbGridControl::OPT_READONLY;
@@ -1621,19 +1621,19 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
break;
case ID_BROWSER_FILTERED:
{
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
Reference< XPropertySet > xActiveSet(getRowSet(), UNO_QUERY);
OUString aFilter = ::comphelper::getString(xActiveSet->getPropertyValue(PROPERTY_FILTER));
OUString aHaving = ::comphelper::getString(xActiveSet->getPropertyValue(PROPERTY_HAVING_CLAUSE));
if ( !(aFilter.isEmpty() && aHaving.isEmpty()) )
{
xActiveSet->getPropertyValue( PROPERTY_APPLYFILTER ) >>= aReturn.bChecked;
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
}
else
{
aReturn.bChecked = false;
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
}
}
break;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index f90b2925cc73..23e0e4f5c980 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -115,7 +115,7 @@ FeatureState UserDefinedFeatures::getState( const URL& /*_rFeatureURL*/ )
// TODO: we should ask the dispatcher. However, this is laborious, since you cannot ask a dispatcher
// directly, but need to add a status listener.
FeatureState aState;
- aState.bEnabled = sal_True;
+ aState.bEnabled = true;
return aState;
}
@@ -170,10 +170,10 @@ OGenericUnoController::OGenericUnoController(const Reference< XComponentContext
,m_aAsyncCloseTask(LINK(this, OGenericUnoController, OnAsyncCloseTask))
,m_xContext(_rM)
,m_aCurrentFrame( *this )
- ,m_bPreview(sal_False)
- ,m_bReadOnly(sal_False)
- ,m_bCurrentlyModified(sal_False)
- ,m_bExternalTitle(sal_False)
+ ,m_bPreview(false)
+ ,m_bReadOnly(false)
+ ,m_bCurrentlyModified(false)
+ ,m_bExternalTitle(false)
{
osl_atomic_increment( &m_refCount );
{
@@ -226,7 +226,7 @@ OGenericUnoController::~OGenericUnoController()
}
-sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
+bool OGenericUnoController::Construct(Window* /*pParent*/)
{
OSL_ENSURE( getView(), "the view is NULL!" );
@@ -252,7 +252,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
ShowServiceNotAvailableError(getView(), OUString("com.sun.star.sdb.DatabaseContext"), true);
}
- return sal_True;
+ return true;
}
IMPL_LINK_NOARG(OGenericUnoController, OnAsyncInvalidateAll)
@@ -287,7 +287,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
else if ( ( *pIter >>= aValue ) && aValue.Name.equalsAscii( "Preview" ) )
{
aValue.Value >>= m_bPreview;
- m_bReadOnly = sal_True;
+ m_bReadOnly = true;
}
}
try
@@ -362,7 +362,7 @@ void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeEx
if ( xModi.is() )
m_bCurrentlyModified = xModi->isModified(); // can only be reset by save
else
- m_bCurrentlyModified = sal_True;
+ m_bCurrentlyModified = true;
}
InvalidateFeature(ID_BROWSER_SAVEDOC);
InvalidateFeature(ID_BROWSER_UNDO);
@@ -454,7 +454,7 @@ namespace
}
}
-void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature, const Reference< XStatusListener > & xListener, sal_Bool _bIgnoreCache)
+void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature, const Reference< XStatusListener > & xListener, bool _bIgnoreCache)
{
sal_uInt16 nFeat = m_aSupportedFeatures[ _rFeature ].nFeatureId;
FeatureState aFeatState( GetState( nFeat ) );
@@ -519,7 +519,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature,
}
-sal_Bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId )
+bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId )
{
SupportedFeatures::iterator aFeaturePos = ::std::find_if(
m_aSupportedFeatures.begin(),
@@ -530,7 +530,7 @@ sal_Bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId )
return ( m_aSupportedFeatures.end() != aFeaturePos && !aFeaturePos->first.isEmpty());
}
-void OGenericUnoController::InvalidateFeature(const OUString& _rURLPath, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast)
+void OGenericUnoController::InvalidateFeature(const OUString& _rURLPath, const Reference< XStatusListener > & _xListener, bool _bForceBroadcast)
{
ImplInvalidateFeature( m_aSupportedFeatures[ _rURLPath ].nFeatureId, _xListener, _bForceBroadcast );
}
@@ -591,7 +591,7 @@ void OGenericUnoController::InvalidateFeature_Impl()
#endif
}
-void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Reference< XStatusListener >& _xListener, sal_Bool _bForceBroadcast )
+void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Reference< XStatusListener >& _xListener, bool _bForceBroadcast )
{
#if OSL_DEBUG_LEVEL > 0
if ( _nId != -1 )
@@ -621,14 +621,14 @@ void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Referen
m_aAsyncInvalidateAll.Call();
}
-void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast)
+void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< XStatusListener > & _xListener, bool _bForceBroadcast)
{
ImplInvalidateFeature( _nId, _xListener, _bForceBroadcast );
}
void OGenericUnoController::InvalidateAll()
{
- ImplInvalidateFeature( ALL_FEATURES, NULL, sal_True );
+ ImplInvalidateFeature( ALL_FEATURES, NULL, true );
}
void OGenericUnoController::InvalidateAll_Impl()
@@ -639,7 +639,7 @@ void OGenericUnoController::InvalidateAll_Impl()
aIter != m_aSupportedFeatures.end();
++aIter
)
- ImplBroadcastFeatureState( aIter->first, NULL, sal_True );
+ ImplBroadcastFeatureState( aIter->first, NULL, true );
{
::osl::MutexGuard aGuard( m_aFeatureMutex);
@@ -740,7 +740,7 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener >
m_arrStatusListener.insert( m_arrStatusListener.end(), DispatchTarget( aParsedURL, aListener ) );
// initially broadcast the state
- ImplBroadcastFeatureState( aParsedURL.Complete, aListener, sal_True );
+ ImplBroadcastFeatureState( aParsedURL.Complete, aListener, true );
// force the new state to be broadcast to the new listener
}
@@ -895,7 +895,7 @@ FeatureState OGenericUnoController::GetState( sal_uInt16 _nId ) const
{
case ID_BROWSER_UNDO:
case ID_BROWSER_SAVEDOC:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
default:
aReturn = m_pData->m_aUserDefinedFeatures.getState( getURLForId( _nId ) );
@@ -1325,7 +1325,7 @@ void SAL_CALL OGenericUnoController::setTitle(const OUString& sTitle)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
- m_bExternalTitle = sal_True;
+ m_bExternalTitle = true;
impl_getTitleHelper_throw()->setTitle (sTitle);
}
@@ -1375,7 +1375,7 @@ void OGenericUnoController::executeChecked(sal_uInt16 _nCommandId, const Sequenc
Execute(_nCommandId, aArgs);
}
-sal_Bool OGenericUnoController::isCommandEnabled(sal_uInt16 _nCommandId) const
+bool OGenericUnoController::isCommandEnabled(sal_uInt16 _nCommandId) const
{
return GetState( _nCommandId ).bEnabled;
}
@@ -1412,9 +1412,9 @@ void OGenericUnoController::notifyHiContrastChanged()
{
}
-sal_Bool OGenericUnoController::isDataSourceReadOnly() const
+bool OGenericUnoController::isDataSourceReadOnly() const
{
- return sal_False;
+ return false;
}
Reference< XController > OGenericUnoController::getXController() throw( RuntimeException )
@@ -1427,18 +1427,18 @@ bool OGenericUnoController::interceptUserInput( const NotifyEvent& _rEvent )
return m_pData->m_aUserInputInterception.handleNotifyEvent( _rEvent );
}
-sal_Bool OGenericUnoController::isCommandChecked(sal_uInt16 _nCommandId) const
+bool OGenericUnoController::isCommandChecked(sal_uInt16 _nCommandId) const
{
FeatureState aState = GetState( _nCommandId );
- return aState.bChecked && (sal_Bool)*aState.bChecked;
+ return aState.bChecked && *aState.bChecked;
}
-sal_Bool OGenericUnoController::isCommandEnabled( const OUString& _rCompleteCommandURL ) const
+bool OGenericUnoController::isCommandEnabled( const OUString& _rCompleteCommandURL ) const
{
OSL_ENSURE( !_rCompleteCommandURL.isEmpty(), "OGenericUnoController::isCommandEnabled: Empty command url!" );
- sal_Bool bIsEnabled = sal_False;
+ bool bIsEnabled = false;
SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( _rCompleteCommandURL );
if ( aIter != m_aSupportedFeatures.end() )
bIsEnabled = isCommandEnabled( aIter->second.nFeatureId );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index bf793a1a47a7..24cfc475a000 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -324,10 +324,10 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
SbaXDataBrowserController::disposing();
}
-sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
+bool SbaTableQueryBrowser::Construct(Window* pParent)
{
if ( !SbaXDataBrowserController::Construct( pParent ) )
- return sal_False;
+ return false;
try
{
@@ -384,7 +384,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
InvalidateFeature(ID_BROWSER_EXPLORER);
}
- return sal_True;
+ return true;
}
namespace
@@ -1734,7 +1734,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
bHandled = sal_True;
break;
case ID_BROWSER_REFRESH:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
bHandled = sal_True;
break;
}
@@ -1804,7 +1804,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
OUString sObject(aName);
aReturn.sTitle = sTitle.replaceFirst(OUString('#'), sObject);
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
}
break;
case ID_BROWSER_TABLEATTR:
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index 78aca38a5068..a2ec2418dc99 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -87,7 +87,7 @@ namespace dbaui
inline OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; }
// OSingleDocumentController overridables
- virtual void reconnect( sal_Bool _bUI ) SAL_OVERRIDE;
+ virtual void reconnect( bool _bUI ) SAL_OVERRIDE;
virtual void impl_onModifyChanged() SAL_OVERRIDE;
// own overridables
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index b30cd4fc706d..d12f26036c68 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -55,7 +55,7 @@ namespace dbaui
void mergeData(const TTableConnectionData& _aConnectionData);
- virtual sal_Bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(Window* pParent) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 7945f826be3a..4aaac196354c 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -111,7 +111,7 @@ namespace dbaui
inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; }
- virtual sal_Bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(Window* pParent) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 868473a12aac..2e5bc70c9fd9 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -149,7 +149,7 @@ namespace dbaui
UnoDataBrowserView* getBrowserView() const { return static_cast< UnoDataBrowserView*>(getView()); }
// late construction
- virtual sal_Bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(Window* pParent) SAL_OVERRIDE;
// UNO
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index ecfd46245251..4d33e1bcbe07 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -126,7 +126,7 @@ namespace dbaui
// execute a feature
virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
- virtual void reconnect( sal_Bool _bUI ) SAL_OVERRIDE;
+ virtual void reconnect( bool _bUI ) SAL_OVERRIDE;
virtual OUString getPrivateTitle( ) const SAL_OVERRIDE;
OQueryContainerWindow* getContainer() const { return static_cast< OQueryContainerWindow* >( getView() ); }
@@ -165,7 +165,7 @@ namespace dbaui
::connectivity::OSQLParser& getParser() { return m_aSqlParser; }
::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; }
- virtual sal_Bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(Window* pParent) SAL_OVERRIDE;
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index c7220ea7cdf4..04c815753ac7 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -147,7 +147,7 @@ namespace dbaui
DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController);
// late construction
- virtual sal_Bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(Window* pParent) SAL_OVERRIDE;
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 631a8f7fd0e5..3f08f0a8b917 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -133,23 +133,23 @@ namespace dbaui
SharedConnection m_xConnection;
::dbtools::DatabaseMetaData m_aSdbMetaData;
// </properties>
- OUString m_sDataSourceName; // the data source we're working for
+ OUString m_sDataSourceName; // the data source we're working for
DataSourceHolder m_aDataSource;
Reference< XModel > m_xDocument;
Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier
sal_Int32 m_nDocStartNumber;
- sal_Bool m_bSuspended; // is true when the controller was already suspended
- sal_Bool m_bEditable; // is the control readonly or not
- sal_Bool m_bModified; // is the data modified
+ bool m_bSuspended; // is true when the controller was already suspended
+ bool m_bEditable; // is the control readonly or not
+ bool m_bModified; // is the data modified
bool m_bNotAttached;
DBSubComponentController_Impl( ::osl::Mutex& i_rMutex )
:m_aDocScriptSupport()
,m_aModifyListeners( i_rMutex )
,m_nDocStartNumber(0)
- ,m_bSuspended( sal_False )
- ,m_bEditable(sal_True)
- ,m_bModified(sal_False)
+ ,m_bSuspended( false )
+ ,m_bEditable(true)
+ ,m_bModified(false)
,m_bNotAttached(true)
{
}
@@ -198,7 +198,7 @@ namespace dbaui
bool bShowError = true;
if ( !isConnected() )
{
- reconnect( sal_False );
+ reconnect( false );
bShowError = false;
}
if ( !isConnected() )
@@ -296,7 +296,7 @@ namespace dbaui
}
}
- void DBSubComponentController::reconnect( sal_Bool _bUI )
+ void DBSubComponentController::reconnect( bool _bUI )
{
OSL_ENSURE(!m_pImpl->m_bSuspended, "Cannot reconnect while suspended!");
@@ -305,7 +305,7 @@ namespace dbaui
m_pImpl->m_xConnection.clear();
// reconnect
- sal_Bool bReConnect = sal_True;
+ bool bReConnect = true;
if ( _bUI )
{
QueryBox aQuery( getView(), ModuleRes(QUERY_CONNECTION_LOST) );
@@ -335,7 +335,7 @@ namespace dbaui
void DBSubComponentController::losingConnection()
{
// our connection was disposed so we need a new one
- reconnect( sal_True );
+ reconnect( true );
InvalidateAll();
}
@@ -384,7 +384,7 @@ namespace dbaui
m_pImpl->m_aCurrentError = ::dbtools::SQLExceptionInfo();
}
- sal_Bool DBSubComponentController::hasError() const
+ bool DBSubComponentController::hasError() const
{
return m_pImpl->m_aCurrentError.isValid();
}
@@ -403,7 +403,7 @@ namespace dbaui
{
m_pImpl->m_bSuspended = bSuspend;
if ( !bSuspend && !isConnected() )
- reconnect(sal_True);
+ reconnect(true);
return sal_True;
}
@@ -464,17 +464,17 @@ namespace dbaui
return m_pImpl->m_xConnection;
}
- sal_Bool DBSubComponentController::isReadOnly() const
+ bool DBSubComponentController::isReadOnly() const
{
return !m_pImpl->m_bEditable;
}
- sal_Bool DBSubComponentController::isEditable() const
+ bool DBSubComponentController::isEditable() const
{
return m_pImpl->m_bEditable;
}
- void DBSubComponentController::setEditable(sal_Bool _bEditable)
+ void DBSubComponentController::setEditable(bool _bEditable)
{
m_pImpl->m_bEditable = _bEditable;
}
@@ -484,7 +484,7 @@ namespace dbaui
return m_pImpl->m_aSdbMetaData;
}
- sal_Bool DBSubComponentController::isConnected() const
+ bool DBSubComponentController::isConnected() const
{
return m_pImpl->m_xConnection.is();
}
@@ -509,7 +509,7 @@ namespace dbaui
return m_pImpl->m_aDataSource.getDataSourceProps();
}
- sal_Bool DBSubComponentController::haveDataSource() const
+ bool DBSubComponentController::haveDataSource() const
{
return m_pImpl->m_aDataSource.is();
}
@@ -583,7 +583,7 @@ namespace dbaui
{
::osl::ClearableMutexGuard aGuard( getMutex() );
- if ( m_pImpl->m_bModified == i_bModified )
+ if ( (m_pImpl->m_bModified ? 1 : 0) == i_bModified )
return;
m_pImpl->m_bModified = i_bModified;
@@ -594,7 +594,7 @@ namespace dbaui
m_pImpl->m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvent );
}
- sal_Bool DBSubComponentController::impl_isModified() const
+ bool DBSubComponentController::impl_isModified() const
{
return m_pImpl->m_bModified;
}
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index b6af882cdbdd..d442baae4587 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -183,7 +183,7 @@ void OJoinController::disposing()
m_vTableData.clear();
}
-void OJoinController::reconnect( sal_Bool _bUI )
+void OJoinController::reconnect( bool _bUI )
{
OJoinController_BASE::reconnect( _bUI );
if ( isConnected() && m_pAddTableDialog )
@@ -215,7 +215,7 @@ FeatureState OJoinController::GetState(sal_uInt16 _nId) const
{
FeatureState aReturn;
// (disabled automatically)
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
switch (_nId)
{
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index ef101a5a2b5e..eb8bafd8fd01 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -474,16 +474,16 @@ void OQueryController::clearFields()
FeatureState OQueryController::GetState(sal_uInt16 _nId) const
{
FeatureState aReturn;
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
// (disabled automatically)
switch (_nId)
{
case ID_BROWSER_EDITDOC:
if ( editingCommand() )
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
else if ( editingView() && !m_xAlterView.is() )
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
else
aReturn = OJoinController::GetState( _nId );
break;
@@ -538,10 +538,10 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = m_bGraphicalDesign;
break;
case ID_BROWSER_QUERY_EXECUTE:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case SID_DB_QUERY_PREVIEW:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getContainer() && getContainer()->getPreviewFrame().is();
break;
#if OSL_DEBUG_LEVEL > 1
@@ -553,7 +553,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
case ID_BROWSER_ADDTABLE:
if ( !m_bGraphicalDesign )
{
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
break;
}
// run through
@@ -960,7 +960,7 @@ void OQueryController::impl_initialize()
bForceInitialDesign = true;
}
- if ( !ensureConnected( sal_False ) )
+ if ( !ensureConnected( false ) )
{ // we have no connection so what else should we do
m_bGraphicalDesign = sal_False;
if ( editingView() )
@@ -1112,7 +1112,7 @@ void OQueryController::setQueryComposer()
}
}
-sal_Bool OQueryController::Construct(Window* pParent)
+bool OQueryController::Construct(Window* pParent)
{
// TODO: we have to check if we should create the text view or the design view
@@ -1177,7 +1177,7 @@ void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(Run
OJoinController::disposing(Source);
}
-void OQueryController::reconnect(sal_Bool _bUI)
+void OQueryController::reconnect(bool _bUI)
{
deleteIterator();
::comphelper::disposeComponent(m_xComposer);
@@ -1245,7 +1245,7 @@ void OQueryController::execute_QueryPropDlg()
m_bDistinct = aQueryPropDlg.getDistinct();
m_nLimit = aQueryPropDlg.getLimit();
InvalidateFeature( SID_QUERY_DISTINCT_VALUES );
- InvalidateFeature( SID_QUERY_LIMIT, 0, sal_True );
+ InvalidateFeature( SID_QUERY_LIMIT, 0, true );
}
}
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 3b3b5f564d44..22a6b75dccf5 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -199,7 +199,7 @@ void ORelationController::impl_initialize()
if( !getSdbMetaData().supportsRelations() )
{// check if this database supports relations
- setEditable(sal_False);
+ setEditable(false);
m_bRelationsPossible = sal_False;
{
OUString sTitle(ModuleRes(STR_RELATIONDESIGN));
@@ -242,11 +242,11 @@ OUString ORelationController::getPrivateTitle( ) const
return ::dbaui::getStrippedDatabaseName(getDataSource(),sName);
}
-sal_Bool ORelationController::Construct(Window* pParent)
+bool ORelationController::Construct(Window* pParent)
{
setView( * new ORelationDesignView( pParent, *this, getORB() ) );
OJoinController::Construct(pParent);
- return sal_True;
+ return true;
}
short ORelationController::saveModified()
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 8516fb92aa39..0bc7256c0921 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -186,7 +186,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const
switch (_nId)
{
case ID_BROWSER_CLOSE:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case ID_BROWSER_EDITDOC:
aReturn.bChecked = isEditable();
@@ -278,7 +278,7 @@ void OTableController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
{
if (!isConnected())
- reconnect(sal_True); // ask the user for a new connection
+ reconnect(true); // ask the user for a new connection
Reference<XTablesSupplier> xTablesSup(getConnection(),UNO_QUERY);
if (!xTablesSup.is())
@@ -537,11 +537,11 @@ void OTableController::impl_initialize()
}
}
-sal_Bool OTableController::Construct(Window* pParent)
+bool OTableController::Construct(Window* pParent)
{
setView( * new OTableDesignView( pParent, getORB(), *this ) );
OTableController_BASE::Construct(pParent);
- return sal_True;
+ return true;
}
sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException, std::exception )
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx
index 7d816728d8cb..7b76dee98577 100644
--- a/include/dbaccess/IController.hxx
+++ b/include/dbaccess/IController.hxx
@@ -73,7 +73,7 @@ namespace dbaui
@return
<TRUE/> if the command is allowed, otherwise <FALSE/>.
*/
- virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0;
+ virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0;
/** checks if the given Command is enabled
@param _rCompleteCommandURL
@@ -82,7 +82,7 @@ namespace dbaui
@return
<TRUE/> if the command is allowed, otherwise <FALSE/>.
*/
- virtual sal_Bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const = 0;
+ virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const = 0;
/** registers a command URL, giving it a unique name
@@ -108,7 +108,7 @@ namespace dbaui
@return
<TRUE/> if read only, otherwise <FALSE/>
*/
- virtual sal_Bool isDataSourceReadOnly() const = 0;
+ virtual bool isDataSourceReadOnly() const = 0;
/** provides access to the model of the controller
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx
index fe9087030431..2452b8ad9a09 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -73,19 +73,19 @@ namespace dbaui
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const SAL_OVERRIDE;
- sal_Bool impl_isModified() const;
+ bool impl_isModified() const;
virtual void impl_onModifyChanged();
public:
- sal_Bool isReadOnly() const;
- sal_Bool isEditable() const;
- void setEditable(sal_Bool _bEditable);
+ bool isReadOnly() const;
+ bool isEditable() const;
+ void setEditable(bool _bEditable);
// asking for connection-related stuff
- sal_Bool isConnected() const;
+ bool isConnected() const;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >
getMetaData( ) const;
@@ -95,7 +95,7 @@ namespace dbaui
OUString getDataSourceName() const;
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >&
getDataSource() const;
- sal_Bool haveDataSource() const;
+ bool haveDataSource() const;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
getDatabaseDocument() const;
@@ -119,7 +119,7 @@ namespace dbaui
/** @return
<TRUE/> when an error was set otherwise <FALSE/>
*/
- sal_Bool hasError() const;
+ bool hasError() const;
/** returns the current error
*/
@@ -167,8 +167,8 @@ namespace dbaui
virtual ~DBSubComponentController();
virtual void disconnect();
- virtual void reconnect( sal_Bool _bUI );
- sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); }
+ virtual void reconnect( bool _bUI );
+ bool ensureConnected( bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); }
/** called when our connection is beeing disposed
<p>The default implementation does a reconnect</p>
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index f6a4952a75da..43b7546094dd 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -124,14 +124,14 @@ namespace dbaui
*/
struct FeatureState
{
- sal_Bool bEnabled;
+ bool bEnabled;
optional< bool > bChecked;
optional< bool > bInvisible;
::com::sun::star::uno::Any aValue;
optional< OUString > sTitle;
- FeatureState() : bEnabled(sal_False) { }
+ FeatureState() : bEnabled(false) { }
};
@@ -166,7 +166,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >
xListener;
sal_Int32 nId;
- sal_Bool bForceBroadcast;
+ bool bForceBroadcast;
};
@@ -249,11 +249,11 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > m_xDatabaseContext;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > m_xTitleHelper;
- sal_Bool m_bPreview;
- sal_Bool m_bReadOnly;
+ bool m_bPreview;
+ bool m_bReadOnly;
- sal_Bool m_bCurrentlyModified : 1;
- sal_Bool m_bExternalTitle : 1;
+ bool m_bCurrentlyModified : 1;
+ bool m_bExternalTitle : 1;
@@ -332,7 +332,7 @@ namespace dbaui
@param _nId
The ID of the feature.
*/
- sal_Bool isFeatureSupported( sal_Int32 _nId );
+ bool isFeatureSupported( sal_Int32 _nId );
// gets the URL which the given id is assigned to
::com::sun::star::util::URL getURLForId(sal_Int32 _nId) const;
@@ -395,10 +395,10 @@ namespace dbaui
void InvalidateAll_Impl();
void InvalidateFeature_Impl();
- void ImplInvalidateFeature( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _xListener, sal_Bool _bForceBroadcast );
+ void ImplInvalidateFeature( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _xListener, bool _bForceBroadcast );
- sal_Bool ImplInvalidateTBItem(sal_uInt16 nId, const FeatureState& rState);
- void ImplBroadcastFeatureState(const OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, sal_Bool _bIgnoreCache);
+ bool ImplInvalidateTBItem(sal_uInt16 nId, const FeatureState& rState);
+ void ImplBroadcastFeatureState(const OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, bool _bIgnoreCache);
// link methods
DECL_LINK(OnAsyncInvalidateAll, void*);
@@ -414,17 +414,17 @@ namespace dbaui
// if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL
// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state
- virtual void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False);
+ virtual void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false);
// if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used.
// if there is a toolbar slot with the given id it is updated (the new state is determined via GetState)
// if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state
- virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False);
+ virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false);
/** InvalidateAll invalidates all features currently known
*/
virtual void InvalidateAll();
// late construction
- virtual sal_Bool Construct(Window* pParent);
+ virtual bool Construct(Window* pParent);
/** get the layout manager
@param _xFrame
@@ -439,16 +439,16 @@ namespace dbaui
virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
- virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE;
- virtual sal_Bool isCommandEnabled(const OUString& _rCompleteCommandURL) const SAL_OVERRIDE;
+ virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE;
+ virtual bool isCommandEnabled(const OUString& _rCompleteCommandURL) const SAL_OVERRIDE;
virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) SAL_OVERRIDE;
virtual void notifyHiContrastChanged() SAL_OVERRIDE;
- virtual sal_Bool isDataSourceReadOnly() const SAL_OVERRIDE;
+ virtual bool isDataSourceReadOnly() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > getXController() throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE;
// misc
- virtual sal_Bool isCommandChecked(sal_uInt16 _nCommandId) const;
+ virtual bool isCommandChecked(sal_uInt16 _nCommandId) const;
// ::com::sun::star::lang::XEventListener
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index fc1c75951f76..7a3110304fa2 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -352,7 +352,7 @@ namespace rptui
sal_Bool isFormatCommandEnabled(sal_uInt16 _nCommand
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const;
- virtual sal_Bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(Window* pParent) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 0c4f878e369e..66bac4b8997d 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -398,7 +398,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
{
FeatureState aReturn;
// (disabled automatically)
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
// check this first
if ( !getView() )
return aReturn;
@@ -549,11 +549,11 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = getDesignView()->GetMode() == RPTUI_INSERT;
break;
case SID_TERMINATE_INPLACEACTIVATION:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case SID_SELECT_ALL_EDITS:
case SID_SELECT_ALL_LABELS:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case SID_RPT_NEW_FUNCTION:
aReturn.bEnabled = isEditable();
@@ -566,7 +566,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
break;
case SID_SELECT:
case SID_SELECT_REPORT:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
break;
case SID_EXECUTE_REPORT:
aReturn.bEnabled = isConnected() && m_xReportDefinition.is();
@@ -601,7 +601,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
aReturn.bChecked = m_bShowRuler;
break;
case SID_OBJECT_SELECT:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = getDesignView()->GetMode() == RPTUI_SELECT;
break;
case SID_INSERT_DIAGRAM:
@@ -770,15 +770,15 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
aReturn.bChecked = getDesignView() && getDesignView()->isAddFieldVisible();
break;
case SID_SHOW_PROPERTYBROWSER:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = m_bShowProperties;
break;
case SID_PROPERTYBROWSER_LAST_PAGE:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.aValue <<= m_sLastActivePage;
break;
case SID_SPLIT_POSITION:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.aValue <<= getSplitPos();
break;
case SID_SAVEDOC:
@@ -814,11 +814,11 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
{
}
else
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
}
break;
case SID_SORTINGANDGROUPING:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
aReturn.bChecked = m_pGroupsFloater && m_pGroupsFloater->IsVisible();
break;
case SID_ATTR_CHAR_WEIGHT:
@@ -928,10 +928,10 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = m_xReportDefinition.is();
break;
case SID_PRINTPREVIEW:
- aReturn.bEnabled = sal_False;
+ aReturn.bEnabled = false;
break;
case SID_ATTR_ZOOM:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
{
SvxZoomItem aZoom(m_eZoomType,m_nZoomValue);
aZoom.SetValueSet(SVX_ZOOM_ENABLE_50|SVX_ZOOM_ENABLE_75|SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_200);
@@ -939,7 +939,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
}
break;
case SID_ATTR_ZOOMSLIDER:
- aReturn.bEnabled = sal_True;
+ aReturn.bEnabled = true;
{
SvxZoomSliderItem aZoomSlider(m_nZoomValue,20,400);
aZoomSlider.AddSnappingPoint(50);
@@ -1788,7 +1788,7 @@ void OReportController::doOpenHelpAgent()
}
}
-sal_Bool OReportController::Construct(Window* pParent)
+bool OReportController::Construct(Window* pParent)
{
ODesignView* pMyOwnView = new ODesignView( pParent, m_xContext, *this );
StartListening( *pMyOwnView );
@@ -1802,7 +1802,7 @@ sal_Bool OReportController::Construct(Window* pParent)
m_pClipbordNotifier->AddRemoveListener( getView(), true );
OReportController_BASE::Construct(pParent);
- return sal_True;
+ return true;
}
sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException, std::exception )
@@ -4110,7 +4110,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui:
}
catch(const beans::UnknownPropertyException&)
{
- _rState.bEnabled = sal_False;
+ _rState.bEnabled = false;
}
}
if ( aIter == aSelection.end() )
@@ -4124,8 +4124,8 @@ void OReportController::impl_zoom_nothrow()
Fraction aZoom(m_nZoomValue,100);
setZoomFactor( aZoom,*getDesignView() );
getDesignView()->zoom(aZoom);
- InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(),sal_True);
- InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(),sal_True);
+ InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(), true);
+ InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(), true);
}
sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat) const