diff options
author | Eike Rathke <erack@redhat.com> | 2014-03-01 03:13:28 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2014-03-05 07:31:19 -0600 |
commit | 68ec95b3f80408ae50897b043eed69a07d084df9 (patch) | |
tree | 5d32076e843fae44f28e3c8d9dbbacf7648fecbc /svx | |
parent | c3403ac888c2e62edaf8befe7982f5f8cc95c16f (diff) |
made ListBox handle more than 64k elements, fdo#61520 related
ListBox and related now handle up to sal_Int32 elements correctly.
sal_Int32 instead of sal_Size or size_t because of UNO and a11y API.
Also disentangled some of the mess of SvTreeList and other containers
regarding sal_uInt16, sal_uLong, long, size_t, ... type mixtures.
Change-Id: Idb6e0ae689dc5bc2cf980721972b57b0261e688a
Reviewed-on: https://gerrit.libreoffice.org/8460
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'svx')
24 files changed, 131 insertions, 122 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 69dbee39f450..2204c5bc4924 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -239,7 +239,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom pRenderedShape = new SdrObjGroup(); ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); } - ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTextObj, LIST_APPEND ); + ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTextObj, CONTAINER_APPEND ); } else pRenderedShape = pTextObj; 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 ); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 7e15117cb13d..7e82487dc103 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -385,7 +385,7 @@ namespace svxform { ItemNode* pNode = new ItemNode( xChild ); SvTreeListEntry* pEntry = m_aItemList.InsertEntry( - sName, aExpImg, aCollImg, _pParent, sal_False, LIST_APPEND, pNode ); + sName, aExpImg, aCollImg, _pParent, sal_False, TREELIST_APPEND, pNode ); if ( xChild->hasAttributes() ) { Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes(); @@ -401,7 +401,7 @@ namespace svxform m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails ); m_aItemList.InsertEntry( sAttrName, aExpImg, aCollImg, - pEntry, sal_False, LIST_APPEND, pNode ); + pEntry, sal_False, TREELIST_APPEND, pNode ); } } } @@ -763,7 +763,7 @@ namespace svxform DBG_UNHANDLED_EXCEPTION(); } return m_aItemList.InsertEntry( - sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode ); + sName, aImage, aImage, pParent, sal_False, TREELIST_APPEND, _pNewNode ); } @@ -782,7 +782,7 @@ namespace svxform { // ID _rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp; - pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode ); + pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, TREELIST_APPEND, pNode ); // Action _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp; OUString sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION ); @@ -826,7 +826,7 @@ namespace svxform _rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp; sName += sTemp; pEntry = m_aItemList.InsertEntry( - sName, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode ); + sName, aImage, aImage, NULL, sal_False, TREELIST_APPEND, pNode ); } catch ( Exception& ) { @@ -1140,7 +1140,7 @@ namespace svxform ItemNode* pNode = new ItemNode( xPropSet ); m_aItemList.InsertEntry( - sEntry, aImage1, aImage2, NULL, sal_False, LIST_APPEND, pNode ); + sEntry, aImage1, aImage2, NULL, sal_False, TREELIST_APPEND, pNode ); } } } @@ -1425,7 +1425,7 @@ namespace svxform IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox ) { - sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos(); + sal_Int32 nPos = m_aModelsBox.GetSelectEntryPos(); // pBox == NULL, if you want to force a new fill. if ( nPos != m_nLastSelectedPos || !pBox ) { @@ -1442,7 +1442,7 @@ namespace svxform { bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; - sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos(); + sal_Int32 nSelectedPos = m_aModelsBox.GetSelectEntryPos(); OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) ); Reference< css::xforms::XModel > xModel; try @@ -1498,7 +1498,7 @@ namespace svxform OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); - sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName ); + sal_Int32 nNewPos = m_aModelsBox.InsertEntry( sNewName ); m_aModelsBox.SelectEntryPos( nNewPos ); ModelSelectHdl( &m_aModelsBox ); bIsDocModified = true; @@ -2713,7 +2713,7 @@ namespace svxform OUString sTemp; if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp ) { - sal_uInt16 nPos = m_pDataTypeLB->GetEntryPos( sTemp ); + sal_Int32 nPos = m_pDataTypeLB->GetEntryPos( sTemp ); if ( LISTBOX_ENTRY_NOTFOUND == nPos ) nPos = m_pDataTypeLB->InsertEntry( sTemp ); m_pDataTypeLB->SelectEntryPos( nPos ); @@ -3297,7 +3297,7 @@ namespace svxform m_xSubmission->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp; sTemp = m_aMethodString.toUI( sTemp ); - sal_uInt16 nPos = m_pMethodLB->GetEntryPos( sTemp ); + sal_Int32 nPos = m_pMethodLB->GetEntryPos( sTemp ); if ( LISTBOX_ENTRY_NOTFOUND == nPos ) nPos = m_pMethodLB->InsertEntry( sTemp ); m_pMethodLB->SelectEntryPos( nPos ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 1394ccff87ef..fddea8e5f316 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -781,8 +781,16 @@ void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem ) void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData) { ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChildren(); - sal_uLong nPos = rPos == rItems.end() ? LIST_APPEND : rPos - rItems.begin(); - rItems.insert(rPos, pData); + sal_uLong nPos = rPos == rItems.end() ? CONTAINER_APPEND : rPos - rItems.begin(); + if (nPos == CONTAINER_APPEND) + { + rItems.push_back(pData); + nPos = rItems.size() - 1; + } + else + { + rItems.insert(rPos, pData); + } // UI benachrichtigen FmFilterInsertedHint aInsertedHint(pData, nPos); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index ad410ed56ef2..271295451596 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -643,7 +643,7 @@ namespace svxform for( size_t i = 0; i < nChildCount; i++ ) { pChildData = pChildList->at( i ); - Insert( pChildData, LIST_APPEND ); + Insert( pChildData, TREELIST_APPEND ); } return pNewEntry; @@ -1362,7 +1362,7 @@ namespace svxform // Form einfuegen - GetNavModel()->Insert( pNewFormData, LIST_APPEND, sal_True ); + GetNavModel()->Insert( pNewFormData, TREELIST_APPEND, sal_True ); // Neue Form als aktive Form setzen @@ -1417,7 +1417,7 @@ namespace svxform // FormComponent einfuegen - GetNavModel()->Insert( pNewFormControlData, LIST_APPEND, sal_True ); + GetNavModel()->Insert( pNewFormControlData, TREELIST_APPEND, sal_True ); GetNavModel()->SetModified(); if (bEditName) diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 8abc293156e2..73bb8f08bfef 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -537,7 +537,7 @@ namespace svxform xForms->getByIndex(i) >>= xSubForm; pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData ); - Insert( pSubFormData, LIST_APPEND ); + Insert( pSubFormData, CONTAINER_APPEND ); // Neuer Branch, wenn SubForm wiederum Subforms enthaelt @@ -566,7 +566,7 @@ namespace svxform if (xSubForm.is()) { // die aktuelle Component ist eine Form pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData); - Insert(pSubFormData, LIST_APPEND); + Insert(pSubFormData, CONTAINER_APPEND); // Neuer Branch, wenn SubForm wiederum Subforms enthaelt @@ -575,7 +575,7 @@ namespace svxform else { pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, pFormData); - Insert(pNewControlData, LIST_APPEND); + Insert(pNewControlData, CONTAINER_APPEND); } } } @@ -614,7 +614,7 @@ namespace svxform if( !pParentData ) { pParentData = new FmFormData( xForm, m_aNormalImages, NULL ); - Insert( pParentData, LIST_APPEND ); + Insert( pParentData, CONTAINER_APPEND ); } if (!FindData(xComp, pParentData->GetChildList(),sal_False)) diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index fa891f621b66..7e7d3d3aebbf 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -103,9 +103,9 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) - _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( sLabel,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); else - _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( *pEntries,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); } } diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 3d8f0348c6f6..2e0005ae586d 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -321,7 +321,7 @@ namespace svxform long m_nMinWidth; long m_nMinHeight; long m_nBorderHeight; - sal_uInt16 m_nLastSelectedPos; + sal_Int32 m_nLastSelectedPos; bool m_bShowDetails; bool m_bIsNotifyDisabled; Size m_a2Size; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 9aeef70572b1..5359d42bfc20 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -386,7 +386,7 @@ namespace svxform void ClearBranch( FmFormData* pParentData ); void UpdateContent( FmFormShell* pNewShell ); - void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = LIST_APPEND, + void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = CONTAINER_APPEND, sal_Bool bAlterModel = sal_False ); void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False ); @@ -455,7 +455,7 @@ namespace svxform void UpdateContent(); FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); void NewForm( SvTreeListEntry* pParentEntry ); - SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); + SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=TREELIST_APPEND ); void Remove( FmEntryData* pEntryData ); diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 402f03fb0cab..74e2d28c9117 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1589,7 +1589,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool delete pLanguageTable; } -void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt16 nPos) +void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos) { const NfCurrencyTable& rCurrencyTable=SvNumberFormatter::GetTheCurrencyTable(); sal_uInt16 nCount=rCurrencyTable.size(); diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index d82e66417ca4..266b33837d3e 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -403,7 +403,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) } case XFILL_GRADIENT: { - sal_uInt16 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -434,7 +434,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) } case XFILL_HATCH: { - sal_uInt16 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -465,7 +465,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) } case XFILL_BITMAP: { - sal_uInt16 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -641,7 +641,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies() if(mpFloatTransparenceItem->IsEnabled()) { const XGradient& rGradient = mpFloatTransparenceItem->GetGradientValue(); - sal_uInt16 nEntryPos(0); + sal_Int32 nEntryPos(0); Image* pImage = 0; mpLBTransType->Enable(); @@ -821,7 +821,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpColorTextFT->Enable(); XFillStyle eXFS = (XFillStyle)mpStyleItem->GetValue(); meLastXFS = eXFS; - mpLbFillType->SelectEntryPos(sal::static_int_cast< sal_uInt16 >(eXFS)); + mpLbFillType->SelectEntryPos(sal::static_int_cast< sal_Int32 >(eXFS)); if(XFILL_NONE == eXFS) { @@ -1213,7 +1213,7 @@ IMPL_LINK( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox ) IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG) { - sal_uInt16 nSelectType = mpLBTransType->GetSelectEntryPos(); + sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos(); bool bGradient = false; sal_uInt16 nTrans = 0; @@ -1310,7 +1310,7 @@ IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG) { const sal_uInt16 nTrans = (sal_uInt16)mpMTRTransparent->GetValue(); mnLastTransSolid = nTrans; - const sal_uInt16 nSelectType = mpLBTransType->GetSelectEntryPos(); + const sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos(); if(nTrans && !nSelectType) { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index 80304f575387..61173229334c 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -86,9 +86,9 @@ private: sal_uInt16 meLastXFS; Color maLastColor; - sal_uInt16 mnLastPosGradient; - sal_uInt16 mnLastPosHatch; - sal_uInt16 mnLastPosBitmap; + sal_Int32 mnLastPosGradient; + sal_Int32 mnLastPosHatch; + sal_Int32 mnLastPosBitmap; sal_uInt16 mnLastTransSolid; XGradient maGradientLinear; diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index aef5069c867c..5f9e4e2a936d 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -571,7 +571,7 @@ void LinePropertyPanel::NotifyItemUpdate( if(pItem) { - sal_uInt16 nEntryPos(0); + sal_Int32 nEntryPos(0); switch(pItem->GetValue()) { @@ -631,7 +631,7 @@ void LinePropertyPanel::NotifyItemUpdate( if(pItem) { - sal_uInt16 nEntryPos(0); + sal_Int32 nEntryPos(0); switch(pItem->GetValue()) { @@ -696,7 +696,7 @@ IMPL_LINK(LinePropertyPanel, ToolboxColorSelectHdl,ToolBox*, pToolBox) IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl) { - const sal_uInt16 nPos(mpLBStyle->GetSelectEntryPos()); + const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos()); if(LISTBOX_ENTRY_NOTFOUND != nPos && nPos != mpLBStyle->GetSavedValue()) { @@ -736,7 +736,7 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl) IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG) { - sal_uInt16 nPos = mpLBStart->GetSelectEntryPos(); + sal_Int32 nPos = mpLBStart->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != mpLBStart->GetSavedValue() ) { XLineStartItem* pItem = NULL; @@ -755,7 +755,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG) IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG) { - sal_uInt16 nPos = mpLBEnd->GetSelectEntryPos(); + sal_Int32 nPos = mpLBEnd->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != mpLBEnd->GetSavedValue() ) { XLineEndItem* pItem = NULL; @@ -774,7 +774,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG) IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG) { - const sal_uInt16 nPos(mpLBEdgeStyle->GetSelectEntryPos()); + const sal_Int32 nPos(mpLBEdgeStyle->GetSelectEntryPos()); if(LISTBOX_ENTRY_NOTFOUND != nPos && nPos != mpLBEdgeStyle->GetSavedValue()) { @@ -815,7 +815,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG) IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG) { - const sal_uInt16 nPos(mpLBCapStyle->GetSelectEntryPos()); + const sal_Int32 nPos(mpLBCapStyle->GetSelectEntryPos()); if(LISTBOX_ENTRY_NOTFOUND != nPos && nPos != mpLBCapStyle->GetSavedValue()) { @@ -1057,7 +1057,7 @@ void LinePropertyPanel::SelectLineStyle() const XDash& rEntry = pEntry->GetDash(); if(rDash == rEntry) { - mpLBStyle->SelectEntryPos((sal_uInt16)a + 2); + mpLBStyle->SelectEntryPos(a + 2); bSelected = true; } } @@ -1091,7 +1091,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart) const basegfx::B2DPolyPolygon& rEntryPolygon = pEntry->GetLineEnd(); if(rItemPolygon == rEntryPolygon) { - mpLBStart->SelectEntryPos((sal_uInt16)a + 1); + mpLBStart->SelectEntryPos(a + 1); bSelected = true; } } @@ -1120,7 +1120,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart) const basegfx::B2DPolyPolygon& rEntryPolygon = pEntry->GetLineEnd(); if(rItemPolygon == rEntryPolygon) { - mpLBEnd->SelectEntryPos((sal_uInt16)a + 1); + mpLBEnd->SelectEntryPos(a + 1); bSelected = true; } } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 44ed0d6ba93b..919fe820f6d7 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -169,7 +169,7 @@ void SvxFillToolBoxControl::StateChanged( if(eLastXFS != eXFS) { bUpdate = sal_True; - pFillTypeLB->SelectEntryPos( sal::static_int_cast< sal_uInt16 >( eXFS ) ); + pFillTypeLB->SelectEntryPos( eXFS ); } pFillAttrLB->Enable(); @@ -253,7 +253,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) LISTBOX_ENTRY_NOTFOUND || pFillAttrLB->GetSelectEntryColor() != aColor ) { - sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); + sal_Int32 nCount = pFillAttrLB->GetEntryCount(); OUString aTmpStr; if( nCount > 0 ) { @@ -268,7 +268,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END; //pFillAttrLB->SetUpdateMode( sal_False ); - sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr ); + sal_Int32 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr ); //pFillAttrLB->SetUpdateMode( sal_True ); pFillAttrLB->SelectEntryPos( nPos ); } @@ -287,7 +287,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) // Check if the entry is not in the list if( pFillAttrLB->GetSelectEntry() != aString ) { - sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); + sal_Int32 nCount = pFillAttrLB->GetEntryCount(); OUString aTmpStr; if( nCount > 0 ) { @@ -332,7 +332,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) // Check if the entry is not in the list if( pFillAttrLB->GetSelectEntry() != aString ) { - sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); + sal_Int32 nCount = pFillAttrLB->GetEntryCount(); OUString aTmpStr; if( nCount > 0 ) { @@ -384,7 +384,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) // Check if the entry is not in the list if( pFillAttrLB->GetSelectEntry() != aString ) { - sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); + sal_Int32 nCount = pFillAttrLB->GetEntryCount(); OUString aTmpStr; if( nCount > 0 ) { @@ -689,7 +689,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) break; case XFILL_GRADIENT: { - sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = pLbFillAttr->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_GRADIENT_LIST ) ) { @@ -713,7 +713,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) case XFILL_HATCH: { - sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = pLbFillAttr->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_HATCH_LIST ) ) { @@ -736,7 +736,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) case XFILL_BITMAP: { - sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = pLbFillAttr->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_BITMAP_LIST ) ) { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index ef667913f1a1..7217655b2d98 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -101,7 +101,7 @@ void SvxLineBox::Select() if ( !IsTravelSelect() ) { XLineStyle eXLS; - sal_uInt16 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectEntryPos(); switch ( nPos ) { @@ -313,7 +313,7 @@ void SvxColorBox::Update( const XLineColorItem* pItem ) if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND || GetSelectEntryColor() != aColor ) { - sal_uInt16 nCount = GetEntryCount(); + sal_Int32 nCount = GetEntryCount(); OUString aTmpStr; if( nCount > 0 ) { @@ -327,7 +327,7 @@ void SvxColorBox::Update( const XLineColorItem* pItem ) } aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END; - sal_uInt16 nPos = InsertEntry( aColor, aTmpStr ); + sal_Int32 nPos = InsertEntry( aColor, aTmpStr ); SelectEntryPos( nPos ); } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 732fe46ef60b..fd31acff4313 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2062,7 +2062,8 @@ void SvxStyleToolBoxControl::FillStyleBox() pBox->SetUpdateMode( true ); pBox->SetFamily( eFamily ); - sal_uInt16 nLines = std::min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES ); + sal_uInt16 nLines = static_cast<sal_uInt16>( + std::min( pBox->GetEntryCount(), static_cast<sal_Int32>(MAX_STYLES_ENTRIES))); pBox->SetDropDownLineCount( nLines ); } } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index c8f41080e045..30b2b20c753b 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -247,7 +247,7 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos ) sal_uIntPtr DictionaryList::deleteEntries( const OUString& rTerm ) { - sal_uIntPtr nPos = LIST_APPEND; + sal_uIntPtr nPos = TREELIST_APPEND; for( sal_Int32 nN=GetRowCount(); nN--; ) { DictionaryEntry* pCurEntry = getEntryOnPos( nN ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 3273633c3173..14b515a47777 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -78,7 +78,7 @@ public: bool hasTerm( const OUString& rTerm ) const; void addEntry( const OUString& rTerm, const OUString& rMapping - , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND ); + , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = TREELIST_APPEND ); sal_uIntPtr deleteEntries( const OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted void deleteEntryOnPos( sal_Int32 nPos ); DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const; |