[Libreoffice-commits] .: 2 commits - sw/inc sw/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Nov 23 07:34:38 PST 2011
sw/inc/swcrsr.hxx | 4 ++--
sw/source/core/crsr/swcrsr.cxx | 9 +++++----
sw/source/core/fields/cellfml.cxx | 4 ++--
unusedcode.easy | 7 ++++---
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit b2e84f9a40fda7821d4e658f9102bcbc783a1ba3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 23 15:32:43 2011 +0000
std::map::erase takes a nonconst iterator
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index f7bb248..9bb433a 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -283,8 +283,8 @@ public:
virtual sal_Bool GotoTable( const String& rName );
void InsertBox( const SwTableBox& rTblBox );
- void DeleteBox( SwSelBoxes::const_iterator it ) { aSelBoxes.erase( it ); bChg = sal_True; }
- void DeleteBox( SwSelBoxes::const_iterator itFirst, SwSelBoxes::const_iterator itLast ) { aSelBoxes.erase( itFirst, itLast ); bChg = sal_True; }
+ void DeleteBox( SwSelBoxes::iterator it ) { aSelBoxes.erase( it ); bChg = sal_True; }
+ void DeleteBox( SwSelBoxes::iterator itFirst, SwSelBoxes::iterator itLast ) { aSelBoxes.erase( itFirst, itLast ); bChg = sal_True; }
void DeleteAllBoxes() { DeleteBox(aSelBoxes.begin(), aSelBoxes.end()); }
sal_uInt16 GetBoxesCount() const { return aSelBoxes.size(); }
const SwSelBoxes& GetBoxes() const { return aSelBoxes; }
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 8b4fab8..650b01d 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2165,8 +2165,9 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
else
{
- SwSelBoxes::const_iterator it = aTmp.find(pSttNd->GetIndex());
- if( it != aTmp.end() ) {
+ SwSelBoxes::iterator it = aTmp.find(pSttNd->GetIndex());
+ if( it != aTmp.end() )
+ {
SwNodeIndex aIdx( *pSttNd, 1 );
const SwNode* pNd = &aIdx.GetNode();
if( !pNd->IsCntntNode() )
@@ -2272,7 +2273,7 @@ bool SwTableCursor::NewTableSelection()
void SwTableCursor::ActualizeSelection( const SwSelBoxes &rNew )
{
- SwSelBoxes::const_iterator itOld = aSelBoxes.begin();
+ SwSelBoxes::iterator itOld = aSelBoxes.begin();
SwSelBoxes::const_iterator itNew = rNew.begin();
while ( itOld != aSelBoxes.end() && itNew != rNew.end() )
{
@@ -2285,7 +2286,7 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes &rNew )
}
else if( pPOld->GetSttIdx() < pPNew->GetSttIdx() )
{
- SwSelBoxes::const_iterator it = itOld;
+ SwSelBoxes::iterator it = itOld;
++itOld;
DeleteBox( it ); // this box has to go
}
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 5e7c1e4..17d3db2 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -349,7 +349,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
rNewStr += '(';
bool bDelim = false;
- for( SwSelBoxes::const_iterator it = aBoxes.begin();
+ for( SwSelBoxes::iterator it = aBoxes.begin();
it != aBoxes.end() && !pCalcPara->rCalc.IsCalcError();
++it )
{
@@ -960,7 +960,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
break;
// dann mal die Tabellenkoepfe raus:
- for( SwSelBoxes::const_iterator it = rBoxes.begin(); it != rBoxes.end(); ++it )
+ for( SwSelBoxes::iterator it = rBoxes.begin(); it != rBoxes.end(); ++it )
{
pLine = it->second->GetUpper();
while( pLine->GetUpper() )
commit 7434fa5bbd051dc4842bc76d33f27e07f10e0053
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 23 15:21:13 2011 +0000
update list post SwSelBoxes conversion
diff --git a/unusedcode.easy b/unusedcode.easy
index 6bb28a2..77d915b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -387,6 +387,7 @@ ScDPItemData::GetNumFormat() const
ScDPSaveData::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&)
ScDdeLink::ResetValue()
ScDocRowHeightUpdater::TabRanges::TabRanges()
+ScDocument::SetAllTabRangeNames(std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&)
ScDocument::ValidNewTabName(std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) const
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ScFormulaCell::IsRangeNameInUse(unsigned short) const
@@ -408,7 +409,9 @@ ScMultiTextWnd::GetLineCount()
ScMyCellInfo::ScMyCellInfo()
ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
+ScNameDefDlg::LinkStubEdModifyHdl(void*, void*)
ScNameDlg::CalcCurTableAssign(String&, ScRangeData*)
+ScNameDlg::UpdateNames()
ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const&, formula::FormulaGrammar::Grammar)
ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
@@ -420,6 +423,7 @@ ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
ScRangeData::ScRangeData(unsigned short)
+ScRangeName::copyLocalNames(boost::ptr_map<short, ScRangeName, std::less<short>, boost::heap_clone_allocator, std::allocator<std::pair<short const, void*> > > const&, std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > >&)
ScRightFooterEditPage::GetRanges()
ScRightHeaderEditPage::GetRanges()
ScSheetSourceDesc::GetCacheId() const
@@ -434,7 +438,6 @@ ScTpCalcOptions::GetRanges()
ScTpPrintOptions::GetRanges()
ScTpSubTotalGroup::GetRanges()
ScTpUserLists::GetRanges()
-ScUndoAllRangeNames::ScUndoAllRangeNames(ScDocShell*, ScRangeName const*, ScRangeName const*, std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&, std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&)
ScUserList::end()
ScUserList::end() const
ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
@@ -962,8 +965,6 @@ SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const&)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned short, unsigned short)
SwSections::DeleteAndDestroy(unsigned short, unsigned short)
-SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
-SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
SwSortElements::Insert(SwSortElement* const&, unsigned short&)
SwSortElements::Insert(SwSortElement* const*, unsigned short)
SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short)
More information about the Libreoffice-commits
mailing list