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
d0a09f85
Kaydet (Commit)
d0a09f85
authored
Eki 27, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: prefix members of SwTableNode
Change-Id: Ibbcafef60e5074ef8b9e86bd6709bcfa50a5068d
üst
cd156058
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
node.hxx
sw/inc/node.hxx
+3
-3
ndtbl.cxx
sw/source/core/docnode/ndtbl.cxx
+8
-8
No files found.
sw/inc/node.hxx
Dosyayı görüntüle @
d0a09f85
...
@@ -494,15 +494,15 @@ private:
...
@@ -494,15 +494,15 @@ private:
class
SW_DLLPUBLIC
SwTableNode
:
public
SwStartNode
,
public
SwModify
class
SW_DLLPUBLIC
SwTableNode
:
public
SwStartNode
,
public
SwModify
{
{
friend
class
SwNodes
;
friend
class
SwNodes
;
SwTable
*
pTable
;
SwTable
*
m_
pTable
;
protected
:
protected
:
virtual
~
SwTableNode
();
virtual
~
SwTableNode
();
public
:
public
:
SwTableNode
(
const
SwNodeIndex
&
);
SwTableNode
(
const
SwNodeIndex
&
);
const
SwTable
&
GetTable
()
const
{
return
*
pTable
;
}
const
SwTable
&
GetTable
()
const
{
return
*
m_
pTable
;
}
SwTable
&
GetTable
()
{
return
*
pTable
;
}
SwTable
&
GetTable
()
{
return
*
m_
pTable
;
}
SwTabFrm
*
MakeFrm
(
SwFrm
*
);
SwTabFrm
*
MakeFrm
(
SwFrm
*
);
/// Creates the frms for the table node (i.e. the TabFrms).
/// Creates the frms for the table node (i.e. the TabFrms).
...
...
sw/source/core/docnode/ndtbl.cxx
Dosyayı görüntüle @
d0a09f85
...
@@ -1597,7 +1597,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
...
@@ -1597,7 +1597,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
// "Delete" the Table and merge all Lines/Boxes
// "Delete" the Table and merge all Lines/Boxes
_DelTabPara
aDelPara
(
*
this
,
cCh
,
pUndo
);
_DelTabPara
aDelPara
(
*
this
,
cCh
,
pUndo
);
for
(
SwTableLine
*
pLine
:
pTableNd
->
pTable
->
GetTabLines
()
)
for
(
SwTableLine
*
pLine
:
pTableNd
->
m_
pTable
->
GetTabLines
()
)
lcl_DelLine
(
pLine
,
&
aDelPara
);
lcl_DelLine
(
pLine
,
&
aDelPara
);
// We just created a TextNode with fitting separator for every TableLine.
// We just created a TextNode with fitting separator for every TableLine.
...
@@ -1609,7 +1609,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
...
@@ -1609,7 +1609,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
// first Text Node
// first Text Node
{
{
// What about UNDO?
// What about UNDO?
const
SfxItemSet
&
rTableSet
=
pTableNd
->
pTable
->
GetFrameFormat
()
->
GetAttrSet
();
const
SfxItemSet
&
rTableSet
=
pTableNd
->
m_
pTable
->
GetFrameFormat
()
->
GetAttrSet
();
const
SfxPoolItem
*
pBreak
,
*
pDesc
;
const
SfxPoolItem
*
pBreak
,
*
pDesc
;
if
(
SfxItemState
::
SET
!=
rTableSet
.
GetItemState
(
RES_PAGEDESC
,
false
,
&
pDesc
))
if
(
SfxItemState
::
SET
!=
rTableSet
.
GetItemState
(
RES_PAGEDESC
,
false
,
&
pDesc
))
pDesc
=
0
;
pDesc
=
0
;
...
@@ -2342,7 +2342,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
...
@@ -2342,7 +2342,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
SwTableNode
::
SwTableNode
(
const
SwNodeIndex
&
rIdx
)
SwTableNode
::
SwTableNode
(
const
SwNodeIndex
&
rIdx
)
:
SwStartNode
(
rIdx
,
ND_TABLENODE
)
:
SwStartNode
(
rIdx
,
ND_TABLENODE
)
{
{
pTable
=
new
SwTable
(
0
);
m_
pTable
=
new
SwTable
(
0
);
}
}
SwTableNode
::~
SwTableNode
()
SwTableNode
::~
SwTableNode
()
...
@@ -2353,12 +2353,12 @@ SwTableNode::~SwTableNode()
...
@@ -2353,12 +2353,12 @@ SwTableNode::~SwTableNode()
pTableFormat
);
pTableFormat
);
pTableFormat
->
ModifyNotification
(
&
aMsgHint
,
&
aMsgHint
);
pTableFormat
->
ModifyNotification
(
&
aMsgHint
,
&
aMsgHint
);
DelFrms
();
DelFrms
();
delete
pTable
;
delete
m_
pTable
;
}
}
SwTabFrm
*
SwTableNode
::
MakeFrm
(
SwFrm
*
pSib
)
SwTabFrm
*
SwTableNode
::
MakeFrm
(
SwFrm
*
pSib
)
{
{
return
new
SwTabFrm
(
*
pTable
,
pSib
);
return
new
SwTabFrm
(
*
m_
pTable
,
pSib
);
}
}
/**
/**
...
@@ -2435,7 +2435,7 @@ void SwTableNode::DelFrms()
...
@@ -2435,7 +2435,7 @@ void SwTableNode::DelFrms()
The TabFrms are attached to the FrameFormat of the SwTable.
The TabFrms are attached to the FrameFormat of the SwTable.
We need to delete them in a more cumbersome way, for the Master to also delete the Follows. */
We need to delete them in a more cumbersome way, for the Master to also delete the Follows. */
SwIterator
<
SwTabFrm
,
SwFormat
>
aIter
(
*
(
pTable
->
GetFrameFormat
())
);
SwIterator
<
SwTabFrm
,
SwFormat
>
aIter
(
*
(
m_
pTable
->
GetFrameFormat
())
);
SwTabFrm
*
pFrm
=
aIter
.
First
();
SwTabFrm
*
pFrm
=
aIter
.
First
();
while
(
pFrm
)
while
(
pFrm
)
{
{
...
@@ -2472,8 +2472,8 @@ void SwTableNode::DelFrms()
...
@@ -2472,8 +2472,8 @@ void SwTableNode::DelFrms()
void
SwTableNode
::
SetNewTable
(
SwTable
*
pNewTable
,
bool
bNewFrames
)
void
SwTableNode
::
SetNewTable
(
SwTable
*
pNewTable
,
bool
bNewFrames
)
{
{
DelFrms
();
DelFrms
();
delete
pTable
;
delete
m_
pTable
;
pTable
=
pNewTable
;
m_
pTable
=
pNewTable
;
if
(
bNewFrames
)
if
(
bNewFrames
)
{
{
SwNodeIndex
aIdx
(
*
EndOfSectionNode
());
SwNodeIndex
aIdx
(
*
EndOfSectionNode
());
...
...
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