Kaydet (Commit) a4c222af authored tarafından Matteo Casalin's avatar Matteo Casalin

sal_uInt16 to sal_Int32

Change-Id: I163c88ff2d6e8ac2ac14b7ff585bf09f6262270e
üst bafc6196
...@@ -790,7 +790,7 @@ public: ...@@ -790,7 +790,7 @@ public:
bool bKeepSelection = false ); bool bKeepSelection = false );
void GetINetAttrs( SwGetINetAttrs& rArr ); void GetINetAttrs( SwGetINetAttrs& rArr );
OUString GetDropTxt( const sal_uInt16 nChars ) const; OUString GetDropTxt( const sal_Int32 nChars ) const;
void ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM = NULL ); void ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM = NULL );
/** May an outline be moved or copied? /** May an outline be moved or copied?
......
...@@ -438,7 +438,7 @@ sal_uInt16 SwEditShell::GetRefMarks( std::vector<OUString>* pStrings ) const ...@@ -438,7 +438,7 @@ sal_uInt16 SwEditShell::GetRefMarks( std::vector<OUString>* pStrings ) const
return GetDoc()->GetRefMarks( pStrings ); return GetDoc()->GetRefMarks( pStrings );
} }
OUString SwEditShell::GetDropTxt( const sal_uInt16 nChars ) const OUString SwEditShell::GetDropTxt( const sal_Int32 nChars ) const
{ {
/* /*
* pb: made changes for #i74939# * pb: made changes for #i74939#
......
...@@ -181,10 +181,10 @@ void SwDropCapsPict::InitPrinter( void ) ...@@ -181,10 +181,10 @@ void SwDropCapsPict::InitPrinter( void )
} }
// Create Default-String from character-count (A, AB, ABC, ...) // Create Default-String from character-count (A, AB, ABC, ...)
OUString GetDefaultString(sal_uInt16 nChars) OUString GetDefaultString(sal_Int32 nChars)
{ {
OUString aStr; OUString aStr;
for (sal_uInt16 i = 0; i < nChars; i++) for (sal_Int32 i = 0; i < nChars; i++)
aStr += OUString((char) (i + 65)); aStr += OUString((char) (i + 65));
return aStr; return aStr;
} }
...@@ -620,7 +620,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) ...@@ -620,7 +620,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet)
// Enable controls // Enable controls
m_pDropCapsBox->Check(aFmtDrop.GetLines() > 1); m_pDropCapsBox->Check(aFmtDrop.GetLines() > 1);
const sal_uInt16 nVal = sal_uInt16(m_pDropCapsField->GetValue()); const sal_Int32 nVal = static_cast<sal_Int32>(m_pDropCapsField->GetValue());
if (bFormat) if (bFormat)
m_pTextEdit->SetText(GetDefaultString(nVal)); m_pTextEdit->SetText(GetDefaultString(nVal));
else else
...@@ -688,8 +688,8 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) ...@@ -688,8 +688,8 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
// set text if applicable // set text if applicable
if (pEdit == m_pDropCapsField) if (pEdit == m_pDropCapsField)
{ {
const sal_uInt16 nVal = !m_pWholeWordCB->IsChecked() const sal_Int32 nVal = !m_pWholeWordCB->IsChecked()
? (sal_uInt16)m_pDropCapsField->GetValue() ? static_cast<sal_Int32>(m_pDropCapsField->GetValue())
: 0; : 0;
bool bSetText = false; bool bSetText = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment