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
72e7a1c2
Kaydet (Commit)
72e7a1c2
authored
Agu 25, 2014
tarafından
Matteo Casalin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_uInt16 to sal_Int32
Change-Id: Ie88f25149e12fecb4f932954ddbe7adc868acfc2
üst
fe2b2be9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
17 deletions
+17
-17
accportions.cxx
sw/source/core/access/accportions.cxx
+4
-4
accportions.hxx
sw/source/core/access/accportions.hxx
+4
-4
SwPortionHandler.hxx
sw/source/core/inc/SwPortionHandler.hxx
+4
-4
xmldump.cxx
sw/source/core/text/xmldump.cxx
+5
-5
No files found.
sw/source/core/access/accportions.cxx
Dosyayı görüntüle @
72e7a1c2
...
@@ -98,7 +98,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
...
@@ -98,7 +98,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
delete
pSentences
;
delete
pSentences
;
}
}
void
SwAccessiblePortionData
::
Text
(
sal_
uInt16
nLength
,
sal_uInt16
nType
,
sal_Int32
/*nHeight*/
,
sal_Int32
/*nWidth*/
)
void
SwAccessiblePortionData
::
Text
(
sal_
Int32
nLength
,
sal_uInt16
nType
,
sal_Int32
/*nHeight*/
,
sal_Int32
/*nWidth*/
)
{
{
OSL_ENSURE
(
(
nModelPosition
+
nLength
)
<=
pTxtNode
->
GetTxt
().
getLength
(),
OSL_ENSURE
(
(
nModelPosition
+
nLength
)
<=
pTxtNode
->
GetTxt
().
getLength
(),
"portion exceeds model string!"
);
"portion exceeds model string!"
);
...
@@ -132,7 +132,7 @@ void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
...
@@ -132,7 +132,7 @@ void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
}
}
void
SwAccessiblePortionData
::
Special
(
void
SwAccessiblePortionData
::
Special
(
sal_
uInt16
nLength
,
const
OUString
&
rText
,
sal_uInt16
nType
,
sal_Int32
/*nHeight*/
,
sal_Int32
/*nWidth*/
)
sal_
Int32
nLength
,
const
OUString
&
rText
,
sal_uInt16
nType
,
sal_Int32
/*nHeight*/
,
sal_Int32
/*nWidth*/
)
{
{
OSL_ENSURE
(
nModelPosition
>=
0
,
"illegal position"
);
OSL_ENSURE
(
nModelPosition
>=
0
,
"illegal position"
);
OSL_ENSURE
(
(
nModelPosition
+
nLength
)
<=
pTxtNode
->
GetTxt
().
getLength
(),
OSL_ENSURE
(
(
nModelPosition
+
nLength
)
<=
pTxtNode
->
GetTxt
().
getLength
(),
...
@@ -228,14 +228,14 @@ void SwAccessiblePortionData::Special(
...
@@ -228,14 +228,14 @@ void SwAccessiblePortionData::Special(
bLastIsSpecial
=
true
;
bLastIsSpecial
=
true
;
}
}
void
SwAccessiblePortionData
::
LineBreak
(
sal_
uInt16
/*nWidth*/
)
void
SwAccessiblePortionData
::
LineBreak
(
sal_
Int32
/*nWidth*/
)
{
{
OSL_ENSURE
(
!
bFinished
,
"We are already done!"
);
OSL_ENSURE
(
!
bFinished
,
"We are already done!"
);
aLineBreaks
.
push_back
(
aBuffer
.
getLength
()
);
aLineBreaks
.
push_back
(
aBuffer
.
getLength
()
);
}
}
void
SwAccessiblePortionData
::
Skip
(
sal_
uInt16
nLength
)
void
SwAccessiblePortionData
::
Skip
(
sal_
Int32
nLength
)
{
{
OSL_ENSURE
(
!
bFinished
,
"We are already done!"
);
OSL_ENSURE
(
!
bFinished
,
"We are already done!"
);
OSL_ENSURE
(
aModelPositions
.
empty
(),
"Never Skip() after portions"
);
OSL_ENSURE
(
aModelPositions
.
empty
(),
"Never Skip() after portions"
);
...
...
sw/source/core/access/accportions.hxx
Dosyayı görüntüle @
72e7a1c2
...
@@ -97,10 +97,10 @@ public:
...
@@ -97,10 +97,10 @@ public:
virtual
~
SwAccessiblePortionData
();
virtual
~
SwAccessiblePortionData
();
// SwPortionHandler methods
// SwPortionHandler methods
virtual
void
Text
(
sal_
uInt16
nLength
,
sal_uInt16
nType
,
sal_Int32
nHeight
=
0
,
sal_Int32
nWidth
=
0
)
SAL_OVERRIDE
;
virtual
void
Text
(
sal_
Int32
nLength
,
sal_uInt16
nType
,
sal_Int32
nHeight
=
0
,
sal_Int32
nWidth
=
0
)
SAL_OVERRIDE
;
virtual
void
Special
(
sal_
uInt16
nLength
,
const
OUString
&
rText
,
sal_uInt16
nType
,
sal_Int32
nHeight
=
0
,
sal_Int32
nWidth
=
0
)
SAL_OVERRIDE
;
virtual
void
Special
(
sal_
Int32
nLength
,
const
OUString
&
rText
,
sal_uInt16
nType
,
sal_Int32
nHeight
=
0
,
sal_Int32
nWidth
=
0
)
SAL_OVERRIDE
;
virtual
void
LineBreak
(
sal_
uInt16
nWidth
)
SAL_OVERRIDE
;
virtual
void
LineBreak
(
sal_
Int32
nWidth
)
SAL_OVERRIDE
;
virtual
void
Skip
(
sal_
uInt16
nLength
)
SAL_OVERRIDE
;
virtual
void
Skip
(
sal_
Int32
nLength
)
SAL_OVERRIDE
;
virtual
void
Finish
()
SAL_OVERRIDE
;
virtual
void
Finish
()
SAL_OVERRIDE
;
virtual
void
SetAttrFieldType
(
sal_uInt16
nAttrFldType
)
SAL_OVERRIDE
;
virtual
void
SetAttrFieldType
(
sal_uInt16
nAttrFldType
)
SAL_OVERRIDE
;
...
...
sw/source/core/inc/SwPortionHandler.hxx
Dosyayı görüntüle @
72e7a1c2
...
@@ -52,7 +52,7 @@ public:
...
@@ -52,7 +52,7 @@ public:
* model string.
* model string.
*/
*/
virtual
void
Text
(
virtual
void
Text
(
sal_
uInt16
nLength
,
/// length of this portion in the model string
sal_
Int32
nLength
,
/// length of this portion in the model string
sal_uInt16
nType
,
/// type of this portion
sal_uInt16
nType
,
/// type of this portion
sal_Int32
nHeight
=
0
,
/// height of this portion
sal_Int32
nHeight
=
0
,
/// height of this portion
sal_Int32
nWidth
=
0
/// width of this portion
sal_Int32
nWidth
=
0
/// width of this portion
...
@@ -64,7 +64,7 @@ public:
...
@@ -64,7 +64,7 @@ public:
* the text which is displayed, and the type of the portion.
* the text which is displayed, and the type of the portion.
*/
*/
virtual
void
Special
(
virtual
void
Special
(
sal_
uInt16
nLength
,
/// length of this portion in the model string
sal_
Int32
nLength
,
/// length of this portion in the model string
const
OUString
&
rText
,
/// text which is painted on-screen
const
OUString
&
rText
,
/// text which is painted on-screen
sal_uInt16
nType
,
/// type of this portion
sal_uInt16
nType
,
/// type of this portion
sal_Int32
nHeight
=
0
,
/// font height of the painted text
sal_Int32
nHeight
=
0
,
/// font height of the painted text
...
@@ -74,7 +74,7 @@ public:
...
@@ -74,7 +74,7 @@ public:
/** line break. This method is called whenever a line break in the
/** line break. This method is called whenever a line break in the
* layout occurs.
* layout occurs.
*/
*/
virtual
void
LineBreak
(
sal_
uInt16
nWidth
)
=
0
;
virtual
void
LineBreak
(
sal_
Int32
nWidth
)
=
0
;
/** skip characters. The SwTxtFrame may only display partially
/** skip characters. The SwTxtFrame may only display partially
* display a certain paragraph (e.g. when the paragaph is split
* display a certain paragraph (e.g. when the paragaph is split
...
@@ -85,7 +85,7 @@ public:
...
@@ -85,7 +85,7 @@ public:
* Skip() between portions is not allowed.
* Skip() between portions is not allowed.
*/
*/
virtual
void
Skip
(
virtual
void
Skip
(
sal_
uInt16
nLength
/// number of 'model string' characters to be skipped
sal_
Int32
nLength
/// number of 'model string' characters to be skipped
)
=
0
;
)
=
0
;
/** end of paragraph. This method is to be called when all the
/** end of paragraph. This method is to be called when all the
...
...
sw/source/core/text/xmldump.cxx
Dosyayı görüntüle @
72e7a1c2
...
@@ -27,7 +27,7 @@ class XmlPortionDumper:public SwPortionHandler
...
@@ -27,7 +27,7 @@ class XmlPortionDumper:public SwPortionHandler
{
{
private
:
private
:
xmlTextWriterPtr
writer
;
xmlTextWriterPtr
writer
;
sal_
uInt16
ofs
;
sal_
Int32
ofs
;
const
char
*
getTypeName
(
sal_uInt16
nType
)
const
char
*
getTypeName
(
sal_uInt16
nType
)
{
{
...
@@ -115,7 +115,7 @@ class XmlPortionDumper:public SwPortionHandler
...
@@ -115,7 +115,7 @@ class XmlPortionDumper:public SwPortionHandler
@param rText
@param rText
text which is painted on-screen
text which is painted on-screen
*/
*/
virtual
void
Text
(
sal_
uInt16
nLength
,
virtual
void
Text
(
sal_
Int32
nLength
,
sal_uInt16
nType
,
sal_uInt16
nType
,
sal_Int32
nHeight
,
sal_Int32
nHeight
,
sal_Int32
nWidth
)
SAL_OVERRIDE
sal_Int32
nWidth
)
SAL_OVERRIDE
...
@@ -146,7 +146,7 @@ class XmlPortionDumper:public SwPortionHandler
...
@@ -146,7 +146,7 @@ class XmlPortionDumper:public SwPortionHandler
@param nHeight
@param nHeight
font size of the painted text
font size of the painted text
*/
*/
virtual
void
Special
(
sal_
uInt16
nLength
,
virtual
void
Special
(
sal_
Int32
nLength
,
const
OUString
&
rText
,
const
OUString
&
rText
,
sal_uInt16
nType
,
sal_uInt16
nType
,
sal_Int32
nHeight
,
sal_Int32
nHeight
,
...
@@ -175,7 +175,7 @@ class XmlPortionDumper:public SwPortionHandler
...
@@ -175,7 +175,7 @@ class XmlPortionDumper:public SwPortionHandler
ofs
+=
nLength
;
ofs
+=
nLength
;
}
}
virtual
void
LineBreak
(
sal_
uInt16
nWidth
)
SAL_OVERRIDE
virtual
void
LineBreak
(
sal_
Int32
nWidth
)
SAL_OVERRIDE
{
{
xmlTextWriterStartElement
(
writer
,
BAD_CAST
(
"LineBreak"
)
);
xmlTextWriterStartElement
(
writer
,
BAD_CAST
(
"LineBreak"
)
);
if
(
nWidth
>
0
)
if
(
nWidth
>
0
)
...
@@ -189,7 +189,7 @@ class XmlPortionDumper:public SwPortionHandler
...
@@ -189,7 +189,7 @@ class XmlPortionDumper:public SwPortionHandler
* @param nLength
* @param nLength
* number of 'model string' characters to be skipped
* number of 'model string' characters to be skipped
*/
*/
virtual
void
Skip
(
sal_
uInt16
nLength
)
SAL_OVERRIDE
virtual
void
Skip
(
sal_
Int32
nLength
)
SAL_OVERRIDE
{
{
xmlTextWriterStartElement
(
writer
,
BAD_CAST
(
"Skip"
)
);
xmlTextWriterStartElement
(
writer
,
BAD_CAST
(
"Skip"
)
);
xmlTextWriterWriteFormatAttribute
(
writer
,
xmlTextWriterWriteFormatAttribute
(
writer
,
...
...
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