diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-23 11:34:21 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-23 11:48:49 +0200 |
| commit | 26fb5883bbc663eceb7c53bd17c1b0ca01abb016 (patch) | |
| tree | e2d637810a08cc8e1ec639cd82112ffb64e6b78c /sw/source/uibase | |
| parent | fdo#76203 - use consistent titlecase for UI title labels (diff) | |
| download | core-26fb5883bbc663eceb7c53bd17c1b0ca01abb016.tar.gz core-26fb5883bbc663eceb7c53bd17c1b0ca01abb016.zip | |
SwContentType::FillMemberList: ignore TextFrames which are used as TextBoxes
SwDoc could already filter them out, but not SwFEShell. This makes them
not shown in the Navigator window.
Change-Id: I343ab005513198c30970bfdec4e871fbccdebc01
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/utlui/content.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 57634f048e62..faf33712b038 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -251,7 +251,7 @@ void SwContentType::Init(bool* pbInvalidateWindow) eType = FLYCNTTYPE_GRF; sTypeToken = "graphic"; } - nMemberCount = pWrtShell->GetFlyCount(eType); + nMemberCount = pWrtShell->GetFlyCount(eType, /*bIgnoreTextBoxes=*/true); bEdit = true; } break; @@ -548,13 +548,13 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) eType = FLYCNTTYPE_OLE; else if(nContentType == CONTENT_TYPE_GRAPHIC) eType = FLYCNTTYPE_GRF; - OSL_ENSURE(nMemberCount == pWrtShell->GetFlyCount(eType), + OSL_ENSURE(nMemberCount == pWrtShell->GetFlyCount(eType, /*bIgnoreTextBoxes=*/true), "MemberCount differs"); Point aNullPt; - nMemberCount = pWrtShell->GetFlyCount(eType); + nMemberCount = pWrtShell->GetFlyCount(eType, /*bIgnoreTextBoxes=*/true); for(sal_uInt16 i = 0; i < nMemberCount; i++) { - const SwFrmFmt* pFrmFmt = pWrtShell->GetFlyNum(i,eType); + const SwFrmFmt* pFrmFmt = pWrtShell->GetFlyNum(i,eType,/*bIgnoreTextBoxes=*/true); const OUString sFrmName = pFrmFmt->GetName(); SwContent* pCnt; |