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

remove some sal_Bool remnants

Browse Source 
Change-Id: I0a9637aca523a73fbdbbd22f9ad735d6d1ba6898
Reviewed-on: https://gerrit.libreoffice.org/48273
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-01-21 18:28:03 +02:00
committed by Noel Grandin
parent 342a56deda
commit 3b666f6819
9 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/source/drivers/file/FResultSet.cxx
View File

@@ -1432,7 +1432,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
const OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); const OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
std::map<OSQLColumns::Vector::iterator,sal_Bool> aSelectIters; std::map<OSQLColumns::Vector::iterator,bool> aSelectIters;
OValueRefVector::Vector::const_iterator aRowIter = _rRow->get().begin()+1; OValueRefVector::Vector::const_iterator aRowIter = _rRow->get().begin()+1;
for (sal_Int32 i=0; // the first column is the bookmark column for (sal_Int32 i=0; // the first column is the bookmark column
aRowIter != _rRow->get().end(); aRowIter != _rRow->get().end();

52
cui/source/options/optsave.cxx
View File

@@ -54,10 +54,9 @@ using namespace comphelper;
struct SvxSaveTabPage_Impl struct SvxSaveTabPage_Impl
{ {
Reference< XNameContainer > xFact; Reference< XNameContainer > xFact;
Sequence< OUString > aFilterArr[APP_COUNT]; std::vector< OUString > aFilterArr[APP_COUNT];
Sequence< sal_Bool > aAlienArr[APP_COUNT]; std::vector< bool > aODFArr[APP_COUNT];
Sequence< sal_Bool > aODFArr[APP_COUNT]; std::vector< OUString > aUIFilterArr[APP_COUNT];
Sequence< OUString > aUIFilterArr[APP_COUNT];
OUString aDefaultArr[APP_COUNT]; OUString aDefaultArr[APP_COUNT];
bool aDefaultReadonlyArr[APP_COUNT]; bool aDefaultReadonlyArr[APP_COUNT];
bool bInitialized; bool bInitialized;
@@ -429,8 +428,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
sCommand = sCommand.replaceFirst("%1", sReplace); sCommand = sCommand.replaceFirst("%1", sReplace);
Reference< XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand); Reference< XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand);
std::vector< OUString > lList; std::vector< OUString > lList;
std::vector< sal_Bool > lAlienList; std::vector<bool> lAlienList;
std::vector< sal_Bool > lODFList; std::vector<bool> lODFList;
while(xList->hasMoreElements()) while(xList->hasMoreElements())
{ {
SequenceAsHashMap aFilter(xList->nextElement()); SequenceAsHashMap aFilter(xList->nextElement());
@@ -443,9 +442,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
lODFList.push_back( isODFFormat( sFilter ) ); lODFList.push_back( isODFFormat( sFilter ) );
} }
} }
pImpl->aFilterArr[nData] = comphelper::containerToSequence(lList); pImpl->aFilterArr[nData] = lList;
pImpl->aAlienArr[nData] = comphelper::containerToSequence(lAlienList); pImpl->aODFArr[nData] = lODFList;
pImpl->aODFArr[nData] = comphelper::containerToSequence(lODFList);
} }
} }
aDocTypeLB->SelectEntryPos(0); aDocTypeLB->SelectEntryPos(0);
@@ -571,36 +569,36 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void )
if(aDocTypeLB == &rBox) if(aDocTypeLB == &rBox)
{ {
aSaveAsLB->Clear(); aSaveAsLB->Clear();
const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray(); auto & rFilters = pImpl->aFilterArr[nData];
if(!pImpl->aUIFilterArr[nData].getLength()) if(!pImpl->aUIFilterArr[nData].size())
{ {
pImpl->aUIFilterArr[nData].realloc(pImpl->aFilterArr[nData].getLength()); pImpl->aUIFilterArr[nData].resize(pImpl->aFilterArr[nData].size());
OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray(); auto & rUIFilters = pImpl->aUIFilterArr[nData];
for(int nFilter = 0; nFilter < pImpl->aFilterArr[nData].getLength(); nFilter++) for(size_t nFilter = 0; nFilter < pImpl->aFilterArr[nData].size(); nFilter++)
{ {
Any aProps = pImpl->xFact->getByName(pFilters[nFilter]); Any aProps = pImpl->xFact->getByName(rFilters[nFilter]);
// get the extension of the filter // get the extension of the filter
OUString extension; OUString extension;
SfxFilterMatcher matcher; SfxFilterMatcher matcher;
std::shared_ptr<const SfxFilter> pFilter = matcher.GetFilter4FilterName(pFilters[nFilter]); std::shared_ptr<const SfxFilter> pFilter = matcher.GetFilter4FilterName(rFilters[nFilter]);
if (pFilter) if (pFilter)
{ {
extension = pFilter->GetWildcard().getGlob().getToken(0, ';'); extension = pFilter->GetWildcard().getGlob().getToken(0, ';');
} }
Sequence<PropertyValue> aProperties; Sequence<PropertyValue> aProperties;
aProps >>= aProperties; aProps >>= aProperties;
pUIFilters[nFilter] = lcl_ExtracUIName(aProperties, extension); rUIFilters[nFilter] = lcl_ExtracUIName(aProperties, extension);
} }
} }
const OUString* pUIFilters = pImpl->aUIFilterArr[nData].getConstArray(); auto const & rUIFilters = pImpl->aUIFilterArr[nData];
OUString sSelect; OUString sSelect;
for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++) for(size_t i = 0; i < pImpl->aUIFilterArr[nData].size(); i++)
{ {
const sal_Int32 nEntryPos = aSaveAsLB->InsertEntry(pUIFilters[i]); const sal_Int32 nEntryPos = aSaveAsLB->InsertEntry(rUIFilters[i]);
if ( pImpl->aODFArr[nData][i] ) if ( pImpl->aODFArr[nData][i] )
aSaveAsLB->SetEntryData( nEntryPos, static_cast<void*>(pImpl.get()) ); aSaveAsLB->SetEntryData( nEntryPos, static_cast<void*>(pImpl.get()) );
if(pFilters[i] == pImpl->aDefaultArr[nData]) if(rFilters[i] == pImpl->aDefaultArr[nData])
sSelect = pUIFilters[i]; sSelect = rUIFilters[i];
} }
if(!sSelect.isEmpty()) if(!sSelect.isEmpty())
{ {
@@ -613,12 +611,12 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void )
else else
{ {
OUString sSelect = rBox.GetSelectedEntry(); OUString sSelect = rBox.GetSelectedEntry();
const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray(); auto const & rFilters = pImpl->aFilterArr[nData];
OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray(); auto const & rUIFilters = pImpl->aUIFilterArr[nData];
for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++) for(size_t i = 0; i < pImpl->aUIFilterArr[nData].size(); i++)
if(pUIFilters[i] == sSelect) if(rUIFilters[i] == sSelect)
{ {
sSelect = pFilters[i]; sSelect = rFilters[i];
break; break;
} }

2
dbaccess/source/ui/inc/sbagrid.hxx
View File

@@ -154,7 +154,7 @@ namespace dbaui
}; };
static DispatchType classifyDispatchURL( const css::util::URL& _rURL ); static DispatchType classifyDispatchURL( const css::util::URL& _rURL );
typedef std::map<DispatchType, sal_Bool> MapDispatchToBool; typedef std::map<DispatchType, bool> MapDispatchToBool;
MapDispatchToBool m_aDispatchStates; MapDispatchToBool m_aDispatchStates;
}; };

