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
d486b2b3
Kaydet (Commit)
d486b2b3
authored
Eki 21, 2013
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Related: fdo#38838 remove/privatize String::Append
Change-Id: I5ae90b02e7ae5ddd19495fd0847b7e9dfc4419e8
üst
8fc69056
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
39 deletions
+1
-39
string.hxx
include/tools/string.hxx
+1
-18
tustring.cxx
tools/source/string/tustring.cxx
+0
-21
No files found.
include/tools/string.hxx
Dosyayı görüntüle @
d486b2b3
...
@@ -107,6 +107,7 @@ private:
...
@@ -107,6 +107,7 @@ private:
xub_StrLen
nLen
=
STRING_LEN
)
const
;
xub_StrLen
nLen
=
STRING_LEN
)
const
;
UniString
&
Assign
(
const
OUString
&
rStr
);
UniString
&
Assign
(
const
OUString
&
rStr
);
UniString
&
Append
(
const
UniString
&
rStr
);
UniString
(
const
int
*
pDummy
);
// not implemented: to prevent UniString( NULL )
UniString
(
const
int
*
pDummy
);
// not implemented: to prevent UniString( NULL )
UniString
(
int
);
// not implemented; to detect misuses of
UniString
(
int
);
// not implemented; to detect misuses of
...
@@ -115,8 +116,6 @@ private:
...
@@ -115,8 +116,6 @@ private:
// of operator =(sal_Unicode)
// of operator =(sal_Unicode)
void
Append
(
int
);
// not implemented; to detect misuses of
void
Append
(
int
);
// not implemented; to detect misuses of
// Append(sal_Unicode)
// Append(sal_Unicode)
void
operator
+=
(
int
);
// not implemented; to detect misuses
// of operator +=(sal_Unicode)
//detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
//detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
TOOLS_DLLPRIVATE
UniString
(
const
sal_Char
*
,
sal_Int32
);
TOOLS_DLLPRIVATE
UniString
(
const
sal_Char
*
,
sal_Int32
);
...
@@ -133,12 +132,6 @@ private:
...
@@ -133,12 +132,6 @@ private:
TOOLS_DLLPRIVATE
UniString
(
const
sal_Unicode
*
pCharStr
);
TOOLS_DLLPRIVATE
UniString
(
const
sal_Unicode
*
pCharStr
);
TOOLS_DLLPRIVATE
UniString
(
const
sal_Unicode
*
pCharStr
,
xub_StrLen
nLen
);
TOOLS_DLLPRIVATE
UniString
(
const
sal_Unicode
*
pCharStr
,
xub_StrLen
nLen
);
TOOLS_DLLPRIVATE
UniString
(
sal_Unicode
c
);
TOOLS_DLLPRIVATE
UniString
(
sal_Unicode
c
);
TOOLS_DLLPRIVATE
UniString
&
Append
(
const
sal_Unicode
*
pCharStr
);
TOOLS_DLLPRIVATE
UniString
&
Append
(
const
sal_Unicode
*
pCharStr
,
xub_StrLen
nLen
);
TOOLS_DLLPRIVATE
UniString
&
Expand
(
xub_StrLen
nCount
,
sal_Unicode
cExpandChar
);
TOOLS_DLLPRIVATE
UniString
&
operator
+=
(
const
sal_Unicode
*
pCharStr
);
public
:
public
:
UniString
();
UniString
();
UniString
(
const
ResId
&
rResId
);
UniString
(
const
ResId
&
rResId
);
...
@@ -175,18 +168,8 @@ public:
...
@@ -175,18 +168,8 @@ public:
UniString
&
operator
=
(
const
OUString
&
rStr
)
UniString
&
operator
=
(
const
OUString
&
rStr
)
{
return
Assign
(
rStr
);
}
{
return
Assign
(
rStr
);
}
UniString
&
Append
(
const
UniString
&
rStr
);
UniString
&
Append
(
sal_Unicode
c
);
UniString
&
Append
(
char
c
)
// ...but allow "Append('a')"
{
return
Append
(
static_cast
<
sal_Unicode
>
(
c
));
}
UniString
&
operator
+=
(
const
UniString
&
rStr
)
{
return
Append
(
rStr
);
}
UniString
&
operator
+=
(
const
OUString
&
rStr
)
UniString
&
operator
+=
(
const
OUString
&
rStr
)
{
return
Append
(
UniString
(
rStr
)
);
}
{
return
Append
(
UniString
(
rStr
)
);
}
UniString
&
operator
+=
(
sal_Unicode
c
)
{
return
Append
(
c
);
}
UniString
&
operator
+=
(
char
c
)
// ...but allow "+= 'a'"
{
return
operator
+=
(
static_cast
<
sal_Unicode
>
(
c
));
}
xub_StrLen
Len
()
const
{
return
(
xub_StrLen
)
mpData
->
mnLen
;
}
xub_StrLen
Len
()
const
{
return
(
xub_StrLen
)
mpData
->
mnLen
;
}
...
...
tools/source/string/tustring.cxx
Dosyayı görüntüle @
d486b2b3
...
@@ -79,27 +79,6 @@ sal_Bool operator==(const UniString& rStr1, const UniString& rStr2)
...
@@ -79,27 +79,6 @@ sal_Bool operator==(const UniString& rStr1, const UniString& rStr2)
return
(
ImplStringCompareWithoutZero
(
rStr1
.
mpData
->
maStr
,
rStr2
.
mpData
->
maStr
,
rStr1
.
mpData
->
mnLen
)
==
0
);
return
(
ImplStringCompareWithoutZero
(
rStr1
.
mpData
->
maStr
,
rStr2
.
mpData
->
maStr
,
rStr1
.
mpData
->
mnLen
)
==
0
);
}
}
STRING
&
STRING
::
Append
(
STRCODE
c
)
{
// don't append null characters and keep string length < maxlen
sal_Int32
nLen
=
mpData
->
mnLen
;
if
(
c
&&
(
nLen
<
STRING_MAXLEN
)
)
{
// allocate string of new size
STRINGDATA
*
pNewData
=
ImplAllocData
(
nLen
+
1
);
// copy string
memcpy
(
pNewData
->
maStr
,
mpData
->
maStr
,
nLen
*
sizeof
(
STRCODE
)
);
pNewData
->
maStr
[
nLen
]
=
c
;
// free old string
STRING_RELEASE
((
STRING_TYPE
*
)
mpData
);
mpData
=
pNewData
;
}
return
*
this
;
}
xub_StrLen
ImplStringLen
(
const
sal_Char
*
pStr
)
xub_StrLen
ImplStringLen
(
const
sal_Char
*
pStr
)
{
{
const
sal_Char
*
pTempStr
=
pStr
;
const
sal_Char
*
pTempStr
=
pStr
;
...
...
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