renaissance1: merge with DEV300_m84

2010-07-01 18:06:39 +02:00
parent 4a33a0f64f 4adb61dc6b
commit df76bfb069
402 changed files with 6146 additions and 11850 deletions
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -53,12 +53,6 @@ public:
    TYPEINFO();
    SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL)

-    static SfxShell* CreateInstance (
-        sal_Int32 nId,
-        SfxShell* pParent,
-        void* pUserData,
-        ViewShellBase& rBase);
-
    static ::boost::shared_ptr<SlideSorterViewShell> Create(
        SfxViewFrame* pFrame,
        ViewShellBase& rViewShellBase,