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
1352d166
Kaydet (Commit)
1352d166
authored
Haz 19, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
workaround older compilers that do not have std::list::erase(const_iterator)
Change-Id: Iaa1164904febd8e97d4962e4004ec4719a1f4a42
üst
32b6002d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
drawtreevisiting.cxx
sdext/source/pdfimport/tree/drawtreevisiting.cxx
+8
-2
writertreevisiting.cxx
sdext/source/pdfimport/tree/writertreevisiting.cxx
+7
-2
No files found.
sdext/source/pdfimport/tree/drawtreevisiting.cxx
Dosyayı görüntüle @
1352d166
...
...
@@ -452,8 +452,14 @@ void DrawXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element* >
elem
.
Children
.
splice
(
elem
.
Children
.
end
(),
pNext
->
Children
);
// workaround older compilers that do not have std::list::erase(const_iterator)
std
::
list
<
Element
*
>
tmp
;
tmp
.
splice
(
tmp
.
begin
(),
elem
.
Parent
->
Children
,
next_it
,
next_it
);
#if defined __GNUC__ == 4 && __GNUC_MINOR__ <= 8
std
::
list
<
Element
*
>::
iterator
tmpIt
=
elem
.
Parent
->
Children
.
begin
();
std
::
advance
(
tmpIt
,
std
::
distance
(
elem
.
Parent
->
Children
.
cbegin
(),
next_it
));
elem
.
Parent
->
Children
.
erase
(
tmpIt
);
#else
elem
.
Parent
->
Children
.
erase
(
next_it
);
#endif
delete
pNext
;
}
}
...
...
sdext/source/pdfimport/tree/writertreevisiting.cxx
Dosyayı görüntüle @
1352d166
...
...
@@ -403,8 +403,13 @@ void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element*
elem
.
Children
.
splice
(
elem
.
Children
.
end
(),
pNext
->
Children
);
// workaround older compilers that do not have std::list::erase(const_iterator)
std
::
list
<
Element
*
>
tmp
;
tmp
.
splice
(
tmp
.
begin
(),
elem
.
Parent
->
Children
,
next_it
,
next_it
);
#if defined __GNUC__ == 4 && __GNUC_MINOR__ <= 8
std
::
list
<
Element
*
>::
iterator
tmpIt
=
elem
.
Parent
->
Children
.
begin
();
std
::
advance
(
tmpIt
,
std
::
distance
(
elem
.
Parent
->
Children
.
cbegin
(),
next_it
));
elem
.
Parent
->
Children
.
erase
(
tmpIt
);
#else
elem
.
Parent
->
Children
.
erase
(
next_it
);
#endif
delete
pNext
;
}
}
...
...
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