merge to m66

1 files changed, 303 insertions, 0 deletions

diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index 0a3ccd8a9819..3570ea9bf143 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -22,12 +22,315 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
 
+<<<<<<< local
 ..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
 ..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h
 ..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
 ..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
 ..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h
 ..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
+=======
+..\inc\svtools\svldllapi.h %_DEST%\inc%_EXT%\svtools\svldllapi.h
+..\inc\svtools\svtdllapi.h %_DEST%\inc%_EXT%\svtools\svtdllapi.h
+
+..\inc\svtools\globalnameitem.hxx %_DEST%\inc%_EXT%\svtools\globalnameitem.hxx
+..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\svtools\imagemgr.hxx
+..\inc\imagemgr.hrc %_DEST%\inc%_EXT%\svtools\imagemgr.hrc
+..\inc\testtool.hxx %_DEST%\inc%_EXT%\svtools\testtool.hxx
+..\inc\flbytes.hxx %_DEST%\inc%_EXT%\svtools\flbytes.hxx
+..\inc\adrparse.hxx %_DEST%\inc%_EXT%\svtools\adrparse.hxx
+..\inc\svtools\aeitem.hxx %_DEST%\inc%_EXT%\svtools\aeitem.hxx
+..\inc\svtools\brdcst.hxx %_DEST%\inc%_EXT%\svtools\brdcst.hxx
+..\inc\broadcast.hxx %_DEST%\inc%_EXT%\svtools\broadcast.hxx
+..\inc\svtools\brwbox.hxx %_DEST%\inc%_EXT%\svtools\brwbox.hxx
+..\inc\calendar.hxx %_DEST%\inc%_EXT%\svtools\calendar.hxx
+..\inc\svtools\cancel.hxx %_DEST%\inc%_EXT%\svtools\cancel.hxx
+..\inc\cntnrsrt.hxx %_DEST%\inc%_EXT%\svtools\cntnrsrt.hxx
+..\inc\svtools\colrdlg.hxx %_DEST%\inc%_EXT%\svtools\colrdlg.hxx
+..\inc\svtools\colctrl.hxx %_DEST%\inc%_EXT%\svtools\colctrl.hxx
+..\inc\ctrlbox.hxx %_DEST%\inc%_EXT%\svtools\ctrlbox.hxx
+..\inc\ctrltool.hxx %_DEST%\inc%_EXT%\svtools\ctrltool.hxx
+..\inc\collatorres.hxx %_DEST%\inc%_EXT%\svtools\collatorres.hxx
+..\inc\indexentryres.hxx %_DEST%\inc%_EXT%\svtools\indexentryres.hxx
+..\inc\cntwids.hrc %_DEST%\inc%_EXT%\svtools\cntwids.hrc
+..\inc\svtools\dateitem.hxx %_DEST%\inc%_EXT%\svtools\dateitem.hxx
+..\inc\svtools\dtritem.hxx %_DEST%\inc%_EXT%\svtools\dtritem.hxx
+..\inc\svtools\frqitem.hxx %_DEST%\inc%_EXT%\svtools\frqitem.hxx
+..\inc\svtools\cstitem.hxx %_DEST%\inc%_EXT%\svtools\cstitem.hxx
+..\inc\svtools\tfrmitem.hxx %_DEST%\inc%_EXT%\svtools\tfrmitem.hxx
+..\inc\svtools\cntwall.hxx %_DEST%\inc%_EXT%\svtools\cntwall.hxx
+..\inc\svtools\langtab.hxx %_DEST%\inc%_EXT%\svtools\langtab.hxx
+..\inc\itemdel.hxx %_DEST%\inc%_EXT%\svtools\itemdel.hxx
+..\inc\wallitem.hxx %_DEST%\inc%_EXT%\svtools\wallitem.hxx
+..\inc\svtools\sfontitm.hxx %_DEST%\inc%_EXT%\svtools\sfontitm.hxx
+..\inc\svtools\bintitem.hxx %_DEST%\inc%_EXT%\svtools\bintitem.hxx
+..\inc\stylepool.hxx %_DEST%\inc%_EXT%\svtools\stylepool.hxx
+..\inc\dialogcontrolling.hxx %_DEST%\inc%_EXT%\svtools\dialogcontrolling.hxx
+..\inc\svtools\eitem.hxx %_DEST%\inc%_EXT%\svtools\eitem.hxx
+..\inc\eventcfg.hxx %_DEST%\inc%_EXT%\svtools\eventcfg.hxx
+..\inc\filedlg.hxx %_DEST%\inc%_EXT%\svtools\filedlg.hxx
+..\inc\svtools\filerec.hxx %_DEST%\inc%_EXT%\svtools\filerec.hxx
+..\inc\svtools\flagitem.hxx %_DEST%\inc%_EXT%\svtools\flagitem.hxx
+..\inc\svtools\fltcall.hxx %_DEST%\inc%_EXT%\svtools\fltcall.hxx
+..\inc\svtools\wmf.hxx %_DEST%\inc%_EXT%\svtools\wmf.hxx
+..\inc\fltdefs.hxx %_DEST%\inc%_EXT%\svtools\fltdefs.hxx
+..\inc\svtools\filter.hxx %_DEST%\inc%_EXT%\svtools\filter.hxx
+..\inc\svtools\FilterConfigItem.hxx %_DEST%\inc%_EXT%\svtools\FilterConfigItem.hxx
+..\inc\svtools\fmtfield.hxx %_DEST%\inc%_EXT%\svtools\fmtfield.hxx
+..\inc\svtools\hint.hxx %_DEST%\inc%_EXT%\svtools\hint.hxx
+..\inc\svtools\accessibletableprovider.hxx %_DEST%\inc%_EXT%\svtools\accessibletableprovider.hxx
+..\inc\svtools\AccessibleBrowseBoxObjType.hxx %_DEST%\inc%_EXT%\svtools\AccessibleBrowseBoxObjType.hxx
+..\inc\svtools\accessiblefactory.hxx %_DEST%\inc%_EXT%\svtools\accessiblefactory.hxx
+..\inc\svtools\textwindowpeer.hxx %_DEST%\inc%_EXT%\svtools\textwindowpeer.hxx
+..\inc\imgdef.hxx %_DEST%\inc%_EXT%\svtools\imgdef.hxx
+..\inc\inetdef.hxx %_DEST%\inc%_EXT%\svtools\inetdef.hxx
+..\inc\svtools\inethist.hxx %_DEST%\inc%_EXT%\svtools\inethist.hxx
+..\inc\inetmsg.hxx %_DEST%\inc%_EXT%\svtools\inetmsg.hxx
+..\inc\inetstrm.hxx %_DEST%\inc%_EXT%\svtools\inetstrm.hxx
+..\inc\svtools\intitem.hxx %_DEST%\inc%_EXT%\svtools\intitem.hxx
+..\inc\svtools\visitem.hxx %_DEST%\inc%_EXT%\svtools\visitem.hxx
+..\inc\svtools\imageitm.hxx %_DEST%\inc%_EXT%\svtools\imageitm.hxx
+..\inc\svtools\isethint.hxx %_DEST%\inc%_EXT%\svtools\isethint.hxx
+..\inc\svtools\itemiter.hxx %_DEST%\inc%_EXT%\svtools\itemiter.hxx
+..\inc\svtools\itempool.hxx %_DEST%\inc%_EXT%\svtools\itempool.hxx
+..\inc\svtools\itemset.hxx %_DEST%\inc%_EXT%\svtools\itemset.hxx
+..\inc\svtools\lckbitem.hxx %_DEST%\inc%_EXT%\svtools\lckbitem.hxx
+..\inc\listener.hxx %_DEST%\inc%_EXT%\svtools\listener.hxx
+..\inc\listeneriter.hxx %_DEST%\inc%_EXT%\svtools\listeneriter.hxx
+..\inc\svtools\lstner.hxx %_DEST%\inc%_EXT%\svtools\lstner.hxx
+..\inc\svtools\macitem.hxx %_DEST%\inc%_EXT%\svtools\macitem.hxx
+..\inc\memberid.hrc %_DEST%\inc%_EXT%\svtools\memberid.hrc
+..\inc\svtools\nranges.hxx %_DEST%\inc%_EXT%\svtools\nranges.hxx
+..\inc\svtools\ownlist.hxx %_DEST%\inc%_EXT%\svtools\ownlist.hxx
+..\inc\prgsbar.hxx %_DEST%\inc%_EXT%\svtools\prgsbar.hxx
+..\inc\svtools\prnsetup.hxx %_DEST%\inc%_EXT%\svtools\prnsetup.hxx
+..\inc\poolcach.hxx %_DEST%\inc%_EXT%\svtools\poolcach.hxx
+..\inc\svtools\poolitem.hxx %_DEST%\inc%_EXT%\svtools\poolitem.hxx
+..\inc\svtools\printdlg.hxx %_DEST%\inc%_EXT%\svtools\printdlg.hxx
+..\inc\svtools\ptitem.hxx %_DEST%\inc%_EXT%\svtools\ptitem.hxx
+..\inc\svtools\szitem.hxx %_DEST%\inc%_EXT%\svtools\szitem.hxx
+..\inc\svtools\rectitem.hxx %_DEST%\inc%_EXT%\svtools\rectitem.hxx
+..\inc\svtools\rngitem.hxx %_DEST%\inc%_EXT%\svtools\rngitem.hxx
+..\inc\ruler.hxx %_DEST%\inc%_EXT%\svtools\ruler.hxx
+..\inc\scrwin.hxx %_DEST%\inc%_EXT%\svtools\scrwin.hxx
+..\inc\svtools\sharecontrolfile.hxx %_DEST%\inc%_EXT%\svtools\sharecontrolfile.hxx
+..\inc\svtools\documentlockfile.hxx %_DEST%\inc%_EXT%\svtools\documentlockfile.hxx
+..\inc\svtools\lockfilecommon.hxx %_DEST%\inc%_EXT%\svtools\lockfilecommon.hxx
+..\inc\svtools\slstitm.hxx %_DEST%\inc%_EXT%\svtools\slstitm.hxx
+..\inc\svtools\ilstitem.hxx %_DEST%\inc%_EXT%\svtools\ilstitem.hxx
+..\inc\svtools\smplhint.hxx %_DEST%\inc%_EXT%\svtools\smplhint.hxx
+..\inc\svtools\cnclhint.hxx %_DEST%\inc%_EXT%\svtools\cnclhint.hxx
+..\inc\svtools\inettype.hxx %_DEST%\inc%_EXT%\svtools\inettype.hxx
+..\inc\svtools\brwhead.hxx %_DEST%\inc%_EXT%\svtools\brwhead.hxx
+..\inc\svtools\solar.hrc %_DEST%\inc%_EXT%\svtools\solar.hrc
+..\inc\scriptedtext.hxx %_DEST%\inc%_EXT%\svtools\scriptedtext.hxx
+..\inc\svtools\stdctrl.hxx %_DEST%\inc%_EXT%\svtools\stdctrl.hxx
+..\inc\svtools\stritem.hxx %_DEST%\inc%_EXT%\svtools\stritem.hxx
+..\inc\svtools\style.hrc %_DEST%\inc%_EXT%\svtools\style.hrc
+..\inc\svtools\style.hxx %_DEST%\inc%_EXT%\svtools\style.hxx
+..\inc\svtools\svarray.hxx %_DEST%\inc%_EXT%\svtools\svarray.hxx
+..\inc\svtools\svdde.hxx %_DEST%\inc%_EXT%\svtools\svdde.hxx
+..\inc\svtools\svtdata.hxx %_DEST%\inc%_EXT%\svtools\svtdata.hxx
+..\inc\tabbar.hxx %_DEST%\inc%_EXT%\svtools\tabbar.hxx
+..\inc\taskbar.hxx %_DEST%\inc%_EXT%\svtools\taskbar.hxx
+..\inc\svtools\undo.hxx %_DEST%\inc%_EXT%\svtools\undo.hxx
+..\inc\whiter.hxx %_DEST%\inc%_EXT%\svtools\whiter.hxx
+..\inc\svtools\valueset.hxx %_DEST%\inc%_EXT%\svtools\valueset.hxx
+..\inc\stdmenu.hxx %_DEST%\inc%_EXT%\svtools\stdmenu.hxx
+..\inc\svtools\headbar.hxx %_DEST%\inc%_EXT%\svtools\headbar.hxx
+..\inc\svtools\svicnvw.hxx %_DEST%\inc%_EXT%\svtools\svicnvw.hxx
+..\inc\svtools\svlbitm.hxx %_DEST%\inc%_EXT%\svtools\svlbitm.hxx
+..\inc\svtools\svlbox.hxx %_DEST%\inc%_EXT%\svtools\svlbox.hxx
+..\inc\svtools\svtabbx.hxx %_DEST%\inc%_EXT%\svtools\svtabbx.hxx
+..\inc\svtools\svtreebx.hxx %_DEST%\inc%_EXT%\svtools\svtreebx.hxx
+..\inc\tooltiplbox.hxx %_DEST%\inc%_EXT%\svtools\tooltiplbox.hxx
+..\inc\svtools\treelist.hxx %_DEST%\inc%_EXT%\svtools\treelist.hxx
+..\inc\svtools\xtextedt.hxx %_DEST%\inc%_EXT%\svtools\xtextedt.hxx
+..\inc\svtools\texteng.hxx %_DEST%\inc%_EXT%\svtools\texteng.hxx
+..\inc\svtools\textview.hxx %_DEST%\inc%_EXT%\svtools\textview.hxx
+..\inc\svtools\textdata.hxx %_DEST%\inc%_EXT%\svtools\textdata.hxx
+..\inc\txtattr.hxx %_DEST%\inc%_EXT%\svtools\txtattr.hxx
+..\inc\sychconv.hxx %_DEST%\inc%_EXT%\svtools\sychconv.hxx
+..\inc\svtools\ttprops.hxx %_DEST%\inc%_EXT%\svtools\ttprops.hxx
+..\inc\svtools\transfer.hxx %_DEST%\inc%_EXT%\svtools\transfer.hxx
+..\inc\svtools\embedtransfer.hxx %_DEST%\inc%_EXT%\svtools\embedtransfer.hxx
+..\inc\svtools\embedhlp.hxx %_DEST%\inc%_EXT%\svtools\embedhlp.hxx
+..\inc\cliplistener.hxx %_DEST%\inc%_EXT%\svtools\cliplistener.hxx
+..\inc\txtcmp.hxx %_DEST%\inc%_EXT%\svtools\txtcmp.hxx
+..\inc\urlbmk.hxx %_DEST%\inc%_EXT%\svtools\urlbmk.hxx
+..\inc\inetimg.hxx %_DEST%\inc%_EXT%\svtools\inetimg.hxx
+..\inc\svtools\svmedit.hxx %_DEST%\inc%_EXT%\svtools\svmedit.hxx
+..\inc\svtools\editsyntaxhighlighter.hxx %_DEST%\inc%_EXT%\svtools\editsyntaxhighlighter.hxx
+..\inc\svtools\syntaxhighlight.hxx %_DEST%\inc%_EXT%\svtools\syntaxhighlight.hxx
+..\inc\svtools\svmedit2.hxx %_DEST%\inc%_EXT%\svtools\svmedit2.hxx
+..\inc\svtools\svstdarr.hxx %_DEST%\inc%_EXT%\svtools\svstdarr.hxx
+..\inc\svtools\metitem.hxx %_DEST%\inc%_EXT%\svtools\metitem.hxx
+..\inc\svtools\nfversi.hxx %_DEST%\inc%_EXT%\svtools\nfversi.hxx
+..\inc\svtools\nfkeytab.hxx %_DEST%\inc%_EXT%\svtools\nfkeytab.hxx
+..\inc\nfsymbol.hxx %_DEST%\inc%_EXT%\svtools\nfsymbol.hxx
+..\inc\svtools\wizdlg.hxx %_DEST%\inc%_EXT%\svtools\wizdlg.hxx
+..\inc\svtools\zforlist.hxx %_DEST%\inc%_EXT%\svtools\zforlist.hxx
+..\inc\svtools\zformat.hxx %_DEST%\inc%_EXT%\svtools\zformat.hxx
+..\inc\numuno.hxx %_DEST%\inc%_EXT%\svtools\numuno.hxx
+..\inc\svtools\ondemand.hxx %_DEST%\inc%_EXT%\svtools\ondemand.hxx
+..\inc\svtools\loginerr.hxx %_DEST%\inc%_EXT%\svtools\loginerr.hxx
+..\inc\svtools\logindlg.hxx %_DEST%\inc%_EXT%\svtools\logindlg.hxx
+..\inc\svtools\httpcook.hxx %_DEST%\inc%_EXT%\svtools\httpcook.hxx
+..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx
+..\inc\svtools\itemprop.hxx %_DEST%\inc%_EXT%\svtools\itemprop.hxx
+..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx
+..\inc\svtools\genericunodialog.hxx %_DEST%\inc%_EXT%\svtools\genericunodialog.hxx
+..\inc\svtools\editbrowsebox.hxx %_DEST%\inc%_EXT%\svtools\editbrowsebox.hxx
+..\inc\svtools\editimplementation.hxx %_DEST%\inc%_EXT%\svtools\editimplementation.hxx
+..\inc\templatefoldercache.hxx %_DEST%\inc%_EXT%\svtools\templatefoldercache.hxx
+..\inc\folderrestriction.hxx %_DEST%\inc%_EXT%\svtools\folderrestriction.hxx
+..\inc\filenotation.hxx %_DEST%\inc%_EXT%\svtools\filenotation.hxx
+..\inc\svtools\urlcontrol.hxx %_DEST%\inc%_EXT%\svtools\urlcontrol.hxx
+..\inc\svtools\fileurlbox.hxx %_DEST%\inc%_EXT%\svtools\fileurlbox.hxx
+..\inc\svtools\toolboxcontroller.hxx %_DEST%\inc%_EXT%\svtools\toolboxcontroller.hxx
+..\inc\framestatuslistener.hxx %_DEST%\inc%_EXT%\svtools\framestatuslistener.hxx
+..\inc\statusbarcontroller.hxx %_DEST%\inc%_EXT%\svtools\statusbarcontroller.hxx
+..\inc\svtools\generictoolboxcontroller.hxx %_DEST%\inc%_EXT%\svtools\generictoolboxcontroller.hxx
+..\inc\svtools\restrictedpaths.hxx %_DEST%\inc%_EXT%\svtools\restrictedpaths.hxx
+
+..\inc\svtools\imap.hxx %_DEST%\inc%_EXT%\svtools\imap.hxx
+..\inc\svtools\imapobj.hxx %_DEST%\inc%_EXT%\svtools\imapobj.hxx
+..\inc\svtools\imaprect.hxx %_DEST%\inc%_EXT%\svtools\imaprect.hxx
+..\inc\svtools\imapcirc.hxx %_DEST%\inc%_EXT%\svtools\imapcirc.hxx
+..\inc\svtools\imappoly.hxx %_DEST%\inc%_EXT%\svtools\imappoly.hxx
+
+..\inc\svtools\parhtml.hxx %_DEST%\inc%_EXT%\svtools\parhtml.hxx
+..\inc\htmltokn.h %_DEST%\inc%_EXT%\svtools\htmltokn.h
+..\inc\htmlkywd.hxx %_DEST%\inc%_EXT%\svtools\htmlkywd.hxx
+..\inc\svtools\svparser.hxx %_DEST%\inc%_EXT%\svtools\svparser.hxx
+..\inc\svtools\htmlout.hxx %_DEST%\inc%_EXT%\svtools\htmlout.hxx
+..\source\svrtf\rtfout.hxx %_DEST%\inc%_EXT%\svtools\rtfout.hxx
+..\inc\svtools\parrtf.hxx %_DEST%\inc%_EXT%\svtools\parrtf.hxx
+..\source\svrtf\rtftoken.h %_DEST%\inc%_EXT%\svtools\rtftoken.h
+..\source\svrtf\rtfkeywd.hxx %_DEST%\inc%_EXT%\svtools\rtfkeywd.hxx
+
+..\inc\svtools\ctypeitm.hxx %_DEST%\inc%_EXT%\svtools\ctypeitm.hxx
+
+..\inc\strmadpt.hxx %_DEST%\inc%_EXT%\svtools\strmadpt.hxx
+..\inc\instrm.hxx %_DEST%\inc%_EXT%\svtools\instrm.hxx
+..\inc\outstrm.hxx %_DEST%\inc%_EXT%\svtools\outstrm.hxx
+
+..\inc\expander.hxx %_DEST%\inc%_EXT%\svtools\expander.hxx
+..\source\svsql\converter.hxx %_DEST%\inc%_EXT%\svtools\converter.hxx
+
+..\inc\filectrl.hxx %_DEST%\inc%_EXT%\svtools\filectrl.hxx
+..\inc\svtools\cenumitm.hxx %_DEST%\inc%_EXT%\svtools\cenumitm.hxx
+..\inc\svtools\cintitem.hxx %_DEST%\inc%_EXT%\svtools\cintitem.hxx
+..\inc\svtools\custritm.hxx %_DEST%\inc%_EXT%\svtools\custritm.hxx
+
+..\inc\sfxecode.hxx %_DEST%\inc%_EXT%\svtools\sfxecode.hxx
+..\inc\svtools\ehdl.hxx %_DEST%\inc%_EXT%\svtools\ehdl.hxx
+..\inc\svtools\svtools.hrc %_DEST%\inc%_EXT%\svtools\svtools.hrc
+..\source\dialogs\filedlg2.hrc %_DEST%\inc%_EXT%\svtools\filedlg2.hrc
+
+..\inc\xmlement.hxx %_DEST%\inc%_EXT%\svtools\xmlement.hxx
+..\inc\svtools\tresitem.hxx %_DEST%\inc%_EXT%\svtools\tresitem.hxx
+..\inc\urihelper.hxx %_DEST%\inc%_EXT%\svtools\urihelper.hxx
+..\inc\reginfo.hxx %_DEST%\inc%_EXT%\svtools\reginfo.hxx
+..\inc\cacheoptions.hxx %_DEST%\inc%_EXT%\svtools\cacheoptions.hxx
+..\inc\svtools\cjkoptions.hxx %_DEST%\inc%_EXT%\svtools\cjkoptions.hxx
+..\inc\javaoptions.hxx %_DEST%\inc%_EXT%\svtools\javaoptions.hxx
+..\inc\svtools\accelcfg.hxx %_DEST%\inc%_EXT%\svtools\accelcfg.hxx
+..\inc\svtools\pathoptions.hxx %_DEST%\inc%_EXT%\svtools\pathoptions.hxx
+..\inc\svtools\useroptions.hxx %_DEST%\inc%_EXT%\svtools\useroptions.hxx
+..\inc\fstathelper.hxx %_DEST%\inc%_EXT%\svtools\fstathelper.hxx
+..\inc\svtools\saveopt.hxx %_DEST%\inc%_EXT%\svtools\saveopt.hxx
+..\inc\svtools\undoopt.hxx %_DEST%\inc%_EXT%\svtools\undoopt.hxx
+..\inc\svtools\helpopt.hxx %_DEST%\inc%_EXT%\svtools\helpopt.hxx
+..\inc\svtools\optionsdlg.hxx %_DEST%\inc%_EXT%\svtools\optionsdlg.hxx
+..\inc\svtools\moduleoptions.hxx %_DEST%\inc%_EXT%\svtools\moduleoptions.hxx
+..\inc\svtools\securityoptions.hxx %_DEST%\inc%_EXT%\svtools\securityoptions.hxx
+..\inc\svtools\extendedsecurityoptions.hxx %_DEST%\inc%_EXT%\svtools\extendedsecurityoptions.hxx
+..\inc\svtools\miscopt.hxx %_DEST%\inc%_EXT%\svtools\miscopt.hxx
+..\inc\svtools\localisationoptions.hxx %_DEST%\inc%_EXT%\svtools\localisationoptions.hxx
+..\inc\svtools\workingsetoptions.hxx %_DEST%\inc%_EXT%\svtools\workingsetoptions.hxx
+..\inc\svtools\viewoptions.hxx %_DEST%\inc%_EXT%\svtools\viewoptions.hxx
+..\inc\svtools\internaloptions.hxx %_DEST%\inc%_EXT%\svtools\internaloptions.hxx
+..\inc\svtools\startoptions.hxx %_DEST%\inc%_EXT%\svtools\startoptions.hxx
+..\inc\svtools\historyoptions.hxx %_DEST%\inc%_EXT%\svtools\historyoptions.hxx
+..\inc\svtools\inetoptions.hxx %_DEST%\inc%_EXT%\svtools\inetoptions.hxx
+..\inc\svtools\menuoptions.hxx %_DEST%\inc%_EXT%\svtools\menuoptions.hxx
+..\inc\svtools\options3d.hxx %_DEST%\inc%_EXT%\svtools\options3d.hxx
+..\inc\svtools\optionsdrawinglayer.hxx %_DEST%\inc%_EXT%\svtools\optionsdrawinglayer.hxx
+..\inc\svtools\fontoptions.hxx %_DEST%\inc%_EXT%\svtools\fontoptions.hxx
+..\inc\svtools\addxmltostorageoptions.hxx %_DEST%\inc%_EXT%\svtools\addxmltostorageoptions.hxx
+..\inc\svtools\defaultoptions.hxx %_DEST%\inc%_EXT%\svtools\defaultoptions.hxx
+..\inc\svtools\printwarningoptions.hxx %_DEST%\inc%_EXT%\svtools\printwarningoptions.hxx
+..\inc\svtools\printoptions.hxx %_DEST%\inc%_EXT%\svtools\printoptions.hxx
+..\inc\svtools\dynamicmenuoptions.hxx %_DEST%\inc%_EXT%\svtools\dynamicmenuoptions.hxx
+..\inc\svtools\compatibility.hxx %_DEST%\inc%_EXT%\svtools\compatibility.hxx
+..\inc\svtools\syslocaleoptions.hxx %_DEST%\inc%_EXT%\svtools\syslocaleoptions.hxx
+..\inc\localresaccess.hxx %_DEST%\inc%_EXT%\svtools\localresaccess.hxx
+..\inc\svtools\wizardmachine.hxx %_DEST%\inc%_EXT%\svtools\wizardmachine.hxx
+..\inc\svtools\roadmapwizard.hxx %_DEST%\inc%_EXT%\svtools\roadmapwizard.hxx
+..\inc\roadmap.hxx %_DEST%\inc%_EXT%\svtools\roadmap.hxx
+..\inc\svtools\hyperlabel.hxx %_DEST%\inc%_EXT%\svtools\hyperlabel.hxx
+..\inc\svtools\fixedhyper.hxx %_DEST%\inc%_EXT%\svtools\fixedhyper.hxx
+..\inc\helpagentwindow.hxx %_DEST%\inc%_EXT%\svtools\helpagentwindow.hxx
+..\inc\pickerhistory.hxx %_DEST%\inc%_EXT%\svtools\pickerhistory.hxx
+..\inc\pickerhistoryaccess.hxx %_DEST%\inc%_EXT%\svtools\pickerhistoryaccess.hxx
+..\inc\pickerhelper.hxx %_DEST%\inc%_EXT%\svtools\pickerhelper.hxx
+..\inc\regoptions.hxx %_DEST%\inc%_EXT%\svtools\regoptions.hxx
+..\inc\svtools\accessibilityoptions.hxx %_DEST%\inc%_EXT%\svtools\accessibilityoptions.hxx
+..\inc\svtools\cmdoptions.hxx %_DEST%\inc%_EXT%\svtools\cmdoptions.hxx
+..\inc\svtools\ctloptions.hxx %_DEST%\inc%_EXT%\svtools\ctloptions.hxx
+..\inc\svtools\languageoptions.hxx %_DEST%\inc%_EXT%\svtools\languageoptions.hxx
+..\inc\svtools\sourceviewconfig.hxx %_DEST%\inc%_EXT%\svtools\sourceviewconfig.hxx
+..\inc\svtools\colorcfg.hxx %_DEST%\inc%_EXT%\svtools\colorcfg.hxx
+
+..\inc\lngmisc.hxx %_DEST%\inc%_EXT%\svtools\lngmisc.hxx
+..\inc\svtools\lingucfg.hxx %_DEST%\inc%_EXT%\svtools\lingucfg.hxx
+..\inc\linguprops.hxx %_DEST%\inc%_EXT%\svtools\linguprops.hxx
+..\inc\searchopt.hxx %_DEST%\inc%_EXT%\svtools\searchopt.hxx
+
+..\inc\PasswordHelper.hxx %_DEST%\inc%_EXT%\svtools\PasswordHelper.hxx
+
+..\inc\svtools\syslocale.hxx %_DEST%\inc%_EXT%\svtools\syslocale.hxx
+
+..\inc\unoimap.hxx %_DEST%\inc%_EXT%\svtools\unoimap.hxx
+..\inc\unoevent.hxx %_DEST%\inc%_EXT%\svtools\unoevent.hxx
+
+..\inc\svtools\stringtransfer.hxx %_DEST%\inc%_EXT%\svtools\stringtransfer.hxx
+
+..\inc\ivctrl.hxx %_DEST%\inc%_EXT%\svtools\ivctrl.hxx
+..\inc\fileview.hxx %_DEST%\inc%_EXT%\svtools\fileview.hxx
+..\inc\templdlg.hxx %_DEST%\inc%_EXT%\svtools\templdlg.hxx
+..\inc\asynclink.hxx %_DEST%\inc%_EXT%\svtools\asynclink.hxx
+..\inc\svtools\inettbc.hxx %_DEST%\inc%_EXT%\svtools\inettbc.hxx
+..\inc\svtools\urlfilter.hxx %_DEST%\inc%_EXT%\svtools\urlfilter.hxx
+
+..\inc\controldims.hrc %_DEST%\inc%_EXT%\svtools\controldims.hrc
+
+..\inc\svtools\helpid.hrc %_DEST%\inc%_EXT%\svtools\helpid.hrc
+..\inc\svtools\insdlg.hxx %_DEST%\inc%_EXT%\svtools\insdlg.hxx
+..\inc\soerr.hxx %_DEST%\inc%_EXT%\svtools\soerr.hxx
+..\inc\sores.hxx %_DEST%\inc%_EXT%\svtools\sores.hxx
+
+..\inc\textwindowaccessibility.hxx %_DEST%\inc%_EXT%\svtools\textwindowaccessibility.hxx
+
+..\inc\fontsubstconfig.hxx %_DEST%\inc%_EXT%\svtools\fontsubstconfig.hxx
+..\inc\apearcfg.hxx %_DEST%\inc%_EXT%\svtools\apearcfg.hxx
+..\inc\fltrcfg.hxx %_DEST%\inc%_EXT%\svtools\fltrcfg.hxx
+..\inc\misccfg.hxx %_DEST%\inc%_EXT%\svtools\misccfg.hxx
+..\inc\acceleratorexecute.hxx %_DEST%\inc%_EXT%\svtools\acceleratorexecute.hxx
+
+..\inc\QueryFolderName.hxx %_DEST%\inc%_EXT%\svtools\QueryFolderName.hxx
+..\inc\DocumentInfoPreview.hxx %_DEST%\inc%_EXT%\svtools\DocumentInfoPreview.hxx
+..\inc\svtools\javacontext.hxx %_DEST%\inc%_EXT%\svtools\javacontext.hxx
+..\inc\svtools\javainteractionhandler.hxx %_DEST%\inc%_EXT%\svtools\javainteractionhandler.hxx
+..\inc\dialogclosedlistener.hxx %_DEST%\inc%_EXT%\svtools\dialogclosedlistener.hxx
+..\inc\svtools\options.hxx %_DEST%\inc%_EXT%\svtools\options.hxx
+..\inc\contextmenuhelper.hxx %_DEST%\inc%_EXT%\svtools\contextmenuhelper.hxx
+..\inc\extcolorcfg.hxx %_DEST%\inc%_EXT%\svtools\extcolorcfg.hxx
+
+..\inc\svtools\chartprettypainter.hxx %_DEST%\inc%_EXT%\svtools\chartprettypainter.hxx
+..\inc\svtools\extensionlistbox.hxx %_DEST%\inc%_EXT%\svtools\extensionlistbox.hxx
+>>>>>>> other
 
 dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"