From afc728fe76fbf1afea725afd6ff5e9af92e10b08 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 9 Apr 2015 16:35:22 +0200 Subject: convert SFXMODEL_ to scoped enum and fix up some confusion in SC and STARMATH about which constants to use Change-Id: Ib75bc78a24bd2fad6ec6d7c94c4c1ad7dc222c1a --- starmath/qa/cppunit/test_nodetotextvisitors.cxx | 3 ++- starmath/qa/cppunit/test_starmath.cxx | 6 +++--- starmath/qa/extras/mmlimport-test.cxx | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'starmath/qa') 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 #include +#include #include #include @@ -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); -- cgit