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
b1c47274
Kaydet (Commit)
b1c47274
authored
Eki 02, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: replace boost::ptr_vector with std::vector
Change-Id: Ib3dbe824bd4e747981b69851c6186fd57402ed23
üst
2cf9bc80
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
authfld.hxx
sw/inc/authfld.hxx
+1
-2
authfld.cxx
sw/source/core/fields/authfld.cxx
+5
-5
cnttab.cxx
sw/source/ui/index/cnttab.cxx
+4
-0
gloshdl.cxx
sw/source/uibase/dochdl/gloshdl.cxx
+3
-0
No files found.
sw/inc/authfld.hxx
Dosyayı görüntüle @
b1c47274
...
...
@@ -22,7 +22,6 @@
#include "swdllapi.h"
#include <fldbas.hxx>
#include <toxe.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
#include <sal/log.hxx>
#include <memory>
...
...
@@ -56,7 +55,7 @@ struct SwTOXSortKey
};
class
SwAuthorityField
;
typedef
boost
::
ptr_
vector
<
SwTOXSortKey
>
SortKeyArr
;
typedef
std
::
vector
<
SwTOXSortKey
>
SortKeyArr
;
typedef
std
::
vector
<
std
::
unique_ptr
<
SwAuthEntry
>>
SwAuthDataArr
;
class
SW_DLLPUBLIC
SwAuthorityFieldType
:
public
SwFieldType
...
...
sw/source/core/fields/authfld.cxx
Dosyayı görüntüle @
b1c47274
...
...
@@ -436,23 +436,23 @@ bool SwAuthorityFieldType::PutValue( const Any& rAny, sal_uInt16 nWhichId )
for
(
sal_Int32
i
=
0
;
i
<
aSeq
.
getLength
()
&&
i
<
USHRT_MAX
/
4
;
i
++
)
{
const
PropertyValue
*
pValue
=
pValues
[
i
].
getConstArray
();
SwTOXSortKey
*
pSortKey
=
new
SwTOX
SortKey
;
SwTOXSortKey
a
SortKey
;
for
(
sal_Int32
j
=
0
;
j
<
pValues
[
i
].
getLength
();
j
++
)
{
if
(
pValue
[
j
].
Name
==
UNO_NAME_SORT_KEY
)
{
sal_Int16
nVal
=
-
1
;
pValue
[
j
].
Value
>>=
nVal
;
if
(
nVal
>=
0
&&
nVal
<
AUTH_FIELD_END
)
pSortKey
->
eField
=
(
ToxAuthorityField
)
nVal
;
aSortKey
.
eField
=
(
ToxAuthorityField
)
nVal
;
else
bRet
=
false
;
}
else
if
(
pValue
[
j
].
Name
==
UNO_NAME_IS_SORT_ASCENDING
)
{
pSortKey
->
bSortAscending
=
*
static_cast
<
sal_Bool
const
*>
(
pValue
[
j
].
Value
.
getValue
());
aSortKey
.
bSortAscending
=
*
static_cast
<
sal_Bool
const
*>
(
pValue
[
j
].
Value
.
getValue
());
}
}
m_SortKeyArr
.
push_back
(
p
SortKey
);
m_SortKeyArr
.
push_back
(
a
SortKey
);
}
}
}
...
...
@@ -488,7 +488,7 @@ void SwAuthorityFieldType::SetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey aKeys[
m_SortKeyArr
.
clear
();
for
(
sal_uInt16
i
=
0
;
i
<
nKeyCount
;
i
++
)
if
(
aKeys
[
i
].
eField
<
AUTH_FIELD_END
)
m_SortKeyArr
.
push_back
(
new
SwTOXSortKey
(
aKeys
[
i
]));
m_SortKeyArr
.
push_back
(
SwTOXSortKey
(
aKeys
[
i
]));
}
SwAuthorityField
::
SwAuthorityField
(
SwAuthorityFieldType
*
pInitType
,
...
...
sw/source/ui/index/cnttab.cxx
Dosyayı görüntüle @
b1c47274
...
...
@@ -78,6 +78,10 @@
#include <sfx2/app.hxx>
#include <unomid.h>
#include <boost/ptr_container/ptr_vector.hpp>
using
namespace
::
com
::
sun
::
star
;
using
namespace
::
com
::
sun
::
star
::
lang
;
using
namespace
::
com
::
sun
::
star
::
uno
;
...
...
sw/source/uibase/dochdl/gloshdl.cxx
Dosyayı görüntüle @
b1c47274
...
...
@@ -58,6 +58,9 @@
#include <misc.hrc>
#include <IDocumentFieldsAccess.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
using
namespace
::
com
::
sun
::
star
;
...
...
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