summaryrefslogtreecommitdiff
path: root/sc/source/core/data/docpool.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/core/data/docpool.cxx')
-rw-r--r--sc/source/core/data/docpool.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 8b2f48d8a2cc..2bb5922242cb 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -642,10 +642,10 @@ void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static
void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle )
{
- USHORT nCount = GetItemCount(ATTR_PATTERN);
- for (USHORT i=0; i<nCount; i++)
+ sal_uInt32 nCount = GetItemCount2(ATTR_PATTERN);
+ for (sal_uInt32 i=0; i<nCount; i++)
{
- ScPatternAttr* pPattern = (ScPatternAttr*)GetItem(ATTR_PATTERN, i);
+ ScPatternAttr* pPattern = (ScPatternAttr*)GetItem2(ATTR_PATTERN, i);
if ( pPattern && pPattern->GetStyleSheet() == pStyle )
pPattern->StyleToName();
}
@@ -658,10 +658,12 @@ void ScDocumentPool::CellStyleCreated( const String& rName )
// Calling StyleSheetChanged isn't enough because the pool may still contain items
// for undo or clipboard content.
- sal_uInt16 nCount = GetItemCount(ATTR_PATTERN);
- for (sal_uInt16 i=0; i<nCount; i++)
+ sal_uInt32 nCount = GetItemCount2(ATTR_PATTERN);
+ for (sal_uInt32 i=0; i<nCount; i++)
{
- ScPatternAttr* pPattern = (ScPatternAttr*)GetItem(ATTR_PATTERN, i);
+ ScPatternAttr *const pPattern =
+ const_cast<ScPatternAttr*>(
+ static_cast<ScPatternAttr const*>(GetItem2(ATTR_PATTERN, i)));
if ( pPattern && pPattern->GetStyleSheet() == NULL )
{
const String* pStyleName = pPattern->GetStyleName();