diff options
| author | Laurent Godard <lgodard.libre@laposte.net> | 2013-12-06 12:36:41 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-06 05:46:16 -0600 |
| commit | f992400f6fec9c0178bddb83dbc859848221b659 (patch) | |
| tree | 8242b760051f0617850c70833e7cc21c9482fb59 /sc/source | |
| parent | c2f5e09900561d417d53a74fd6bc189cb7d898e1 (diff) | |
count notes - GetNotesInRange now include last tab
- refactor tests
- add unit test on counting notes on a sheet
Change-Id: I6762a0e791a745b828800645effdfc044ac33710
Reviewed-on: https://gerrit.libreoffice.org/6954
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/data/document.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index a24889be64f3..9f36896206b4 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6239,7 +6239,7 @@ void ScDocument::GetNotesInRange( const ScRangeList& rRange, std::vector<sc::Not for( size_t i = 0; i < rRange.size(); ++i) { const ScRange* pRange = rRange[i]; - for( SCTAB nTab = pRange->aStart.Tab(); nTab < pRange->aEnd.Tab(); ++nTab ) + for( SCTAB nTab = pRange->aStart.Tab(); nTab <= pRange->aEnd.Tab(); ++nTab ) { maTabs[nTab]->GetNotesInRange( *pRange, rNotes ); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 54f40d071df8..af9ede871094 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3601,7 +3601,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera sal_Int32 SAL_CALL ScAnnotationsObj::getCount() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - sal_uLong nCount = 0; + sal_Int32 nCount = 0; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); |