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
7cd899bc
Kaydet (Commit)
7cd899bc
authored
Nis 25, 2012
tarafından
Noel Grandin
Kaydeden (comit)
Michael Stahl
Nis 25, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Remove data structures there dead i.e. not doing any actual work
üst
40bd5dab
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
38 deletions
+5
-38
swtable.hxx
sw/inc/swtable.hxx
+1
-4
tblsel.hxx
sw/inc/tblsel.hxx
+1
-5
docchart.cxx
sw/source/core/doc/docchart.cxx
+2
-3
tblsel.cxx
sw/source/core/frmedt/tblsel.cxx
+1
-26
No files found.
sw/inc/swtable.hxx
Dosyayı görüntüle @
7cd899bc
...
@@ -53,8 +53,6 @@ class SwTabCols;
...
@@ -53,8 +53,6 @@ class SwTabCols;
class
SwDoc
;
class
SwDoc
;
class
SwSelBoxes
;
class
SwSelBoxes
;
class
SwTblCalcPara
;
class
SwTblCalcPara
;
class
SwChartBoxes
;
class
SwChartLines
;
struct
SwPosition
;
struct
SwPosition
;
class
SwNodeIndex
;
class
SwNodeIndex
;
class
SwNode
;
class
SwNode
;
...
@@ -285,8 +283,7 @@ public:
...
@@ -285,8 +283,7 @@ public:
sal_Bool
IsTblComplex
()
const
;
sal_Bool
IsTblComplex
()
const
;
// Returns sal_True if table or selection is balanced.
// Returns sal_True if table or selection is balanced.
sal_Bool
IsTblComplexForChart
(
const
String
&
rSel
,
sal_Bool
IsTblComplexForChart
(
const
String
&
rSel
)
const
;
SwChartLines
*
pGetCLines
=
0
)
const
;
// Search all content-bearing boxes of the base line on which this box stands.
// Search all content-bearing boxes of the base line on which this box stands.
// rBoxes as a return value for immediate use.
// rBoxes as a return value for immediate use.
...
...
sw/inc/tblsel.hxx
Dosyayı görüntüle @
7cd899bc
...
@@ -130,11 +130,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
...
@@ -130,11 +130,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
sal_Bool
HasProtectedCells
(
const
SwSelBoxes
&
rBoxes
);
sal_Bool
HasProtectedCells
(
const
SwSelBoxes
&
rBoxes
);
// Check if selection is balanced.
// Check if selection is balanced.
class
SwChartBoxes
:
public
std
::
vector
<
SwTableBoxPtr
>
{};
sal_Bool
ChkChartSel
(
const
SwNode
&
rSttNd
,
const
SwNode
&
rEndNd
);
class
SwChartLines
:
public
boost
::
ptr_vector
<
SwChartBoxes
>
{};
sal_Bool
ChkChartSel
(
const
SwNode
&
rSttNd
,
const
SwNode
&
rEndNd
,
SwChartLines
*
pGetCLines
=
0
);
// Check if cell is part of SSelection.
// Check if cell is part of SSelection.
// (Became a function, in order to make sure that GetTblSel() and MakeTblCrsr()
// (Became a function, in order to make sure that GetTblSel() and MakeTblCrsr()
...
...
sw/source/core/doc/docchart.cxx
Dosyayı görüntüle @
7cd899bc
...
@@ -64,8 +64,7 @@ void SwTable::UpdateCharts() const
...
@@ -64,8 +64,7 @@ void SwTable::UpdateCharts() const
GetFrmFmt
()
->
GetDoc
()
->
UpdateCharts
(
GetFrmFmt
()
->
GetName
()
);
GetFrmFmt
()
->
GetDoc
()
->
UpdateCharts
(
GetFrmFmt
()
->
GetName
()
);
}
}
sal_Bool
SwTable
::
IsTblComplexForChart
(
const
String
&
rSelection
,
sal_Bool
SwTable
::
IsTblComplexForChart
(
const
String
&
rSelection
)
const
SwChartLines
*
pGetCLines
)
const
{
{
const
SwTableBox
*
pSttBox
,
*
pEndBox
;
const
SwTableBox
*
pSttBox
,
*
pEndBox
;
if
(
2
<
rSelection
.
Len
()
)
if
(
2
<
rSelection
.
Len
()
)
...
@@ -101,7 +100,7 @@ sal_Bool SwTable::IsTblComplexForChart( const String& rSelection,
...
@@ -101,7 +100,7 @@ sal_Bool SwTable::IsTblComplexForChart( const String& rSelection,
}
}
return
!
pSttBox
||
!
pEndBox
||
!::
ChkChartSel
(
*
pSttBox
->
GetSttNd
(),
return
!
pSttBox
||
!
pEndBox
||
!::
ChkChartSel
(
*
pSttBox
->
GetSttNd
(),
*
pEndBox
->
GetSttNd
()
,
pGetCLines
);
*
pEndBox
->
GetSttNd
()
);
}
}
void
SwDoc
::
DoUpdateAllCharts
()
void
SwDoc
::
DoUpdateAllCharts
()
...
...
sw/source/core/frmedt/tblsel.cxx
Dosyayı görüntüle @
7cd899bc
...
@@ -437,8 +437,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
...
@@ -437,8 +437,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
sal_Bool
ChkChartSel
(
const
SwNode
&
rSttNd
,
const
SwNode
&
rEndNd
,
sal_Bool
ChkChartSel
(
const
SwNode
&
rSttNd
,
const
SwNode
&
rEndNd
)
SwChartLines
*
pGetCLines
)
{
{
const
SwTableNode
*
pTNd
=
rSttNd
.
FindTableNode
();
const
SwTableNode
*
pTNd
=
rSttNd
.
FindTableNode
();
if
(
!
pTNd
)
if
(
!
pTNd
)
...
@@ -645,25 +644,6 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
...
@@ -645,25 +644,6 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
else
if
(
nRowCells
!=
nCellCnt
)
else
if
(
nRowCells
!=
nCellCnt
)
bValidChartSel
=
sal_False
;
bValidChartSel
=
sal_False
;
}
}
if
(
bValidChartSel
&&
pGetCLines
)
{
nYPos
=
LONG_MAX
;
SwChartBoxes
*
pBoxes
=
0
;
for
(
n
=
0
;
n
<
aCellFrms
.
size
();
++
n
)
{
const
_Sort_CellFrm
&
rCF
=
aCellFrms
[
n
];
if
(
(
rCF
.
pFrm
->
Frm
().
*
fnRect
->
fnGetTop
)()
!=
nYPos
)
{
pBoxes
=
new
SwChartBoxes
();
pBoxes
->
reserve
(
255
<
nRowCells
?
255
:
(
sal_uInt8
)
nRowCells
);
pGetCLines
->
push_back
(
pBoxes
);
nYPos
=
(
rCF
.
pFrm
->
Frm
().
*
fnRect
->
fnGetTop
)();
}
SwTableBoxPtr
pBox
=
(
SwTableBox
*
)
rCF
.
pFrm
->
GetTabBox
();
pBoxes
->
push_back
(
pBox
);
}
}
}
}
if
(
bTblIsValid
)
if
(
bTblIsValid
)
...
@@ -682,15 +662,10 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
...
@@ -682,15 +662,10 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
break
;
break
;
}
}
--
nLoopMax
;
--
nLoopMax
;
if
(
pGetCLines
)
pGetCLines
->
clear
();
}
while
(
sal_True
);
}
while
(
sal_True
);
OSL_ENSURE
(
nLoopMax
,
"table layout is still invalid!"
);
OSL_ENSURE
(
nLoopMax
,
"table layout is still invalid!"
);
if
(
!
bValidChartSel
&&
pGetCLines
)
pGetCLines
->
clear
();
return
bValidChartSel
;
return
bValidChartSel
;
}
}
...
...
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