commit 9177901fd6491be2937126839e5b96b1bb77ae7c
author Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Wed Mar 09 13:46:28 2011 +0100
committer Michael Meeks <michael.meeks@suse.com> Wed Nov 28 12:48:32 2012 +0000
tree 52ed173378b48713a8be837df2d471e554667972
parent 8bcf6ba5586818f4100113a6b685e891de84a5ea

impress211: fix some warnings, types

sd/source/ui/app/sdxfer.cxx

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 6807235..f516f47 100755
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -794,7 +794,7 @@ sal_Int32 SdTransferable::GetUserDataCount (void) const

::boost::shared_ptr<SdTransferable::UserData> SdTransferable::GetUserData (const sal_Int32 nIndex) const
{
    if (nIndex>=0 && nIndex<maUserData.size())
    if (nIndex>=0 && nIndex<sal_Int32(maUserData.size()))
        return maUserData[nIndex];
    else
        return ::boost::shared_ptr<UserData>();

sd/source/ui/dlg/present.cxx

diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index e606dfa..dbe57f0 100755
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -226,7 +226,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
                maLBMonitor.InsertEntry( aName );

                // Store display index together with name.
                const USHORT nEntryIndex (maLBMonitor.GetEntryCount()-1);
                const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
                maLBMonitor.SetEntryData(nEntryIndex, (void*)nDisplay);

                // Remember to select the default display.
@@ -236,7 +236,7 @@ void SdStartPresentationDlg::InitMonitorSettings()

            if( !bUnifiedDisplay )
                maLBMonitor.InsertEntry( msAllMonitors );
                const USHORT nEntryIndex (maLBMonitor.GetEntryCount()-1);
                const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
                maLBMonitor.SetEntryData(nEntryIndex, (void*)-1);
                if (nDefaultValue == -1)
                    nSelected = nEntryIndex;

sd/source/ui/slidesorter/controller/SlsClipboard.cxx

diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index f852d1e8..398e0da 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -559,8 +559,8 @@ void Clipboard::CreateSlideTransferable (
        SdDrawDocument* pTransferableDocument = rSlideSorter.GetModel().GetDocument();
        if (pTransferableDocument == NULL)
            break;
        BOOL bIsMasterPage;
        const USHORT nPageIndex (pTransferableDocument->GetPageByName(sBookmark, bIsMasterPage));
        sal_Bool bIsMasterPage = sal_False;
        const sal_uInt16 nPageIndex (pTransferableDocument->GetPageByName(sBookmark, bIsMasterPage));
        if (nPageIndex == SDRPAGE_NOTFOUND)
            break;

@@ -630,7 +630,7 @@ void Clipboard::StartDrag (

void Clipboard::DragFinished (sal_Int8 nDropAction)
{
    SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
    // SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;

    if (mnDragFinishedUserEventId == 0)
    {