Skip to content

C
core
Kaydet (Commit) 8b1b67db authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane
Dosyalara gözat
Seçenekler

WaE: unitialised variable 

Change-Id: Icda6d87e2bf17e651d2a60c4a024dfaa8ed36a51
üst d0618020
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
sd/source/ui/dlg/PhotoAlbumDialog.cxx
Dosyayı görüntüle @ 8b1b67db
...@@ -124,7 +124,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) ...@@ -124,7 +124,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
if ( sOpt == "Fit to slide") if ( sOpt == "Fit to slide")
{ {
OUString sUrl; OUString sUrl;
OUString* pData; OUString* pData = NULL;
for( sal_Int16 i = 0; i < pImagesLst->GetEntryCount(); ++i ) for( sal_Int16 i = 0; i < pImagesLst->GetEntryCount(); ++i )
{ {
pData = (OUString*) pImagesLst->GetEntryData(i); pData = (OUString*) pImagesLst->GetEntryData(i);
...@@ -179,12 +179,13 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) ...@@ -179,12 +179,13 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages); appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
} }
} }
delete pData; if (pData)
delete pData;
} }
else if( sOpt == "1 image with title" ) else if( sOpt == "1 image with title" )
{ {
OUString sUrl; OUString sUrl;
OUString* pData; OUString* pData = NULL;
for( sal_Int16 i = 0; i < pImagesLst->GetEntryCount(); ++i ) for( sal_Int16 i = 0; i < pImagesLst->GetEntryCount(); ++i )
{ {
pData = (OUString*) pImagesLst->GetEntryData(i); pData = (OUString*) pImagesLst->GetEntryData(i);
...@@ -221,13 +222,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) ...@@ -221,13 +222,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages); appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
} }
} }
delete pData; if (pData)
delete pData;
} }
else if( sOpt == "2 images" ) else if( sOpt == "2 images" )
{ {
OUString sUrl1(""); OUString sUrl1("");
OUString sUrl2(""); OUString sUrl2("");
OUString* pData; OUString* pData = NULL;
for( sal_Int32 i = 0; i < pImagesLst->GetEntryCount(); i+=2 ) for( sal_Int32 i = 0; i < pImagesLst->GetEntryCount(); i+=2 )
{ {
...@@ -333,7 +335,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) ...@@ -333,7 +335,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
} }
} }
delete pData; if (pData)
delete pData;
} }
else if( sOpt == "4 images" ) else if( sOpt == "4 images" )
{ {
...@@ -341,7 +344,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) ...@@ -341,7 +344,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
OUString sUrl2(""); OUString sUrl2("");
OUString sUrl3(""); OUString sUrl3("");
OUString sUrl4(""); OUString sUrl4("");
OUString* pData; OUString* pData = NULL;
for( sal_Int32 i = 0; i < pImagesLst->GetEntryCount(); i+=4 ) for( sal_Int32 i = 0; i < pImagesLst->GetEntryCount(); i+=4 )
{ {
...@@ -539,7 +542,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) ...@@ -539,7 +542,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
xSlide->add(xShape); xSlide->add(xShape);
} }
} }
delete pData; if (pData)
delete pData;
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment