diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:43 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:43 +0200 |
| commit | 752af7d5c284b4c8cebd7bf4df112d62456f3c8c (patch) | |
| tree | 898eb9534ca61e85d934721d6e425fb129e58c3d /sc/source/filter/excel/xiname.cxx | |
| parent | b585a9809cfc6b777c0012cf36d9eddba8a14e32 (diff) | |
| parent | cf08c0b8dbac91c0d7f105d6ace5933e6e585e06 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sc/source/filter/excel/xiname.cxx
sc/source/filter/xml/xmldrani.cxx
Diffstat (limited to 'sc/source/filter/excel/xiname.cxx')
| -rw-r--r-- | sc/source/filter/excel/xiname.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index f2ade90977fb..261d61f9f452 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -271,7 +271,7 @@ const XclImpName* XclImpNameManager::FindName( const String& rXclName, SCTAB nSc const XclImpName* XclImpNameManager::GetName( sal_uInt16 nXclNameIdx ) const { OSL_ENSURE( nXclNameIdx > 0, "XclImpNameManager::GetName - index must be >0" ); - return &(maNameList.at( nXclNameIdx - 1 )); + return ( nXclNameIdx >= maNameList.size() ) ? NULL : &(maNameList.at( nXclNameIdx - 1 )); } // ============================================================================ |