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
c74631a0
Kaydet (Commit)
c74631a0
authored
May 12, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: remove redundant parameter of SwXText::Impl::ConvertCell()
Change-Id: I8f435c4a8bb8e2ad118abd001df56162a3996521
üst
36a7ac0d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
unotext.cxx
sw/source/core/unocore/unotext.cxx
+4
-5
No files found.
sw/source/core/unocore/unotext.cxx
Dosyayı görüntüle @
c74631a0
...
@@ -110,7 +110,6 @@ public:
...
@@ -110,7 +110,6 @@ public:
throw
(
lang
::
IllegalArgumentException
,
uno
::
RuntimeException
);
throw
(
lang
::
IllegalArgumentException
,
uno
::
RuntimeException
);
void
ConvertCell
(
void
ConvertCell
(
const
bool
bFirstCell
,
const
uno
::
Sequence
<
uno
::
Reference
<
text
::
XTextRange
>
>
&
rCell
,
const
uno
::
Sequence
<
uno
::
Reference
<
text
::
XTextRange
>
>
&
rCell
,
::
std
::
vector
<
SwNodeRange
>
&
rRowNodes
,
::
std
::
vector
<
SwNodeRange
>
&
rRowNodes
,
::
std
::
unique_ptr
<
SwPaM
>
&
rpFirstPaM
,
::
std
::
unique_ptr
<
SwPaM
>
&
rpFirstPaM
,
...
@@ -1816,7 +1815,6 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 )
...
@@ -1816,7 +1815,6 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 )
}
}
void
SwXText
::
Impl
::
ConvertCell
(
void
SwXText
::
Impl
::
ConvertCell
(
const
bool
bFirstCell
,
const
uno
::
Sequence
<
uno
::
Reference
<
text
::
XTextRange
>
>
&
rCell
,
const
uno
::
Sequence
<
uno
::
Reference
<
text
::
XTextRange
>
>
&
rCell
,
::
std
::
vector
<
SwNodeRange
>
&
rRowNodes
,
::
std
::
vector
<
SwNodeRange
>
&
rRowNodes
,
::
std
::
unique_ptr
<
SwPaM
>
&
rpFirstPaM
,
::
std
::
unique_ptr
<
SwPaM
>
&
rpFirstPaM
,
...
@@ -1905,7 +1903,7 @@ void SwXText::Impl::ConvertCell(
...
@@ -1905,7 +1903,7 @@ void SwXText::Impl::ConvertCell(
have to be aligned on paragraph borders by inserting paragraph
have to be aligned on paragraph borders by inserting paragraph
breaks. Non-consecutive ranges must initiate an exception.
breaks. Non-consecutive ranges must initiate an exception.
*/
*/
if
(
bFirstCell
)
if
(
!
pLastCell
)
// first cell?
{
{
// align the beginning - if necessary
// align the beginning - if necessary
if
(
aStartCellPam
.
Start
()
->
nContent
.
GetIndex
())
if
(
aStartCellPam
.
Start
()
->
nContent
.
GetIndex
())
...
@@ -1980,8 +1978,9 @@ void SwXText::Impl::ConvertCell(
...
@@ -1980,8 +1978,9 @@ void SwXText::Impl::ConvertCell(
SwNodeRange
aCellRange
(
aStartCellPam
.
Start
()
->
nNode
,
SwNodeRange
aCellRange
(
aStartCellPam
.
Start
()
->
nNode
,
aEndCellPam
.
End
()
->
nNode
);
aEndCellPam
.
End
()
->
nNode
);
rRowNodes
.
push_back
(
aCellRange
);
// note: invalidates pLastCell!
rRowNodes
.
push_back
(
aCellRange
);
// note: invalidates pLastCell!
if
(
bFir
stCell
)
if
(
!
pLa
stCell
)
{
{
assert
(
!
rpFirstPaM
);
rpFirstPaM
.
reset
(
new
SwPaM
(
*
aStartCellPam
.
Start
()));
rpFirstPaM
.
reset
(
new
SwPaM
(
*
aStartCellPam
.
Start
()));
}
}
}
}
...
@@ -2250,7 +2249,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
...
@@ -2250,7 +2249,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
(
nCell
==
0
)
(
nCell
==
0
)
?
((
nRow
==
0
)
?
nullptr
:
&*
aTableNodes
.
rbegin
()
->
rbegin
())
?
((
nRow
==
0
)
?
nullptr
:
&*
aTableNodes
.
rbegin
()
->
rbegin
())
:
&*
aRowNodes
.
rbegin
());
:
&*
aRowNodes
.
rbegin
());
m_pImpl
->
ConvertCell
(
(
nCell
==
0
)
&&
(
nRow
==
0
),
pRow
[
nCell
],
m_pImpl
->
ConvertCell
(
pRow
[
nCell
],
aRowNodes
,
pFirstPaM
,
pLastCell
,
bExcept
);
aRowNodes
,
pFirstPaM
,
pLastCell
,
bExcept
);
}
}
aTableNodes
.
push_back
(
aRowNodes
);
aTableNodes
.
push_back
(
aRowNodes
);
...
...
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