connectivity/source/drivers/file/FResultSet.cxx | 2
cui/source/options/optsave.cxx | 52 +++++++++++-------------
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/misc/DExport.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 2
forms/source/component/EventThread.hxx | 2
l10ntools/inc/xmlparse.hxx | 2
svx/source/form/fmshimp.cxx | 2
unotools/source/config/optionsdlg.cxx | 2
9 files changed, 33 insertions(+), 35 deletions(-)
New commits:
commit 3b666f6819bb0230520bc724d5e33a7a349aa15c
Author: Noel Grandin <noelgran...@gmail.com>
Date: Sun Jan 21 18:28:03 2018 +0200
remove some sal_Bool remnants
Change-Id: I0a9637aca523a73fbdbbd22f9ad735d6d1ba6898
Reviewed-on: https://gerrit.libreoffice.org/48273
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index dc6bb60a07da..50bb8f9f1c5f 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1432,7 +1432,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow&
_rRow,
const OUString sRealName =
OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
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;
for (sal_Int32 i=0; // the first column is the bookmark column
aRowIter != _rRow->get().end();
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index ff3456eee4d8..8167af33add4 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -54,10 +54,9 @@ using namespace comphelper;
struct SvxSaveTabPage_Impl
{
Reference< XNameContainer > xFact;
- Sequence< OUString > aFilterArr[APP_COUNT];
- Sequence< sal_Bool > aAlienArr[APP_COUNT];
- Sequence< sal_Bool > aODFArr[APP_COUNT];
- Sequence< OUString > aUIFilterArr[APP_COUNT];
+ std::vector< OUString > aFilterArr[APP_COUNT];
+ std::vector< bool > aODFArr[APP_COUNT];
+ std::vector< OUString > aUIFilterArr[APP_COUNT];
OUString aDefaultArr[APP_COUNT];
bool aDefaultReadonlyArr[APP_COUNT];
bool bInitialized;
@@ -429,8 +428,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
sCommand = sCommand.replaceFirst("%1", sReplace);
Reference< XEnumeration > xList =
xQuery->createSubSetEnumerationByQuery(sCommand);
std::vector< OUString > lList;
- std::vector< sal_Bool > lAlienList;
- std::vector< sal_Bool > lODFList;
+ std::vector<bool> lAlienList;
+ std::vector<bool> lODFList;
while(xList->hasMoreElements())
{
SequenceAsHashMap aFilter(xList->nextElement());
@@ -443,9 +442,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
lODFList.push_back( isODFFormat( sFilter ) );
}
}
- pImpl->aFilterArr[nData] =
comphelper::containerToSequence(lList);
- pImpl->aAlienArr[nData] =
comphelper::containerToSequence(lAlienList);
- pImpl->aODFArr[nData] =
comphelper::containerToSequence(lODFList);
+ pImpl->aFilterArr[nData] = lList;
+ pImpl->aODFArr[nData] = lODFList;
}
}
aDocTypeLB->SelectEntryPos(0);
@@ -571,36 +569,36 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&,
rBox, void )
if(aDocTypeLB == &rBox)
{
aSaveAsLB->Clear();
- const OUString* pFilters =
pImpl->aFilterArr[nData].getConstArray();
- if(!pImpl->aUIFilterArr[nData].getLength())
+ auto & rFilters = pImpl->aFilterArr[nData];
+ if(!pImpl->aUIFilterArr[nData].size())
{
-
pImpl->aUIFilterArr[nData].realloc(pImpl->aFilterArr[nData].getLength());
- OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray();
- for(int nFilter = 0; nFilter <
pImpl->aFilterArr[nData].getLength(); nFilter++)
+
pImpl->aUIFilterArr[nData].resize(pImpl->aFilterArr[nData].size());
+ auto & rUIFilters = pImpl->aUIFilterArr[nData];
+ 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
OUString extension;
SfxFilterMatcher matcher;
- std::shared_ptr<const SfxFilter> pFilter =
matcher.GetFilter4FilterName(pFilters[nFilter]);
+ std::shared_ptr<const SfxFilter> pFilter =
matcher.GetFilter4FilterName(rFilters[nFilter]);
if (pFilter)
{
extension =
pFilter->GetWildcard().getGlob().getToken(0, ';');
}
Sequence<PropertyValue> 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;
- 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] )
aSaveAsLB->SetEntryData( nEntryPos,
static_cast<void*>(pImpl.get()) );
- if(pFilters[i] == pImpl->aDefaultArr[nData])
- sSelect = pUIFilters[i];
+ if(rFilters[i] == pImpl->aDefaultArr[nData])
+ sSelect = rUIFilters[i];
}
if(!sSelect.isEmpty())
{
@@ -613,12 +611,12 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&,
rBox, void )
else
{
OUString sSelect = rBox.GetSelectedEntry();
- const OUString* pFilters =
pImpl->aFilterArr[nData].getConstArray();
- OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray();
- for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++)
- if(pUIFilters[i] == sSelect)
+ auto const & rFilters = pImpl->aFilterArr[nData];
+ auto const & rUIFilters = pImpl->aUIFilterArr[nData];
+ for(size_t i = 0; i < pImpl->aUIFilterArr[nData].size(); i++)
+ if(rUIFilters[i] == sSelect)
{
- sSelect = pFilters[i];
+ sSelect = rFilters[i];
break;
}
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx
b/dbaccess/source/ui/inc/sbagrid.hxx
index 1eb7869eafe9..c1e920ba2533 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -154,7 +154,7 @@ namespace dbaui
};
static DispatchType classifyDispatchURL( const css::util::URL& _rURL );
- typedef std::map<DispatchType, sal_Bool> MapDispatchToBool;
+ typedef std::map<DispatchType, bool> MapDispatchToBool;
MapDispatchToBool m_aDispatchStates;
};
diff --git a/dbaccess/source/ui/misc/DExport.cxx
b/dbaccess/source/ui/misc/DExport.cxx
index 6780a35fd4cc..fae5ddf492a1 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -180,7 +180,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection&
_rxConnection,
{
::connectivity::ORowSetValue aValue;
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<XRow> xRow(xSet,UNO_QUERY_THROW);
while(xSet->next())
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 1ba1f0b28887..f96e6b9fd822 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -438,7 +438,7 @@ void fillTypeInfo( const Reference<
css::sdbc::XConnection>& _rxConnection,
Reference<XResultSetMetaData> xResultSetMetaData =
Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData();
::connectivity::ORowSetValue aValue;
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
while (xRs->next())
{
diff --git a/forms/source/component/EventThread.hxx
b/forms/source/component/EventThread.hxx
index ec5e8d706faa..f2ee991330cb 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -50,7 +50,7 @@ class OComponentEventThread
{
typedef std::vector<css::lang::EventObject*> ThreadEvents;
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::Condition m_aCond; // Queue filled?
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index b3a8fbe36455..e8e2d203801d 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -178,7 +178,7 @@ private:
OString m_sFileName;
/// 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;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index dcdf9811b09e..7724e4221205 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3035,7 +3035,7 @@ void FmXFormShell::stopFiltering_Lock(bool bSave)
{
const ::std::vector< Reference< runtime::XFormController > >&
rControllerList = pAdapter->GetList();
::std::vector < OUString > aOriginalFilters;
- ::std::vector < sal_Bool > aOriginalApplyFlags;
+ ::std::vector < bool > aOriginalApplyFlags;
if (bSave)
{
diff --git a/unotools/source/config/optionsdlg.cxx
b/unotools/source/config/optionsdlg.cxx
index b07c728d0fbf..a8a28b002ce5 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -43,7 +43,7 @@ static sal_Int32 nRefCount = 0;
class SvtOptionsDlgOptions_Impl : public utl::ConfigItem
{
private:
- typedef std::unordered_map< OUString, sal_Bool > OptionNodeList;
+ typedef std::unordered_map< OUString, bool > OptionNodeList;
OUString m_sPathDelimiter;
OptionNodeList m_aOptionNodeList;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
