impress195: merge with DEV300_m92

20 files changed, 394 insertions, 86 deletions

diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index b43dba7d6673..1d4003fa44e6 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -543,7 +543,6 @@
 #include "svl/ownlist.hxx"
 #include "svtools/parhtml.hxx"
 #include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
 #include "svl/poolitem.hxx"
 #include "svtools/printoptions.hxx"
 #include "unotools/printwarningoptions.hxx"
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 3508ea026637..fc7b318965b0 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -69,7 +69,6 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
 {
     sal_uInt32              nUniqId;
     String                  aExtraData;
-    Timer                   aTimer;
     const SfxItemSet*       pInputSet;
     SfxItemSet*             pOutputSet;
 
@@ -77,8 +76,6 @@ private:
     SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined
     SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined
 
-    DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* );
-
     SAL_DLLPRIVATE void SetDialogData_Impl();
     SAL_DLLPRIVATE void GetDialogData_Impl();
     SAL_DLLPRIVATE void init();
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index f0dd2248c456..8d99d6efd9f4 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -122,7 +122,7 @@ friend class SfxViewFrame;
     DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
 
     SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord );
-    SAL_DLLPRIVATE sal_uInt32 _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
+    SAL_DLLPRIVATE void _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
     SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*);
 
 protected:
@@ -237,7 +237,7 @@ public:
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
     SAL_DLLPRIVATE void SetMenu_Impl();
-    SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
+    SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
     SAL_DLLPRIVATE BOOL IsUpdated_Impl() const;
     SAL_DLLPRIVATE void DebugOutput_Impl() const;
     SAL_DLLPRIVATE void ResetObjectBars_Impl();
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 7468394d2617..89062d7b7263 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -94,7 +94,7 @@ public:
     USHORT          GetViewFactoryCount() const;
     SfxViewFactory& GetViewFactory(USHORT i = 0) const;
 
-    /// returns the view factory whose GetViewName delivers the requested logical name
+    /// returns the view factory whose GetAPIViewName or GetLegacyViewName delivers the requested logical name
     SfxViewFactory* GetViewFactoryByViewName( const String& i_rViewName ) const;
 
     // Filter
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index e4d3ff023b3b..0cb57e7a414d 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -62,7 +62,6 @@ class Timer;
 class SfxItemSet;
 class DateTime;
 class SvStringsDtor;
-class SvEaMgr;
 
 #define S2BS(s) ByteString( s, RTL_TEXTENCODING_MS_1252 )
 
@@ -208,8 +207,6 @@ public:
     SvStream*           GetInStream();
     SvStream*           GetOutStream();
 
-    SvEaMgr*            GetEaMgr();
-
     sal_Bool            Commit();
     sal_Bool            IsStorage();
 
@@ -323,7 +320,6 @@ public:
 
     static com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag > GetVersionList(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
-    static sal_Bool EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL );
     static ::rtl::OUString CreateTempCopyWithExt( const ::rtl::OUString& aURL );
     static sal_Bool CallApproveHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler, ::com::sun::star::uno::Any aRequest, sal_Bool bAllowAbort );
 
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index 9b775f8e827d..619358f077ac 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -281,8 +281,7 @@ public:
             Pointer to an array of help ids. For each element in _pControlId, there must be
             a corresponding element herein.
     */
-    void                    SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId );
-    void                    SetDialogHelpId( const sal_Int32 _nHelpId );
+    void                    SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
     void                    CreateMatcher( const String& rName );
 
     /** sets the context of the dialog and trigger necessary actions e.g. loading config, setting help id
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 9c9b566d9d9d..f1df0f0aa547 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -134,7 +134,7 @@ public:
     void                EndInsert();
     void                CheckItem( USHORT, BOOL );
     void                RemoveItem( USHORT );
-    void                InsertItem( USHORT, const String&, MenuItemBits,
+    void                InsertItem( USHORT, const String&, MenuItemBits, const rtl::OString& rHelpId,
                                 USHORT nPos = MENU_APPEND );
     void                InsertSeparator( USHORT nPos = MENU_APPEND );
     // @deprecated (end)
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index efbc2d2c75af..10fbd222a2ed 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -29,6 +29,9 @@
 
 #include <tools/rtti.hxx>
 #include <sfx2/shell.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
 
 //--------------------------------------------------------------------
 
@@ -287,6 +290,8 @@ public:
     USHORT          GetValue() const { return nValue; }
     const SfxType*  GetType() const { return pType; }
     const char*     GetUnoName() const { return pUnoName; }
+    SFX2_DLLPUBLIC rtl::OString    GetCommand() const;
+    SFX2_DLLPUBLIC rtl::OUString    GetCommandString() const;
 
     USHORT          GetFormalArgumentCount() const { return nArgDefCount; }
     const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 63eb9e8c876f..9473ac126bd7 100755..100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -293,6 +293,7 @@ public:
     sal_Bool                    IsReadOnlyUI() const;
     void                        SetNoName();
     sal_Bool                    IsInModalMode() const;
+    sal_Bool                    IsInPrepareClose() const;
     //<!--Added by PengYunQuan for Validity Cell Range Picker
     virtual sal_Bool            AcceptStateUpdate() const;
     //-->Added by PengYunQuan for Validity Cell Range Picker
@@ -346,6 +347,9 @@ public:
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
     virtual void                UpdateLinks();
 
+    // called for a few slots like SID_SAVE[AS]DOC, SID_PRINTDOC[DIRECT], derived classes may abort the action
+    virtual sal_Bool            QuerySlotExecutable( USHORT nSlotId );
+
     sal_Bool                    SaveChildren(BOOL bObjectsOnly=FALSE);
     sal_Bool                    SaveAsChildren( SfxMedium &rMedium );
     sal_Bool                    SwitchChildrenPersistance(
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index 0d11462685d5..df8ae09f90a3 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -54,10 +54,7 @@ public:
     String                  GetCurrentFilter() const;
     void                    SetCurrentFilter(const String&);
 
-    /// Set dialog help id at FileDlgHelper
-    void                    SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId );
-    /// Set control help ids at FileDlgHelper
-    void                    SetDialogHelpId( const INT32 _nHelpId );
+    void                    SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId );
 private:
     // disable copy and assignment
     SFX2_DLLPRIVATE SvxOpenGraphicDialog    (const SvxOpenGraphicDialog&);
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 4f4a04834257..b0105553cd40 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -78,7 +78,7 @@ public:
 
     void            SetMinLen( USHORT Len );
     void            SetMaxLen( USHORT Len );
-    void            SetEditHelpId( ULONG nId ) { maPasswordED.SetHelpId( nId ); }
+    void            SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); }
     void            ShowExtras( USHORT nExtras ) { mnExtras = nExtras; }
     void            AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; }
 
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
new file mode 100644
index 000000000000..bdf27baac7b3
--- /dev/null
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -0,0 +1,345 @@
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2000, 2010 Oracle and/or its affiliates.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ ************************************************************************/

