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/source | |
| 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/source')
| -rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 3 | ||||
| -rw-r--r-- | starmath/source/document.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/register.hxx | 3 | ||||
| -rw-r--r-- | starmath/source/unodoc.cxx | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 907d1480b020..12eb670136a1 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -27,6 +27,7 @@ #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxmodelfactory.hxx> #include <vcl/settings.hxx> typedef tools::SvRef<SmDocShell> SmDocShellRef; @@ -219,7 +220,7 @@ const sal_uInt16 SmElementsControl::aOthers[][2] = SmElementsControl::SmElementsControl(vcl::Window *pParent) : Control(pParent, WB_TABSTOP) - , mpDocShell(new SmDocShell(SFXOBJECTSHELL_STD_NORMAL)) + , mpDocShell(new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT)) , maCurrentSetId(0) , mpCurrentElement(NULL) , mbVerticalMode(true) diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 2f1c91b384c7..b6d37ac4d197 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -653,7 +653,7 @@ void SmDocShell::Repaint() } -SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) : +SmDocShell::SmDocShell( SfxModelFlags i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), pTree ( 0 ), pEditEngineItemPool ( 0 ), diff --git a/starmath/source/register.hxx b/starmath/source/register.hxx index 5aac343b9a42..97b4692eb319 100644 --- a/starmath/source/register.hxx +++ b/starmath/source/register.hxx @@ -21,6 +21,7 @@ #define INCLUDED_STARMATH_SOURCE_REGISTER_HXX #include <sal/config.h> +#include <sfx2/sfxmodelfactory.hxx> //Math document css::uno::Sequence< OUString > SAL_CALL @@ -28,7 +29,7 @@ css::uno::Sequence< OUString > SAL_CALL OUString SAL_CALL SmDocument_getImplementationName() throw(); css::uno::Reference< css::uno::XInterface >SAL_CALL - SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags) throw( css::uno::Exception ); + SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags) throw( css::uno::Exception ); //MathML import css::uno::Sequence< OUString > SAL_CALL diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index 1d89f4a0ab77..df5a5974f4f1 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -40,7 +40,7 @@ uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw() } uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, const sal_uInt64 _nCreationFlags ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, SfxModelFlags _nCreationFlags ) throw( uno::Exception ) { SolarMutexGuard aGuard; SmGlobals::ensure(); |