[Libreoffice-commits] core.git: 4 commits - sw/source
Matteo Casalin
matteo.casalin at yahoo.com
Sat May 30 14:29:49 PDT 2015
sw/source/uibase/inc/content.hxx | 6
sw/source/uibase/utlui/content.cxx | 230 +++++++++++++++++--------------------
2 files changed, 112 insertions(+), 124 deletions(-)
New commits:
commit 4618d15cb73d0f0c15e0f4d2a6ce9cdbe6eeef24
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat May 30 23:25:51 2015 +0200
Simplify
Change-Id: Iafeed40abb3228c00c5490692c9f2f4d526c1dee
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index c13e95c..5e3ca2b 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1480,14 +1480,13 @@ bool SwContentTree::Expand( SvTreeListEntry* pParent )
bool SwContentTree::Collapse( SvTreeListEntry* pParent )
{
- bool bRet(false);
if(!bIsRoot || (static_cast<SwContentType*>(pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) ||
(nRootType == CONTENT_TYPE_OUTLINE))
{
if(lcl_IsContentType(pParent))
{
if(bIsRoot)
- return bRet = false;
+ return false;
SwContentType* pCntType = static_cast<SwContentType*>(pParent->GetUserData());
const sal_Int32 nAnd = ~(1 << pCntType->GetType());
if(bIsActive || bIsConstant)
@@ -1505,11 +1504,9 @@ bool SwContentTree::Collapse( SvTreeListEntry* pParent )
void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
mOutLineNodeMap[key] = false;
}
- bRet = SvTreeListBox::Collapse(pParent);
}
- else
- bRet = SvTreeListBox::Collapse(pParent);
- return bRet;
+
+ return SvTreeListBox::Collapse(pParent);
}
// Also on double click will be initially opened only.
commit 824cda403206b61af20ed86aead59cfaddb6ac83
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat May 30 23:19:48 2015 +0200
Fix indentation
Change-Id: I5a2d05d476b81ad610ddf470b4e9a176f41a8c82
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 1c7d45a..c13e95c 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1259,11 +1259,11 @@ PopupMenu* SwContentTree::CreateContextMenu()
SwContentType* pType = static_cast<SwContentType*>(pEntry->GetUserData());
if ( (pType->GetType() == CONTENT_TYPE_POSTIT) && (!pActiveShell->GetView().GetDocShell()->IsReadOnly()) && ( pType->GetMemberCount() > 0) )
{
- pSubPop4->InsertItem(600, sPostItShow );
- pSubPop4->InsertItem(601, sPostItHide );
- pSubPop4->InsertItem(602, sPostItDelete );
- pPop->InsertItem(4, pType->GetSingleName());
- pPop->SetPopupMenu(4, pSubPop4);
+ pSubPop4->InsertItem(600, sPostItShow );
+ pSubPop4->InsertItem(601, sPostItHide );
+ pSubPop4->InsertItem(602, sPostItDelete );
+ pPop->InsertItem(4, pType->GetSingleName());
+ pPop->SetPopupMenu(4, pSubPop4);
}
}
@@ -1308,50 +1308,48 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
SwContentType* pCntType = static_cast<SwContentType*>(pParent->GetUserData());
const size_t nCount = pCntType->GetMemberCount();
- // Add for outline plus/minus
- if(pCntType->GetType() == CONTENT_TYPE_OUTLINE)
- {
- SvTreeListEntry* pChild = 0;
- for(size_t i = 0; i < nCount; ++i)
- {
- const SwContent* pCnt = pCntType->GetMember(i);
- if(pCnt)
- {
- const auto nLevel = static_cast<const SwOutlineContent*>(pCnt)->GetOutlineLevel();
- OUString sEntry = pCnt->GetName();
- if(sEntry.isEmpty())
- sEntry = sSpace;
- if(!pChild || (nLevel == 0))
- pChild = InsertEntry(sEntry, pParent,
- false, TREELIST_APPEND,(void*)pCnt);
- else
- {
- //back search parent.
- if(static_cast<const SwOutlineContent*>(pCntType->GetMember(i-1))->GetOutlineLevel() < nLevel)
- pChild = InsertEntry(sEntry, pChild,
- false, TREELIST_APPEND, (void*)pCnt);
- else
- {
- pChild = Prev(pChild);
- while(pChild &&
- lcl_IsContent(pChild) &&
- !(static_cast<SwOutlineContent*>(pChild->GetUserData())->GetOutlineLevel() < nLevel)
- )
- {
- pChild = Prev(pChild);
- }
- if(pChild)
- pChild = InsertEntry(sEntry, pChild,
- false, TREELIST_APPEND, (void*)pCnt);
- }
+ // Add for outline plus/minus
+ if(pCntType->GetType() == CONTENT_TYPE_OUTLINE)
+ {
+ SvTreeListEntry* pChild = 0;
+ for(size_t i = 0; i < nCount; ++i)
+ {
+ const SwContent* pCnt = pCntType->GetMember(i);
+ if(pCnt)
+ {
+ const auto nLevel = static_cast<const SwOutlineContent*>(pCnt)->GetOutlineLevel();
+ OUString sEntry = pCnt->GetName();
+ if(sEntry.isEmpty())
+ sEntry = sSpace;
+ if(!pChild || (nLevel == 0))
+ pChild = InsertEntry(sEntry, pParent, false, TREELIST_APPEND,(void*)pCnt);
+ else
+ {
+ //back search parent.
+ if(static_cast<const SwOutlineContent*>(pCntType->GetMember(i-1))->GetOutlineLevel() < nLevel)
+ pChild = InsertEntry(sEntry, pChild, false, TREELIST_APPEND, (void*)pCnt);
+ else
+ {
+ pChild = Prev(pChild);
+ while(pChild &&
+ lcl_IsContent(pChild) &&
+ !(static_cast<SwOutlineContent*>(pChild->GetUserData())->GetOutlineLevel() < nLevel)
+ )
+ {
+ pChild = Prev(pChild);
+ }
+ if(pChild)
+ pChild = InsertEntry(sEntry, pChild,
+ false, TREELIST_APPEND, (void*)pCnt);
+ }
}
- }
- }
- }
- else
- {
- for(size_t i = 0; i < nCount; ++i)
- {
+ }
+ }
+ }
+ else
+ {
+ for(size_t i = 0; i < nCount; ++i)
+ {
SvTreeListEntry* pChild = NULL;
const SwContent* pCnt = pCntType->GetMember(i);
if (pCnt)
@@ -1359,8 +1357,7 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
OUString sEntry = pCnt->GetName();
if (sEntry.isEmpty())
sEntry = sSpace;
- pChild = InsertEntry(sEntry, pParent,
- false, TREELIST_APPEND, (void*)pCnt);
+ pChild = InsertEntry(sEntry, pParent, false, TREELIST_APPEND, (void*)pCnt);
}
if (pChild)
{
@@ -1380,11 +1377,10 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
//sEntry += String::CreateFromAscii(" *");
pChild->SetMarked(true);
}
-
}
}
- }
- }
+ }
+ }
}
}
}
@@ -1509,7 +1505,7 @@ bool SwContentTree::Collapse( SvTreeListEntry* pParent )
void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
mOutLineNodeMap[key] = false;
}
- bRet = SvTreeListBox::Collapse(pParent);
+ bRet = SvTreeListBox::Collapse(pParent);
}
else
bRet = SvTreeListBox::Collapse(pParent);
@@ -1693,9 +1689,9 @@ void SwContentTree::Display( bool bActive )
false, TREELIST_APPEND, (void*)pCnt);
}
}
- }
- else
- RequestingChildren(pParent);
+ }
+ else
+ RequestingChildren(pParent);
Expand(pParent);
if( nRootType == CONTENT_TYPE_OUTLINE && bIsActive )
{
@@ -1843,8 +1839,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
// only if a primarily link shall be integrated.
bRet = true;
}
- else if( nActType == CONTENT_TYPE_REGION ||
- nActType == CONTENT_TYPE_BOOKMARK )
+ else if ( nActType == CONTENT_TYPE_REGION || nActType == CONTENT_TYPE_BOOKMARK )
{
// For field and bookmarks a link is also allowed
// without a filename into its own document.
@@ -2649,9 +2644,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent)
case 0:
if(lcl_IsContentType(pEntry))
{
- IsExpanded(pEntry) ?
- Collapse(pEntry) :
- Expand(pEntry);
+ IsExpanded(pEntry) ? Collapse(pEntry) : Expand(pEntry);
}
else
ContentDoubleClickHdl(0);
commit 549e8285b2b57797d72fd064d947da522471a6b9
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat May 30 20:06:14 2015 +0200
Use size_t for GetMemberCount/GetMember
Also use more proper integer types in related files.
Change-Id: I07536491f0a28d27de07ceb3326b703206087caf
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 0d1a804..adcb3f7 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -155,7 +155,7 @@ class SwContentType : public SwTypeNumber
OUString sContentTypeName; // name of content type
OUString sSingleContentTypeName; // name of content type, singular
OUString sTypeToken; // attachment for URL
- sal_uInt16 nMemberCount; // content count
+ size_t nMemberCount; // content count
sal_uInt16 nContentType; // content type's Id
sal_uInt8 nOutlineLevel;
bool bDataValid : 1;
@@ -169,10 +169,10 @@ public:
void Init(bool* pbInvalidateWindow = 0);
void FillMemberList(bool* pbLevelChanged = NULL);
- sal_uInt16 GetMemberCount() const
+ size_t GetMemberCount() const
{return nMemberCount;};
sal_uInt16 GetType() const {return nContentType;}
- const SwContent* GetMember(sal_uInt16 nIndex);
+ const SwContent* GetMember(size_t nIndex);
const OUString& GetName() {return sContentTypeName;}
const OUString& GetSingleName() const {return sSingleContentTypeName;}
const OUString& GetTypeToken() const{return sTypeToken;}
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 815df8c..1c7d45a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -148,7 +148,7 @@ namespace
return IDocumentMarkAccess::GetType(*rpMark) == IDocumentMarkAccess::MarkType::BOOKMARK;
}
- sal_uInt16 lcl_InsertURLFieldContent(
+ size_t lcl_InsertURLFieldContent(
SwContentArr *pMember,
SwWrtShell* pWrtShell,
const SwContentType *pCntType)
@@ -237,18 +237,17 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe
void SwContentType::Init(bool* pbInvalidateWindow)
{
// if the MemberCount is changing ...
- sal_uInt16 nOldMemberCount = nMemberCount;
+ size_t nOldMemberCount = nMemberCount;
nMemberCount = 0;
switch(nContentType)
{
case CONTENT_TYPE_OUTLINE :
{
sTypeToken = "outline";
- const size_t nOutlineCount =
- pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount();
- nMemberCount = static_cast<sal_uInt16>(nOutlineCount);
- if(nOutlineLevel < MAXLEVEL)
+ nMemberCount = pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount();
+ if (nMemberCount < MAXLEVEL)
{
+ const size_t nOutlineCount = nMemberCount;
for(size_t j = 0; j < nOutlineCount; ++j)
{
if(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineLevel(j) > nOutlineLevel )
@@ -261,7 +260,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
case CONTENT_TYPE_TABLE :
sTypeToken = "table";
- nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true));
+ nMemberCount = pWrtShell->GetTableFrameFormatCount(true);
bEdit = true;
break;
@@ -288,10 +287,10 @@ void SwContentType::Init(bool* pbInvalidateWindow)
case CONTENT_TYPE_BOOKMARK:
{
IDocumentMarkAccess* const pMarkAccess = pWrtShell->getIDocumentMarkAccess();
- nMemberCount = static_cast<sal_uInt16>(count_if(
+ nMemberCount = count_if(
pMarkAccess->getBookmarksBegin(),
pMarkAccess->getBookmarksEnd(),
- &lcl_IsUiVisibleBookmark));
+ &lcl_IsUiVisibleBookmark);
sTypeToken.clear();
bEdit = true;
}
@@ -311,7 +310,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
}
const Point aNullPt;
nMemberCount = pWrtShell->GetSectionFormatCount();
- for(sal_uInt16 i = 0; i < nMemberCount; i++)
+ for(size_t i = 0; i < nMemberCount; ++i)
{
const SwSectionFormat* pFormat;
SectionType eTmpType;
@@ -458,7 +457,7 @@ SwContentType::~SwContentType()
// Deliver content, for that if necessary fill the list
-const SwContent* SwContentType::GetMember(sal_uInt16 nIndex)
+const SwContent* SwContentType::GetMember(size_t nIndex)
{
if(!bDataValid || !pMember)
{
@@ -466,9 +465,8 @@ const SwContent* SwContentType::GetMember(sal_uInt16 nIndex)
}
if(nIndex < pMember->size())
return (*pMember)[nIndex];
- else
- return 0;
+ return nullptr;
}
void SwContentType::Invalidate()
@@ -481,7 +479,7 @@ void SwContentType::Invalidate()
void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
{
SwContentArr* pOldMember = 0;
- int nOldMemberCount = 0;
+ size_t nOldMemberCount = 0;
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 );
if(pMember && pbLevelOrVisibilityChanged)
{
@@ -498,11 +496,11 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
{
case CONTENT_TYPE_OUTLINE :
{
- sal_uInt16 nOutlineCount = nMemberCount =
- static_cast<sal_uInt16>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount());
+ const size_t nOutlineCount = nMemberCount =
+ pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount();
- sal_uInt16 nPos = 0;
- for (sal_uInt16 i = 0; i < nOutlineCount; ++i)
+ size_t nPos = 0;
+ for (size_t i = 0; i < nOutlineCount; ++i)
{
const sal_Int8 nLevel = (sal_Int8)pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineLevel(i);
if(nLevel >= nOutlineLevel )
@@ -518,7 +516,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
// with the same number and existing "pOldMember" the
// old one is compared with the new OutlinePos.
// cast for Win16
- if(nOldMemberCount > (int)nPos &&
+ if (nOldMemberCount > nPos &&
static_cast<SwOutlineContent*>((*pOldMember)[nPos])->GetOutlineLevel() != nLevel)
*pbLevelOrVisibilityChanged = true;
@@ -531,11 +529,11 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
case CONTENT_TYPE_TABLE :
{
- OSL_ENSURE(nMemberCount == static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true)),
- "MemberCount differs");
+ const size_t nCount = pWrtShell->GetTableFrameFormatCount(true);
+ OSL_ENSURE(nMemberCount == nCount, "MemberCount differs");
Point aNullPt;
- nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true));
- for(sal_uInt16 i = 0; i < nMemberCount; i++)
+ nMemberCount = nCount;
+ for(size_t i = 0; i < nMemberCount; ++i)
{
const SwFrameFormat& rTableFormat = pWrtShell->GetTableFrameFormat(i, true);
const OUString sTableName( rTableFormat.GetName() );
@@ -548,7 +546,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
pMember->insert(pCnt);
- if(nOldMemberCount > (int)i &&
+ if(nOldMemberCount > i &&
(*pOldMember)[i]->IsInvisible() != pCnt->IsInvisible())
*pbLevelOrVisibilityChanged = true;
}
@@ -592,7 +590,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->insert(pCnt);
- if(nOldMemberCount > (int)i &&
+ if (nOldMemberCount > i &&
(*pOldMember)[i]->IsInvisible() != pCnt->IsInvisible())
*pbLevelOrVisibilityChanged = true;
}
@@ -619,7 +617,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
{
const Point aNullPt;
nMemberCount = pWrtShell->GetSectionFormatCount();
- for(sal_uInt16 i = 0; i < nMemberCount; i++)
+ for(size_t i = 0; i < nMemberCount; ++i)
{
const SwSectionFormat* pFormat;
SectionType eTmpType;
@@ -645,7 +643,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
pCnt->SetInvisible();
pMember->insert(pCnt);
- sal_uInt16 nPos = pMember->size() - 1;
+ const size_t nPos = pMember->size() - 1;
if(nOldMemberCount > nPos &&
(*pOldMember)[nPos]->IsInvisible()
!= pCnt->IsInvisible())
@@ -674,7 +672,8 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
case CONTENT_TYPE_INDEX:
{
- sal_uInt16 nCount = nMemberCount = pWrtShell->GetTOXCount();
+ const sal_uInt16 nCount = pWrtShell->GetTOXCount();
+ nMemberCount = nCount;
for ( sal_uInt16 nTox = 0; nTox < nCount; nTox++ )
{
const SwTOXBase* pBase = pWrtShell->GetTOX( nTox );
@@ -688,7 +687,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
pCnt->SetInvisible();
pMember->insert( pCnt );
- sal_uInt16 nPos = pMember->size() - 1;
+ const size_t nPos = pMember->size() - 1;
if(nOldMemberCount > nPos &&
(*pOldMember)[nPos]->IsInvisible()
!= pCnt->IsInvisible())
@@ -762,7 +761,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
pCnt->SetInvisible();
pMember->insert(pCnt);
nMemberCount++;
- if(nOldMemberCount > (int)i &&
+ if (nOldMemberCount > i &&
(*pOldMember)[i]->IsInvisible() != pCnt->IsInvisible() )
*pbLevelOrVisibilityChanged = true;
}
@@ -818,12 +817,12 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
SetNodeDefaultImages();
SetDoubleClickHdl(LINK(this, SwContentTree, ContentDoubleClickHdl));
SetDragDropMode(DragDropMode::APP_COPY);
- for (sal_uInt16 i = 0; i < CONTENT_TYPE_MAX; i++)
+ for (int i = 0; i < CONTENT_TYPE_MAX; ++i)
{
aActiveContentArr[i] = 0;
aHiddenContentArr[i] = 0;
}
- for (sal_uInt16 i = 0; i < CONTEXT_COUNT; i++)
+ for (int i = 0; i < CONTEXT_COUNT; ++i)
{
aContextStrings[i] = SW_RESSTR(i+ST_CONTEXT_FIRST);
}
@@ -1121,12 +1120,12 @@ PopupMenu* SwContentTree::CreateContextMenu()
PopupMenu* pSubPop3 = new PopupMenu;
PopupMenu* pSubPop4 = new PopupMenu; // Edit
- for(sal_uInt16 i = 1; i <= MAXLEVEL; ++i)
+ for(int i = 1; i <= MAXLEVEL; ++i)
{
pSubPop1->InsertItem( i + 100, OUString::number(i));
}
pSubPop1->CheckItem(100 + nOutlineLevel);
- for(sal_uInt16 i=0; i < 3; ++i)
+ for(int i=0; i < 3; ++i)
{
pSubPop2->InsertItem( i + 201, aContextStrings[
ST_HYPERLINK - ST_CONTEXT_FIRST + i]);
@@ -1279,7 +1278,7 @@ PopupMenu* SwContentTree::CreateContextMenu()
sal_IntPtr SwContentTree::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
{
- sal_uInt16 nLevel = 0;
+ sal_IntPtr nLevel = 0;
if(lcl_IsContent(pEntry))
{
nLevel++;
@@ -1293,8 +1292,7 @@ sal_IntPtr SwContentTree::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
nLevel = nLevel + static_cast<SwRegionContent*>(pCnt)->GetRegionLevel();
}
}
- sal_uInt16 nBasis = bIsRoot ? 0 : 5;
- return nLevel * 10 + nBasis + pTab->GetPos(); //determined empirically
+ return nLevel * 10 + (bIsRoot ? 0 : 5) + pTab->GetPos(); //determined empirically
}
// Content will be integrated into the Box only on demand.
@@ -1309,17 +1307,17 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
OSL_ENSURE(pParent->GetUserData(), "no UserData?");
SwContentType* pCntType = static_cast<SwContentType*>(pParent->GetUserData());
- const sal_uInt16 nCount = pCntType->GetMemberCount();
+ const size_t nCount = pCntType->GetMemberCount();
// Add for outline plus/minus
if(pCntType->GetType() == CONTENT_TYPE_OUTLINE)
{
SvTreeListEntry* pChild = 0;
- for(sal_uInt16 i = 0; i < nCount; i++)
+ for(size_t i = 0; i < nCount; ++i)
{
const SwContent* pCnt = pCntType->GetMember(i);
if(pCnt)
{
- const sal_uInt16 nLevel = static_cast<const SwOutlineContent*>(pCnt)->GetOutlineLevel();
+ const auto nLevel = static_cast<const SwOutlineContent*>(pCnt)->GetOutlineLevel();
OUString sEntry = pCnt->GetName();
if(sEntry.isEmpty())
sEntry = sSpace;
@@ -1352,7 +1350,7 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
}
else
{
- for(sal_uInt16 i = 0; i < nCount; i++)
+ for(size_t i = 0; i < nCount; ++i)
{
SvTreeListEntry* pChild = NULL;
const SwContent* pCnt = pCntType->GetMember(i);
@@ -1683,7 +1681,7 @@ void SwContentTree::Display( bool bActive )
if(nRootType != CONTENT_TYPE_OUTLINE)
{
- for(sal_uInt16 i = 0; i < (*ppRootContentT)->GetMemberCount(); i++ )
+ for(size_t i = 0; i < (*ppRootContentT)->GetMemberCount(); ++i)
{
const SwContent* pCnt = (*ppRootContentT)->GetMember(i);
if(pCnt)
@@ -1961,7 +1959,7 @@ bool SwContentTree::HasContentChanged()
if(!bIsActive && ! bIsConstant)
{
- for(sal_uInt16 i=0; i < CONTENT_TYPE_MAX; i++)
+ for(int i=0; i < CONTENT_TYPE_MAX; ++i)
{
if(aActiveContentArr[i])
aActiveContentArr[i]->Invalidate();
@@ -1987,7 +1985,7 @@ bool SwContentTree::HasContentChanged()
0 != ( pFirstSel = FirstSelected()) &&
lcl_IsContent(pFirstSel))
{
- const sal_uInt16 nSelLevel =
+ const auto nSelLevel =
static_cast<SwOutlineContent*>(pFirstSel->GetUserData())->GetOutlineLevel();
SwWrtShell* pSh = GetWrtShell();
const sal_uInt16 nOutlinePos = pSh->GetOutlinePos(MAXLEVEL);
@@ -2005,8 +2003,8 @@ bool SwContentTree::HasContentChanged()
bRepaint = true;
else
{
- const sal_uInt16 nChildCount = (sal_uInt16)GetChildCount(pEntry);
- for(sal_uInt16 j = 0; j < nChildCount; j++)
+ const size_t nChildCount = GetChildCount(pEntry);
+ for(size_t j = 0; j < nChildCount; ++j)
{
pEntry = Next(pEntry);
const SwContent* pCnt = pArrType->GetMember(j);
@@ -2048,7 +2046,7 @@ bool SwContentTree::HasContentChanged()
{
bool bNext = true; // at least a next must be
SwContentType* pTreeType = static_cast<SwContentType*>(pEntry->GetUserData());
- const sal_uInt16 nTreeCount = pTreeType->GetMemberCount();
+ const size_t nTreeCount = pTreeType->GetMemberCount();
const sal_uInt16 nType = pTreeType->GetType();
SwContentType* pArrType = aActiveContentArr[nType];
if(!pArrType)
@@ -2064,7 +2062,7 @@ bool SwContentTree::HasContentChanged()
// or if the visibility of objects (frames, sections, tables) has changed
// i.e. in header/footer
pArrType->FillMemberList(&bLevelOrVisibiblityChanged);
- const sal_uInt16 nChildCount = (sal_uInt16)GetChildCount(pEntry);
+ const size_t nChildCount = GetChildCount(pEntry);
if((nType == CONTENT_TYPE_OUTLINE) && bLevelOrVisibiblityChanged)
bRepaint = true;
if(bLevelOrVisibiblityChanged)
@@ -2074,7 +2072,7 @@ bool SwContentTree::HasContentChanged()
bRepaint = true;
else
{
- for(sal_uInt16 j = 0; j < nChildCount; j++)
+ for(size_t j = 0; j < nChildCount; ++j)
{
pEntry = Next(pEntry);
bNext = false;
@@ -2099,7 +2097,7 @@ bool SwContentTree::HasContentChanged()
// i.e. in header/footer
pArrType->FillMemberList(&bLevelOrVisibiblityChanged);
bool bRemoveChildren = false;
- const sal_uInt16 nChildCount = (sal_uInt16)GetChildCount(pEntry);
+ const size_t nChildCount = GetChildCount(pEntry);
if( nChildCount != pArrType->GetMemberCount() )
{
bRemoveChildren = true;
@@ -2107,7 +2105,7 @@ bool SwContentTree::HasContentChanged()
else
{
SvTreeListEntry* pChild = FirstChild(pEntry);
- for(sal_uInt16 j = 0; j < nChildCount; j++)
+ for(size_t j = 0; j < nChildCount; ++j)
{
const SwContent* pCnt = pArrType->GetMember(j);
pChild->SetUserData((void*)pCnt);
@@ -2122,7 +2120,7 @@ bool SwContentTree::HasContentChanged()
{
SvTreeListEntry* pChild = FirstChild(pEntry);
SvTreeListEntry* pRemove = pChild;
- for(sal_uInt16 j = 0; j < nChildCount; j++)
+ for(size_t j = 0; j < nChildCount; ++j)
{
pChild = Next(pRemove);
GetModel()->Remove(pRemove);
@@ -2188,7 +2186,7 @@ void SwContentTree::SetHiddenShell(SwWrtShell* pSh)
bIsHidden = true;
bIsActive = bIsConstant = false;
FindActiveTypeAndRemoveUserData();
- for(sal_uInt16 i=0; i < CONTENT_TYPE_MAX; i++)
+ for(int i=0; i < CONTENT_TYPE_MAX; ++i)
{
DELETEZ(aHiddenContentArr[i]);
}
@@ -2228,7 +2226,7 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
if (pActiveShell)
StartListening(*pActiveShell->GetView().GetDocShell());
FindActiveTypeAndRemoveUserData();
- for(sal_uInt16 i=0; i < CONTENT_TYPE_MAX; i++)
+ for(int i=0; i < CONTENT_TYPE_MAX; ++i)
{
DELETEZ(aActiveContentArr[i]);
}
@@ -2247,7 +2245,7 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh)
bIsConstant = true;
StartListening(*pActiveShell->GetView().GetDocShell());
FindActiveTypeAndRemoveUserData();
- for(sal_uInt16 i=0; i < CONTENT_TYPE_MAX; i++)
+ for(int i=0; i < CONTENT_TYPE_MAX; ++i)
{
DELETEZ(aActiveContentArr[i]);
}
@@ -2332,7 +2330,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
{
sal_uInt16 nActEndPos = nActPos;
SvTreeListEntry* pEntry = pFirstEntry;
- sal_uInt16 nActLevel = static_cast<SwOutlineContent*>(
+ const auto nActLevel = static_cast<SwOutlineContent*>(
pFirstEntry->GetUserData())->GetOutlineLevel();
pEntry = Next(pEntry);
while( pEntry && CONTENT_TYPE_OUTLINE ==
@@ -2858,7 +2856,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
}
else
{
- const sal_uInt16 nMemberCount = static_cast<SwContentType*>(pUserData)->GetMemberCount();
+ const size_t nMemberCount = static_cast<SwContentType*>(pUserData)->GetMemberCount();
sEntry = OUString::number(nMemberCount);
sEntry += " ";
sEntry += nMemberCount == 1
commit b75c104ace039cff957696ea3de091f60b26c918
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat May 30 11:21:38 2015 +0200
0 is fine here
Change-Id: I5f4e98f644dfd10e6fb35d15622b46fdcac00395
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index d0c72c3..815df8c 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -481,7 +481,7 @@ void SwContentType::Invalidate()
void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
{
SwContentArr* pOldMember = 0;
- int nOldMemberCount = -1;
+ int nOldMemberCount = 0;
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 );
if(pMember && pbLevelOrVisibilityChanged)
{
More information about the Libreoffice-commits
mailing list