+#ifndef SFX2_SFXCOMMANDS_HRC

+#define SFX2_SFXCOMMANDS_HRC

+

+#define CMD_SID_VIEWSHELL0                          ".uno:_SwitchViewShell0"

+#define CMD_SID_VIEWSHELL1                          ".uno:_SwitchViewShell1"

+#define CMD_SID_VIEWSHELL2                          ".uno:_SwitchViewShell2"

+#define CMD_SID_VIEWSHELL3                          ".uno:_SwitchViewShell3"

+#define CMD_SID_VIEWSHELL4                          ".uno:_SwitchViewShell4"

+#define CMD_SID_ABOUT                               ".uno:About"

+#define CMD_SID_ACTIVATE                            ".uno:Activate"

+#define CMD_SID_HELPBALLOONS                        ".uno:ActiveHelp"

+#define CMD_SID_STYLE_FAMILY                        ".uno:ActualStyleFamily"

+#define CMD_SID_NEWDOC                              ".uno:NewDoc"

+#define CMD_SID_CREATELINK                          ".uno:AddBookmark"

+#define CMD_SID_NEWDOCDIRECT                        ".uno:AddDirect"

+#define CMD_SID_TEMPLATE_ADDRESSBOKSOURCE           ".uno:AddressBookSource"

+#define CMD_SID_BASICIDE_ADDWATCH                   ".uno:AddWatch"

+#define CMD_SID_DOCINFO_AUTHOR                      ".uno:Author"

+#define CMD_SID_AUTOHIDE                            ".uno:AutoHide"

+#define CMD_SID_AUTOPILOTMENU                       ".uno:AutoPilotMenu"

+#define CMD_SID_GALLERY_BG_BRUSH                    ".uno:BackgroundImage"

+#define CMD_SID_BACKSPACE                           ".uno:Backspace"

+#define CMD_SID_BASICBREAK                          ".uno:BasicBreak"

+#define CMD_SID_BASICIDE_APPEAR                     ".uno:BasicIDEAppear"

+#define CMD_SID_BASICSTEPINTO                       ".uno:BasicStepInto"

+#define CMD_SID_BASICSTEPOUT                        ".uno:BasicStepOut"

+#define CMD_SID_BASICSTEPOVER                       ".uno:BasicStepOver"

+#define CMD_SID_BASICSTOP                           ".uno:BasicStop"

+#define CMD_SID_BROWSER                             ".uno:Beamer"

+#define CMD_SID_BASICIDE_BRKPNTSCHANGED             ".uno:BreakPointsChanged"

+#define CMD_SID_BROWSE_BACKWARD                     ".uno:BrowseBackward"

+#define CMD_SID_BROWSE_FORWARD                      ".uno:BrowseForward"

+#define CMD_SID_BROWSER_MODE                        ".uno:BrowseView"

+#define CMD_SID_BUILD_VERSION                       ".uno:BuildVersion"

+#define CMD_SID_CAPTION                             ".uno:Caption"

+#define CMD_SID_STYLE_FAMILY1                       ".uno:CharStyle"

+#define CMD_SID_CHECK_KEY                           ".uno:CheckKey"

+#define CMD_SID_BASICIDE_CHOOSEMACRO                ".uno:ChooseMacro"

+#define CMD_SID_CLEARHISTORY                        ".uno:ClearHistory"

+#define CMD_SID_CLOSEWINS                           ".uno:CloseWins"

+#define CMD_SID_CLOSEDOCS                           ".uno:CloseDocs"

+#define CMD_SID_CLOSEDOC                            ".uno:CloseDoc"

+#define CMD_SID_CLOSEWIN                            ".uno:CloseWin"

+#define CMD_SID_CLOSING                             ".uno:Closing"

+#define CMD_SID_DOCINFO_COMMENTS                    ".uno:Comments"

+#define CMD_SID_OFFICE_COMMERCIAL_USE               ".uno:CommercialUse"

+#define CMD_SID_DOCUMENT_COMPARE                    ".uno:CompareDocuments"

+#define CMD_SID_BASICCOMPILE                        ".uno:CompileBasic"

+#define CMD_SID_CONFIG                              ".uno:ConfigureDialog"

+#define CMD_SID_CONTEXT                             ".uno:Context"

