sb118: merged in re/DEV300_next towards DEV300_m76

7 files changed, 15 insertions, 17 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index e983a22094f0..f03cd43fc965 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -168,7 +168,7 @@ public:
     using SotObject::GetInterface;
     SFX_DECL_OBJECTFACTORY();
 
-                SmDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, const sal_Bool _bScriptSupport = sal_True);
+                SmDocShell( const sal_uInt64 i_nSfxCreationFlags );
     virtual     ~SmDocShell();
 
     void        LoadSymbols();
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 20baff5ea42e..9aa39924b619 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1158,6 +1158,10 @@ XubString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nP
     return aTxt;
 }
 
+void SmTextForwarder::FieldClicked(const SvxFieldItem&, USHORT, USHORT)
+{
+}
+
 USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich )
 {
     EECharAttribArray aAttribs;
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 32c8615fc1bb..7cf37516880c 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -236,6 +236,7 @@ public:
     virtual SfxItemPool* GetPool() const;
 
     virtual XubString    CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void        FieldClicked(const SvxFieldItem&, USHORT, USHORT);
     virtual BOOL         IsValid() const;
 
     virtual LanguageType    GetLanguage( USHORT, USHORT ) const;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index aac3f65c14e6..ff2d5bed71a2 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -676,8 +676,8 @@ void SmDocShell::Repaint()
 }
 
 
-SmDocShell::SmDocShell(SfxObjectCreateMode eMode,const sal_Bool _bScriptSupport) :
-    SfxObjectShell(eMode),
+SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
+    SfxObjectShell( i_nSfxCreationFlags ),
     pTree               ( 0 ),
     pEditEngineItemPool ( 0 ),
     pEditEngine         ( 0 ),
@@ -696,12 +696,7 @@ SmDocShell::SmDocShell(SfxObjectCreateMode eMode,const sal_Bool _bScriptSupport)
     StartListening(aFormat);
     StartListening(*pp->GetConfig());
 
-    if ( !_bScriptSupport )
-        SetHasNoBasic();
-
-    SetModel( new SmModel(this) );  //! das hier mit new erzeugte Model brauch
-                                    //! im Destruktor nicht explizit geloescht werden.
-                                    //! Dies erledigt das Sfx.
+    SetBaseModel( new SmModel(this) );
 }
 
 
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index c3091423c1b8..a69a90010700 100644
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -85,6 +85,7 @@ SLOFILES = \
     $(SLO2FILES)
 
 EXCEPTIONSFILES =   \
+        $(SLO)$/register.obj  \
         $(SLO)$/accessibility.obj \
         $(SLO)$/cfgitem.obj \
         $(SLO)$/document.obj \
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 1a2ff371f212..52c362748868 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -61,10 +61,7 @@ uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance(
     if ( !SM_MOD() )
         SmDLL::Init();
 
-    const SfxObjectCreateMode eCreateMode = ( _nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD;
-    const bool bScriptSupport = ( _nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0;
-
-    SfxObjectShell* pShell = new SmDocShell( eCreateMode, bScriptSupport );
+    SfxObjectShell* pShell = new SmDocShell( _nCreationFlags );
     if( pShell )
         return uno::Reference< uno::XInterface >( pShell->GetModel() );
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c114f8f3367a..1552d4edc231 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -350,7 +350,7 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt)
 void SmGraphicWindow::Command(const CommandEvent& rCEvt)
 {
     BOOL bCallBase = TRUE;
-    if ( !pViewShell->GetViewFrame()->GetFrame()->IsInPlace() )
+    if ( !pViewShell->GetViewFrame()->GetFrame().IsInPlace() )
     {
         switch ( rCEvt.GetCommand() )
         {
@@ -1610,7 +1610,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
 
         case SID_ATTR_ZOOM:
         {
-            if ( !GetViewFrame()->GetFrame()->IsInPlace() )
+            if ( !GetViewFrame()->GetFrame().IsInPlace() )
             {
                 //CHINA001 SvxZoomDialog *pDlg = 0;
                 AbstractSvxZoomDialog *pDlg = 0;
@@ -1737,7 +1737,7 @@ void SmViewShell::GetState(SfxItemSet &rSet)
         case SID_ZOOMIN:
         case SID_ZOOMOUT:
         case SID_FITINWINDOW:
-            if ( GetViewFrame()->GetFrame()->IsInPlace() )
+            if ( GetViewFrame()->GetFrame().IsInPlace() )
                 rSet.DisableItem( nWh );
             break;
 
@@ -1781,7 +1781,7 @@ void SmViewShell::GetState(SfxItemSet &rSet)
 
 
 SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *):
-    SfxViewShell(pFrame_, SFX_VIEW_DISABLE_ACCELS | SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_HAS_PRINTOPTIONS | SFX_VIEW_CAN_PRINT),
+    SfxViewShell(pFrame_, SFX_VIEW_HAS_PRINTOPTIONS | SFX_VIEW_CAN_PRINT),
     aGraphic(this),
     aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame_->GetBindings()),
     pImpl( new SmViewShell_Impl )