diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:47:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:47:09 +0000 |
| commit | fcb62088812101f206681b68e88da31b4cbba971 (patch) | |
| tree | 3e02e6d03889c0b6eeb6ad8e776d5f6d43d94e18 /sfx2/source/appl/appopen.cxx | |
| parent | 7b142839cace4ae305180104015efdcb48d20418 (diff) | |
INTEGRATION: CWS sb59 (1.106.22); FILE MERGED
2006/08/16 09:31:14 sb 1.106.22.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'sfx2/source/appl/appopen.cxx')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 0e5907e2c5..9f3599ef9b 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appopen.cxx,v $ * - * $Revision: 1.107 $ + * $Revision: 1.108 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:15:37 $ + * last change: $Author: obo $ $Date: 2006-10-12 15:47:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1014,7 +1014,10 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { aPath = SvtPathOptions().GetTemplatePath(); sal_Int32 nTokenCount = aPath.GetTokenCount( ';' ); - aPath = aPath.GetToken( ( nTokenCount ? ( nTokenCount - 1 ) : 0 ), ';' ); + aPath = aPath.GetToken( + sal::static_int_cast< xub_StrLen >( + nTokenCount ? ( nTokenCount - 1 ) : 0 ), + ';' ); } ULONG nErr = sfx2::FileOpenDialog_Impl( @@ -1584,32 +1587,3 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) delete pLinkItem; } } - -//-------------------------------------------------------------------- - -SfxViewFrame *SfxApplication::CreateView_Impl -( - SfxRequest& rReq, - SfxObjectShell* pDoc, - FASTBOOL bNewView, // neue View erzwingen - FASTBOOL bHidden -) -{ - SfxViewFrame* pFrame = CreateView_Impl( rReq.GetArgs(), pDoc, bNewView, bHidden ); - rReq.SetReturnValue( SfxViewFrameItem( pFrame ) ); - return pFrame; -} - -SfxViewFrame *SfxApplication::CreateView_Impl -( - const SfxItemSet* pSet, - SfxObjectShell* pDoc, - FASTBOOL /*bNewView*/, // neue View erzwingen - FASTBOOL bHidden -) -{ - DBG_MEMTEST(); - - SfxFrame* pFrame = SfxTopFrame::Create( pDoc, 0, bHidden, pSet ); - return pFrame->GetCurrentViewFrame(); -} |