+#define CMD_SID_COPY                                ".uno:Copy"

+#define CMD_SID_CRASH                               ".uno:Crash"

+#define CMD_SID_BASICIDE_CREATEMACRO                ".uno:CreateMacro"

+#define CMD_SID_CURRENT_URL                         ".uno:CurrentURL"

+#define CMD_SID_CURSORENDOFSCREEN                   ".uno:CursorEndOfScreen"

+#define CMD_SID_CURSORTOPOFSCREEN                   ".uno:CursorTopOfScreen"

+#define CMD_SID_OFFICE_CUSTOMERNUMBER               ".uno:CustomerNumber"

+#define CMD_SID_CUT                                 ".uno:Cut"

+#define CMD_SID_DEFAULTFILEPATH                     ".uno:DefaultFilePath"

+#define CMD_SID_DEFAULTFILENAME                     ".uno:DefaultFileName"

+#define CMD_SID_DELETE                              ".uno:Delete"

+#define CMD_SID_BASICIDE_DELETECURRENT              ".uno:DeleteCurrent"

+#define CMD_SID_STYLE_DELETE                        ".uno:DeleteStyle"

+#define CMD_SID_STYLE_DESIGNER                      ".uno:DesignerDialog"

+#define CMD_SID_STYLE_DRAGHIERARCHIE                ".uno:DragHierarchy"

+#define CMD_SID_EDITDOC                             ".uno:EditDoc"

+#define CMD_SID_BASICIDE_EDITMACRO                  ".uno:EditMacro"

+#define CMD_SID_STYLE_EDIT                          ".uno:EditStyle"

+#define CMD_FID_SEARCH_NOW                          ".uno:ExecuteSearch"

+#define CMD_SID_EXTENDEDHELP                        ".uno:ExtendedHelp"

+#define CMD_SID_FILE_NAME                           ".uno:FileName"

+#define CMD_SID_FOCUSURLBOX                         ".uno:FocusUrlBox"

+#define CMD_SID_FORMATMENU                          ".uno:FormatMenu"

+#define CMD_SID_STYLE_FAMILY3                       ".uno:FrameStyle"

+#define CMD_SID_FRAMETITLE                          ".uno:FrameTitle"

+#define CMD_SID_PROGFILENAME                        ".uno:FullName"

+#define CMD_SID_DOCFULLNAME                         ".uno:FullName"

+#define CMD_SID_WIN_FULLSCREEN                      ".uno:FullScreen"

+#define CMD_SID_FILLFRAME                           ".uno:GetFrameWindow"

+#define CMD_SID_CURSORDOWN                          ".uno:GoDown"

+#define CMD_SID_CURSORPAGEDOWN                      ".uno:GoDownBlock"

+#define CMD_SID_CURSORPAGEDOWN_SEL                  ".uno:GoDownBlockSel"

+#define CMD_SID_CURSORDOWN_SEL                      ".uno:GoDownSel"

+#define CMD_SID_CURSORLEFT                          ".uno:GoLeft"

+#define CMD_SID_CURSORPAGELEFT                      ".uno:GoLeftBlock"

+#define CMD_SID_CURSORPAGELEFT_SEL                  ".uno:GoLeftBlockSel"

+#define CMD_SID_CURSORLEFT_SEL                      ".uno:GoLeftSel"

+#define CMD_SID_CURSORRIGHT                         ".uno:GoRight"

+#define CMD_SID_CURSORRIGHT_SEL                     ".uno:GoRightSel"

+#define CMD_SID_CURSORENDOFFILE                     ".uno:GoToEndOfData"

+#define CMD_SID_CURSORENDOFFILE_SEL                 ".uno:GoToEndOfDataSel"

+#define CMD_SID_CURSOREND                           ".uno:GoToEndOfRow"

+#define CMD_SID_CURSOREND_SEL                       ".uno:GoToEndOfRowSel"

+#define CMD_SID_CURSORTOPOFFILE                     ".uno:GoToStart"

+#define CMD_SID_CURSORHOME                          ".uno:GoToStartOfRow"

+#define CMD_SID_CURSORHOME_SEL                      ".uno:GoToStartOfRowSel"

+#define CMD_SID_CURSORTOPOFFILE_SEL                 ".uno:GoToStartSel"

+#define CMD_SID_CURSORUP                            ".uno:GoUp"

+#define CMD_SID_CURSORPAGEUP                        ".uno:GoUpBlock"

+#define CMD_SID_CURSORPAGEUP_SEL                    ".uno:GoUpBlockSel"

+#define CMD_SID_CURSORUP_SEL                        ".uno:GoUpSel"

+#define CMD_SID_HELP_ANNOTATE                       ".uno:HelpAnnotate"

+#define CMD_SID_HELP_BOOKMARK                       ".uno:HelpBookmark"

+#define CMD_SID_HELP_HELPFILEBOX                    ".uno:HelpChooseFile"

+#define CMD_SID_HELP_DOWNLOAD                       ".uno:HelpDownload"

+#define CMD_SID_HELP_PI                             ".uno:HelperDialog"

+#define CMD_SID_HELPINDEX                           ".uno:HelpIndex"

+#define CMD_SID_HELPMENU                            ".uno:HelpMenu"

+#define CMD_SID_HELPONHELP                          ".uno:HelpOnHelp"

+#define CMD_SID_HELP_SEARCH                         ".uno:HelpSearch"

+#define CMD_SID_HELPTIPS                            ".uno:HelpTip"

+#define CMD_SID_HELP_ZOOMIN                         ".uno:HelpZoomIn"

+#define CMD_SID_HELP_ZOOMOUT                        ".uno:HelpZoomOut"

