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
eaef6193
Kaydet (Commit)
eaef6193
authored
Eyl 10, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert editeng/source/uno/*.cxx from String to OUString
Change-Id: If709d2ce0aea90133b2b243bb9ecb77d64ca065b
üst
94be5692
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
22 deletions
+21
-22
unoedprx.cxx
editeng/source/uno/unoedprx.cxx
+15
-16
unofield.cxx
editeng/source/uno/unofield.cxx
+3
-3
unotext.cxx
editeng/source/uno/unotext.cxx
+3
-3
No files found.
editeng/source/uno/unoedprx.cxx
Dosyayı görüntüle @
eaef6193
...
...
@@ -472,7 +472,7 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
::
std
::
swap
(
aStartIndex
,
aEndIndex
);
}
String
sStr
=
mrTextForwarder
->
GetText
(
MakeEESelection
(
aStartIndex
,
aEndIndex
)
);
OU
String
sStr
=
mrTextForwarder
->
GetText
(
MakeEESelection
(
aStartIndex
,
aEndIndex
)
);
// trim field text, if necessary
if
(
aStartIndex
.
InField
()
)
...
...
@@ -481,15 +481,15 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
aStartIndex
.
GetFieldOffset
()
<=
USHRT_MAX
,
"SvxAccessibleTextIndex::GetText: index value overflow"
);
sStr
.
Erase
(
0
,
static_cast
<
sal_uInt16
>
(
aStartIndex
.
GetFieldOffset
()
)
);
sStr
=
sStr
.
copy
(
aStartIndex
.
GetFieldOffset
(
)
);
}
if
(
aEndIndex
.
InField
()
&&
aEndIndex
.
GetFieldOffset
()
)
{
DBG_ASSERT
(
sStr
.
Len
()
-
(
aEndIndex
.
GetFieldLen
()
-
aEndIndex
.
GetFieldOffset
())
>=
0
&&
sStr
.
Len
()
-
(
aEndIndex
.
GetFieldLen
()
-
aEndIndex
.
GetFieldOffset
())
<=
USHRT_MAX
,
DBG_ASSERT
(
sStr
.
getLength
()
-
(
aEndIndex
.
GetFieldLen
()
-
aEndIndex
.
GetFieldOffset
())
>=
0
&&
sStr
.
getLength
()
-
(
aEndIndex
.
GetFieldLen
()
-
aEndIndex
.
GetFieldOffset
())
<=
USHRT_MAX
,
"SvxAccessibleTextIndex::GetText: index value overflow"
);
sStr
=
sStr
.
Copy
(
0
,
static_cast
<
sal_uInt16
>
(
sStr
.
Len
()
-
(
aEndIndex
.
GetFieldLen
()
-
aEndIndex
.
GetFieldOffset
()
))
);
sStr
=
sStr
.
copy
(
0
,
sStr
.
getLength
()
-
(
aEndIndex
.
GetFieldLen
()
-
aEndIndex
.
GetFieldOffset
(
))
);
}
EBulletInfo
aBulletInfo1
=
GetBulletInfo
(
aStartIndex
.
GetParagraph
()
);
...
...
@@ -498,13 +498,13 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
if
(
aStartIndex
.
InBullet
()
)
{
// prepend leading bullet
String
sBullet
=
aBulletInfo1
.
aText
;
OU
String
sBullet
=
aBulletInfo1
.
aText
;
DBG_ASSERT
(
aStartIndex
.
GetBulletOffset
()
>=
0
&&
aStartIndex
.
GetBulletOffset
()
<=
USHRT_MAX
,
"SvxAccessibleTextIndex::GetText: index value overflow"
);
sBullet
.
Erase
(
0
,
static_cast
<
sal_uInt16
>
(
aStartIndex
.
GetBulletOffset
()
)
);
sBullet
=
sBullet
.
copy
(
aStartIndex
.
GetBulletOffset
(
)
);
sBullet
+=
sStr
;
sStr
=
sBullet
;
...
...
@@ -515,26 +515,25 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
// append trailing bullet
sStr
+=
aBulletInfo2
.
aText
;
DBG_ASSERT
(
sStr
.
Len
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
>=
0
&&
sStr
.
Len
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
<=
USHRT_MAX
,
DBG_ASSERT
(
sStr
.
getLength
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
>=
0
&&
sStr
.
getLength
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
<=
USHRT_MAX
,
"SvxAccessibleTextIndex::GetText: index value overflow"
);
sStr
=
sStr
.
Copy
(
0
,
static_cast
<
sal_uInt16
>
(
sStr
.
Len
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
()
))
);
sStr
=
sStr
.
copy
(
0
,
sStr
.
getLength
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
(
))
);
}
else
if
(
aStartIndex
.
GetParagraph
()
!=
aEndIndex
.
GetParagraph
()
&&
HaveTextBullet
(
aEndIndex
.
GetParagraph
()
)
)
{
String
sBullet
=
aBulletInfo2
.
aText
;
OU
String
sBullet
=
aBulletInfo2
.
aText
;
DBG_ASSERT
(
sBullet
.
Len
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
>=
0
&&
sBullet
.
Len
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
<=
USHRT_MAX
,
DBG_ASSERT
(
sBullet
.
getLength
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
>=
0
&&
sBullet
.
getLength
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
())
<=
USHRT_MAX
,
"SvxAccessibleTextIndex::GetText: index value overflow"
);
sBullet
=
sBullet
.
Copy
(
0
,
static_cast
<
sal_uInt16
>
(
sBullet
.
Len
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
()
))
);
sBullet
=
sBullet
.
copy
(
0
,
sBullet
.
getLength
()
-
(
aEndIndex
.
GetBulletLen
()
-
aEndIndex
.
GetBulletOffset
(
))
);
// insert bullet
sStr
.
Insert
(
sBullet
,
static_cast
<
sal_uInt16
>
(
GetTextLen
(
aStartIndex
.
GetParagraph
())
-
aStartIndex
.
GetIndex
())
);
sStr
=
sStr
.
replaceAt
(
GetTextLen
(
aStartIndex
.
GetParagraph
())
-
aStartIndex
.
GetIndex
(),
0
,
sBullet
);
}
return
sStr
;
...
...
editeng/source/uno/unofield.cxx
Dosyayı görüntüle @
eaef6193
...
...
@@ -448,9 +448,9 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
case
text
:
:
textfield
::
Type
::
AUTHOR
:
{
OUString
aContent
;
String
aFirstName
;
String
aLastName
;
String
aEmpty
;
OU
String
aFirstName
;
OU
String
aLastName
;
OU
String
aEmpty
;
// do we have CurrentPresentation given?
// mimic behaviour of writer, which means:
...
...
editeng/source/uno/unotext.cxx
Dosyayı görüntüle @
eaef6193
...
...
@@ -392,7 +392,7 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString)
{
CheckSelection
(
maSelection
,
pForwarder
);
String
aConverted
(
convertLineEnd
(
aString
,
LINEEND_LF
));
// Simply count the number of line endings
OU
String
aConverted
(
convertLineEnd
(
aString
,
LINEEND_LF
));
// Simply count the number of line endings
pForwarder
->
QuickInsertText
(
aConverted
,
maSelection
);
mpEditSource
->
UpdateData
();
...
...
@@ -402,7 +402,7 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString)
//! on QuickInsertText...
CollapseToStart
();
sal_uInt16
nLen
=
aConverted
.
Len
();
sal_uInt16
nLen
=
aConverted
.
getLength
();
if
(
nLen
)
GoRight
(
nLen
,
sal_True
);
}
...
...
@@ -1891,7 +1891,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
if
(
bAbsorb
)
{
const
String
aEmpty
;
const
OU
String
aEmpty
;
pForwarder
->
QuickInsertText
(
aEmpty
,
aRange
);
aRange
.
nEndPos
=
aRange
.
nStartPos
;
...
...
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