CWS-TOOLING: integrate CWS dba33i

5 files changed, 3 insertions, 12 deletions

diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index f23229d31a43..07c3d2b375e0 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -103,6 +103,6 @@
 #define SC_PAGEVIEWZOOMVALUE                "PageViewZoomValue"
 #define SC_SHOWPAGEBREAKPREVIEW             "ShowPageBreakPreview"
 #define SC_VIEWID                           "ViewId"
-#define SC_VIEW                             "View"
+#define SC_VIEW                             "view"
 
 #endif
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index b4313c1d7a32..28cc2a823928 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -144,7 +144,6 @@ private:
     ScNavigatorSettings*    pNavSettings;
 
     // used in first Activate
-    ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aPendingUserData;
     BOOL                    bFirstActivate;
 
     BOOL                    bActiveDrawSh;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 38d5144274c5..48ffd4fd39a4 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -108,7 +108,7 @@ SFX_IMPL_INTERFACE( ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL) )
     SFX_POPUPMENU_REGISTRATION(ScResId(RID_POPUP_PREVIEW));
 }
 
-SFX_IMPL_VIEWFACTORY( ScPreviewShell, ScResId(STR_NONAME) )
+SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" )
 {
     SFX_VIEW_REGISTRATION(ScDocShell);
 }
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 1733cf2e19b5..2fc2bba072d9 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -102,7 +102,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
     //-->Added by PengYunQuan for Validity Cell Range Picker
 }
 
-SFX_IMPL_VIEWFACTORY( ScTabViewShell, ScResId(STR_NONAME) )
+SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" )
 {
     SFX_VIEW_REGISTRATION(ScDocShell);
 }
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index ed09ec85ee8c..0835d08de9fd 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -173,13 +173,6 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
             SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_NAVIGATOR_UPDATEALL ) );
             bFirstActivate = FALSE;
 
-            if ( aPendingUserData.hasElements() )
-            {
-                //  #89897# read user data from print preview now, after ctor
-                DoReadUserDataSequence( aPendingUserData );
-                aPendingUserData.realloc( 0 );
-            }
-
             // #116278# ReadExtOptions (view settings from Excel import) must also be done
             // after the ctor, because of the potential calls to Window::Show.
             // Even after the fix for #104887# (Window::Show no longer notifies the access
@@ -1924,7 +1917,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
     if ( pOldSh && pOldSh->ISA( ScPreviewShell ) )
     {
         ScPreviewShell* pPreviewShell = ((ScPreviewShell*)pOldSh);
-        aPendingUserData = pPreviewShell->GetSourceData();      // used in Activate
         nForceDesignMode = pPreviewShell->GetSourceDesignMode();
     }