diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-09 16:35:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-10 09:48:07 +0200 |
| commit | afc728fe76fbf1afea725afd6ff5e9af92e10b08 (patch) | |
| tree | 6c691ba617ed7d025abd17d71745d0623cdc5d53 /starmath/qa | |
| parent | 89dd3f80685c66883b6ed4efbf369f5aa2dc292e (diff) | |
convert SFXMODEL_ to scoped enum
and fix up some confusion in SC and STARMATH about which constants to
use
Change-Id: Ib75bc78a24bd2fad6ec6d7c94c4c1ad7dc222c1a
Diffstat (limited to 'starmath/qa')
| -rw-r--r-- | starmath/qa/cppunit/test_nodetotextvisitors.cxx | 3 | ||||
| -rw-r--r-- | starmath/qa/cppunit/test_starmath.cxx | 6 | ||||
| -rw-r--r-- | starmath/qa/extras/mmlimport-test.cxx | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index 4e4de168d476..7736d2f0b8ff 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -11,6 +11,7 @@ #include <test/bootstrapfixture.hxx> #include <vcl/svapp.hxx> +#include <sfx2/sfxmodelfactory.hxx> #include <smdll.hxx> #include <document.hxx> @@ -87,7 +88,7 @@ void Test::setUp() SmGlobals::ensure(); - xDocShRef = new SmDocShell(SFXOBJECTSHELL_STD_NORMAL); + xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT); } void Test::tearDown() diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 054af675bfd1..5184b38529ae 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -73,9 +73,9 @@ void Test::setUp() SmGlobals::ensure(); m_xDocShRef = new SmDocShell( - SFXMODEL_STANDARD | - SFXMODEL_DISABLE_EMBEDDED_SCRIPTS | - SFXMODEL_DISABLE_DOCUMENT_RECOVERY); + SfxModelFlags::EMBEDDED_OBJECT | + SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS | + SfxModelFlags::DISABLE_DOCUMENT_RECOVERY); m_xDocShRef->DoInitNew(0); SfxViewFrame *pViewFrame = SfxViewFrame::LoadHiddenDocument(*m_xDocShRef, 0); diff --git a/starmath/qa/extras/mmlimport-test.cxx b/starmath/qa/extras/mmlimport-test.cxx index e52ebf308daa..3effb31a2823 100644 --- a/starmath/qa/extras/mmlimport-test.cxx +++ b/starmath/qa/extras/mmlimport-test.cxx @@ -55,9 +55,9 @@ private: "private:factory/smath*"); pFilter->SetVersion(SOFFICE_FILEFORMAT_60); - mxDocShell = new SmDocShell(SFXMODEL_STANDARD | - SFXMODEL_DISABLE_EMBEDDED_SCRIPTS | - SFXMODEL_DISABLE_DOCUMENT_RECOVERY); + mxDocShell = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT | + SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS | + SfxModelFlags::DISABLE_DOCUMENT_RECOVERY); SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ); pSrcMed->SetFilter(pFilter); |