CWS gnumake: resync to m91; conflicts unresolved

2 files changed, 84 insertions, 0 deletions

diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index 3591f5b29a..be5c4d4f59 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,3 +1,63 @@
+<<<<<<< local
 fr framework : l10n svtools NULL
 fr framework     usr1  - all fr_mkout NULL
 fr framework\prj nmake - all fr_all NULL
+=======
+fr	framework	:    l10n svtools NULL
+fr	framework								usr1	-	all	fr_mkout NULL
+fr  framework\inc			        	    nmake   -   all fr_inc NULL
+fr  framework\source\constant               nmake   -   all fr_constant fr_inc NULL
+fr  framework\source\threadhelp             nmake   -   all fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\loadenv                nmake   -   all fr_loadenv fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\classes                nmake   -   all fr_classes fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\jobs                   nmake   -   all fr_jobs fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\interaction            nmake   -   all fr_interaction fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\helper                 nmake   -   all fr_helper fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\dispatch               nmake   -   all fr_dispatch fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\services               nmake   -   all fr_services fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\register               nmake   -   all fr_register fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\recording              nmake   -   all fr_recording fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\xml					nmake   -  	all fr_xml fr_threadhelp fr_inc NULL
+fr  framework\source\layoutmanager			nmake   -   all fr_layoutmanager fr_threadhelp fr_inc NULL
+fr  framework\source\uielement              nmake   -   all fr_uielement fr_threadhelp fr_inc NULL
+fr  framework\source\uifactory              nmake   -   all fr_uifactory fr_threadhelp fr_inc NULL
+fr  framework\source\uiconfiguration        nmake   -   all fr_uiconfiguration fr_threadhelp fr_inc NULL
+fr  framework\source\accelerators           nmake   -   all fr_accelerators fr_threadhelp fr_inc NULL
+fr  framework\source\tabwin					nmake   -   all fr_tabwin fr_threadhelp fr_inc NULL
+fr  framework\util                          nmake   -   all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin NULL
+fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL
+
+# complex tests
+# fails on unxsoli4
+# fr framework\qa\complex\ModuleManager          nmake - all fr_qa_complex_modulemanager NULL
+# fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL
+
+# fr framework\qa\complex\accelerators           nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL
+
+# unclear should be remove
+# fr framework\qa\complex\api_internal           nmake - all fr_qa_complex_api_internal NULL
+
+# BUG! opens an error box
+# fr framework\qa\complex\broken_document          nmake - all fr_qa_complex_broken_doc NULL
+
+# failed:
+# fr framework\qa\complex\desktop                  nmake - all fr_qa_complex_desktop NULL
+
+# fr framework\qa\complex\dispatches               nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL
+# fr framework\qa\complex\disposing                nmake - all fr_qa_complex_disposing NULL
+
+# GPF
+# fr framework\qa\complex\framework\autosave       nmake - all fr_qa_complex_framework_autosave NULL
+
+# much too complex, will not change to new junit
+# fr framework\qa\complex\framework\recovery     nmake - all fr_qa_complex_framework_recovery NULL
+
+# fr framework\qa\complex\imageManager             nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL
+
+# fr framework\qa\complex\loadAllDocuments         nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL
+
+# need cleanups
+# fr framework\qa\complex\path_settings            nmake - all fr_qa_complex_path_settings NULL
+# fr framework\qa\complex\path_substitution        nmake - all fr_qa_complex_path_substitution NULL
+
+>>>>>>> other
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index 123234eeff..acf0007049 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -25,8 +25,29 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 
 ..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib
 ..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib
+<<<<<<< local
 ..\inc\framework/*.h %_DEST%\inc%_EXT%\framework\*.h
 ..\inc\framework/*.hxx %_DEST%\inc%_EXT%\framework\*.hxx
+=======
+..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx
+..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx
+..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx
+..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx
+..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx
+..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx
+..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx
+..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx
+..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx
+..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx
+..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx
+..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx
+..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx
+..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx
+..\inc\classes\menuextensionsupplier.hxx %_DEST%\inc%_EXT%\framework\menuextensionsupplier.hxx
+..\inc\interaction\preventduplicateinteraction.hxx %_DEST%\inc%_EXT%\framework\preventduplicateinteraction.hxx
+..\inc\helper\titlehelper.hxx %_DEST%\inc%_EXT%\framework\titlehelper.hxx
+..\inc\classes\framelistanalyzer.hxx %_DEST%\inc%_EXT%\framework\framelistanalyzer.hxx
+>>>>>>> other
 
 ..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml
 ..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml
@@ -34,3 +55,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 
 ..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
 
+..\%__SRC%\misc\fwk.component %_DEST%\xml%_EXT%\fwk.component
+..\%__SRC%\misc\fwl.component %_DEST%\xml%_EXT%\fwl.component
+..\%__SRC%\misc\fwm.component %_DEST%\xml%_EXT%\fwm.component