summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorGergő Mocsi <gmocsi91@gmail.com>2013-04-19 05:14:03 +0200
committerAndras Timar <atimar@suse.com>2013-05-03 13:41:22 +0000
commitb971a83f34c3204e9a57874d55e5f23229b62b7f (patch)
tree574c1bf6f05abbd655bf1d9328d918462cbb70f7 /sd
parentadd a warning (diff)
downloadcore-b971a83f34c3204e9a57874d55e5f23229b62b7f.tar.gz
core-b971a83f34c3204e9a57874d55e5f23229b62b7f.zip
Create Photo Album fix
Fixed some UI tweaks in handler function DownHdl: now images can me moved down correctly. Also, made some simplification in handler UpHdl: I've moved forvard the declaration of local variable nActPos. Change-Id: I879a6394865bb8442c0621dc2789efd9eedae87c Reviewed-on: https://gerrit.libreoffice.org/3759 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 5d6ba1e6d41e..fc4b2566c550 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -650,12 +650,12 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
&& pImagesLst->GetSelectEntryPos() != 0)
{
- OUString sActEntry( pImagesLst->GetEntry(pImagesLst->GetSelectEntryPos()) );
+ sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos();
+ OUString sActEntry( pImagesLst->GetEntry(nActPos) );
// actual data
- OUString* pActData = (OUString*) pImagesLst->GetEntryData(pImagesLst->GetSelectEntryPos());
+ OUString* pActData = (OUString*) pImagesLst->GetEntryData(nActPos);
OUString sAct(*pActData);
- sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos();
OUString sUpperEntry( pImagesLst->GetEntry(nActPos - 1) );
// upper data
OUString* pUpperData = (OUString*) pImagesLst->GetEntryData(nActPos - 1);
@@ -701,10 +701,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl)
pImagesLst->RemoveEntry( sDownEntry );
pImagesLst->InsertEntry( sDownEntry, nActPos );
- pImagesLst->SetEntryData( nActPos, (void*) new OUString(sAct));
+ pImagesLst->SetEntryData( nActPos, (void*) new OUString(sDown));
pImagesLst->InsertEntry( sActEntry, nActPos + 1 );
- pImagesLst->SetEntryData( nActPos + 1, (void*) new OUString(sDown));
+ pImagesLst->SetEntryData( nActPos + 1, (void*) new OUString(sAct));
pImagesLst->SelectEntryPos(nActPos + 1);