sd/source/ui/dlg/present.cxx | 4 ++--
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 93fe2c4b9c24a5518d7d8ca1deda14a16c23fd22
Author: Thorsten Behrens <tbehr...@suse.com>
Date: Tue Nov 27 23:26:47 2012 +0100
Make all-screen presentation work again.
Change-Id: I6b276690043c202f82d5bf7e955b0534a3f9f6b1
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 0bafbed..2b87ec3 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -239,7 +239,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
nDefaultExternalIndex = nEntryIndex;
}
- if( !bUnifiedDisplay )
+ if( bUnifiedDisplay )
{
maLBMonitor.InsertEntry( msAllMonitors );
const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
commit 644dcc0e402c0593c45a26aaba8d354687f2c7de
Author: Thorsten Behrens <tbehr...@suse.com>
Date: Tue Nov 27 23:26:33 2012 +0100
Remove commented code.
Change-Id: Ia09c147a084765072f5457d799fccad61adad017
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 2602cf5..47005af 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -630,8 +630,6 @@ void Clipboard::StartDrag (
void Clipboard::DragFinished (sal_Int8 nDropAction)
{
- // SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
-
if (mnDragFinishedUserEventId == 0)
{
if ( ! Application::PostUserEvent(
commit 67636f0813c7e774565eee337fe70589ba27b185
Author: Thorsten Behrens <tbehr...@suse.com>
Date: Tue Nov 27 23:26:16 2012 +0100
Fix a warning
Change-Id: I4921c437a6a410e67ea937029b53a1df93e48674
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 3d44536..0bafbed 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -228,7 +228,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
// Store display index together with name.
const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
- maLBMonitor.SetEntryData(nEntryIndex, (void*)nDisplay);
+ maLBMonitor.SetEntryData(nEntryIndex,
(void*)(sal_IntPtr)nDisplay);
// Remember the index of the default selection.
if (nDefaultSelectedDisplay == nDisplay)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
