summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 20:02:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:27 +0100
commit2462159d7b49f0091727ea13ea733d1a8c436bf7 (patch)
tree53fbdd7e34241ed32340a197045c99afc3aeb4d6 /framework
parent99e7071f2e35d87641274552d708bd521f50b0f6 (diff)
bool improvements
Change-Id: I754b47013d8f1aa3ecf6204fbe926a438887639d
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/uielement/headermenucontroller.hxx2
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx4
-rw-r--r--framework/source/fwe/helper/undomanagerhelper.cxx2
-rw-r--r--framework/source/fwi/helper/mischelper.cxx2
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx2
-rw-r--r--framework/source/helper/uiconfigelementwrapperbase.cxx18
-rw-r--r--framework/source/helper/vclstatusindicator.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx60
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx22
-rw-r--r--framework/source/layoutmanager/uielement.cxx8
-rw-r--r--framework/source/loadenv/loadenv.cxx2
-rw-r--r--framework/source/services/substitutepathvars.cxx10
-rw-r--r--framework/source/tabwin/tabwindow.cxx6
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx8
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx14
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx16
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx14
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx2
-rw-r--r--framework/source/uielement/menubarwrapper.cxx2
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx2
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx2
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx8
-rw-r--r--framework/source/uielement/uicommanddescription.cxx2
24 files changed, 106 insertions, 106 deletions
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 4bb93c880fd2..95b2cefef918 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -46,7 +46,7 @@ namespace framework
using svt::PopupMenuControllerBase::disposing;
public:
- HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, bool _bFooter = sal_False );
+ HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, bool _bFooter = false );
virtual ~HeaderMenuController();
// XServiceInfo
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 753f40c5f923..882937298052 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -648,12 +648,12 @@ OUString TitleHelper::impl_convertURL2Title(const OUString& sURL)
if (aURL.HasMark())
aURL = INetURLObject(aURL.GetURLNoMark());
- sTitle = aURL.getName(INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::DECODE_WITH_CHARSET);
+ sTitle = aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET);
}
else
{
if (aURL.hasExtension(INetURLObject::LAST_SEGMENT))
- sTitle = aURL.getName(INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::DECODE_WITH_CHARSET);
+ sTitle = aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET);
if ( sTitle.isEmpty() )
sTitle = aURL.GetHostPort(INetURLObject::DECODE_WITH_CHARSET);
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 72e0f9b66a31..793b6bd04f9e 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -138,7 +138,7 @@ namespace framework
//------------------------------------------------------------------------------------------------------------------
bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const
{
- return sal_False;
+ return false;
}
//==================================================================================================================
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 9970c52b99e2..d243795e4e20 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -57,7 +57,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
}
catch (const uno::Exception &)
{
- DBG_ASSERT( 0, "failed to get language guessing component" );
+ DBG_ASSERT( false, "failed to get language guessing component" );
}
}
return m_xLanguageGuesser;
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 61dc16df16df..1188c2062a11 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -398,7 +398,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
if ( pWindow )
{
bool bForceFrontAndFocus(officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext));
- pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
+ pWindow->Show(true, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
}
}
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 4fff2ac9050b..df0ddf867276 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -64,12 +64,12 @@ UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType )
, ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() )
, ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
, m_nType ( nType )
- , m_bPersistent ( sal_True )
- , m_bInitialized ( sal_False )
- , m_bConfigListener ( sal_False )
- , m_bConfigListening ( sal_False )
- , m_bDisposed ( sal_False )
- , m_bNoClose ( sal_False )
+ , m_bPersistent ( true )
+ , m_bInitialized ( false )
+ , m_bConfigListener ( false )
+ , m_bConfigListening ( false )
+ , m_bDisposed ( false )
+ , m_bNoClose ( false )
, m_aListenerContainer ( m_aLock.getShareableOslMutex() )
{
}
@@ -142,7 +142,7 @@ throw ( Exception, RuntimeException )
}
}
- m_bInitialized = sal_True;
+ m_bInitialized = true;
}
}
@@ -272,7 +272,7 @@ void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sa
if ( xUIConfig.is() )
{
xUIConfig->removeConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
- m_bConfigListening = sal_False;
+ m_bConfigListening = false;
}
}
catch ( const Exception& )
@@ -290,7 +290,7 @@ void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sa
if ( xUIConfig.is() )
{
xUIConfig->addConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
- m_bConfigListening = sal_True;
+ m_bConfigListening = true;
}
}
catch ( const Exception& )
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 077faf2d68e3..ad07ad8a2b7e 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -121,7 +121,7 @@ void SAL_CALL VCLStatusIndicator::end()
if (m_pStatusBar)
{
m_pStatusBar->EndProgressMode();
- m_pStatusBar->Show(sal_False);
+ m_pStatusBar->Show(false);
delete m_pStatusBar;
m_pStatusBar = 0;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index bca54870731f..7dc9bb302281 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -383,7 +383,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
m_xModuleCfgMgr = xModCfgMgr;
m_xDocCfgMgr = xDokCfgMgr;
m_xPersistentWindowState = xPersistentWindowState;
- m_aStatusBarElement.m_bStateRead = sal_False; // reset state to read data again!
+ m_aStatusBarElement.m_bStateRead = false; // reset state to read data again!
aWriteLock.unlock();
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -618,7 +618,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
// set flag to determine that we triggered the notification
- m_bStoreWindowState = sal_True;
+ m_bStoreWindowState = true;
aWriteLock.unlock();
sal_Bool bPersistent( sal_False );
@@ -685,7 +685,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
// Reset flag
aWriteLock.lock();
- m_bStoreWindowState = sal_False;
+ m_bStoreWindowState = false;
aWriteLock.unlock();
}
@@ -847,7 +847,7 @@ void LayoutManager::implts_readStatusBarState( const OUString& rStatusBarName )
{
// Read persistent data for status bar if not yet read!
if ( implts_readWindowStateData( rStatusBarName, m_aStatusBarElement ))
- m_aStatusBarElement.m_bStateRead = sal_True;
+ m_aStatusBarElement.m_bStateRead = true;
}
}
@@ -999,7 +999,7 @@ sal_Bool LayoutManager::implts_showProgressBar()
xProgressBar = Reference< XUIElement >( m_aProgressBarElement.m_xUIElement, UNO_QUERY );
sal_Bool bVisible( m_bVisible );
- m_aProgressBarElement.m_bVisible = sal_True;
+ m_aProgressBarElement.m_bVisible = true;
if ( bVisible )
{
if ( xStatusBar.is() && !m_aStatusBarElement.m_bMasterHide )
@@ -1054,7 +1054,7 @@ sal_Bool LayoutManager::implts_hideProgressBar()
xStatusBar = Reference< awt::XWindow >( xStatusBarElement->getRealInterface(), UNO_QUERY );
bInternalStatusBar = xStatusBar != xWindow;
}
- m_aProgressBarElement.m_bVisible = sal_False;
+ m_aProgressBarElement.m_bVisible = false;
implts_readStatusBarState( STATUS_BAR_ALIAS );
bHideStatusBar = !m_aStatusBarElement.m_bVisible;
aWriteLock.unlock();
@@ -1078,7 +1078,7 @@ sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState )
WriteGuard aWriteLock( m_aLock );
Reference< ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement;
if ( bStoreState )
- m_aStatusBarElement.m_bVisible = sal_True;
+ m_aStatusBarElement.m_bVisible = true;
aWriteLock.unlock();
if ( xStatusBar.is() )
@@ -1104,7 +1104,7 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState )
WriteGuard aWriteLock( m_aLock );
Reference< ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement;
if ( bStoreState )
- m_aStatusBarElement.m_bVisible = sal_False;
+ m_aStatusBarElement.m_bVisible = false;
aWriteLock.unlock();
if ( xStatusBar.is() )
@@ -1150,7 +1150,7 @@ throw (uno::RuntimeException)
if ( m_xInplaceMenuBar.is() )
m_xInplaceMenuBar->dispose();
m_xInplaceMenuBar.clear();
- m_bInplaceMenuSet = sal_False;
+ m_bInplaceMenuSet = false;
if ( m_xFrame.is() && m_xContainerWindow.is() )
{
@@ -1165,7 +1165,7 @@ throw (uno::RuntimeException)
if ( pSysWindow )
pSysWindow->SetMenuBar( pMenuBar );
- m_bInplaceMenuSet = sal_True;
+ m_bInplaceMenuSet = true;
m_xInplaceMenuBar = Reference< XComponent >( (OWeakObject *)m_pInplaceMenuBar, UNO_QUERY );
}
@@ -1181,7 +1181,7 @@ throw (uno::RuntimeException)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
WriteGuard aWriteLock( m_aLock );
- m_bInplaceMenuSet = sal_False;
+ m_bInplaceMenuSet = false;
if ( m_xContainerWindow.is() )
{
@@ -1504,7 +1504,7 @@ throw (RuntimeException)
pSysWindow->SetMenuBar( pMenuBar );
pMenuBar->SetDisplayable( m_bMenuVisible );
if ( m_bMenuVisible )
- bNotify = sal_True;
+ bNotify = true;
implts_updateMenuBarClose();
}
}
@@ -1518,14 +1518,14 @@ throw (RuntimeException)
( implts_isFrameOrWindowTop(xFrame) || implts_isEmbeddedLayoutManager() ))
{
implts_createStatusBar( aName );
- bNotify = sal_True;
+ bNotify = true;
}
else if ( aElementType.equalsIgnoreAsciiCase("progressbar") &&
aElementName.equalsIgnoreAsciiCase("progressbar") &&
implts_isFrameOrWindowTop(xFrame) )
{
implts_createProgressBar();
- bNotify = sal_True;
+ bNotify = true;
}
else if ( aElementType.equalsIgnoreAsciiCase("dockingwindow"))
{
@@ -1561,9 +1561,9 @@ throw (RuntimeException)
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
WriteGuard aWriteLock( m_aLock );
- bool bMustBeLayouted( sal_False );
- bool bMustBeDestroyed( sal_False );
- bool bNotify( sal_False );
+ bool bMustBeLayouted( false );
+ bool bMustBeDestroyed( false );
+ bool bNotify( false );
OUString aElementType;
OUString aElementName;
@@ -1595,7 +1595,7 @@ throw (RuntimeException)
aWriteLock.unlock();
implts_createProgressBar();
bMustBeLayouted = true;
- bNotify = sal_True;
+ bNotify = true;
}
else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL )
{
@@ -1667,7 +1667,7 @@ throw (uno::RuntimeException)
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow )
{
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
bResult = true;
bNotify = true;
}
@@ -1780,7 +1780,7 @@ throw (RuntimeException)
aElementName.equalsIgnoreAsciiCase("menubar") )
{
WriteGuard aWriteLock( m_aLock );
- m_bMenuVisible = sal_True;
+ m_bMenuVisible = true;
aWriteLock.unlock();
bResult = implts_resetMenuBar();
@@ -1866,7 +1866,7 @@ throw (RuntimeException)
if ( m_xContainerWindow.is() )
{
- m_bMenuVisible = sal_False;
+ m_bMenuVisible = false;
SolarMutexGuard aGuard;
SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
@@ -1890,8 +1890,8 @@ throw (RuntimeException)
implts_hideStatusBar( sal_True ))
{
implts_writeWindowStateData( STATUS_BAR_ALIAS, m_aStatusBarElement );
- bMustLayout = sal_True;
- bNotify = sal_True;
+ bMustLayout = true;
+ bNotify = true;
}
}
else if ( aElementType.equalsIgnoreAsciiCase("progressbar") &&
@@ -2340,7 +2340,7 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_
bLayouted = sal_True;
WriteGuard aWriteGuard( m_aLock );
- m_bDoLayout = sal_True;
+ m_bDoLayout = true;
aWriteGuard.unlock();
awt::Rectangle aDockSpace( implts_calcDockingAreaSizes() );
@@ -2388,7 +2388,7 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_
{
aWriteGuard.lock();
m_aDockingArea = aBorderSpace;
- m_bMustDoLayout = sal_False;
+ m_bMustDoLayout = false;
aWriteGuard.unlock();
}
}
@@ -2423,7 +2423,7 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_
xDockingAreaAcceptor->setDockingAreaSpace( aBorderSpace );
aWriteGuard.lock();
- m_bDoLayout = sal_False;
+ m_bDoLayout = false;
aWriteGuard.unlock();
}
}
@@ -2691,7 +2691,7 @@ throw( uno::RuntimeException )
// We have to call our resize handler at least once synchronously, as some
// application modules need this. So we have to check if this is the first
// call after the async layout time expired.
- m_bMustDoLayout = sal_True;
+ m_bMustDoLayout = true;
if ( !m_aAsyncLayoutTimer.IsActive() )
{
const Link& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl();
@@ -2798,8 +2798,8 @@ throw ( RuntimeException )
SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_ATTACHED|REATTACHED)" );
WriteGuard aWriteLock( m_aLock );
- m_bComponentAttached = sal_True;
- m_bMustDoLayout = sal_True;
+ m_bComponentAttached = true;
+ m_bMustDoLayout = true;
aWriteLock.unlock();
implts_reset( sal_True );
@@ -2821,7 +2821,7 @@ throw ( RuntimeException )
SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_DETACHING)" );
WriteGuard aWriteLock( m_aLock );
- m_bComponentAttached = sal_False;
+ m_bComponentAttached = false;
aWriteLock.unlock();
implts_reset( sal_False );
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 4ffab50fa625..35e903c42a3d 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -584,7 +584,7 @@ bool ToolbarLayoutManager::showToolbar( const OUString& rResourceURL )
if ( !aUIElement.m_bFloating )
implts_setLayoutDirty();
else
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
aUIElement.m_bVisible = true;
implts_writeWindowStateData( aUIElement );
@@ -604,7 +604,7 @@ bool ToolbarLayoutManager::hideToolbar( const OUString& rResourceURL )
Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
if ( pWindow )
{
- pWindow->Show( sal_False );
+ pWindow->Show( false );
if ( !aUIElement.m_bFloating )
implts_setLayoutDirty();
@@ -664,10 +664,10 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible )
if ( bVisible )
{
if ( pIter->m_bVisible && !pIter->m_bMasterHide )
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
else
- pWindow->Show( sal_False );
+ pWindow->Show( false );
}
}
}
@@ -1511,7 +1511,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
if ( bShowElement && pWindow )
{
SolarMutexGuard aGuard;
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
}
else
@@ -1590,7 +1590,7 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
m_bStoreWindowState = true; // set flag to determine that we triggered the notification
aWriteLock.unlock();
- bool bPersistent( sal_False );
+ bool bPersistent( false );
uno::Reference< beans::XPropertySet > xPropSet( rElementData.m_xUIElement, uno::UNO_QUERY );
if ( xPropSet.is() )
{
@@ -1847,7 +1847,7 @@ void ToolbarLayoutManager::implts_sortUIElements()
// We have to reset our temporary flags.
UIElementVector::iterator pIter;
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
- pIter->m_bUserActive = sal_False;
+ pIter->m_bUserActive = false;
aWriteLock.unlock();
}
@@ -2583,7 +2583,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
if ( aWinRect.X < nCurrPos )
aWinRect.X = nCurrPos;
pWindow->SetPosSizePixel( ::Point( aWinRect.X, nOffset ), ::Size( aWinRect.Width, rRowColumnWindowData.nStaticSize ));
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
nCurrPos += ( aWinRect.X - nCurrPos ) + aWinRect.Width;
}
else
@@ -2591,7 +2591,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
if ( aWinRect.Y < nCurrPos )
aWinRect.Y = nCurrPos;
pWindow->SetPosSizePixel( ::Point( nOffset, aWinRect.Y ), ::Size( rRowColumnWindowData.nStaticSize, aWinRect.Height ));
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
nCurrPos += ( aWinRect.Y - nCurrPos ) + aWinRect.Height;
}
}
@@ -3613,7 +3613,7 @@ throw (uno::RuntimeException)
implts_sortUIElements();
aWriteLock.lock();
- m_bDockingInProgress = sal_False;
+ m_bDockingInProgress = false;
m_bLayoutDirty = !bStartDockFloated || !bFloating;
bool bNotify = m_bLayoutDirty;
aWriteLock.unlock();
@@ -3817,7 +3817,7 @@ throw (uno::RuntimeException)
// context sensitive toolbar: only destroy toolbar and store state.
// non context sensitive toolbar: make it invisible, store state and destroy it.
if ( !pIter->m_bContextSensitive )
- pIter->m_bVisible = sal_False;
+ pIter->m_bVisible = false;
aUIElement = *pIter;
break;
diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx
index 2a83a4e23ca6..1dd14ae15517 100644
--- a/framework/source/layoutmanager/uielement.cxx
+++ b/framework/source/layoutmanager/uielement.cxx
@@ -69,9 +69,9 @@ namespace framework
if ( bEqual )
{
if ( m_bUserActive && !aUIElement.m_bUserActive )
- return sal_True;
+ return true;
else
- return sal_False;
+ return false;
}
else
return ( m_aDockedData.m_aPos.X <= aUIElement.m_aDockedData.m_aPos.X );
@@ -87,9 +87,9 @@ namespace framework
if ( bEqual )
{
if ( m_bUserActive && !aUIElement.m_bUserActive )
- return sal_True;
+ return true;
else
- return sal_False;
+ return false;
}
else
return ( m_aDockedData.m_aPos.Y <= aUIElement.m_aDockedData.m_aPos.Y );
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index a9b2dcbfed43..c43748cd975f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1740,7 +1740,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) )
pWindow->ToTop();
else
- pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 );
+ pWindow->Show(true, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 );
}
}
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 7839c1ba6b57..a7a44f05e8fe 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -259,7 +259,7 @@ const OUString& SubstitutePathVariables_Impl::GetYPDomainName()
if ( !m_bYPDomainRetrieved )
{
m_aYPDomain = NetworkDomain::GetYPDomainName().toAsciiLowerCase();
- m_bYPDomainRetrieved = sal_True;
+ m_bYPDomainRetrieved = true;
}
return m_aYPDomain;
@@ -284,7 +284,7 @@ const OUString& SubstitutePathVariables_Impl::GetDNSDomainName()
else
m_aDNSDomain = "";
- m_bDNSDomainRetrieved = sal_True;
+ m_bDNSDomainRetrieved = true;
}
return m_aDNSDomain;
@@ -295,7 +295,7 @@ const OUString& SubstitutePathVariables_Impl::GetNTDomainName()
if ( !m_bNTDomainRetrieved )
{
m_aNTDomain = NetworkDomain::GetNTDomainName().toAsciiLowerCase();
- m_bNTDomainRetrieved = sal_True;
+ m_bNTDomainRetrieved = true;
}
return m_aNTDomain;
@@ -314,7 +314,7 @@ const OUString& SubstitutePathVariables_Impl::GetHostName()
bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule )
{
- bool bResult = sal_False;
+ bool bResult = false;
if ( !aRuleSet.empty() )
{
@@ -837,7 +837,7 @@ throw ( NoSuchElementException, RuntimeException )
sal_Int32 nEndPosition = aWorkText.indexOf( ')', nPosition );
if ( nEndPosition != -1 )
nLength = nEndPosition - nPosition + 1;
- bVarNotSubstituted = sal_False;
+ bVarNotSubstituted = false;
++nDepth;
}
}
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 7b6d5881bcef..c03e0b1d8357 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -401,16 +401,16 @@ throw (css::uno::Exception, css::uno::RuntimeException)
SolarMutexGuard aGuard;
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if( pWindow )
- pWindow->Show( sal_True );
+ pWindow->Show( true );
pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
if ( pWindow )
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
pWindow = VCLUnoHelper::GetWindow( xTabControl );
if ( pWindow )
{
- pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
TabControl* pTabControl = (TabControl *)pWindow;
pTabControl->SetActivatePageHdl( LINK( this, TabWindow, Activate ));
pTabControl->SetDeactivatePageHdl( LINK( this, TabWindow, Deactivate ));
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 5a36fef0a60f..a719fc702031 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -810,7 +810,7 @@ throw (::com::sun::star::uno::RuntimeException)
m_bUserImageListModified[i] = true;
}
- m_bModified = sal_True;
+ m_bModified = true;
}
Sequence< OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType )
@@ -991,7 +991,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
if (( pInsertedImages != 0 ) || ( pReplacedImages != 0 ))
{
- m_bModified = sal_True;
+ m_bModified = true;
m_bUserImageListModified[nIndex] = true;
}
}
@@ -1095,7 +1095,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
if (( pReplacedImages != 0 ) || ( pRemovedImages != 0 ))
{
- m_bModified = sal_True;
+ m_bModified = true;
m_bUserImageListModified[nIndex] = true;
}
}
@@ -1318,7 +1318,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
m_xUserRootCommit->commit();
}
- m_bModified = sal_False;
+ m_bModified = false;
}
}
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 4279482c6e56..028ab82acd09 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -557,7 +557,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag
if ( rElement.bDefault )
{
xStorage->removeElement( rElement.aName );
- rElement.bModified = sal_False; // mark as not modified
+ rElement.bModified = false; // mark as not modified
}
else
{
@@ -612,7 +612,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag
// mark as not modified if we store to our own storage
if ( bResetModifyState )
- rElement.bModified = sal_False;
+ rElement.bModified = false;
}
}
@@ -626,7 +626,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag
// mark UIElementType as not modified if we store to our own storage
if ( bResetModifyState )
- rElementType.bModified = sal_False;
+ rElementType.bModified = false;
}
// This is only allowed to be called on the LAYER_USER_DEFINED!
@@ -776,7 +776,7 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData(
++pIter;
}
- rUserElementType.bModified = sal_False;
+ rUserElementType.bModified = false;
}
void ModuleUIConfigurationManager::impl_Initialize()
@@ -1056,7 +1056,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno
UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][j];
impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer );
- rUserElementType.bModified = sal_False;
+ rUserElementType.bModified = false;
}
catch ( const Exception& )
{
@@ -1064,7 +1064,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno
}
}
- m_bModified = sal_False;
+ m_bModified = false;
// Unlock mutex before notify our listeners
aGuard.unlock();
@@ -1582,7 +1582,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un
}
}
- m_bModified = sal_False;
+ m_bModified = false;
// Unlock mutex before notify our listeners
aGuard.unlock();
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 29ccd8796137..845233fdab82 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -471,7 +471,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x
if ( rElement.bDefault )
{
xStorage->removeElement( rElement.aName );
- rElement.bModified = sal_False; // mark as not modified
+ rElement.bModified = false; // mark as not modified
}
else
{
@@ -526,7 +526,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x
// mark as not modified if we store to our own storage
if ( bResetModifyState )
- rElement.bModified = sal_False;
+ rElement.bModified = false;
}
}
@@ -540,7 +540,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x
// mark UIElementType as not modified if we store to our own storage
if ( bResetModifyState )
- rElementType.bModified = sal_False;
+ rElementType.bModified = false;
}
void UIConfigurationManager::impl_resetElementTypeData(
@@ -637,7 +637,7 @@ void UIConfigurationManager::impl_reloadElementTypeData(
++pIter;
}
- rDocElementType.bModified = sal_False;
+ rDocElementType.bModified = false;
}
void UIConfigurationManager::impl_Initialize()
@@ -834,10 +834,10 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt
UIElementType& rDocElementType = m_aUIElements[j];
impl_resetElementTypeData( rDocElementType, aRemoveEventNotifyContainer );
- rDocElementType.bModified = sal_False;
+ rDocElementType.bModified = false;
}
- m_bModified = sal_False;
+ m_bModified = false;
// Unlock mutex before notify our listeners
aGuard.unlock();
@@ -1227,7 +1227,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
// We store the new storage. Be careful it could be an empty reference!
m_xDocConfigStorage = Storage;
- m_bReadOnly = sal_True;
+ m_bReadOnly = true;
Reference< XUIConfigurationStorage > xAccUpdate(m_xAccConfig, UNO_QUERY);
if ( xAccUpdate.is() )
@@ -1301,7 +1301,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc
}
}
- m_bModified = sal_False;
+ m_bModified = false;
// Unlock mutex before notify our listeners
aGuard.unlock();
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index baca1f567f93..dc3b9aaa7726 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -609,7 +609,7 @@ Any ConfigurationAccess_WindowState::impl_getSequenceFromStruct( const WindowSta
case PROPERTY_DOCKSIZE:
aPropSeq[nIndex].Value = makeAny( rWinStateInfo.aDockSize ); break;
default:
- DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
+ DBG_ASSERT( false, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
}
}
@@ -789,7 +789,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU
break;
default:
- DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
+ DBG_ASSERT( false, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
if ( bAddToSeq )
@@ -861,7 +861,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat
case PROPERTY_CONTEXTACTIVE:
aWindowStateInfo.bContextActive = bValue; break;
default:
- DBG_ASSERT( sal_False, "Unknown boolean property in WindowState found!" );
+ DBG_ASSERT( false, "Unknown boolean property in WindowState found!" );
}
}
}
@@ -972,7 +972,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat
}
default:
- DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
+ DBG_ASSERT( false, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
}
catch( const com::sun::star::container::NoSuchElementException& )
@@ -1072,7 +1072,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn
rWinStateInfo.bContextActive = bValue;
break;
default:
- DBG_ASSERT( sal_False, "Unknown boolean property in WindowState found!" );
+ DBG_ASSERT( false, "Unknown boolean property in WindowState found!" );
}
}
}
@@ -1163,7 +1163,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn
break;
default:
- DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
+ DBG_ASSERT( false, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
break;
@@ -1244,7 +1244,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
case PROPERTY_STYLE:
xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Int32( rWinStateInfo.nStyle )) ); break;
default:
- DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
+ DBG_ASSERT( false, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
}
catch( const Exception& )
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 2c6c533671f2..2c6c04d1612f 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -128,7 +128,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
// Fill toolbar with container contents
pToolBarManager->FillToolbar( m_aConfigData );
pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
- pToolBar->EnableCustomize( sal_True );
+ pToolBar->EnableCustomize( true );
::Size aActSize( pToolBar->GetSizePixel() );
::Size aSize( pToolBar->CalcWindowSizePixel() );
aSize.Width() = aActSize.Width();
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 565be800a318..e822785c5c17 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -109,7 +109,7 @@ void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeExc
m_xConfigData.clear();
m_xMenuBar.clear();
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
// XInitialization
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 230023752f02..98c8df144e03 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -119,7 +119,7 @@ throw (uno::RuntimeException)
pStatusBar->SetProgressValue( sal_uInt16( nValue ));
pStatusBar->SetUpdateMode( sal_True );
}
- pStatusBar->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pStatusBar->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
}
}
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 6e96a968632d..ee451b27723a 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -81,7 +81,7 @@ void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeE
m_xConfigData.clear();
m_xContext.clear();
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
else
throw DisposedException();
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 71d8a84dd23c..dd2b7b88e669 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1736,7 +1736,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
- GetImageFromURL( m_xFrame, aCommandURL, sal_False )
+ GetImageFromURL( m_xFrame, aCommandURL, false )
);
}
else
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 5f518f760009..efd7c8b3dec1 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -109,7 +109,7 @@ void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException )
m_xConfigSource.clear();
m_xConfigData.clear();
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
// XInitialization
@@ -166,7 +166,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
// Fill toolbar with container contents
pToolBarManager->FillToolbar( m_xConfigData );
pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
- pToolBar->EnableCustomize( sal_True );
+ pToolBar->EnableCustomize( true );
::Size aActSize( pToolBar->GetSizePixel() );
::Size aSize( pToolBar->CalcWindowSizePixel() );
aSize.Width() = aActSize.Width();
@@ -177,11 +177,11 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
{
// No settings in our configuration manager. This means we are
// a transient toolbar which has no persistent settings.
- m_bPersistent = sal_False;
+ m_bPersistent = false;
if ( pToolBar && pToolBarManager )
{
pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
- pToolBar->EnableCustomize( sal_True );
+ pToolBar->EnableCustomize( true );
::Size aActSize( pToolBar->GetSizePixel() );
::Size aSize( pToolBar->CalcWindowSizePixel() );
aSize.Width() = aActSize.Width();
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 84a45632688f..fc98617b809e 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -298,7 +298,7 @@ void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo,
rCmdInfo.aLabel = aStr;
aStr = comphelper::string::stripEnd(aStr, '.'); // Remove "..." from string
rCmdInfo.aCommandName = MnemonicGenerator::EraseAllMnemonicChars(aStr);
- rCmdInfo.bCommandNameCreated = sal_True;
+ rCmdInfo.bCommandNameCreated = true;
}
Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aCommandURL )