Kaydet (Commit) c2968f41 authored tarafından Herbert Dürr's avatar Herbert Dürr

remove ambiguity of shared_ptr between boost and std namespaces

also a minor cleanup of that code part
üst 7d6c5e79
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
using namespace ::std; using namespace ::std;
using namespace ::boost;
using namespace ::sw::mark; using namespace ::sw::mark;
namespace namespace
...@@ -363,39 +362,39 @@ namespace sw { namespace mark ...@@ -363,39 +362,39 @@ namespace sw { namespace mark
" - creating duplicate CrossRefBookmark"); " - creating duplicate CrossRefBookmark");
// create mark // create mark
pMark_t pMark; MarkBase* pMarkBase = NULL;
switch(eType) switch(eType)
{ {
case IDocumentMarkAccess::TEXT_FIELDMARK: case IDocumentMarkAccess::TEXT_FIELDMARK:
pMark = shared_ptr<IMark>(new TextFieldmark(rPaM)); pMarkBase = new TextFieldmark(rPaM);
break; break;
case IDocumentMarkAccess::CHECKBOX_FIELDMARK: case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
pMark = shared_ptr<IMark>(new CheckboxFieldmark(rPaM)); pMarkBase = new CheckboxFieldmark(rPaM);
break; break;
case IDocumentMarkAccess::NAVIGATOR_REMINDER: case IDocumentMarkAccess::NAVIGATOR_REMINDER:
pMark = shared_ptr<IMark>(new NavigatorReminder(rPaM)); pMarkBase = new NavigatorReminder(rPaM);
break; break;
case IDocumentMarkAccess::BOOKMARK: case IDocumentMarkAccess::BOOKMARK:
pMark = shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); pMarkBase = new Bookmark(rPaM, KeyCode(), rName, ::rtl::OUString());
break; break;
case IDocumentMarkAccess::DDE_BOOKMARK: case IDocumentMarkAccess::DDE_BOOKMARK:
pMark = shared_ptr<IMark>(new DdeBookmark(rPaM)); pMarkBase = new DdeBookmark(rPaM);
break; break;
case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK: case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
pMark = shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); pMarkBase = new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, ::rtl::OUString());
break; break;
case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK: case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
pMark = shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); pMarkBase = new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, ::rtl::OUString());
break; break;
case IDocumentMarkAccess::UNO_BOOKMARK: case IDocumentMarkAccess::UNO_BOOKMARK:
pMark = shared_ptr<IMark>(new UnoMark(rPaM)); pMarkBase = new UnoMark(rPaM);
break; break;
} }
OSL_ENSURE(pMark.get(), OSL_ENSURE( pMarkBase!=NULL,
"MarkManager::makeMark(..)" "MarkManager::makeMark(..)"
" - Mark was not created."); " - Mark was not created.");
MarkBase* pMarkBase = dynamic_cast<MarkBase*>(pMark.get());
pMark_t pMark = boost::shared_ptr<IMark>( pMarkBase);
if(pMark->GetMarkPos() != pMark->GetMarkStart()) if(pMark->GetMarkPos() != pMark->GetMarkStart())
pMarkBase->Swap(); pMarkBase->Swap();
...@@ -762,7 +761,7 @@ namespace sw { namespace mark ...@@ -762,7 +761,7 @@ namespace sw { namespace mark
iterator_t pMarkHigh = m_vMarks.end(); iterator_t pMarkHigh = m_vMarks.end();
iterator_t pMarkFound = find_if( iterator_t pMarkFound = find_if(
pMarkLow, pMarkHigh, pMarkLow, pMarkHigh,
bind(equal_to<const IMark*>(), bind(&shared_ptr<IMark>::get, _1), pMark)); bind(equal_to<const IMark*>(), bind(&boost::shared_ptr<IMark>::get, _1), pMark));
if(pMarkFound != pMarkHigh) if(pMarkFound != pMarkHigh)
deleteMark(pMarkFound); deleteMark(pMarkFound);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment