[Libreoffice-commits] core.git: cui/source

[Stephan Bergmann]

 cui/source/options/optsave.cxx |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 1da153b617b80887680be65c1854ef8080c2e1c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 22 15:11:22 2014 +0200

    Consistently use APP_WRITER as an integer, never as a nullptr
    
    (not that it matters much in practice, on platforms where nullptr is all-zero
    anyway)
    
    Change-Id: I640e4e3e8c77f8c5c59c8e4b51c04f72dc1fadf9

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index bb01888..5101a21 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -110,13 +110,13 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
     aODFVersionLB->SetEntryData(2, (void*)8         ); // 1.2 Extended (compat mode)
     aODFVersionLB->SetEntryData(3, (void*)0x7fffffff); // 1.2 Extended (recommended)
 
-    aDocTypeLB->SetEntryData(0, (void*)APP_WRITER       );
-    aDocTypeLB->SetEntryData(1, (void*)APP_WRITER_WEB   );
-    aDocTypeLB->SetEntryData(2, (void*)APP_WRITER_GLOBAL);
-    aDocTypeLB->SetEntryData(3, (void*)APP_CALC         );
-    aDocTypeLB->SetEntryData(4, (void*)APP_IMPRESS      );
-    aDocTypeLB->SetEntryData(5, (void*)APP_DRAW         );
-    aDocTypeLB->SetEntryData(6, (void*)APP_MATH         );
+    aDocTypeLB->SetEntryData(0, reinterpret_cast<void*>(APP_WRITER)       );
+    aDocTypeLB->SetEntryData(1, reinterpret_cast<void*>(APP_WRITER_WEB)   );
+    aDocTypeLB->SetEntryData(2, reinterpret_cast<void*>(APP_WRITER_GLOBAL));
+    aDocTypeLB->SetEntryData(3, reinterpret_cast<void*>(APP_CALC)         );
+    aDocTypeLB->SetEntryData(4, reinterpret_cast<void*>(APP_IMPRESS)      );
+    aDocTypeLB->SetEntryData(5, reinterpret_cast<void*>(APP_DRAW)         );
+    aDocTypeLB->SetEntryData(6, reinterpret_cast<void*>(APP_MATH)         );
 
     Link aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
     aAutoSaveCB->SetClickHdl( aLink );
@@ -169,12 +169,12 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
 
     if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
     {
-        aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER ));
-        aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER_WEB ));
-        aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER_GLOBAL ));
-        aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_WRITER ));
-        aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_WRITER_WEB ));
-        aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_WRITER_GLOBAL ));
+        aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER) ));
+        aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER_WEB) ));
+        aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER_GLOBAL) ));
+        aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER) ));
+        aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER_WEB) ));
+        aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER_GLOBAL) ));
     }
     else
     {