summaryrefslogtreecommitdiff
path: root/svx/source/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/dialog')
-rw-r--r--svx/source/dialog/checklbx.cxx30
-rw-r--r--svx/source/dialog/ctredlin.cxx6
-rw-r--r--svx/source/dialog/dlgctrl.cxx12
-rw-r--r--svx/source/dialog/fontlb.cxx4
-rw-r--r--svx/source/dialog/frmdirlbox.cxx10
-rw-r--r--svx/source/dialog/langbox.cxx40
-rw-r--r--svx/source/dialog/txencbox.cxx18
7 files changed, 60 insertions, 60 deletions
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 2ac7ec8e83ab..005e1b136d53 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -85,7 +85,7 @@ void SvxCheckListBox::Init_Impl()
-void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos,
+void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uLong nPos,
void* pUserData,
SvLBoxButtonKind eButtonKind )
{
@@ -95,7 +95,7 @@ void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos,
-void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos )
+void SvxCheckListBox::RemoveEntry( sal_uLong nPos )
{
if ( nPos < GetEntryCount() )
SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) );
@@ -103,7 +103,7 @@ void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos )
-void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect )
+void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, sal_Bool bSelect )
{
if ( nPos < GetEntryCount() )
Select( GetEntry( nPos ), bSelect );
@@ -111,18 +111,18 @@ void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect )
-sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const
+sal_uLong SvxCheckListBox::GetSelectEntryPos() const
{
SvTreeListEntry* pEntry = GetCurEntry();
if ( pEntry )
- return (sal_uInt16)GetModel()->GetAbsPos( pEntry );
- return LISTBOX_ENTRY_NOTFOUND;
+ return GetModel()->GetAbsPos( pEntry );
+ return TREELIST_ENTRY_NOTFOUND;
}
-OUString SvxCheckListBox::GetText( sal_uInt16 nPos ) const
+OUString SvxCheckListBox::GetText( sal_uLong nPos ) const
{
SvTreeListEntry* pEntry = GetEntry( nPos );
@@ -133,12 +133,12 @@ OUString SvxCheckListBox::GetText( sal_uInt16 nPos ) const
-sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const
+sal_uLong SvxCheckListBox::GetCheckedEntryCount() const
{
- sal_uInt16 nCheckCount = 0;
- sal_uInt16 nCount = (sal_uInt16)GetEntryCount();
+ sal_uLong nCheckCount = 0;
+ sal_uLong nCount = GetEntryCount();
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ for ( sal_uLong i = 0; i < nCount; ++i )
{
if ( IsChecked( i ) )
nCheckCount++;
@@ -148,7 +148,7 @@ sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const
-void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck )
+void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, sal_Bool bCheck )
{
if ( nPos < GetEntryCount() )
SetCheckButtonState(
@@ -158,7 +158,7 @@ void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck )
-sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const
+sal_Bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const
{
if ( nPos < GetEntryCount() )
return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED);
@@ -168,7 +168,7 @@ sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const
-void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData )
+void* SvxCheckListBox::SetEntryData ( sal_uLong nPos, void* pNewData )
{
void* pOld = NULL;
@@ -182,7 +182,7 @@ void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData )
-void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const
+void* SvxCheckListBox::GetEntryData( sal_uLong nPos ) const
{
if ( nPos < GetEntryCount() )
return GetEntry( nPos )->GetUserData();
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 2e3e73471fbf..25f6a20f4f1a 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -751,7 +751,7 @@ void SvxTPFilter::ClearAuthors()
m_pLbAuthor->Clear();
}
-void SvxTPFilter::InsertAuthor( const OUString& rString, sal_uInt16 nPos)
+void SvxTPFilter::InsertAuthor( const OUString& rString, sal_Int32 nPos)
{
m_pLbAuthor->InsertEntry(rString,nPos);
}
@@ -761,12 +761,12 @@ OUString SvxTPFilter::GetSelectedAuthor() const
return m_pLbAuthor->GetSelectEntry();
}
-void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos)
+void SvxTPFilter::SelectedAuthorPos(sal_Int32 nPos)
{
m_pLbAuthor->SelectEntryPos(nPos);
}
-sal_uInt16 SvxTPFilter::SelectAuthor(const OUString& aString)
+sal_Int32 SvxTPFilter::SelectAuthor(const OUString& aString)
{
m_pLbAuthor->SelectEntry(aString);
return m_pLbAuthor->GetSelectEntryPos();
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index fb9799d38c2e..27515989e779 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1184,7 +1184,7 @@ void ColorLB::Append( const XColorEntry& rEntry )
/************************************************************************/
-void ColorLB::Modify( const XColorEntry& rEntry, sal_uInt16 nPos )
+void ColorLB::Modify( const XColorEntry& rEntry, sal_Int32 nPos )
{
RemoveEntry( nPos );
InsertEntry( rEntry.GetColor(), rEntry.GetName(), nPos );
@@ -1271,7 +1271,7 @@ void HatchingLB::Append( const XHatchEntry& rEntry, const Bitmap& rBitmap )
/************************************************************************/
-void HatchingLB::Modify( const XHatchEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap )
+void HatchingLB::Modify( const XHatchEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap )
{
RemoveEntry( nPos );
@@ -1370,7 +1370,7 @@ void GradientLB::Append( const XGradientEntry& rEntry, const Bitmap& rBitmap )
/************************************************************************/
-void GradientLB::Modify( const XGradientEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap )
+void GradientLB::Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap )
{
RemoveEntry( nPos );
@@ -1555,7 +1555,7 @@ void BitmapLB::Append(const Size& rSize, const XBitmapEntry& rEntry)
/************************************************************************/
-void BitmapLB::Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_uInt16 nPos)
+void BitmapLB::Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 nPos)
{
RemoveEntry(nPos);
maBitmapEx = rEntry.GetGraphicObject().GetGraphic().GetBitmapEx();
@@ -1705,7 +1705,7 @@ void LineLB::Append( const XDashEntry& rEntry, const Bitmap& rBitmap )
/************************************************************************/
-void LineLB::Modify( const XDashEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap )
+void LineLB::Modify( const XDashEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap )
{
RemoveEntry( nPos );
@@ -1805,7 +1805,7 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool
/************************************************************************/
-void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap, bool bStart )
+void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap, bool bStart )
{
RemoveEntry( nPos );
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 7449551b24a9..9c4c74c60c49 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -109,7 +109,7 @@ void SvxFontListBox::InsertFontEntry( const OUString& rString, const Font& rFont
mbUseFont = false;
}
-void SvxFontListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect )
+void SvxFontListBox::SelectEntryPos( sal_uLong nPos, bool bSelect )
{
SvTreeListEntry* pEntry = GetEntry( nPos );
if( pEntry )
@@ -127,7 +127,7 @@ void SvxFontListBox::SetNoSelection()
sal_uLong SvxFontListBox::GetSelectEntryPos() const
{
SvTreeListEntry* pSvLBoxEntry = FirstSelected();
- return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND;
+ return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : TREELIST_ENTRY_NOTFOUND;
}
OUString SvxFontListBox::GetSelectEntry() const
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 114a36b29a3c..04a8454d6e25 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -55,22 +55,22 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFrameDirectionListBox(Windo
}
-void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection, sal_uInt16 nPos )
+void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection, sal_Int32 nPos )
{
- sal_uInt16 nRealPos = InsertEntry( rString, nPos );
+ sal_Int32 nRealPos = InsertEntry( rString, nPos );
SetEntryData( nRealPos, lclEnumToVoid( eDirection ) );
}
void FrameDirectionListBox::RemoveEntryValue( SvxFrameDirection eDirection )
{
- sal_uInt16 nPos = GetEntryPos( lclEnumToVoid( eDirection ) );
+ sal_Int32 nPos = GetEntryPos( lclEnumToVoid( eDirection ) );
if( nPos != LISTBOX_ENTRY_NOTFOUND )
RemoveEntry( nPos );
}
void FrameDirectionListBox::SelectEntryValue( SvxFrameDirection eDirection )
{
- sal_uInt16 nPos = GetEntryPos( lclEnumToVoid( eDirection ) );
+ sal_Int32 nPos = GetEntryPos( lclEnumToVoid( eDirection ) );
if( nPos == LISTBOX_ENTRY_NOTFOUND )
SetNoSelection();
else
@@ -79,7 +79,7 @@ void FrameDirectionListBox::SelectEntryValue( SvxFrameDirection eDirection )
SvxFrameDirection FrameDirectionListBox::GetSelectEntryValue() const
{
- sal_uInt16 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectEntryPos();
if( nPos == LISTBOX_ENTRY_NOTFOUND )
return static_cast< SvxFrameDirection >( 0xFFFF );
return lclVoidToEnum( GetEntryData( nPos ) );
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index fb51ab3c5640..1766b3d3f3aa 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -107,12 +107,12 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL
// class SvxLanguageBox
-sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
+sal_Int32 TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
{
- sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
- sal_uInt16 nCount = rLb.GetEntryCount();
+ sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
+ sal_Int32 nCount = rLb.GetEntryCount();
- for ( sal_uInt16 i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
+ for ( sal_Int32 i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
if ( eType == LanguageType((sal_uIntPtr)rLb.GetEntryData(i)) )
nPos = i;
@@ -185,9 +185,9 @@ SvxLanguageBox::~SvxLanguageBox()
-sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, sal_uInt16 nPos, bool bChecked )
+sal_Int32 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, sal_Int32 nPos, bool bChecked )
{
- sal_uInt16 nRet = 0;
+ sal_Int32 nRet = 0;
if( !bChecked )
nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos );
else
@@ -320,14 +320,14 @@ void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList,
-sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos )
+sal_Int32 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_Int32 nPos )
{
return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
}
-sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType )
+sal_Int32 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_Int32 nPos, sal_Int16 nType )
{
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
// For obsolete and to be replaced languages check whether an entry of the
@@ -335,7 +335,7 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
// string as would be returned by SvtLanguageTable::GetString().
if (nLang != nLangType)
{
- sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
+ sal_Int32 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
return nAt;
}
@@ -358,7 +358,7 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
- sal_uInt16 nAt = 0;
+ sal_Int32 nAt = 0;
if ( m_bWithCheckmark )
{
bool bFound = false;
@@ -383,22 +383,22 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
-sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos )
+sal_Int32 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos )
{
return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
}
-sal_uInt16 SvxLanguageBox::InsertSystemLanguage( sal_uInt16 nPos )
+sal_Int32 SvxLanguageBox::InsertSystemLanguage( sal_Int32 nPos )
{
return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
}
-sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
- sal_Bool bCheckEntry, sal_uInt16 nPos )
+sal_Int32 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
+ sal_Bool bCheckEntry, sal_Int32 nPos )
{
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
// For obsolete and to be replaced languages check whether an entry of the
@@ -406,7 +406,7 @@ sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
// string as would be returned by SvtLanguageTable::GetString().
if (nLang != nLangType)
{
- sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
+ sal_Int32 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
return nAt;
}
@@ -415,7 +415,7 @@ sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
aStrEntry = m_aAllString;
- sal_uInt16 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
+ sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
SetEntryData( nAt, (void*)(sal_uIntPtr)nLang );
return nAt;
@@ -425,7 +425,7 @@ sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
{
- sal_uInt16 nAt = TypeToPos_Impl( eLangType, *this );
+ sal_Int32 nAt = TypeToPos_Impl( eLangType, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
RemoveEntry( nAt );
@@ -435,7 +435,7 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
LanguageType SvxLanguageBox::GetSelectLanguage() const
{
- sal_uInt16 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
return LanguageType( (sal_uIntPtr)GetEntryData(nPos) );
@@ -451,7 +451,7 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSel
// a language that is replaced, we need to select the replacement instead.
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
- sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
+ sal_Int32 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt == LISTBOX_ENTRY_NOTFOUND )
nAt = InsertLanguage( nLang ); // on-the-fly-ID
@@ -467,7 +467,7 @@ sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) cons
// Same here, work on the replacement if applicable.
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
- sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
+ sal_Int32 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
return IsEntryPosSelected( nAt );
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 5e292c5c1bb1..a0796d38f614 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -67,10 +67,10 @@ SvxTextEncodingBox::~SvxTextEncodingBox()
-sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
+sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
{
- sal_uInt16 nCount = GetEntryCount();
- for ( sal_uInt16 i=0; i<nCount; i++ )
+ sal_Int32 nCount = GetEntryCount();
+ for ( sal_Int32 i=0; i<nCount; i++ )
{
if ( nEnc == rtl_TextEncoding( (sal_uIntPtr)GetEntryData(i) ) )
return i;
@@ -144,7 +144,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
svxform::ODataAccessCharsetHelper aCSH;
::std::vector< rtl_TextEncoding > aEncs;
sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs );
- for ( sal_uInt16 j=0; j<nCount; j++ )
+ for ( sal_Int32 j=0; j<nCount; j++ )
{
sal_Bool bInsert = sal_True;
rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] );
@@ -201,15 +201,15 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest()
void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
- const OUString& rEntry, sal_uInt16 nPos )
+ const OUString& rEntry, sal_Int32 nPos )
{
- sal_uInt16 nAt = InsertEntry( rEntry, nPos );
+ sal_Int32 nAt = InsertEntry( rEntry, nPos );
SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc );
}
-void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos )
+void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_Int32 nPos )
{
const OUString& rEntry = m_pEncTable->GetTextString( nEnc );
if ( !rEntry.isEmpty() )
@@ -222,7 +222,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uI
rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
{
- sal_uInt16 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
return rtl_TextEncoding( (sal_uIntPtr)GetEntryData(nPos) );
@@ -234,7 +234,7 @@ rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect )
{
- sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
+ sal_Int32 nAt = EncodingToPos_Impl( nEnc );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
SelectEntryPos( nAt, bSelect );