diff options
Diffstat (limited to 'sfx2/source/view/frame.cxx')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 09e42563d6..acea8a46f0 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -1,10 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * Copyright 2000, 2010 Oracle and/or its affiliates. * * This file is part of OpenOffice.org. * @@ -37,7 +38,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/container/XChild.hpp> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> #endif #include <svl/intitem.hxx> @@ -48,16 +48,10 @@ #include <svl/stritem.hxx> #ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <com/sun/star/awt/PosSize.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <vcl/msgbox.hxx> -#ifndef GCC -#endif - // wg. pTopFrames #include "appdata.hxx" #include <sfx2/app.hxx> @@ -503,11 +497,11 @@ void SfxFrame::GetTargetList( TargetList& rList ) const if ( !GetParentFrame() ) { // Einen Leerstring f"ur 'Kein Target' - rList.Insert( new String() ); - rList.Insert( new String( DEFINE_CONST_UNICODE( "_top" ) ) ); - rList.Insert( new String( DEFINE_CONST_UNICODE( "_parent" ) ) ); - rList.Insert( new String( DEFINE_CONST_UNICODE( "_blank" ) ) ); - rList.Insert( new String( DEFINE_CONST_UNICODE( "_self" ) ) ); + rList.push_back( new String() ); + rList.push_back( new String( DEFINE_CONST_UNICODE( "_top" ) ) ); + rList.push_back( new String( DEFINE_CONST_UNICODE( "_parent" ) ) ); + rList.push_back( new String( DEFINE_CONST_UNICODE( "_blank" ) ) ); + rList.push_back( new String( DEFINE_CONST_UNICODE( "_self" ) ) ); } SfxViewFrame* pView = GetCurrentViewFrame(); @@ -592,7 +586,7 @@ SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const return pNew; } -sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const { if ( wFrame ) { @@ -603,7 +597,7 @@ sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const return FALSE; } -sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) { Reference < XFrame > xFrame; if ( (rVal >>= xFrame) && xFrame.is() ) @@ -643,13 +637,13 @@ SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const return new SfxUsrAnyItem( Which(), aValue ); } -sal_Bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const { rVal = aValue; return sal_True; } -sal_Bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) { aValue = rVal; return sal_True; @@ -992,3 +986,4 @@ const SfxPoolItem* SfxFrame::OpenDocumentSynchron( SfxItemSet& i_rSet, const Ref return SFX_APP()->GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, i_rSet ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |