diff options
Diffstat (limited to 'svx/source/form/fmpage.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/form/fmpage.cxx | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 480bc5678eaf..3887ec5f1a2d 100644..100755 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" +#include <sal/macros.h> #define ENABLE_BYTESTRING_STREAM_OPERATORS #include <svx/fmpage.hxx> @@ -37,30 +39,22 @@ #include <svx/fmmodel.hxx> #ifndef SVX_LIGHT -#ifndef _SVX_FMOBJ_HXX #include "fmobj.hxx" #endif -#endif #ifndef SVX_LIGHT -#ifndef _SVX_FMRESIDS_HRC #include "svx/fmresids.hrc" #endif -#endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #ifndef SVX_LIGHT -#ifndef _SVX_FMPGEIMP_HXX #include "fmpgeimp.hxx" #endif -#endif #ifndef SVX_LIGHT -#ifndef _SFX_OBJSH_HXX //autogen #include <sfx2/objsh.hxx> #endif -#endif #include "svx/svditer.hxx" #include <svx/svdview.hxx> #include <tools/urlobj.hxx> @@ -68,12 +62,8 @@ #ifndef SVX_LIGHT -#ifndef _SVX_FMGLOB_HXX #include <svx/fmglob.hxx> -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmundo.hxx" #include "svx/fmtools.hxx" using namespace ::svxform; @@ -89,7 +79,7 @@ using com::sun::star::container::XNameContainer; TYPEINIT1(FmFormPage, SdrPage); //------------------------------------------------------------------ -FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, FASTBOOL bMasterPage) +FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage) :SdrPage(rModel, bMasterPage) #ifndef SVX_LIGHT ,m_pImpl( new FmFormPageImpl( *this ) ) @@ -155,7 +145,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel) } } } - catch( ::com::sun::star::uno::Exception ex ) + catch( ::com::sun::star::uno::Exception const& ) { OSL_ENSURE( sal_False, "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" ); } @@ -241,7 +231,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, INET_PROT_HTTPS, INET_PROT_JAVASCRIPT, INET_PROT_IMAP, INET_PROT_POP3, INET_PROT_VIM, INET_PROT_LDAP }; - for (sal_uInt16 i=0; i<sizeof(s_aQuickHelpSupported)/sizeof(s_aQuickHelpSupported[0]); ++i) + for (sal_uInt16 i=0; i < SAL_N_ELEMENTS(s_aQuickHelpSupported); ++i) if (s_aQuickHelpSupported[i] == aProtocol) { aHelpText = INetURLObject::decode(aUrl.GetURLNoPass(), '%', INetURLObject::DECODE_UNAMBIGUOUS); @@ -280,3 +270,5 @@ SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum) #endif return pObj; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |