From bb3daa7351f0b07e6f4331c19837081e6c3e30b8 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 7 Oct 2010 13:54:14 +0200
Subject: dba34b: #i112779# no need to use a UNO control/peer for the throbber
 - it exists as VCL control now

---
 desktop/source/migration/wizard.hxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'desktop/source/migration/wizard.hxx')

diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 3317880f8bd6..48045f6b035f 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -30,9 +30,8 @@
 
 #include <rtl/ustring.hxx>
 #include <svtools/roadmapwizard.hxx>
-#include <vcl/window.hxx>
+#include <vcl/throbber.hxx>
 #include <tools/resid.hxx>
-#include <com/sun/star/awt/XThrobber.hpp>
 
 namespace desktop
 {
@@ -76,7 +75,7 @@ private:
     sal_Bool m_bLicenseWasAccepted;
     sal_Bool m_bAutomaticUpdChk;
     Link m_lnkCancel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
+    Throbber  m_aThrobber;
 
     rtl::OUString m_aLicensePath;
 
-- 
cgit 


From 351f811977224b7ef0cd10256d02f43b1ad19324 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Fri, 14 Jan 2011 17:22:33 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from desktop

---
 desktop/source/migration/wizard.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'desktop/source/migration/wizard.hxx')

diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 3317880f8bd6..7e97f7d8e30e 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -40,7 +40,7 @@ namespace desktop
 class WizardResId : public ResId
 {
 public:
-    WizardResId( USHORT nId );
+    WizardResId( sal_uInt16 nId );
 };
 
 class FirstStartWizard : public svt::RoadmapWizard
-- 
cgit