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
3dc20805
Kaydet (Commit)
3dc20805
authored
Haz 02, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: prefix remaining _SectionSaveStruct members
Change-Id: Ia321a8fd657ea7d610f8a349b99d6dc91fd6d847
üst
8d46bc15
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
19 deletions
+19
-19
htmltab.cxx
sw/source/filter/html/htmltab.cxx
+19
-19
No files found.
sw/source/filter/html/htmltab.cxx
Dosyayı görüntüle @
3dc20805
...
@@ -2984,10 +2984,10 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
...
@@ -2984,10 +2984,10 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
class
_SectionSaveStruct
:
public
SwPendingStackData
class
_SectionSaveStruct
:
public
SwPendingStackData
{
{
sal_uInt16
nBaseFontStMinSave
,
nFontStMinSave
,
nFontStHeadStartSave
;
sal_uInt16
m_nBaseFontStMinSave
,
m_nFontStMinSave
,
m_
nFontStHeadStartSave
;
sal_uInt16
nDefListDeepSave
;
sal_uInt16
m_
nDefListDeepSave
;
size_t
nContextStMinSave
;
size_t
m_
nContextStMinSave
;
size_t
nContextStAttrMinSave
;
size_t
m_
nContextStAttrMinSave
;
public
:
public
:
...
@@ -2997,32 +2997,32 @@ public:
...
@@ -2997,32 +2997,32 @@ public:
virtual
~
_SectionSaveStruct
();
virtual
~
_SectionSaveStruct
();
#if OSL_DEBUG_LEVEL > 0
#if OSL_DEBUG_LEVEL > 0
size_t
GetContextStAttrMin
()
const
{
return
nContextStAttrMinSave
;
}
size_t
GetContextStAttrMin
()
const
{
return
m_
nContextStAttrMinSave
;
}
#endif
#endif
void
Restore
(
SwHTMLParser
&
rParser
);
void
Restore
(
SwHTMLParser
&
rParser
);
};
};
_SectionSaveStruct
::
_SectionSaveStruct
(
SwHTMLParser
&
rParser
)
:
_SectionSaveStruct
::
_SectionSaveStruct
(
SwHTMLParser
&
rParser
)
:
nBaseFontStMinSave
(
0
),
nFontStMinSave
(
0
),
nFontStHeadStartSave
(
0
),
m_nBaseFontStMinSave
(
0
),
m_nFontStMinSave
(
0
),
m_
nFontStHeadStartSave
(
0
),
nDefListDeepSave
(
0
),
nContextStMinSave
(
0
),
nContextStAttrMinSave
(
0
),
m_nDefListDeepSave
(
0
),
m_nContextStMinSave
(
0
),
m_
nContextStAttrMinSave
(
0
),
m_pTable
(
0
)
m_pTable
(
0
)
{
{
// Font-Stacks einfrieren
// Font-Stacks einfrieren
nBaseFontStMinSave
=
rParser
.
nBaseFontStMin
;
m_
nBaseFontStMinSave
=
rParser
.
nBaseFontStMin
;
rParser
.
nBaseFontStMin
=
rParser
.
aBaseFontStack
.
size
();
rParser
.
nBaseFontStMin
=
rParser
.
aBaseFontStack
.
size
();
nFontStMinSave
=
rParser
.
nFontStMin
;
m_
nFontStMinSave
=
rParser
.
nFontStMin
;
nFontStHeadStartSave
=
rParser
.
nFontStHeadStart
;
m_
nFontStHeadStartSave
=
rParser
.
nFontStHeadStart
;
rParser
.
nFontStMin
=
rParser
.
aFontStack
.
size
();
rParser
.
nFontStMin
=
rParser
.
aFontStack
.
size
();
// Kontext-Stack einfrieren
// Kontext-Stack einfrieren
nContextStMinSave
=
rParser
.
nContextStMin
;
m_
nContextStMinSave
=
rParser
.
nContextStMin
;
nContextStAttrMinSave
=
rParser
.
nContextStAttrMin
;
m_
nContextStAttrMinSave
=
rParser
.
nContextStAttrMin
;
rParser
.
nContextStMin
=
rParser
.
aContexts
.
size
();
rParser
.
nContextStMin
=
rParser
.
aContexts
.
size
();
rParser
.
nContextStAttrMin
=
rParser
.
nContextStMin
;
rParser
.
nContextStAttrMin
=
rParser
.
nContextStMin
;
// und noch ein par Zaehler retten
// und noch ein par Zaehler retten
nDefListDeepSave
=
rParser
.
nDefListDeep
;
m_
nDefListDeepSave
=
rParser
.
nDefListDeep
;
rParser
.
nDefListDeep
=
0
;
rParser
.
nDefListDeep
=
0
;
}
}
...
@@ -3036,23 +3036,23 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser )
...
@@ -3036,23 +3036,23 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser )
if
(
rParser
.
aBaseFontStack
.
size
()
>
nMin
)
if
(
rParser
.
aBaseFontStack
.
size
()
>
nMin
)
rParser
.
aBaseFontStack
.
erase
(
rParser
.
aBaseFontStack
.
begin
()
+
nMin
,
rParser
.
aBaseFontStack
.
erase
(
rParser
.
aBaseFontStack
.
begin
()
+
nMin
,
rParser
.
aBaseFontStack
.
end
()
);
rParser
.
aBaseFontStack
.
end
()
);
rParser
.
nBaseFontStMin
=
nBaseFontStMinSave
;
rParser
.
nBaseFontStMin
=
m_
nBaseFontStMinSave
;
nMin
=
rParser
.
nFontStMin
;
nMin
=
rParser
.
nFontStMin
;
if
(
rParser
.
aFontStack
.
size
()
>
nMin
)
if
(
rParser
.
aFontStack
.
size
()
>
nMin
)
rParser
.
aFontStack
.
erase
(
rParser
.
aFontStack
.
begin
()
+
nMin
,
rParser
.
aFontStack
.
erase
(
rParser
.
aFontStack
.
begin
()
+
nMin
,
rParser
.
aFontStack
.
end
()
);
rParser
.
aFontStack
.
end
()
);
rParser
.
nFontStMin
=
nFontStMinSave
;
rParser
.
nFontStMin
=
m_
nFontStMinSave
;
rParser
.
nFontStHeadStart
=
nFontStHeadStartSave
;
rParser
.
nFontStHeadStart
=
m_
nFontStHeadStartSave
;
OSL_ENSURE
(
rParser
.
aContexts
.
size
()
==
rParser
.
nContextStMin
&&
OSL_ENSURE
(
rParser
.
aContexts
.
size
()
==
rParser
.
nContextStMin
&&
rParser
.
aContexts
.
size
()
==
rParser
.
nContextStAttrMin
,
rParser
.
aContexts
.
size
()
==
rParser
.
nContextStAttrMin
,
"The Context Stack was not cleaned up"
);
"The Context Stack was not cleaned up"
);
rParser
.
nContextStMin
=
nContextStMinSave
;
rParser
.
nContextStMin
=
m_
nContextStMinSave
;
rParser
.
nContextStAttrMin
=
nContextStAttrMinSave
;
rParser
.
nContextStAttrMin
=
m_
nContextStAttrMinSave
;
// und noch ein par Zaehler rekonstruieren
// und noch ein par Zaehler rekonstruieren
rParser
.
nDefListDeep
=
nDefListDeepSave
;
rParser
.
nDefListDeep
=
m_
nDefListDeepSave
;
// und ein par Flags zuruecksetzen
// und ein par Flags zuruecksetzen
rParser
.
bNoParSpace
=
false
;
rParser
.
bNoParSpace
=
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