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
b570cc6f
Kaydet (Commit)
b570cc6f
authored
Haz 22, 2012
tarafından
Noel Grandin
Kaydeden (comit)
Michael Stahl
Haz 25, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Convert SwShareBoxFmt and SwShareBoxFmts from Svptrarr to std::vector
Change-Id: I9f3b53992af8db54c6e8229c750143a1d5f047a7
üst
2b5aa5cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
19 deletions
+17
-19
tblrwcl.cxx
sw/source/core/doc/tblrwcl.cxx
+12
-14
tblrwcl.hxx
sw/source/core/inc/tblrwcl.hxx
+5
-5
No files found.
sw/source/core/doc/tblrwcl.cxx
Dosyayı görüntüle @
b570cc6f
...
...
@@ -4534,8 +4534,8 @@ sal_Bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
SwFrmFmt
*
SwShareBoxFmt
::
GetFormat
(
long
nWidth
)
const
{
SwFrmFmt
*
pRet
=
0
,
*
pTmp
;
for
(
sal_uInt16
n
=
aNewFmts
.
Count
();
n
;
)
if
(
(
pTmp
=
(
SwFrmFmt
*
)
aNewFmts
[
--
n
])
->
GetFrmSize
().
GetWidth
()
for
(
sal_uInt16
n
=
aNewFmts
.
size
();
n
;
)
if
(
(
pTmp
=
aNewFmts
[
--
n
])
->
GetFrmSize
().
GetWidth
()
==
nWidth
)
{
pRet
=
pTmp
;
...
...
@@ -4550,8 +4550,8 @@ SwFrmFmt* SwShareBoxFmt::GetFormat( const SfxPoolItem& rItem ) const
sal_uInt16
nWhich
=
rItem
.
Which
();
SwFrmFmt
*
pRet
=
0
,
*
pTmp
;
const
SfxPoolItem
&
rFrmSz
=
pOldFmt
->
GetFmtAttr
(
RES_FRM_SIZE
,
sal_False
);
for
(
sal_uInt16
n
=
aNewFmts
.
Count
();
n
;
)
if
(
SFX_ITEM_SET
==
(
pTmp
=
(
SwFrmFmt
*
)
aNewFmts
[
--
n
])
->
for
(
sal_uInt16
n
=
aNewFmts
.
size
();
n
;
)
if
(
SFX_ITEM_SET
==
(
pTmp
=
aNewFmts
[
--
n
])
->
GetItemState
(
nWhich
,
sal_False
,
&
pItem
)
&&
*
pItem
==
rItem
&&
pTmp
->
GetFmtAttr
(
RES_FRM_SIZE
,
sal_False
)
==
rFrmSz
)
{
...
...
@@ -4561,23 +4561,21 @@ SwFrmFmt* SwShareBoxFmt::GetFormat( const SfxPoolItem& rItem ) const
return
pRet
;
}
void
SwShareBoxFmt
::
AddFormat
(
const
SwFrmFmt
&
rNew
)
void
SwShareBoxFmt
::
AddFormat
(
SwFrmFmt
&
rNew
)
{
void
*
pFmt
=
(
void
*
)
&
rNew
;
aNewFmts
.
Insert
(
pFmt
,
aNewFmts
.
Count
()
);
aNewFmts
.
push_back
(
&
rNew
);
}
sal_B
ool
SwShareBoxFmt
::
RemoveFormat
(
const
SwFrmFmt
&
rFmt
)
b
ool
SwShareBoxFmt
::
RemoveFormat
(
const
SwFrmFmt
&
rFmt
)
{
// returns sal_True, if we can delete
if
(
pOldFmt
==
&
rFmt
)
return
sal_True
;
void
*
p
=
(
void
*
)
&
rFmt
;
sal_uInt16
nFnd
=
aNewFmts
.
GetPos
(
p
);
if
(
USHRT_MAX
!=
nFnd
)
aNewFmts
.
Remove
(
nFnd
);
return
0
==
aNewFmts
.
Count
();
std
::
vector
<
SwFrmFmt
*>::
iterator
it
=
std
::
find
(
aNewFmts
.
begin
(),
aNewFmts
.
end
(),
&
rFmt
);
if
(
aNewFmts
.
end
()
!=
it
)
aNewFmts
.
erase
(
it
);
return
aNewFmts
.
empty
();
}
SwShareBoxFmts
::~
SwShareBoxFmts
()
...
...
@@ -4600,7 +4598,7 @@ SwFrmFmt* SwShareBoxFmts::GetFormat( const SwFrmFmt& rFmt,
:
0
;
}
void
SwShareBoxFmts
::
AddFormat
(
const
SwFrmFmt
&
rOld
,
const
SwFrmFmt
&
rNew
)
void
SwShareBoxFmts
::
AddFormat
(
const
SwFrmFmt
&
rOld
,
SwFrmFmt
&
rNew
)
{
{
sal_uInt16
nPos
;
...
...
sw/source/core/inc/tblrwcl.hxx
Dosyayı görüntüle @
b570cc6f
...
...
@@ -159,20 +159,20 @@ void lcl_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara );
class
SwShareBoxFmt
{
const
SwFrmFmt
*
pOldFmt
;
SvPtrarr
aNewFmts
;
std
::
vector
<
SwFrmFmt
*>
aNewFmts
;
public
:
SwShareBoxFmt
(
const
SwFrmFmt
&
rFmt
)
:
pOldFmt
(
&
rFmt
),
aNewFmts
(
1
)
:
pOldFmt
(
&
rFmt
),
aNewFmts
()
{}
const
SwFrmFmt
&
GetOldFormat
()
const
{
return
*
pOldFmt
;
}
SwFrmFmt
*
GetFormat
(
long
nWidth
)
const
;
SwFrmFmt
*
GetFormat
(
const
SfxPoolItem
&
rItem
)
const
;
void
AddFormat
(
const
SwFrmFmt
&
rFmt
);
void
AddFormat
(
SwFrmFmt
&
rFmt
);
// returnt sal_True, wenn geloescht werden kann
sal_B
ool
RemoveFormat
(
const
SwFrmFmt
&
rFmt
);
b
ool
RemoveFormat
(
const
SwFrmFmt
&
rFmt
);
};
...
...
@@ -192,7 +192,7 @@ public:
SwFrmFmt
*
GetFormat
(
const
SwFrmFmt
&
rFmt
,
long
nWidth
)
const
;
SwFrmFmt
*
GetFormat
(
const
SwFrmFmt
&
rFmt
,
const
SfxPoolItem
&
)
const
;
void
AddFormat
(
const
SwFrmFmt
&
rOld
,
const
SwFrmFmt
&
rNew
);
void
AddFormat
(
const
SwFrmFmt
&
rOld
,
SwFrmFmt
&
rNew
);
void
SetSize
(
SwTableBox
&
rBox
,
const
SwFmtFrmSize
&
rSz
);
void
SetAttr
(
SwTableBox
&
rBox
,
const
SfxPoolItem
&
rItem
);
...
...
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