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
8f7e364a
Kaydet (Commit)
8f7e364a
authored
Eki 27, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: deploy some asserts in SwpHints::TryInsertNesting()
Change-Id: I584edadf13b34edf054e3405865c43bae74a7830
üst
8af112fe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
15 deletions
+14
-15
thints.cxx
sw/source/core/txtnode/thints.cxx
+14
-15
No files found.
sw/source/core/txtnode/thints.cxx
Dosyayı görüntüle @
8f7e364a
...
@@ -164,8 +164,8 @@ bool isSelfNestable(const sal_uInt16 nWhich)
...
@@ -164,8 +164,8 @@ bool isSelfNestable(const sal_uInt16 nWhich)
(
RES_TXTATR_CJK_RUBY
==
nWhich
)
||
(
RES_TXTATR_CJK_RUBY
==
nWhich
)
||
(
RES_TXTATR_INPUTFIELD
==
nWhich
))
(
RES_TXTATR_INPUTFIELD
==
nWhich
))
return
false
;
return
false
;
OSL_ENSURE
((
RES_TXTATR_META
==
nWhich
)
||
assert
((
RES_TXTATR_META
==
nWhich
)
||
(
RES_TXTATR_METAFIELD
==
nWhich
)
,
"???"
);
(
RES_TXTATR_METAFIELD
==
nWhich
));
return
true
;
return
true
;
}
}
...
@@ -175,9 +175,9 @@ bool isSplittable(const sal_uInt16 nWhich)
...
@@ -175,9 +175,9 @@ bool isSplittable(const sal_uInt16 nWhich)
if
((
RES_TXTATR_INETFMT
==
nWhich
)
||
if
((
RES_TXTATR_INETFMT
==
nWhich
)
||
(
RES_TXTATR_CJK_RUBY
==
nWhich
))
(
RES_TXTATR_CJK_RUBY
==
nWhich
))
return
true
;
return
true
;
OSL_ENSURE
((
RES_TXTATR_META
==
nWhich
)
||
assert
((
RES_TXTATR_META
==
nWhich
)
||
(
RES_TXTATR_METAFIELD
==
nWhich
)
||
(
RES_TXTATR_METAFIELD
==
nWhich
)
||
(
RES_TXTATR_INPUTFIELD
==
nWhich
)
,
"???"
);
(
RES_TXTATR_INPUTFIELD
==
nWhich
));
return
false
;
return
false
;
}
}
...
@@ -246,7 +246,7 @@ MakeTxtAttrNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNesting,
...
@@ -246,7 +246,7 @@ MakeTxtAttrNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNesting,
break
;
break
;
}
}
default
:
default
:
OSL_FAIL
(
"MakeTxtAttrNesting: what the hell is that?"
);
assert
(
!
"MakeTxtAttrNesting: what the hell is that?"
);
break
;
break
;
}
}
return
static_txtattr_cast
<
SwTxtAttrNesting
*>
(
pNew
);
return
static_txtattr_cast
<
SwTxtAttrNesting
*>
(
pNew
);
...
@@ -362,12 +362,11 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
...
@@ -362,12 +362,11 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
const
sal_Int32
nNewEnd
(
*
rNewHint
.
GetEnd
()
);
const
sal_Int32
nNewEnd
(
*
rNewHint
.
GetEnd
()
);
const
bool
bNewSelfNestable
(
isSelfNestable
(
nNewWhich
)
);
const
bool
bNewSelfNestable
(
isSelfNestable
(
nNewWhich
)
);
OSL_ENSURE
(
(
RES_TXTATR_INETFMT
==
nNewWhich
)
||
assert
(
(
RES_TXTATR_INETFMT
==
nNewWhich
)
||
(
RES_TXTATR_CJK_RUBY
==
nNewWhich
)
||
(
RES_TXTATR_CJK_RUBY
==
nNewWhich
)
||
(
RES_TXTATR_META
==
nNewWhich
)
||
(
RES_TXTATR_META
==
nNewWhich
)
||
(
RES_TXTATR_METAFIELD
==
nNewWhich
)
||
(
RES_TXTATR_METAFIELD
==
nNewWhich
)
||
(
RES_TXTATR_INPUTFIELD
==
nNewWhich
),
(
RES_TXTATR_INPUTFIELD
==
nNewWhich
));
"TryInsertNesting: Expecting INETFMT or RUBY or META or METAFIELD or INPUTFIELD"
);
NestList_t
OverlappingExisting
;
// existing hints to be split
NestList_t
OverlappingExisting
;
// existing hints to be split
NestList_t
OverwrittenExisting
;
// existing hints to be replaced
NestList_t
OverwrittenExisting
;
// existing hints to be replaced
...
@@ -403,7 +402,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
...
@@ -403,7 +402,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
static_txtattr_cast
<
SwTxtAttrNesting
*>
(
pOther
));
static_txtattr_cast
<
SwTxtAttrNesting
*>
(
pOther
));
break
;
break
;
default
:
default
:
OSL_FAIL
(
"bad code monkey"
);
assert
(
!
"bad code monkey"
);
break
;
break
;
}
}
}
}
...
@@ -419,7 +418,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
...
@@ -419,7 +418,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
{
{
if
(
rNewHint
.
HasDummyChar
())
if
(
rNewHint
.
HasDummyChar
())
{
{
OSL_FAIL
(
"ERROR: inserting duplicate CH_TXTATR hint"
);
assert
(
!
"ERROR: inserting duplicate CH_TXTATR hint"
);
return
false
;
return
false
;
}
else
if
(
nNewEnd
<
nOtherEnd
)
{
}
else
if
(
nNewEnd
<
nOtherEnd
)
{
// other has dummy char, new is inside other, but
// other has dummy char, new is inside other, but
...
@@ -428,7 +427,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
...
@@ -428,7 +427,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
// in SwXMeta::createEnumeration
// in SwXMeta::createEnumeration
// SplitNew is sorted, so this is the first split
// SplitNew is sorted, so this is the first split
sal_Int32
&
rStart
(
SplitNew
.
front
()
->
GetStart
());
sal_Int32
&
rStart
(
SplitNew
.
front
()
->
GetStart
());
OSL_ENSURE
(
rStart
==
nNewStart
,
"how did that happen?"
);
assert
(
rStart
==
nNewStart
);
rStart
=
nNewStart
+
1
;
rStart
=
nNewStart
+
1
;
}
}
}
}
...
@@ -436,7 +435,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
...
@@ -436,7 +435,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
}
}
}
}
OSL_ENSURE
(
isSplittable
(
nNewWhich
)
||
SplitNew
.
size
()
==
1
,
assert
((
isSplittable
(
nNewWhich
)
||
SplitNew
.
size
()
==
1
)
&&
"splitting the unsplittable ???"
);
"splitting the unsplittable ???"
);
// pass 2: split existing hints that overlap/nest with new hint
// pass 2: split existing hints that overlap/nest with new hint
...
@@ -467,14 +466,14 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
...
@@ -467,14 +466,14 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
{
{
case
POS_INSIDE
:
case
POS_INSIDE
:
{
{
OSL_ENSURE
(
!
bRemoveOverlap
,
assert
(
!
bRemoveOverlap
&&
"this one should be in OverwrittenExisting?"
);
"this one should be in OverwrittenExisting?"
);
}
}
break
;
break
;
case
POS_OUTSIDE
:
case
POS_OUTSIDE
:
case
POS_EQUAL
:
case
POS_EQUAL
:
{
{
OSL_FAIL
(
"existing hint inside new hint: why?"
);
assert
(
!
"existing hint inside new hint: why?"
);
}
}
break
;
break
;
case
POS_OVERLAP_BEFORE
:
case
POS_OVERLAP_BEFORE
:
...
@@ -551,7 +550,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
...
@@ -551,7 +550,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
}
}
else
else
{
{
OSL_ENSURE
((
nOtherStart
<
nNewStart
)
&&
(
nNewEnd
<
nOtherEnd
),
"huh?"
);
assert
((
nOtherStart
<
nNewStart
)
&&
(
nNewEnd
<
nOtherEnd
)
);
// scenario: there is a RUBY, and contained within that a META;
// scenario: there is a RUBY, and contained within that a META;
// now a RUBY is inserted within the META => the exising RUBY is split:
// now a RUBY is inserted within the META => the exising RUBY is split:
// here it is not possible to simply insert the left/right fragment
// here it is not possible to simply insert the left/right fragment
...
...
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