strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sdwarningsbegone (1.8.36); FILE MERGED

Browse source 
2006/11/22 12:42:24 cl 1.8.36.1: #i69285# warning free code changes for unxlngi6.pro
This commit is contained in:
Kurt Zenker 2006-12-12 18:06:40 +00:00
parent ad3f127660
commit 75baf8ca3a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sd/source/ui/view/PresentationViewShellBase.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: PresentationViewShellBase.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: obo $ $Date: 2006-09-16 19:31:51 $
* last change: $Author: kz $ $Date: 2006-12-12 19:06:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -76,10 +76,10 @@ SFX_IMPL_VIEWFACTORY(PresentationViewShellBase, SdResId(STR_DEFAULTVIEW))
*/
SfxViewFactory* PresentationViewShellBase::pFactory;
SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
SfxViewFrame *pFrame, SfxViewShell *pOldView)
SfxViewFrame *_pFrame, SfxViewShell *pOldView)
{
PresentationViewShellBase* pBase =
new PresentationViewShellBase(pFrame, pOldView);
new PresentationViewShellBase(_pFrame, pOldView);
pBase->LateInit();
return pBase;
}
@ -98,17 +98,17 @@ void PresentationViewShellBase::InitFactory()
PresentationViewShellBase::PresentationViewShellBase (
SfxViewFrame* pFrame,
SfxViewFrame* _pFrame,
SfxViewShell* pOldShell)
: ViewShellBase (pFrame, pOldShell, ViewShell::ST_PRESENTATION)
: ViewShellBase (_pFrame, pOldShell, ViewShell::ST_PRESENTATION)
{
GetUpdateLockManager().Disable();
// Hide the automatic (non-context sensitive) tool bars.
if (pFrame!=NULL && pFrame->GetFrame()!=NULL)
if (_pFrame!=NULL && _pFrame->GetFrame()!=NULL)
{
Reference<beans::XPropertySet> xFrameSet (
pFrame->GetFrame()->GetFrameInterface(),
_pFrame->GetFrame()->GetFrameInterface(),
UNO_QUERY);
if (xFrameSet.is())
{