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
be5b8202
Kaydet (Commit)
be5b8202
authored
Eyl 10, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert various bits in editeng from String to OUString
Change-Id: If8b0da1e6b6e3f1f0a0f4946c7741fd5aec66aa6
üst
d169dd26
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
outliner.cxx
editeng/source/outliner/outliner.cxx
+4
-4
outlvw.cxx
editeng/source/outliner/outlvw.cxx
+4
-4
svxrtf.cxx
editeng/source/rtf/svxrtf.cxx
+6
-6
No files found.
editeng/source/outliner/outliner.cxx
Dosyayı görüntüle @
be5b8202
...
@@ -109,7 +109,7 @@ Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 nAbsPos, sal_Int16
...
@@ -109,7 +109,7 @@ Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 nAbsPos, sal_Int16
ImplBlockInsertionCallbacks
(
sal_True
);
ImplBlockInsertionCallbacks
(
sal_True
);
pPara
=
new
Paragraph
(
nDepth
);
pPara
=
new
Paragraph
(
nDepth
);
pParaList
->
Insert
(
pPara
,
nAbsPos
);
pParaList
->
Insert
(
pPara
,
nAbsPos
);
pEditEngine
->
InsertParagraph
(
nAbsPos
,
String
()
);
pEditEngine
->
InsertParagraph
(
nAbsPos
,
OU
String
()
);
DBG_ASSERT
(
pPara
==
pParaList
->
GetParagraph
(
nAbsPos
),
"Insert:Failed"
);
DBG_ASSERT
(
pPara
==
pParaList
->
GetParagraph
(
nAbsPos
),
"Insert:Failed"
);
ImplInitDepth
(
nAbsPos
,
nDepth
,
sal_False
);
ImplInitDepth
(
nAbsPos
,
nDepth
,
sal_False
);
pHdlParagraph
=
pPara
;
pHdlParagraph
=
pPara
;
...
@@ -749,8 +749,8 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet*
...
@@ -749,8 +749,8 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet*
if
(
nDepth
<
0
)
if
(
nDepth
<
0
)
nDepth
=
0
;
nDepth
=
0
;
String
aNewStyleSheetName
(
pStyle
->
GetName
()
);
OU
String
aNewStyleSheetName
(
pStyle
->
GetName
()
);
aNewStyleSheetName
.
Erase
(
aNewStyleSheetName
.
Len
()
-
1
,
1
);
aNewStyleSheetName
=
aNewStyleSheetName
.
copy
(
0
,
aNewStyleSheetName
.
getLength
()
-
1
);
aNewStyleSheetName
+=
OUString
::
number
(
nDepth
+
1
);
aNewStyleSheetName
+=
OUString
::
number
(
nDepth
+
1
);
SfxStyleSheet
*
pNewStyle
=
(
SfxStyleSheet
*
)
GetStyleSheetPool
()
->
Find
(
aNewStyleSheetName
,
pStyle
->
GetFamily
()
);
SfxStyleSheet
*
pNewStyle
=
(
SfxStyleSheet
*
)
GetStyleSheetPool
()
->
Find
(
aNewStyleSheetName
,
pStyle
->
GetFamily
()
);
DBG_ASSERT
(
pNewStyle
,
"AutoStyleSheetName - Style not found!"
);
DBG_ASSERT
(
pNewStyle
,
"AutoStyleSheetName - Style not found!"
);
...
@@ -1522,7 +1522,7 @@ Size Outliner::ImplGetBulletSize( sal_Int32 nPara )
...
@@ -1522,7 +1522,7 @@ Size Outliner::ImplGetBulletSize( sal_Int32 nPara )
}
}
else
if
(
pFmt
->
GetNumberingType
()
!=
SVX_NUM_BITMAP
)
else
if
(
pFmt
->
GetNumberingType
()
!=
SVX_NUM_BITMAP
)
{
{
String
aBulletText
=
ImplGetBulletText
(
nPara
);
OU
String
aBulletText
=
ImplGetBulletText
(
nPara
);
OutputDevice
*
pRefDev
=
pEditEngine
->
GetRefDevice
();
OutputDevice
*
pRefDev
=
pEditEngine
->
GetRefDevice
();
Font
aBulletFont
(
ImpCalcBulletFont
(
nPara
)
);
Font
aBulletFont
(
ImpCalcBulletFont
(
nPara
)
);
Font
aRefFont
(
pRefDev
->
GetFont
());
Font
aRefFont
(
pRefDev
->
GetFont
());
...
...
editeng/source/outliner/outlvw.cxx
Dosyayı görüntüle @
be5b8202
...
@@ -77,7 +77,7 @@ void OutlinerView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
...
@@ -77,7 +77,7 @@ void OutlinerView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
// For the first Paint/KeyInput/Drop an emty Outliner is turned into
// For the first Paint/KeyInput/Drop an emty Outliner is turned into
// an Outliner with exactly one paragraph.
// an Outliner with exactly one paragraph.
if
(
pOwner
->
bFirstParaIsEmpty
)
if
(
pOwner
->
bFirstParaIsEmpty
)
pOwner
->
Insert
(
String
()
);
pOwner
->
Insert
(
OU
String
()
);
pEditView
->
Paint
(
rRect
,
pTargetDevice
);
pEditView
->
Paint
(
rRect
,
pTargetDevice
);
}
}
...
@@ -89,7 +89,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
...
@@ -89,7 +89,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
// For the first Paint/KeyInput/Drop an emty Outliner is turned into
// For the first Paint/KeyInput/Drop an emty Outliner is turned into
// an Outliner with exactly one paragraph.
// an Outliner with exactly one paragraph.
if
(
pOwner
->
bFirstParaIsEmpty
)
if
(
pOwner
->
bFirstParaIsEmpty
)
pOwner
->
Insert
(
String
()
);
pOwner
->
Insert
(
OU
String
()
);
sal_Bool
bKeyProcessed
=
sal_False
;
sal_Bool
bKeyProcessed
=
sal_False
;
...
@@ -218,7 +218,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
...
@@ -218,7 +218,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
SAL_WARN_IF
(
nTemp
<
0
,
"editeng"
,
"OutlinerView::PostKeyEvent - overflow"
);
SAL_WARN_IF
(
nTemp
<
0
,
"editeng"
,
"OutlinerView::PostKeyEvent - overflow"
);
if
(
nTemp
>=
0
)
if
(
nTemp
>=
0
)
{
{
pOwner
->
Insert
(
String
(),
nTemp
,
pPara
->
GetDepth
());
pOwner
->
Insert
(
OU
String
(),
nTemp
,
pPara
->
GetDepth
());
// Position the cursor
// Position the cursor
ESelection
aTmpSel
(
nTemp
,
0
,
nTemp
,
0
);
ESelection
aTmpSel
(
nTemp
,
0
,
nTemp
,
0
);
pEditView
->
SetSelection
(
aTmpSel
);
pEditView
->
SetSelection
(
aTmpSel
);
...
@@ -236,7 +236,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
...
@@ -236,7 +236,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
pOwner
->
UndoActionStart
(
OLUNDO_INSERT
);
pOwner
->
UndoActionStart
(
OLUNDO_INSERT
);
sal_Int32
nTemp
=
aSel
.
nEndPara
;
sal_Int32
nTemp
=
aSel
.
nEndPara
;
nTemp
++
;
nTemp
++
;
pOwner
->
Insert
(
String
(),
nTemp
,
pPara
->
GetDepth
()
+
1
);
pOwner
->
Insert
(
OU
String
(),
nTemp
,
pPara
->
GetDepth
()
+
1
);
// Position the cursor
// Position the cursor
ESelection
aTmpSel
(
nTemp
,
0
,
nTemp
,
0
);
ESelection
aTmpSel
(
nTemp
,
0
,
nTemp
,
0
);
...
...
editeng/source/rtf/svxrtf.cxx
Dosyayı görüntüle @
be5b8202
...
@@ -460,7 +460,7 @@ void SvxRTFParser::ReadFontTable()
...
@@ -460,7 +460,7 @@ void SvxRTFParser::ReadFontTable()
int
_nOpenBrakets
=
1
;
// the first was already detected earlier!!
int
_nOpenBrakets
=
1
;
// the first was already detected earlier!!
Font
*
pFont
=
new
Font
();
Font
*
pFont
=
new
Font
();
short
nFontNo
(
0
),
nInsFontNo
(
0
);
short
nFontNo
(
0
),
nInsFontNo
(
0
);
String
sAltNm
,
sFntNm
;
OU
String
sAltNm
,
sFntNm
;
sal_Bool
bIsAltFntNm
=
sal_False
,
bCheckNewFont
;
sal_Bool
bIsAltFntNm
=
sal_False
,
bCheckNewFont
;
CharSet
nSystemChar
=
lcl_GetDefaultTextEncodingForRTF
();
CharSet
nSystemChar
=
lcl_GetDefaultTextEncodingForRTF
();
...
@@ -567,18 +567,18 @@ void SvxRTFParser::ReadFontTable()
...
@@ -567,18 +567,18 @@ void SvxRTFParser::ReadFontTable()
break
;
break
;
}
}
if
(
bCheckNewFont
&&
1
>=
_nOpenBrakets
&&
sFntNm
.
Len
()
)
// one font is ready
if
(
bCheckNewFont
&&
1
>=
_nOpenBrakets
&&
!
sFntNm
.
isEmpty
()
)
// one font is ready
{
{
// All data from the font is available, so off to the table
// All data from the font is available, so off to the table
if
(
sAltNm
.
Len
())
if
(
!
sAltNm
.
isEmpty
())
(
sFntNm
+=
';'
)
+=
sAltNm
;
sFntNm
=
sFntNm
+
";"
+
sAltNm
;
pFont
->
SetName
(
sFntNm
);
pFont
->
SetName
(
sFntNm
);
aFontTbl
.
insert
(
nInsFontNo
,
pFont
);
aFontTbl
.
insert
(
nInsFontNo
,
pFont
);
pFont
=
new
Font
();
pFont
=
new
Font
();
pFont
->
SetCharSet
(
nSystemChar
);
pFont
->
SetCharSet
(
nSystemChar
);
sAltNm
.
Erase
()
;
sAltNm
=
""
;
sFntNm
.
Erase
()
;
sFntNm
=
""
;
}
}
}
}
// the last one we have to delete manually
// the last one we have to delete manually
...
...
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