2
dbaccess/source/ui/misc/DExport.cxx
View File

@@ -180,7 +180,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
{ {
::connectivity::ORowSetValue aValue; ::connectivity::ORowSetValue aValue;
std::vector<sal_Int32> aTypes; std::vector<sal_Int32> aTypes;
std::vector<sal_Bool> aNullable; std::vector<bool> aNullable;
Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xSet,UNO_QUERY_THROW)->getMetaData(); Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xSet,UNO_QUERY_THROW)->getMetaData();
Reference<XRow> xRow(xSet,UNO_QUERY_THROW); Reference<XRow> xRow(xSet,UNO_QUERY_THROW);
while(xSet->next()) while(xSet->next())

2
dbaccess/source/ui/misc/UITools.cxx
View File

@@ -438,7 +438,7 @@ void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection,
Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData(); Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData();
::connectivity::ORowSetValue aValue; ::connectivity::ORowSetValue aValue;
std::vector<sal_Int32> aTypes; std::vector<sal_Int32> aTypes;
std::vector<sal_Bool> aNullable; std::vector<bool> aNullable;
// Loop on the result set until we reach end of file // Loop on the result set until we reach end of file
while (xRs->next()) while (xRs->next())
{ {

2
forms/source/component/EventThread.hxx
View File

@@ -50,7 +50,7 @@ class OComponentEventThread
{ {
typedef std::vector<css::lang::EventObject*> ThreadEvents; typedef std::vector<css::lang::EventObject*> ThreadEvents;
typedef std::vector< css::uno::Reference< css::uno::XAdapter> > ThreadObjects; typedef std::vector< css::uno::Reference< css::uno::XAdapter> > ThreadObjects;
typedef std::vector<sal_Bool> ThreadBools; typedef std::vector<bool> ThreadBools;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
::osl::Condition m_aCond; // Queue filled? ::osl::Condition m_aCond; // Queue filled?

2
l10ntools/inc/xmlparse.hxx
View File

@@ -178,7 +178,7 @@ private:
OString m_sFileName; OString m_sFileName;
/// Mapping XML tag names <-> have localizable strings /// Mapping XML tag names <-> have localizable strings
std::unordered_map<OString, sal_Bool> m_aNodes_localize; std::unordered_map<OString, bool> m_aNodes_localize;
std::unique_ptr<XMLHashMap> m_pXMLStrings; std::unique_ptr<XMLHashMap> m_pXMLStrings;

2
svx/source/form/fmshimp.cxx
View File

@@ -3035,7 +3035,7 @@ void FmXFormShell::stopFiltering_Lock(bool bSave)
{ {
const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList(); const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList();
::std::vector < OUString > aOriginalFilters; ::std::vector < OUString > aOriginalFilters;
::std::vector < sal_Bool > aOriginalApplyFlags; ::std::vector < bool > aOriginalApplyFlags;
if (bSave) if (bSave)
{ {

2
unotools/source/config/optionsdlg.cxx
View File

@@ -43,7 +43,7 @@ static sal_Int32 nRefCount = 0;
class SvtOptionsDlgOptions_Impl : public utl::ConfigItem class SvtOptionsDlgOptions_Impl : public utl::ConfigItem
{ {
private: private:
typedef std::unordered_map< OUString, sal_Bool > OptionNodeList; typedef std::unordered_map< OUString, bool > OptionNodeList;
OUString m_sPathDelimiter; OUString m_sPathDelimiter;
OptionNodeList m_aOptionNodeList; OptionNodeList m_aOptionNodeList;