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
7cdbf12f
Kaydet (Commit)
7cdbf12f
authored
Mar 29, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
coverity#982292 Logically dead code
Change-Id: I7862ffc1ba51b1083e7cd1fe428fd9a0e134bc38
üst
28d202cd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
31 deletions
+18
-31
cfg.cxx
cui/source/customize/cfg.cxx
+18
-31
No files found.
cui/source/customize/cfg.cxx
Dosyayı görüntüle @
7cdbf12f
...
...
@@ -2130,11 +2130,11 @@ void SvxConfigPage::MoveEntry( bool bMoveUp )
bool
SvxConfigPage
::
MoveEntryData
(
SvTreeListEntry
*
pSourceEntry
,
SvTreeListEntry
*
pTargetEntry
)
{
//
modified by shizhoubo for issue53677
if
(
NULL
==
pSourceEntry
||
NULL
==
pTargetEntry
)
{
return
false
;
}
//
#i53677#
if
(
NULL
==
pSourceEntry
||
NULL
==
pTargetEntry
)
{
return
false
;
}
// Grab the entries list for the currently selected menu
SvxEntries
*
pEntries
=
GetTopLevelSelection
()
->
GetEntries
();
...
...
@@ -2142,39 +2142,26 @@ bool SvxConfigPage::MoveEntryData(
SvxConfigEntry
*
pSourceData
=
(
SvxConfigEntry
*
)
pSourceEntry
->
GetUserData
();
if
(
pTargetEntry
==
NULL
)
{
RemoveEntry
(
pEntries
,
pSourceData
);
pEntries
->
insert
(
pEntries
->
begin
(),
pSourceData
);
SvxConfigEntry
*
pTargetData
=
(
SvxConfigEntry
*
)
pTargetEntry
->
GetUserData
();
GetSaveInData
()
->
SetModified
(
true
);
return
true
;
}
else
if
(
pSourceData
!=
NULL
&&
pTargetData
!=
NULL
)
{
SvxConfigEntry
*
pTargetData
=
(
SvxConfigEntry
*
)
pTargetEntry
->
GetUserData
();
if
(
pSourceData
!=
NULL
&&
pTargetData
!=
NULL
)
{
// remove the source entry from our list
RemoveEntry
(
pEntries
,
pSourceData
);
// remove the source entry from our list
RemoveEntry
(
pEntries
,
pSourceData
);
SvxEntries
::
iterator
iter
=
pEntries
->
begin
();
SvxEntries
::
const_iterator
end
=
pEntries
->
end
();
SvxEntries
::
iterator
iter
=
pEntries
->
begin
();
SvxEntries
::
const_iterator
end
=
pEntries
->
end
();
// advance the iterator to the position of the target entry
while
(
*
iter
!=
pTargetData
&&
++
iter
!=
end
)
;
// advance the iterator to the position of the target entry
while
(
*
iter
!=
pTargetData
&&
++
iter
!=
end
)
;
// insert the source entry at the position after the target
pEntries
->
insert
(
++
iter
,
pSourceData
);
// insert the source entry at the position after the target
pEntries
->
insert
(
++
iter
,
pSourceData
);
GetSaveInData
()
->
SetModified
(
true
);
GetSaveInData
()
->
SetModified
(
true
);
return
true
;
}
return
true
;
}
return
false
;
...
...
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