fix field name, was mxMSF, but should have been named mxContext

Change-Id: I4661cd84346791ddd6167ccc63335ad63255472f

15 files changed, 55 insertions, 55 deletions

diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 50592c52737c..9d0bbbbf3759 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -147,8 +147,8 @@ sal_Bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSetti
 }
 
 
-ConfigurationAccess::ConfigurationAccess( const Reference< uno::XComponentContext >& rxMSF, OptimizerSettings* pDefaultSettings ) :
-    mxMSF( rxMSF )
+ConfigurationAccess::ConfigurationAccess( const Reference< uno::XComponentContext >& rxContext, OptimizerSettings* pDefaultSettings ) :
+    mxContext( rxContext )
 {
     LoadStrings();
     maSettings.push_back( pDefaultSettings ?
@@ -174,7 +174,7 @@ OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken )
         if ( aPath.match( sProtocol, 0 ) )
         {
             OUString aTmp( aPath.copy( 20 ) );
-            Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxMSF);
+            Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxContext);
             aPath = xExpander->expandMacros( aTmp );
         }
     }
@@ -317,7 +317,7 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
     Reference< XInterface > xRoot;
     try
     {
-        Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxMSF );
+        Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxContext );
         Sequence< Any > aCreationArguments( 2 );
         aCreationArguments[0] = makeAny( PropertyValue(
             OUString( "nodepath" ), 0,
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 85af8b94a832..08785cfb987a 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -118,7 +118,7 @@ class ConfigurationAccess
         std::vector< OptimizerSettings > maSettings;
         std::vector< OptimizerSettings > maInitialSettings;
 
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
+        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
 
         void LoadStrings();
         void LoadConfiguration();
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index d3350651310b..82ed6fe45031 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -255,7 +255,7 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const
     }
 }
 
-Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& rxMSF,
+Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& rxContext,
     const Reference< XGraphic >& xGraphic, const awt::Size& aLogicalSize, const text::GraphicCrop& aGraphicCropLogic,
         const GraphicSettings& rGraphicSettings )
 {
@@ -290,7 +290,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                         // cropping has to be removed from SourceSizePixel
                         if ( aGraphicCropLogic.Left || aGraphicCropLogic.Top || aGraphicCropLogic.Right || aGraphicCropLogic.Bottom )
                         {
-                            const awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxMSF, xGraphic ) );
+                            const awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxContext, xGraphic ) );
 
                             if ( bRemoveCropArea )
                                 bNeedsOptimizing = sal_True;
@@ -339,9 +339,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                             }
                             if ( bNeedsOptimizing && aDestSizePixel.Width && aDestSizePixel.Height )
                             {
-                                Reference< XStream > xTempFile( io::TempFile::create(rxMSF), UNO_QUERY_THROW );
+                                Reference< XStream > xTempFile( io::TempFile::create(rxContext), UNO_QUERY_THROW );
                                 Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() );
-                                Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxMSF ) );
+                                Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxContext ) );
 
                                 ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, bRemoveCropArea, aGraphicCropLogic );
                                 Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
@@ -359,9 +359,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
             else // this is a metafile
             {
                 OUString aDestMimeType( aSourceMimeType );
-                Reference< XStream > xTempFile( io::TempFile::create(rxMSF), UNO_QUERY_THROW );
+                Reference< XStream > xTempFile( io::TempFile::create(rxContext), UNO_QUERY_THROW );
                 Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() );
-                Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxMSF ) );
+                Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxContext ) );
                 ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic );
                 Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
                 Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
@@ -379,7 +379,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
     return xNewGraphic;
 }
 
