[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/ui/dbui/mmaddressblockpage.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 660de685037cce4ff86f7008169c1ca954342a23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 30 21:02:15 2011 +0000

    WaE: various new gcc 4.6.0 warnings

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 617cc14..ec237cb 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -621,7 +621,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
     {
         const XubString& rHeader = rHeaders.GetString( i );
         SvLBoxEntry* pEntry = m_aAddressElementsLB.InsertEntry(rHeader);
-        pEntry->SetUserData((void*)(sal_Int32)i);
+        pEntry->SetUserData((void*)(sal_IntPtr)i);
     }
     m_aOK.SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl));
     m_aAddressElementsLB.SetSelectHdl(LINK(this, SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl ));
@@ -1066,7 +1066,6 @@ SwAssignFieldsControl::SwAssignFieldsControl(
         m_aMatches.push_back(pNewLB);
         m_aPreviews.push_back(pNewPreview);
     }
-    ListBox* pBottomBox = m_aMatches[rHeaders.Count() -1];
     m_aVScroll.SetRange(Range(0, rHeaders.Count()));
     m_aVScroll.SetPageSize((aOutputSize.Height() - nHBHeight - m_nLBStartTopPos)/ m_nYOffset);
     m_aVScroll.EnableDrag();