diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:09:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:25:35 +0200 |
| commit | 6546ed8c7948841f147c3848acccc8defbe9997a (patch) | |
| tree | c8e4b90736052a181b43c19266dc22db89898115 /reportdesign | |
| parent | 40d6b81b9ee0a878d0dadb40941c50aa394a7501 (diff) | |
Replace sal_Bool with bool in vector<pair<...>>
Change-Id: I158e78ff4c7fc5d5d894a27599d533419eea1fe7
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 206c9b8443e2..2928520d7d5b 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -570,7 +570,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) TSectionsGrid::iterator aInsert = m_aSectionsGrid.insert( TSectionsGrid::value_type( _xProp.get(), - TGrid(aRowPos.size() - 1,TGrid::value_type(sal_False,TRow(aColumnPos.size() - 1))) + TGrid(aRowPos.size() - 1,TGrid::value_type(false,TRow(aColumnPos.size() - 1))) ) ).first; lcl_calculate(aColumnPos,aRowPos,aInsert->second); @@ -635,7 +635,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) aInsert->second[yi].second[xi] = TCell(); ++xi; } - aInsert->second[yi].first = sal_True; + aInsert->second[yi].first = true; ++yi; } @@ -1545,7 +1545,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG { sFunction = "INT"; uno::Reference< XFunction> xCountFunction = xFunctions->createFunction(); - xCountFunction->setInitialFormula(beans::Optional< OUString>(sal_True,OUString("rpt:0"))); + xCountFunction->setInitialFormula(beans::Optional< OUString>(true,OUString("rpt:0"))); OUString sCountName = sFunction + "_count_" + sExpression; xCountFunction->setName(sCountName); xCountFunction->setFormula( "rpt:[" + sCountName + "] + 1" ); @@ -1572,7 +1572,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG xFunction->setName(sFunctionName); if ( !sInitialFormula.isEmpty() ) - xFunction->setInitialFormula(beans::Optional< OUString>(sal_True, sInitialFormula)); + xFunction->setInitialFormula(beans::Optional< OUString>(true, sInitialFormula)); sFunction = "rpt:" + sFunction; sFunction += "(["; sFunction += sExpression; diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 534fabe636e0..d8854166e4b8 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -88,7 +88,7 @@ public: typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap; typedef ::std::map< Reference<XPropertySet> , TStringVec> TGridStyleMap; typedef ::std::vector< TCell > TRow; - typedef ::std::vector< ::std::pair< sal_Bool, TRow > > TGrid; + typedef ::std::vector< ::std::pair< bool, TRow > > TGrid; typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid; typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap; private: |