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
2552420c
Kaydet (Commit)
2552420c
authored
Nis 25, 2012
tarafından
Noel Grandin
Kaydeden (comit)
Michael Stahl
May 09, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Convert SV_DECL_PTRARR_DEL(SfxItemSets) to boost::ptr_vector
üst
b9f344ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
+10
-12
untbl.cxx
sw/source/core/undo/untbl.cxx
+10
-12
No files found.
sw/source/core/undo/untbl.cxx
Dosyayı görüntüle @
2552420c
...
...
@@ -84,8 +84,7 @@
extern
void
ClearFEShellTabCols
();
typedef
SfxItemSet
*
SfxItemSetPtr
;
SV_DECL_PTRARR_DEL
(
SfxItemSets
,
SfxItemSetPtr
,
10
)
typedef
boost
::
ptr_vector
<
SfxItemSet
>
SfxItemSets
;
class
SwUndoSaveSections
:
public
boost
::
ptr_vector
<
SwUndoSaveSection
>
{
public
:
...
...
@@ -221,8 +220,6 @@ struct SwTblToTxtSave
~
SwTblToTxtSave
()
{
delete
m_pHstry
;
}
};
SV_IMPL_PTRARR
(
SfxItemSets
,
SfxItemSetPtr
)
sal_uInt16
aSave_BoxCntntSet
[]
=
{
RES_CHRATR_COLOR
,
RES_CHRATR_CROSSEDOUT
,
RES_CHRATR_FONT
,
RES_CHRATR_FONTSIZE
,
...
...
@@ -952,7 +949,8 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine )
((
SwTblBoxFormula
*
)
pItem
)
->
ChgDefinedIn
(
0
);
}
}
aSets
.
Insert
(
pSet
,
(
nRet
=
aSets
.
Count
()
)
);
nRet
=
aSets
.
size
();
aSets
.
push_back
(
pSet
);
aFrmFmts
.
Insert
(
pFmt
,
nRet
);
}
return
nRet
;
...
...
@@ -988,7 +986,7 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, sal_Bool bMdfyBox )
// FrmFmts mit Defaults (0) fuellen
pFmt
=
0
;
for
(
n
=
aSets
.
Count
();
n
;
--
n
)
for
(
n
=
aSets
.
size
();
n
;
--
n
)
aFrmFmts
.
Insert
(
pFmt
,
aFrmFmts
.
Count
()
);
sal_uInt16
nLnCnt
=
nLineCount
;
...
...
@@ -1045,7 +1043,7 @@ void _SaveTable::CreateNew( SwTable& rTbl, sal_Bool bCreateFrms,
// FrmFmts mit Defaults (0) fuellen
pFmt
=
0
;
for
(
n
=
aSets
.
Count
();
n
;
--
n
)
for
(
n
=
aSets
.
size
();
n
;
--
n
)
aFrmFmts
.
Insert
(
pFmt
,
aFrmFmts
.
Count
()
);
pLine
->
CreateNew
(
rTbl
,
aParent
,
*
this
);
...
...
@@ -1127,7 +1125,7 @@ void _SaveTable::NewFrmFmt( const SwTableLine* pTblLn, const SwTableBox* pTblBx,
pFmt
=
pDoc
->
MakeTableLineFmt
();
else
pFmt
=
pDoc
->
MakeTableBoxFmt
();
pFmt
->
SetFmtAttr
(
*
aSets
[
nFmtPos
]
);
pFmt
->
SetFmtAttr
(
aSets
[
nFmtPos
]
);
aFrmFmts
.
Replace
(
pFmt
,
nFmtPos
);
}
...
...
@@ -1223,7 +1221,7 @@ void _SaveLine::CreateNew( SwTable& rTbl, SwTableBox& rParent, _SaveTable& rSTbl
{
SwDoc
*
pDoc
=
rTbl
.
GetFrmFmt
()
->
GetDoc
();
pFmt
=
pDoc
->
MakeTableLineFmt
();
pFmt
->
SetFmtAttr
(
*
rSTbl
.
aSets
[
nItemSet
]
);
pFmt
->
SetFmtAttr
(
rSTbl
.
aSets
[
nItemSet
]
);
rSTbl
.
aFrmFmts
.
Replace
(
pFmt
,
nItemSet
);
}
SwTableLine
*
pNew
=
new
SwTableLine
(
pFmt
,
1
,
&
rParent
);
...
...
@@ -1318,7 +1316,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
SwCntntNode
*
pCNd
=
rNds
[
n
]
->
GetCntntNode
();
if
(
pCNd
)
{
SfxItemSet
*
pSet
=
(
*
Ptrs
.
pCntntAttrs
)[
nSet
++
];
SfxItemSet
*
pSet
=
&
(
*
Ptrs
.
pCntntAttrs
)[
nSet
++
];
if
(
pSet
)
{
sal_uInt16
*
pRstAttr
=
aSave_BoxCntntSet
;
...
...
@@ -1366,7 +1364,7 @@ void _SaveBox::SaveCntntAttrs( SwDoc* pDoc )
pSet
->
Put
(
*
pCNd
->
GetpSwAttrSet
()
);
}
Ptrs
.
pCntntAttrs
->
Insert
(
pSet
,
Ptrs
.
pCntntAttrs
->
Count
()
);
Ptrs
.
pCntntAttrs
->
push_back
(
pSet
);
}
}
}
...
...
@@ -1382,7 +1380,7 @@ void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl
{
SwDoc
*
pDoc
=
rTbl
.
GetFrmFmt
()
->
GetDoc
();
pFmt
=
pDoc
->
MakeTableBoxFmt
();
pFmt
->
SetFmtAttr
(
*
rSTbl
.
aSets
[
nItemSet
]
);
pFmt
->
SetFmtAttr
(
rSTbl
.
aSets
[
nItemSet
]
);
rSTbl
.
aFrmFmts
.
Replace
(
pFmt
,
nItemSet
);
}
...
...
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