mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace map to sal_Bool with map to bool

Browse Source 
(Though this looks like it wants to use a set instead of a map, anyway.)

Change-Id: I755581d3915dca902e7b96efea16d4d29cb0158a
This commit is contained in:
Stephan Bergmann
2016-04-20 17:08:13 +02:00
parent fde48126df
commit 40d6b81b9e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbaccess/source/ui/tabledesign/TableController.cxx
View File

@@ -989,7 +989,7 @@ void OTableController::alterColumns()
// contains all columns names which are already handled those which are not in the list will be deleted // contains all columns names which are already handled those which are not in the list will be deleted
Reference< XDatabaseMetaData> xMetaData = getMetaData( ); Reference< XDatabaseMetaData> xMetaData = getMetaData( );
::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers()); ::std::map< OUString,bool,::comphelper::UStringMixLess> aColumns(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
// first look for columns where something other than the name changed // first look for columns where something other than the name changed
@@ -1002,14 +1002,14 @@ void OTableController::alterColumns()
continue; continue;
if ( (*aIter)->IsReadOnly() ) if ( (*aIter)->IsReadOnly() )
{ {
aColumns[pField->GetName()] = sal_True; aColumns[pField->GetName()] = true;
continue; continue;
} }
Reference<XPropertySet> xColumn; Reference<XPropertySet> xColumn;
if ( xColumns->hasByName(pField->GetName()) ) if ( xColumns->hasByName(pField->GetName()) )
{ {
aColumns[pField->GetName()] = sal_True; aColumns[pField->GetName()] = true;
xColumns->getByName(pField->GetName()) >>= xColumn; xColumns->getByName(pField->GetName()) >>= xColumn;
OSL_ENSURE(xColumn.is(),"Column is null!"); OSL_ENSURE(xColumn.is(),"Column is null!");
@@ -1102,7 +1102,7 @@ void OTableController::alterColumns()
xAlter->alterColumnByIndex(nPos,xNewColumn); xAlter->alterColumnByIndex(nPos,xNewColumn);
if(xColumns->hasByName(pField->GetName())) if(xColumns->hasByName(pField->GetName()))
{ // ask for the append by name { // ask for the append by name
aColumns[pField->GetName()] = sal_True; aColumns[pField->GetName()] = true;
xColumns->getByName(pField->GetName()) >>= xColumn; xColumns->getByName(pField->GetName()) >>= xColumn;
if(xColumn.is()) if(xColumn.is())
pField->copyColumnSettingsTo(xColumn); pField->copyColumnSettingsTo(xColumn);
@@ -1125,8 +1125,8 @@ void OTableController::alterColumns()
Reference<XPropertySet> xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW); Reference<XPropertySet> xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW);
OUString sName; OUString sName;
xNewColumn->getPropertyValue(PROPERTY_NAME) >>= sName; xNewColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
aColumns[sName] = sal_True; aColumns[sName] = true;
aColumns[pField->GetName()] = sal_True; aColumns[pField->GetName()] = true;
continue; continue;
} }
} }
@@ -1149,7 +1149,7 @@ void OTableController::alterColumns()
continue; continue;
if ( (*aIter)->IsReadOnly() ) if ( (*aIter)->IsReadOnly() )
{ {
aColumns[pField->GetName()] = sal_True; aColumns[pField->GetName()] = true;
continue; continue;
} }
@@ -1238,7 +1238,7 @@ void OTableController::alterColumns()
xAppend->appendByDescriptor(xColumn); xAppend->appendByDescriptor(xColumn);
if(xColumns->hasByName(pField->GetName())) if(xColumns->hasByName(pField->GetName()))
{ // ask for the append by name { // ask for the append by name
aColumns[pField->GetName()] = sal_True; aColumns[pField->GetName()] = true;
xColumns->getByName(pField->GetName()) >>= xColumn; xColumns->getByName(pField->GetName()) >>= xColumn;
if(xColumn.is()) if(xColumn.is())
pField->copyColumnSettingsTo(xColumn); pField->copyColumnSettingsTo(xColumn);