[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source

[Michael Stahl]

 filter/source/flash/swfdialog.cxx |    4 +---
 filter/source/flash/swfdialog.hxx |    1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit eff099b9083ed5a5f83b45162d45c55e5c6d714a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 25 20:36:30 2013 +0100

    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)

diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 152aba4..b63604f 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 a74559e..b4fe8b4 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;