+#define CMD_SID_BASICIDE_HIDECURPAGE                ".uno:HideCurPage"

+#define CMD_SID_HYPERLINK_DIALOG                    ".uno:HyperlinkDialog"

+#define CMD_SID_INSERTDOC                           ".uno:InsertDoc"

+#define CMD_SID_HYPERLINK_INSERT                    ".uno:InsertHyperlink"

+#define CMD_SID_INSERT_FLOATINGFRAME                ".uno:InsertObjectFloatingFrame"

+#define CMD_SID_INTERNET_ONLINE                     ".uno:InternetOnline"

+#define CMD_SID_INTERNET_SEARCH                     ".uno:InternetSearch"

+#define CMD_SID_DOC_LOADING                         ".uno:IsLoading"

+#define CMD_SID_IMG_LOADING                         ".uno:IsLoadingImages"

+#define CMD_SID_PRINTOUT                            ".uno:IsPrinting"

+#define CMD_SID_JUMPTOMARK                          ".uno:JumpToMark"

+#define CMD_SID_DOCINFO_KEYWORDS                    ".uno:Keywords"

+#define CMD_SID_BASICIDE_LIBLOADED                  ".uno:LibLoaded"

+#define CMD_SID_BASICIDE_LIBREMOVED                 ".uno:LibRemoved"

+#define CMD_SID_BASICIDE_LIBSELECTED                ".uno:LibSelect"

+#define CMD_SID_BASICIDE_LIBSELECTOR                ".uno:LibSelector"

+#define CMD_SID_OFFICE_PLK                          ".uno:LicenceKey"

+#define CMD_SID_CONFIGACCEL                         ".uno:LoadAccel"

+#define CMD_SID_BASICLOAD                           ".uno:LoadBasic"

+#define CMD_SID_LOADCONFIG                          ".uno:LoadConfiguration"

+#define CMD_SID_CONFIGEVENT                         ".uno:LoadEvents"

+#define CMD_SID_CONFIGMENU                          ".uno:LoadMenu"

+#define CMD_SID_CONFIGSTATUSBAR                     ".uno:LoadStatusBar"

+#define CMD_SID_TOOLBOXOPTIONS                      ".uno:LoadToolBox"

+#define CMD_SID_LOGOUT                              ".uno:Logout"

+#define CMD_SID_SCRIPTORGANIZER                     ".uno:ScriptOrganizer"

+#define CMD_SID_MACROORGANIZER                      ".uno:MacroOrganizer"

+#define CMD_SID_RUNMACRO                            ".uno:RunMacro"

+#define CMD_SID_BASICCHOOSER                        ".uno:MacroDialog"

+#define CMD_SID_MAIL_NOTIFY                         ".uno:MailReceipt"

+#define CMD_SID_MAIL_CHILDWIN                       ".uno:MailWindow"

+#define CMD_SID_BASICIDE_MATCHGROUP                 ".uno:MatchGroup"

+#define CMD_SID_TOGGLE_MENUBAR                      ".uno:MenuBarVisible"

+#define CMD_SID_DOCUMENT_MERGE                      ".uno:MergeDocuments"

+#define CMD_SID_ATTR_METRIC                         ".uno:MetricUnit"

+#define CMD_SID_MODIFIED                            ".uno:Modified"

+#define CMD_SID_DOC_MODIFIED                        ".uno:ModifiedStatus"

+#define CMD_SID_BASICIDE_MODULEDLG                  ".uno:ModuleDialog"

+#define CMD_SID_BASICIDE_NAMECHANGEDONTAB           ".uno:NameChangedOnTab"

+#define CMD_SID_NAVIGATOR                           ".uno:Navigator"

+#define CMD_SID_RESTORE_EDITING_VIEW                ".uno:RestoreEditingView"

+#define CMD_SID_BASICIDE_NEWDIALOG                  ".uno:NewDialog"

+#define CMD_SID_BASICIDE_NEWMODULE                  ".uno:NewModule"

+#define CMD_SID_CREATE_BASICOBJECT                  ".uno:NewObject"

+#define CMD_SID_STYLE_NEW                           ".uno:NewStyle"

+#define CMD_SID_NEWWINDOW                           ".uno:NewWindow"

+#define CMD_SID_BASICIDE_OBJCAT                     ".uno:ObjectCatalog"

+#define CMD_SID_OBJECT                              ".uno:ObjectMenue"

+#define CMD_SID_OLD_PALK                            ".uno:OldPALK"

+#define CMD_SID_OPENDOC                             ".uno:Open"

+#define CMD_SID_WEBHTML                             ".uno:WebHtml"

+#define CMD_SID_OPENHYPERLINK                       ".uno:OpenHyperlink"

+#define CMD_SID_DOCINFO_TITLE                       ".uno:DocInfoTitle"

+#define CMD_SID_OPENTEMPLATE                        ".uno:OpenTemplate"

+#define CMD_SID_OPENURL                             ".uno:OpenUrl"

+#define CMD_SID_OPTIONS                             ".uno:Options"

+#define CMD_SID_ORGANIZER                           ".uno:Organizer"

+#define CMD_SID_STYLE_FAMILY4                       ".uno:PageStyle"

+#define CMD_SID_STYLE_FAMILY2                       ".uno:ParaStyle"

+#define CMD_SID_PARTWIN                             ".uno:PartWindow"

+#define CMD_SID_PASTE                               ".uno:Paste"

+#define CMD_SID_CLIPBOARD_FORMAT_ITEMS              ".uno:ClipboardFormatItems"

+#define CMD_SID_PASTE_SPECIAL                       ".uno:PasteSpecial"

+#define CMD_SID_DOCPATH                             ".uno:DocPath"

+#define CMD_SID_PICKLIST                            ".uno:PickList"

+#define CMD_SID_PLAYMACRO                           ".uno:PlayMacro"

+#define CMD_SID_PLUGINS_ACTIVE                      ".uno:PlugInsActive"

+#define CMD_SID_PRINTDOC                            ".uno:Print"

+#define CMD_SID_PRINTDOCDIRECT                      ".uno:PrintDefault"

+#define CMD_SID_PRINTER_NAME                        ".uno:Printer"

+#define CMD_SID_SETUPPRINTER                        ".uno:PrinterSetup"

+#define CMD_SID_PRINTPREVIEW                        ".uno:PrintPreview"

+#define CMD_SID_OFFICE_PRIVATE_USE                  ".uno:PrivateUse"

+#define CMD_SID_DOCINFO                             ".uno:SetDocumentProperties"

+#define CMD_SID_QUITAPP                             ".uno:Quit"

+#define CMD_SID_DOC_READONLY                        ".uno:ReadOnly"

+#define CMD_SID_RECORDMACRO                         ".uno:MacroRecorder"

+#define CMD_SID_STOP_RECORDING                      ".uno:StopRecording"

+#define CMD_SID_RECORDING_FLOATWINDOW               ".uno:MacroRecordingFloat"

+#define CMD_SID_REDO                                ".uno:Redo"

+#define CMD_SID_DELETE_BASICOBJECT                  ".uno:ReleaseObject"

+#define CMD_SID_RELOAD                              ".uno:Reload"

+#define CMD_SID_BASICIDE_REMOVEWATCH                ".uno:RemoveWatch"

+#define CMD_SID_BASICIDE_RENAMECURRENT              ".uno:RenameCurrent"

+#define CMD_SID_REPAINT                             ".uno:Repaint"

+#define CMD_SID_REPEAT                              ".uno:RepeatAction"

+#define CMD_SID_RUBY_DIALOG                         ".uno:RubyDialog"

+#define CMD_SID_BASICRUN                            ".uno:RunBasic"

+#define CMD_SID_STARTSW                             ".uno:RunStarWriter"

+#define CMD_SID_SAVEDOC                             ".uno:Save"

+#define CMD_SID_SAVEDOCS                            ".uno:SaveAll"

+#define CMD_SID_SAVEASDOC                           ".uno:SaveAs"

+#define CMD_SID_DOCTEMPLATE                         ".uno:SaveAsTemplate"

+#define CMD_SID_BASICSAVEAS                         ".uno:SaveBasicAs"

+#define CMD_SID_EXPORT_DIALOG                       ".uno:ExportDialog"

+#define CMD_SID_IMPORT_DIALOG                       ".uno:ImportDialog"

+#define CMD_SID_SAVECONFIG                          ".uno:SaveConfiguration"

+#define CMD_SID_DOC_SAVED                           ".uno:Saved"

+#define CMD_SID_BASICIDE_SBXDELETED                 ".uno:SbxDeleted"

+#define CMD_SID_BASICIDE_SBXINSERTED                ".uno:SbxInserted"

+#define CMD_SID_BASICIDE_SBXRENAMED                 ".uno:SbxRenamed"

+#define CMD_SID_MAIL_SCROLLBODY_PAGEDOWN            ".uno:ScrollBodyPageDown"

+#define CMD_SID_SEARCH_DLG                          ".uno:SearchDialog"

+#define CMD_SID_SEARCH_OPTIONS                      ".uno:SearchOptions"

+#define CMD_SID_SEARCH_ITEM                         ".uno:SearchProperties"

+#define CMD_SID_SELECTALL                           ".uno:SelectAll"

+#define CMD_FN_FAX                                  ".uno:SendFax"

+#define CMD_SID_MAIL_SENDDOC                        ".uno:SendMail"

+#define CMD_SID_MAIL_SENDDOCASPDF                   ".uno:SendMailDocAsPDF"

+#define CMD_SID_MAIL_SENDDOCASFORMAT                ".uno:SendMailDocAsFormat"

+#define CMD_SID_MAIL_SENDDOCASMS                    ".uno:SendMailDocAsMS"

+#define CMD_SID_MAIL_SENDDOCASOOO                   ".uno:SendMailDocAsOOo"

+#define CMD_SID_SETOPTIONS                          ".uno:SetOptions"

+#define CMD_SID_OFFICE_PALK                         ".uno:SetPALK"

+#define CMD_SID_SHOW_BROWSER                        ".uno:ShowBrowser"

+#define CMD_SID_SHOWPOPUPS                          ".uno:ShowPopups"

+#define CMD_SID_BASICIDE_SHOWSBX                    ".uno:ShowSbx"

+#define CMD_SID_SOURCEVIEW                          ".uno:SourceView"

+#define CMD_SID_ONLINE_REGISTRATION_DLG             ".uno:StartRegistrationDialog"

+#define CMD_SID_STATUSBARTEXT                       ".uno:StatusBar"

+#define CMD_SID_TOGGLESTATUSBAR                     ".uno:StatusBarVisible"

+#define CMD_SID_BASICIDE_STAT_DATE                  ".uno:StatusGetDate"

+#define CMD_SID_BASICIDE_STAT_POS                   ".uno:StatusGetPosition"

+#define CMD_SID_BASICIDE_STAT_TITLE                 ".uno:StatusGetTitle"

+#define CMD_SID_BASICIDE_STOREALLMODULESOURCES      ".uno:StoreAllModuleSources"

