Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
c2968f41
Kaydet (Commit)
c2968f41
authored
Nis 16, 2013
tarafından
Herbert Dürr
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove ambiguity of shared_ptr between boost and std namespaces
also a minor cleanup of that code part
üst
7d6c5e79
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
13 deletions
+12
-13
docbm.cxx
sw/source/core/doc/docbm.cxx
+12
-13
No files found.
sw/source/core/doc/docbm.cxx
Dosyayı görüntüle @
c2968f41
...
@@ -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
)
);
pMark
Base
=
new
TextFieldmark
(
rPaM
);
break
;
break
;
case
IDocumentMarkAccess
:
:
CHECKBOX_FIELDMARK
:
case
IDocumentMarkAccess
:
:
CHECKBOX_FIELDMARK
:
pMark
=
shared_ptr
<
IMark
>
(
new
CheckboxFieldmark
(
rPaM
)
);
pMark
Base
=
new
CheckboxFieldmark
(
rPaM
);
break
;
break
;
case
IDocumentMarkAccess
:
:
NAVIGATOR_REMINDER
:
case
IDocumentMarkAccess
:
:
NAVIGATOR_REMINDER
:
pMark
=
shared_ptr
<
IMark
>
(
new
NavigatorReminder
(
rPaM
)
);
pMark
Base
=
new
NavigatorReminder
(
rPaM
);
break
;
break
;
case
IDocumentMarkAccess
:
:
BOOKMARK
:
case
IDocumentMarkAccess
:
:
BOOKMARK
:
pMark
=
shared_ptr
<
IMark
>
(
new
Bookmark
(
rPaM
,
KeyCode
(),
rName
,
::
rtl
::
OUString
()
));
pMark
Base
=
new
Bookmark
(
rPaM
,
KeyCode
(),
rName
,
::
rtl
::
OUString
(
));
break
;
break
;
case
IDocumentMarkAccess
:
:
DDE_BOOKMARK
:
case
IDocumentMarkAccess
:
:
DDE_BOOKMARK
:
pMark
=
shared_ptr
<
IMark
>
(
new
DdeBookmark
(
rPaM
)
);
pMark
Base
=
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
()
));
pMark
Base
=
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
()
));
pMark
Base
=
new
CrossRefNumItemBookmark
(
rPaM
,
KeyCode
(),
rName
,
::
rtl
::
OUString
(
));
break
;
break
;
case
IDocumentMarkAccess
:
:
UNO_BOOKMARK
:
case
IDocumentMarkAccess
:
:
UNO_BOOKMARK
:
pMark
=
shared_ptr
<
IMark
>
(
new
UnoMark
(
rPaM
)
);
pMark
Base
=
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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment