remove unnecessary casts when calling Combobox::SetEntryData

An OUString* is type compatibile with void*.

Change-Id: I6f01fe02c75f4db0bda09c7e288cb88d1fbf3c37

4 files changed, 12 insertions, 12 deletions

diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index 3a29b8784a63..0eca236620c3 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -117,7 +117,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
         else
         {
             sal_uInt16 nPos = aPathLB.InsertEntry( sInsFile, LISTBOX_APPEND );
-            aPathLB.SetEntryData( nPos, (void*) new OUString( sInsFile ) );
+            aPathLB.SetEntryData( nPos, new OUString( sInsFile ) );
         }
 
     } // end of if ( aDlg.Execute() == ERRCODE_NONE )
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index fc24c308edff..1fa83cb323d4 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -120,7 +120,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
             else
             {
                 sal_uInt16 nPos = aPathLB.InsertEntry( sInsPath, LISTBOX_APPEND );
-                aPathLB.SetEntryData( nPos, (void*)new OUString( aURL ) );
+                aPathLB.SetEntryData( nPos, new OUString( aURL ) );
             }
         }
         SelectHdl_Impl( NULL );
@@ -296,7 +296,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath )
                 nPos = aPathLB.InsertEntry( sSystemPath, LISTBOX_APPEND );
             else
                 nPos = aPathLB.InsertEntry( sPath, LISTBOX_APPEND );
-            aPathLB.SetEntryData( nPos, (void*)new OUString( sPath ) );
+            aPathLB.SetEntryData( nPos, new OUString( sPath ) );
         }
     }
 
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 38d777fa9587..25c7554a5132 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
                 // Store full path, show filename only. Use INetURLObject to display spaces in filename correctly
                 INetURLObject aUrl = INetURLObject(aFilesArr[i]);
                 sal_Int16 nPos = pImagesLst->InsertEntry( aUrl.GetLastName(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8) );
-                pImagesLst->SetEntryData(nPos, (OUString*) new OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8)));
+                pImagesLst->SetEntryData(nPos, new OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8)));
             }
         }
     }
@@ -509,10 +509,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
         pImagesLst->RemoveEntry( sUpperEntry );
 
         pImagesLst->InsertEntry( sActEntry, nActPos - 1 );
-        pImagesLst->SetEntryData( nActPos - 1, (void*) new OUString(sAct));
+        pImagesLst->SetEntryData( nActPos - 1, new OUString(sAct));
 
         pImagesLst->InsertEntry( sUpperEntry, nActPos );
-        pImagesLst->SetEntryData( nActPos, (void*) new OUString(sUpper));
+        pImagesLst->SetEntryData( nActPos, new OUString(sUpper));
 
         pImagesLst->SelectEntryPos(nActPos - 1);
     }
@@ -538,10 +538,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl)
         pImagesLst->RemoveEntry( sDownEntry );
 
         pImagesLst->InsertEntry( sDownEntry, nActPos );
-        pImagesLst->SetEntryData( nActPos, (void*) new OUString(sDown));
+        pImagesLst->SetEntryData( nActPos, new OUString(sDown));
 
         pImagesLst->InsertEntry( sActEntry, nActPos + 1 );
-        pImagesLst->SetEntryData( nActPos + 1, (void*) new OUString(sAct));
+        pImagesLst->SetEntryData( nActPos + 1, new OUString(sAct));
 
         pImagesLst->SelectEntryPos(nActPos + 1);
 
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8bd2f5ff9a3e..77e7362b05ac 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1076,7 +1076,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl)
             nIdx = 0;
             OUString* pURL = new OUString( rRow.getToken( 2, '\t', nIdx ) );
             sal_uInt16 nPos = aResultsLB.InsertEntry( aTitle );
-            aResultsLB.SetEntryData( nPos, (void*)(sal_uIntPtr)pURL );
+            aResultsLB.SetEntryData( nPos, pURL );
         }
         LeaveWait();
 
@@ -1279,7 +1279,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
                     OUString aImageURL = IMAGE_URL;
                     aImageURL += INetURLObject( *pURL ).GetHost();
                     nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( INetURLObject(aImageURL), false ) );
-                    SetEntryData( nPos, (void*)(sal_uIntPtr)( new OUString( *pURL ) ) );
+                    SetEntryData( nPos, new OUString( *pURL ) );
                     SelectEntryPos( nPos );
                     delete pURL;
                 }
@@ -1452,7 +1452,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString
     OUString aImageURL = IMAGE_URL;
     aImageURL += INetURLObject( rURL ).GetHost();
     sal_uInt16 nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( INetURLObject(aImageURL), false ) );
-    aBookmarksBox.SetEntryData( nPos, (void*)(sal_uIntPtr)( new OUString( rURL ) ) );
+    aBookmarksBox.SetEntryData( nPos, new OUString( rURL ) );
 }
 
 OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory        ,
@@ -1593,7 +1593,7 @@ void SfxHelpIndexWindow_Impl::Initialize()
         OUString aURL = rRow.getToken( 2, '\t', nIdx );
         OUString* pFactory = new OUString( INetURLObject( aURL ).GetHost() );
         sal_uInt16 nPos = aActiveLB.InsertEntry( aTitle );
-        aActiveLB.SetEntryData( nPos, (void*)(sal_uIntPtr)pFactory );
+        aActiveLB.SetEntryData( nPos, pFactory );
     }
 
     aActiveLB.SetDropDownLineCount( (sal_uInt16)aFactories.size() );