+#define CMD_SID_BASICIDE_STOREMODULESOURCE          ".uno:StoreModuleSource"

+#define CMD_SID_STYLE_APPLY                         ".uno:StyleApplyState"

+#define CMD_SID_STYLE_CATALOG                       ".uno:StyleCatalog"

+#define CMD_SID_STYLE_NEW_BY_EXAMPLE                ".uno:StyleNewByExample"

+#define CMD_SID_STYLE_UPDATE_BY_EXAMPLE             ".uno:StyleUpdateByExample"

+#define CMD_SID_STYLE_WATERCAN                      ".uno:StyleWatercanMode"

+#define CMD_SID_VIEWSHELL                           ".uno:SwitchViewShell"

+#define CMD_SID_TASKBAR                             ".uno:TaskBarVisible"

+#define CMD_SID_STYLE_FAMILY5                       ".uno:ListStyle"

+#define CMD_SID_TIPWINDOW                           ".uno:TipsDialog"

+#define CMD_SID_DOCTITLE                            ".uno:Title"

+#define CMD_SID_TITLE                               ".uno:Title"

+#define CMD_SID_BASICIDE_TOGGLEBRKPNT               ".uno:ToggleBreakPoint"

+#define CMD_SID_BASICIDE_SHOWWINDOW                 ".uno:BasicIDEShowWindow"

+#define CMD_SID_EDITMACRO                           ".uno:ToolsMacroEdit"

+#define CMD_SID_UNDO                                ".uno:Undo"

+#define CMD_SID_FORMATPAINTBRUSH                    ".uno:FormatPaintbrush"

+#define CMD_SID_ATTR_UNDO_COUNT                     ".uno:UndoCount"

+#define CMD_SID_BASICIDE_UPDATEALLMODULESOURCES     ".uno:UpdateAllModuleSources"

+#define CMD_SID_BASICIDE_UPDATEMODULESOURCE         ".uno:UpdateModuleSource"

+#define CMD_SID_BASICIDE_MANAGEBRKPNTS              ".uno:ManageBreakPoints"

+#define CMD_SID_BASICIDE_TOGGLEBRKPNTENABLED        ".uno:ToggleBreakPointEnabled"

+#define CMD_SID_UPDATE_VERSION                      ".uno:UpdateVersion"

+#define CMD_SID_VERSION                             ".uno:VersionDialog"

+#define CMD_SID_SIGNATURE                           ".uno:Signature"

+#define CMD_SID_MACRO_SIGNATURE                     ".uno:MacroSignature"

+#define CMD_SID_VERSION_VISIBLE                     ".uno:VersionVisible"

+#define CMD_SID_VIEW_DATA_SOURCE_BROWSER            ".uno:ViewDataSourceBrowser"

+#define CMD_SID_WIN_VISIBLE                         ".uno:WinVisible"

+#define CMD_SID_MDIWINDOWLIST                       ".uno:WindowList"

+#define CMD_SID_ZOOM_IN                             ".uno:ZoomMinus"

+#define CMD_SID_ZOOM                                ".uno:Zooming"

+#define CMD_SID_ZOOM_NEXT                           ".uno:ZoomNext"

+#define CMD_SID_ZOOM_OUT                            ".uno:ZoomPlus"

+#define CMD_SID_ZOOM_PREV                           ".uno:ZoomPrevious"

+#define CMD_SID_ZOOM_TOOLBOX                        ".uno:ZoomToolBox"

+#define CMD_SID_EXPORTDOC                           ".uno:ExportTo"

+#define CMD_SID_EXPORTDOCASPDF                      ".uno:ExportToPDF"

+#define CMD_SID_DIRECTEXPORTDOCASPDF                ".uno:ExportDirectToPDF"

+#define CMD_SID_IMAGE_ORIENTATION                   ".uno:ImageOrientation"

+#define CMD_SID_SAVE_VERSION_ON_CLOSE               ".uno:SaveVersionOnClose"

+#define CMD_SID_ADDONS                              ".uno:Addons"

+#define CMD_SID_SHOW_IME_STATUS_WINDOW              ".uno:ShowImeStatusWindow"

+#define CMD_SID_UPDATE_CONFIG                       ".uno:UpdateConfiguration"

+#define CMD_SID_HELP_SUPPORTPAGE                    ".uno:HelpSupport"

+#define CMD_SID_HELP_TUTORIALS                      ".uno:HelpTutorials"

+#define CMD_SID_ADDONHELP                           ".uno:AddonHelp"

+#define CMD_SID_FORMATMENUSTATE                     ".uno:FormatMenuState"

+#define CMD_SID_INET_DLG                            ".uno:InternetDialog"

+#define CMD_SID_ONLINE_REGISTRATION                 ".uno:OnlineRegistrationDlg"

+#define CMD_SID_OFFICE_CHECK_PLZ                    ".uno:CheckPLZ"

+#define CMD_SID_ADDRESS_DATA_SOURCE                 ".uno:AutoPilotAddressDataSource"

+#define CMD_FN_BUSINESS_CARD                        ".uno:InsertBusinessCard"

+#define CMD_FN_LABEL                                ".uno:InsertLabels"

+#define CMD_FN_XFORMS_INIT                          ".uno:NewXForms"

+#define CMD_SID_SD_AUTOPILOT                        ".uno:AutoPilotPresentations"

+#define CMD_SID_NEWSD                               ".uno:NewPresentation"

+#define CMD_SID_COMP_BIBLIOGRAPHY                   ".uno:BibliographyComponent"

+#define CMD_SID_MINIMIZED                           ".uno:Minimized"

