diff options
author | Thomas Lange [tl] <tl@openoffice.org> | 2010-05-11 13:45:11 +0200 |
---|---|---|
committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-05-11 13:45:11 +0200 |
commit | 4dc7803c4d9d411579ce4fe871c2abdcd107c6c6 (patch) | |
tree | 48d72173f7fcae1831776c4bc1eccbd136abd192 /starmath | |
parent | 165f0b50ea8624004d12a09f9b04a1ede187511d (diff) | |
parent | b812217fb9701fc0b0bca438668611fc8a10cc10 (diff) |
cws tl80: merge with DEV300 m77
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/document.hxx | 2 | ||||
-rw-r--r-- | starmath/prj/build.lst | 1 | ||||
-rw-r--r-- | starmath/qa/unoapi/Test.java | 51 | ||||
-rw-r--r-- | starmath/qa/unoapi/makefile.mk | 30 | ||||
-rw-r--r-- | starmath/source/accessibility.cxx | 4 | ||||
-rw-r--r-- | starmath/source/accessibility.hxx | 1 | ||||
-rw-r--r-- | starmath/source/document.cxx | 11 | ||||
-rw-r--r-- | starmath/source/makefile.mk | 1 | ||||
-rwxr-xr-x | starmath/source/smres.src | 2 | ||||
-rw-r--r-- | starmath/source/unodoc.cxx | 5 | ||||
-rw-r--r-- | starmath/source/view.cxx | 8 | ||||
-rw-r--r-- | starmath/util/makefile.mk | 6 | ||||
-rw-r--r-- | starmath/util/sm.map | 8 | ||||
-rw-r--r-- | starmath/util/smd.map | 8 |
14 files changed, 90 insertions, 48 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/prj/build.lst b/starmath/prj/build.lst index cb6fd9358454..cbfff6772402 100644 --- a/starmath/prj/build.lst +++ b/starmath/prj/build.lst @@ -6,3 +6,4 @@ sm starmath\res get - all sm_res NULL sm starmath\sdi nmake - all sm_sdi NULL sm starmath\source nmake - all sm_sorce sm_sdi sm_inc NULL sm starmath\util nmake - all sm_util sm_sorce NULL +sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL diff --git a/starmath/qa/unoapi/Test.java b/starmath/qa/unoapi/Test.java new file mode 100644 index 000000000000..520491da3a8c --- /dev/null +++ b/starmath/qa/unoapi/Test.java @@ -0,0 +1,51 @@ +/************************************************************************* +* 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. +************************************************************************/ + +package org.openoffice.starmath.qa.unoapi; + +import org.openoffice.Runner; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public final class Test { + @org.junit.Before public void setUp() throws Exception { + connection.setUp(); + } + + @org.junit.After public void tearDown() + throws InterruptedException, com.sun.star.uno.Exception + { + connection.tearDown(); + } + + @org.junit.Test public void test() { + assertTrue( + Runner.run( + "-sce", "sm.sce", "-xcl", "knownissues.xcl", "-cs", + connection.getDescription())); + } + + private final OfficeConnection connection = new OfficeConnection(); +} diff --git a/starmath/qa/unoapi/makefile.mk b/starmath/qa/unoapi/makefile.mk index 93169ee51708..68fcfe744868 100644 --- a/starmath/qa/unoapi/makefile.mk +++ b/starmath/qa/unoapi/makefile.mk @@ -1,7 +1,6 @@ #************************************************************************* -# # 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 @@ -22,19 +21,28 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. -# -#************************************************************************* +#***********************************************************************/ -PRJ=..$/.. +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -PRJNAME=starmath -TARGET=qa_unoapi +PRJ = ../.. +PRJNAME = starmath +TARGET = qa_unoapi -.INCLUDE: settings.mk +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = org/openoffice/starmath/qa/unoapi +JAVATESTFILES = Test.java +JAVAFILES = $(JAVATESTFILES) +JARFILES = OOoRunner.jar ridl.jar test.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END +.INCLUDE: settings.mk .INCLUDE: target.mk +.INCLUDE: installationtest.mk -ALLTAR : UNOAPI_TEST +ALLTAR : javatest -UNOAPI_TEST: - +$(SOLARENV)$/bin$/checkapi -sce sm.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments +.END 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/smres.src b/starmath/source/smres.src index 3ba2f49026eb..7d3525bd2a29 100755 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -3559,7 +3559,7 @@ StringArray RID_PRINTUIOPTIONS { < "%PRODUCTNAME %s"; >; < "Contents"; >; - < "~Title row"; >; + < "~Title"; >; < "Specifies whether you want the name of the document to be included in the printout"; >; < "~Formula text"; >; < "Specifies whether to include the contents of the 'Commands' window at the bottom of the printout."; >; 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 ) diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk index 09e738299419..1ba52411d721 100644 --- a/starmath/util/makefile.mk +++ b/starmath/util/makefile.mk @@ -48,7 +48,7 @@ RESLIB1SRSFILES=\ SHL1TARGET= sm$(DLLPOSTFIX) SHL1IMPLIB= smimp -SHL1VERSIONMAP= sm.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) @@ -73,7 +73,7 @@ SHL1STDLIBS= \ SHL2TARGET= smd$(DLLPOSTFIX) SHL2IMPLIB= smdimp -SHL2VERSIONMAP= sm.map +SHL2VERSIONMAP=$(SOLARENV)/src/component.map SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) @@ -90,7 +90,7 @@ SHL2STDLIBS= \ $(SALLIB) SHL2DEPN= makefile.mk -SHL2VERSIONMAP= smd.map +SHL2VERSIONMAP=$(SOLARENV)/src/component.map SHL2OBJS= $(SLO)$/smdetect.obj \ $(SLO)$/detreg.obj \ $(SLO)$/eqnolefilehdr.obj diff --git a/starmath/util/sm.map b/starmath/util/sm.map deleted file mode 100644 index 62f014e12ba0..000000000000 --- a/starmath/util/sm.map +++ /dev/null @@ -1,8 +0,0 @@ -SM_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/starmath/util/smd.map b/starmath/util/smd.map deleted file mode 100644 index 62f014e12ba0..000000000000 --- a/starmath/util/smd.map +++ /dev/null @@ -1,8 +0,0 @@ -SM_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; |