summaryrefslogtreecommitdiff
path: root/framework/source/uiconfiguration
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/source/uiconfiguration
parent99e7071f2e35d87641274552d708bd521f50b0f6 (diff)
bool improvements
Change-Id: I754b47013d8f1aa3ecf6204fbe926a438887639d
Diffstat (limited to 'framework/source/uiconfiguration')
-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
4 files changed, 26 insertions, 26 deletions
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& )