+#define CMD_SID_AUTO_CORRECT_DLG                    ".uno:AutoCorrectDlg"

+#define CMD_SID_OPTIONS_TREEDIALOG                  ".uno:OptionsTreeDialog"

+#define CMD_SID_TERMINATE_INPLACEACTIVATION         ".uno:TerminateInplaceActivation"

+#define CMD_SID_RECENTFILELIST                      ".uno:RecentFileList"

+#define CMD_SID_AVAILABLE_TOOLBARS                  ".uno:AvailableToolbars"

+#define CMD_SID_AVMEDIA_PLAYER                      ".uno:AVMediaPlayer"

+#define CMD_SID_INSERT_AVMEDIA                      ".uno:InsertAVMedia"

+#define CMD_SID_MORE_DICTIONARIES                   ".uno:MoreDictionaries"

+#define CMD_SID_ACTIVATE_STYLE_APPLY                ".uno:ActivateStyleApply"

+#define CMD_SID_DOCKWIN_0                           ".uno:DockingWindow0"

+#define CMD_SID_DOCKWIN_1                           ".uno:DockingWindow1"

+#define CMD_SID_DOCKWIN_2                           ".uno:DockingWindow2"

+#define CMD_SID_DOCKWIN_3                           ".uno:DockingWindow3"

+#define CMD_SID_DOCKWIN_4                           ".uno:DockingWindow4"

+#define CMD_SID_DOCKWIN_5                           ".uno:DockingWindow5"

+#define CMD_SID_DOCKWIN_6                           ".uno:DockingWindow6"

+#define CMD_SID_DOCKWIN_7                           ".uno:DockingWindow7"

+#define CMD_SID_DOCKWIN_8                           ".uno:DockingWindow8"

+#define CMD_SID_DOCKWIN_9                           ".uno:DockingWindow9"

+#define CMD_SID_PASTE_UNFORMATTED                   ".uno:PasteUnformatted"

+

+#endif

diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index d82abeefe8bc..f3d773f98afc 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -133,10 +133,10 @@ public:
                                             const String *pUserButtonText=0 ) = 0;
     virtual CreateTabPage               GetTabPageCreatorFunc( USHORT nId ) = 0;
     virtual GetTabPageRanges            GetTabPageRangesFunc( USHORT nId ) = 0;
-    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
             const SvObjectServerList* pList = 0 )=0;
-    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
     virtual  SfxAbstractPasteDialog*         CreatePasteDialog( Window* pParent )=0;
     virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0;
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 26e1991c24b8..9ab4a50b63d8 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -421,7 +421,6 @@
 #define SID_INSERT_PLUGIN                   (SID_SFX_START + 672)
 #define SID_INSERT_SOUND                    (SID_SFX_START + 676)
 #define SID_INSERT_VIDEO                    (SID_SFX_START + 677)
-#define SID_INSERT_APPLET                   (SID_SFX_START + 673)
 
 #define SID_HYPERLINK_DIALOG                (SID_SFX_START + 678)
 
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index fb331889a573..f9702063713a 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -73,7 +73,6 @@
 #define UNOPROPERTYVALUE                ::com::sun::star::beans::PropertyValue
 #define UNOREFERENCE                    ::com::sun::star::uno::Reference
 #define UNORUNTIMEEXCEPTION             ::com::sun::star::uno::RuntimeException
-#define UNOINVALIDREGISTRYEXCEPTION     ::com::sun::star::registry::InvalidRegistryException
 #define UNOSEQUENCE                     ::com::sun::star::uno::Sequence
 #define UNOTYPE                         ::com::sun::star::uno::Type
 #define UNOURL                          ::com::sun::star::util::URL
@@ -591,52 +590,6 @@ sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd );
     }
 
 //************************************************************************************************************************
-//  definition for "extern c component_writeInfo()"
-//************************************************************************************************************************
-#define COMPONENT_INFO(CLASS)                                                                                           \
-                                                                                                                        \
-    try                                                                                                                 \
-    {                                                                                                                   \
-        /* Set default result of follow operations !!! */                                                               \
-        bReturn = sal_False ;                                                                                           \
-                                                                                                                        \
-        /* Do the follow only, if given key is valid ! */                                                               \
-        if ( xKey.is () )                                                                                               \
-        {                                                                                                               \
-            /* Build new keyname */                                                                                     \
-            sKeyName     =  UNOOUSTRING::createFromAscii( "/" )         ;                                               \
-            sKeyName    +=  CLASS::impl_getStaticImplementationName()   ;                                               \
-            sKeyName    +=  UNOOUSTRING::createFromAscii( "/UNO/SERVICES" );                                            \
-                                                                                                                        \
-            /* Create new key with new name. */                                                                         \
-             xNewKey = xKey->createKey( sKeyName );                                                                     \
-                                                                                                                        \
-            /* If this new key valid ... */                                                                             \
-            if ( xNewKey.is () )                                                                                        \
-            {                                                                                                           \
-                /* Get information about supported services. */                                                         \
-                seqServiceNames =   CLASS::impl_getStaticSupportedServiceNames()    ;                                   \
-                pArray          =   seqServiceNames.getArray()                      ;                                   \
-                nLength         =   seqServiceNames.getLength()                     ;                                   \
-                nCounter        =   0                                               ;                                   \
-                                                                                                                        \
-                /* Then set this information on this key. */                                                            \
-                for ( nCounter = 0; nCounter < nLength; ++nCounter )                                                    \
-                {                                                                                                       \
-                    xNewKey->createKey( pArray [nCounter] );                                                            \
-                }                                                                                                       \
-                                                                                                                        \
-                /* Result of this operations = OK. */                                                                   \
-                bReturn = sal_True ;                                                                                    \
-            }                                                                                                           \
-        }                                                                                                               \
-    }                                                                                                                   \
-    catch( UNOINVALIDREGISTRYEXCEPTION& )                                                                               \
-    {                                                                                                                   \
-        bReturn = sal_False ;                                                                                           \
-    }                                                                                                                   \
-
-//************************************************************************************************************************
 //  definition for "extern c component_getFactory()"
 //************************************************************************************************************************
 #define CREATEFACTORY(CLASS)                                                                                            \
diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx
index ebb4497a0ba2..b6925ad332ad 100644
--- a/sfx2/inc/sfx2/titledockwin.hxx
+++ b/sfx2/inc/sfx2/titledockwin.hxx
@@ -76,7 +76,7 @@ namespace sfx2
             @return
                 the ID of the newly created toolbox item
         */
-        USHORT  AddDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback )
+        USHORT  AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
         {
             return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
         }
@@ -100,6 +100,11 @@ namespace sfx2
         ToolBox&        GetToolBox()        { return m_aToolbox; }
         const ToolBox&  GetToolBox() const  { return m_aToolbox; }
 
+        /** Return the border that is painted around the inner window as
+            decoration.
+        */
+        SvBorder        GetDecorationBorder (void) const  { return m_aBorder; }
+
     protected:
         // Window overridables
         virtual void Paint( const Rectangle& i_rArea );
@@ -121,7 +126,7 @@ namespace sfx2
 
         /** internal version of AddDropDownToolBoxItem
         */
-        USHORT  impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback );
+        USHORT  impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback );
 
         /** returns the current title.
 
@@ -153,6 +158,11 @@ namespace sfx2
             since the last Paint().
         */
         bool                m_bLayoutPending;
+
+        /** Height of the title bar.  Calculated in impl_layout().
+        */
+        int                 m_nTitleBarHeight;
+
     };
 
 //......................................................................................................................
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index d376236bf830..affa836486e6 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -253,6 +253,7 @@ public:
 private:
     SAL_DLLPRIVATE BOOL SwitchToViewShell_Impl( USHORT nNo, BOOL bIsIndex = FALSE );
     SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell );
+    SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const USHORT i_nNewViewId );
 
     /** loads the given existing document into the given frame
 
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 8465a238cd5b..ee8dfb1ca57c 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -123,13 +123,13 @@ public: \
     static SfxViewFactory&Factory() { return *pFactory; } \
     static void           InitFactory()
 
-#define SFX_IMPL_VIEWFACTORY(Class, rResId) \
+#define SFX_IMPL_NAMED_VIEWFACTORY(Class, AsciiViewName) \
     SfxViewFactory* Class::pFactory; \
     SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \
     { return new Class(pFrame, pOldView); } \
     void Class::RegisterFactory( USHORT nPrio ) \
     { \
-        pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,rResId);\
+        pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\
         InitFactory(); \
     } \
     void Class::InitFactory()
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx
index 60ad04b2e9ab..17589c7cd399 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfxhelp.hxx
@@ -45,12 +45,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
     SfxHelp_Impl*   pImp;
 
 private:
-    SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow );
+    SAL_DLLPRIVATE BOOL Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword );
+    SAL_DLLPRIVATE virtual BOOL SearchKeyword( const XubString& rKeyWord );
     SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow );
-    SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId );
-
+    SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId );
     SAL_DLLPRIVATE String GetHelpModuleName_Impl();
-    SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName );
     SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName );
 
 public:
@@ -60,12 +59,11 @@ public:
     inline void             SetTicket( const String& rTicket )  { aTicket = rTicket; }
     inline void             SetUser( const String& rUser )      { aUser = rUser; }
 
-    virtual XubString       GetHelpText( ULONG nHelpId, const Window* pWindow );
     virtual XubString       GetHelpText( const String&, const Window* pWindow );
 
-    static String           CreateHelpURL( ULONG nHelpId, const String& rModuleName );
     static String           CreateHelpURL( const String& aCommandURL, const String& rModuleName );
-    static void             OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId );
+    using Help::OpenHelpAgent;
+    static void             OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId );
     static String           GetDefaultHelpModule();
     static ::rtl::OUString  GetCurrentModuleIdentifier();
 };
diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/viewfac.hxx
index 6f9ae1d3cb37..b0f0abdba3b3 100644
--- a/sfx2/inc/viewfac.hxx
+++ b/sfx2/inc/viewfac.hxx
@@ -46,24 +46,29 @@ class SFX2_DLLPUBLIC SfxViewFactory
 {
 public:
     SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI,
-                    USHORT nOrdinal, const ResId& aDescrResId );
+                    USHORT nOrdinal, const sal_Char* asciiViewName );
     ~SfxViewFactory();
 
     SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
     void          InitFactory();
 
-    String        GetDescription() const
-                  { return String( aDescription ); }
     USHORT        GetOrdinal() const { return nOrd; }
 
-    /// returns an API-compatible view name. For the moment, this is "view" with an appended ordinal/ID
-    String        GetViewName() const;
+    /// returns a legacy view name. This is "view" with an appended ordinal/ID.
+    String        GetLegacyViewName() const;
+
+    /** returns a API-compatible view name.
+
+        For details on which view names are specified, see the XModel2.getAvailableViewControllerNames
+        documentation.
+    */
+    String        GetAPIViewName() const;
 
 private:
     SfxViewCtor fnCreate;
     SfxViewInit fnInit;
     USHORT      nOrd;
-    ResId       aDescription;
+    const String    m_sViewName;
 };
 
 #endif