diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-04-12 22:16:25 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-04-12 22:36:30 +0200 |
| commit | a4c222af6283da2e9252cffa468091f0f85cfcc6 (patch) | |
| tree | 04d9a4256408d65b3b5840738a440eafaaabc55e | |
| parent | bafc6196c5364c2692e9a4f538a580e3dedec073 (diff) | |
sal_uInt16 to sal_Int32
Change-Id: I163c88ff2d6e8ac2ac14b7ff585bf09f6262270e
| -rw-r--r-- | sw/inc/editsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/edit/editsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index b2e8ee2841a8..c1ea880361b8 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -790,7 +790,7 @@ public: bool bKeepSelection = false ); 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 ); /** May an outline be moved or copied? diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 65c480a0c6ba..148ea268606c 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -438,7 +438,7 @@ sal_uInt16 SwEditShell::GetRefMarks( std::vector<OUString>* pStrings ) const 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# diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index e10da98f811b..0343fed1f301 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -181,10 +181,10 @@ void SwDropCapsPict::InitPrinter( void ) } // Create Default-String from character-count (A, AB, ABC, ...) -OUString GetDefaultString(sal_uInt16 nChars) +OUString GetDefaultString(sal_Int32 nChars) { OUString aStr; - for (sal_uInt16 i = 0; i < nChars; i++) + for (sal_Int32 i = 0; i < nChars; i++) aStr += OUString((char) (i + 65)); return aStr; } @@ -620,7 +620,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) // Enable controls 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) m_pTextEdit->SetText(GetDefaultString(nVal)); else @@ -688,8 +688,8 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) // set text if applicable if (pEdit == m_pDropCapsField) { - const sal_uInt16 nVal = !m_pWholeWordCB->IsChecked() - ? (sal_uInt16)m_pDropCapsField->GetValue() + const sal_Int32 nVal = !m_pWholeWordCB->IsChecked() + ? static_cast<sal_Int32>(m_pDropCapsField->GetValue()) : 0; bool bSetText = false; |