From 28d8a1b19571f801277f9c98f818dda4158fbf2c Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 1 Sep 2010 14:59:07 +0200 Subject: [PATCH] dba33i: #i111146# migrated all SFX-based applications to use named views --- sd/inc/FactoryIds.hxx | 3 +-- sd/source/ui/app/strings.src | 4 ---- sd/source/ui/inc/strings.hrc | 1 - sd/source/ui/view/GraphicViewShellBase.cxx | 2 +- sd/source/ui/view/ImpressViewShellBase.cxx | 2 +- sd/source/ui/view/OutlineViewShellBase.cxx | 2 +- sd/source/ui/view/PresentationViewShellBase.cxx | 2 +- sd/source/ui/view/SlideSorterViewShellBase.cxx | 2 +- sd/source/ui/view/ViewShellBase.cxx | 2 +- 9 files changed, 7 insertions(+), 13 deletions(-) mode change 100644 => 100755 sd/inc/FactoryIds.hxx mode change 100644 => 100755 sd/source/ui/view/ImpressViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/OutlineViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/PresentationViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/SlideSorterViewShellBase.cxx diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx old mode 100644 new mode 100755 index 66477a1faf67..4f2346942fc9 --- a/sd/inc/FactoryIds.hxx +++ b/sd/inc/FactoryIds.hxx @@ -42,8 +42,7 @@ enum ViewShellFactoryIds DRAW_FACTORY_ID = 1, SLIDE_SORTER_FACTORY_ID = 2, OUTLINE_FACTORY_ID = 3, - PRESENTATION_FACTORY_ID = 4, - PREVIEW_FACTORY_ID = 5 + PRESENTATION_FACTORY_ID = 4 }; } // end of namespace sd diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index e992e7016f04..bb1199fdd352 100755 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -86,10 +86,6 @@ String RID_APPTITLE { Text = "StarImpress 4.0" ; }; -String STR_DEFAULTVIEW -{ - Text [ en-US ] = "Default" ; -}; String STR_NULL { Text [ en-US ] = "None" ; diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index d9dc93a1ef20..7f5086057e5c 100755 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -28,7 +28,6 @@ #ifndef _SD_CFGID_HXX #include "cfgids.hxx" #endif -#define STR_DEFAULTVIEW (RID_APP_START) #define STR_NULL (RID_APP_START+3) #define STR_INSERTPAGE (RID_APP_START+35) #define STR_INSERTLAYER (RID_APP_START+37) diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 759103760bfe..99e45a0d05d6 100755 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -62,7 +62,7 @@ SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance ( void GraphicViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); + &CreateInstance,&InitFactory,nPrio,"Default"); InitFactory(); } void GraphicViewShellBase::InitFactory() diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx old mode 100644 new mode 100755 index 0cd5971eb51e..69906fbfd5d8 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -62,7 +62,7 @@ SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance ( void ImpressViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); + &CreateInstance,&InitFactory,nPrio,"Default"); InitFactory(); } void ImpressViewShellBase::InitFactory() diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx old mode 100644 new mode 100755 index 762219c88016..3c31155a9fb5 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -60,7 +60,7 @@ SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance ( void OutlineViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); + &CreateInstance,&InitFactory,nPrio,"Outline"); InitFactory(); } void OutlineViewShellBase::InitFactory() diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx old mode 100644 new mode 100755 index a16b12d3cb63..0fcb421a9888 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -70,7 +70,7 @@ SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance ( void PresentationViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); + &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation"); InitFactory(); } void PresentationViewShellBase::InitFactory() diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx old mode 100644 new mode 100755 index 466f699b1bb0..7944d2cf4b2e --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -64,7 +64,7 @@ SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance ( void SlideSorterViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); + &CreateInstance,&InitFactory,nPrio,"SlideSorter"); InitFactory(); } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 1e18ad5c5ee9..c748ffbc05e0 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -258,7 +258,7 @@ SfxViewShell* __EXPORT ViewShellBase::CreateInstance ( void ViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); + &CreateInstance,&InitFactory,nPrio,"Default"); InitFactory(); } void ViewShellBase::InitFactory()