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
05d46a4a
Kaydet (Commit)
05d46a4a
authored
Haz 15, 2012
tarafından
Noel Grandin
Kaydeden (comit)
Michael Stahl
Haz 20, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Convert SV_DECL_PTRARR(SwTOXMarks) to std::vector
Change-Id: Idffc8a90fcd4ada856339fc0be3e4a11478db6cc
üst
36387c8c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
17 deletions
+15
-17
tox.hxx
sw/inc/tox.hxx
+1
-1
doctxm.cxx
sw/source/core/doc/doctxm.cxx
+4
-4
edtox.cxx
sw/source/core/edit/edtox.cxx
+1
-1
tox.cxx
sw/source/core/tox/tox.cxx
+1
-3
unoidx.cxx
sw/source/core/unocore/unoidx.cxx
+3
-3
toxmgr.hxx
sw/source/ui/inc/toxmgr.hxx
+1
-1
toxmgr.cxx
sw/source/ui/index/toxmgr.cxx
+3
-3
textidx.cxx
sw/source/ui/shells/textidx.cxx
+1
-1
No files found.
sw/inc/tox.hxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -57,7 +57,7 @@ class SwTOXMark;
class
SwTxtTOXMark
;
class
SwDoc
;
SV_DECL_PTRARR
(
SwTOXMarks
,
SwTOXMark
*
,
0
)
class
SwTOXMarks
:
public
std
::
vector
<
SwTOXMark
*>
{};
/*--------------------------------------------------------------------
Description: Entry of content index, alphabetical index or user defined index
...
...
sw/source/core/doc/doctxm.cxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -159,10 +159,10 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
// the attributes are sorted by Start!
break
;
const
SwTOXMark
*
pTMark
=
&
pHt
->
GetTOXMark
();
rArr
.
Insert
(
pTMark
,
rArr
.
Count
()
);
SwTOXMark
*
pTMark
=
(
SwTOXMark
*
)
&
pHt
->
GetTOXMark
();
rArr
.
push_back
(
pTMark
);
}
return
rArr
.
Count
();
return
rArr
.
size
();
}
/*--------------------------------------------------------------------
...
...
@@ -253,7 +253,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
const
SwTOXMark
*
pTOXMark
;
const
SwCntntFrm
*
pCFrm
;
Point
aPt
;
for
(
sal_Int32
nMark
=
0
;
nMark
<
aMarks
.
Count
();
nMark
++
)
for
(
sal_Int32
nMark
=
0
;
nMark
<
(
sal_Int32
)
aMarks
.
size
();
nMark
++
)
{
pTOXMark
=
aMarks
[
nMark
];
if
(
pTOXMark
!=
&
rCurTOXMark
&&
...
...
sw/source/core/edit/edtox.cxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -329,7 +329,7 @@ void SwEditShell::ApplyAutoMark()
SwTOXMarks
aMarks
;
SwTOXMark
::
InsertTOXMarks
(
aMarks
,
*
pTOXType
);
for
(
sal_uInt16
nMark
=
0
;
nMark
<
aMarks
.
Count
();
nMark
++
)
for
(
sal_uInt16
nMark
=
0
;
nMark
<
aMarks
.
size
();
nMark
++
)
{
SwTOXMark
*
pMark
=
aMarks
[
nMark
];
if
(
pMark
->
IsAutoGenerated
()
&&
pMark
->
GetTxtTOXMark
())
...
...
sw/source/core/tox/tox.cxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -69,8 +69,6 @@ sal_uInt8 SwForm::nFormChapterMarkLen = 3;
sal_uInt8
SwForm
::
nFormTextLen
=
3
;
sal_uInt8
SwForm
::
nFormAuthLen
=
5
;
SV_IMPL_PTRARR
(
SwTOXMarks
,
SwTOXMark
*
)
TYPEINIT2
(
SwTOXMark
,
SfxPoolItem
,
SwClient
);
// fuers rtti
struct
PatternIni
...
...
@@ -263,7 +261,7 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType )
while
(
pMark
)
{
if
(
pMark
->
GetTxtTOXMark
())
aMarks
.
C40_INSERT
(
SwTOXMark
,
pMark
,
aMarks
.
Count
()
);
aMarks
.
push_back
(
pMark
);
pMark
=
aIter
.
Next
();
}
}
...
...
sw/source/core/unocore/unoidx.cxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -1188,11 +1188,11 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
SwTOXMarks
aMarks
;
const
SwTOXType
*
pType
=
pTOXBase
->
GetTOXType
();
SwTOXMark
::
InsertTOXMarks
(
aMarks
,
*
pType
);
uno
::
Sequence
<
uno
::
Reference
<
text
::
XDocumentIndexMark
>
>
aXMarks
(
aMarks
.
Count
());
uno
::
Sequence
<
uno
::
Reference
<
text
::
XDocumentIndexMark
>
>
aXMarks
(
aMarks
.
size
());
uno
::
Reference
<
text
::
XDocumentIndexMark
>*
pxMarks
=
aXMarks
.
getArray
();
for
(
sal_uInt16
i
=
0
;
i
<
aMarks
.
Count
();
i
++
)
for
(
sal_uInt16
i
=
0
;
i
<
aMarks
.
size
();
i
++
)
{
SwTOXMark
*
pMark
=
aMarks
.
GetObject
(
i
)
;
SwTOXMark
*
pMark
=
aMarks
[
i
]
;
pxMarks
[
i
]
=
SwXDocumentIndexMark
::
CreateXDocumentIndexMark
(
*
m_pImpl
->
m_pDoc
,
*
const_cast
<
SwTOXType
*>
(
pType
),
*
pMark
);
...
...
sw/source/ui/inc/toxmgr.hxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -313,7 +313,7 @@ public:
Description: inlines
--------------------------------------------------------------------*/
inline
sal_uInt16
SwTOXMgr
::
GetTOXMarkCount
()
{
return
aCurMarks
.
Count
();
}
{
return
aCurMarks
.
size
();
}
inline
SwTOXMark
*
SwTOXMgr
::
GetCurTOXMark
()
{
return
pCurTOXMark
;
}
...
...
sw/source/ui/index/toxmgr.cxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -63,7 +63,7 @@ sal_uInt16 SwTOXMgr::GetTOXMarks()
SwTOXMark
*
SwTOXMgr
::
GetTOXMark
(
sal_uInt16
nId
)
{
if
(
aCurMarks
.
Count
()
>
0
)
if
(
!
aCurMarks
.
empty
()
)
return
aCurMarks
[
nId
];
return
0
;
}
...
...
@@ -204,7 +204,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
else
{
SwTOXMark
aCpy
(
*
pCurTOXMark
);
aCurMarks
.
Remove
(
0
,
aCurMarks
.
Count
()
);
aCurMarks
.
clear
(
);
pSh
->
DeleteTOXMark
(
pCurTOXMark
);
aCpy
.
SetAlternativeText
(
*
rDesc
.
GetAltStr
()
);
pSh
->
SwEditShell
::
Insert
(
aCpy
);
...
...
@@ -283,7 +283,7 @@ const SwTOXType* SwTOXMgr::GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const
void
SwTOXMgr
::
SetCurTOXMark
(
sal_uInt16
nId
)
{
pCurTOXMark
=
(
nId
<
aCurMarks
.
Count
())
?
aCurMarks
[
nId
]
:
0
;
pCurTOXMark
=
(
nId
<
aCurMarks
.
size
())
?
aCurMarks
[
nId
]
:
0
;
}
sal_Bool
SwTOXMgr
::
UpdateOrInsertTOX
(
const
SwTOXDescription
&
rDesc
,
...
...
sw/source/ui/shells/textidx.cxx
Dosyayı görüntüle @
05d46a4a
...
...
@@ -222,7 +222,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
{
SwTOXMarks
aArr
;
rSh
.
GetCurTOXMarks
(
aArr
);
if
(
!
aArr
.
Count
())
if
(
aArr
.
empty
())
bEnableEdit
=
sal_False
;
}
...
...
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