-void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentContext >& rxMSF, const GraphicSettings& rGraphicSettings,
+void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentContext >& rxContext, const GraphicSettings& rGraphicSettings,
     std::vector< GraphicCollector::GraphicEntity >& rGraphicList )
 {
     try
@@ -414,8 +414,8 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
                 if ( xGraphic.is() )
                 {
                     Reference< XPropertySet > xNewGraphicPropertySet( xGraphic, UNO_QUERY_THROW );
-                    awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxMSF, xGraphic ) );
-                    Reference< XGraphic > xNewGraphic( ImpCompressGraphic( rxMSF, xGraphic, aGraphicIter->maLogicalSize, aGraphicIter->maGraphicCropLogic, aGraphicSettings ) );
+                    awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxContext, xGraphic ) );
+                    Reference< XGraphic > xNewGraphic( ImpCompressGraphic( rxContext, xGraphic, aGraphicIter->maLogicalSize, aGraphicIter->maGraphicCropLogic, aGraphicSettings ) );
                     if ( xNewGraphic.is() )
                     {
                         // applying graphic to each user
@@ -435,7 +435,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
                                     text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
                                     if ( !aGraphicSettings.mbRemoveCropArea )
                                     {
-                                        awt::Size aNewSize( GraphicCollector::GetOriginalSize( rxMSF, xNewGraphic ) );
+                                        awt::Size aNewSize( GraphicCollector::GetOriginalSize( rxContext, xNewGraphic ) );
                                         aGraphicCropLogic.Left = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Left * ((double)aNewSize.Width / (double)aSize100thMM.Width));
                                         aGraphicCropLogic.Top = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Top * ((double)aNewSize.Height / (double)aSize100thMM.Height));
                                         aGraphicCropLogic.Right = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Right * ((double)aNewSize.Width / (double)aSize100thMM.Width));
@@ -486,8 +486,8 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
 // - ImpOptimizer -
 // ----------------
 
-ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxMSF, const Reference< XModel >& rxModel ) :
-    mxMSF                       ( rxMSF ),
+ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxModel ) :
+    mxContext                   ( rxContext ),
     mxModel                     ( rxModel ),
     mbJPEGCompression           ( sal_False ),
     mnJPEGQuality               ( 90 ),
@@ -569,8 +569,8 @@ sal_Bool ImpOptimizer::Optimize()
 
         std::vector< GraphicCollector::GraphicEntity > aGraphicList;
         GraphicSettings aGraphicSettings( mbJPEGCompression, mnJPEGQuality, mbRemoveCropArea, mnImageResolution, mbEmbedLinkedGraphics );
-        GraphicCollector::CollectGraphics( mxMSF, mxModel, aGraphicSettings, aGraphicList );
-        CompressGraphics( *this, mxMSF, aGraphicSettings, aGraphicList );
+        GraphicCollector::CollectGraphics( mxContext, mxModel, aGraphicSettings, aGraphicList );
+        CompressGraphics( *this, mxContext, aGraphicSettings, aGraphicList );
     }
     SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 100 ) ) );
     DispatchStatus();
@@ -681,7 +681,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
                 SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) );
                 DispatchStatus();
 
-                Reference< XDesktop2 > xDesktop = Desktop::create( mxMSF );
+                Reference< XDesktop2 > xDesktop = Desktop::create( mxContext );
                 xSelf = xDesktop->findFrame( TKGet( TK__blank ), FrameSearchFlag::CREATE );
                 Reference< XComponentLoader > xComponentLoader( xSelf, UNO_QUERY );
 
@@ -706,7 +706,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
             if ( xFrame.is() )
             {
                 const OUString sSlot( "slot:27115"  );
-                DispatchURL( mxMSF, sSlot, xFrame );
+                DispatchURL( mxContext, sSlot, xFrame );
             }
         }
 
@@ -721,7 +721,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
 
         if ( mxInformationDialog.is() )
         {
-            InformationDialog aInformationDialog( mxMSF, mxInformationDialog, maSaveAsURL, mbOpenNewDocument, nSourceSize, nDestSize, nEstimatedFileSize );
+            InformationDialog aInformationDialog( mxContext, mxInformationDialog, maSaveAsURL, mbOpenNewDocument, nSourceSize, nDestSize, nEstimatedFileSize );
             aInformationDialog.execute();
             SetStatusValue( TK_OpenNewDocument, Any( mbOpenNewDocument ) );
             DispatchStatus();
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index a07952d73a94..8731fbfbda12 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -38,7 +38,7 @@ class ImpOptimizer : public OptimizationStats
 {
 private:
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >    mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >    mxContext;
     com::sun::star::uno::Reference< com::sun::star::frame::XModel >             mxModel;
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >          mxStatusDispatcher;
 
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index babba10cfaf1..e055ad415a26 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -266,7 +266,7 @@ void InformationDialog::InitDialog()
     OUString aTitle;
     if ( !maSaveAsURL.isEmpty() )
     {
-        Reference< XURLTransformer > xURLTransformer( URLTransformer::create(mxMSF) );
+        Reference< XURLTransformer > xURLTransformer( URLTransformer::create(mxContext) );
         util::URL aURL, aPresentationURL;
         aURL.Complete = maSaveAsURL;
         xURLTransformer->parseSmart( aURL, OUString() );
@@ -313,10 +313,10 @@ void InformationDialog::InitDialog()
 
 // -----------------------------------------------------------------------------
 
-InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
-    UnoDialog( rxMSF, rxFrame ),
-    ConfigurationAccess( rxMSF, NULL ),
-    mxMSF( rxMSF ),
+InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
+    UnoDialog( rxContext, rxFrame ),
+    ConfigurationAccess( rxContext, NULL ),
+    mxContext( rxContext ),
     mxFrame( rxFrame ),
     mxActionListener( new OKActionListener( *this ) ),
     mnSourceSize( rSourceSize ),
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 5de67e1aafd7..1ee8b11a6572 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -46,7 +46,7 @@ class InformationDialog : public UnoDialog, public ConfigurationAccess
 {
 public :
 
-    InformationDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF,
+    InformationDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
             com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, const OUString& rSaveAsURL,
                 sal_Bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest );
     ~InformationDialog();
@@ -55,7 +55,7 @@ public :
 
 private :
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame >         mxFrame;
     com::sun::star::uno::Reference< com::sun::star::io::XStream >           mxTempFile;
 
@@ -72,7 +72,7 @@ private :
 public :
 
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; };
-    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxMSF; };
+    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxContext; };
 };
 
 class OKActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XActionListener >
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index acc45bf74df0..2be42898f860 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -204,12 +204,12 @@ void OptimizerDialog::UpdateConfiguration()
 
 // -----------------------------------------------------------------------------
 
-OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame, Reference< XDispatch > rxStatusDispatcher ) :
-    UnoDialog( rxMSF, rxFrame ),
-    ConfigurationAccess( rxMSF, NULL ),
+OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, Reference< XDispatch > rxStatusDispatcher ) :
+    UnoDialog( rxContext, rxFrame ),
+    ConfigurationAccess( rxContext, NULL ),
     mnCurrentStep( 0 ),
     mnTabIndex( 0 ),
-    mxMSF( rxMSF ),
+    mxContext( rxContext ),
     mxFrame( rxFrame ),
     mxItemListener( new ItemListener( *this ) ),
     mxActionListener( new ActionListener( *this ) ),
@@ -522,7 +522,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
             if ( nInt16 )
             {
                 OUString aSaveAsURL;
-                FileOpenDialog aFileOpenDialog( ((UnoDialog&)mrOptimizerDialog).mxMSF );
+                FileOpenDialog aFileOpenDialog( mrOptimizerDialog.GetComponentContext() );
 
                 // generating default file name
                 Reference< XStorable > xStorable( mrOptimizerDialog.mxController->getModel(), UNO_QUERY );
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 3bd5080ab6ca..ff711ba205b0 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -62,7 +62,7 @@ class OptimizerDialog : public UnoDialog, public ConfigurationAccess
 {
 public :
 
-    OptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame,
+    OptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame,
         com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > rxStatusDispatcher );
     ~OptimizerDialog();
 
@@ -73,7 +73,7 @@ public :
     sal_Bool                mbIsReadonly;
 
 private :
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame >         mxFrame;
 
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface >       mxRoadmapControl;
@@ -125,7 +125,7 @@ public :
     OUString GetSelectedString( PPPOptimizerTokenEnum eListBox );
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; };
-    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxMSF; };
+    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxContext; };
 };
 
 // -----------------------------------------------------------------------------
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 0c5445940103..bc031a538d0e 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -748,7 +748,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
     sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, (sal_Int32)0 ) );
     GraphicSettings aGraphicSettings( bJPEGCompression, nJPEGQuality, GetConfigProperty( TK_RemoveCropArea, sal_False ),
                                         nImageResolution, GetConfigProperty( TK_EmbedLinkedGraphics, sal_True ) );
