diff options
author | Mathias Bauer <mba@openoffice.org> | 2009-10-08 18:23:23 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2009-10-08 18:23:23 +0200 |
commit | 62c0e0c6b18e5e7a9d0ce9d6c53f4c3b1ba5204e (patch) | |
tree | 7ec46721150f49bf875fad8b1bfa2244bfe6737a /svtools | |
parent | 80a5eff607808252c7fa7024793d445191d928a5 (diff) |
#i103496#: make svtools buildable
Diffstat (limited to 'svtools')
40 files changed, 106 insertions, 810 deletions
diff --git a/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx index 19eddb75bf35..6b01ad6079e5 100644 --- a/svtools/inc/svtools/menuoptions.hxx +++ b/svtools/inc/svtools/menuoptions.hxx @@ -34,7 +34,7 @@ // includes //_________________________________________________________________________________________________________________ -#include "svtools/svldllapi.h" +#include "svtools/svtdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> #include <unotools/options.hxx> @@ -67,7 +67,7 @@ class SvtMenuOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SVL_DLLPUBLIC SvtMenuOptions: public utl::detail::Options +class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- // public methods @@ -148,7 +148,7 @@ class SVL_DLLPUBLIC SvtMenuOptions: public utl::detail::Options @onerror - *//*-*****************************************************************************************************/ - SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); + SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- // private member diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx index 120cccfa4232..18ce9c65e897 100644 --- a/svtools/inc/svtools/optionsdrawinglayer.hxx +++ b/svtools/inc/svtools/optionsdrawinglayer.hxx @@ -35,7 +35,7 @@ // includes //_________________________________________________________________________________________________________________ -#include "svtools/svldllapi.h" +#include "svtools/svtdllapi.h" #include <sal/types.h> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> @@ -68,7 +68,7 @@ class SvtOptionsDrawinglayer_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SVL_DLLPUBLIC SvtOptionsDrawinglayer +class SVT_DLLPUBLIC SvtOptionsDrawinglayer { //------------------------------------------------------------------------------------------------------------- // public methods @@ -217,7 +217,7 @@ class SVL_DLLPUBLIC SvtOptionsDrawinglayer @onerror - *//*-*****************************************************************************************************/ - SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); + SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- // private member diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index c929faad3d13..b1cc8136ef68 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -32,34 +32,22 @@ #define _SVTOOLS_SVTDATA_HXX #include <tools/resid.hxx> -#include <tools/simplerm.hxx> +#include <com/sun/star/lang/Locale.hpp> class ResMgr; class SfxItemDesruptorList_Impl; -class SfxItemPool; -class Twain; //============================================================================ class ImpSvtData { public: - Twain * pTwain; - const SfxItemPool * pStoringPool; SfxItemDesruptorList_Impl * pItemDesruptList; - ResMgr * pResMgr; ResMgr * pPatchResMgr; - void* m_pThreadsafeRMs; - // one SimpleResMgr for each language for which a resource was requested - // (When using the 'non-simple' resmgr, the first request for any language wins, any - // further request for any other language supply the resmgr of the first call. - // For the simple resmgr we have a mgr for each language ever requested). - private: ImpSvtData(): - pTwain(0), pStoringPool(0), pItemDesruptList(0), pResMgr(0), - pPatchResMgr(NULL), m_pThreadsafeRMs(NULL) + pItemDesruptList(0), pResMgr(0), pPatchResMgr(0) {} ~ImpSvtData(); @@ -67,13 +55,9 @@ private: public: ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale); ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL! - ResMgr * GetPatchResMgr(); ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale); - - SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale); - static ImpSvtData & GetSvtData(); }; @@ -100,18 +84,5 @@ public: // VCL dependant, only available in SVT, not in SVL! }; -//============================================================================ -class SvtSimpleResId -{ - String m_sValue; - -public: - SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvtData::GetSvtData().GetSimpleRM(aLocale)->ReadString(nId)) { }; - - operator String () const { return m_sValue; } -}; - - - #endif // _SVTOOLS_SVTDATA_HXX diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index a60199740561..5a67b9414181 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,55 +1,28 @@ -st svtools : l10n offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL -st svtools usr1 - all st_mkout NULL -st svtools\inc nmake - all st_inc NULL -st svtools\inc\sane get - all st_incsa NULL -st svtools\prj get - all st_prj NULL -st svtools\res get - all st_res NULL -st svtools\win\inc get - all st_winc NULL -st svtools\win\res get - all st_wres NULL -st svtools\os2\inc get - all st_oinc NULL -st svtools\mac\inc get - all st_minc NULL -st svtools\unx\inc get - all st_uinc NULL -st svtools\bmpmaker nmake - all st_bmp st_inc NULL -st svtools\source\memtools nmake - all st_mem st_inc NULL -st svtools\source\numbers nmake - all st_num st_inc NULL -st svtools\source\notify nmake - all st_not st_inc NULL -st svtools\source\config nmake - all st_conf st_inc NULL -st svtools\unx\source\svdde nmake - u st_usdde st_inc NULL -st svtools\unx\source\svdde nmake - p st_psdde st_inc NULL -st svtools\mac\source\svdde nmake - m st_msdde st_inc NULL -st svtools\mac\source\misc nmake - m st_msc st_inc NULL -st svtools\source\control nmake - all st_ctl st_inc NULL -st svtools\source\filerec nmake - all st_file st_inc NULL -st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL -st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL -st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL -st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL -st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL -st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL +st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL +st svtools usr1 - all st_mkout NULL +st svtools\inc nmake - all st_inc NULL +st svtools\bmpmaker nmake - all st_bmp st_inc NULL st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL -st svtools\source\urlobj nmake - all st__url st_inc NULL -st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL -st svtools\source\misc1 nmake - all st__misc1 st_inc NULL +st svtools\source\config nmake - all st_conf st_inc NULL st svtools\source\contnr nmake - all st__ctr st_inc NULL -st svtools\source\svdde nmake - all st__dde st_inc NULL -st svtools\source\items nmake - all st__item st_inc NULL -st svtools\source\items1 nmake - all st__item1 st_inc NULL -st svtools\source\undo nmake - all st_undo st_inc NULL -st svtools\source\plugapp nmake - all st_papp st_inc NULL +st svtools\source\control nmake - all st_ctl st_inc NULL st svtools\source\dialogs nmake - all st_dial st_inc NULL -st svtools\source\edit nmake - all st_edit st_inc NULL -st svtools\source\table nmake - all st_table st_inc NULL -st svtools\source\uno nmake - all st_uno st_inc NULL -st svtools\source\svrtf nmake - all st_rtf st_inc NULL -st svtools\source\svsql nmake - all st_sql st_inc NULL +st svtools\source\edit nmake - all st_edit st_inc NULL +st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL +st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL +st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL +st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL +st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL +st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL +st svtools\source\java nmake - all st_svtjava st_inc NULL +st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL +st svtools\source\plugapp nmake - all st_papp st_inc NULL st svtools\source\svhtml nmake - all st_html st_inc NULL -st svtools\source\syslocale nmake - all st_sysloc st_inc NULL -st svtools\source\filepicker nmake - all st_filepick st_inc NULL -st svtools\util nmake - all st_util st__brw st__ctr st__dde st__item st__item1 st__misc st__misc1 st__url st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_psdde.p st_msdde.m st_msc.m st_undo st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_sysloc st_filepick st_not st_conf st_mem st_num st_svtjava NULL -st svtools\source\fsstor nmake - all st_fsstor st_inc NULL +st svtools\source\svrtf nmake - all st_rtf st_inc NULL +st svtools\source\table nmake - all st_table st_inc NULL +st svtools\source\uno nmake - all st_uno st_inc NULL +st svtools\source\urlobj nmake - all st__url st_inc NULL +st svtools\util nmake - all st_util st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL -st svtools\source\passwordcontainer nmake - all st_passcont st_inc NULL st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL -st svtools\uno nmake - all st_svtuno st_util st_inc NULL -st svtools\source\java nmake - all st_svtjava st_inc NULL st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst index a3a7679f8aea..0a3ccd8a9819 100644 --- a/svtools/prj/d.lst +++ b/svtools/prj/d.lst @@ -5,11 +5,8 @@ mkdir: %_DEST%\inc%_EXT%\svtools ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid ..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs ..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid -..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib ..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib ..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib -..\%__SRC%\bin\dllver.exe %_DEST%\bin%_EXT%\dllver.exe -..\%__SRC%\bin\dllver %_DEST%\bin%_EXT%\dllver ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.* @@ -28,104 +25,9 @@ mkdir: %_DEST%\inc%_EXT%\svtools ..\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\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\broadcast.hxx %_DEST%\inc%_EXT%\svtools\broadcast.hxx -..\inc\calendar.hxx %_DEST%\inc%_EXT%\svtools\calendar.hxx -..\inc\cntnrsrt.hxx %_DEST%\inc%_EXT%\svtools\cntnrsrt.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\itemdel.hxx %_DEST%\inc%_EXT%\svtools\itemdel.hxx -..\inc\wallitem.hxx %_DEST%\inc%_EXT%\svtools\wallitem.hxx -..\inc\stylepool.hxx %_DEST%\inc%_EXT%\svtools\stylepool.hxx -..\inc\dialogcontrolling.hxx %_DEST%\inc%_EXT%\svtools\dialogcontrolling.hxx -..\inc\filedlg.hxx %_DEST%\inc%_EXT%\svtools\filedlg.hxx -..\inc\fltdefs.hxx %_DEST%\inc%_EXT%\svtools\fltdefs.hxx -..\inc\imgdef.hxx %_DEST%\inc%_EXT%\svtools\imgdef.hxx -..\inc\inetdef.hxx %_DEST%\inc%_EXT%\svtools\inetdef.hxx -..\inc\inetmsg.hxx %_DEST%\inc%_EXT%\svtools\inetmsg.hxx -..\inc\inetstrm.hxx %_DEST%\inc%_EXT%\svtools\inetstrm.hxx -..\inc\listener.hxx %_DEST%\inc%_EXT%\svtools\listener.hxx -..\inc\listeneriter.hxx %_DEST%\inc%_EXT%\svtools\listeneriter.hxx -..\inc\memberid.hrc %_DEST%\inc%_EXT%\svtools\memberid.hrc -..\inc\prgsbar.hxx %_DEST%\inc%_EXT%\svtools\prgsbar.hxx -..\inc\poolcach.hxx %_DEST%\inc%_EXT%\svtools\poolcach.hxx -..\inc\ruler.hxx %_DEST%\inc%_EXT%\svtools\ruler.hxx -..\inc\scrwin.hxx %_DEST%\inc%_EXT%\svtools\scrwin.hxx -..\inc\scriptedtext.hxx %_DEST%\inc%_EXT%\svtools\scriptedtext.hxx -..\inc\tabbar.hxx %_DEST%\inc%_EXT%\svtools\tabbar.hxx -..\inc\taskbar.hxx %_DEST%\inc%_EXT%\svtools\taskbar.hxx -..\inc\whiter.hxx %_DEST%\inc%_EXT%\svtools\whiter.hxx -..\inc\stdmenu.hxx %_DEST%\inc%_EXT%\svtools\stdmenu.hxx -..\inc\tooltiplbox.hxx %_DEST%\inc%_EXT%\svtools\tooltiplbox.hxx -..\inc\txtattr.hxx %_DEST%\inc%_EXT%\svtools\txtattr.hxx -..\inc\sychconv.hxx %_DEST%\inc%_EXT%\svtools\sychconv.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\nfsymbol.hxx %_DEST%\inc%_EXT%\svtools\nfsymbol.hxx -..\inc\numuno.hxx %_DEST%\inc%_EXT%\svtools\numuno.hxx -..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx -..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.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\framestatuslistener.hxx %_DEST%\inc%_EXT%\svtools\framestatuslistener.hxx -..\inc\statusbarcontroller.hxx %_DEST%\inc%_EXT%\svtools\statusbarcontroller.hxx -..\inc\htmltokn.h %_DEST%\inc%_EXT%\svtools\htmltokn.h -..\inc\htmlkywd.hxx %_DEST%\inc%_EXT%\svtools\htmlkywd.hxx -..\source\svrtf\rtfout.hxx %_DEST%\inc%_EXT%\svtools\rtfout.hxx -..\source\svrtf\rtftoken.h %_DEST%\inc%_EXT%\svtools\rtftoken.h -..\source\svrtf\rtfkeywd.hxx %_DEST%\inc%_EXT%\svtools\rtfkeywd.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\sectctr.hxx %_DEST%\inc%_EXT%\svtools\sectctr.hxx -..\inc\privsplt.hxx %_DEST%\inc%_EXT%\svtools\privsplt.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\sfxecode.hxx %_DEST%\inc%_EXT%\svtools\sfxecode.hxx -..\source\dialogs\filedlg2.hrc %_DEST%\inc%_EXT%\svtools\filedlg2.hrc -..\inc\xmlement.hxx %_DEST%\inc%_EXT%\svtools\xmlement.hxx -..\inc\urihelper.hxx %_DEST%\inc%_EXT%\svtools\urihelper.hxx -..\inc\reginfo.hxx %_DEST%\inc%_EXT%\svtools\reginfo.hxx -..\inc\fstathelper.hxx %_DEST%\inc%_EXT%\svtools\fstathelper.hxx -..\inc\localresaccess.hxx %_DEST%\inc%_EXT%\svtools\localresaccess.hxx -..\inc\roadmap.hxx %_DEST%\inc%_EXT%\svtools\roadmap.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\lngmisc.hxx %_DEST%\inc%_EXT%\svtools\lngmisc.hxx -..\inc\PasswordHelper.hxx %_DEST%\inc%_EXT%\svtools\PasswordHelper.hxx -..\inc\unoimap.hxx %_DEST%\inc%_EXT%\svtools\unoimap.hxx -..\inc\unoevent.hxx %_DEST%\inc%_EXT%\svtools\unoevent.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\controldims.hrc %_DEST%\inc%_EXT%\svtools\controldims.hrc -..\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\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\dialogclosedlistener.hxx %_DEST%\inc%_EXT%\svtools\dialogclosedlistener.hxx -..\inc\contextmenuhelper.hxx %_DEST%\inc%_EXT%\svtools\contextmenuhelper.hxx -..\inc\extcolorcfg.hxx %_DEST%\inc%_EXT%\svtools\extcolorcfg.hxx +..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx +..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h +..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi" diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index bbe9c65ede9e..147d0fea5c59 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - #include <svtools/accessibilityoptions.hxx> #include "configitems/accessibilityoptions_const.hxx" diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 35a07a715dd5..ccfc402ac221 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - #include "apearcfg.hxx" #include "com/sun/star/uno/Any.hxx" diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 0c39fde11390..f600be830b41 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - #include <svtools/colorcfg.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 4610a1571baf..66dfd8af1ebb 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -27,11 +27,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svtools.hxx" #include "extcolorcfg.hxx" #include <com/sun/star/uno/Any.hxx> diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 8fe799dec67a..4d1c9b7db5c5 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - #include "fontsubstconfig.hxx" #include <svtools/svarray.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 0ca09c176072..16982a695e11 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - #include <svtools/helpopt.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index d0e5b30007f9..759fabbee686 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - #include "itemholder2.hxx" //----------------------------------------------- @@ -45,16 +40,11 @@ #include <svtools/accessibilityoptions.hxx> #include <apearcfg.hxx> -#include <svtools/cjkoptions.hxx> #include <svtools/menuoptions.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/ctloptions.hxx> #include <fontsubstconfig.hxx> #include <svtools/helpopt.hxx> -#include <svtools/languageoptions.hxx> -#include <misccfg.hxx> #include <svtools/printoptions.hxx> -#include <svtools/syslocaleoptions.hxx> #include <unotools/options.hxx> #include <svtools/miscopt.hxx> @@ -177,18 +167,10 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) // no ref count rItem.pItem = new SvtTabAppearanceCfg(); break; - case E_CJKOPTIONS : - rItem.pItem = new SvtCJKOptions(); - break; - case E_COLORCFG : rItem.pItem = new ::svtools::ColorConfig(); break; - case E_CTLOPTIONS : - rItem.pItem = new SvtCTLOptions(); - break; - case E_FONTSUBSTCONFIG : // no ref count rItem.pItem = new SvtFontSubstConfig(); break; @@ -197,14 +179,6 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) rItem.pItem = new SvtHelpOptions(); break; - case E_LANGUAGEOPTIONS : -// capsulate CTL and CJL options ! rItem.pItem = new SvtLanguageOptions(); - break; - - case E_MISCCFG : -// no ref count rItem.pItem = new SfxMiscCfg(); - break; - case E_MENUOPTIONS : rItem.pItem = new SvtMenuOptions(); break; @@ -217,10 +191,6 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) rItem.pItem = new SvtPrintFileOptions(); break; - case E_SYSLOCALEOPTIONS : - rItem.pItem = new SvtSysLocaleOptions(); - break; - case E_MISCOPTIONS : rItem.pItem = new SvtMiscOptions(); break; diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk index d3f2615776da..9de32bd9e43d 100644 --- a/svtools/source/config/makefile.mk +++ b/svtools/source/config/makefile.mk @@ -38,27 +38,22 @@ ENABLE_EXCEPTIONS := TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svl.pmk +.INCLUDE : $(PRJ)$/util$/svt.pmk # --- Files -------------------------------------------------------- SLOFILES= \ - $(SLO)$/accessibilityoptions.obj \ - $(SLO)$/apearcfg.obj \ - $(SLO)$/cjkoptions.obj \ + $(SLO)$/accessibilityoptions.obj \ + $(SLO)$/apearcfg.obj \ $(SLO)$/colorcfg.obj \ - $(SLO)$/ctloptions.obj \ $(SLO)$/extcolorcfg.obj \ - $(SLO)$/fontsubstconfig.obj \ + $(SLO)$/fontsubstconfig.obj \ $(SLO)$/helpopt.obj \ - $(SLO)$/itemholder2.obj \ - $(SLO)$/languageoptions.obj \ - $(SLO)$/menuoptions.obj \ - $(SLO)$/misccfg.obj \ + $(SLO)$/itemholder2.obj \ + $(SLO)$/menuoptions.obj \ $(SLO)$/miscopt.obj \ - $(SLO)$/optionsdrawinglayer.obj \ - $(SLO)$/printoptions.obj \ - $(SLO)$/syslocaleoptions.obj + $(SLO)$/optionsdrawinglayer.obj \ + $(SLO)$/printoptions.obj # --- Targets ------------------------------------------------------ diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 7a6dc4281da6..edf5b9e7c40c 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -33,10 +33,6 @@ //_________________________________________________________________________________________________________________ // includes //_________________________________________________________________________________________________________________ -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION #include <svtools/miscopt.hxx> #include <unotools/configmgr.hxx> diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index dcaa3b7d1bb3..9627a2ce10d9 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - //_________________________________________________________________________________________________________________ // includes //_________________________________________________________________________________________________________________ diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index 936f8b3e25c5..3ba69e826e1c 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -32,7 +32,7 @@ #include "precompiled_svtools.hxx" #include <svtools/fileurlbox.hxx> #include <osl/file.h> -#include "filenotation.hxx" +#include "svtools/filenotation.hxx" //......................................................................... namespace svt diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index d5e7fbaa5cd4..89f4a988aec2 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -71,7 +71,7 @@ #include <svtools/stritem.hxx> #include <svtools/cancel.hxx> #include <svtools/itemset.hxx> -#include "urihelper.hxx" +#include "svtools/urihelper.hxx" #include <unotools/pathoptions.hxx> #define _SVSTDARR_STRINGSDTOR diff --git a/svtools/source/control/makefile.mk b/svtools/source/control/makefile.mk index 10bb6beb50e4..eecf983ab756 100644 --- a/svtools/source/control/makefile.mk +++ b/svtools/source/control/makefile.mk @@ -77,7 +77,6 @@ SLOFILES=\ $(SLO)$/calendar.obj \ $(SLO)$/filectrl.obj \ $(SLO)$/scrwin.obj \ - $(SLO)$/reginfo.obj \ $(SLO)$/collatorres.obj \ $(SLO)$/indexentryres.obj \ $(SLO)$/hyperlabel.obj \ diff --git a/svtools/source/control/reginfo.cxx b/svtools/source/control/reginfo.cxx deleted file mode 100644 index 24daba5e6123..000000000000 --- a/svtools/source/control/reginfo.cxx +++ /dev/null @@ -1,375 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: reginfo.cxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#include "reginfo.hxx" -#include <tools/debug.hxx> -#include <osl/thread.h> - -#define MAXREGVALUE 200 - -// ***************************************************************************** -#if defined(WIN) || defined(WNT) - -#include <tools/svwin.h> - -#define DBG_HDL DBG_ASSERT(pImp->bValidGroup, "Keine Gruppe gesetzt"); \ - if( !pImp->bValidGroup ) return - -struct RegInfo_Impl -{ - HKEY aGroupHdl; - BOOL bValidGroup; -}; - -RegInfo::RegInfo() -{ - pImp=new RegInfo_Impl; - pImp->bValidGroup = FALSE; -} - -RegInfo::~RegInfo() -{ - if(pImp->bValidGroup) - RegCloseKey( pImp->aGroupHdl ); - delete pImp; -} - -String RegInfo::GetKeyName( USHORT nKey ) const -{ - DBG_HDL String::EmptyString(); - char aBuffer[MAXREGVALUE]; - RegEnumKey( pImp->aGroupHdl, nKey, aBuffer, MAXREGVALUE ); - return String( UniString::CreateFromAscii(aBuffer) ); -} - -USHORT RegInfo::GetKeyCount() const -{ - DBG_HDL 0; -#ifdef WNT - DWORD nKeys; - DWORD Dum1=10, Dum2, Dum3, Dum4, Dum5, Dum6, Dum7; - char s[10]; - FILETIME aDumFileTime; - RegQueryInfoKey( pImp->aGroupHdl, s, &Dum1, 0, &nKeys, &Dum2, &Dum3, - &Dum4, &Dum5, &Dum6, &Dum7, &aDumFileTime ); - return (USHORT) nKeys; -#else - char aBuffer[MAXREGVALUE]; - USHORT n=0; - while(RegEnumKey( - pImp->aGroupHdl, n, aBuffer, MAXREGVALUE) == ERROR_SUCCESS) - n++; - return n; -#endif -} - -inline String MakeAppGroupString_Impl( const String &rGroup ) -{ - String aGroup( UniString::CreateFromAscii("SvAppGroups\\") ); - aGroup+=rGroup; - return aGroup; -} - -void RegInfo::SetAppGroup( const String& rGroup ) -{ - aCurrentGroup = MakeAppGroupString_Impl(rGroup); - if( pImp->bValidGroup ) - { - RegCloseKey( pImp->aGroupHdl ); - pImp->bValidGroup = FALSE; - } - ByteString aBStr( aCurrentGroup, osl_getThreadTextEncoding() ); - RegCreateKey( HKEY_CLASSES_ROOT, aBStr.GetBuffer(), &pImp->aGroupHdl ); - pImp->bValidGroup = TRUE; -} - -void RegInfo::DeleteAppGroup( const String &rGroup ) -{ - String aOldGroup = aCurrentGroup; - SetAppGroup( rGroup ); - DBG_HDL; - USHORT nMax = GetKeyCount(); - for( USHORT n = nMax; n--; ) - { - String aKey( GetKeyName( n )); - DeleteKey( aKey ); - } - RegCloseKey( pImp->aGroupHdl ); - - ByteString aBStr( rGroup, osl_getThreadTextEncoding() ); - RegDeleteKey( HKEY_CLASSES_ROOT, aBStr.GetBuffer() ); - pImp->bValidGroup = FALSE; - if( rGroup != aOldGroup ) - SetAppGroup( aOldGroup ); -} - -BOOL ReadKey_Impl( const String& rKey, - HKEY aHdl, String& rResult ) -{ - char s[MAXREGVALUE]; - LONG aLen=MAXREGVALUE; - - ByteString aBStr( rKey, osl_getThreadTextEncoding() ); - LONG nRes = RegQueryValue( aHdl, aBStr.GetBuffer(), s, &aLen); - if(nRes == ERROR_SUCCESS) - { - rResult = UniString::CreateFromAscii(s); - return TRUE; - } - else - return FALSE; -} - -String RegInfo::ReadKey( const String& rKey ) const -{ - DBG_HDL String::EmptyString(); - String aRes; - if(ReadKey_Impl( rKey, pImp->aGroupHdl, aRes)) - return aRes; - else - return String::EmptyString(); -} - -String RegInfo::ReadKey( const String& rKey, const String &rDefault ) const -{ - DBG_HDL String::EmptyString(); - String aRes; - if(ReadKey_Impl( rKey, pImp->aGroupHdl, aRes)) - return aRes; - else - return rDefault; -} - -void RegInfo::WriteKey( const String& rKey, const String& rValue ) -{ - DBG_HDL; - ByteString aBStr( rKey, osl_getThreadTextEncoding() ); - ByteString aBStr1( rValue, osl_getThreadTextEncoding() ); - RegSetValue( pImp->aGroupHdl, aBStr.GetBuffer(), REG_SZ, aBStr1.GetBuffer(), 0); -} - - -void RegInfo::DeleteKey( const String& rKey ) -{ - DBG_HDL; - ByteString aBStr( rKey, osl_getThreadTextEncoding() ); - RegDeleteKey( pImp->aGroupHdl, aBStr.GetBuffer() ); -} - -// ***************************************************************************** -#elif defined(OS2) - -#define INCL_WINSHELLDATA -#include <svpm.h> - -struct RegInfo_Impl -{ - char *pKeyList; - String aCurrentApp; - void BuildKeyList( const String &rGroup ); -}; - -void RegInfo_Impl::BuildKeyList( const String &rGroup ) -{ - ByteString aBStr( rGroup, osl_getThreadTextEncoding() ); - USHORT nLen = 0; - do - { - nLen+=1000; - delete[] pKeyList; - pKeyList = new char[nLen]; - *(int *)pKeyList = 0; - } - while( PrfQueryProfileString( - HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), - 0, 0, pKeyList, nLen) == nLen); -} - - -RegInfo::RegInfo() -{ - pImp=new RegInfo_Impl; - pImp->pKeyList = 0; -} - -RegInfo::~RegInfo() -{ - delete[] pImp->pKeyList; - delete pImp; -} - -inline String MakeAppGroupString_Impl( const String &rGroup ) -{ - String aGroup(UniString::CreateFromAscii("SvAppGroups:")); - aGroup+=rGroup; - return aGroup; -} - -String RegInfo::GetKeyName( USHORT nKey ) const -{ - if( !pImp->pKeyList ) - pImp->BuildKeyList(pImp->aCurrentApp); - - const char *pc=pImp->pKeyList; - for( USHORT n=0; n<nKey; n++ ) - while(*pc++); - - return String(UniString::CreateFromAscii(pc)); -} - -USHORT RegInfo::GetKeyCount() const -{ - if( !pImp->pKeyList ) - pImp->BuildKeyList( pImp->aCurrentApp); - - const char *pc=pImp->pKeyList; - USHORT nRet=0; - while(*pc) - { - while(*pc++); - nRet++; - } - return nRet; -} - -void RegInfo::SetAppGroup( const String& rGroup ) -{ - delete[] pImp->pKeyList; - pImp->pKeyList = 0; - aCurrentGroup = rGroup; - pImp->aCurrentApp = MakeAppGroupString_Impl( rGroup ); -} - -void RegInfo::DeleteAppGroup( const String &rGroup ) -{ - ByteString aBStr( MakeAppGroupString_Impl( rGroup ), osl_getThreadTextEncoding() ); - PrfWriteProfileString( - HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), 0, 0); -} - - -String RegInfo::ReadKey( const String& rKey ) const -{ - ULONG ulBufferMax = MAXREGVALUE; - char *pBuffer= new char[MAXREGVALUE]; - ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() ); - ByteString aBStr1( rKey, osl_getThreadTextEncoding() ); - *pBuffer=0; - PrfQueryProfileData( - HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)aBStr1.GetBuffer(), pBuffer, &ulBufferMax); - String aRet(UniString::CreateFromAscii(pBuffer)); - delete[] pBuffer; - return aRet; -} - - -String RegInfo::ReadKey( const String& rKey, const String &rDefault ) const -{ - String aResult = ReadKey(rKey); - if (!aResult.Len()) - return rDefault; - else - return aResult; -} - - -void RegInfo::WriteKey( const String& rKey, const String& rValue ) -{ - ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() ); - ByteString aBStr1( rKey, osl_getThreadTextEncoding() ); - PrfWriteProfileData( - HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)aBStr1.GetBuffer(), (PVOID)rValue.GetBuffer(), rValue.Len()*2); -} - -void RegInfo::DeleteKey( const String& rKey ) -{ - ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() ); - ByteString aBStr1( rKey, osl_getThreadTextEncoding() ); - PrfWriteProfileString( - HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)rKey.GetBuffer(), 0); -} - -// ***************************************************************************** - -#else - -RegInfo::RegInfo() -{ -} - - -RegInfo::~RegInfo() -{ -} - -String RegInfo::GetKeyName( USHORT ) const -{ - return String::EmptyString(); -} - -USHORT RegInfo::GetKeyCount() const -{ - return 0; -} - -void RegInfo::SetAppGroup( const String& ) -{ - return ; -} - -void RegInfo::DeleteAppGroup( const String& ) -{ - return; -} - -String RegInfo::ReadKey( const String& ) const -{ - return String::EmptyString(); -} - -String RegInfo::ReadKey( const String&, const String& ) const -{ - return String::EmptyString(); -} - -void RegInfo::WriteKey( const String&, const String& ) -{ - return; -} - -void RegInfo::DeleteKey( const String& ) -{ - return; -} - -#endif diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 1252fc17a1d6..4ad0969dd732 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -31,12 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef SVTOOL_URLCONTROL_HXX #include <svtools/urlcontrol.hxx> -#endif -#ifndef SVTOOLS_FILENOTATION_HXX_ -#include "filenotation.hxx" -#endif +#include "svtools/filenotation.hxx" //......................................................................... namespace svt diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 14ede88482a6..ca7064e101fa 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -70,7 +70,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include "localresaccess.hxx" #ifndef SVTOOLS_FILENOTATION_HXX_ -#include "filenotation.hxx" +#include "svtools/filenotation.hxx" #endif #include <tools/urlobj.hxx> diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 68acffc62a74..5aeea754aef2 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -47,7 +47,7 @@ #include <svtools/printdlg.hxx> #include <svtools/svtdata.hxx> #include <filedlg.hxx> -#include "pickerhelper.hxx" +#include "svtools/pickerhelper.hxx" #ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> #endif diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index e0697a488287..c21bd70b3fd9 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -44,7 +44,7 @@ #include <tools/stream.hxx> #include <sot/formats.hxx> -#include <urlbmk.hxx> +#include <svtools/urlbmk.hxx> #ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_ #include <com/sun/star/i18n/XBreakIterator.hpp> diff --git a/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk index 2229f8f05546..ecdf48ba5671 100644 --- a/svtools/source/filter.vcl/filter/makefile.mk +++ b/svtools/source/filter.vcl/filter/makefile.mk @@ -40,6 +40,8 @@ LIBTARGET=NO .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/svt.pmk +SOLARINC+=-I../../inc + # --- Files -------------------------------------------------------- SRS1NAME=$(TARGET) diff --git a/svtools/source/filter.vcl/igif/makefile.mk b/svtools/source/filter.vcl/igif/makefile.mk index 0562813c00cc..49e2461bd7a8 100644 --- a/svtools/source/filter.vcl/igif/makefile.mk +++ b/svtools/source/filter.vcl/igif/makefile.mk @@ -38,6 +38,7 @@ TARGET=igif .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/svt.pmk +SOLARINC+=-I../../inc # --- Files -------------------------------------------------------- diff --git a/svtools/source/filter.vcl/ixbm/makefile.mk b/svtools/source/filter.vcl/ixbm/makefile.mk index 9c090e1de04a..41d6f7425474 100644 --- a/svtools/source/filter.vcl/ixbm/makefile.mk +++ b/svtools/source/filter.vcl/ixbm/makefile.mk @@ -38,6 +38,7 @@ TARGET=ixbm .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/svt.pmk +SOLARINC+=-I../../inc # --- Files -------------------------------------------------------- diff --git a/svtools/source/filter.vcl/ixpm/makefile.mk b/svtools/source/filter.vcl/ixpm/makefile.mk index 2e5cb851ebbf..10792f41ab3a 100644 --- a/svtools/source/filter.vcl/ixpm/makefile.mk +++ b/svtools/source/filter.vcl/ixpm/makefile.mk @@ -38,6 +38,7 @@ TARGET=ixpm .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/svt.pmk +SOLARINC+=-I../../inc # --- Files -------------------------------------------------------- diff --git a/svtools/source/filter.vcl/jpeg/makefile.mk b/svtools/source/filter.vcl/jpeg/makefile.mk index 86c9c89c8bf0..7a9b5fc509c9 100644 --- a/svtools/source/filter.vcl/jpeg/makefile.mk +++ b/svtools/source/filter.vcl/jpeg/makefile.mk @@ -43,6 +43,8 @@ TARGET=jpeg CFLAGS+=-DSYSTEM_JPEG .ENDIF +SOLARINC+=-I../../inc + # --- Files -------------------------------------------------------- SLOFILES= $(SLO)$/jpegc.obj \ diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 6bd1126f8082..ba21db8a8e76 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -58,6 +58,7 @@ #include <cppuhelper/implbase4.hxx> #include "vcl/svapp.hxx" #include <rtl/logfile.hxx> +#include <vos/mutex.hxx> using namespace com::sun::star; diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 314242063711..ddf6a7350772 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -58,6 +58,7 @@ #include <svtools/svtools.hrc> #include "imagemgr.hrc" #include <svtools/svtdata.hxx> +#include <vos/mutex.hxx> // globals ******************************************************************* diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 9fb60111094e..8ea4296d6db3 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -36,7 +36,7 @@ #include <vcl/mapmod.hxx> #include <vcl/window.hxx> -#include "urihelper.hxx" +#include "svtools/urihelper.hxx" #include <svtools/imap.hxx> #include <svtools/imapobj.hxx> #include <svtools/imapcirc.hxx> diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index b1e03a574188..dc18e1a9c24b 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -43,7 +43,7 @@ #endif #include <sot/formats.hxx> -#include "urihelper.hxx" +#include "svtools/urihelper.hxx" #include <svtools/imap.hxx> #include <svtools/imap.hxx> #include <svtools/imapobj.hxx> diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk index a23092e120da..77cf8a41a8bd 100644 --- a/svtools/source/misc/makefile.mk +++ b/svtools/source/misc/makefile.mk @@ -46,11 +46,9 @@ ENABLE_EXCEPTIONS := TRUE SRS1NAME=misc SRC1FILES=\ - config.src \ - iniman.src \ ehdl.src \ - imagemgr.src \ helpagent.src \ + imagemgr.src \ langtab.src SRS2NAME=ehdl @@ -59,33 +57,28 @@ SRC2FILES=\ SLOFILES=\ $(SLO)$/acceleratorexecute.obj \ + $(SLO)$/chartprettypainter.obj \ $(SLO)$/cliplistener.obj \ + $(SLO)$/dialogclosedlistener.obj\ + $(SLO)$/dialogcontrolling.obj \ + $(SLO)$/ehdl.obj \ $(SLO)$/embedhlp.obj \ $(SLO)$/embedtransfer.obj \ + $(SLO)$/helpagentwindow.obj \ $(SLO)$/imagemgr.obj \ $(SLO)$/imageresourceaccess.obj \ - $(SLO)$/templatefoldercache.obj \ - $(SLO)$/transfer.obj \ - $(SLO)$/transfer2.obj \ - $(SLO)$/stringtransfer.obj \ - $(SLO)$/urihelper.obj \ - $(SLO)$/svtaccessiblefactory.obj \ - $(SLO)$/ehdl.obj \ - $(SLO)$/flbytes.obj \ - $(SLO)$/helpagentwindow.obj \ $(SLO)$/imap.obj \ $(SLO)$/imap2.obj \ $(SLO)$/imap3.obj \ - $(SLO)$/ownlist.obj \ - $(SLO)$/vcldata.obj \ - $(SLO)$/restrictedpaths.obj \ - $(SLO)$/dialogclosedlistener.obj\ - $(SLO)$/dialogcontrolling.obj \ - $(SLO)$/chartprettypainter.obj \ - $(SLO)$/lockfilecommon.obj \ - $(SLO)$/sharecontrolfile.obj \ - $(SLO)$/documentlockfile.obj \ - $(SLO)$/langtab.obj + $(SLO)$/itemdel.obj \ + $(SLO)$/langtab.obj \ + $(SLO)$/stringtransfer.obj \ + $(SLO)$/svtaccessiblefactory.obj \ + $(SLO)$/svtdata.obj \ + $(SLO)$/templatefoldercache.obj \ + $(SLO)$/transfer.obj \ + $(SLO)$/transfer2.obj \ + $(SLO)$/wallitem.obj # --- Targets ------------------------------------------------------- diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 51247a628c0e..2bc1977e9197 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -36,17 +36,7 @@ #include <tools/shl.hxx> #include <vos/process.hxx> #include <svtools/svtdata.hxx> - -namespace unnamed_svtools_svtdata {} -using namespace unnamed_svtools_svtdata; - // unnamed namespaces don't work well yet - -//============================================================================ -namespace unnamed_svtools_svtdata { - -typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap; - -} +#include <vcl/svapp.hxx> //============================================================================ // @@ -57,11 +47,6 @@ typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap; ImpSvtData::~ImpSvtData() { delete pResMgr; - for (SimpleResMgrMap::iterator t - = static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->begin(); - t != static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->end(); ++t) - delete t->second; - delete static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs); } //============================================================================ @@ -74,22 +59,9 @@ ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale) return pResMgr; } -//============================================================================ -SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale) +ResMgr * ImpSvtData::GetResMgr() { - if (!m_pThreadsafeRMs) - m_pThreadsafeRMs = new SimpleResMgrMap; - rtl::OUString aISOcode = rLocale.Language; - aISOcode += rtl::OStringToOUString("-", RTL_TEXTENCODING_UTF8); - aISOcode += rLocale.Country; - - SimpleResMgr *& rResMgr - = (*static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs))[aISOcode]; - if (!rResMgr) - { - rResMgr = new SimpleResMgr(CREATEVERSIONRESMGR_NAME(svs), rLocale ); - } - return rResMgr; + return GetResMgr(Application::GetSettings().GetUILocale()); } ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale) @@ -101,6 +73,16 @@ ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocal return pPatchResMgr; } +ResMgr * ImpSvtData::GetPatchResMgr() +{ + return GetPatchResMgr(Application::GetSettings().GetUILocale()); +} + +SvpResId::SvpResId( USHORT nId ) : + ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() ) +{ +} + //============================================================================ // static ImpSvtData & ImpSvtData::GetSvtData() diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 0bcd00af40aa..e2cd8f803a04 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -76,7 +76,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include "urlbmk.hxx" +#include "svtools/urlbmk.hxx" #include "inetimg.hxx" #include <svtools/wmf.hxx> #include <svtools/imap.hxx> diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 8dcbbf9d93dc..eebf91ab57ff 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> #endif -#include "urlbmk.hxx" +#include "svtools/urlbmk.hxx" #include "inetimg.hxx" #include <svtools/imap.hxx> #include <svtools/transfer.hxx> diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 5b584a37059d..9783188e3b7c 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -44,7 +44,7 @@ #include <svtools/imaprect.hxx> #include <svtools/imapcirc.hxx> #include <svtools/imappoly.hxx> -#include "urihelper.hxx" +#include "svtools/urihelper.hxx" #ifndef RTL_CONSTASCII_STRINGPARAM #define RTL_CONSTASCII_STRINGPARAM( c ) c, sizeof(c)-1 diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk index 47eaf4f25749..d8438bd48ccf 100644 --- a/svtools/source/uno/makefile.mk +++ b/svtools/source/uno/makefile.mk @@ -46,7 +46,7 @@ SRS1NAME= uno SRC1FILES= unoifac2.src SLOFILES= \ - $(SLO)$/adrtempuno.obj \ + $(SLO)$/addrtempuno.obj \ $(SLO)$/contextmenuhelper.obj \ $(SLO)$/framestatuslistener.obj \ $(SLO)$/generictoolboxcontroller.obj \ diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 54cc448ff89e..cc367c5a0264 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -48,7 +48,7 @@ #include <toolkit/helper/convert.hxx> #include <toolkit/helper/property.hxx> #include <svtools/fmtfield.hxx> -#include <numuno.hxx> +#include <svtools/numuno.hxx> #include <calendar.hxx> #include <prgsbar.hxx> diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index fac8f654bfbe..51ea7a9fef31 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -35,7 +35,6 @@ PRJNAME=svtools TARGET=svtool RESTARGET=svt RESTARGETPATCH=svp -RESTARGETSIMPLE=svs GEN_HID=TRUE GEN_HID_OTHER=TRUE ENABLE_EXCEPTIONS=TRUE @@ -49,53 +48,33 @@ USE_LDUMP2=TRUE # --- general section ---------------------------------------------------- .IF "$(GUI)"!="UNX" -LIB3TARGET= $(LB)$/svtool.lib -LIB3FILES= $(LB)$/_svt.lib +LIB2TARGET= $(LB)$/svtool.lib +LIB2FILES= $(LB)$/_svt.lib .ENDIF -.IF "$(GUI)"!="UNX" -LIB4TARGET= $(LB)$/isvl.lib -LIB4FILES= $(LB)$/_isvl.lib -.ENDIF - -LIB7TARGET= $(SLB)$/svt.lib -LIB7FILES= \ - $(SLB)$/misc.lib \ - $(SLB)$/items.lib \ +LIB1TARGET= $(SLB)$/svt.lib +LIB1FILES= \ $(SLB)$/browse.lib \ + $(SLB)$/config.lib \ + $(SLB)$/svcontnr.lib \ $(SLB)$/ctrl.lib \ $(SLB)$/dialogs.lib \ $(SLB)$/edit.lib \ - $(SLB)$/unoiface.lib \ $(SLB)$/filter.lib \ + $(SLB)$/filter.uno.lib \ $(SLB)$/igif.lib \ $(SLB)$/jpeg.lib \ $(SLB)$/ixpm.lib \ $(SLB)$/ixbm.lib \ - $(SLB)$/numbers.lib \ - $(SLB)$/numbers.uno.lib \ $(SLB)$/wmf.lib \ - $(SLB)$/undo.lib \ - $(SLB)$/urlobj.lib \ + $(SLB)$/java.lib \ + $(SLB)$/misc.lib \ $(SLB)$/plugapp.lib \ - $(SLB)$/svcontnr.lib \ - $(SLB)$/syslocale.lib \ - $(SLB)$/svdde.lib \ $(SLB)$/svhtml.lib \ $(SLB)$/svrtf.lib \ - $(SLB)$/config.lib \ $(SLB)$/table.lib \ - $(SLB)$/java.lib - -LIB8TARGET= $(SLB)$/svl.lib -LIB8FILES= \ - $(SLB)$/filerec.lib \ - $(SLB)$/filepicker.lib \ - $(SLB)$/items1.lib \ - $(SLB)$/misc1.lib \ - $(SLB)$/notify.lib \ - $(SLB)$/svarray.lib \ - $(SLB)$/svsql.lib + $(SLB)$/unoiface.lib \ + $(SLB)$/urlobj.lib # generation of resourcen-lib ---------------------------------------- @@ -112,12 +91,6 @@ RESLIB1SRSFILES= \ $(SRS)$/browse.srs \ $(SRS)$/javaerror.srs -RESLIB2NAME= $(RESTARGETSIMPLE) -RESLIB2SRSFILES=\ - $(SRS)$/items1.srs \ - $(SRS)$/misc1.srs - - RESLIB3NAME= $(RESTARGETPATCH) RESLIB3SRSFILES= \ $(SRS)$/patchjavaerror.srs @@ -168,55 +141,16 @@ SHL1STDLIBS+= \ $(OLEAUT32LIB) .ENDIF # WNT -SHL1OBJS= \ - $(SLO)$/svtdata.obj - SHL1LIBS= \ $(SLB)$/svt.lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1DEPN=$(SHL2TARGETN) DEF1NAME= $(SHL1TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt DEFLIB1NAME =svt DEF1DES =SvTools -# --- svtools lite -------------------------------------------------- - -SHL2TARGET= svl$(DLLPOSTFIX) -SHL2IMPLIB= _isvl -SHL2USE_EXPORTS=name -#Do not link with VCL or any other library that links with VCL -SHL2STDLIBS= \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(VCLLIB) \ - $(SALLIB) - -.IF "$(GUI)"=="WNT" -SHL2STDLIBS+= \ - $(UWINAPILIB) \ - $(ADVAPI32LIB) \ - $(GDI32LIB) -.ENDIF # WNT - -SHL2LIBS= $(SLB)$/svl.lib - -SHL2DEF= $(MISC)$/$(SHL2TARGET).def - -DEF2NAME= $(SHL2TARGET) -DEF2DEPN= $(MISC)$/$(SHL2TARGET).flt $(SLB)$/svl.lib -DEFLIB2NAME=svl -DEF2DES =SvTools lite - # --- g2g application -------------------------------------------------- APP2TARGET = g2g @@ -240,19 +174,14 @@ APP2STDLIBS+= $(VCLLIB) \ # --- Targets ------------------------------------------------------ .IF "$(GUI)"=="UNX" -SVTTARGETS= $(LB)$/lib$(SHL2TARGET)$(DLLPOST) $(LB)$/lib$(SHL1TARGET)$(DLLPOST) +SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST) .ELSE -SVTTARGETS= $(LB)$/isvl.lib \ - $(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST) +SVTTARGETS= $(BIN)$/$(SHL1TARGET)$(DLLPOST) .ENDIF # just a quick fix - has to be cleaned up some day... .IF "$(L10N-framework)"=="" -ALL: $(SLB)$/svl.lib \ - $(SLB)$/svt.lib \ - $(MISC)$/$(SHL2TARGET).flt \ - $(MISC)$/$(SHL1TARGET).flt \ - $(MISC)$/$(SHL2TARGET).def \ +ALL: $(SLB)$/svt.lib \ $(MISC)$/$(SHL1TARGET).def \ $(SVTTARGETS) \ ALLTAR @@ -260,15 +189,4 @@ ALL: $(SLB)$/svl.lib \ .INCLUDE : target.mk -# --- Svtools-Control-Filter-Datei --- - -$(MISC)$/$(SHL1TARGET).flt: svt.flt - @echo ------------------------------ - @echo Making: $@ - $(TYPE) svt.flt >$@ - -$(MISC)$/$(SHL2TARGET).flt: svl.flt - @echo ------------------------------ - @echo Making: $@ - $(TYPE) svl.flt >$@ |