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 | 91e34e4ccc6c61d0b64d250817af7f0d2263b89e (patch) | |
| tree | 40aada24b74a727c59941b29a8a12c3ea06f0b4f /svl | |
| parent | e775b40a11ca0eab7964dacc8387367086e2b029 (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/Library_svl.mk | 2 | ||||
| -rw-r--r-- | svl/Package_inc.mk | 1 | ||||
| -rw-r--r-- | svl/prj/build.lst | 2 | ||||
| -rw-r--r-- | svl/source/misc/lngmisc.cxx | 6 |
4 files changed, 1 insertions, 10 deletions
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index bfa5cfaa96ee..e872c1cfec5b 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/itemholder2 \ svl/source/config/languageoptions \ svl/source/config/srchcfg \ - svl/source/filepicker/pickerhelper \ svl/source/filepicker/pickerhistory \ svl/source/filerec/filerec \ svl/source/items/aeitem \ @@ -144,7 +143,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/notify/listeneriter \ svl/source/notify/lstner \ svl/source/notify/smplhint \ - svl/source/numbers/nbdll \ svl/source/numbers/numfmuno \ svl/source/numbers/numhead \ svl/source/numbers/numuno \ diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk index e0f4b1835f95..e2f8473d46aa 100644 --- a/svl/Package_inc.mk +++ b/svl/Package_inc.mk @@ -109,7 +109,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx)) diff --git a/svl/prj/build.lst b/svl/prj/build.lst index 54eb363e906d..10b9cfe432f2 100644 --- a/svl/prj/build.lst +++ b/svl/prj/build.lst @@ -5,5 +5,5 @@ sl svl\prj nmake - all svl_prj NULL # complex test for ConfigItems are marked as defect # sl svl\qa\complex\ConfigItems\helper nmake - all svl_qa_complex_help svl_util svl_passcont NULL # sl svl\qa\complex\ConfigItems nmake - all svl_qa_complex svl_qa_complex_help svl_util svl_passcont NULL -sl svl\qa\complex\passwordcontainer nmake - all svl_qa_complex svl_util svl_passcont NULL +sl svl\qa\complex\passwordcontainer nmake - all svl_qa_complex svl_prj NULL diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index c0866b21e785..1324a8fa842c 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -27,19 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -<<<<<<< local #include <svl/lngmisc.hxx> -======= - -#include <lngmisc.hxx> ->>>>>>> other #include <tools/solar.h> #include <tools/string.hxx> #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> - using namespace rtl; namespace linguistic |