-    GraphicCollector::CountGraphics( mxMSF, mxController->getModel(), aGraphicSettings, nGraphics );
+    GraphicCollector::CountGraphics( mxContext, mxController->getModel(), aGraphicSettings, nGraphics );
     if ( nGraphics > 1 )
     {
         OUString aStr( getString( STR_OPTIMIZE_IMAGES ) );
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 3d7994e097e9..021a376ecae6 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -37,8 +37,8 @@ using namespace ::com::sun::star::beans;
 // - PPPOptimizer -
 // ----------------
 
-PPPOptimizer::PPPOptimizer( const Reference< XComponentContext > &rxMSF ) :
-    mxMSF( rxMSF )
+PPPOptimizer::PPPOptimizer( const Reference< XComponentContext > &xContext ) :
+    mxContext( xContext )
 {
 }
 
@@ -133,7 +133,7 @@ void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyV
             {
                 try
                 {
-                    ImpOptimizer aOptimizer( mxMSF, xModel );
+                    ImpOptimizer aOptimizer( mxContext, xModel );
                     aOptimizer.Optimize( lArguments );
                 }
                 catch( Exception& )
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index f01f4dc31c52..3565b0ca47d7 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -39,12 +39,12 @@ class PPPOptimizer : public cppu::WeakImplHelper4<
                                     com::sun::star::frame::XDispatchProvider,
                                     com::sun::star::frame::XDispatch >
 {
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
     com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
 
 public:
 
-                PPPOptimizer( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF );
+                PPPOptimizer( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
     virtual     ~PPPOptimizer();
 
     // XInitialization
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index e8c707b501d6..0d58b07adef6 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -35,8 +35,8 @@ using namespace ::com::sun::star::beans;
 // - PPPOptimizerDialog -
 // ----------------------
 
-PPPOptimizerDialog::PPPOptimizerDialog( const Reference< XComponentContext > &rxMSF ) :
-    mxMSF( rxMSF ),
+PPPOptimizerDialog::PPPOptimizerDialog( const Reference< XComponentContext > &xContext ) :
+    mxContext( xContext ),
     mpOptimizerDialog( NULL )
 {
 }
@@ -130,7 +130,7 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
             {
                 sal_Int64 nFileSizeSource = 0;
                 sal_Int64 nFileSizeDest = 0;
-                mpOptimizerDialog = new OptimizerDialog( mxMSF, mxFrame, this );
+                mpOptimizerDialog = new OptimizerDialog( mxContext, mxFrame, this );
                 mpOptimizerDialog->execute();
 
                 const Any* pVal( mpOptimizerDialog->maStats.GetStatusValue( TK_FileSizeSource ) );
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 69d9a937d84b..6464a166568b 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -45,7 +45,7 @@ class PPPOptimizerDialog : public   ::cppu::WeakImplHelper4<
                                     com::sun::star::frame::XDispatchProvider,
                                     com::sun::star::frame::XDispatch >
 {
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
     com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
 
@@ -53,7 +53,7 @@ class PPPOptimizerDialog : public   ::cppu::WeakImplHelper4<
 
 public:
 
-    PPPOptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF );
+    PPPOptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
     virtual ~PPPOptimizerDialog();
 
     // XInitialization
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index 8c2eafe3e3de..352aff0903e2 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -45,10 +45,10 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::script;
 
 UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame ) :
-    mxMSF( rxContext ),
+    mxContext( rxContext ),
     mxController( rxFrame->getController() ),
-    mxDialogModel( mxMSF->getServiceManager()->createInstanceWithContext( OUString(
-        "com.sun.star.awt.UnoControlDialogModel" ), mxMSF ), UNO_QUERY_THROW ),
+    mxDialogModel( mxContext->getServiceManager()->createInstanceWithContext( OUString(
+        "com.sun.star.awt.UnoControlDialogModel" ), mxContext ), UNO_QUERY_THROW ),
     mxDialogModelMultiPropertySet( mxDialogModel, UNO_QUERY_THROW ),
     mxDialogModelPropertySet( mxDialogModel, UNO_QUERY_THROW ),
     mxDialogModelMSF( mxDialogModel, UNO_QUERY_THROW ),
@@ -95,7 +95,7 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x
     throw ( Exception )
 {
     mxDialog->setVisible( sal_False );
-    Reference< XToolkit > xToolkit( Toolkit::create( mxMSF ), UNO_QUERY_THROW  );
+    Reference< XToolkit > xToolkit( Toolkit::create( mxContext ), UNO_QUERY_THROW  );
     if ( !xParentPeer.is() )
         xParentPeer = xToolkit->getDesktopWindow();
     mxReschedule = Reference< XReschedule >( xToolkit, UNO_QUERY );
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index b06aab794d85..1f4d5c9fa3cc 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -107,7 +107,7 @@ public :
     void enableControl( const OUString& rControlName );
     void disableControl( const OUString& rControlName );
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >        mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >        mxContext;
     com::sun::star::uno::Reference< com::sun::star::frame::XController >            mxController;
     com::sun::star::uno::Reference< com::sun::star::awt::XReschedule >              mxReschedule;