diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 12:43:22 +0100 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 12:43:22 +0100 |
commit | 94160afa68a6bf633c5fb14944c5f239187fa7c1 (patch) | |
tree | 65743009389efd14619dc13db601ef7e1d453c7c /sfx2/inc | |
parent | 9c5a2fb27f432c2fe4528f2239f560b515d2021c (diff) | |
parent | 213e25168a934890e60546be9c819d16754aaa49 (diff) |
CWS-TOOLING: integrate CWS gnumake2
Diffstat (limited to 'sfx2/inc')
-rwxr-xr-x | sfx2/inc/brokenpackageint.hxx | 101 | ||||
-rw-r--r-- | sfx2/inc/makefile.mk | 48 | ||||
-rw-r--r-- | sfx2/inc/sfx2/QuerySaveDocument.hxx (renamed from sfx2/inc/QuerySaveDocument.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/basmgr.hxx (renamed from sfx2/inc/basmgr.hxx) | 3 | ||||
-rwxr-xr-x | sfx2/inc/sfx2/brokenpackageint.hxx | 55 | ||||
-rw-r--r-- | sfx2/inc/sfx2/dinfedt.hxx (renamed from sfx2/inc/dinfedt.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/docinsert.hxx (renamed from sfx2/inc/docinsert.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/imagemgr.hxx (renamed from sfx2/inc/imagemgr.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/imgmgr.hxx (renamed from sfx2/inc/imgmgr.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/mailmodelapi.hxx (renamed from sfx2/inc/mailmodelapi.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/mieclip.hxx (renamed from sfx2/inc/mieclip.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/minfitem.hxx (renamed from sfx2/inc/minfitem.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/passwd.hxx | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | sfx2/inc/sfx2/sfx.hrc | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxhelp.hxx (renamed from sfx2/inc/sfxhelp.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxresid.hxx (renamed from sfx2/inc/sfxresid.hxx) | 6 | ||||
-rw-r--r-- | sfx2/inc/sfx2/stbitem.hxx (renamed from sfx2/inc/stbitem.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/tplpitem.hxx (renamed from sfx2/inc/tplpitem.hxx) | 0 | ||||
-rw-r--r-- | sfx2/inc/sfx2/viewfac.hxx (renamed from sfx2/inc/viewfac.hxx) | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/viewsh.hxx | 1 |
20 files changed, 60 insertions, 166 deletions
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx deleted file mode 100755 index 16f332480cf6..000000000000 --- a/sfx2/inc/brokenpackageint.hxx +++ /dev/null @@ -1,101 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include <com/sun/star/document/BrokenPackageRequest.hpp> -#include <com/sun/star/task/XInteractionApprove.hpp> -#include <com/sun/star/task/XInteractionDisapprove.hpp> -#include <framework/interaction.hxx> - -using namespace ::framework; -typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove; -typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove; - -class SFX2_DLLPUBLIC RequestPackageReparation : - public ::com::sun::star::task::XInteractionRequest, - public ::cppu::OWeakObject -{ - ::com::sun::star::uno::Any m_aRequest; - - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > m_lContinuations; - - SfxContinuationApprove* m_pApprove; - SfxContinuationDisapprove* m_pDisapprove; - -public: - RequestPackageReparation( ::rtl::OUString aName ); - - // XInterface / OWeakObject - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); - - sal_Bool isApproved() { return m_pApprove->isSelected(); } - - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ); - - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ); -}; - -class SFX2_DLLPUBLIC NotifyBrokenPackage : - public ::com::sun::star::task::XInteractionRequest, - public ::cppu::OWeakObject -{ - ::com::sun::star::uno::Any m_aRequest; - - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > m_lContinuations; - - ContinuationAbort* m_pAbort; - -public: - NotifyBrokenPackage( ::rtl::OUString aName ); - - // XInterface / OWeakObject - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); - - sal_Bool isAborted() { return m_pAbort->isSelected(); } - - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ); - - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ); -}; - diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk deleted file mode 100644 index b7aa547e2c79..000000000000 --- a/sfx2/inc/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# 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 -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=sfx2 -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx index e25d1a23082c..e25d1a23082c 100644 --- a/sfx2/inc/QuerySaveDocument.hxx +++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx index 7156be8f8327..0227ad6515ec 100644 --- a/sfx2/inc/basmgr.hxx +++ b/sfx2/inc/sfx2/basmgr.hxx @@ -28,8 +28,7 @@ #ifndef _SFX_BASMGR_HXX #define _SFX_BASMGR_HXX -#ifndef _BASMGR_HXX_ #include <basic/basmgr.hxx> -#endif +#include <svtools/svtools.hrc> #endif //_SFX_BASMGR_HXX diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx new file mode 100755 index 000000000000..5186e875a6ea --- /dev/null +++ b/sfx2/inc/sfx2/brokenpackageint.hxx @@ -0,0 +1,55 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "sal/config.h" +#include "sfx2/dllapi.h" +#include <com/sun/star/document/BrokenPackageRequest.hpp> +#include <com/sun/star/task/XInteractionApprove.hpp> +#include <com/sun/star/task/XInteractionDisapprove.hpp> + +class RequestPackageReparation_Impl; +class SFX2_DLLPUBLIC RequestPackageReparation +{ + RequestPackageReparation_Impl* pImp; +public: + RequestPackageReparation( ::rtl::OUString aName ); + ~RequestPackageReparation(); + sal_Bool isApproved(); + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); +}; + +class NotifyBrokenPackage_Impl; +class SFX2_DLLPUBLIC NotifyBrokenPackage +{ + NotifyBrokenPackage_Impl* pImp; +public: + NotifyBrokenPackage( ::rtl::OUString aName ); + ~NotifyBrokenPackage(); + sal_Bool isAborted(); + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); +}; + diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx index 64ad32cb1337..64ad32cb1337 100644 --- a/sfx2/inc/dinfedt.hxx +++ b/sfx2/inc/sfx2/dinfedt.hxx diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx index c4e4be12185e..c4e4be12185e 100644 --- a/sfx2/inc/docinsert.hxx +++ b/sfx2/inc/sfx2/docinsert.hxx diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx index 79dc724210c4..79dc724210c4 100644 --- a/sfx2/inc/imagemgr.hxx +++ b/sfx2/inc/sfx2/imagemgr.hxx diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx index ae1f8a23ddc9..ae1f8a23ddc9 100644 --- a/sfx2/inc/imgmgr.hxx +++ b/sfx2/inc/sfx2/imgmgr.hxx diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx index fa9086f2623b..fa9086f2623b 100644 --- a/sfx2/inc/mailmodelapi.hxx +++ b/sfx2/inc/sfx2/mailmodelapi.hxx diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx index 562bca7940e2..562bca7940e2 100644 --- a/sfx2/inc/mieclip.hxx +++ b/sfx2/inc/sfx2/mieclip.hxx diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx index 29edf6b3e8cb..29edf6b3e8cb 100644 --- a/sfx2/inc/minfitem.hxx +++ b/sfx2/inc/sfx2/minfitem.hxx diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 5a3a48445c0f..6ca9d5212a57 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -28,14 +28,12 @@ #define _SFX_PASSWD_HXX #include "sal/config.h" -#include "sfx2/dllapi.h" - -#ifndef _SV_BUTTON_HXX +#include <sfx2/dllapi.h> #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> +#include <sfx2/app.hxx> // defines --------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index a49b003b5b49..44c00cc93018 100755..100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -362,9 +362,6 @@ #define RID_ITEMLIST_LINGU (RID_OPTIONS_START + 11) #define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) -#define STR_UNDO (RID_SFX_VIEW_START+11) -#define STR_REDO (RID_SFX_VIEW_START+12) -#define STR_REPEAT (RID_SFX_VIEW_START+13) #define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) // Member-Ids ------------------------------------------------------------ diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx index 17589c7cd399..17589c7cd399 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfx2/sfxhelp.hxx diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx index ceea5452a0d5..2dfdb48afef4 100644 --- a/sfx2/inc/sfxresid.hxx +++ b/sfx2/inc/sfx2/sfxresid.hxx @@ -28,12 +28,10 @@ #define _SFX_SFXRESID_HXX #include <tools/string.hxx> - -#ifndef _RESID_HXX //autogen +#include "sfx2/dllapi.h" #include <tools/resid.hxx> -#endif -class SfxResId: public ResId +class SFX2_DLLPUBLIC SfxResId: public ResId { public: SfxResId( USHORT nId ); diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx index 977ba869750d..977ba869750d 100644 --- a/sfx2/inc/stbitem.hxx +++ b/sfx2/inc/sfx2/stbitem.hxx diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx index 38198e0ff7ee..38198e0ff7ee 100644 --- a/sfx2/inc/tplpitem.hxx +++ b/sfx2/inc/sfx2/tplpitem.hxx diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx index b0f0abdba3b3..420a44440aae 100644 --- a/sfx2/inc/viewfac.hxx +++ b/sfx2/inc/sfx2/viewfac.hxx @@ -30,9 +30,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include <tools/string.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif class SfxViewFrame; class SfxViewShell; @@ -51,7 +49,6 @@ public: SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); void InitFactory(); - USHORT GetOrdinal() const { return nOrd; } /// returns a legacy view name. This is "view" with an appended ordinal/ID. diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index ee8dfb1ca57c..bbd627a39ad6 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -380,4 +380,3 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const #endif // #ifndef _SFXVIEWSH_HXX - |