diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:31:09 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:31:09 +0000 |
| commit | 5db62b83c782dc4ed06732ec6424705f86f2ab28 (patch) | |
| tree | fc1bbc91be67cb0e5a07c7ffce9cf705e5daba70 /sfx2/source/appl/appdata.cxx | |
| parent | 3d7e5e7fdbf2f2191d367d405cb7f8b153d3e39d (diff) | |
INTEGRATION: CWS basmgr03 (1.25.12); FILE MERGED
2007/08/01 08:24:17 fs 1.25.12.1: #i73331# SfxObjectShell* pThisDocument replaced by XModel m_xThisDocument
Diffstat (limited to 'sfx2/source/appl/appdata.cxx')
| -rw-r--r-- | sfx2/source/appl/appdata.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 0e9f71441da9..eca0690987c7 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appdata.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:55:31 $ + * last change: $Author: kz $ $Date: 2007-10-09 15:31:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -135,7 +135,7 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) : pSaveOptions( 0 ), pUndoOptions( 0 ), pHelpOptions( 0 ), - pThisDocument(0), + m_xThisDocument( ), pProgress(0), pTemplateCommon( 0 ), nDocModalMode(0), @@ -216,10 +216,10 @@ void SfxAppData_Impl::OnApplicationBasicManagerCreated( BasicManager& _rBasicMan // global constants, additionally to the ones already added by createApplicationBasicManager: // ThisComponent - Reference< XModel > xThisComponent; + Reference< XModel > xCurrentDoc; SfxObjectShell* pDoc = SfxObjectShell::Current(); if ( pDoc ) - xThisComponent = pDoc->GetModel(); - _rBasicManager.InsertGlobalUNOConstant( "ThisComponent", makeAny( xThisComponent ) ); - pThisDocument = pDoc; + xCurrentDoc = pDoc->GetModel(); + _rBasicManager.InsertGlobalUNOConstant( "ThisComponent", makeAny( xCurrentDoc ) ); + m_xThisDocument = xCurrentDoc; } |