summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog/uiregionsw.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-12-01 17:30:38 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-12-01 17:30:38 +0000
commitb5d79ba0c2c3a07331406eb0f3bbb3d40986320f (patch)
tree316e92b8935ce9711ca450c054511b9a0bca764f /sw/source/ui/dialog/uiregionsw.cxx
parenteb1e977a36bfeebf17c57a167238c610c74be783 (diff)
parent5edc2d8ffaf658b05e4b044e44bd360697c3d08c (diff)
chartshapes: merge with DEV300 m50
Diffstat (limited to 'sw/source/ui/dialog/uiregionsw.cxx')
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index bae83e7df144..2f90c9fddef3 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -61,7 +61,7 @@
#include <comphelper/storagehelper.hxx>
#include <uitool.hxx>
-#include <bookmrk.hxx>
+#include <IMark.hxx>
#include <section.hxx>
#include <docary.hxx>
#include <doc.hxx> // fuers SwSectionFmt-Array
@@ -1588,9 +1588,7 @@ SwInsertSectionTabPage::~SwInsertSectionTabPage()
{
delete m_pDocInserter;
}
-/* -----------------21.05.99 12:58-------------------
- *
- * --------------------------------------------------*/
+
void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
{
m_pWrtSh = &rSh;
@@ -1606,12 +1604,14 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
}
FillList();
- USHORT nCnt = m_pWrtSh->GetBookmarkCnt();
- for( USHORT i = 0; i < nCnt; ++i )
- {
- SwBookmark& rBm = m_pWrtSh->GetBookmark( i );
- if( rBm.GetOtherBookmarkPos() )
- aSubRegionED.InsertEntry( rBm.GetName() );
+ IDocumentMarkAccess* const pMarkAccess = m_pWrtSh->getIDocumentMarkAccess();
+ for( IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getMarksBegin();
+ ppMark != pMarkAccess->getMarksEnd();
+ ppMark++)
+ {
+ const ::sw::mark::IMark* pBkmk = ppMark->get();
+ if( pBkmk->IsExpanded() )
+ aSubRegionED.InsertEntry( pBkmk->GetName() );
}
SwSection* pSect = ((SwInsertSectionTabDialog*)GetTabDialog())->GetSection();