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/source | |
| parent | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/viewfac.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 6 |
3 files changed, 0 insertions, 18 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 9c25006b611c..bab37281cb05 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -<<<<<<< local #include "sfx2/sfxhelp.hxx" -======= -#include "sfxhelp.hxx" #include <set> ->>>>>>> other #include <algorithm> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/frame/XFrame.hpp> diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index 85f7c7f3745d..3eed678420dd 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -70,20 +70,12 @@ String SfxViewFactory::GetAPIViewName() const // CTOR / DTOR ----------------------------------------------------------- -<<<<<<< local -SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ): -======= SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal, const sal_Char* asciiViewName ): ->>>>>>> other fnCreate(fnC), fnInit(fnI), -<<<<<<< local - nOrd(nOrdinal) -======= nOrd(nOrdinal), m_sViewName( String::CreateFromAscii( asciiViewName ) ) ->>>>>>> other { DBG_CTOR(SfxViewFactory, 0); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 55521b026fdc..dbadbc54ebd4 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -92,12 +92,9 @@ #include <comphelper/storagehelper.hxx> #include <svtools/asynclink.hxx> #include <svl/sharecontrolfile.hxx> -<<<<<<< local #include <svtools/svtools.hrc> #include <svtools/svtdata.hxx> -======= #include <framework/framelistanalyzer.hxx> ->>>>>>> other #include <boost/optional.hpp> @@ -112,9 +109,6 @@ using ::com::sun::star::document::XViewDataSupplier; using ::com::sun::star::container::XIndexContainer; namespace css = ::com::sun::star; -#ifndef GCC -#endif - // wg. ViewFrame::Current #include "appdata.hxx" #include <sfx2/taskpane.hxx> |