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
228e3408
Kaydet (Commit)
228e3408
authored
Kas 10, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I91f8fa3097c216230e4a9eaf1339157dd85bfdfc
üst
86043a2f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
11 deletions
+12
-11
htmltab.cxx
sw/source/filter/html/htmltab.cxx
+2
-0
svxcss1.cxx
sw/source/filter/html/svxcss1.cxx
+7
-7
svxcss1.hxx
sw/source/filter/html/svxcss1.hxx
+3
-4
No files found.
sw/source/filter/html/htmltab.cxx
Dosyayı görüntüle @
228e3408
...
...
@@ -56,6 +56,8 @@
#include "swcss1.hxx"
#include <numrule.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
#define NETSCAPE_DFLT_BORDER 1
#define NETSCAPE_DFLT_CELLSPACING 2
...
...
sw/source/filter/html/svxcss1.cxx
Dosyayı görüntüle @
228e3408
...
...
@@ -664,18 +664,18 @@ bool SvxCSS1Parser::SelectorParsed( CSS1Selector *pSelector, bool bFirst )
{
OSL_ENSURE
(
pSheetItemSet
,
"Where is the Item-Set for Style-Sheets?"
);
for
(
size_t
i
=
0
;
i
<
a
Selectors
.
size
();
++
i
)
for
(
size_t
i
=
0
;
i
<
m_
Selectors
.
size
();
++
i
)
{
StyleParsed
(
&
aSelectors
[
i
],
*
pSheetItemSet
,
*
pSheetPropInfo
);
StyleParsed
(
m_Selectors
[
i
].
get
(),
*
pSheetItemSet
,
*
pSheetPropInfo
);
}
pSheetItemSet
->
ClearItem
();
pSheetPropInfo
->
Clear
();
// und die naechste Rule vorbereiten
a
Selectors
.
clear
();
m_
Selectors
.
clear
();
}
aSelectors
.
push_back
(
pSelector
);
m_Selectors
.
push_back
(
std
::
unique_ptr
<
CSS1Selector
>
(
pSelector
)
);
return
false
;
// den Selektor haben wir gespeichert. Loeschen toedlich!
}
...
...
@@ -828,13 +828,13 @@ bool SvxCSS1Parser::ParseStyleSheet( const OUString& rIn )
bool
bSuccess
=
CSS1Parser
::
ParseStyleSheet
(
rIn
);
for
(
size_t
i
=
0
;
i
<
a
Selectors
.
size
();
++
i
)
for
(
size_t
i
=
0
;
i
<
m_
Selectors
.
size
();
++
i
)
{
StyleParsed
(
&
aSelectors
[
i
],
*
pSheetItemSet
,
*
pSheetPropInfo
);
StyleParsed
(
m_Selectors
[
i
].
get
(),
*
pSheetItemSet
,
*
pSheetPropInfo
);
}
// und etwas aufrauemen
a
Selectors
.
clear
();
m_
Selectors
.
clear
();
pSheetItemSet
->
ClearItem
();
pSheetPropInfo
->
Clear
();
...
...
sw/source/filter/html/svxcss1.hxx
Dosyayı görüntüle @
228e3408
...
...
@@ -24,9 +24,8 @@
#include <rtl/textenc.h>
#include "parcss1.hxx"
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
#include <vector>
#include <map>
class
SfxItemPool
;
...
...
@@ -178,9 +177,9 @@ public:
class
SvxCSS1Parser
:
public
CSS1Parser
{
typedef
::
boost
::
ptr_vector
<
CSS1Selector
>
CSS1Selectors
;
typedef
::
std
::
vector
<
std
::
unique_ptr
<
CSS1Selector
>
>
CSS1Selectors
;
typedef
::
std
::
map
<
OUString
,
std
::
unique_ptr
<
SvxCSS1MapEntry
>>
CSS1Map
;
CSS1Selectors
aSelectors
;
// Liste der "offenen" Selectoren
CSS1Selectors
m_Selectors
;
// List of "open" Selectors
CSS1Map
m_Ids
;
CSS1Map
m_Classes
;
...
...
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