From e0d43c1493e7a36086df622247ad45c04c502929 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Tue, 12 Jan 2010 23:30:34 +0100
Subject: autorecovery: remove SID_VIEW, it is used only once, and mapped to
 SID_HIDDEN, anyway

---
 sd/source/ui/dlg/dlgass.cxx | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'sd/source/ui/dlg/dlgass.cxx')

diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index ea89fba79500..5fdb08e112b1 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -304,8 +304,8 @@ public:
     OKButton            maFinishButton;
     SdDocPreviewWin     maPreview;
 
-    String              maCreateStr;
-    String              maOpenStr;
+    String              maCreateStr;
+    String              maOpenStr;
 
     // Seite 1
     FixedBitmap*        mpPage1FB;
@@ -385,8 +385,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     maLastPageButton(pWindow,SdResId(BUT_LAST)),
     maNextPageButton(pWindow,SdResId(BUT_NEXT)),
     maFinishButton(pWindow,SdResId(BUT_FINISH)),
-    maPreview(pWindow,SdResId(CT_PREVIEW)),
-    maCreateStr(SdResId(STR_CREATE)),
+    maPreview(pWindow,SdResId(CT_PREVIEW)),
+    maCreateStr(SdResId(STR_CREATE)),
     maOpenStr(SdResId(STR_OPEN))
 {
     maPageListFile += sal_Unicode('?'),
@@ -974,9 +974,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
     mpPage1OpenLB->Show(eType == ST_OPEN);
     mpPage1OpenPB->Show(eType == ST_OPEN);
 
-    if (eType == ST_OPEN)
-        maFinishButton.SetText(maOpenStr);
-    else
+    if (eType == ST_OPEN)
+        maFinishButton.SetText(maOpenStr);
+    else
         maFinishButton.SetText(maCreateStr);
 }
 
@@ -1594,14 +1594,13 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
             aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile ));
             aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) );
             aReq.AppendItem( SfxStringItem( SID_TARGETNAME, aTargetStr ) );
-            aReq.AppendItem( SfxBoolItem( SID_VIEW, FALSE ) );
+            aReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
             aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) );
 
-            const SfxObjectShellItem* pRet = (SfxObjectShellItem*)
-                SFX_APP()->ExecuteSlot( aReq );
+            const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SFX_APP()->ExecuteSlot( aReq ) );
 
-            if( pRet && pRet->GetObjectShell() )
-                xDocShell = pRet->GetObjectShell();
+            if ( pRet && pRet->GetFrame() && pRet->GetFrame()->GetObjectShell() )
+                xDocShell = pRet->GetFrame()->GetObjectShell();
         }
 
 
-- 
cgit