diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-25 20:36:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-25 20:41:16 +0100 |
| commit | eff099b9083ed5a5f83b45162d45c55e5c6d714a (patch) | |
| tree | 1d620c540a3d6f30f676f65d84aa816d9ee28ac4 /filter | |
| parent | c3d0095d8d98faf2e9fea525722c046f732b4bab (diff) | |
filter: un-break the SWF export dialog
The mpResMgr is no longer initialized but still checked.
(regression from 191dc43f97ed8bec78ee540676a91815cad71104)
Change-Id: I8330a74e9209eaca1fee70e7b8ba332482fa0c1d
(cherry picked from commit 6e4a4af525923eb6c2b24f6ac0c9936efe827ca3)
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swfdialog.cxx | 4 | ||||
| -rw-r--r-- | filter/source/flash/swfdialog.hxx | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 152aba4df709..b63604fac578 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -91,14 +91,12 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul SWFDialog::SWFDialog( const Reference< XComponentContext> &rxContext ) : OGenericUnoDialog( rxContext ) { - mpResMgr = ResMgr::CreateResMgr( "flash", Application::GetSettings().GetUILanguageTag() ); } // ----------------------------------------------------------------------------- SWFDialog::~SWFDialog() { - delete mpResMgr; } // ----------------------------------------------------------------------------- @@ -162,7 +160,7 @@ Dialog* SWFDialog::createDialog( Window* pParent ) { Dialog* pRet = NULL; - if( mpResMgr && mxSrcDoc.is() ) + if (mxSrcDoc.is()) { /* TODO: From the controler we may get information what page is visible and what shapes are selected, if we optionaly want to limit output to that diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index a74559e951a3..b4fe8b47d5e9 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -39,7 +39,6 @@ class SWFDialog : public ::svt::OGenericUnoDialog, { private: - ResMgr* mpResMgr; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData; com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSrcDoc; |