diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
commit | 4f40fd2727a826d5d0b06617e5179829d66df5d2 (patch) | |
tree | bb3fbdb8fd94c48653a3b642b7d59dd10972b439 /sfx2/inc | |
parent | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (diff) |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sfx2/inc')
-rw-r--r-- | sfx2/inc/sfx2/viewfac.hxx | 13 | ||||
-rw-r--r-- | sfx2/inc/sfx2/viewsh.hxx | 9 |
2 files changed, 0 insertions, 22 deletions
diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx index cfe2ff0fb855..420a44440aae 100644 --- a/sfx2/inc/sfx2/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; @@ -45,20 +43,12 @@ typedef void (*SfxViewInit)(); class SFX2_DLLPUBLIC SfxViewFactory { public: -<<<<<<< local - SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ); -======= SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal, const sal_Char* asciiViewName ); ->>>>>>> other ~SfxViewFactory(); SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); void InitFactory(); -<<<<<<< local -======= - ->>>>>>> other USHORT GetOrdinal() const { return nOrd; } /// returns a legacy view name. This is "view" with an appended ordinal/ID. @@ -75,10 +65,7 @@ private: SfxViewCtor fnCreate; SfxViewInit fnInit; USHORT nOrd; -<<<<<<< local -======= const String m_sViewName; ->>>>>>> other }; #endif diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 22e873aea097..bbd627a39ad6 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -123,21 +123,13 @@ public: \ static SfxViewFactory&Factory() { return *pFactory; } \ static void InitFactory() -<<<<<<< local -#define SFX_IMPL_VIEWFACTORY(Class) \ -======= #define SFX_IMPL_NAMED_VIEWFACTORY(Class, AsciiViewName) \ ->>>>>>> other SfxViewFactory* Class::pFactory; \ SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \ { return new Class(pFrame, pOldView); } \ void Class::RegisterFactory( USHORT nPrio ) \ { \ -<<<<<<< local - pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio);\ -======= pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\ ->>>>>>> other InitFactory(); \ } \ void Class::InitFactory() @@ -388,4 +380,3 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const #endif // #ifndef _SFXVIEWSH_HXX - |