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
236ebc08
Kaydet (Commit)
236ebc08
authored
Nis 01, 2012
tarafından
Rafael Dominguez
Kaydeden (comit)
Luboš Luňák
Nis 13, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Replace deprecated List for std::vector<rtl::OUString>.
üst
c2954281
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
15 deletions
+6
-15
sdview2.cxx
sd/source/ui/view/sdview2.cxx
+6
-15
No files found.
sd/source/ui/view/sdview2.cxx
Dosyayı görüntüle @
236ebc08
...
...
@@ -861,8 +861,7 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
if
(
pPageObjsTransferable
&&
aDataHelper
.
GetINetBookmark
(
SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK
,
aINetBookmark
)
)
{
Point
aPos
;
List
aBookmarkList
;
String
aBookmark
;
rtl
::
OUString
aBookmark
;
SdPage
*
pPage
=
(
SdPage
*
)
GetSdrPageView
()
->
GetPage
();
sal_uInt16
nPgPos
=
0xFFFF
;
...
...
@@ -873,7 +872,9 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
sal_Int32
nIndex
=
aURL
.
indexOf
(
(
sal_Unicode
)
'#'
);
if
(
nIndex
!=
-
1
)
aBookmark
=
aURL
.
copy
(
nIndex
+
1
);
aBookmarkList
.
Insert
(
&
aBookmark
);
std
::
vector
<
rtl
::
OUString
>
aExchangeList
;
std
::
vector
<
rtl
::
OUString
>
aBookmarkList
(
1
,
aBookmark
);
if
(
!
pPage
->
IsMasterPage
()
)
{
...
...
@@ -886,9 +887,8 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
// Um zu gewaehrleisten, dass alle Seitennamen eindeutig sind, werden
// die einzufuegenden geprueft und gegebenenfalls in einer Ersatzliste
// aufgenommen (bNameOK == sal_False -> Benutzer hat abgebrochen)
List
*
pExchangeList
=
NULL
;
sal_Bool
bLink
=
(
NAVIGATOR_DRAGTYPE_LINK
==
pPageObjsTransferable
->
GetDragType
()
?
sal_True
:
sal_False
);
sal_Bool
bNameOK
=
GetExchangeList
(
pExchangeList
,
&
aBookmarkList
,
2
);
sal_Bool
bNameOK
=
GetExchangeList
(
aExchangeList
,
aBookmarkList
,
2
);
sal_Bool
bReplace
=
sal_False
;
// Da man hier nicht weiss, ob es sich um eine Seite oder ein Objekt handelt,
...
...
@@ -896,20 +896,11 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
// Sollten Seitennamen und Objektnamen identisch sein gibt es hier natuerlich Probleme !!!
if
(
bNameOK
)
{
mrDoc
.
InsertBookmark
(
&
aBookmarkList
,
p
ExchangeList
,
mrDoc
.
InsertBookmark
(
aBookmarkList
,
a
ExchangeList
,
bLink
,
bReplace
,
nPgPos
,
sal_False
,
&
pPageObjsTransferable
->
GetDocShell
(),
sal_True
,
&
aPos
);
}
// Delete the ExchangeList
if
(
pExchangeList
)
{
for
(
void
*
p
=
pExchangeList
->
First
();
p
;
p
=
pExchangeList
->
Next
()
)
delete
(
String
*
)
p
;
delete
pExchangeList
;
}
}
delete
pSdNavigatorDropEvent
;
...
...
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