summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basebmp/test/basictest.cxx2
-rw-r--r--basebmp/test/bmpmasktest.cxx2
-rw-r--r--basebmp/test/bmptest.cxx2
-rw-r--r--basebmp/test/cliptest.cxx2
-rw-r--r--basebmp/test/filltest.cxx2
-rw-r--r--basebmp/test/linetest.cxx2
-rw-r--r--basebmp/test/makefile.mk17
-rw-r--r--basebmp/test/masktest.cxx2
-rw-r--r--basebmp/test/polytest.cxx2
-rw-r--r--basegfx/inc/basegfx/curve/b2dcubicbezier.hxx16
-rw-r--r--basegfx/inc/basegfx/matrix/b2dhommatrix.hxx10
-rw-r--r--basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx205
-rw-r--r--basegfx/inc/basegfx/polygon/b2dpolygon.hxx5
-rw-r--r--basegfx/inc/basegfx/polygon/b2dpolygontools.hxx61
-rw-r--r--basegfx/inc/basegfx/range/b1drange.hxx6
-rw-r--r--basegfx/inc/basegfx/range/b2drange.hxx9
-rw-r--r--basegfx/inc/basegfx/range/basicrange.hxx9
-rw-r--r--basegfx/source/curve/b2dcubicbezier.cxx60
-rw-r--r--basegfx/source/matrix/b2dhommatrix.cxx174
-rw-r--r--basegfx/source/matrix/b2dhommatrixtools.cxx333
-rw-r--r--basegfx/source/polygon/b2dlinegeometry.cxx9
-rw-r--r--basegfx/source/polygon/b2dpolygon.cxx50
-rw-r--r--basegfx/source/polygon/b2dpolygonclipper.cxx7
-rw-r--r--basegfx/source/polygon/b2dpolygoncutandtouch.cxx46
-rw-r--r--basegfx/source/polygon/b2dpolygontools.cxx324
-rw-r--r--basegfx/source/polygon/b2dsvgpolypolygon.cxx6
-rw-r--r--basegfx/source/polygon/b3dpolygontools.cxx167
-rw-r--r--basegfx/source/tools/gradienttools.cxx17
-rwxr-xr-xbasegfx/source/tools/unopolypolygon.cxx6
-rw-r--r--basegfx/test/basegfx1d.cxx2
-rw-r--r--basegfx/test/basegfx2d.cxx9
-rw-r--r--basegfx/test/basegfx3d.cxx2
-rw-r--r--basegfx/test/makefile.mk11
-rw-r--r--canvas/source/cairo/cairo_canvashelper.cxx50
-rw-r--r--canvas/source/cairo/cairo_canvashelper.hxx1
-rwxr-xr-xcanvas/source/directx/dx_canvashelper.cxx24
-rwxr-xr-xcanvas/source/directx/dx_canvashelper_texturefill.cxx4
-rwxr-xr-xcanvas/source/directx/dx_config.cxx3
-rw-r--r--canvas/source/directx/dx_config.hxx2
-rwxr-xr-xcanvas/source/directx/dx_impltools.cxx67
-rwxr-xr-xcanvas/source/directx/dx_impltools.hxx15
-rwxr-xr-xcanvas/source/directx/dx_linepolypolygon.cxx4
-rwxr-xr-xcanvas/source/directx/dx_linepolypolygon.hxx2
-rw-r--r--canvas/source/simplecanvas/simplecanvasimpl.cxx11
-rw-r--r--canvas/source/tools/canvastools.cxx11
-rw-r--r--canvas/source/tools/surface.cxx11
-rw-r--r--comphelper/inc/comphelper/servicedecl.hxx60
-rw-r--r--comphelper/qa/makefile.mk6
-rw-r--r--comphelper/qa/test_string.cxx2
-rw-r--r--comphelper/qa/test_weakbag.cxx2
-rw-r--r--comphelper/source/misc/comphelper_services.cxx2
-rw-r--r--comphelper/source/misc/documentiologring.cxx25
-rw-r--r--comphelper/source/misc/documentiologring.hxx11
-rw-r--r--comphelper/source/property/ChainablePropertySetInfo.cxx2
-rw-r--r--comphelper/source/property/MasterPropertySetInfo.cxx4
-rw-r--r--comphelper/source/property/propertysetinfo.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/bitmapaction.cxx19
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx46
-rw-r--r--cppcanvas/source/mtfrenderer/mtftools.cxx11
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx5
-rw-r--r--goodies/inc/chtuner.hxx2
-rw-r--r--goodies/inc/grfmgr.hxx2
-rw-r--r--goodies/inc/pch/precompiled_goodies.hxx8
-rw-r--r--goodies/source/filter.vcl/eos2met/eos2met.cxx6
-rw-r--r--goodies/source/filter.vcl/epict/epict.cxx124
-rw-r--r--goodies/source/filter.vcl/epict/makefile.mk2
-rw-r--r--goodies/source/filter.vcl/eps/eps.cxx61
-rw-r--r--goodies/source/filter.vcl/ios2met/ios2met.cxx2
-rw-r--r--goodies/source/graphic/grfcache.cxx18
-rw-r--r--goodies/source/graphic/grfmgr.cxx6
-rw-r--r--goodies/source/unographic/descriptor.cxx2
-rw-r--r--goodies/source/unographic/renderer.cxx2
-rw-r--r--i18npool/source/characterclassification/cclass_unicode_parser.cxx2
-rw-r--r--i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx15
-rw-r--r--i18npool/source/isolang/inwnt.cxx4
-rw-r--r--i18npool/source/isolang/mslangid.cxx2
-rw-r--r--i18npool/source/localedata/localedata.cxx11
-rw-r--r--i18npool/source/search/makefile.mk6
-rw-r--r--i18npool/source/search/textsearch.cxx1
-rw-r--r--i18npool/source/textconversion/genconv_dict.cxx12
-rw-r--r--o3tl/qa/makefile.mk3
-rw-r--r--o3tl/qa/test-cow_wrapper.cxx2
-rw-r--r--o3tl/qa/test-heap_ptr.cxx2
-rw-r--r--o3tl/qa/test-range.cxx2
-rw-r--r--padmin/source/adddlg.cxx2
-rw-r--r--padmin/source/cmddlg.cxx54
-rw-r--r--padmin/source/padialog.cxx2
-rw-r--r--rsc/inc/rsctools.hxx44
-rw-r--r--rsc/source/parser/rsclex.cxx2
-rw-r--r--rsc/source/parser/rsclex.hxx2
-rw-r--r--rsc/source/rsc/makefile.mk4
-rw-r--r--sax/inc/sax/tools/converter.hxx52
-rw-r--r--sax/source/expatwrap/attrlistimpl.cxx7
-rw-r--r--sax/source/expatwrap/sax_expat.cxx4
-rw-r--r--sax/source/fastparser/fastparser.hxx4
-rw-r--r--sax/source/tools/converter.cxx500
-rw-r--r--sax/test/sax/testsax.cxx13
-rw-r--r--svl/inc/PasswordHelper.hxx (renamed from svtools/inc/PasswordHelper.hxx)2
-rw-r--r--svl/inc/adrparse.hxx (renamed from svtools/inc/adrparse.hxx)2
-rw-r--r--svl/inc/broadcast.hxx (renamed from svtools/inc/broadcast.hxx)2
-rw-r--r--svl/inc/cntnrsrt.hxx (renamed from svtools/inc/cntnrsrt.hxx)0
-rw-r--r--svl/inc/cntwids.hrc (renamed from svtools/inc/cntwids.hrc)0
-rw-r--r--svl/inc/converter.hxx (renamed from svtools/source/svsql/converter.hxx)2
-rw-r--r--svl/inc/filenotation.hxx (renamed from svtools/inc/filenotation.hxx)2
-rw-r--r--svl/inc/folderrestriction.hxx (renamed from svtools/inc/folderrestriction.hxx)2
-rw-r--r--svl/inc/fstathelper.hxx (renamed from svtools/inc/fstathelper.hxx)2
-rw-r--r--svl/inc/inetdef.hxx (renamed from svtools/inc/inetdef.hxx)0
-rw-r--r--svl/inc/inetmsg.hxx (renamed from svtools/inc/inetmsg.hxx)0
-rw-r--r--svl/inc/inetstrm.hxx (renamed from svtools/inc/inetstrm.hxx)0
-rw-r--r--svl/inc/instrm.hxx (renamed from svtools/inc/instrm.hxx)2
-rw-r--r--svl/inc/listener.hxx (renamed from svtools/inc/listener.hxx)2
-rw-r--r--svl/inc/listeneriter.hxx (renamed from svtools/inc/listeneriter.hxx)2
-rw-r--r--svl/inc/lngmisc.hxx (renamed from svtools/inc/lngmisc.hxx)2
-rw-r--r--svl/inc/makefile.mk (renamed from svtools/source/syslocale/makefile.mk)22
-rw-r--r--svl/inc/memberid.hrc (renamed from svtools/inc/memberid.hrc)0
-rw-r--r--svl/inc/nfsymbol.hxx (renamed from svtools/inc/nfsymbol.hxx)0
-rw-r--r--svl/inc/numuno.hxx (renamed from svtools/inc/numuno.hxx)4
-rw-r--r--svl/inc/outstrm.hxx (renamed from svtools/inc/outstrm.hxx)2
-rw-r--r--svl/inc/pch/precompiled_svl.cxx32
-rw-r--r--svl/inc/pch/precompiled_svl.hxx435
-rw-r--r--svl/inc/pickerhelper.hxx (renamed from svtools/inc/pickerhelper.hxx)2
-rw-r--r--svl/inc/pickerhistory.hxx (renamed from svtools/inc/pickerhistory.hxx)2
-rw-r--r--svl/inc/pickerhistoryaccess.hxx (renamed from svtools/inc/pickerhistoryaccess.hxx)2
-rw-r--r--svl/inc/poolcach.hxx (renamed from svtools/inc/poolcach.hxx)4
-rw-r--r--svl/inc/strmadpt.hxx (renamed from svtools/inc/strmadpt.hxx)2
-rw-r--r--svl/inc/stylepool.hxx (renamed from svtools/inc/stylepool.hxx)2
-rw-r--r--svl/inc/svl/aeitem.hxx (renamed from svtools/inc/svtools/aeitem.hxx)8
-rw-r--r--svl/inc/svl/brdcst.hxx (renamed from svtools/inc/svtools/brdcst.hxx)4
-rw-r--r--svl/inc/svl/cancel.hxx (renamed from svtools/inc/svtools/cancel.hxx)8
-rw-r--r--svl/inc/svl/cenumitm.hxx (renamed from svtools/inc/svtools/cenumitm.hxx)4
-rw-r--r--svl/inc/svl/cintitem.hxx (renamed from svtools/inc/svtools/cintitem.hxx)4
-rw-r--r--svl/inc/svl/cjkoptions.hxx (renamed from svtools/inc/svtools/cjkoptions.hxx)6
-rw-r--r--svl/inc/svl/cnclhint.hxx (renamed from svtools/inc/svtools/cnclhint.hxx)4
-rw-r--r--svl/inc/svl/cntwall.hxx (renamed from svtools/inc/svtools/cntwall.hxx)4
-rw-r--r--svl/inc/svl/ctloptions.hxx (renamed from svtools/inc/svtools/ctloptions.hxx)13
-rw-r--r--svl/inc/svl/ctypeitm.hxx (renamed from svtools/inc/svtools/ctypeitm.hxx)4
-rw-r--r--svl/inc/svl/custritm.hxx (renamed from svtools/inc/svtools/custritm.hxx)4
-rw-r--r--svl/inc/svl/dateitem.hxx (renamed from svtools/inc/svtools/dateitem.hxx)2
-rw-r--r--svl/inc/svl/documentlockfile.hxx (renamed from svtools/inc/svtools/documentlockfile.hxx)6
-rw-r--r--svl/inc/svl/eitem.hxx (renamed from svtools/inc/svtools/eitem.hxx)8
-rw-r--r--svl/inc/svl/filerec.hxx (renamed from svtools/inc/svtools/filerec.hxx)4
-rw-r--r--svl/inc/svl/flagitem.hxx (renamed from svtools/inc/svtools/flagitem.hxx)8
-rw-r--r--svl/inc/svl/globalnameitem.hxx (renamed from svtools/inc/svtools/globalnameitem.hxx)6
-rw-r--r--svl/inc/svl/hint.hxx (renamed from svtools/inc/svtools/hint.hxx)2
-rw-r--r--svl/inc/svl/httpcook.hxx (renamed from svtools/inc/svtools/httpcook.hxx)2
-rw-r--r--svl/inc/svl/ilstitem.hxx (renamed from svtools/inc/svtools/ilstitem.hxx)4
-rw-r--r--svl/inc/svl/imageitm.hxx (renamed from svtools/inc/svtools/imageitm.hxx)6
-rw-r--r--svl/inc/svl/inethist.hxx (renamed from svtools/inc/svtools/inethist.hxx)6
-rw-r--r--svl/inc/svl/inettype.hxx (renamed from svtools/inc/svtools/inettype.hxx)2
-rw-r--r--svl/inc/svl/intitem.hxx (renamed from svtools/inc/svtools/intitem.hxx)16
-rw-r--r--svl/inc/svl/isethint.hxx (renamed from svtools/inc/svtools/isethint.hxx)4
-rw-r--r--svl/inc/svl/itemiter.hxx (renamed from svtools/inc/svtools/itemiter.hxx)4
-rw-r--r--svl/inc/svl/itempool.hxx (renamed from svtools/inc/svtools/itempool.hxx)6
-rw-r--r--svl/inc/svl/itemprop.hxx (renamed from svtools/inc/svtools/itemprop.hxx)4
-rw-r--r--svl/inc/svl/itemset.hxx (renamed from svtools/inc/svtools/itemset.hxx)4
-rw-r--r--svl/inc/svl/languageoptions.hxx (renamed from svtools/inc/svtools/languageoptions.hxx)14
-rw-r--r--svl/inc/svl/lckbitem.hxx (renamed from svtools/inc/svtools/lckbitem.hxx)4
-rw-r--r--svl/inc/svl/lockfilecommon.hxx (renamed from svtools/inc/svtools/lockfilecommon.hxx)4
-rw-r--r--svl/inc/svl/lstner.hxx (renamed from svtools/inc/svtools/lstner.hxx)4
-rw-r--r--svl/inc/svl/macitem.hxx (renamed from svtools/inc/svtools/macitem.hxx)10
-rw-r--r--svl/inc/svl/metitem.hxx (renamed from svtools/inc/svtools/metitem.hxx)8
-rw-r--r--svl/inc/svl/nfkeytab.hxx (renamed from svtools/inc/svtools/nfkeytab.hxx)0
-rw-r--r--svl/inc/svl/nfversi.hxx (renamed from svtools/inc/svtools/nfversi.hxx)0
-rw-r--r--svl/inc/svl/nranges.hxx (renamed from svtools/inc/svtools/nranges.hxx)4
-rw-r--r--svl/inc/svl/ondemand.hxx (renamed from svtools/inc/svtools/ondemand.hxx)2
-rw-r--r--svl/inc/svl/ownlist.hxx (renamed from svtools/inc/svtools/ownlist.hxx)8
-rw-r--r--svl/inc/svl/poolitem.hxx (renamed from svtools/inc/svtools/poolitem.hxx)6
-rw-r--r--svl/inc/svl/ptitem.hxx (renamed from svtools/inc/svtools/ptitem.hxx)8
-rw-r--r--svl/inc/svl/rectitem.hxx (renamed from svtools/inc/svtools/rectitem.hxx)8
-rw-r--r--svl/inc/svl/restrictedpaths.hxx (renamed from svtools/inc/svtools/restrictedpaths.hxx)6
-rw-r--r--svl/inc/svl/rngitem.hxx (renamed from svtools/inc/svtools/rngitem.hxx)12
-rw-r--r--svl/inc/svl/sfontitm.hxx (renamed from svtools/inc/svtools/sfontitm.hxx)2
-rw-r--r--svl/inc/svl/sharecontrolfile.hxx (renamed from svtools/inc/svtools/sharecontrolfile.hxx)6
-rw-r--r--svl/inc/svl/slstitm.hxx (renamed from svtools/inc/svtools/slstitm.hxx)4
-rw-r--r--svl/inc/svl/smplhint.hxx (renamed from svtools/inc/svtools/smplhint.hxx)4
-rw-r--r--svl/inc/svl/solar.hrc305
-rw-r--r--svl/inc/svl/stritem.hxx (renamed from svtools/inc/svtools/stritem.hxx)6
-rw-r--r--svl/inc/svl/style.hrc (renamed from svtools/inc/svtools/style.hrc)0
-rw-r--r--svl/inc/svl/style.hxx (renamed from svtools/inc/svtools/style.hxx)38
-rw-r--r--svl/inc/svl/svarray.hxx (renamed from svtools/inc/svtools/svarray.hxx)4
-rw-r--r--svl/inc/svl/svdde.hxx (renamed from svtools/inc/svtools/svdde.hxx)34
-rw-r--r--svl/inc/svl/svldata.hxx (renamed from svtools/inc/iniadrtk.hxx)58
-rw-r--r--svl/inc/svl/svldllapi.h (renamed from svtools/inc/svtools/svldllapi.h)0
-rw-r--r--svl/inc/svl/svstdarr.hxx (renamed from svtools/inc/svtools/svstdarr.hxx)4
-rw-r--r--svl/inc/svl/svtools.hrc (renamed from svtools/inc/svtools/svtools.hrc)10
-rw-r--r--svl/inc/svl/szitem.hxx (renamed from svtools/inc/svtools/szitem.hxx)2
-rw-r--r--svl/inc/svl/undo.hxx (renamed from svtools/inc/svtools/undo.hxx)16
-rw-r--r--svl/inc/svl/urlfilter.hxx (renamed from svtools/inc/svtools/urlfilter.hxx)0
-rw-r--r--svl/inc/svl/visitem.hxx (renamed from svtools/inc/svtools/visitem.hxx)4
-rw-r--r--svl/inc/svl/zforlist.hxx (renamed from svtools/inc/svtools/zforlist.hxx)60
-rw-r--r--svl/inc/svl/zformat.hxx (renamed from svtools/inc/svtools/zformat.hxx)56
-rw-r--r--svl/inc/urihelper.hxx (renamed from svtools/inc/urihelper.hxx)20
-rw-r--r--svl/inc/urlbmk.hxx (renamed from svtools/inc/urlbmk.hxx)0
-rw-r--r--svl/inc/whiter.hxx (renamed from svtools/inc/whiter.hxx)2
-rw-r--r--svl/inc/xmlement.hxx (renamed from svtools/inc/xmlement.hxx)0
-rw-r--r--svl/prj/build.lst22
-rw-r--r--svl/prj/d.lst22
-rw-r--r--svl/qa/complex/ConfigItems/CheckConfigItems.java (renamed from svtools/qa/complex/ConfigItems/CheckConfigItems.java)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx)12
-rw-r--r--svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/UserOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/UserOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/exports.map (renamed from svtools/qa/complex/ConfigItems/helper/exports.map)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/makefile.mk (renamed from svtools/qa/complex/ConfigItems/helper/makefile.mk)4
-rw-r--r--svl/qa/complex/ConfigItems/makefile.mk (renamed from svtools/qa/complex/ConfigItems/makefile.mk)2
-rw-r--r--svl/qa/complex/passwordcontainer/MasterPasswdHandler.java (renamed from svtools/qa/complex/passwordcontainer/MasterPasswdHandler.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/PasswordContainerTest.java (renamed from svtools/qa/complex/passwordcontainer/PasswordContainerTest.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java (renamed from svtools/qa/complex/passwordcontainer/PasswordContainerUnitTest.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/Test01.java (renamed from svtools/qa/complex/passwordcontainer/Test01.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/Test02.java (renamed from svtools/qa/complex/passwordcontainer/Test02.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/Test03.java (renamed from svtools/qa/complex/passwordcontainer/Test03.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/TestHelper.java (renamed from svtools/qa/complex/passwordcontainer/TestHelper.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/makefile.mk (renamed from svtools/qa/complex/passwordcontainer/makefile.mk)2
-rwxr-xr-xsvl/qa/export.map (renamed from svtools/qa/export.map)0
-rw-r--r--svl/qa/makefile.mk (renamed from svtools/qa/makefile.mk)23
-rw-r--r--svl/qa/test_URIHelper.cxx (renamed from svtools/qa/test_URIHelper.cxx)4
-rw-r--r--svl/source/config/cjkoptions.cxx (renamed from svtools/source/config/cjkoptions.cxx)13
-rw-r--r--svl/source/config/ctloptions.cxx (renamed from svtools/source/config/ctloptions.cxx)42
-rw-r--r--svl/source/config/itemholder2.cxx182
-rw-r--r--svl/source/config/itemholder2.hxx92
-rw-r--r--svl/source/config/languageoptions.cxx (renamed from svtools/source/config/languageoptions.cxx)40
-rw-r--r--svl/source/config/makefile.mk54
-rw-r--r--svl/source/filepicker/makefile.mk (renamed from svtools/source/filepicker/makefile.mk)2
-rw-r--r--svl/source/filepicker/pickerhelper.cxx (renamed from svtools/source/filepicker/pickerhelper.cxx)2
-rw-r--r--svl/source/filepicker/pickerhistory.cxx (renamed from svtools/source/filepicker/pickerhistory.cxx)2
-rw-r--r--svl/source/filerec/filerec.cxx (renamed from svtools/source/filerec/filerec.cxx)4
-rw-r--r--svl/source/filerec/makefile.mk (renamed from svtools/source/filerec/makefile.mk)2
-rw-r--r--svl/source/fsstor/exports.map (renamed from svtools/source/fsstor/exports.map)0
-rw-r--r--svl/source/fsstor/fsfactory.cxx (renamed from svtools/source/fsstor/fsfactory.cxx)2
-rw-r--r--svl/source/fsstor/fsstorage.cxx (renamed from svtools/source/fsstor/fsstorage.cxx)2
-rw-r--r--svl/source/fsstor/fsstorage.hxx (renamed from svtools/source/fsstor/fsstorage.hxx)0
-rw-r--r--svl/source/fsstor/makefile.mk (renamed from svtools/source/fsstor/makefile.mk)2
-rw-r--r--svl/source/fsstor/oinputstreamcontainer.cxx (renamed from svtools/source/fsstor/oinputstreamcontainer.cxx)2
-rw-r--r--svl/source/fsstor/oinputstreamcontainer.hxx (renamed from svtools/source/fsstor/oinputstreamcontainer.hxx)0
-rw-r--r--svl/source/fsstor/ostreamcontainer.cxx (renamed from svtools/source/fsstor/ostreamcontainer.cxx)2
-rw-r--r--svl/source/fsstor/ostreamcontainer.hxx (renamed from svtools/source/fsstor/ostreamcontainer.hxx)0
-rw-r--r--svl/source/inc/fsfactory.hxx (renamed from svtools/source/inc/fsfactory.hxx)0
-rw-r--r--svl/source/inc/passwordcontainer.hxx (renamed from svtools/source/inc/passwordcontainer.hxx)0
-rw-r--r--svl/source/inc/poolio.hxx (renamed from svtools/source/inc/poolio.hxx)2
-rw-r--r--svl/source/items/aeitem.cxx (renamed from svtools/source/items/aeitem.cxx)8
-rw-r--r--svl/source/items/cenumitm.cxx (renamed from svtools/source/items1/cenumitm.cxx)4
-rw-r--r--svl/source/items/cintitem.cxx (renamed from svtools/source/items1/cintitem.cxx)4
-rw-r--r--svl/source/items/cntwall.cxx (renamed from svtools/source/items1/cntwall.cxx)4
-rw-r--r--svl/source/items/cstitem.src (renamed from svtools/source/misc/config.src)18
-rw-r--r--svl/source/items/ctypeitm.cxx (renamed from svtools/source/items1/ctypeitm.cxx)4
-rw-r--r--svl/source/items/custritm.cxx (renamed from svtools/source/items1/custritm.cxx)4
-rw-r--r--svl/source/items/dateitem.cxx (renamed from svtools/source/items1/dateitem.cxx)16
-rw-r--r--svl/source/items/eitem.cxx (renamed from svtools/source/items/eitem.cxx)4
-rw-r--r--svl/source/items/flagitem.cxx (renamed from svtools/source/items/flagitem.cxx)6
-rw-r--r--svl/source/items/globalnameitem.cxx (renamed from svtools/source/items/globalnameitem.cxx)4
-rw-r--r--svl/source/items/ilstitem.cxx (renamed from svtools/source/items1/ilstitem.cxx)6
-rw-r--r--svl/source/items/imageitm.cxx (renamed from svtools/source/items/imageitm.cxx)4
-rw-r--r--svl/source/items/intitem.cxx (renamed from svtools/source/items/intitem.cxx)6
-rw-r--r--svl/source/items/itemiter.cxx (renamed from svtools/source/items1/itemiter.cxx)8
-rw-r--r--svl/source/items/itempool.cxx (renamed from svtools/source/items1/itempool.cxx)16
-rw-r--r--svl/source/items/itemprop.cxx (renamed from svtools/source/items1/itemprop.cxx)22
-rw-r--r--svl/source/items/itemset.cxx (renamed from svtools/source/items1/itemset.cxx)12
-rw-r--r--svl/source/items/lckbitem.cxx (renamed from svtools/source/items1/lckbitem.cxx)6
-rw-r--r--svl/source/items/macitem.cxx (renamed from svtools/source/items/macitem.cxx)4
-rw-r--r--svl/source/items/makefile.mk (renamed from svtools/source/items1/makefile.mk)34
-rw-r--r--svl/source/items/nranges.cxx (renamed from svtools/source/items1/nranges.cxx)2
-rw-r--r--svl/source/items/poolcach.cxx (renamed from svtools/source/items/poolcach.cxx)6
-rw-r--r--svl/source/items/poolio.cxx (renamed from svtools/source/items1/poolio.cxx)18
-rw-r--r--svl/source/items/poolitem.cxx (renamed from svtools/source/items1/poolitem.cxx)4
-rw-r--r--svl/source/items/ptitem.cxx (renamed from svtools/source/items/ptitem.cxx)6
-rw-r--r--svl/source/items/rectitem.cxx (renamed from svtools/source/items/rectitem.cxx)6
-rw-r--r--svl/source/items/rngitem.cxx (renamed from svtools/source/items/rngitem.cxx)6
-rwxr-xr-xsvl/source/items/rngitem_inc.cxx (renamed from svtools/source/items/rngitem_inc.cxx)0
-rw-r--r--svl/source/items/sfontitm.cxx (renamed from svtools/source/items1/sfontitm.cxx)4
-rw-r--r--svl/source/items/sitem.cxx (renamed from svtools/source/items1/sitem.cxx)6
-rw-r--r--svl/source/items/slstitm.cxx (renamed from svtools/source/items1/slstitm.cxx)6
-rw-r--r--svl/source/items/stritem.cxx (renamed from svtools/source/items/stritem.cxx)4
-rw-r--r--svl/source/items/style.cxx (renamed from svtools/source/items/style.cxx)33
-rw-r--r--svl/source/items/stylepool.cxx (renamed from svtools/source/items1/stylepool.cxx)6
-rw-r--r--svl/source/items/szitem.cxx (renamed from svtools/source/items/szitem.cxx)6
-rw-r--r--svl/source/items/visitem.cxx (renamed from svtools/source/items1/visitem.cxx)4
-rw-r--r--svl/source/items/whassert.hxx (renamed from svtools/source/items1/whassert.hxx)0
-rw-r--r--svl/source/items/whiter.cxx (renamed from svtools/source/items1/whiter.cxx)4
-rw-r--r--svl/source/memtools/makefile.mk (renamed from svtools/source/memtools/makefile.mk)2
-rw-r--r--svl/source/memtools/svarray.cxx (renamed from svtools/source/memtools/svarray.cxx)4
-rw-r--r--svl/source/misc/PasswordHelper.cxx (renamed from svtools/source/misc1/PasswordHelper.cxx)2
-rw-r--r--svl/source/misc/adrparse.cxx (renamed from svtools/source/misc1/adrparse.cxx)8
-rw-r--r--svl/source/misc/documentlockfile.cxx (renamed from svtools/source/misc/documentlockfile.cxx)6
-rw-r--r--svl/source/misc/filenotation.cxx (renamed from svtools/source/misc1/filenotation.cxx)2
-rw-r--r--svl/source/misc/folderrestriction.cxx (renamed from svtools/source/misc1/folderrestriction.cxx)2
-rw-r--r--svl/source/misc/fstathelper.cxx (renamed from svtools/source/misc1/fstathelper.cxx)2
-rw-r--r--svl/source/misc/inethist.cxx (renamed from svtools/source/misc1/inethist.cxx)4
-rw-r--r--svl/source/misc/inettype.cxx (renamed from svtools/source/misc1/inettype.cxx)18
-rw-r--r--svl/source/misc/lngmisc.cxx (renamed from svtools/source/misc1/lngmisc.cxx)2
-rw-r--r--svl/source/misc/lockfilecommon.cxx (renamed from svtools/source/misc/lockfilecommon.cxx)6
-rw-r--r--svl/source/misc/makefile.mk (renamed from svtools/source/misc1/makefile.mk)15
-rw-r--r--svl/source/misc/mediatyp.src (renamed from svtools/source/misc1/mediatyp.src)2
-rw-r--r--svl/source/misc/ownlist.cxx (renamed from svtools/source/misc/ownlist.cxx)4
-rw-r--r--svl/source/misc/restrictedpaths.cxx (renamed from svtools/source/misc/restrictedpaths.cxx)6
-rw-r--r--svl/source/misc/sharecontrolfile.cxx (renamed from svtools/source/misc/sharecontrolfile.cxx)6
-rw-r--r--svl/source/misc/strmadpt.cxx (renamed from svtools/source/misc1/strmadpt.cxx)2
-rw-r--r--svl/source/misc/svldata.cxx (renamed from svtools/source/misc1/svtdata.cxx)49
-rw-r--r--svl/source/misc/urihelper.cxx (renamed from svtools/source/misc/urihelper.cxx)10
-rw-r--r--svl/source/notify/brdcst.cxx (renamed from svtools/source/notify/brdcst.cxx)10
-rw-r--r--svl/source/notify/broadcast.cxx (renamed from svtools/source/notify/broadcast.cxx)4
-rw-r--r--svl/source/notify/cancel.cxx (renamed from svtools/source/notify/cancel.cxx)8
-rw-r--r--svl/source/notify/hint.cxx (renamed from svtools/source/notify/hint.cxx)4
-rw-r--r--svl/source/notify/isethint.cxx (renamed from svtools/source/notify/isethint.cxx)6
-rw-r--r--svl/source/notify/listener.cxx (renamed from svtools/source/notify/listener.cxx)2
-rw-r--r--svl/source/notify/listenerbase.cxx (renamed from svtools/source/notify/listenerbase.cxx)2
-rw-r--r--svl/source/notify/listenerbase.hxx (renamed from svtools/source/notify/listenerbase.hxx)0
-rw-r--r--svl/source/notify/listeneriter.cxx (renamed from svtools/source/notify/listeneriter.cxx)2
-rw-r--r--svl/source/notify/lstner.cxx (renamed from svtools/source/notify/lstner.cxx)8
-rw-r--r--svl/source/notify/makefile.mk (renamed from svtools/source/notify/makefile.mk)2
-rw-r--r--svl/source/notify/smplhint.cxx (renamed from svtools/source/notify/smplhint.cxx)4
-rw-r--r--svl/source/numbers/makefile.mk (renamed from svtools/source/numbers/makefile.mk)4
-rw-r--r--svl/source/numbers/nbdll.cxx (renamed from svtools/source/numbers/nbdll.cxx)2
-rw-r--r--svl/source/numbers/numfmuno.cxx (renamed from svtools/source/numbers/numfmuno.cxx)9
-rw-r--r--svl/source/numbers/numfmuno.hxx (renamed from svtools/source/numbers/numfmuno.hxx)0
-rw-r--r--svl/source/numbers/numhead.cxx (renamed from svtools/source/numbers/numhead.cxx)2
-rw-r--r--svl/source/numbers/numhead.hxx (renamed from svtools/source/numbers/numhead.hxx)0
-rw-r--r--svl/source/numbers/numuno.cxx (renamed from svtools/source/numbers/numuno.cxx)5
-rw-r--r--svl/source/numbers/supservs.cxx (renamed from svtools/source/numbers/supservs.cxx)3
-rw-r--r--svl/source/numbers/supservs.hxx (renamed from svtools/source/numbers/supservs.hxx)2
-rw-r--r--svl/source/numbers/zforfind.cxx (renamed from svtools/source/numbers/zforfind.cxx)8
-rw-r--r--svl/source/numbers/zforfind.hxx (renamed from svtools/inc/zforfind.hxx)0
-rw-r--r--svl/source/numbers/zforlist.cxx (renamed from svtools/source/numbers/zforlist.cxx)66
-rw-r--r--svl/source/numbers/zformat.cxx (renamed from svtools/source/numbers/zformat.cxx)6
-rw-r--r--svl/source/numbers/zforscan.cxx (renamed from svtools/source/numbers/zforscan.cxx)6
-rw-r--r--svl/source/numbers/zforscan.hxx (renamed from svtools/source/numbers/zforscan.hxx)2
-rw-r--r--svl/source/passwordcontainer/exports.map (renamed from svtools/source/passwordcontainer/exports.map)0
-rw-r--r--svl/source/passwordcontainer/makefile.mk (renamed from svtools/source/passwordcontainer/makefile.mk)2
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx (renamed from svtools/source/passwordcontainer/passwordcontainer.cxx)21
-rw-r--r--svl/source/passwordcontainer/syscreds.cxx (renamed from svtools/source/passwordcontainer/syscreds.cxx)9
-rw-r--r--svl/source/passwordcontainer/syscreds.hxx (renamed from svtools/source/passwordcontainer/syscreds.hxx)2
-rw-r--r--svl/source/svdde/ddecli.cxx (renamed from svtools/source/svdde/ddecli.cxx)14
-rw-r--r--svl/source/svdde/ddedata.cxx (renamed from svtools/source/svdde/ddedata.cxx)4
-rw-r--r--svl/source/svdde/ddedll.cxx (renamed from svtools/source/svdde/ddedll.cxx)2
-rw-r--r--svl/source/svdde/ddeimp.hxx (renamed from svtools/source/svdde/ddeimp.hxx)0
-rw-r--r--svl/source/svdde/ddeinf.cxx (renamed from svtools/source/svdde/ddeinf.cxx)4
-rw-r--r--svl/source/svdde/ddeml1.cxx (renamed from svtools/source/svdde/ddeml1.cxx)4
-rw-r--r--svl/source/svdde/ddeml2.cxx (renamed from svtools/source/svdde/ddeml2.cxx)2
-rw-r--r--svl/source/svdde/ddemldeb.cxx (renamed from svtools/source/svdde/ddemldeb.cxx)2
-rw-r--r--svl/source/svdde/ddemldeb.hxx (renamed from svtools/source/svdde/ddemldeb.hxx)0
-rw-r--r--svl/source/svdde/ddemlimp.hxx (renamed from svtools/source/svdde/ddemlimp.hxx)0
-rw-r--r--svl/source/svdde/ddemlos2.h (renamed from svtools/source/svdde/ddemlos2.h)0
-rw-r--r--svl/source/svdde/ddestrg.cxx (renamed from svtools/source/svdde/ddestrg.cxx)4
-rw-r--r--svl/source/svdde/ddesvr.cxx (renamed from svtools/source/svdde/ddesvr.cxx)8
-rw-r--r--svl/source/svdde/ddewrap.cxx (renamed from svtools/source/svdde/ddewrap.cxx)2
-rw-r--r--svl/source/svdde/ddewrap.hxx (renamed from svtools/source/svdde/ddewrap.hxx)0
-rw-r--r--svl/source/svdde/makefile.mk (renamed from svtools/source/svdde/makefile.mk)4
-rw-r--r--svl/source/svsql/converter.cxx (renamed from svtools/source/svsql/converter.cxx)2
-rw-r--r--svl/source/svsql/makefile.mk (renamed from svtools/source/svsql/makefile.mk)2
-rw-r--r--svl/source/undo/makefile.mk (renamed from svtools/source/undo/makefile.mk)4
-rw-r--r--svl/source/undo/undo.cxx (renamed from svtools/source/undo/undo.cxx)18
-rw-r--r--svl/source/uno/makefile.mk51
-rw-r--r--svl/source/uno/pathservice.cxx (renamed from svtools/uno/pathservice.cxx)6
-rw-r--r--svl/source/uno/registerservices.cxx (renamed from svtools/source/uno/registerservices.cxx)27
-rw-r--r--svl/unx/inc/convert.hxx (renamed from svtools/unx/inc/convert.hxx)0
-rw-r--r--svl/unx/source/svdde/ddedummy.cxx (renamed from svtools/unx/source/svdde/ddedummy.cxx)4
-rw-r--r--svl/unx/source/svdde/makefile.mk (renamed from svtools/unx/source/svdde/makefile.mk)4
-rw-r--r--svl/util/makefile.mk126
-rw-r--r--svl/util/svl.pmk (renamed from svtools/util/svl.pmk)0
-rw-r--r--svtools/inc/apearcfg.hxx1
-rw-r--r--svtools/inc/calendar.hxx1
-rw-r--r--svtools/inc/extcolorcfg.hxx4
-rw-r--r--svtools/inc/filedlg2.hrc (renamed from svtools/source/dialogs/filedlg2.hrc)0
-rw-r--r--svtools/inc/flbytes.hxx174
-rw-r--r--svtools/inc/fontsubstconfig.hxx1
-rw-r--r--svtools/inc/imgdef.hxx11
-rw-r--r--svtools/inc/inidef.hxx146
-rw-r--r--svtools/inc/iniprop.hxx64
-rw-r--r--svtools/inc/privsplt.hxx86
-rw-r--r--svtools/inc/reginfo.hxx65
-rw-r--r--svtools/inc/reqitem.hxx68
-rw-r--r--svtools/inc/roadmap.hxx82
-rw-r--r--svtools/inc/rtfkeywd.hxx (renamed from svtools/source/svrtf/rtfkeywd.hxx)0
-rw-r--r--svtools/inc/rtfout.hxx (renamed from svtools/source/svrtf/rtfout.hxx)0
-rw-r--r--svtools/inc/rtftoken.h (renamed from svtools/source/svrtf/rtftoken.h)0
-rw-r--r--svtools/inc/sectctr.hxx154
-rw-r--r--svtools/inc/svipcdef.h71
-rw-r--r--svtools/inc/svtools/accessibilityoptions.hxx8
-rw-r--r--svtools/inc/svtools/accessiblefactory.hxx6
-rwxr-xr-xsvtools/inc/svtools/accessibletable.hxx185
-rw-r--r--svtools/inc/svtools/addxmltostorageoptions.hxx162
-rw-r--r--svtools/inc/svtools/bintitem.hxx88
-rw-r--r--svtools/inc/svtools/colorcfg.hxx11
-rw-r--r--svtools/inc/svtools/cstitem.hxx94
-rw-r--r--svtools/inc/svtools/dtritem.hxx93
-rw-r--r--svtools/inc/svtools/editbrowsebox.hxx1
-rw-r--r--svtools/inc/svtools/embedhlp.hxx10
-rw-r--r--svtools/inc/svtools/fmtfield.hxx2
-rw-r--r--svtools/inc/svtools/frqitem.hxx178
-rw-r--r--svtools/inc/svtools/helpopt.hxx4
-rw-r--r--svtools/inc/svtools/htmlout.hxx2
-rw-r--r--svtools/inc/svtools/hyperlabel.hxx11
-rw-r--r--svtools/inc/svtools/imapobj.hxx2
-rw-r--r--svtools/inc/svtools/insdlg.hxx2
-rw-r--r--svtools/inc/svtools/menuoptions.hxx12
-rw-r--r--svtools/inc/svtools/miscopt.hxx8
-rw-r--r--svtools/inc/svtools/options.hxx55
-rw-r--r--svtools/inc/svtools/optionsdrawinglayer.hxx6
-rw-r--r--svtools/inc/svtools/parhtml.hxx2
-rw-r--r--svtools/inc/svtools/parrtf.hxx2
-rw-r--r--svtools/inc/svtools/printoptions.hxx4
-rw-r--r--svtools/inc/svtools/section.hxx104
-rw-r--r--svtools/inc/svtools/svlbox.hxx2
-rw-r--r--svtools/inc/svtools/svmedit.hxx1
-rw-r--r--svtools/inc/svtools/svtdata.hxx33
-rw-r--r--svtools/inc/svtools/syntaxhighlight.hxx6
-rw-r--r--svtools/inc/svtools/table/tablecontrol.hxx86
-rw-r--r--svtools/inc/svtools/table/tablemodel.hxx4
-rw-r--r--svtools/inc/svtools/textdata.hxx4
-rw-r--r--svtools/inc/svtools/texteng.hxx2
-rw-r--r--svtools/inc/svtools/tfrmitem.hxx90
-rw-r--r--svtools/inc/svtools/tresitem.hxx65
-rw-r--r--svtools/inc/svtools/valueset.hxx1
-rw-r--r--svtools/inc/svtuno.hxx63
-rw-r--r--svtools/inc/twain.hxx99
-rw-r--r--svtools/inc/whmap.hxx61
-rw-r--r--svtools/inc/xmlcnimp.hxx143
-rw-r--r--svtools/prj/build.lst69
-rw-r--r--svtools/prj/d.lst311
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx14
-rw-r--r--svtools/source/brwbox/editbrowsebox.src2
-rw-r--r--svtools/source/config/accessibilityoptions.cxx11
-rw-r--r--svtools/source/config/addxmltostorageoptions.cxx291
-rw-r--r--svtools/source/config/apearcfg.cxx10
-rw-r--r--svtools/source/config/colorcfg.cxx104
-rw-r--r--svtools/source/config/extcolorcfg.cxx11
-rw-r--r--svtools/source/config/fontsubstconfig.cxx11
-rw-r--r--svtools/source/config/helpopt.cxx5
-rw-r--r--svtools/source/config/itemholder2.cxx42
-rw-r--r--svtools/source/config/itemholder2.hxx2
-rw-r--r--svtools/source/config/makefile.mk80
-rw-r--r--svtools/source/config/menuoptions.cxx20
-rw-r--r--svtools/source/config/miscopt.cxx62
-rw-r--r--svtools/source/config/options.cxx42
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx8
-rw-r--r--svtools/source/config/printoptions.cxx7
-rw-r--r--svtools/source/config/test/test.cxx2
-rw-r--r--svtools/source/contnr/contentenumeration.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx8
-rw-r--r--svtools/source/contnr/fileview.src2
-rw-r--r--svtools/source/contnr/imivctl.hxx2
-rw-r--r--svtools/source/contnr/ivctrl.cxx7
-rw-r--r--svtools/source/contnr/svcontnr.src2
-rw-r--r--svtools/source/contnr/svimpbox.cxx2
-rw-r--r--svtools/source/contnr/svimpicn.cxx2
-rw-r--r--svtools/source/contnr/svlbitm.cxx3
-rw-r--r--svtools/source/contnr/svlbox.cxx2
-rw-r--r--svtools/source/contnr/svtabbx.cxx2
-rw-r--r--svtools/source/contnr/svtreebx.cxx2
-rw-r--r--svtools/source/contnr/templwin.cxx20
-rw-r--r--svtools/source/contnr/templwin.hxx2
-rw-r--r--svtools/source/contnr/templwin.src2
-rw-r--r--svtools/source/contnr/treelist.cxx2
-rw-r--r--svtools/source/control/calendar.cxx2
-rw-r--r--svtools/source/control/calendar.src2
-rw-r--r--svtools/source/control/collatorres.cxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx5
-rw-r--r--svtools/source/control/ctrlbox.src2
-rw-r--r--svtools/source/control/ctrltool.cxx2
-rw-r--r--svtools/source/control/ctrltool.src2
-rw-r--r--svtools/source/control/fileurlbox.cxx2
-rw-r--r--svtools/source/control/fmtfield.cxx4
-rw-r--r--svtools/source/control/hyperlabel.cxx43
-rw-r--r--svtools/source/control/indexentryres.cxx2
-rw-r--r--svtools/source/control/inettbc.cxx18
-rw-r--r--svtools/source/control/makefile.mk1
-rw-r--r--svtools/source/control/reginfo.cxx375
-rw-r--r--svtools/source/control/roadmap.cxx687
-rw-r--r--svtools/source/control/taskstat.cxx2
-rw-r--r--svtools/source/control/urlcontrol.cxx6
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx16
-rw-r--r--svtools/source/dialogs/addresstemplate.src2
-rw-r--r--svtools/source/dialogs/logindlg.cxx2
-rw-r--r--svtools/source/dialogs/logindlg.src2
-rw-r--r--svtools/source/dialogs/printdlg.cxx4
-rw-r--r--svtools/source/dialogs/printdlg.hrc2
-rw-r--r--svtools/source/dialogs/prnsetup.hrc2
-rw-r--r--svtools/source/dialogs/propctrl.hxx (renamed from svtools/inc/propctrl.hxx)2
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.src2
-rw-r--r--svtools/source/edit/svmedit.cxx10
-rw-r--r--svtools/source/edit/syntaxhighlight.cxx2
-rw-r--r--svtools/source/edit/textdat2.hxx2
-rw-r--r--svtools/source/edit/textdoc.hxx2
-rw-r--r--svtools/source/edit/texteng.cxx2
-rw-r--r--svtools/source/edit/textundo.hxx2
-rw-r--r--svtools/source/edit/textview.cxx4
-rw-r--r--svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx2
-rw-r--r--svtools/source/filter.vcl/filter/dlgejpg.hrc2
-rw-r--r--svtools/source/filter.vcl/filter/dlgepng.hrc2
-rw-r--r--svtools/source/filter.vcl/filter/dlgexpor.hrc2
-rw-r--r--svtools/source/filter.vcl/filter/makefile.mk2
-rw-r--r--svtools/source/filter.vcl/filter/strings.hrc2
-rw-r--r--svtools/source/filter.vcl/igif/decode.cxx3
-rw-r--r--svtools/source/filter.vcl/igif/makefile.mk1
-rw-r--r--svtools/source/filter.vcl/ixbm/makefile.mk1
-rw-r--r--svtools/source/filter.vcl/ixpm/makefile.mk1
-rw-r--r--svtools/source/filter.vcl/ixpm/xpmread.cxx21
-rw-r--r--svtools/source/filter.vcl/jpeg/makefile.mk2
-rw-r--r--svtools/source/filter.vcl/wmf/emfwr.cxx94
-rw-r--r--svtools/source/filter.vcl/wmf/emfwr.hxx4
-rw-r--r--svtools/source/filter.vcl/wmf/wmfwr.cxx92
-rw-r--r--svtools/source/filter.vcl/wmf/wmfwr.hxx4
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.hxx (renamed from svtools/source/inc/hatchwindowfactory.hxx)0
-rw-r--r--svtools/source/inc/filectrl.hrc (renamed from svtools/inc/filectrl.hrc)0
-rw-r--r--svtools/source/inc/gifread.hxx (renamed from svtools/inc/gifread.hxx)0
-rw-r--r--svtools/source/inc/gradwrap.hxx (renamed from svtools/inc/gradwrap.hxx)0
-rw-r--r--svtools/source/inc/iodlg.hrc (renamed from svtools/inc/iodlg.hrc)2
-rw-r--r--svtools/source/inc/jpeg.hxx (renamed from svtools/inc/jpeg.hxx)0
-rw-r--r--svtools/source/inc/msgrd.hxx (renamed from svtools/inc/msgrd.hxx)0
-rw-r--r--svtools/source/inc/msgwr.hxx (renamed from svtools/inc/msgwr.hxx)0
-rw-r--r--svtools/source/inc/property.hxx (renamed from svtools/inc/property.hxx)8
-rw-r--r--svtools/source/inc/sgfbram.hxx (renamed from svtools/inc/sgfbram.hxx)0
-rw-r--r--svtools/source/inc/sgffilt.hxx (renamed from svtools/inc/sgffilt.hxx)0
-rw-r--r--svtools/source/inc/sgvmain.hxx (renamed from svtools/inc/sgvmain.hxx)0
-rw-r--r--svtools/source/inc/sgvspln.hxx (renamed from svtools/inc/sgvspln.hxx)0
-rw-r--r--svtools/source/inc/svimpbox.hxx (renamed from svtools/inc/svimpbox.hxx)0
-rw-r--r--svtools/source/inc/svimpicn.hxx (renamed from svtools/inc/svimpicn.hxx)0
-rw-r--r--svtools/source/inc/xbmread.hxx (renamed from svtools/inc/xbmread.hxx)0
-rw-r--r--svtools/source/inc/xpmread.hxx (renamed from svtools/inc/xpmread.hxx)0
-rw-r--r--svtools/source/items/makefile.mk65
-rw-r--r--svtools/source/items1/bintitem.cxx169
-rw-r--r--svtools/source/items1/cstitem.cxx252
-rw-r--r--svtools/source/items1/cstitem.src112
-rw-r--r--svtools/source/items1/dtritem.cxx244
-rw-r--r--svtools/source/items1/frqitem.cxx580
-rw-r--r--svtools/source/items1/tfrmitem.cxx184
-rw-r--r--svtools/source/items1/tresitem.cxx78
-rw-r--r--svtools/source/java/javaerror.src2
-rw-r--r--svtools/source/java/javainteractionhandler.cxx2
-rw-r--r--svtools/source/java/patchjavaerror.src2
-rw-r--r--svtools/source/misc/ehdl.cxx2
-rw-r--r--svtools/source/misc/ehdl.src2
-rw-r--r--svtools/source/misc/embedhlp.cxx44
-rw-r--r--svtools/source/misc/errtxt.src2
-rw-r--r--svtools/source/misc/flbytes.cxx432
-rw-r--r--svtools/source/misc/helpagent.src2
-rw-r--r--svtools/source/misc/helpagentwindow.cxx2
-rw-r--r--svtools/source/misc/imagemgr.cxx3
-rw-r--r--svtools/source/misc/imagemgr.src2
-rw-r--r--svtools/source/misc/imap.cxx2
-rw-r--r--svtools/source/misc/imap2.cxx2
-rw-r--r--svtools/source/misc/inidef.cxx269
-rw-r--r--svtools/source/misc/iniman.src68
-rw-r--r--svtools/source/misc/itemdel.cxx (renamed from svtools/source/items/itemdel.cxx)4
-rw-r--r--svtools/source/misc/langtab.cxx4
-rw-r--r--svtools/source/misc/langtab.src2
-rw-r--r--svtools/source/misc/makefile.mk37
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx9
-rw-r--r--svtools/source/misc/svtdata.cxx (renamed from svtools/source/misc/vcldata.cxx)48
-rw-r--r--svtools/source/misc/templatefoldercache.cxx2
-rw-r--r--svtools/source/misc/transfer.cxx2
-rw-r--r--svtools/source/misc/transfer2.cxx2
-rw-r--r--svtools/source/misc/wallitem.cxx (renamed from svtools/source/items/wallitem.cxx)2
-rw-r--r--svtools/source/misc1/iniadrtk.cxx76
-rw-r--r--svtools/source/productregistration/makefile.mk3
-rw-r--r--svtools/source/productregistration/productregistration.cxx20
-rw-r--r--svtools/source/productregistration/registrationdlg.cxx2
-rw-r--r--svtools/source/productregistration/registrationdlg.src2
-rw-r--r--svtools/source/svhtml/htmlout.cxx8
-rw-r--r--svtools/source/svhtml/htmlsupp.cxx2
-rw-r--r--svtools/source/svhtml/parhtml.cxx4
-rw-r--r--svtools/source/svrtf/svparser.cxx10
-rw-r--r--svtools/source/table/tablecontrol.cxx372
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx25
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx20
-rw-r--r--svtools/source/uno/addrtempuno.cxx (renamed from svtools/uno/addrtempuno.cxx)0
-rw-r--r--svtools/source/uno/contextmenuhelper.cxx2
-rw-r--r--svtools/source/uno/makefile.mk18
-rw-r--r--svtools/source/uno/miscservices.cxx (renamed from svtools/uno/miscservices.cxx)17
-rwxr-xr-xsvtools/source/uno/svtxgridcontrol.cxx458
-rwxr-xr-xsvtools/source/uno/svtxgridcontrol.hxx106
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx2
-rw-r--r--svtools/source/uno/unocontroltablemodel.cxx481
-rw-r--r--svtools/source/uno/unocontroltablemodel.hxx96
-rw-r--r--svtools/source/uno/unoevent.cxx2
-rw-r--r--svtools/source/uno/unoiface.cxx11
-rw-r--r--svtools/uno/exports.map8
-rw-r--r--svtools/uno/makefile.mk81
-rw-r--r--svtools/util/makefile.mk114
-rw-r--r--svtools/util/svl.flt85
-rw-r--r--svtools/util/svt.flt81
-rw-r--r--svtools/win/res/makefile.mk30
-rw-r--r--toolkit/inc/toolkit/awt/vclxtopwindow.hxx37
-rw-r--r--toolkit/inc/toolkit/awt/vclxwindows.hxx5
-rw-r--r--toolkit/inc/toolkit/helper/property.hxx1
-rwxr-xr-xtoolkit/qa/complex/toolkit/interface_tests/makefile.mk2
-rwxr-xr-xtoolkit/qa/complex/toolkit/makefile.mk2
-rw-r--r--toolkit/source/awt/vclxdialog.cxx1
-rw-r--r--toolkit/source/awt/vclxtopwindow.cxx166
-rw-r--r--toolkit/source/awt/vclxwindow.cxx27
-rw-r--r--toolkit/source/awt/vclxwindows.cxx9
-rw-r--r--toolkit/source/controls/unocontrol.cxx8
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx7
-rw-r--r--toolkit/source/helper/property.cxx15
-rw-r--r--toolkit/source/helper/throbberimpl.cxx4
-rw-r--r--toolkit/src2xml/include.lst3
-rw-r--r--toolkit/workben/layout/editor.cxx11
-rw-r--r--tools/inc/poly.h13
-rw-r--r--tools/inc/tools/date.hxx3
-rw-r--r--tools/inc/tools/fldunit.hxx44
-rw-r--r--tools/inc/tools/fontenum.hxx175
-rw-r--r--tools/inc/tools/fsys.hxx2
-rw-r--r--tools/inc/tools/gen.hxx31
-rw-r--r--tools/inc/tools/inetdef.hxx2
-rw-r--r--tools/inc/tools/mapunit.hxx44
-rw-r--r--tools/inc/tools/poly.hxx2
-rw-r--r--tools/inc/tools/solar.h4
-rwxr-xr-x[-rw-r--r--]tools/inc/tools/solarmutex.hxx (renamed from svtools/inc/svtool.h)27
-rw-r--r--tools/inc/tools/wintypes.hxx337
-rw-r--r--tools/prj/d.lst6
-rw-r--r--tools/qa/makefile.mk4
-rw-r--r--tools/qa/test_pathutils.cxx2
-rw-r--r--tools/source/datetime/tdate.cxx6
-rw-r--r--tools/source/fsys/unx.cxx2
-rw-r--r--tools/source/fsys/wntmsc.cxx2
-rw-r--r--tools/source/generic/line.cxx5
-rw-r--r--tools/source/generic/poly.cxx64
-rw-r--r--tools/source/generic/poly2.cxx17
-rw-r--r--tools/source/memtools/table.cxx41
-rw-r--r--tools/source/misc/makefile.mk3
-rw-r--r--tools/source/misc/solarmutex.cxx (renamed from svtools/source/misc/iniprop.cxx)45
-rw-r--r--tools/source/stream/strmunx.cxx2
-rw-r--r--tools/test/makefile.mk9
-rw-r--r--tools/test/tests.cxx2
-rw-r--r--transex3/inc/export.hxx12
-rw-r--r--transex3/inc/gsicheck.hxx (renamed from transex3/source/gsicheck.hxx)0
-rw-r--r--transex3/inc/inireader.hxx52
-rw-r--r--transex3/inc/treeconfig.hxx28
-rw-r--r--transex3/inc/xmlparse.hxx4
-rw-r--r--transex3/prj/d.lst2
-rw-r--r--transex3/scripts/fast_merge.pl2
-rwxr-xr-xtransex3/scripts/localize_old.pl1130
-rw-r--r--transex3/source/cfgmerge.cxx4
-rw-r--r--transex3/source/directory.cxx17
-rw-r--r--transex3/source/export2.cxx13
-rw-r--r--transex3/source/help/HelpLinker.cxx124
-rw-r--r--transex3/source/help/MANIFEST.MF2
-rw-r--r--transex3/source/help/compilehelp.hxx1
-rw-r--r--transex3/source/help/makefile.mk19
-rw-r--r--transex3/source/hw2fw.cxx202
-rw-r--r--transex3/source/inireader.cxx132
-rw-r--r--transex3/source/localize.cxx189
-rw-r--r--transex3/source/makefile.mk30
-rw-r--r--transex3/source/treeconfig.cxx128
-rw-r--r--transex3/source/txtconv.cxx168
-rw-r--r--transex3/source/xrmmerge.cxx4
-rw-r--r--unotools/inc/unotools/accelcfg.hxx (renamed from svtools/inc/svtools/accelcfg.hxx)8
-rw-r--r--unotools/inc/unotools/cacheoptions.hxx (renamed from svtools/inc/cacheoptions.hxx)12
-rw-r--r--unotools/inc/unotools/cmdoptions.hxx (renamed from svtools/inc/svtools/cmdoptions.hxx)14
-rw-r--r--unotools/inc/unotools/compatibility.hxx (renamed from svtools/inc/svtools/compatibility.hxx)14
-rw-r--r--unotools/inc/unotools/configitem.hxx7
-rw-r--r--unotools/inc/unotools/defaultoptions.hxx (renamed from svtools/inc/svtools/defaultoptions.hxx)12
-rw-r--r--unotools/inc/unotools/dynamicmenuoptions.hxx (renamed from svtools/inc/svtools/dynamicmenuoptions.hxx)14
-rw-r--r--unotools/inc/unotools/eventcfg.hxx (renamed from svtools/inc/eventcfg.hxx)4
-rw-r--r--unotools/inc/unotools/extendedsecurityoptions.hxx (renamed from svtools/inc/svtools/extendedsecurityoptions.hxx)14
-rw-r--r--unotools/inc/unotools/fltrcfg.hxx (renamed from svtools/inc/fltrcfg.hxx)4
-rw-r--r--unotools/inc/unotools/fontcfg.hxx (renamed from vcl/inc/vcl/fontcfg.hxx)26
-rw-r--r--unotools/inc/unotools/fontcvt.hxx (renamed from vcl/inc/vcl/fontcvt.hxx)41
-rw-r--r--unotools/inc/unotools/fontdefs.hxx110
-rw-r--r--unotools/inc/unotools/fontoptions.hxx (renamed from svtools/inc/svtools/fontoptions.hxx)14
-rw-r--r--unotools/inc/unotools/historyoptions.hxx (renamed from svtools/inc/svtools/historyoptions.hxx)8
-rw-r--r--unotools/inc/unotools/historyoptions_const.hxx (renamed from svtools/source/inc/configitems/historyoptions_const.hxx)2
-rw-r--r--unotools/inc/unotools/inetoptions.hxx (renamed from svtools/inc/svtools/inetoptions.hxx)12
-rw-r--r--unotools/inc/unotools/internaloptions.hxx (renamed from svtools/inc/svtools/internaloptions.hxx)14
-rw-r--r--unotools/inc/unotools/itemholderbase.hxx (renamed from svtools/source/config/itemholderbase.hxx)10
-rw-r--r--unotools/inc/unotools/javaoptions.hxx (renamed from svtools/inc/javaoptions.hxx)8
-rw-r--r--unotools/inc/unotools/lingucfg.hxx (renamed from svtools/inc/svtools/lingucfg.hxx)16
-rw-r--r--unotools/inc/unotools/linguprops.hxx (renamed from svtools/inc/linguprops.hxx)4
-rw-r--r--unotools/inc/unotools/localisationoptions.hxx (renamed from svtools/inc/svtools/localisationoptions.hxx)14
-rw-r--r--unotools/inc/unotools/loghelper.hxx (renamed from svtools/source/config/loghelper.hxx)0
-rw-r--r--unotools/inc/unotools/misccfg.hxx (renamed from svtools/inc/misccfg.hxx)39
-rw-r--r--unotools/inc/unotools/moduleoptions.hxx (renamed from svtools/inc/svtools/moduleoptions.hxx)8
-rwxr-xr-xunotools/inc/unotools/options.hxx100
-rw-r--r--unotools/inc/unotools/optionsdlg.hxx (renamed from svtools/inc/svtools/optionsdlg.hxx)12
-rw-r--r--unotools/inc/unotools/pathoptions.hxx (renamed from svtools/inc/svtools/pathoptions.hxx)12
-rw-r--r--unotools/inc/unotools/printwarningoptions.hxx (renamed from svtools/inc/svtools/printwarningoptions.hxx)14
-rw-r--r--unotools/inc/unotools/regoptions.hxx (renamed from svtools/inc/regoptions.hxx)16
-rw-r--r--unotools/inc/unotools/saveopt.hxx (renamed from svtools/inc/svtools/saveopt.hxx)10
-rw-r--r--unotools/inc/unotools/searchopt.hxx (renamed from svtools/inc/searchopt.hxx)4
-rw-r--r--unotools/inc/unotools/securityoptions.hxx (renamed from svtools/inc/svtools/securityoptions.hxx)14
-rw-r--r--unotools/inc/unotools/sourceviewconfig.hxx (renamed from svtools/inc/svtools/sourceviewconfig.hxx)18
-rw-r--r--unotools/inc/unotools/startoptions.hxx (renamed from svtools/inc/svtools/startoptions.hxx)14
-rw-r--r--unotools/inc/unotools/syslocale.hxx (renamed from svtools/inc/svtools/syslocale.hxx)20
-rwxr-xr-x[-rw-r--r--]unotools/inc/unotools/syslocaleoptions.hxx (renamed from svtools/inc/svtools/syslocaleoptions.hxx)31
-rw-r--r--unotools/inc/unotools/undoopt.hxx (renamed from svtools/inc/svtools/undoopt.hxx)15
-rw-r--r--unotools/inc/unotools/useroptions.hxx (renamed from svtools/inc/svtools/useroptions.hxx)17
-rw-r--r--unotools/inc/unotools/useroptions_const.hxx (renamed from svtools/source/inc/configitems/useroptions_const.hxx)0
-rw-r--r--unotools/inc/unotools/viewoptions.hxx (renamed from svtools/inc/svtools/viewoptions.hxx)14
-rw-r--r--unotools/inc/unotools/workingsetoptions.hxx (renamed from svtools/inc/svtools/workingsetoptions.hxx)10
-rw-r--r--unotools/inc/unotools/xmlaccelcfg.hxx (renamed from svtools/inc/xmlaccelcfg.hxx)8
-rw-r--r--unotools/source/config/accelcfg.cxx (renamed from svtools/source/config/accelcfg.cxx)8
-rw-r--r--unotools/source/config/cacheoptions.cxx (renamed from svtools/source/config/cacheoptions.cxx)9
-rw-r--r--unotools/source/config/cmdoptions.cxx (renamed from svtools/source/config/cmdoptions.cxx)4
-rw-r--r--unotools/source/config/compatibility.cxx (renamed from svtools/source/config/compatibility.cxx)4
-rw-r--r--unotools/source/config/configitem.cxx42
-rw-r--r--unotools/source/config/defaultoptions.cxx (renamed from svtools/source/config/defaultoptions.cxx)18
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx (renamed from svtools/source/config/dynamicmenuoptions.cxx)6
-rw-r--r--unotools/source/config/eventcfg.cxx (renamed from svtools/source/config/eventcfg.cxx)4
-rw-r--r--unotools/source/config/extendedsecurityoptions.cxx (renamed from svtools/source/config/extendedsecurityoptions.cxx)8
-rw-r--r--unotools/source/config/fltrcfg.cxx (renamed from svtools/source/config/fltrcfg.cxx)14
-rw-r--r--unotools/source/config/fontcfg.cxx (renamed from vcl/source/gdi/fontcfg.cxx)199
-rw-r--r--unotools/source/config/fontoptions.cxx (renamed from svtools/source/config/fontoptions.cxx)6
-rw-r--r--unotools/source/config/historyoptions.cxx (renamed from svtools/source/config/historyoptions.cxx)10
-rw-r--r--unotools/source/config/inetoptions.cxx (renamed from svtools/source/config/inetoptions.cxx)6
-rw-r--r--unotools/source/config/internaloptions.cxx (renamed from svtools/source/config/internaloptions.cxx)6
-rw-r--r--unotools/source/config/itemholder1.cxx (renamed from svtools/source/config/itemholder1.cxx)95
-rw-r--r--unotools/source/config/itemholder1.hxx (renamed from svtools/source/config/itemholder1.hxx)8
-rw-r--r--unotools/source/config/javaoptions.cxx (renamed from svtools/source/config/javaoptions.cxx)15
-rw-r--r--unotools/source/config/lingucfg.cxx (renamed from svtools/source/config/lingucfg.cxx)13
-rw-r--r--unotools/source/config/localisationoptions.cxx (renamed from svtools/source/config/localisationoptions.cxx)8
-rw-r--r--unotools/source/config/makefile.mk40
-rw-r--r--unotools/source/config/menuoptions.cxx564
-rw-r--r--unotools/source/config/misccfg.cxx (renamed from svtools/source/config/misccfg.cxx)142
-rw-r--r--unotools/source/config/moduleoptions.cxx (renamed from svtools/source/config/moduleoptions.cxx)6
-rwxr-xr-xunotools/source/config/options.cxx109
-rw-r--r--unotools/source/config/optionsdlg.cxx (renamed from svtools/source/config/optionsdlg.cxx)4
-rw-r--r--unotools/source/config/optionsdrawinglayer.cxx1708
-rw-r--r--unotools/source/config/pathoptions.cxx (renamed from svtools/source/config/pathoptions.cxx)6
-rw-r--r--unotools/source/config/printwarningoptions.cxx (renamed from svtools/source/config/printwarningoptions.cxx)9
-rw-r--r--unotools/source/config/regoptions.cxx (renamed from svtools/source/config/regoptions.cxx)9
-rw-r--r--unotools/source/config/saveopt.cxx (renamed from svtools/source/config/saveopt.cxx)6
-rw-r--r--unotools/source/config/searchopt.cxx (renamed from svtools/source/config/searchopt.cxx)11
-rw-r--r--unotools/source/config/securityoptions.cxx (renamed from svtools/source/config/securityoptions.cxx)8
-rw-r--r--unotools/source/config/sourceviewconfig.cxx (renamed from svtools/source/config/sourceviewconfig.cxx)28
-rw-r--r--unotools/source/config/startoptions.cxx (renamed from svtools/source/config/startoptions.cxx)6
-rwxr-xr-x[-rw-r--r--]unotools/source/config/syslocaleoptions.cxx (renamed from svtools/source/config/syslocaleoptions.cxx)344
-rw-r--r--unotools/source/config/undoopt.cxx (renamed from svtools/source/config/undoopt.cxx)34
-rw-r--r--unotools/source/config/useroptions.cxx (renamed from svtools/source/config/useroptions.cxx)37
-rw-r--r--unotools/source/config/viewoptions.cxx (renamed from svtools/source/config/viewoptions.cxx)4
-rw-r--r--unotools/source/config/workingsetoptions.cxx (renamed from svtools/source/config/workingsetoptions.cxx)4
-rw-r--r--unotools/source/config/xmlaccelcfg.cxx (renamed from svtools/source/config/xmlaccelcfg.cxx)12
-rw-r--r--unotools/source/i18n/calendarwrapper.cxx52
-rw-r--r--unotools/source/i18n/charclass.cxx4
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx2
-rw-r--r--unotools/source/i18n/transliterationwrapper.cxx10
-rw-r--r--unotools/source/misc/fontcvt.cxx (renamed from vcl/source/gdi/fontcvt.cxx)45
-rw-r--r--unotools/source/misc/fontdefs.cxx596
-rw-r--r--unotools/source/misc/makefile.mk3
-rw-r--r--unotools/source/misc/syslocale.cxx (renamed from svtools/source/syslocale/syslocale.cxx)88
-rw-r--r--unotools/source/property/propertysetinfo.cxx2
-rw-r--r--vcl/aqua/inc/salframe.h3
-rwxr-xr-xvcl/aqua/inc/salframeview.h6
-rw-r--r--vcl/aqua/inc/salgdi.h1
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.cxx4
-rw-r--r--vcl/aqua/source/app/salinst.cxx4
-rwxr-xr-xvcl/aqua/source/gdi/salatslayout.cxx40
-rw-r--r--vcl/aqua/source/gdi/salatsuifontutils.cxx9
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx84
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx5
-rw-r--r--vcl/aqua/source/window/salframe.cxx24
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm60
-rw-r--r--vcl/inc/vcl/bitmapex.hxx13
-rw-r--r--vcl/inc/vcl/button.hxx28
-rw-r--r--vcl/inc/vcl/controldata.hxx60
-rw-r--r--vcl/inc/vcl/ctrl.hxx52
-rw-r--r--vcl/inc/vcl/cvtsvm.hxx4
-rw-r--r--vcl/inc/vcl/dialog.hxx1
-rw-r--r--vcl/inc/vcl/edit.hxx1
-rw-r--r--vcl/inc/vcl/fixbrd.hxx1
-rw-r--r--vcl/inc/vcl/fixed.hxx13
-rw-r--r--vcl/inc/vcl/fldunit.hxx10
-rw-r--r--vcl/inc/vcl/group.hxx5
-rw-r--r--vcl/inc/vcl/ilstbox.hxx1
-rw-r--r--vcl/inc/vcl/impimagetree.hxx22
-rw-r--r--vcl/inc/vcl/lineinfo.hxx37
-rw-r--r--vcl/inc/vcl/mapunit.hxx10
-rw-r--r--vcl/inc/vcl/outdev.h29
-rw-r--r--vcl/inc/vcl/outdev.hxx61
-rw-r--r--vcl/inc/vcl/outfont.hxx16
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx4
-rw-r--r--vcl/inc/vcl/salbtype.hxx32
-rw-r--r--vcl/inc/vcl/salframe.hxx1
-rw-r--r--vcl/inc/vcl/salsession.hxx10
-rw-r--r--vcl/inc/vcl/settings.hxx21
-rw-r--r--vcl/inc/vcl/slider.hxx1
-rw-r--r--vcl/inc/vcl/solar.hrc32
-rw-r--r--vcl/inc/vcl/svapp.hxx3
-rw-r--r--vcl/inc/vcl/svdata.hxx44
-rw-r--r--vcl/inc/vcl/syswin.hxx4
-rw-r--r--vcl/inc/vcl/tabctrl.hxx3
-rwxr-xr-xvcl/inc/vcl/textlayout.hxx134
-rw-r--r--vcl/inc/vcl/toolbox.h1
-rw-r--r--vcl/inc/vcl/vclevent.hxx33
-rw-r--r--vcl/inc/vcl/window.hxx1
-rw-r--r--vcl/inc/vcl/wintypes.hxx303
-rw-r--r--vcl/inc/vcl/wrkwin.hxx2
-rw-r--r--vcl/os2/source/app/salinst.cxx3
-rw-r--r--vcl/os2/source/gdi/salgdi.cxx2
-rw-r--r--vcl/os2/source/gdi/salgdi3.cxx6
-rw-r--r--vcl/os2/source/window/salframe.cxx6
-rw-r--r--vcl/prj/build.lst2
-rw-r--r--vcl/prj/d.lst1
-rw-r--r--vcl/source/app/salvtables.cxx7
-rw-r--r--vcl/source/app/session.cxx26
-rwxr-xr-x[-rw-r--r--]vcl/source/app/settings.cxx203
-rw-r--r--vcl/source/app/svapp.cxx173
-rw-r--r--vcl/source/app/svdata.cxx8
-rw-r--r--vcl/source/app/svmain.cxx10
-rw-r--r--vcl/source/app/vclevent.cxx53
-rw-r--r--vcl/source/control/button.cxx175
-rw-r--r--vcl/source/control/combobox.cxx6
-rw-r--r--vcl/source/control/ctrl.cxx189
-rw-r--r--vcl/source/control/edit.cxx20
-rw-r--r--vcl/source/control/field2.cxx11
-rw-r--r--vcl/source/control/fixed.cxx108
-rw-r--r--vcl/source/control/group.cxx44
-rw-r--r--vcl/source/control/ilstbox.cxx40
-rw-r--r--vcl/source/control/lstbox.cxx6
-rw-r--r--vcl/source/control/spinfld.cxx4
-rw-r--r--vcl/source/control/tabctrl.cxx73
-rw-r--r--vcl/source/fontsubset/cff.cxx78
-rw-r--r--vcl/source/fontsubset/gsub.cxx8
-rw-r--r--vcl/source/gdi/base14.cxx2
-rw-r--r--vcl/source/gdi/bitmapex.cxx73
-rw-r--r--vcl/source/gdi/configsettings.cxx205
-rw-r--r--vcl/source/gdi/cvtsvm.cxx354
-rw-r--r--vcl/source/gdi/font.cxx12
-rw-r--r--vcl/source/gdi/impimagetree.cxx60
-rw-r--r--vcl/source/gdi/implncvt.cxx577
-rw-r--r--vcl/source/gdi/implncvt.hxx78
-rw-r--r--vcl/source/gdi/lineinfo.cxx109
-rwxr-xr-x[-rw-r--r--]vcl/source/gdi/makefile.mk81
-rw-r--r--vcl/source/gdi/metaact.cxx114
-rw-r--r--vcl/source/gdi/outdev.cxx297
-rw-r--r--vcl/source/gdi/outdev3.cxx795
-rw-r--r--vcl/source/gdi/outdev6.cxx14
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx13
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx290
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx10
-rw-r--r--vcl/source/gdi/regband.cxx2
-rw-r--r--vcl/source/gdi/region.cxx25
-rw-r--r--vcl/source/gdi/salgdilayout.cxx1
-rwxr-xr-xvcl/source/gdi/sallayout.cxx15
-rw-r--r--vcl/source/gdi/salmisc.cxx8
-rwxr-xr-xvcl/source/gdi/textlayout.cxx384
-rw-r--r--vcl/source/glyphs/gcach_ftyp.cxx15
-rw-r--r--vcl/source/glyphs/glyphcache.cxx2
-rw-r--r--vcl/source/glyphs/graphite_adaptors.cxx10
-rw-r--r--vcl/source/glyphs/makefile.mk3
-rw-r--r--vcl/source/window/accmgr.cxx17
-rw-r--r--vcl/source/window/dialog.cxx14
-rw-r--r--vcl/source/window/menu.cxx24
-rw-r--r--vcl/source/window/status.cxx7
-rw-r--r--vcl/source/window/syswin.cxx24
-rw-r--r--vcl/source/window/toolbox2.cxx3
-rw-r--r--vcl/source/window/window.cxx6
-rw-r--r--vcl/source/window/wrkwin.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atktext.cxx12
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx13
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx21
-rw-r--r--vcl/unx/headless/svppspgraphics.cxx22
-rw-r--r--vcl/unx/inc/kde_headers.h97
-rw-r--r--vcl/unx/inc/plugins/gtk/gtkframe.hxx7
-rw-r--r--vcl/unx/inc/plugins/kde/kdedata.hxx2
-rw-r--r--vcl/unx/inc/salframe.h4
-rw-r--r--vcl/unx/inc/salunx.h6
-rw-r--r--vcl/unx/inc/sm.hxx2
-rw-r--r--vcl/unx/kde/kdedata.cxx2
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx7
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx33
-rw-r--r--vcl/unx/kde4/KDESalFrame.hxx2
-rw-r--r--vcl/unx/kde4/KDESalGraphics.cxx2
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx13
-rw-r--r--vcl/unx/source/app/i18n_ic.cxx4
-rw-r--r--vcl/unx/source/app/i18n_im.cxx2
-rw-r--r--vcl/unx/source/app/randrwrapper.cxx8
-rw-r--r--vcl/unx/source/app/saldisp.cxx7
-rw-r--r--vcl/unx/source/app/salinst.cxx4
-rw-r--r--vcl/unx/source/app/saltimer.cxx3
-rw-r--r--vcl/unx/source/app/sm.cxx13
-rw-r--r--vcl/unx/source/dtrans/X11_selection.cxx40
-rw-r--r--vcl/unx/source/gdi/pspgraphics.cxx22
-rw-r--r--vcl/unx/source/gdi/salgdi.cxx434
-rw-r--r--vcl/unx/source/gdi/xrender_peer.cxx4
-rw-r--r--vcl/unx/source/gdi/xrender_peer.hxx14
-rw-r--r--vcl/unx/source/plugadapt/salplug.cxx58
-rw-r--r--vcl/unx/source/printer/printerinfomanager.cxx2
-rw-r--r--vcl/unx/source/printergfx/common_gfx.cxx66
-rw-r--r--vcl/unx/source/printergfx/glyphset.cxx38
-rw-r--r--vcl/unx/source/window/salframe.cxx10
-rw-r--r--vcl/util/makefile.mk1
-rw-r--r--vcl/win/source/app/salinst.cxx3
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx15
-rw-r--r--vcl/win/source/gdi/salgdi_gdiplus.cxx74
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/winlayout.cxx5
-rw-r--r--vcl/win/source/window/salframe.cxx29
-rwxr-xr-xvcl/workben/outdevgrind.cxx12
893 files changed, 17487 insertions, 14295 deletions
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 15d2da39851a..d4d836a4b553 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index afadcad3b3fb..1b9e4ca0c68f 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 33ed58c25402..978c4bbe6243 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 2172b0b667a7..41da8cac617a 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index fcc4e5df5fa3..ba25cfa9044e 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2drange.hxx>
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 1a424864f893..b78175128eba 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 3ea13868aeb4..f7a5dded4cf1 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -57,7 +57,7 @@ CFLAGS += -fno-inline
# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
# if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS"
+.IF "$(OS)"=="SOLARIS"
# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
.IF "$(CCNUMVER)"!="00050005"
CDEFS+=-xalias_level=compatible
@@ -68,7 +68,7 @@ CDEFS+=-xalias_level=compatible
.IF "$(L10N_framework)"==""
# BEGIN ----------------------------------------------------------------
-# auto generated Target:tests by codegen.pl
+# auto generated Target:tests by codegen.pl
SHL1OBJS= \
$(SLO)$/basictest.obj \
$(SLO)$/bmpmasktest.obj \
@@ -88,13 +88,14 @@ SHL1OBJS= \
# source/makefile.mk
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
+ $(TESTSHL2LIB)\
$(CPPUNITLIB) \
- $(BASEGFXLIB)
+ $(BASEGFXLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1VERSIONMAP = export.map
.ENDIF
# END ------------------------------------------------------------------
@@ -111,7 +112,7 @@ SHL1VERSIONMAP = export.map
# $(CPPUHELPERLIB) \
# $(UCBHELPERLIB) \
# $(SALLIB) \
-# $(VCLLIB)
+# $(VCLLIB)
#
#.IF "$(GUI)"!="UNX"
#APP2DEF= $(MISC)$/$(TARGET).def
@@ -119,12 +120,12 @@ SHL1VERSIONMAP = export.map
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
.IF "$(L10N_framework)"==""
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 61f329f094f2..94e5bc42a5ea 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index e35c8c834bd9..da118e4b6d8a 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
index 4dc2f45568f1..81be451499ea 100644
--- a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
+++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
@@ -203,6 +203,22 @@ namespace basegfx
sense to use reserve(4) at the vector as preparation.
*/
void getAllExtremumPositions(::std::vector< double >& rResults) const;
+
+ /** Get optimum-split position on this segment
+
+ This method calculates the positions of all points of the segment
+ that have the maximimum distance to the corresponding line from
+ startpoint-endpoint. This helps to approximate the bezier curve
+ with a minimum number of line segments
+
+ @param fResults
+ Result positions are in the range ]0.0 .. 1.0[
+ Cubic beziers have at most two of these positions
+
+ @return
+ Returns the number of split positions found
+ */
+ int getMaxDistancePositions( double fResults[2]) const;
};
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
index c7c79d0cd6e9..10b023c5f68c 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
@@ -52,12 +52,22 @@ namespace basegfx
B2DHomMatrix(const B2DHomMatrix& rMat);
~B2DHomMatrix();
+ /** constructor to allow setting all needed values for a 3x2 matrix at once. The
+ parameter f_0x1 e.g. is the same as using set(0, 1, f)
+ */
+ B2DHomMatrix(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2);
+
/// unshare this matrix with all internally shared instances
void makeUnique();
double get(sal_uInt16 nRow, sal_uInt16 nColumn) const;
void set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue);
+ /** allow setting all needed values for a 3x2 matrix in one call. The
+ parameter f_0x1 e.g. is the same as using set(0, 1, f)
+ */
+ void set3x2(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2);
+
// test if last line is default to see if last line needs to be
// involved in calculations
bool isLastLineDefault() const;
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
index 0b200b812bed..c90f673a8194 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
@@ -40,45 +40,190 @@
namespace basegfx
{
- class DecomposedB2DHomMatrixContainer
+ namespace tools
{
- private:
- B2DHomMatrix maB2DHomMatrix;
- B2DVector maScale;
- B2DVector maTranslate;
- double mfRotate;
- double mfShearX;
+ /** If the rotation angle is an approximate multiple of pi/2,
+ force fSin/fCos to -1/0/1, to maintain orthogonality (which
+ might also be advantageous for the other cases, but: for
+ multiples of pi/2, the exact values _can_ be attained. It
+ would be largely unintuitive, if a 180 degrees rotation
+ would introduce slight roundoff errors, instead of exactly
+ mirroring the coordinate system)
+ */
+ void createSinCosOrthogonal(double& o_rSin, double& rCos, double fRadiant);
- // bitfield
- unsigned mbDecomposed : 1;
+ /** Tooling methods for on-the-fly matrix generation e.g. for inline
+ multiplications
+ */
+ B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double fScaleY);
+ B2DHomMatrix createShearXB2DHomMatrix(double fShearX);
+ B2DHomMatrix createShearYB2DHomMatrix(double fShearY);
+ B2DHomMatrix createRotateB2DHomMatrix(double fRadiant);
+ B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY);
- void impCheckDecompose()
+ /// inline versions for parameters as tuples
+ inline B2DHomMatrix createScaleB2DHomMatrix(const B2DTuple& rScale)
{
- if(!mbDecomposed)
- {
- maB2DHomMatrix.decompose(maScale, maTranslate, mfRotate, mfShearX);
- mbDecomposed = true;
- }
+ return createScaleB2DHomMatrix(rScale.getX(), rScale.getY());
+ }
+
+ inline B2DHomMatrix createTranslateB2DHomMatrix(const B2DTuple& rTranslate)
+ {
+ return createTranslateB2DHomMatrix(rTranslate.getX(), rTranslate.getY());
+ }
+
+ /** Tooling methods for faster completely combined matrix creation
+ when scale, shearX, rotation and translation needs to be done in
+ exactly that order. It's faster since it direcly calculates
+ each matrix value based on a symbolic calculation of the three
+ matrix multiplications.
+ Inline versions for parameters as tuples added, too.
+ */
+ B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix(
+ double fScaleX, double fScaleY,
+ double fShearX,
+ double fRadiant,
+ double fTranslateX, double fTranslateY);
+ inline B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix(
+ const B2DTuple& rScale,
+ double fShearX,
+ double fRadiant,
+ const B2DTuple& rTranslate)
+ {
+ return createScaleShearXRotateTranslateB2DHomMatrix(
+ rScale.getX(), rScale.getY(),
+ fShearX,
+ fRadiant,
+ rTranslate.getX(), rTranslate.getY());
+ }
+
+ B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
+ double fShearX,
+ double fRadiant,
+ double fTranslateX, double fTranslateY);
+ inline B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
+ double fShearX,
+ double fRadiant,
+ const B2DTuple& rTranslate)
+ {
+ return createShearXRotateTranslateB2DHomMatrix(
+ fShearX,
+ fRadiant,
+ rTranslate.getX(), rTranslate.getY());
}
- public:
- DecomposedB2DHomMatrixContainer(const B2DHomMatrix& rB2DHomMatrix)
- : maB2DHomMatrix(rB2DHomMatrix),
- maScale(),
- maTranslate(),
- mfRotate(0.0),
- mfShearX(0.0),
- mbDecomposed(false)
+ B2DHomMatrix createScaleTranslateB2DHomMatrix(
+ double fScaleX, double fScaleY,
+ double fTranslateX, double fTranslateY);
+ inline B2DHomMatrix createScaleTranslateB2DHomMatrix(
+ const B2DTuple& rScale,
+ const B2DTuple& rTranslate)
{
+ return createScaleTranslateB2DHomMatrix(
+ rScale.getX(), rScale.getY(),
+ rTranslate.getX(), rTranslate.getY());
}
- // data access
- const B2DHomMatrix& getB2DHomMatrix() const { return maB2DHomMatrix; }
- const B2DVector& getScale() const { const_cast< DecomposedB2DHomMatrixContainer* >(this)->impCheckDecompose(); return maScale; }
- const B2DVector& getTranslate() const { const_cast< DecomposedB2DHomMatrixContainer* >(this)->impCheckDecompose(); return maTranslate; }
- double getRotate() const { const_cast< DecomposedB2DHomMatrixContainer* >(this)->impCheckDecompose(); return mfRotate; }
- double getShearX() const { const_cast< DecomposedB2DHomMatrixContainer* >(this)->impCheckDecompose(); return mfShearX; }
- };
+ /// special for the often used case of rotation around a point
+ B2DHomMatrix createRotateAroundPoint(
+ double fPointX, double fPointY,
+ double fRadiant);
+ inline B2DHomMatrix createRotateAroundPoint(
+ const B2DTuple& rPoint,
+ double fRadiant)
+ {
+ return createRotateAroundPoint(
+ rPoint.getX(), rPoint.getY(),
+ fRadiant);
+ }
+ } // end of namespace tools
+} // end of namespace basegfx
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ namespace tools
+ {
+ class B2DHomMatrixBufferedDecompose
+ {
+ private:
+ B2DVector maScale;
+ B2DVector maTranslate;
+ double mfRotate;
+ double mfShearX;
+
+ public:
+ B2DHomMatrixBufferedDecompose(const B2DHomMatrix& rB2DHomMatrix)
+ : maScale(),
+ maTranslate(),
+ mfRotate(0.0),
+ mfShearX(0.0)
+ {
+ rB2DHomMatrix.decompose(maScale, maTranslate, mfRotate, mfShearX);
+ }
+
+ // data access
+ B2DHomMatrix getB2DHomMatrix() const
+ {
+ return createScaleShearXRotateTranslateB2DHomMatrix(
+ maScale, mfShearX, mfRotate, maTranslate);
+ }
+
+ const B2DVector& getScale() const { return maScale; }
+ const B2DVector& getTranslate() const { return maTranslate; }
+ double getRotate() const { return mfRotate; }
+ double getShearX() const { return mfShearX; }
+ };
+ } // end of namespace tools
+} // end of namespace basegfx
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ namespace tools
+ {
+ class B2DHomMatrixBufferedOnDemandDecompose
+ {
+ private:
+ B2DHomMatrix maB2DHomMatrix;
+ B2DVector maScale;
+ B2DVector maTranslate;
+ double mfRotate;
+ double mfShearX;
+
+ // bitfield
+ unsigned mbDecomposed : 1;
+
+ void impCheckDecompose()
+ {
+ if(!mbDecomposed)
+ {
+ maB2DHomMatrix.decompose(maScale, maTranslate, mfRotate, mfShearX);
+ mbDecomposed = true;
+ }
+ }
+
+ public:
+ B2DHomMatrixBufferedOnDemandDecompose(const B2DHomMatrix& rB2DHomMatrix)
+ : maB2DHomMatrix(rB2DHomMatrix),
+ maScale(),
+ maTranslate(),
+ mfRotate(0.0),
+ mfShearX(0.0),
+ mbDecomposed(false)
+ {
+ }
+
+ // data access
+ const B2DHomMatrix& getB2DHomMatrix() const { return maB2DHomMatrix; }
+ const B2DVector& getScale() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maScale; }
+ const B2DVector& getTranslate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maTranslate; }
+ double getRotate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfRotate; }
+ double getShearX() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfShearX; }
+ };
+ } // end of namespace tools
} // end of namespace basegfx
///////////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index ee12d55d460b..c0de4b57ced8 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: b2dpolygon.hxx,v $
- * $Revision: 1.14 $
*
* This file is part of OpenOffice.org.
*
@@ -88,7 +87,9 @@ namespace basegfx
/// Coordinate insert/append
void insert(sal_uInt32 nIndex, const basegfx::B2DPoint& rPoint, sal_uInt32 nCount = 1);
- void append(const basegfx::B2DPoint& rPoint, sal_uInt32 nCount = 1);
+ void append(const basegfx::B2DPoint& rPoint, sal_uInt32 nCount);
+ void append(const basegfx::B2DPoint& rPoint);
+ void reserve(sal_uInt32 nCount);
/// Basic ControlPoint interface
basegfx::B2DPoint getPrevControlPoint(sal_uInt32 nIndex) const;
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
index 5eff6b0b9cc1..47ff41b75e70 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
@@ -288,14 +288,6 @@ namespace basegfx
*/
B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius );
- /** append a unit circle with one point and the control vectors to the given polygon
- */
- void appendUnitCircleQuadrant(B2DPolygon& rPolygon, sal_uInt32 nQuadrant, bool bEndPoint);
-
- /** append a segment of unit circle with one point and the control vectors to the given polygon
- */
- void appendUnitCircleQuadrantSegment(B2DPolygon& rPolygon, sal_uInt32 nQuadrant, double fStart, double fEnd, bool bEndPoint);
-
/** create a polygon which describes the unit circle and close it
@param nStartQuadrant
@@ -325,59 +317,6 @@ namespace basegfx
*/
B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY );
- /** append a unit circle with one point and the control vectors to the given polygon
- */
- void appendUnitCircleQuadrant(B2DPolygon& rPolygon, sal_uInt32 nQuadrant);
-
- /** append a segment of unit circle with start point, the control vectors and end point to the given polygon
- */
- void appendUnitCircleQuadrantSegment(B2DPolygon& rPolygon, sal_uInt32 nQuadrant, double fStart, double fEnd);
-
- /** Create an ellipse polygon with given radii.
-
- This method creates an ellipse approximation consisting of
- four cubic bezier segments, which approximate the given
- ellipse with an error of less than 0.5 percent.
-
- @param rCenter
- Center point of the circle
-
- @param fRadiusX
- Radius of the ellipse in X direction
-
- @param fRadiusY
- Radius of the ellipse in Y direction
-
- @param fStart
- Start angle where the ellipe segment starts in the range [0.0 .. 2PI[
-
- @param fEnd
- End angle where the ellipe segment ends in the range [0.0 .. 2PI[
- */
- B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY );
-
- /** Create an ellipse polygon with given radii and the given angles, from start to end
-
- This method creates an ellipse approximation consisting of
- four cubic bezier segments, which approximate the given
- ellipse with an error of less than 0.5 percent.
-
- @param rCenter
- Center point of the circle
-
- @param fRadiusX
- Radius of the ellipse in X direction
-
- @param fRadiusY
- Radius of the ellipse in Y direction
-
- @param fStart
- Start angle where the ellipe segment starts in the range [0.0 .. 2PI[
-
- @param fEnd
- End angle where the ellipe segment ends in the range [0.0 .. 2PI[
- */
-
/** Create an unit ellipse polygon with the given angles, from start to end
*/
B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double fStart, double fEnd );
diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx
index efca06d92dfd..366431c3cd50 100644
--- a/basegfx/inc/basegfx/range/b1drange.hxx
+++ b/basegfx/inc/basegfx/range/b1drange.hxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: b1drange.hxx,v $
- * $Revision: 1.15 $
*
* This file is part of OpenOffice.org.
*
@@ -131,6 +130,11 @@ namespace basegfx
return maRange.overlaps(rRange.maRange);
}
+ bool overlapsMore(const B1DRange& rRange) const
+ {
+ return maRange.overlapsMore(rRange.maRange);
+ }
+
void expand(double fValue)
{
maRange.expand(fValue);
diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/basegfx/inc/basegfx/range/b2drange.hxx
index 66892865399f..8a70d4782f47 100644
--- a/basegfx/inc/basegfx/range/b2drange.hxx
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: b2drange.hxx,v $
- * $Revision: 1.19 $
*
* This file is part of OpenOffice.org.
*
@@ -222,6 +221,14 @@ namespace basegfx
);
}
+ bool overlapsMore(const B2DRange& rRange) const
+ {
+ return (
+ maRangeX.overlapsMore(rRange.maRangeX)
+ && maRangeY.overlapsMore(rRange.maRangeY)
+ );
+ }
+
void expand(const B2DTuple& rTuple)
{
maRangeX.expand(rTuple.getX());
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
index a7c402c905c8..59d13cf530c0 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: basicrange.hxx,v $
- * $Revision: 1.15 $
*
* This file is part of OpenOffice.org.
*
@@ -142,6 +141,14 @@ namespace basegfx
}
}
+ bool overlapsMore(const BasicRange& rRange) const
+ {
+ if(isEmpty() || rRange.isEmpty())
+ return false;
+ // returns true if the overlap is more than just a touching at the limits
+ return ((rRange.mnMaximum > mnMinimum) && (rRange.mnMinimum < mnMaximum));
+ }
+
bool operator==( const BasicRange& rRange ) const
{
return (mnMinimum == rRange.mnMinimum && mnMaximum == rRange.mnMaximum);
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index e7247a95333b..83c620df7870 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: b2dcubicbezier.cxx,v $
- * $Revision: 1.16 $
*
* This file is part of OpenOffice.org.
*
@@ -1045,6 +1044,65 @@ namespace basegfx
impCheckExtremumResult(fCY / (2 * fBY), rResults);
}
}
+
+ int B2DCubicBezier::getMaxDistancePositions( double pResult[2]) const
+ {
+ // the distance from the bezier to a line through start and end
+ // is proportional to (ENDx-STARTx,ENDy-STARTy)*(+BEZIERy(t),-BEZIERx(t))
+ // this distance becomes zero for at least t==0 and t==1
+ // its extrema that are between 0..1 are interesting as split candidates
+ // its derived function has the form dD/dt = fA*t^2 + 2*fB*t + fC
+ const B2DPoint aRelativeEndPoint(maEndPoint-maStartPoint);
+ const double fA = 3 * (maEndPoint.getX() - maControlPointB.getX()) * aRelativeEndPoint.getY()
+ - 3 * (maEndPoint.getY() - maControlPointB.getY()) * aRelativeEndPoint.getX();
+ const double fB = (maControlPointB.getX() - maControlPointA.getX()) * aRelativeEndPoint.getY()
+ - (maControlPointB.getY() - maControlPointA.getY()) * aRelativeEndPoint.getX();
+ const double fC = (maControlPointA.getX() - maStartPoint.getX()) * aRelativeEndPoint.getY()
+ - (maControlPointA.getY() - maStartPoint.getY()) * aRelativeEndPoint.getX();
+
+ // test for degenerated case: non-cubic curve
+ if( fTools::equalZero(fA) )
+ {
+ // test for degenerated case: straight line
+ if( fTools::equalZero(fB) )
+ return 0;
+
+ // degenerated case: quadratic bezier
+ pResult[0] = -fC / (2*fB);
+
+ // test root: ignore it when it is outside the curve
+ int nCount = ((pResult[0] > 0) && (pResult[0] < 1));
+ return nCount;
+ }
+
+ // derivative is polynomial of order 2
+ // check if the polynomial has non-imaginary roots
+ const double fD = fB*fB - fA*fC;
+ if( fD >= 0.0 ) // TODO: is this test needed? geometrically not IMHO
+ {
+ // calculate the first root
+ const double fS = sqrt(fD);
+ const double fQ = fB + ((fB >= 0) ? +fS : -fS);
+ pResult[0] = fQ / fA;
+ // test root: ignore it when it is outside the curve
+ int nCount = ((pResult[0] > 0) && (pResult[0] < 1));
+
+ // ignore multiplicit roots
+ if( !fTools::equalZero(fD) )
+ {
+ // calculate the second root
+ const double fRoot = fC / fQ;
+ pResult[ nCount ] = fC / fQ;
+ // test root: ignore it when it is outside the curve
+ nCount += ((fRoot > 0) && (fRoot < 1));
+ }
+
+ return nCount;
+ }
+
+ return 0;
+ }
+
} // end of namespace basegfx
// eof
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx
index 352113fa8ed3..a7777352effb 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -36,6 +36,9 @@
#include <hommatrixtemplate.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+///////////////////////////////////////////////////////////////////////////////
namespace basegfx
{
@@ -60,6 +63,17 @@ namespace basegfx
{
}
+ B2DHomMatrix::B2DHomMatrix(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2)
+ : mpImpl( IdentityMatrix::get() ) // use common identity matrix, will be made unique with 1st set-call
+ {
+ mpImpl->set(0, 0, f_0x0);
+ mpImpl->set(0, 1, f_0x1);
+ mpImpl->set(0, 2, f_0x2);
+ mpImpl->set(1, 0, f_1x0);
+ mpImpl->set(1, 1, f_1x1);
+ mpImpl->set(1, 2, f_1x2);
+ }
+
B2DHomMatrix& B2DHomMatrix::operator=(const B2DHomMatrix& rMat)
{
mpImpl = rMat.mpImpl;
@@ -81,6 +95,16 @@ namespace basegfx
mpImpl->set(nRow, nColumn, fValue);
}
+ void B2DHomMatrix::set3x2(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2)
+ {
+ mpImpl->set(0, 0, f_0x0);
+ mpImpl->set(0, 1, f_0x1);
+ mpImpl->set(0, 2, f_0x2);
+ mpImpl->set(1, 0, f_1x0);
+ mpImpl->set(1, 1, f_1x1);
+ mpImpl->set(1, 2, f_1x2);
+ }
+
bool B2DHomMatrix::isLastLineDefault() const
{
return mpImpl->isLastLineDefault();
@@ -206,56 +230,9 @@ namespace basegfx
if(!fTools::equalZero(fRadiant))
{
double fSin(0.0);
- double fCos(0.0);
-
- // is the rotation angle an approximate multiple of pi/2?
- // If yes, force fSin/fCos to -1/0/1, to maintain
- // orthogonality (which might also be advantageous for the
- // other cases, but: for multiples of pi/2, the exact
- // values _can_ be attained. It would be largely
- // unintuitive, if a 180 degrees rotation would introduce
- // slight roundoff errors, instead of exactly mirroring
- // the coordinate system).
- if( fTools::equalZero( fmod( fRadiant, F_PI2 ) ) )
- {
- // determine quadrant
- const sal_Int32 nQuad(
- (4 + fround( 4/F_2PI*fmod( fRadiant, F_2PI ) )) % 4 );
- switch( nQuad )
- {
- case 0: // -2pi,0,2pi
- fSin = 0.0;
- fCos = 1.0;
- break;
-
- case 1: // -3/2pi,1/2pi
- fSin = 1.0;
- fCos = 0.0;
- break;
-
- case 2: // -pi,pi
- fSin = 0.0;
- fCos = -1.0;
- break;
-
- case 3: // -1/2pi,3/2pi
- fSin = -1.0;
- fCos = 0.0;
- break;
-
- default:
- OSL_ENSURE( false,
- "B2DHomMatrix::rotate(): Impossible case reached" );
- }
- }
- else
- {
- // TODO(P1): Maybe use glibc's sincos here (though
- // that's kinda non-portable...)
- fSin = sin(fRadiant);
- fCos = cos(fRadiant);
- }
+ double fCos(1.0);
+ tools::createSinCosOrthogonal(fSin, fCos, fRadiant);
Impl2DHomMatrix aRotMat;
aRotMat.set(0, 0, fCos);
@@ -474,104 +451,7 @@ namespace basegfx
return true;
}
-
-/* Old version: Used 3D decompose when shaer was involved and also a determinant test
- (but only in that case). Keeping as comment since it also worked and to allow a
- fallback in case the new version makes trouble somehow. Definitely missing in the 2nd
- case is the sign correction for Y-Scale, this would need to be added following the above
- pattern
-
- bool B2DHomMatrix::decompose(B2DTuple& rScale, B2DTuple& rTranslate, double& rRotate, double& rShearX) const
- {
- // when perspective is used, decompose is not made here
- if(!mpImpl->isLastLineDefault())
- return false;
-
- // test for rotation and shear
- if(fTools::equalZero(get(0, 1))
- && fTools::equalZero(get(1, 0)))
- {
- // no rotation and shear, direct value extraction
- rRotate = rShearX = 0.0;
-
- // copy scale values
- rScale.setX(get(0, 0));
- rScale.setY(get(1, 1));
-
- // copy translation values
- rTranslate.setX(get(0, 2));
- rTranslate.setY(get(1, 2));
-
- return true;
- }
- else
- {
- // test if shear is zero. That's the case, if the unit vectors in the matrix
- // are perpendicular -> scalar is zero
- const ::basegfx::B2DVector aUnitVecX(get(0, 0), get(1, 0));
- const ::basegfx::B2DVector aUnitVecY(get(0, 1), get(1, 1));
-
- if(fTools::equalZero(aUnitVecX.scalar(aUnitVecY)))
- {
- // no shear, direct value extraction
- rShearX = 0.0;
-
- // calculate rotation
- rShearX = 0.0;
- rRotate = atan2(aUnitVecX.getY(), aUnitVecX.getX());
-
- // calculate scale values
- rScale.setX(aUnitVecX.getLength());
- rScale.setY(aUnitVecY.getLength());
-
- // copy translation values
- rTranslate.setX(get(0, 2));
- rTranslate.setY(get(1, 2));
-
- return true;
- }
- else
- {
- // If determinant is zero, decomposition is not possible
- if(0.0 == determinant())
- return false;
-
- // copy 2x2 matrix and translate vector to 3x3 matrix
- ::basegfx::B3DHomMatrix a3DHomMat;
-
- a3DHomMat.set(0, 0, get(0, 0));
- a3DHomMat.set(0, 1, get(0, 1));
- a3DHomMat.set(1, 0, get(1, 0));
- a3DHomMat.set(1, 1, get(1, 1));
- a3DHomMat.set(0, 3, get(0, 2));
- a3DHomMat.set(1, 3, get(1, 2));
-
- ::basegfx::B3DTuple r3DScale, r3DTranslate, r3DRotate, r3DShear;
-
- if(a3DHomMat.decompose(r3DScale, r3DTranslate, r3DRotate, r3DShear))
- {
- // copy scale values
- rScale.setX(r3DScale.getX());
- rScale.setY(r3DScale.getY());
-
- // copy shear
- rShearX = r3DShear.getX();
-
- // copy rotate
- rRotate = r3DRotate.getZ();
-
- // copy translate
- rTranslate.setX(r3DTranslate.getX());
- rTranslate.setY(r3DTranslate.getY());
-
- return true;
- }
- }
- }
-
- return false;
- } */
-
} // end of namespace basegfx
+///////////////////////////////////////////////////////////////////////////////
// eof
diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx
index 59a1ff432fc7..2c71193f6352 100644
--- a/basegfx/source/matrix/b2dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b2dhommatrixtools.cxx
@@ -38,6 +38,339 @@
namespace basegfx
{
+ namespace tools
+ {
+ void createSinCosOrthogonal(double& o_rSin, double& o_rCos, double fRadiant)
+ {
+ if( fTools::equalZero( fmod( fRadiant, F_PI2 ) ) )
+ {
+ // determine quadrant
+ const sal_Int32 nQuad(
+ (4 + fround( 4/F_2PI*fmod( fRadiant, F_2PI ) )) % 4 );
+ switch( nQuad )
+ {
+ case 0: // -2pi,0,2pi
+ o_rSin = 0.0;
+ o_rCos = 1.0;
+ break;
+
+ case 1: // -3/2pi,1/2pi
+ o_rSin = 1.0;
+ o_rCos = 0.0;
+ break;
+
+ case 2: // -pi,pi
+ o_rSin = 0.0;
+ o_rCos = -1.0;
+ break;
+
+ case 3: // -1/2pi,3/2pi
+ o_rSin = -1.0;
+ o_rCos = 0.0;
+ break;
+
+ default:
+ OSL_ENSURE( false, "createSinCos: Impossible case reached" );
+ }
+ }
+ else
+ {
+ // TODO(P1): Maybe use glibc's sincos here (though
+ // that's kinda non-portable...)
+ o_rSin = sin(fRadiant);
+ o_rCos = cos(fRadiant);
+ }
+ }
+
+ B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double fScaleY)
+ {
+ B2DHomMatrix aRetval;
+ const double fOne(1.0);
+
+ if(!fTools::equal(fScaleX, fOne))
+ {
+ aRetval.set(0, 0, fScaleX);
+ }
+
+ if(!fTools::equal(fScaleY, fOne))
+ {
+ aRetval.set(1, 1, fScaleY);
+ }
+
+ return aRetval;
+ }
+
+ B2DHomMatrix createShearXB2DHomMatrix(double fShearX)
+ {
+ B2DHomMatrix aRetval;
+
+ if(!fTools::equalZero(fShearX))
+ {
+ aRetval.set(0, 1, fShearX);
+ }
+
+ return aRetval;
+ }
+
+ B2DHomMatrix createShearYB2DHomMatrix(double fShearY)
+ {
+ B2DHomMatrix aRetval;
+
+ if(!fTools::equalZero(fShearY))
+ {
+ aRetval.set(1, 0, fShearY);
+ }
+
+ return aRetval;
+ }
+
+ B2DHomMatrix createRotateB2DHomMatrix(double fRadiant)
+ {
+ B2DHomMatrix aRetval;
+
+ if(!fTools::equalZero(fRadiant))
+ {
+ double fSin(0.0);
+ double fCos(1.0);
+
+ createSinCosOrthogonal(fSin, fCos, fRadiant);
+ aRetval.set(0, 0, fCos);
+ aRetval.set(1, 1, fCos);
+ aRetval.set(1, 0, fSin);
+ aRetval.set(0, 1, -fSin);
+ }
+
+ return aRetval;
+ }
+
+ B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY)
+ {
+ B2DHomMatrix aRetval;
+
+ if(!(fTools::equalZero(fTranslateX) && fTools::equalZero(fTranslateY)))
+ {
+ aRetval.set(0, 2, fTranslateX);
+ aRetval.set(1, 2, fTranslateY);
+ }
+
+ return aRetval;
+ }
+
+ B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix(
+ double fScaleX, double fScaleY,
+ double fShearX,
+ double fRadiant,
+ double fTranslateX, double fTranslateY)
+ {
+ const double fOne(1.0);
+
+ if(fTools::equal(fScaleX, fOne) && fTools::equal(fScaleY, fOne))
+ {
+ /// no scale, take shortcut
+ return createShearXRotateTranslateB2DHomMatrix(fShearX, fRadiant, fTranslateX, fTranslateY);
+ }
+ else
+ {
+ /// scale used
+ if(fTools::equalZero(fShearX))
+ {
+ /// no shear
+ if(fTools::equalZero(fRadiant))
+ {
+ /// no rotate, take shortcut
+ return createScaleTranslateB2DHomMatrix(fScaleX, fScaleY, fTranslateX, fTranslateY);
+ }
+ else
+ {
+ /// rotate and scale used, no shear
+ double fSin(0.0);
+ double fCos(1.0);
+
+ createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+ B2DHomMatrix aRetval(
+ /* Row 0, Column 0 */ fCos * fScaleX,
+ /* Row 0, Column 1 */ fScaleY * -fSin,
+ /* Row 0, Column 2 */ fTranslateX,
+ /* Row 1, Column 0 */ fSin * fScaleX,
+ /* Row 1, Column 1 */ fScaleY * fCos,
+ /* Row 1, Column 2 */ fTranslateY);
+
+ return aRetval;
+ }
+ }
+ else
+ {
+ /// scale and shear used
+ if(fTools::equalZero(fRadiant))
+ {
+ /// scale and shear, but no rotate
+ B2DHomMatrix aRetval(
+ /* Row 0, Column 0 */ fScaleX,
+ /* Row 0, Column 1 */ fScaleY * fShearX,
+ /* Row 0, Column 2 */ fTranslateX,
+ /* Row 1, Column 0 */ 0.0,
+ /* Row 1, Column 1 */ fScaleY,
+ /* Row 1, Column 2 */ fTranslateY);
+
+ return aRetval;
+ }
+ else
+ {
+ /// scale, shear and rotate used
+ double fSin(0.0);
+ double fCos(1.0);
+
+ createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+ B2DHomMatrix aRetval(
+ /* Row 0, Column 0 */ fCos * fScaleX,
+ /* Row 0, Column 1 */ fScaleY * ((fCos * fShearX) - fSin),
+ /* Row 0, Column 2 */ fTranslateX,
+ /* Row 1, Column 0 */ fSin * fScaleX,
+ /* Row 1, Column 1 */ fScaleY * ((fSin * fShearX) + fCos),
+ /* Row 1, Column 2 */ fTranslateY);
+
+ return aRetval;
+ }
+ }
+ }
+ }
+
+ B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
+ double fShearX,
+ double fRadiant,
+ double fTranslateX, double fTranslateY)
+ {
+ if(fTools::equalZero(fShearX))
+ {
+ /// no shear
+ if(fTools::equalZero(fRadiant))
+ {
+ /// no shear, no rotate, take shortcut
+ return createTranslateB2DHomMatrix(fTranslateX, fTranslateY);
+ }
+ else
+ {
+ /// no shear, but rotate used
+ double fSin(0.0);
+ double fCos(1.0);
+
+ createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+ B2DHomMatrix aRetval(
+ /* Row 0, Column 0 */ fCos,
+ /* Row 0, Column 1 */ -fSin,
+ /* Row 0, Column 2 */ fTranslateX,
+ /* Row 1, Column 0 */ fSin,
+ /* Row 1, Column 1 */ fCos,
+ /* Row 1, Column 2 */ fTranslateY);
+
+ return aRetval;
+ }
+ }
+ else
+ {
+ /// shear used
+ if(fTools::equalZero(fRadiant))
+ {
+ /// no rotate, but shear used
+ B2DHomMatrix aRetval(
+ /* Row 0, Column 0 */ 1.0,
+ /* Row 0, Column 1 */ fShearX,
+ /* Row 0, Column 2 */ fTranslateX,
+ /* Row 1, Column 0 */ 0.0,
+ /* Row 1, Column 1 */ 1.0,
+ /* Row 1, Column 2 */ fTranslateY);
+
+ return aRetval;
+ }
+ else
+ {
+ /// shear and rotate used
+ double fSin(0.0);
+ double fCos(1.0);
+
+ createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+ B2DHomMatrix aRetval(
+ /* Row 0, Column 0 */ fCos,
+ /* Row 0, Column 1 */ (fCos * fShearX) - fSin,
+ /* Row 0, Column 2 */ fTranslateX,
+ /* Row 1, Column 0 */ fSin,
+ /* Row 1, Column 1 */ (fSin * fShearX) + fCos,
+ /* Row 1, Column 2 */ fTranslateY);
+
+ return aRetval;
+ }
+ }
+ }
+
+ B2DHomMatrix createScaleTranslateB2DHomMatrix(
+ double fScaleX, double fScaleY,
+ double fTranslateX, double fTranslateY)
+ {
+ const double fOne(1.0);
+
+ if(fTools::equal(fScaleX, fOne) && fTools::equal(fScaleY, fOne))
+ {
+ /// no scale, take shortcut
+ return createTranslateB2DHomMatrix(fTranslateX, fTranslateY);
+ }
+ else
+ {
+ /// scale used
+ if(fTools::equalZero(fTranslateX) && fTools::equalZero(fTranslateY))
+ {
+ /// no translate, but scale.
+ B2DHomMatrix aRetval;
+
+ aRetval.set(0, 0, fScaleX);
+ aRetval.set(1, 1, fScaleY);
+
+ return aRetval;
+ }
+ else
+ {
+ /// translate and scale
+ B2DHomMatrix aRetval(
+ /* Row 0, Column 0 */ fScaleX,
+ /* Row 0, Column 1 */ 0.0,
+ /* Row 0, Column 2 */ fTranslateX,
+ /* Row 1, Column 0 */ 0.0,
+ /* Row 1, Column 1 */ fScaleY,
+ /* Row 1, Column 2 */ fTranslateY);
+
+ return aRetval;
+ }
+ }
+ }
+
+ B2DHomMatrix createRotateAroundPoint(
+ double fPointX, double fPointY,
+ double fRadiant)
+ {
+ B2DHomMatrix aRetval;
+
+ if(!fTools::equalZero(fRadiant))
+ {
+ double fSin(0.0);
+ double fCos(1.0);
+
+ createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+ aRetval.set3x2(
+ /* Row 0, Column 0 */ fCos,
+ /* Row 0, Column 1 */ -fSin,
+ /* Row 0, Column 2 */ (fPointX * (1.0 - fCos)) + (fSin * fPointY),
+ /* Row 1, Column 0 */ fSin,
+ /* Row 1, Column 1 */ fCos,
+ /* Row 1, Column 2 */ (fPointY * (1.0 - fCos)) - (fSin * fPointX));
+ }
+
+ return aRetval;
+ }
+ } // end of namespace tools
} // end of namespace basegfx
///////////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index 1a9264ab769e..c22b5ea94011 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -40,6 +40,7 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -85,11 +86,9 @@ namespace basegfx
// get size of the arrow
const B2DRange aArrowSize(getRange(rArrow));
- // build ArrowTransform
- B2DHomMatrix aArrowTransform;
-
- // center in X, align with axis in Y
- aArrowTransform.translate(-aArrowSize.getCenter().getX(), -aArrowSize.getMinimum().getY());
+ // build ArrowTransform; center in X, align with axis in Y
+ B2DHomMatrix aArrowTransform(basegfx::tools::createTranslateB2DHomMatrix(
+ -aArrowSize.getCenter().getX(), -aArrowSize.getMinimum().getY()));
// scale to target size
const double fArrowScale(fWidth / (aArrowSize.getRange().getX()));
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 467a4b90f516..48d00ddcec7d 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: b2dpolygon.cxx,v $
- * $Revision: 1.22 $
*
* This file is part of OpenOffice.org.
*
@@ -123,6 +122,16 @@ public:
maVector[nIndex].setCoordinate(rValue);
}
+ void reserve(sal_uInt32 nCount)
+ {
+ maVector.reserve(nCount);
+ }
+
+ void append(const CoordinateData2D& rValue)
+ {
+ maVector.push_back(rValue);
+ }
+
void insert(sal_uInt32 nIndex, const CoordinateData2D& rValue, sal_uInt32 nCount)
{
if(nCount)
@@ -380,6 +389,17 @@ public:
}
}
+ void append(const ControlVectorPair2D& rValue)
+ {
+ maVector.push_back(rValue);
+
+ if(!rValue.getPrevVector().equalZero())
+ mnUsedVectors += 1;
+
+ if(!rValue.getNextVector().equalZero())
+ mnUsedVectors += 1;
+ }
+
void insert(sal_uInt32 nIndex, const ControlVectorPair2D& rValue, sal_uInt32 nCount)
{
if(nCount)
@@ -741,6 +761,24 @@ public:
maPoints.setCoordinate(nIndex, rValue);
}
+ void reserve(sal_uInt32 nCount)
+ {
+ maPoints.reserve(nCount);
+ }
+
+ void append(const basegfx::B2DPoint& rPoint)
+ {
+ mpBufferedData.reset(); // TODO: is this needed?
+ const CoordinateData2D aCoordinate(rPoint);
+ maPoints.append(aCoordinate);
+
+ if(mpControlVector)
+ {
+ const ControlVectorPair2D aVectorPair;
+ mpControlVector->append(aVectorPair);
+ }
+ }
+
void insert(sal_uInt32 nIndex, const basegfx::B2DPoint& rPoint, sal_uInt32 nCount)
{
if(nCount)
@@ -1190,6 +1228,11 @@ namespace basegfx
}
}
+ void B2DPolygon::reserve(sal_uInt32 nCount)
+ {
+ mpPolygon->reserve(nCount);
+ }
+
void B2DPolygon::insert(sal_uInt32 nIndex, const B2DPoint& rPoint, sal_uInt32 nCount)
{
OSL_ENSURE(nIndex <= mpPolygon->count(), "B2DPolygon Insert outside range (!)");
@@ -1208,6 +1251,11 @@ namespace basegfx
}
}
+ void B2DPolygon::append(const B2DPoint& rPoint)
+ {
+ mpPolygon->append(rPoint);
+ }
+
B2DPoint B2DPolygon::getPrevControlPoint(sal_uInt32 nIndex) const
{
OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index f0d325942c07..87e44ed3d063 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -40,6 +40,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>
#include <basegfx/tools/rectcliptools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -361,11 +362,10 @@ namespace basegfx
else if(rCandidate.count())
{
const B2DVector aEdge(rPointB - rPointA);
- B2DHomMatrix aMatrixTransform;
B2DPolygon aCandidate(rCandidate);
// translate and rotate polygon so that given edge is on x axis
- aMatrixTransform.translate(-rPointA.getX(), -rPointA.getY());
+ B2DHomMatrix aMatrixTransform(basegfx::tools::createTranslateB2DHomMatrix(-rPointA.getX(), -rPointA.getY()));
aMatrixTransform.rotate(-atan2(aEdge.getY(), aEdge.getX()));
aCandidate.transform(aMatrixTransform);
@@ -395,11 +395,10 @@ namespace basegfx
else if(rCandidate.count())
{
const B2DVector aEdge(rPointB - rPointA);
- B2DHomMatrix aMatrixTransform;
B2DPolyPolygon aCandidate(rCandidate);
// translate and rotate polygon so that given edge is on x axis
- aMatrixTransform.translate(-rPointA.getX(), -rPointA.getY());
+ B2DHomMatrix aMatrixTransform(basegfx::tools::createTranslateB2DHomMatrix(-rPointA.getX(), -rPointA.getY()));
aMatrixTransform.rotate(-atan2(aEdge.getY(), aEdge.getX()));
aCandidate.transform(aMatrixTransform);
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 26016942717d..da6ff8904725 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: b2dpolygoncutandtouch.cxx,v $
- * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -430,6 +429,7 @@ namespace basegfx
// create subdivided polygons and find cuts between them
// Keep adaptiveSubdivideByCount due to needed quality
+ aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
aTempPolygonA.append(rCubicA.getStartPoint());
rCubicA.adaptiveSubdivideByCount(aTempPolygonA, SUBDIVIDE_FOR_CUT_TEST_COUNT);
aTempPolygonEdge.append(rCurrB);
@@ -470,8 +470,10 @@ namespace basegfx
// create subdivided polygons and find cuts between them
// Keep adaptiveSubdivideByCount due to needed quality
+ aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
aTempPolygonA.append(rCubicA.getStartPoint());
rCubicA.adaptiveSubdivideByCount(aTempPolygonA, SUBDIVIDE_FOR_CUT_TEST_COUNT);
+ aTempPolygonB.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
aTempPolygonB.append(rCubicB.getStartPoint());
rCubicB.adaptiveSubdivideByCount(aTempPolygonB, SUBDIVIDE_FOR_CUT_TEST_COUNT);
@@ -497,6 +499,13 @@ namespace basegfx
const B2DCubicBezier& rCubicA,
sal_uInt32 nInd, temporaryPointVector& rTempPoints)
{
+ // avoid expensive part of this method if possible
+ // TODO: use hasAnyExtremum() method instead when it becomes available
+ double fDummy;
+ const bool bHasAnyExtremum = rCubicA.getMinimumExtremumPosition( fDummy );
+ if( !bHasAnyExtremum )
+ return;
+
// find all self-intersections on the given bezier segment. Add an entry to the tempPoints
// for each self intersection point with the cut value describing the relative position on given
// bezier segment.
@@ -505,6 +514,7 @@ namespace basegfx
// create subdivided polygon and find cuts on it
// Keep adaptiveSubdivideByCount due to needed quality
+ aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
aTempPolygon.append(rCubicA.getStartPoint());
rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
findCuts(aTempPolygon, aTempPointVector);
@@ -557,7 +567,14 @@ namespace basegfx
const bool bEdgeBIsCurve(aCubicB.isBezier());
const B2DRange aRangeB(aCubicB.getRange());
- if(aRangeA.overlaps(aRangeB))
+ // only overlapping segments need to be tested
+ // consecutive segments touch of course
+ bool bOverlap = false;
+ if( b > a+1)
+ bOverlap = aRangeA.overlaps(aRangeB);
+ else
+ bOverlap = aRangeA.overlapsMore(aRangeB);
+ if( bOverlap)
{
if(bEdgeAIsCurve && bEdgeBIsCurve)
{
@@ -599,7 +616,13 @@ namespace basegfx
const B2DPoint aNextB(rCandidate.getB2DPoint(b + 1L == nPointCount ? 0L : b + 1L));
const B2DRange aRangeB(aCurrB, aNextB);
- if(aRangeA.overlaps(aRangeB))
+ // consecutive segments touch of course
+ bool bOverlap = false;
+ if( b > a+1)
+ bOverlap = aRangeA.overlaps(aRangeB);
+ else
+ bOverlap = aRangeA.overlapsMore(aRangeB);
+ if( bOverlap)
{
findEdgeCutsTwoEdges(aCurrA, aNextA, aCurrB, aNextB, a, b, rTempPoints, rTempPoints);
}
@@ -688,6 +711,7 @@ namespace basegfx
// create subdivided polygon and find cuts on it
// Keep adaptiveSubdivideByCount due to needed quality
+ aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
aTempPolygon.append(rCubicA.getStartPoint());
rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
findTouches(aTempPolygon, rPointPolygon, aTempPointVector);
@@ -796,7 +820,13 @@ namespace basegfx
const bool bEdgeBIsCurve(aCubicB.isBezier());
const B2DRange aRangeB(aCubicB.getRange());
- if(aRangeA.overlaps(aRangeB))
+ // consecutive segments touch of course
+ bool bOverlap = false;
+ if( b > a+1)
+ bOverlap = aRangeA.overlaps(aRangeB);
+ else
+ bOverlap = aRangeA.overlapsMore(aRangeB);
+ if( bOverlap)
{
if(bEdgeAIsCurve && bEdgeBIsCurve)
{
@@ -838,7 +868,13 @@ namespace basegfx
const B2DPoint aNextB(rCandidateB.getB2DPoint(b + 1L == nPointCountB ? 0L : b + 1L));
const B2DRange aRangeB(aCurrB, aNextB);
- if(aRangeA.overlaps(aRangeB))
+ // consecutive segments touch of course
+ bool bOverlap = false;
+ if( b > a+1)
+ bOverlap = aRangeA.overlaps(aRangeB);
+ else
+ bOverlap = aRangeA.overlapsMore(aRangeB);
+ if( bOverlap)
{
// test for simple edge-edge cuts
findEdgeCutsTwoEdges(aCurrA, aNextA, aCurrB, aNextB, a, b, rTempPointsA, rTempPointsB);
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index c1e5dc80d8c4..d62462b8c097 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: b2dpolygontools.cxx,v $
- * $Revision: 1.29.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -34,7 +33,6 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <osl/diagnose.h>
#include <rtl/math.hxx>
-
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/range/b2drange.hxx>
@@ -44,6 +42,8 @@
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/curve/b2dbeziertools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <osl/mutex.hxx>
#include <numeric>
#include <limits>
@@ -55,6 +55,7 @@
#ifdef DBG_UTIL
static double fAngleBoundStartValue = ANGLE_BOUND_START_VALUE;
#endif
+#define STEPSPERQUARTER (3)
//////////////////////////////////////////////////////////////////////////////
@@ -192,6 +193,9 @@ namespace basegfx
B2DCubicBezier aBezier;
aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+ // perf: try to avoid too many realloctions by guessing the result's pointcount
+ aRetval.reserve(nPointCount*4);
+
// add start point (always)
aRetval.append(aBezier.getStartPoint());
@@ -272,6 +276,9 @@ namespace basegfx
B2DCubicBezier aBezier;
aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+ // perf: try to avoid too many realloctions by guessing the result's pointcount
+ aRetval.reserve(nPointCount*4);
+
// add start point (always)
aRetval.append(aBezier.getStartPoint());
@@ -342,6 +349,9 @@ namespace basegfx
B2DCubicBezier aBezier;
aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+ // perf: try to avoid too many realloctions by guessing the result's pointcount
+ aRetval.reserve(nPointCount*4);
+
// add start point (always)
aRetval.append(aBezier.getStartPoint());
@@ -1832,145 +1842,106 @@ namespace basegfx
return createPolygonFromEllipse( rCenter, fRadius, fRadius );
}
- void appendUnitCircleQuadrant(B2DPolygon& rPolygon, sal_uInt32 nQuadrant)
+ B2DPolygon impCreateUnitCircle(sal_uInt32 nStartQuadrant)
{
- const double fZero(0.0);
- const double fOne(1.0);
+ B2DPolygon aUnitCircle;
const double fKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
+ const double fScaledKappa(fKappa * (1.0 / STEPSPERQUARTER));
+ const B2DHomMatrix aRotateMatrix(createRotateB2DHomMatrix(F_PI2 / STEPSPERQUARTER));
+
+ B2DPoint aPoint(1.0, 0.0);
+ B2DPoint aForward(1.0, fScaledKappa);
+ B2DPoint aBackward(1.0, -fScaledKappa);
- // create closed unit-circle with 4 segments
- switch(nQuadrant)
+ if(0 != nStartQuadrant)
{
- case 0 : // first quadrant
- {
- rPolygon.append(B2DPoint(fOne, fZero));
- rPolygon.appendBezierSegment(B2DPoint(fOne, fKappa), B2DPoint(fKappa, fOne), B2DPoint(fZero, fOne));
- break;
- }
- case 1 : // second quadrant
- {
- rPolygon.append(B2DPoint(fZero, fOne));
- rPolygon.appendBezierSegment(B2DPoint(-fKappa, fOne), B2DPoint(-fOne, fKappa), B2DPoint(-fOne, fZero));
- break;
- }
- case 2 : // third quadrant
- {
- rPolygon.append(B2DPoint(-fOne, fZero));
- rPolygon.appendBezierSegment(B2DPoint(-fOne, -fKappa), B2DPoint(-fKappa, -fOne), B2DPoint(fZero, -fOne));
- break;
- }
- default : // last quadrant
- {
- rPolygon.append(B2DPoint(fZero, -fOne));
- rPolygon.appendBezierSegment(B2DPoint(fKappa, -fOne), B2DPoint(fOne, -fKappa), B2DPoint(fOne, fZero));
- break;
- }
+ const B2DHomMatrix aQuadrantMatrix(createRotateB2DHomMatrix(F_PI2 * (nStartQuadrant % 4)));
+ aPoint *= aQuadrantMatrix;
+ aBackward *= aQuadrantMatrix;
+ aForward *= aQuadrantMatrix;
}
- }
- B2DPolygon createPolygonFromUnitCircle(sal_uInt32 nStartQuadrant)
- {
- B2DPolygon aRetval;
+ aUnitCircle.append(aPoint);
- // create unit-circle with all 4 segments, close it
- appendUnitCircleQuadrant(aRetval, nStartQuadrant % 4); nStartQuadrant++;
- appendUnitCircleQuadrant(aRetval, nStartQuadrant % 4); nStartQuadrant++;
- appendUnitCircleQuadrant(aRetval, nStartQuadrant % 4); nStartQuadrant++;
- appendUnitCircleQuadrant(aRetval, nStartQuadrant % 4); nStartQuadrant++;
- aRetval.setClosed(true);
+ for(sal_uInt32 a(0); a < STEPSPERQUARTER * 4; a++)
+ {
+ aPoint *= aRotateMatrix;
+ aBackward *= aRotateMatrix;
+ aUnitCircle.appendBezierSegment(aForward, aBackward, aPoint);
+ aForward *= aRotateMatrix;
+ }
- // remove double points between segments created by segmented creation
- aRetval.removeDoublePoints();
+ aUnitCircle.setClosed(true);
+ aUnitCircle.removeDoublePoints();
- return aRetval;
+ return aUnitCircle;
}
- B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY )
+ B2DPolygon createPolygonFromUnitCircle(sal_uInt32 nStartQuadrant)
{
- const double fOne(1.0);
- B2DPolygon aRetval(createPolygonFromUnitCircle());
-
- // transformation necessary?
- const sal_Bool bScale(!fTools::equal(fRadiusX, fOne) || !fTools::equal(fRadiusY, fOne));
- const sal_Bool bTranslate(!rCenter.equalZero());
-
- if(bScale || bTranslate)
+ switch(nStartQuadrant % 4)
{
- B2DHomMatrix aMatrix;
-
- if(bScale)
+ case 1 :
{
- aMatrix.scale(fRadiusX, fRadiusY);
- }
-
- if(bTranslate)
- {
- aMatrix.translate(rCenter.getX(), rCenter.getY());
- }
+ static B2DPolygon aUnitCircleStartQuadrantOne;
- aRetval.transform(aMatrix);
- }
-
- return aRetval;
- }
-
- void appendUnitCircleQuadrantSegment(B2DPolygon& rPolygon, sal_uInt32 nQuadrant, double fStart, double fEnd)
- {
- OSL_ENSURE(fStart >= 0.0 && fStart <= 1.0, "appendUnitCircleQuadrantSegment: Access out of range (!)");
- OSL_ENSURE(fEnd >= 0.0 && fEnd <= 1.0, "appendUnitCircleQuadrantSegment: Access out of range (!)");
- OSL_ENSURE(fEnd >= fStart, "appendUnitCircleQuadrantSegment: Access out of range (!)");
- const double fOne(1.0);
- const bool bStartIsZero(fTools::equalZero(fStart));
- const bool bEndIsOne(fTools::equal(fEnd, fOne));
-
- if(bStartIsZero && bEndIsOne)
- {
- // add completely
- appendUnitCircleQuadrant(rPolygon, nQuadrant);
- }
- else
- {
- // split and add
- B2DPolygon aQuadrant;
- appendUnitCircleQuadrant(aQuadrant, nQuadrant);
- const bool bStartEndEqual(fTools::equal(fStart, fEnd));
+ if(!aUnitCircleStartQuadrantOne.count())
+ {
+ ::osl::Mutex m_mutex;
+ aUnitCircleStartQuadrantOne = impCreateUnitCircle(1);
+ }
- if(bStartEndEqual)
+ return aUnitCircleStartQuadrantOne;
+ }
+ case 2 :
{
- if(bStartIsZero)
+ static B2DPolygon aUnitCircleStartQuadrantTwo;
+
+ if(!aUnitCircleStartQuadrantTwo.count())
{
- // both zero, add start point
- rPolygon.append(aQuadrant.getB2DPoint(0L));
+ ::osl::Mutex m_mutex;
+ aUnitCircleStartQuadrantTwo = impCreateUnitCircle(2);
}
- else if(bEndIsOne)
+
+ return aUnitCircleStartQuadrantTwo;
+ }
+ case 3 :
+ {
+ static B2DPolygon aUnitCircleStartQuadrantThree;
+
+ if(!aUnitCircleStartQuadrantThree.count())
{
- // both one, add end point
- rPolygon.append(aQuadrant.getB2DPoint(1L));
+ ::osl::Mutex m_mutex;
+ aUnitCircleStartQuadrantThree = impCreateUnitCircle(3);
}
- else
- {
- // both equal but not zero, add split point
- B2DCubicBezier aCubicBezier(
- aQuadrant.getB2DPoint(0L), aQuadrant.getNextControlPoint(0L),
- aQuadrant.getPrevControlPoint(1L), aQuadrant.getB2DPoint(1L));
- aCubicBezier.split(fStart, &aCubicBezier, 0);
- rPolygon.append(aCubicBezier.getEndPoint());
- }
+ return aUnitCircleStartQuadrantThree;
}
- else
+ default : // case 0 :
{
- B2DCubicBezier aCubicBezier(
- aQuadrant.getB2DPoint(0L), aQuadrant.getNextControlPoint(0L),
- aQuadrant.getPrevControlPoint(1L), aQuadrant.getB2DPoint(1L));
+ static B2DPolygon aUnitCircleStartQuadrantZero;
+
+ if(!aUnitCircleStartQuadrantZero.count())
+ {
+ ::osl::Mutex m_mutex;
+ aUnitCircleStartQuadrantZero = impCreateUnitCircle(0);
+ }
- aCubicBezier = aCubicBezier.snippet(fStart, fEnd);
- rPolygon.append(aCubicBezier.getStartPoint());
- rPolygon.appendBezierSegment(aCubicBezier.getControlPointA(), aCubicBezier.getControlPointB(), aCubicBezier.getEndPoint());
+ return aUnitCircleStartQuadrantZero;
}
}
}
+ B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY )
+ {
+ B2DPolygon aRetval(createPolygonFromUnitCircle());
+ const B2DHomMatrix aMatrix(createScaleTranslateB2DHomMatrix(fRadiusX, fRadiusY, rCenter.getX(), rCenter.getY()));
+
+ aRetval.transform(aMatrix);
+
+ return aRetval;
+ }
+
B2DPolygon createPolygonFromUnitEllipseSegment( double fStart, double fEnd )
{
B2DPolygon aRetval;
@@ -1997,49 +1968,74 @@ namespace basegfx
fEnd = 0.0;
}
- const sal_uInt32 nQuadrantStart(sal_uInt32(fStart / F_PI2) % 4L);
- const sal_uInt32 nQuadrantEnd(sal_uInt32(fEnd / F_PI2) % 4L);
- sal_uInt32 nCurrentQuadrant(nQuadrantStart);
- bool bStartDone(false);
- bool bEndDone(false);
-
- do
+ if(fTools::equal(fStart, fEnd))
{
- if(!bStartDone && nQuadrantStart == nCurrentQuadrant)
- {
- if(nQuadrantStart == nQuadrantEnd && fTools::moreOrEqual(fEnd, fStart))
- {
- // both in one quadrant and defining the complete segment, create start to end
- double fSplitOffsetStart((fStart - (nCurrentQuadrant * F_PI2)) / F_PI2);
- double fSplitOffsetEnd((fEnd - (nCurrentQuadrant * F_PI2)) / F_PI2);
- appendUnitCircleQuadrantSegment(aRetval, nCurrentQuadrant, fSplitOffsetStart, fSplitOffsetEnd);
- bStartDone = bEndDone = true;
- }
- else
- {
- // create start to quadrant end
- const double fSplitOffsetStart((fStart - (nCurrentQuadrant * F_PI2)) / F_PI2);
- appendUnitCircleQuadrantSegment(aRetval, nCurrentQuadrant, fSplitOffsetStart, 1.0);
- bStartDone = true;
- }
- }
- else if(!bEndDone && nQuadrantEnd == nCurrentQuadrant)
+ // same start and end angle, add single point
+ aRetval.append(B2DPoint(cos(fStart), sin(fStart)));
+ }
+ else
+ {
+ const sal_uInt32 nSegments(STEPSPERQUARTER * 4);
+ const double fAnglePerSegment(F_PI2 / STEPSPERQUARTER);
+ const sal_uInt32 nStartSegment(sal_uInt32(fStart / fAnglePerSegment) % nSegments);
+ const sal_uInt32 nEndSegment(sal_uInt32(fEnd / fAnglePerSegment) % nSegments);
+ const double fKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
+ const double fScaledKappa(fKappa * (1.0 / STEPSPERQUARTER));
+
+ B2DPoint aSegStart(cos(fStart), sin(fStart));
+ aRetval.append(aSegStart);
+
+ if(nStartSegment == nEndSegment && fTools::more(fEnd, fStart))
{
- // create quadrant start to end
- const double fSplitOffsetEnd((fEnd - (nCurrentQuadrant * F_PI2)) / F_PI2);
- appendUnitCircleQuadrantSegment(aRetval, nCurrentQuadrant, 0.0, fSplitOffsetEnd);
- bEndDone = true;
+ // start and end in one sector and in the right order, create in one segment
+ const B2DPoint aSegEnd(cos(fEnd), sin(fEnd));
+ const double fFactor(fScaledKappa * ((fEnd - fStart) / fAnglePerSegment));
+
+ aRetval.appendBezierSegment(
+ aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
+ aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
+ aSegEnd);
}
else
{
- // add quadrant completely
- appendUnitCircleQuadrant(aRetval, nCurrentQuadrant);
- }
+ double fSegEndRad((nStartSegment + 1) * fAnglePerSegment);
+ double fFactor(fScaledKappa * ((fSegEndRad - fStart) / fAnglePerSegment));
+ B2DPoint aSegEnd(cos(fSegEndRad), sin(fSegEndRad));
+
+ aRetval.appendBezierSegment(
+ aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
+ aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
+ aSegEnd);
+
+ sal_uInt32 nSegment((nStartSegment + 1) % nSegments);
+ aSegStart = aSegEnd;
+
+ while(nSegment != nEndSegment)
+ {
+ // No end in this sector, add full sector.
+ fSegEndRad = (nSegment + 1) * fAnglePerSegment;
+ aSegEnd = B2DPoint(cos(fSegEndRad), sin(fSegEndRad));
+
+ aRetval.appendBezierSegment(
+ aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fScaledKappa),
+ aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fScaledKappa),
+ aSegEnd);
+
+ nSegment = (nSegment + 1) % nSegments;
+ aSegStart = aSegEnd;
+ }
- // next step
- nCurrentQuadrant = (nCurrentQuadrant + 1L) % 4L;
+ // End in this sector
+ const double fSegStartRad(nSegment * fAnglePerSegment);
+ fFactor = fScaledKappa * ((fEnd - fSegStartRad) / fAnglePerSegment);
+ aSegEnd = B2DPoint(cos(fEnd), sin(fEnd));
+
+ aRetval.appendBezierSegment(
+ aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
+ aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
+ aSegEnd);
+ }
}
- while(!(bStartDone && bEndDone));
// remove double points between segments created by segmented creation
aRetval.removeDoublePoints();
@@ -2050,28 +2046,9 @@ namespace basegfx
B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double fStart, double fEnd )
{
B2DPolygon aRetval(createPolygonFromUnitEllipseSegment(fStart, fEnd));
+ const B2DHomMatrix aMatrix(createScaleTranslateB2DHomMatrix(fRadiusX, fRadiusY, rCenter.getX(), rCenter.getY()));
- // transformation necessary?
- const double fOne(1.0);
- const sal_Bool bScale(!fTools::equal(fRadiusX, fOne) || !fTools::equal(fRadiusY, fOne));
- const sal_Bool bTranslate(!rCenter.equalZero());
-
- if(bScale || bTranslate)
- {
- B2DHomMatrix aMatrix;
-
- if(bScale)
- {
- aMatrix.scale(fRadiusX, fRadiusY);
- }
-
- if(bTranslate)
- {
- aMatrix.translate(rCenter.getX(), rCenter.getY());
- }
-
- aRetval.transform(aMatrix);
- }
+ aRetval.transform(aMatrix);
return aRetval;
}
@@ -2701,11 +2678,7 @@ namespace basegfx
if(nPointCount)
{
- B2DHomMatrix aMatrix;
-
- aMatrix.translate(-rCenter.getX(), -rCenter.getY());
- aMatrix.rotate(fAngle);
- aMatrix.translate(rCenter.getX(), rCenter.getY());
+ const B2DHomMatrix aMatrix(basegfx::tools::createRotateAroundPoint(rCenter, fAngle));
aRetval.transform(aMatrix);
}
@@ -3269,6 +3242,9 @@ namespace basegfx
B2DCubicBezier aBezier;
aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+ // try to avoid costly reallocations
+ aRetval.reserve( nEdgeCount+1);
+
// add start point
aRetval.append(aBezier.getStartPoint());
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 2247c237d90f..e38ec3809fb1 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -36,6 +36,7 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <rtl/ustring.hxx>
#include <rtl/math.hxx>
@@ -705,7 +706,7 @@ namespace basegfx
// |y1'| = |-sin phi cos phi| |(y1 - y2)/2|
const B2DPoint p1(nLastX, nLastY);
const B2DPoint p2(nX, nY);
- B2DHomMatrix aTransform; aTransform.rotate(-fPhi*M_PI/180);
+ B2DHomMatrix aTransform(basegfx::tools::createRotateB2DHomMatrix(-fPhi*M_PI/180));
const B2DPoint p1_prime( aTransform * B2DPoint(((p1-p2)/2.0)) );
@@ -797,8 +798,7 @@ namespace basegfx
fTheta1, fTheta2 ));
// transform ellipse by rotation & move to final center
- aTransform.identity();
- aTransform.scale(fRX,fRY);
+ aTransform = basegfx::tools::createScaleB2DHomMatrix(fRX, fRY);
aTransform.translate(aCenter_prime.getX(),
aCenter_prime.getY());
aTransform.rotate(fPhi*M_PI/180);
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index ea303886dd88..52e0f0fcc36f 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -875,52 +875,147 @@ namespace basegfx
}
else
{
+ bool bRetval(false);
const B3DVector aPlaneNormal(rCandidate.getNormal());
if(!aPlaneNormal.equalZero())
{
- const double fAbsX(fabs(aPlaneNormal.getX()));
- const double fAbsY(fabs(aPlaneNormal.getY()));
- const double fAbsZ(fabs(aPlaneNormal.getZ()));
+ const sal_uInt32 nPointCount(rCandidate.count());
- if(fAbsX > fAbsY && fAbsX > fAbsZ)
+ if(nPointCount)
{
- // normal points mostly in X-Direction, use YZ-Polygon projection for check
- B3DHomMatrix aTrans;
+ B3DPoint aCurrentPoint(rCandidate.getB3DPoint(nPointCount - 1));
+ const double fAbsX(fabs(aPlaneNormal.getX()));
+ const double fAbsY(fabs(aPlaneNormal.getY()));
+ const double fAbsZ(fabs(aPlaneNormal.getZ()));
- aTrans.set(0, 0, 0.0);
- aTrans.set(0, 1, 1.0);
- aTrans.set(1, 1, 0.0);
- aTrans.set(1, 2, 1.0);
-
- const B2DPolygon aYZ(createB2DPolygonFromB3DPolygon(rCandidate, aTrans));
-
- return isInside(aYZ, B2DPoint(rPoint.getY(), rPoint.getZ()), bWithBorder);
- }
- else if(fAbsY > fAbsX && fAbsY > fAbsZ)
- {
- // normal points mostly in Y-Direction, use XZ-Polygon projection for check
- B3DHomMatrix aTrans;
-
- aTrans.set(1, 1, 0.0);
- aTrans.set(1, 2, 1.0);
-
- const B2DPolygon aXZ(createB2DPolygonFromB3DPolygon(rCandidate, aTrans));
-
- return isInside(aXZ, B2DPoint(rPoint.getX(), rPoint.getZ()), bWithBorder);
- }
- else
- {
- // normal points mostly in Z-Direction, use XY-Polygon projection for check
- B3DHomMatrix aTrans;
-
- const B2DPolygon aXY(createB2DPolygonFromB3DPolygon(rCandidate, aTrans));
-
- return isInside(aXY, B2DPoint(rPoint.getX(), rPoint.getY()), bWithBorder);
+ if(fAbsX > fAbsY && fAbsX > fAbsZ)
+ {
+ // normal points mostly in X-Direction, use YZ-Polygon projection for check
+ // x -> y, y -> z
+ for(sal_uInt32 a(0); a < nPointCount; a++)
+ {
+ const B3DPoint aPreviousPoint(aCurrentPoint);
+ aCurrentPoint = rCandidate.getB3DPoint(a);
+
+ // cross-over in Z?
+ const bool bCompZA(fTools::more(aPreviousPoint.getZ(), rPoint.getZ()));
+ const bool bCompZB(fTools::more(aCurrentPoint.getZ(), rPoint.getZ()));
+
+ if(bCompZA != bCompZB)
+ {
+ // cross-over in Y?
+ const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
+ const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
+
+ if(bCompYA == bCompYB)
+ {
+ if(bCompYA)
+ {
+ bRetval = !bRetval;
+ }
+ }
+ else
+ {
+ const double fCompare(
+ aCurrentPoint.getY() - (aCurrentPoint.getZ() - rPoint.getZ()) *
+ (aPreviousPoint.getY() - aCurrentPoint.getY()) /
+ (aPreviousPoint.getZ() - aCurrentPoint.getZ()));
+
+ if(fTools::more(fCompare, rPoint.getY()))
+ {
+ bRetval = !bRetval;
+ }
+ }
+ }
+ }
+ }
+ else if(fAbsY > fAbsX && fAbsY > fAbsZ)
+ {
+ // normal points mostly in Y-Direction, use XZ-Polygon projection for check
+ // x -> x, y -> z
+ for(sal_uInt32 a(0); a < nPointCount; a++)
+ {
+ const B3DPoint aPreviousPoint(aCurrentPoint);
+ aCurrentPoint = rCandidate.getB3DPoint(a);
+
+ // cross-over in Z?
+ const bool bCompZA(fTools::more(aPreviousPoint.getZ(), rPoint.getZ()));
+ const bool bCompZB(fTools::more(aCurrentPoint.getZ(), rPoint.getZ()));
+
+ if(bCompZA != bCompZB)
+ {
+ // cross-over in X?
+ const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
+ const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
+
+ if(bCompXA == bCompXB)
+ {
+ if(bCompXA)
+ {
+ bRetval = !bRetval;
+ }
+ }
+ else
+ {
+ const double fCompare(
+ aCurrentPoint.getX() - (aCurrentPoint.getZ() - rPoint.getZ()) *
+ (aPreviousPoint.getX() - aCurrentPoint.getX()) /
+ (aPreviousPoint.getZ() - aCurrentPoint.getZ()));
+
+ if(fTools::more(fCompare, rPoint.getX()))
+ {
+ bRetval = !bRetval;
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ // normal points mostly in Z-Direction, use XY-Polygon projection for check
+ // x -> x, y -> y
+ for(sal_uInt32 a(0); a < nPointCount; a++)
+ {
+ const B3DPoint aPreviousPoint(aCurrentPoint);
+ aCurrentPoint = rCandidate.getB3DPoint(a);
+
+ // cross-over in Y?
+ const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
+ const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
+
+ if(bCompYA != bCompYB)
+ {
+ // cross-over in X?
+ const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
+ const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
+
+ if(bCompXA == bCompXB)
+ {
+ if(bCompXA)
+ {
+ bRetval = !bRetval;
+ }
+ }
+ else
+ {
+ const double fCompare(
+ aCurrentPoint.getX() - (aCurrentPoint.getY() - rPoint.getY()) *
+ (aPreviousPoint.getX() - aCurrentPoint.getX()) /
+ (aPreviousPoint.getY() - aCurrentPoint.getY()));
+
+ if(fTools::more(fCompare, rPoint.getX()))
+ {
+ bRetval = !bRetval;
+ }
+ }
+ }
+ }
+ }
}
}
- return false;
+ return bRetval;
}
}
diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx
index 9e78039cd590..51989899ebf4 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -32,9 +32,9 @@
#include "precompiled_basegfx.hxx"
#include <basegfx/tools/gradienttools.hxx>
-
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
namespace basegfx
{
@@ -79,9 +79,8 @@ namespace basegfx
B2DPoint aCenter(0.5, 0.5);
aCenter *= o_rGradientInfo.maTextureTransform;
- o_rGradientInfo.maTextureTransform.translate(-aCenter.getX(), -aCenter.getY());
- o_rGradientInfo.maTextureTransform.rotate(fAngle);
- o_rGradientInfo.maTextureTransform.translate(aCenter.getX(), aCenter.getY());
+ o_rGradientInfo.maTextureTransform = basegfx::tools::createRotateAroundPoint(aCenter, fAngle)
+ * o_rGradientInfo.maTextureTransform;
}
// add object translate
@@ -158,9 +157,8 @@ namespace basegfx
B2DPoint aCenter(0.5, 0.5);
aCenter *= o_rGradientInfo.maTextureTransform;
- o_rGradientInfo.maTextureTransform.translate(-aCenter.getX(), -aCenter.getY());
- o_rGradientInfo.maTextureTransform.rotate(fAngle);
- o_rGradientInfo.maTextureTransform.translate(aCenter.getX(), aCenter.getY());
+ o_rGradientInfo.maTextureTransform = basegfx::tools::createRotateAroundPoint(aCenter, fAngle)
+ * o_rGradientInfo.maTextureTransform;
}
}
@@ -232,9 +230,8 @@ namespace basegfx
B2DPoint aCenter(0.5, 0.5);
aCenter *= o_rGradientInfo.maTextureTransform;
- o_rGradientInfo.maTextureTransform.translate(-aCenter.getX(), -aCenter.getY());
- o_rGradientInfo.maTextureTransform.rotate(fAngle);
- o_rGradientInfo.maTextureTransform.translate(aCenter.getX(), aCenter.getY());
+ o_rGradientInfo.maTextureTransform = basegfx::tools::createRotateAroundPoint(aCenter, fAngle)
+ * o_rGradientInfo.maTextureTransform;
}
// add defined offsets after rotation
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 6d8fcd83edb0..05dbe5b1c823 100755
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -44,8 +44,8 @@
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-
#include <basegfx/tools/unopolypolygon.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
using namespace ::com::sun::star;
@@ -138,9 +138,7 @@ namespace unotools
if( !aOffset.equalZero() )
{
- B2DHomMatrix aTranslate;
- aTranslate.translate( aOffset.getX(), aOffset.getY() );
-
+ const B2DHomMatrix aTranslate(tools::createTranslateB2DHomMatrix(aOffset));
aSrcPoly.transform( aTranslate );
}
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index f058b0034fa7..454ed23289b2 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
namespace basegfx1d
{
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 4f0305df953f..1bd15702e143 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
@@ -484,8 +484,13 @@ public:
}
while ( nIndex >= 0 );
+ // Adapted number of spaces to 50 and 67 because of the new circle construction
+ // methods which produce more points and thus more spaces, too. Use both since
+ // depending on float precision and the getContinuity() implemetation using
+ // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32
+ // uses more 'S' statements (as it should be for circles)
CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates",
- nCount==18);
+ nCount==67 || nCount==50);
const B2DPolygon aRect(
tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index fc59ffbced4e..f0fe463ce23d 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
namespace basegfx3d
{
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 1bd4d59b98d5..da61c60f9308 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -46,7 +46,7 @@ SHL1OBJS= \
$(SLO)$/basegfx1d.obj \
$(SLO)$/basegfx2d.obj \
$(SLO)$/basegfx3d.obj \
- $(SLO)$/testtools.obj
+ $(SLO)$/testtools.obj
# linking statically against basegfx parts
SHL1LIBS=\
@@ -66,23 +66,24 @@ SHL1STDLIBS= \
$(SALLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
+ $(TESTSHL2LIB) \
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1VERSIONMAP = export.map
# END ------------------------------------------------------------------
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : _cppunit.mk
# --- Enable testshl2 execution in normal build ------------------------
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 9cf2dd978759..5469010f2745 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -958,6 +958,7 @@ namespace cairocanvas
void CanvasHelper::doPolyPolygonPath( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
Operation aOperation,
+ bool bNoLineJoin,
const uno::Sequence< rendering::Texture >* pTextures,
Cairo* pCairo ) const
{
@@ -967,10 +968,46 @@ namespace cairocanvas
if( !pCairo )
pCairo = mpCairo.get();
- doPolyPolygonImplementation( rPolyPoly, aOperation,
- pCairo, pTextures,
- mpSurfaceProvider,
- xPolyPolygon->getFillRule() );
+ if(bNoLineJoin && Stroke == aOperation)
+ {
+ // emulate rendering::PathJoinType::NONE by painting single edges
+ for(sal_uInt32 a(0); a < rPolyPoly.count(); a++)
+ {
+ const basegfx::B2DPolygon aCandidate(rPolyPoly.getB2DPolygon(a));
+ const sal_uInt32 nPointCount(aCandidate.count());
+
+ if(nPointCount)
+ {
+ const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount + 1: nPointCount);
+ basegfx::B2DPolygon aEdge;
+ aEdge.append(aCandidate.getB2DPoint(0));
+ aEdge.append(basegfx::B2DPoint(0.0, 0.0));
+
+ for(sal_uInt32 a(0); a < nEdgeCount; a++)
+ {
+ const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+ aEdge.setB2DPoint(1, aCandidate.getB2DPoint(nNextIndex));
+ aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(a));
+ aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex));
+
+ doPolyPolygonImplementation( aEdge, aOperation,
+ pCairo, pTextures,
+ mpSurfaceProvider,
+ xPolyPolygon->getFillRule() );
+
+ // prepare next step
+ aEdge.setB2DPoint(0, aEdge.getB2DPoint(1));
+ }
+ }
+ }
+ }
+ else
+ {
+ doPolyPolygonImplementation( rPolyPoly, aOperation,
+ pCairo, pTextures,
+ mpSurfaceProvider,
+ xPolyPolygon->getFillRule() );
+ }
}
uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* ,
@@ -1039,9 +1076,12 @@ namespace cairocanvas
break;
}
+ bool bNoLineJoin(false);
+
switch( strokeAttributes.JoinType ) {
// cairo doesn't have join type NONE so we use MITER as it's pretty close
case rendering::PathJoinType::NONE:
+ bNoLineJoin = true;
case rendering::PathJoinType::MITER:
cairo_set_line_join( mpCairo.get(), CAIRO_LINE_JOIN_MITER );
break;
@@ -1063,7 +1103,7 @@ namespace cairocanvas
// TODO(rodo) use LineArray of strokeAttributes
- doPolyPolygonPath( xPolyPolygon, Stroke );
+ doPolyPolygonPath( xPolyPolygon, Stroke, bNoLineJoin );
cairo_restore( mpCairo.get() );
} else
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index 1e69a9f41e5b..90d365d63b3c 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -276,6 +276,7 @@ namespace cairocanvas
void doPolyPolygonPath( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
Operation aOperation,
+ bool bNoLineJoin = false,
const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >* pTextures=NULL,
::cairo::Cairo* pCairo=NULL ) const;
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 0642b6c50efb..607f7c076e21 100755
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -46,6 +46,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <comphelper/sequence.hxx>
#include <canvas/canvastools.hxx>
@@ -367,7 +368,11 @@ namespace dxcanvas
pGraphics->GetPixelOffsetMode() );
pGraphics->SetPixelOffsetMode( Gdiplus::PixelOffsetModeNone );
- aPen.SetMiterLimit( static_cast< Gdiplus::REAL >(strokeAttributes.MiterLimit) );
+ const bool bIsMiter(rendering::PathJoinType::MITER == strokeAttributes.JoinType);
+ const bool bIsNone(rendering::PathJoinType::NONE == strokeAttributes.JoinType);
+
+ if(bIsMiter)
+ aPen.SetMiterLimit( static_cast< Gdiplus::REAL >(strokeAttributes.MiterLimit) );
const ::std::vector< Gdiplus::REAL >& rDashArray(
::comphelper::sequenceToContainer< ::std::vector< Gdiplus::REAL > >(
@@ -380,9 +385,10 @@ namespace dxcanvas
aPen.SetLineCap( gdiCapFromCap(strokeAttributes.StartCapType),
gdiCapFromCap(strokeAttributes.EndCapType),
Gdiplus::DashCapFlat );
- aPen.SetLineJoin( gdiJoinFromJoin(strokeAttributes.JoinType) );
+ if(!bIsNone)
+ aPen.SetLineJoin( gdiJoinFromJoin(strokeAttributes.JoinType) );
- GraphicsPathSharedPtr pPath( tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ) );
+ GraphicsPathSharedPtr pPath( tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon, bIsNone ) );
// TODO(E1): Return value
Gdiplus::Status hr = pGraphics->DrawPath( &aPen, pPath.get() );
@@ -733,10 +739,8 @@ namespace dxcanvas
// add output offset
if( !maOutputOffset.equalZero() )
{
- ::basegfx::B2DHomMatrix aOutputOffset;
- aOutputOffset.translate( maOutputOffset.getX(),
- maOutputOffset.getY() );
-
+ const basegfx::B2DHomMatrix aOutputOffset(basegfx::tools::createTranslateB2DHomMatrix(
+ maOutputOffset.getX(), maOutputOffset.getY()));
aTransform = aOutputOffset * aTransform;
}
@@ -774,10 +778,8 @@ namespace dxcanvas
// add output offset
if( !maOutputOffset.equalZero() )
{
- ::basegfx::B2DHomMatrix aOutputOffset;
- aOutputOffset.translate( maOutputOffset.getX(),
- maOutputOffset.getY() );
-
+ const basegfx::B2DHomMatrix aOutputOffset(basegfx::tools::createTranslateB2DHomMatrix(
+ maOutputOffset.getX(), maOutputOffset.getY()));
aTransform = aOutputOffset * aTransform;
}
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index f291d197c4de..73a2d49bfb62 100755
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -43,6 +43,7 @@
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/tools/tools.hxx>
#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <canvas/parametricpolypolygon.hxx>
@@ -452,8 +453,7 @@ namespace dxcanvas
aFillBrush.SetColor( aFillColor );
const double nCurrScale( (nStepCount-i)/(double)nStepCount );
- aScaleMatrix.identity();
- aScaleMatrix.translate( -0.5, -0.5 );
+ aScaleMatrix = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5);
// handle anisotrophic polygon scaling
if( rValues.mnAspectRatio < 1.0 )
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index 48f44e3ba816..e124d4d78e6a 100755
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -144,6 +144,9 @@ namespace dxcanvas
}
}
+ void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) {}
+ void DXCanvasItem::Commit() {}
+
bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const
{
return maValues.find(rDeviceInfo) == maValues.end();
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 34deddb509a7..1fffcb2ed56e 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -77,6 +77,8 @@ namespace dxcanvas
bool isBlacklistCurrentDevice() const;
void blacklistDevice( const DeviceInfo& rDeviceInfo );
void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
+ virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+ virtual void Commit();
private:
typedef std::set< DeviceInfo > ValueSet;
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 40164c9a1d87..4f5b92d6bcb5 100755
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -194,7 +194,8 @@ namespace dxcanvas
void graphicsPathFromB2DPolygon( GraphicsPathSharedPtr& rOutput,
::std::vector< Gdiplus::PointF >& rPoints,
- const ::basegfx::B2DPolygon& rPoly )
+ const ::basegfx::B2DPolygon& rPoly,
+ bool bNoLineJoin)
{
const sal_uInt32 nPoints( rPoly.count() );
@@ -241,7 +242,18 @@ namespace dxcanvas
rPoints[nCurrOutput++] = Gdiplus::PointF( static_cast<Gdiplus::REAL>(rPoint.getX()),
static_cast<Gdiplus::REAL>(rPoint.getY()) );
- rOutput->AddBeziers( &rPoints[0], nCurrOutput );
+ if(bNoLineJoin && nCurrOutput > 7)
+ {
+ for(sal_uInt32 a(3); a < nCurrOutput; a+=3)
+ {
+ rOutput->StartFigure();
+ rOutput->AddBezier(rPoints[a - 3], rPoints[a - 2], rPoints[a - 1], rPoints[a]);
+ }
+ }
+ else
+ {
+ rOutput->AddBeziers( &rPoints[0], nCurrOutput );
+ }
}
else
{
@@ -251,7 +263,20 @@ namespace dxcanvas
// Therefore, simply don't pass the last two
// points here.
if( nCurrOutput > 3 )
- rOutput->AddBeziers( &rPoints[0], nCurrOutput-2 );
+ {
+ if(bNoLineJoin && nCurrOutput > 7)
+ {
+ for(sal_uInt32 a(3); a < nCurrOutput; a+=3)
+ {
+ rOutput->StartFigure();
+ rOutput->AddBezier(rPoints[a - 3], rPoints[a - 2], rPoints[a - 1], rPoints[a]);
+ }
+ }
+ else
+ {
+ rOutput->AddBeziers( &rPoints[0], nCurrOutput-2 );
+ }
+ }
}
}
else
@@ -267,10 +292,27 @@ namespace dxcanvas
static_cast<Gdiplus::REAL>(rPoint.getY()) );
}
- rOutput->AddLines( &rPoints[0], nPoints );
+ if(bNoLineJoin && nPoints > 2)
+ {
+ for(sal_uInt32 a(1); a < nPoints; a++)
+ {
+ rOutput->StartFigure();
+ rOutput->AddLine(rPoints[a - 1], rPoints[a]);
+ }
+
+ if(bClosedPolygon)
+ {
+ rOutput->StartFigure();
+ rOutput->AddLine(rPoints[nPoints - 1], rPoints[0]);
+ }
+ }
+ else
+ {
+ rOutput->AddLines( &rPoints[0], nPoints );
+ }
}
- if( bClosedPolygon )
+ if( bClosedPolygon && !bNoLineJoin )
rOutput->CloseFigure();
}
}
@@ -426,17 +468,17 @@ namespace dxcanvas
return pRes;
}
- GraphicsPathSharedPtr graphicsPathFromB2DPolygon( const ::basegfx::B2DPolygon& rPoly )
+ GraphicsPathSharedPtr graphicsPathFromB2DPolygon( const ::basegfx::B2DPolygon& rPoly, bool bNoLineJoin )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
::std::vector< Gdiplus::PointF > aPoints;
- graphicsPathFromB2DPolygon( pRes, aPoints, rPoly );
+ graphicsPathFromB2DPolygon( pRes, aPoints, rPoly, bNoLineJoin );
return pRes;
}
- GraphicsPathSharedPtr graphicsPathFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
+ GraphicsPathSharedPtr graphicsPathFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, bool bNoLineJoin )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
::std::vector< Gdiplus::PointF > aPoints;
@@ -446,24 +488,25 @@ namespace dxcanvas
{
graphicsPathFromB2DPolygon( pRes,
aPoints,
- rPoly.getB2DPolygon( nCurrPoly ) );
+ rPoly.getB2DPolygon( nCurrPoly ),
+ bNoLineJoin);
}
return pRes;
}
- GraphicsPathSharedPtr graphicsPathFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly )
+ GraphicsPathSharedPtr graphicsPathFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly, bool bNoLineJoin )
{
LinePolyPolygon* pPolyImpl = dynamic_cast< LinePolyPolygon* >( xPoly.get() );
if( pPolyImpl )
{
- return pPolyImpl->getGraphicsPath();
+ return pPolyImpl->getGraphicsPath( bNoLineJoin );
}
else
{
return tools::graphicsPathFromB2DPolyPolygon(
- polyPolygonFromXPolyPolygon2D( xPoly ) );
+ polyPolygonFromXPolyPolygon2D( xPoly ), bNoLineJoin );
}
}
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index 072d1063235d..222b1a927305 100755
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -107,11 +107,18 @@ namespace dxcanvas
GraphicsPathSharedPtr graphicsPathFromRealPoint2DSequence( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& );
- GraphicsPathSharedPtr graphicsPathFromB2DPolygon( const ::basegfx::B2DPolygon& rPoly );
- GraphicsPathSharedPtr graphicsPathFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly );
+ GraphicsPathSharedPtr graphicsPathFromB2DPolygon(
+ const ::basegfx::B2DPolygon& rPoly,
+ bool bNoLineJoin = false);
+
+ GraphicsPathSharedPtr graphicsPathFromB2DPolyPolygon(
+ const ::basegfx::B2DPolyPolygon& rPoly,
+ bool bNoLineJoin = false);
+
+ GraphicsPathSharedPtr graphicsPathFromXPolyPolygon2D(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >&,
+ bool bNoLineJoin = false );
- GraphicsPathSharedPtr graphicsPathFromXPolyPolygon2D( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& );
bool drawGdiPlusBitmap( const GraphicsSharedPtr& rGraphics,
const BitmapSharedPtr& rBitmap );
bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
diff --git a/canvas/source/directx/dx_linepolypolygon.cxx b/canvas/source/directx/dx_linepolypolygon.cxx
index e63adc3dc613..9a5569384eae 100755
--- a/canvas/source/directx/dx_linepolypolygon.cxx
+++ b/canvas/source/directx/dx_linepolypolygon.cxx
@@ -46,14 +46,14 @@ namespace dxcanvas
{
}
- GraphicsPathSharedPtr LinePolyPolygon::getGraphicsPath() const
+ GraphicsPathSharedPtr LinePolyPolygon::getGraphicsPath( bool bNoLineJoin ) const
{
// generate GraphicsPath only on demand (gets deleted as soon
// as any of the modifying methods above touches the
// B2DPolyPolygon).
if( !mpPath )
{
- mpPath = tools::graphicsPathFromB2DPolyPolygon( getPolyPolygonUnsafe() );
+ mpPath = tools::graphicsPathFromB2DPolyPolygon( getPolyPolygonUnsafe(), bNoLineJoin );
mpPath->SetFillMode( const_cast<LinePolyPolygon*>(this)->getFillRule() == rendering::FillRule_EVEN_ODD ?
Gdiplus::FillModeAlternate : Gdiplus::FillModeWinding );
}
diff --git a/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx
index 431cd1b87b4f..3e061d76e768 100755
--- a/canvas/source/directx/dx_linepolypolygon.hxx
+++ b/canvas/source/directx/dx_linepolypolygon.hxx
@@ -45,7 +45,7 @@ namespace dxcanvas
public:
explicit LinePolyPolygon( const ::basegfx::B2DPolyPolygon& );
- GraphicsPathSharedPtr getGraphicsPath() const;
+ GraphicsPathSharedPtr getGraphicsPath( bool bNoLineJoin = false) const;
private:
// overridden, to clear mpPath
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 185979b0220e..7ca251458d22 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -46,6 +46,7 @@
#include <comphelper/servicedecl.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include "canvas/canvastools.hxx"
@@ -287,10 +288,7 @@ namespace
::sal_Int8 nTextDirection ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
-
- basegfx::B2DHomMatrix offsetTransform;
- offsetTransform.translate(aOutPos.X,aOutPos.Y);
-
+ const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aOutPos.X,aOutPos.Y));
rendering::RenderState aRenderState( createStrokingRenderState() );
tools::appendToRenderState(aRenderState, offsetTransform);
@@ -305,10 +303,7 @@ namespace
const geometry::RealPoint2D& aLeftTop ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
-
- basegfx::B2DHomMatrix offsetTransform;
- offsetTransform.translate(aLeftTop.X,aLeftTop.Y);
-
+ const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aLeftTop.X,aLeftTop.Y));
rendering::RenderState aRenderState( createStrokingRenderState() );
tools::appendToRenderState(aRenderState, offsetTransform);
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 23d6124e4cb8..278789637c72 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -63,6 +63,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <cppuhelper/compbase1.hxx>
#include <rtl/instance.hxx>
@@ -679,9 +680,8 @@ namespace canvas
i_transformation );
// now move resulting left,top point of bounds to (0,0)
- ::basegfx::B2DHomMatrix aCorrectedTransform;
- aCorrectedTransform.translate( -aTransformedRect.getMinX(),
- -aTransformedRect.getMinY() );
+ const basegfx::B2DHomMatrix aCorrectedTransform(basegfx::tools::createTranslateB2DHomMatrix(
+ -aTransformedRect.getMinX(), -aTransformedRect.getMinY()));
// prepend to original transformation
o_transform = aCorrectedTransform * i_transformation;
@@ -745,9 +745,8 @@ namespace canvas
transformation );
// now move resulting left,top point of bounds to (0,0)
- ::basegfx::B2DHomMatrix aCorrectedTransform;
- aCorrectedTransform.translate( -aTransformedRect.getMinX(),
- -aTransformedRect.getMinY() );
+ basegfx::B2DHomMatrix aCorrectedTransform(basegfx::tools::createTranslateB2DHomMatrix(
+ -aTransformedRect.getMinX(), -aTransformedRect.getMinY()));
// scale to match outRect
const double xDenom( aTransformedRect.getWidth() );
diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx
index c3161758ea3e..96162f6d78af 100644
--- a/canvas/source/tools/surface.cxx
+++ b/canvas/source/tools/surface.cxx
@@ -33,6 +33,7 @@
#include "surface.hxx"
#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <comphelper/scopeguard.hxx>
#include <boost/bind.hpp>
@@ -150,9 +151,8 @@ namespace canvas
// 4) scale to normalized device coordinates
// 5) flip y-axis
// 6) translate to account for viewport transform
- ::basegfx::B2DHomMatrix aTransform;
- aTransform.translate(maSourceOffset.getX(),
- maSourceOffset.getY());
+ basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(
+ maSourceOffset.getX(), maSourceOffset.getY()));
aTransform = aTransform * rTransform;
aTransform.translate(::basegfx::fround(rPos.getX()),
::basegfx::fround(rPos.getY()));
@@ -277,8 +277,7 @@ namespace canvas
// 1) offset of surface subarea
// 2) surface transform
// 3) translation to output position [rPos]
- ::basegfx::B2DHomMatrix aTransform;
- aTransform.translate(aPos1.getX(),aPos1.getY());
+ basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(aPos1.getX(), aPos1.getY()));
aTransform = aTransform * rTransform;
aTransform.translate(::basegfx::fround(rPos.getX()),
::basegfx::fround(rPos.getY()));
@@ -380,7 +379,7 @@ namespace canvas
// be transformed by the overall transform and uv coordinates will
// be calculated from the result, and this is why we need to use
// integer coordinates here...
- ::basegfx::B2DHomMatrix aTransform;
+ basegfx::B2DHomMatrix aTransform;
aTransform = aTransform * rTransform;
aTransform.translate(::basegfx::fround(rPos.getX()),
::basegfx::fround(rPos.getY()));
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index a11598bdca85..7b77d3ba29e7 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -169,21 +169,20 @@ template <bool> struct with_args;
/// @internal
namespace detail {
-
template <typename ImplT>
-class ServiceImpl
- : public ::cppu::ImplInheritanceHelper1<ImplT, css::lang::XServiceInfo>,
+class OwnServiceImpl
+ : public ImplT,
private ::boost::noncopyable
{
- typedef ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> BaseT;
+ typedef ImplT BaseT;
public:
- ServiceImpl(
+ OwnServiceImpl(
ServiceDecl const& rServiceDecl,
css::uno::Sequence<css::uno::Any> const& args,
css::uno::Reference<css::uno::XComponentContext> const& xContext )
- : BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
- ServiceImpl(
+ :BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
+ OwnServiceImpl(
ServiceDecl const& rServiceDecl,
css::uno::Reference<css::uno::XComponentContext> const& xContext )
: BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
@@ -206,6 +205,22 @@ private:
ServiceDecl const& m_rServiceDecl;
};
+template <typename ImplT>
+class ServiceImpl : public OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> >
+{
+typedef OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> > ServiceImpl_BASE;
+public:
+ ServiceImpl(
+ ServiceDecl const& rServiceDecl,
+ css::uno::Sequence<css::uno::Any> const& args,
+ css::uno::Reference<css::uno::XComponentContext> const& xContext )
+ : ServiceImpl_BASE(rServiceDecl, args, xContext) {}
+ ServiceImpl(
+ ServiceDecl const& rServiceDecl,
+ css::uno::Reference<css::uno::XComponentContext> const& xContext )
+ : ServiceImpl_BASE(rServiceDecl, xContext) {}
+};
+
template <typename ServiceImplT>
struct PostProcessDefault {
css::uno::Reference<css::uno::XInterface>
@@ -230,7 +245,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<false> > {
const& xContext ) const
{
return m_postProcessFunc(
- new ServiceImpl<ImplT>( rServiceDecl, xContext ) );
+ new ImplT( rServiceDecl, xContext ) );
}
};
@@ -247,7 +262,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > {
const& xContext ) const
{
return m_postProcessFunc(
- new ServiceImpl<ImplT>( rServiceDecl, args, xContext ) );
+ new ImplT( rServiceDecl, args, xContext ) );
}
};
@@ -261,18 +276,17 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > {
or just (uno::Reference<uno::XComponentContext>)
*/
template <typename ImplT_, typename WithArgsT = with_args<false> >
-struct class_ {
+struct serviceimpl_base {
typedef ImplT_ ImplT;
- typedef detail::ServiceImpl<ImplT_> ServiceImplT;
detail::CreateFuncF const m_createFunc;
- typedef detail::PostProcessDefault<ServiceImplT> PostProcessDefaultT;
+ typedef detail::PostProcessDefault<ImplT> PostProcessDefaultT;
/** Default ctor. Implementation class without args, expecting
component context as single argument.
*/
- class_() : m_createFunc(
+ serviceimpl_base() : m_createFunc(
detail::CreateFunc<ImplT, PostProcessDefaultT, WithArgsT>(
PostProcessDefaultT() ) ) {}
@@ -284,11 +298,29 @@ struct class_ {
uno::Reference<uno::XInterface>
*/
template <typename PostProcessFuncT>
- explicit class_( PostProcessFuncT const& postProcessFunc )
+ explicit serviceimpl_base( PostProcessFuncT const& postProcessFunc )
: m_createFunc( detail::CreateFunc<ImplT, PostProcessFuncT, WithArgsT>(
postProcessFunc ) ) {}
};
+template <typename ImplT_, typename WithArgsT = with_args<false> >
+struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT >
+{
+ typedef serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT > baseT;
+ /** Default ctor. Implementation class without args, expecting
+ component context as single argument.
+ */
+ class_() : baseT() {}
+ template <typename PostProcessFuncT>
+ /** Ctor to pass a post processing function/functor.
+
+ @tpl PostProcessDefaultT let your compiler deduce this
+ @param postProcessFunc function/functor that gets the yet unacquired
+ ImplT_ pointer returning a
+ uno::Reference<uno::XInterface>
+ */
+ explicit class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
+};
//
// component_... helpers with arbitrary service declarations:
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
index cfc597570bc4..52c57a9d77de 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -43,7 +43,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)_weakbag
SHL1OBJS = $(SLO)$/test_weakbag.obj
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
@@ -55,4 +55,4 @@ SLOFILES = $(SHL1OBJS)
ALLTAR: test
test .PHONY: $(SHL1TARGETN)
- testshl2 $(SHL1TARGETN)
+ $(TESTSHL2) $(SHL1TARGETN)
diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
index 035e56fdb8c4..c237158beccc 100644
--- a/comphelper/qa/test_string.cxx
+++ b/comphelper/qa/test_string.cxx
@@ -32,7 +32,7 @@
#include "sal/config.h"
#include "comphelper/string.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/string.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx
index dd4a8356eb5a..470ac2eef6c0 100644
--- a/comphelper/qa/test_weakbag.cxx
+++ b/comphelper/qa/test_weakbag.cxx
@@ -35,7 +35,7 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "comphelper/weakbag.hxx"
#include "cppuhelper/weak.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
namespace {
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index 77ab145e2581..8fa318a92eb1 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -39,6 +39,7 @@ extern void createRegistryInfo_AnyCompareFactory();
extern void createRegistryInfo_OfficeInstallationDirectories();
extern void createRegistryInfo_OInstanceLocker();
extern void createRegistryInfo_Map();
+extern void createRegistryInfo_OSimpleLogRing();
//........................................................................
namespace comphelper { namespace module
@@ -63,6 +64,7 @@ namespace comphelper { namespace module
createRegistryInfo_OfficeInstallationDirectories();
createRegistryInfo_OInstanceLocker();
createRegistryInfo_Map();
+ createRegistryInfo_OSimpleLogRing();
}
}
}
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index 7969b938e108..8b999aaf4449 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -34,6 +34,8 @@
#include <com/sun/star/frame/DoubleInitializationException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <comphelper_module.hxx>
+
#include "documentiologring.hxx"
using namespace ::com::sun::star;
@@ -56,33 +58,33 @@ OSimpleLogRing::~OSimpleLogRing()
}
// ----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::impl_staticGetSupportedServiceNames()
+uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()
{
uno::Sequence< rtl::OUString > aResult( 1 );
- aResult[0] = impl_staticGetServiceName();
+ aResult[0] = getServiceName_static();
return aResult;
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetImplementationName()
+::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName_static()
{
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.logging.SimpleLogRing" ) );
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetSingletonName()
+::rtl::OUString SAL_CALL OSimpleLogRing::getSingletonName_static()
{
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.DocumentIOLogRing" ) );
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetServiceName()
+::rtl::OUString SAL_CALL OSimpleLogRing::getServiceName_static()
{
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.SimpleLogRing" ) );
}
// ----------------------------------------------------------
-uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::impl_staticCreateSelfInstance( const uno::Reference< uno::XComponentContext >& rxContext )
+uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( const uno::Reference< uno::XComponentContext >& rxContext )
{
return static_cast< cppu::OWeakObject* >( new OSimpleLogRing( rxContext ) );
}
@@ -149,13 +151,13 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
// ----------------------------------------------------------
::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException)
{
- return impl_staticGetImplementationName();
+ return getImplementationName_static();
}
// ----------------------------------------------------------
::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException)
{
- const uno::Sequence< rtl::OUString > & aSupportedNames = impl_staticGetSupportedServiceNames();
+ const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static();
for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ )
{
if ( aSupportedNames[ nInd ].equals( aServiceName ) )
@@ -168,8 +170,13 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
// ----------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException)
{
- return impl_staticGetSupportedServiceNames();
+ return getSupportedServiceNames_static();
}
} // namespace comphelper
+void createRegistryInfo_OSimpleLogRing()
+{
+ static ::comphelper::module::OAutoRegistration< ::comphelper::OSimpleLogRing > aAutoRegistration;
+ static ::comphelper::module::OSingletonRegistration< ::comphelper::OSimpleLogRing > aSingletonRegistration;
+}
diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index ae7d2a6eaf19..b2b935c478af 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.hxx
@@ -60,17 +60,16 @@ public:
virtual ~OSimpleLogRing();
static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
- impl_staticGetSupportedServiceNames();
+ getSupportedServiceNames_static();
- static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+ static ::rtl::OUString SAL_CALL getImplementationName_static();
- static ::rtl::OUString SAL_CALL impl_staticGetSingletonName();
+ static ::rtl::OUString SAL_CALL getSingletonName_static();
- static ::rtl::OUString SAL_CALL impl_staticGetServiceName();
+ static ::rtl::OUString SAL_CALL getServiceName_static();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- impl_staticCreateSelfInstance(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+ Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
// XSimpleLogRing
virtual void SAL_CALL logString( const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index b27cef88319c..c5d134eb9982 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -76,7 +76,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount )
{
OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyInfoHash::iterator aIter = maMap.find( aName );
if( aIter != maMap.end() )
OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index e74d21b2d755..91a9a17856d4 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -84,7 +84,7 @@ void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8
{
OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyDataHash::iterator aIter = maMap.find( aName );
if( aIter != maMap.end() )
OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
@@ -102,7 +102,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
while ( aIter != aEnd )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyDataHash::iterator aDebugIter = maMap.find( (*aIter).first );
if( aDebugIter != maMap.end() )
OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index e155d695e2c9..83b769553331 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -82,7 +82,7 @@ void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw()
{
OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyMap::iterator aIter = maPropertyMap.find( aName );
if( aIter != maPropertyMap.end() )
{
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 355dd336e2c5..4f54b10c4879 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -35,25 +35,21 @@
#include <com/sun/star/rendering/XBitmap.hpp>
#include <com/sun/star/rendering/RepaintResult.hpp>
#include <com/sun/star/rendering/XCachedPrimitive.hpp>
-
#include <vcl/bitmapex.hxx>
#include <tools/gen.hxx>
#include <vcl/canvastools.hxx>
-
#include <canvas/canvastools.hxx>
-
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/tools/canvastools.hxx>
-
#include <boost/utility.hpp>
-
#include "cachedprimitivebase.hxx"
#include "bitmapaction.hxx"
#include "outdevstate.hxx"
#include "mtftools.hxx"
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
using namespace ::com::sun::star;
@@ -112,9 +108,7 @@ namespace cppcanvas
// Setup transformation such that the next render call is
// moved rPoint away.
- ::basegfx::B2DHomMatrix aLocalTransformation;
- aLocalTransformation.translate( rDstPoint.getX(),
- rDstPoint.getY() );
+ const basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createTranslateB2DHomMatrix(rDstPoint));
::canvas::tools::appendToRenderState( maState,
aLocalTransformation );
@@ -144,15 +138,12 @@ namespace cppcanvas
// moved rPoint away, and scaled according to the ratio
// given by src and dst size.
const ::Size aBmpSize( rBmpEx.GetSizePixel() );
- ::basegfx::B2DHomMatrix aLocalTransformation;
const ::basegfx::B2DVector aScale( rDstSize.getX() / aBmpSize.Width(),
rDstSize.getY() / aBmpSize.Height() );
- aLocalTransformation.scale( aScale.getX(), aScale.getY() );
- aLocalTransformation.translate( rDstPoint.getX(),
- rDstPoint.getY() );
- ::canvas::tools::appendToRenderState( maState,
- aLocalTransformation );
+ const basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createScaleTranslateB2DHomMatrix(
+ aScale, rDstPoint));
+ ::canvas::tools::appendToRenderState( maState, aLocalTransformation );
// correct clip (which is relative to original transform)
tools::modifyClip( maState,
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index c6f9a295b332..8ea2ae453a97 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -34,19 +34,14 @@
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/verbosetrace.hxx>
-
#include <osl/mutex.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
-
#include <rtl/logfile.hxx>
-
#include <comphelper/sequence.hxx>
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
-
#include <cppcanvas/canvas.hxx>
-
#include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.hpp>
@@ -59,7 +54,6 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/PathCapType.hpp>
#include <com/sun/star/rendering/PathJoinType.hpp>
-
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -73,7 +67,6 @@
#include <basegfx/tuple/b2dtuple.hxx>
#include <basegfx/polygon/b2dpolygonclipper.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
-
#include <canvas/canvastools.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/salbtype.hxx>
@@ -84,11 +77,9 @@
#include <vcl/graphictools.hxx>
#include <tools/poly.hxx>
#include <i18npool/mslangid.hxx>
-
#include <implrenderer.hxx>
#include <tools.hxx>
#include <outdevstate.hxx>
-
#include <action.hxx>
#include <bitmapaction.hxx>
#include <lineaction.hxx>
@@ -96,15 +87,13 @@
#include <polypolyaction.hxx>
#include <textaction.hxx>
#include <transparencygroupaction.hxx>
-
#include <vector>
#include <algorithm>
#include <iterator>
-
#include <boost/scoped_array.hpp>
-
#include "mtftools.hxx"
#include "outdevstate.hxx"
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
using namespace ::com::sun::star;
@@ -286,10 +275,25 @@ namespace
(getState( rParms.mrStates ).mapModeTransform * aWidth).getX();
// setup reasonable defaults
- o_rStrokeAttributes.MiterLimit = 1.0;
+ o_rStrokeAttributes.MiterLimit = 15.0; // 1.0 was no good default; GDI+'s limit is 10.0, our's is 15.0
o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT;
o_rStrokeAttributes.EndCapType = rendering::PathCapType::BUTT;
- o_rStrokeAttributes.JoinType = rendering::PathJoinType::MITER;
+
+ switch(rLineInfo.GetLineJoin())
+ {
+ default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE
+ o_rStrokeAttributes.JoinType = rendering::PathJoinType::NONE;
+ break;
+ case basegfx::B2DLINEJOIN_BEVEL:
+ o_rStrokeAttributes.JoinType = rendering::PathJoinType::BEVEL;
+ break;
+ case basegfx::B2DLINEJOIN_MITER:
+ o_rStrokeAttributes.JoinType = rendering::PathJoinType::MITER;
+ break;
+ case basegfx::B2DLINEJOIN_ROUND:
+ o_rStrokeAttributes.JoinType = rendering::PathJoinType::ROUND;
+ break;
+ }
if( LINE_DASH == rLineInfo.GetStyle() )
{
@@ -729,12 +733,11 @@ namespace cppcanvas
fabs( aBounds.getHeight()*sin(nRotation) ) +
fabs( aBounds.getWidth()*cos(nRotation) )));
- aTextureTransformation.scale( nScale, nScale );
-
- // translate back origin to center of
+ // scale and translate back origin to center of
// primitive
- aTextureTransformation.translate( 0.5*aBounds.getWidth(),
- 0.5*aBounds.getHeight() );
+ aTextureTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix(
+ nScale, nScale, 0.5*aBounds.getWidth(), 0.5*aBounds.getHeight())
+ * aTextureTransformation;
}
break;
@@ -856,9 +859,8 @@ namespace cppcanvas
aTextureTransformation.scale( nScaleX, nScaleY );
// rotate texture according to gradient rotation
- aTextureTransformation.translate( -0.5*nScaleX, -0.5*nScaleY );
- aTextureTransformation.rotate( nRotation );
- aTextureTransformation.translate( 0.5*nScaleX, 0.5*nScaleY );
+ aTextureTransformation = basegfx::tools::createRotateAroundPoint(0.5*nScaleX, 0.5*nScaleY, nRotation)
+ * aTextureTransformation;
aTextureTransformation.translate( nOffsetX, nOffsetY );
}
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index e4e227955da6..b6a548aa49be 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -34,10 +34,8 @@
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/verbosetrace.hxx>
-
#include <com/sun/star/rendering/RenderState.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -45,16 +43,15 @@
#include <basegfx/range/b2drectangle.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <canvas/canvastools.hxx>
-
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
#include <vcl/metric.hxx>
#include <tools/poly.hxx>
-
#include "mtftools.hxx"
#include "outdevstate.hxx"
#include "polypolyaction.hxx"
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -111,9 +108,9 @@ namespace cppcanvas
const ::Size aSizePixel( rVDev.LogicToPixel( aSizeLogic ) );
- o_rMatrix.identity();
- o_rMatrix.scale( aSizePixel.Width() / (double)aSizeLogic.Width(),
- aSizePixel.Height() / (double)aSizeLogic.Height() );
+ o_rMatrix = basegfx::tools::createScaleB2DHomMatrix(
+ aSizePixel.Width() / (double)aSizeLogic.Width(),
+ aSizePixel.Height() / (double)aSizeLogic.Height() );
return o_rMatrix;
}
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index f1191e6e57f3..038b68c3008e 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -48,6 +48,7 @@
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <tools/gen.hxx>
#include <vcl/canvastools.hxx>
@@ -93,9 +94,7 @@ namespace cppcanvas
NULL,
&rState.fontRotation );
- ::basegfx::B2DHomMatrix aLocalTransformation;
-
- aLocalTransformation.rotate( rState.fontRotation );
+ basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createRotateB2DHomMatrix(rState.fontRotation));
aLocalTransformation.translate( rStartPoint.getX(),
rStartPoint.getY() );
::canvas::tools::appendToRenderState( o_rRenderState,
diff --git a/goodies/inc/chtuner.hxx b/goodies/inc/chtuner.hxx
index 4c7e288d2ce3..7a54c1e05a41 100644
--- a/goodies/inc/chtuner.hxx
+++ b/goodies/inc/chtuner.hxx
@@ -38,7 +38,7 @@
#endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
class ChannelItem;
class ChannelList;
diff --git a/goodies/inc/grfmgr.hxx b/goodies/inc/grfmgr.hxx
index b44c27ea65e3..1ef351ae6d32 100644
--- a/goodies/inc/grfmgr.hxx
+++ b/goodies/inc/grfmgr.hxx
@@ -353,7 +353,7 @@ public:
void ReleaseFromCache();
const Graphic& GetGraphic() const;
- void SetGraphic( const Graphic& rGraphic );
+ void SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj = 0);
void SetGraphic( const Graphic& rGraphic, const String& rLink );
/** Get graphic transformed according to given attributes
diff --git a/goodies/inc/pch/precompiled_goodies.hxx b/goodies/inc/pch/precompiled_goodies.hxx
index 8df95abff7ce..754e737467b4 100644
--- a/goodies/inc/pch/precompiled_goodies.hxx
+++ b/goodies/inc/pch/precompiled_goodies.hxx
@@ -96,13 +96,13 @@
#include "rtl/uuid.h"
#include "svtools/FilterConfigItem.hxx"
-#include "svtools/cacheoptions.hxx"
+#include "unotools/cacheoptions.hxx"
#include "svtools/fltcall.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/lstner.hxx"
#include "vcl/solar.hrc"
#include "svtools/stdctrl.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
#include "toolkit/helper/vclunohelper.hxx"
diff --git a/goodies/source/filter.vcl/eos2met/eos2met.cxx b/goodies/source/filter.vcl/eos2met/eos2met.cxx
index eabf720f7838..74db6f344492 100644
--- a/goodies/source/filter.vcl/eos2met/eos2met.cxx
+++ b/goodies/source/filter.vcl/eos2met/eos2met.cxx
@@ -1753,7 +1753,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
Polygon aSimplePoly;
const Polygon& rPoly = pA->GetPolygon();
if ( rPoly.HasFlags() )
- rPoly.GetSimple( aSimplePoly );
+ rPoly.AdaptiveSubdivide( aSimplePoly );
else
aSimplePoly = rPoly;
METLine( aSimplePoly );
@@ -1772,7 +1772,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
Polygon aSimplePoly;
const Polygon& rPoly = pA->GetPolygon();
if ( rPoly.HasFlags() )
- rPoly.GetSimple( aSimplePoly );
+ rPoly.AdaptiveSubdivide( aSimplePoly );
else
aSimplePoly = rPoly;
if( aGDIFillColor != Color( COL_TRANSPARENT ) )
@@ -1809,7 +1809,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
if ( aSimplePolyPoly[ i ].HasFlags() )
{
Polygon aSimplePoly;
- aSimplePolyPoly[ i ].GetSimple( aSimplePoly );
+ aSimplePolyPoly[ i ].AdaptiveSubdivide( aSimplePoly );
aSimplePolyPoly[ i ] = aSimplePoly;
}
}
diff --git a/goodies/source/filter.vcl/epict/epict.cxx b/goodies/source/filter.vcl/epict/epict.cxx
index 3de76263538d..4f20619eb185 100644
--- a/goodies/source/filter.vcl/epict/epict.cxx
+++ b/goodies/source/filter.vcl/epict/epict.cxx
@@ -55,6 +55,9 @@
#include "dlgepct.hrc"
#include "dlgepct.hxx"
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+
//============================== PictWriter ===================================
struct PictWriterAttrStackMember {
@@ -77,7 +80,6 @@ struct PictPattern {
sal_uInt32 nLo, nHi;
};
-
class PictWriter {
private:
@@ -178,6 +180,7 @@ private:
void WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry);
+ void HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon);
void WriteOpcodes(const GDIMetaFile & rMTF);
void WriteHeader(const GDIMetaFile & rMTF);
@@ -1371,6 +1374,65 @@ void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal
}
}
+void PictWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon)
+{
+ if(rLinePolygon.count())
+ {
+ basegfx::B2DPolyPolygon aLinePolyPolygon(rLinePolygon);
+ basegfx::B2DPolyPolygon aFillPolyPolygon;
+
+ rInfo.applyToB2DPolyPolygon(aLinePolyPolygon, aFillPolyPolygon);
+
+ if(aLinePolyPolygon.count())
+ {
+ aLinePolyPolygon = aLinePolyPolygon.getDefaultAdaptiveSubdivision();
+ const sal_uInt32 nPolyCount(aLinePolyPolygon.count());
+ SetAttrForFrame();
+
+ for(sal_uInt32 a(0); a < nPolyCount; a++)
+ {
+ const basegfx::B2DPolygon aCandidate(aLinePolyPolygon.getB2DPolygon(a));
+ const sal_uInt32 nPointCount(aCandidate.count());
+
+ if(nPointCount)
+ {
+ const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount + 1 : nPointCount);
+ const basegfx::B2DPoint aCurr(aCandidate.getB2DPoint(0));
+ Point nCurr(basegfx::fround(aCurr.getX()), basegfx::fround(aCurr.getY()));
+
+ for(sal_uInt32 b(0); b < nEdgeCount; b++)
+ {
+ const sal_uInt32 nNextIndex((b + 1) % nPointCount);
+ const basegfx::B2DPoint aNext(aCandidate.getB2DPoint(nNextIndex));
+ const Point nNext(basegfx::fround(aNext.getX()), basegfx::fround(aNext.getY()));
+
+ WriteOpcode_Line(nCurr, nNext);
+ nCurr = nNext;
+ }
+ }
+ }
+ }
+
+ if(aFillPolyPolygon.count())
+ {
+ const Color aOldLineColor(aLineColor);
+ const Color aOldFillColor(aFillColor);
+
+ aLineColor = Color( COL_TRANSPARENT );
+ aFillColor = aOldLineColor;
+ SetAttrForPaint();
+
+ for(sal_uInt32 a(0); a < aFillPolyPolygon.count(); a++)
+ {
+ const Polygon aPolygon(aFillPolyPolygon.getB2DPolygon(a).getDefaultAdaptiveSubdivision());
+ WriteOpcode_Poly(PDM_PAINT, aPolygon);
+ }
+
+ aLineColor = aOldLineColor;
+ aFillColor = aOldFillColor;
+ }
+ }
+}
void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
{
@@ -1417,8 +1479,19 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
if( aLineColor != Color( COL_TRANSPARENT ) )
{
- SetAttrForFrame();
- WriteOpcode_Line( pA->GetStartPoint(),pA->GetEndPoint() );
+ if(pA->GetLineInfo().IsDefault())
+ {
+ SetAttrForFrame();
+ WriteOpcode_Line( pA->GetStartPoint(),pA->GetEndPoint() );
+ }
+ else
+ {
+ // LineInfo used; handle Dash/Dot and fat lines
+ basegfx::B2DPolygon aPolygon;
+ aPolygon.append(basegfx::B2DPoint(pA->GetStartPoint().X(), pA->GetStartPoint().Y()));
+ aPolygon.append(basegfx::B2DPoint(pA->GetEndPoint().X(), pA->GetEndPoint().Y()));
+ HandleLineInfoPolyPolygons(pA->GetLineInfo(), aPolygon);
+ }
}
break;
}
@@ -1571,24 +1644,35 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
{
const Polygon& rPoly = pA->GetPolygon();
- Polygon aSimplePoly;
- if ( rPoly.HasFlags() )
- rPoly.GetSimple( aSimplePoly );
- else
- aSimplePoly = rPoly;
-
- const USHORT nSize = aSimplePoly.GetSize();
- Point aLast;
-
- if ( nSize )
+ if( rPoly.GetSize() )
{
- SetAttrForFrame();
- aLast = aSimplePoly[0];
+ if(pA->GetLineInfo().IsDefault())
+ {
+ Polygon aSimplePoly;
+ if ( rPoly.HasFlags() )
+ rPoly.AdaptiveSubdivide( aSimplePoly );
+ else
+ aSimplePoly = rPoly;
- for ( USHORT i = 1; i < nSize; i++ )
+ const USHORT nSize = aSimplePoly.GetSize();
+ Point aLast;
+
+ if ( nSize )
+ {
+ SetAttrForFrame();
+ aLast = aSimplePoly[0];
+
+ for ( USHORT i = 1; i < nSize; i++ )
+ {
+ WriteOpcode_Line( aLast, aSimplePoly[i] );
+ aLast = aSimplePoly[i];
+ }
+ }
+ }
+ else
{
- WriteOpcode_Line( aLast, aSimplePoly[i] );
- aLast = aSimplePoly[i];
+ // LineInfo used; handle Dash/Dot and fat lines
+ HandleLineInfoPolyPolygons(pA->GetLineInfo(), rPoly.getB2DPolygon());
}
}
}
@@ -1603,7 +1687,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
Polygon aSimplePoly;
if ( rPoly.HasFlags() )
- rPoly.GetSimple( aSimplePoly );
+ rPoly.AdaptiveSubdivide( aSimplePoly );
else
aSimplePoly = rPoly;
@@ -1632,7 +1716,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
if ( aSimplePolyPoly[ i ].HasFlags() )
{
Polygon aSimplePoly;
- aSimplePolyPoly[ i ].GetSimple( aSimplePoly );
+ aSimplePolyPoly[ i ].AdaptiveSubdivide( aSimplePoly );
aSimplePolyPoly[ i ] = aSimplePoly;
}
}
diff --git a/goodies/source/filter.vcl/epict/makefile.mk b/goodies/source/filter.vcl/epict/makefile.mk
index 4aa4bab80ffc..9f25a562488a 100644
--- a/goodies/source/filter.vcl/epict/makefile.mk
+++ b/goodies/source/filter.vcl/epict/makefile.mk
@@ -61,7 +61,7 @@ RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
.IF "$(L10N_framework)"==""
SHL1TARGET= ept$(DLLPOSTFIX)
SHL1IMPLIB= epict
-SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB)
+SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB) $(BASEGFXLIB)
SHL1LIBS= $(SLB)$/epict.lib
diff --git a/goodies/source/filter.vcl/eps/eps.cxx b/goodies/source/filter.vcl/eps/eps.cxx
index cda3da68aaa5..d3580bf4ebc6 100644
--- a/goodies/source/filter.vcl/eps/eps.cxx
+++ b/goodies/source/filter.vcl/eps/eps.cxx
@@ -388,7 +388,7 @@ BOOL PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
bTextFillColor = TRUE;
aTextFillColor = Color( COL_BLACK );
fLineWidth = 1;
- fMiterLimit = 10;
+ fMiterLimit = 15; // use same limit as most graphic systems and basegfx
eLineCap = SvtGraphicStroke::capButt;
eJoinType = SvtGraphicStroke::joinMiter;
aBackgroundColor = Color( COL_WHITE );
@@ -701,7 +701,40 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
Polygon aPoly( ( (const MetaPolyLineAction*) pMA )->GetPolygon() );
const LineInfo& rLineInfo = ( ( const MetaPolyLineAction*)pMA )->GetLineInfo();
ImplWriteLineInfo( rLineInfo );
- ImplPolyLine( aPoly );
+
+ if(basegfx::B2DLINEJOIN_NONE == rLineInfo.GetLineJoin()
+ && rLineInfo.GetWidth() > 1)
+ {
+ // emulate B2DLINEJOIN_NONE by creating single edges
+ const sal_uInt16 nPoints(aPoly.GetSize());
+ const bool bCurve(aPoly.HasFlags());
+
+ for(sal_uInt16 a(0); a + 1 < nPoints; a++)
+ {
+ if(bCurve
+ && POLY_NORMAL != aPoly.GetFlags(a + 1)
+ && a + 2 < nPoints
+ && POLY_NORMAL != aPoly.GetFlags(a + 2)
+ && a + 3 < nPoints)
+ {
+ const Polygon aSnippet(4,
+ aPoly.GetConstPointAry() + a,
+ aPoly.GetConstFlagAry() + a);
+ ImplPolyLine(aSnippet);
+ a += 2;
+ }
+ else
+ {
+ const Polygon aSnippet(2,
+ aPoly.GetConstPointAry() + a);
+ ImplPolyLine(aSnippet);
+ }
+ }
+ }
+ else
+ {
+ ImplPolyLine( aPoly );
+ }
}
break;
@@ -2343,8 +2376,28 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
SvtGraphicStroke::DashArray l_aDashArray;
if ( rLineInfo.GetStyle() == LINE_DASH )
l_aDashArray.push_back( 2 );
- double fLWidth = ( ( rLineInfo.GetWidth() + 1 ) + ( rLineInfo.GetWidth() + 1 ) ) * 0.5;
- ImplWriteLineInfo( fLWidth, 10.0, SvtGraphicStroke::capButt, SvtGraphicStroke::joinMiter, l_aDashArray );
+ const double fLWidth(( ( rLineInfo.GetWidth() + 1 ) + ( rLineInfo.GetWidth() + 1 ) ) * 0.5);
+ SvtGraphicStroke::JoinType aJoinType(SvtGraphicStroke::joinMiter);
+
+ switch(rLineInfo.GetLineJoin())
+ {
+ default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE
+ // do NOT use SvtGraphicStroke::joinNone here
+ // since it will be written as numerical value directly
+ // and is NOT a valid EPS value
+ break;
+ case basegfx::B2DLINEJOIN_MITER:
+ aJoinType = SvtGraphicStroke::joinMiter;
+ break;
+ case basegfx::B2DLINEJOIN_BEVEL:
+ aJoinType = SvtGraphicStroke::joinBevel;
+ break;
+ case basegfx::B2DLINEJOIN_ROUND:
+ aJoinType = SvtGraphicStroke::joinRound;
+ break;
+ }
+
+ ImplWriteLineInfo( fLWidth, fMiterLimit, SvtGraphicStroke::capButt, aJoinType, l_aDashArray );
}
//---------------------------------------------------------------------------------
diff --git a/goodies/source/filter.vcl/ios2met/ios2met.cxx b/goodies/source/filter.vcl/ios2met/ios2met.cxx
index 0fbf24f56029..8c3c19e22379 100644
--- a/goodies/source/filter.vcl/ios2met/ios2met.cxx
+++ b/goodies/source/filter.vcl/ios2met/ios2met.cxx
@@ -846,7 +846,7 @@ void OS2METReader::ReadRelLine(BOOL bGivenPos, USHORT nOrderLen)
if (nPolySize==0) return;
Polygon aPolygon(nPolySize);
for (i=0; i<nPolySize; i++) {
-#if (defined SOLARIS && defined PPC) || defined IRIX
+#if defined SOLARIS && defined PPC
UINT8 nunsignedbyte;
*pOS2MET >> nunsignedbyte; aP0.X()+=(INT8)nunsignedbyte;
*pOS2MET >> nunsignedbyte; aP0.Y()+=(INT8)nunsignedbyte;
diff --git a/goodies/source/graphic/grfcache.cxx b/goodies/source/graphic/grfcache.cxx
index 1a2af16ed741..f0a41ceca53f 100644
--- a/goodies/source/graphic/grfcache.cxx
+++ b/goodies/source/graphic/grfcache.cxx
@@ -37,6 +37,8 @@
#include <tools/poly.hxx>
#include "grfcache.hxx"
+#include <memory>
+
// -----------
// - Defines -
// -----------
@@ -612,7 +614,12 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti
if( !bInserted )
{
GraphicCacheEntry* pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.First() );
- const GraphicID aID( rObj );
+ ::std::auto_ptr< GraphicID > apID;
+
+ if( !pID )
+ {
+ apID.reset( new GraphicID( rObj ) );
+ }
while( !bInserted && pEntry )
{
@@ -647,10 +654,13 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti
}
}
}
- else if( rEntryID == aID )
+ else
{
- pEntry->AddGraphicObjectReference( rObj, rSubstitute );
- bInserted = TRUE;
+ if( rEntryID == *apID )
+ {
+ pEntry->AddGraphicObjectReference( rObj, rSubstitute );
+ bInserted = TRUE;
+ }
}
if( !bInserted )
diff --git a/goodies/source/graphic/grfmgr.cxx b/goodies/source/graphic/grfmgr.cxx
index 5cb37a51e81f..7f5970383075 100644
--- a/goodies/source/graphic/grfmgr.cxx
+++ b/goodies/source/graphic/grfmgr.cxx
@@ -44,7 +44,7 @@
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
#include <vcl/salbtype.hxx>
-#include <svtools/cacheoptions.hxx>
+#include <unotools/cacheoptions.hxx>
#include "grfmgr.hxx"
// -----------
@@ -845,7 +845,7 @@ const Graphic& GraphicObject::GetGraphic() const
// -----------------------------------------------------------------------------
-void GraphicObject::SetGraphic( const Graphic& rGraphic )
+void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj )
{
mpMgr->ImplUnregisterObj( *this );
@@ -858,7 +858,7 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic )
delete mpLink, mpLink = NULL;
delete mpSimpleCache, mpSimpleCache = NULL;
- mpMgr->ImplRegisterObj( *this, maGraphic );
+ mpMgr->ImplRegisterObj( *this, maGraphic, 0, pCopyObj);
if( mpSwapOutTimer )
mpSwapOutTimer->Start();
diff --git a/goodies/source/unographic/descriptor.cxx b/goodies/source/unographic/descriptor.cxx
index e75b008cfb69..c19318d6e11e 100644
--- a/goodies/source/unographic/descriptor.cxx
+++ b/goodies/source/unographic/descriptor.cxx
@@ -37,7 +37,7 @@
#include <vos/mutex.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <svtools/filter.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
#ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_
#include <com/sun/star/beans/PropertyState.hpp>
diff --git a/goodies/source/unographic/renderer.cxx b/goodies/source/unographic/renderer.cxx
index 78f006cc69be..d280ed832999 100644
--- a/goodies/source/unographic/renderer.cxx
+++ b/goodies/source/unographic/renderer.cxx
@@ -48,7 +48,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/propertysetinfo.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
#include "grfmgr.hxx"
#include "graphic.hxx"
#include "renderer.hxx"
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 27d6443a27fc..39e925cb7eb9 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -1038,7 +1038,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
if ( !xNatNumSup.is() )
{
throw RuntimeException( OUString(
-#ifndef PRODUCT
+#ifdef DBG_UTIL
RTL_CONSTASCII_USTRINGPARAM(
"cclass_Unicode::parseText: can't instanciate "
NATIVENUMBERSUPPLIER_SERVICENAME )
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 9126162d6f36..91d856b19e62 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -39,11 +39,6 @@
#include <stdio.h>
#include <string.h>
-#if OSL_DEBUG_LEVEL == 0 && !defined(NDEBUG)
-#define NDEBUG
-#endif
-#include <assert.h>
-
// Cyrillic upper case
#define C_CYR_A "\xD0\x90"
#define C_CYR_B "\xD0\x91"
@@ -277,7 +272,7 @@ const char* expected_name( int i, int last )
else if( i==1 ) return "NumberingType";
else if( i==2 ) return "Suffix";
else if( i==last ) return "Value";
- else { assert(0); return ""; }
+ else { OSL_ASSERT(0); return ""; }
}
static
const char* expected_type( int i, int last )
@@ -287,7 +282,7 @@ const char* expected_type( int i, int last )
else if( i==1 ) return "sal_Int16";
else if( i==2 ) return "OUString";
else if( i==last ) return "sal_Int32";
- else { assert(0); return ""; }
+ else { OSL_ASSERT(0); return ""; }
}
static
void failedToConvert( int i, int last )
@@ -461,7 +456,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
return OUString::createFromAscii(""); // ignore prefix and suffix
case PAGE_DESCRIPTOR:
case BITMAP:
- assert(0);
+ OSL_ASSERT(0);
throw IllegalArgumentException();
case CHARS_UPPER_LETTER_N:
lcl_formatChars1( upperLetter, 26, number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>BB, ...
@@ -480,7 +475,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
} catch (Exception& ) {
// When translteration property is missing, return default number (bug #101141#)
result += OUString::valueOf( number );
- // assert(0);
+ // OSL_ASSERT(0);
// throw IllegalArgumentException();
}
break;
@@ -674,7 +669,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
break;
default:
- assert(0);
+ OSL_ASSERT(0);
throw IllegalArgumentException();
}
diff --git a/i18npool/source/isolang/inwnt.cxx b/i18npool/source/isolang/inwnt.cxx
index 7d5e4d3216e7..2550eb3acd10 100644
--- a/i18npool/source/isolang/inwnt.cxx
+++ b/i18npool/source/isolang/inwnt.cxx
@@ -104,11 +104,7 @@ LanguageType MsLangId::getPlatformSystemUILanguage()
{
// TODO: this could be distinguished, #if(WINVER >= 0x0500)
// needs _run_ time differentiation though, not at compile time.
-#if 0
getPlatformSystemLanguageImpl( nImplSystemUILanguage,
&GetUserDefaultUILanguage, &GetSystemDefaultUILanguage);
-#endif
- getPlatformSystemLanguageImpl( nImplSystemUILanguage,
- &GetUserDefaultLangID, &GetSystemDefaultLangID);
return nImplSystemUILanguage;
}
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 3476341fbc79..aab92d717429 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -154,7 +154,7 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
nLang = LANGUAGE_CHINESE_SIMPLIFIED;
else
- nLang = nConfiguredComplexFallback;
+ nLang = nConfiguredAsianFallback;
break;
case ::com::sun::star::i18n::ScriptType::COMPLEX:
if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 083fbc548c8c..e119e71ec14c 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -38,13 +38,6 @@
#include <stdio.h>
#include "rtl/instance.hxx"
-#if OSL_DEBUG_LEVEL == 0
-# ifndef NDEBUG
-# define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
using namespace com::sun::star::i18n;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -1136,7 +1129,7 @@ LocaleData::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(Ru
rVal.Value <<= (sal_Int16) sVal.toInt32();
break;
default:
- assert(0);
+ OSL_ASSERT(0);
}
}
}
@@ -1260,7 +1253,7 @@ LocaleData::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(Runti
case 10: level[j].sTransliteration = tmp; break;
case 11: level[j].nNatNum = tmp.toInt32(); break;
default:
- assert(0);
+ OSL_ASSERT(0);
}
}
}
diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk
index 1b48919624f6..2e81ec3f1d53 100644
--- a/i18npool/source/search/makefile.mk
+++ b/i18npool/source/search/makefile.mk
@@ -50,6 +50,12 @@ SLOFILES= \
$(EXCEPTIONSFILES) \
$(SLO)$/levdis.obj
+# on unxsoli, no optimization for textsearch because of i105945
+.IF "$(OS)$(COM)$(CPUNAME)"=="SOLARISC52INTEL"
+EXCEPTIONSNOOPTFILES= \
+ $(SLO)$/textsearch.obj
+.ENDIF
+
SHL1TARGET= $(TARGET)
SHL1OBJS= $(SLOFILES)
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 96f033f4e4e3..2518a6cb0481 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -562,6 +562,7 @@ sal_Int32 TextSearch::GetDiff( const sal_Unicode cChr ) const
}
+// TextSearch::NSrchFrwrd is mis-optimized on unxsoli (#i105945#)
SearchResult TextSearch::NSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos )
throw(RuntimeException)
{
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index 23a264603df9..a49bf3031bbc 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.cxx
@@ -39,6 +39,8 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
+#include <vector>
+
using namespace ::rtl;
void make_hhc_char(FILE *sfp, FILE *cfp);
@@ -357,8 +359,8 @@ void make_stc_word(FILE *sfp, FILE *cfp)
{
sal_Int32 count, i, length;
sal_Unicode STC_WordData[0x10000];
- Index *STC_WordEntry_S2T = (Index*) malloc(0x10000 * sizeof(Index));
- Index *STC_WordEntry_T2S = (Index*) malloc(0x10000 * sizeof(Index));
+ std::vector<Index> STC_WordEntry_S2T(0x10000);
+ std::vector<Index> STC_WordEntry_T2S(0x10000);
sal_Int32 count_S2T = 0, count_T2S = 0;
sal_Int32 line = 0, char_total = 0;
sal_Char Cstr[1024];
@@ -416,7 +418,7 @@ void make_stc_word(FILE *sfp, FILE *cfp)
sal_uInt16 STC_WordIndex[0x100];
if (count_S2T > 0) {
- qsort(STC_WordEntry_S2T, count_S2T, sizeof(Index), Index_comp);
+ qsort(&STC_WordEntry_S2T[0], count_S2T, sizeof(Index), Index_comp);
fprintf(cfp, "\nstatic const sal_uInt16 STC_WordEntry_S2T[] = {");
count = 0;
@@ -449,7 +451,7 @@ void make_stc_word(FILE *sfp, FILE *cfp)
}
if (count_T2S > 0) {
- qsort(STC_WordEntry_T2S, count_T2S, sizeof(Index), Index_comp);
+ qsort(&STC_WordEntry_T2S[0], count_T2S, sizeof(Index), Index_comp);
fprintf(cfp, "\nstatic const sal_uInt16 STC_WordEntry_T2S[] = {");
count = 0;
@@ -480,7 +482,5 @@ void make_stc_word(FILE *sfp, FILE *cfp)
fprintf (cfp, "\tconst sal_uInt16* getSTC_WordEntry_T2S() { return NULL; }\n");
fprintf (cfp, "\tconst sal_uInt16* getSTC_WordIndex_T2S(sal_Int32& count) { count = 0; return NULL; }\n");
}
- free(STC_WordEntry_S2T);
- free(STC_WordEntry_T2S);
}
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 70fe224cf6a9..b592790516da 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -51,6 +51,7 @@ SHL1OBJS= \
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
+ $(TESTSHL2LIB)\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index 6bb169e951a4..eebbb633f82b 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -1,6 +1,6 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include "cow_wrapper_clients.hxx"
diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
index 5e247a8b9abc..25f2209c94f5 100644
--- a/o3tl/qa/test-heap_ptr.cxx
+++ b/o3tl/qa/test-heap_ptr.cxx
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <o3tl/heap_ptr.hxx>
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index 626d9b6e3a90..fa956db96005 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.cxx
@@ -29,7 +29,7 @@
************************************************************************/
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <o3tl/range.hxx>
#include <vector>
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 052de2cbb731..58c37dcffa83 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -807,7 +807,7 @@ AddPrinterDialog::~AddPrinterDialog()
void AddPrinterDialog::updateSettings()
{
- if( ! GetDisplayBackground().GetColor().IsDark() )
+ if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
m_aTitleImage.SetImage( Image( BitmapEx( PaResId( RID_BMP_PRINTER ) ) ) );
else
m_aTitleImage.SetImage( Image( BitmapEx( PaResId( RID_BMP_PRINTER_HC ) ) ) );
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 9aa65c8ce204..c6daf547369c 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -79,20 +79,22 @@ void CommandStore::getSystemPdfCommands( ::std::list< String >& rCommands )
pPipe = popen( "which gs 2>/dev/null", "r" );
if( pPipe )
{
- fgets( pBuffer, sizeof( pBuffer ), pPipe );
- int nLen = strlen( pBuffer );
- if( pBuffer[nLen-1] == '\n' ) // strip newline
- pBuffer[--nLen] = 0;
- aCommand = String( ByteString( pBuffer ), aEncoding );
- if( ( ( aCommand.GetChar( 0 ) == '/' )
- || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '/' )
- || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '.' && aCommand.GetChar( 2 ) == '/' ) )
- && nLen > 2
- && aCommand.GetChar( nLen-2 ) == 'g'
- && aCommand.GetChar( nLen-1 ) == 's' )
+ if (fgets( pBuffer, sizeof( pBuffer ), pPipe ) != NULL)
{
- aCommand.AppendAscii( " -q -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=\"(OUTFILE)\" -" );
- aSysCommands.push_back( aCommand );
+ int nLen = strlen( pBuffer );
+ if( pBuffer[nLen-1] == '\n' ) // strip newline
+ pBuffer[--nLen] = 0;
+ aCommand = String( ByteString( pBuffer ), aEncoding );
+ if( ( ( aCommand.GetChar( 0 ) == '/' )
+ || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '/' )
+ || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '.' && aCommand.GetChar( 2 ) == '/' ) )
+ && nLen > 2
+ && aCommand.GetChar( nLen-2 ) == 'g'
+ && aCommand.GetChar( nLen-1 ) == 's' )
+ {
+ aCommand.AppendAscii( " -q -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=\"(OUTFILE)\" -" );
+ aSysCommands.push_back( aCommand );
+ }
}
pclose( pPipe );
}
@@ -100,19 +102,21 @@ void CommandStore::getSystemPdfCommands( ::std::list< String >& rCommands )
pPipe = popen( "which distill 2>/dev/null", "r" );
if( pPipe )
{
- fgets( pBuffer, sizeof( pBuffer ), pPipe );
- int nLen = strlen( pBuffer );
- if( pBuffer[nLen-1] == '\n' ) // strip newline
- pBuffer[--nLen] = 0;
- aCommand = String( ByteString( pBuffer ), aEncoding );
- if( ( ( aCommand.GetChar( 0 ) == '/' )
- || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '/' )
- || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '.' && aCommand.GetChar( 2 ) == '/' ) )
- && nLen > 7
- && aCommand.Copy( nLen - 8 ).EqualsAscii( "/distill" ) )
+ if (fgets( pBuffer, sizeof( pBuffer ), pPipe ) != NULL)
{
- aCommand.AppendAscii( " (TMP) ; mv `echo (TMP) | sed s/\\.ps\\$/.pdf/` \"(OUTFILE)\"" );
- aSysCommands.push_back( aCommand );
+ int nLen = strlen( pBuffer );
+ if( pBuffer[nLen-1] == '\n' ) // strip newline
+ pBuffer[--nLen] = 0;
+ aCommand = String( ByteString( pBuffer ), aEncoding );
+ if( ( ( aCommand.GetChar( 0 ) == '/' )
+ || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '/' )
+ || ( aCommand.GetChar( 0 ) == '.' && aCommand.GetChar( 1 ) == '.' && aCommand.GetChar( 2 ) == '/' ) )
+ && nLen > 7
+ && aCommand.Copy( nLen - 8 ).EqualsAscii( "/distill" ) )
+ {
+ aCommand.AppendAscii( " (TMP) ; mv `echo (TMP) | sed s/\\.ps\\$/.pdf/` \"(OUTFILE)\"" );
+ aSysCommands.push_back( aCommand );
+ }
}
pclose( pPipe );
}
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index d1d36fade717..5a6a1d0e319e 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -110,7 +110,7 @@ PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
void PADialog::updateSettings()
{
- if( ! GetDisplayBackground().GetColor().IsDark() )
+ if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
{
m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) );
m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX ) ) );
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index eb9f8937b939..fd8e49135eb0 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -138,28 +138,41 @@ public:
sal_uInt32 Size(){ return( nLen ); };
void Put( sal_uInt64 lVal )
{
+ union
+ {
+ sal_uInt64 lVal64;
+ sal_uInt32 aVal32[2];
+ };
+ lVal64 = lVal;
if( bSwap )
{
- Put( *(((sal_uInt32*)&lVal)+1) );
- Put( *(sal_uInt32*)&lVal );
+ Put( aVal32[1] );
+ Put( aVal32[0] );
}
else
{
- Put( *(sal_uInt32*)&lVal );
- Put( *(((sal_uInt32*)&lVal)+1) );
+ Put( aVal32[0] );
+ Put( aVal32[1] );
}
}
void Put( sal_Int32 lVal )
{
+ union
+ {
+ sal_uInt32 lVal32;
+ sal_uInt16 aVal16[2];
+ };
+ lVal32 = lVal;
+
if( bSwap )
{
- Put( *(((sal_uInt16*)&lVal) +1) );
- Put( *(sal_uInt16*)&lVal );
+ Put( aVal16[1] );
+ Put( aVal16[0] );
}
else
{
- Put( *(sal_uInt16*)&lVal );
- Put( *(((sal_uInt16*)&lVal) +1) );
+ Put( aVal16[0] );
+ Put( aVal16[1] );
}
}
void Put( sal_uInt32 nValue )
@@ -171,15 +184,22 @@ public:
void PutAt( sal_uInt32 nPos, INT32 lVal )
{
+ union
+ {
+ sal_uInt32 lVal32;
+ sal_uInt16 aVal16[2];
+ };
+ lVal32 = lVal;
+
if( bSwap )
{
- PutAt( nPos, *(((sal_uInt16*)&lVal) +1) );
- PutAt( nPos + 2, *(sal_uInt16*)&lVal );
+ PutAt( nPos, aVal16[1] );
+ PutAt( nPos + 2, aVal16[0] );
}
else
{
- PutAt( nPos, *(sal_uInt16*)&lVal );
- PutAt( nPos + 2, *(((sal_uInt16*)&lVal) +1) );
+ PutAt( nPos, aVal16[0] );
+ PutAt( nPos + 2, aVal16[1] );
}
}
void PutAt( sal_uInt32 nPos, sal_uInt32 lVal )
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 3c2c95e541d1..8c34637fa304 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -317,7 +317,7 @@ int yylex()
/****************** yyerror **********************************************/
#ifdef RS6000
extern "C" void yyerror( char* pMessage )
-#elif defined HP9000 || defined SCO || defined IRIX || defined SOLARIS
+#elif defined HP9000 || defined SCO || defined SOLARIS
extern "C" void yyerror( const char* pMessage )
#else
void yyerror( char* pMessage )
diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index 89feed4dd132..63afd0b208c7 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -107,7 +107,7 @@ class ObjectStack {
extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion
extern "C" void yyerror( char * );
extern "C" int yylex( void );
-#elif defined( HP9000 ) || defined( SCO ) || defined ( IRIX ) || defined ( SOLARIS )
+#elif defined( HP9000 ) || defined( SCO ) || defined ( SOLARIS )
extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion
extern "C" void yyerror( const char * );
extern "C" int yylex( void );
diff --git a/rsc/source/rsc/makefile.mk b/rsc/source/rsc/makefile.mk
index 40e2d77740a3..89abd22207d9 100644
--- a/rsc/source/rsc/makefile.mk
+++ b/rsc/source/rsc/makefile.mk
@@ -40,10 +40,6 @@ ENABLE_EXCEPTIONS=true
.INCLUDE : settings.mk
-.IF "$(OS)"=="IRIX"
-NOOPTFILES= $(OBJ)$/rsc.obj
-.ENDIF
-
OBJFILES= $(OBJ)$/rsc.obj
.INCLUDE : target.mk
diff --git a/sax/inc/sax/tools/converter.hxx b/sax/inc/sax/tools/converter.hxx
index 18212dfb9b8b..f8c988d2fceb 100644
--- a/sax/inc/sax/tools/converter.hxx
+++ b/sax/inc/sax/tools/converter.hxx
@@ -31,11 +31,13 @@
#ifndef _SAX_CONVERTER_HXX
#define _SAX_CONVERTER_HXX
-#include <sal/types.h>
#include "sax/dllapi.h"
-#include <com/sun/star/util/Date.hpp>
+
+#include <sal/types.h>
+
#include <com/sun/star/util/MeasureUnit.hpp>
+
namespace rtl
{
class OUString;
@@ -43,8 +45,12 @@ class OUStringBuffer;
}
namespace com { namespace sun { namespace star {
- namespace util { struct DateTime; }
-}}}
+ namespace util {
+ struct Date;
+ struct DateTime;
+ struct Duration;
+ }
+} } }
namespace sax {
@@ -138,31 +144,43 @@ public:
/** convert string to double number (using ::rtl::math) with unit conversion */
static bool convertDouble(double& rValue, const ::rtl::OUString& rString, sal_Int16 nTargetUnit );
- /** convert double to ISO Time String */
- static void convertTime( ::rtl::OUStringBuffer& rBuffer,
- const double& fTime);
+ /** convert double to ISO "duration" string; negative durations allowed */
+ static void convertDuration(::rtl::OUStringBuffer& rBuffer,
+ const double fTime);
- /** convert util::DateTime to ISO Time String */
- static void convertTime( ::rtl::OUStringBuffer& rBuffer,
- const ::com::sun::star::util::DateTime& rDateTime );
+ /** convert util::Duration to ISO "duration" string */
+ static void convertDuration(::rtl::OUStringBuffer& rBuffer,
+ const ::com::sun::star::util::Duration& rDuration);
- /** convert ISO Time String to double */
- static bool convertTime( double& fTime,
+ /** convert ISO "duration" string to double; negative durations allowed */
+ static bool convertDuration(double & rfTime,
const ::rtl::OUString& rString);
- /** convert ISO Time String to util::DateTime */
- static bool convertTime( ::com::sun::star::util::DateTime& rDateTime,
- const ::rtl::OUString& rString );
+ /** convert ISO "duration" string to util::Duration */
+ static bool convertDuration(::com::sun::star::util::Duration& rDuration,
+ const ::rtl::OUString& rString);
- /** convert util::DateTime to ISO Date String */
+ /** convert util::Date to ISO "date" string */
+ static void convertDate( ::rtl::OUStringBuffer& rBuffer,
+ const com::sun::star::util::Date& rDate );
+
+ /** convert util::DateTime to ISO "date" or "dateTime" string */
static void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
const com::sun::star::util::DateTime& rDateTime,
bool bAddTimeIf0AM = false );
- /** convert ISO Date String to util::DateTime */
+ /** convert ISO "date" or "dateTime" string to util::DateTime */
static bool convertDateTime( com::sun::star::util::DateTime& rDateTime,
const ::rtl::OUString& rString );
+ /** convert ISO "date" or "dateTime" string to util::DateTime or
+ util::Date */
+ static bool convertDateOrDateTime(
+ com::sun::star::util::Date & rDate,
+ com::sun::star::util::DateTime & rDateTime,
+ bool & rbDateTime,
+ const ::rtl::OUString & rString );
+
/** gets the position of the first comma after npos in the string
rStr. Commas inside '"' pairs are not matched */
static sal_Int32 indexOfComma( const ::rtl::OUString& rStr,
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 1ec1128516fd..4eb07be50311 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.cxx
@@ -32,13 +32,6 @@
#include <vector>
-#if OSL_DEBUG_LEVEL == 0
-# ifndef NDEBUG
-# define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
#include <cppuhelper/weak.hxx>
using namespace ::std;
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index e1f5161b7e3a..b1726f750127 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -46,11 +46,7 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include "expat/xmlparse.h"
-#endif
using namespace ::rtl;
using namespace ::std;
diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx
index 07cb6afac77d..3e6220a0c782 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -42,11 +42,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx>
-#ifdef SYSTEM_EXPAT
#include <expat.h>
-#else
-#include "expat/xmlparse.h"
-#endif
#include "xml2utf.hxx"
#include <sax/fastattribs.hxx>
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 354ee1936094..e13df493628a 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -32,8 +32,9 @@
#include <com/sun/star/i18n/UnicodeType.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/Duration.hpp>
#include <com/sun/star/uno/Sequence.hxx>
+
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#include "sax/tools/converter.hxx"
@@ -683,11 +684,10 @@ bool Converter::convertDouble(double& rValue, const ::rtl::OUString& rString)
return ( eStatus == rtl_math_ConversionStatus_Ok );
}
-/** convert double to ISO Time String; negative durations allowed */
-void Converter::convertTime( ::rtl::OUStringBuffer& rBuffer,
- const double& fTime)
+/** convert double to ISO "duration" string; negative durations allowed */
+void Converter::convertDuration(::rtl::OUStringBuffer& rBuffer,
+ const double fTime)
{
-
double fValue = fTime;
// take care of negative durations as specified in:
@@ -755,9 +755,9 @@ void Converter::convertTime( ::rtl::OUStringBuffer& rBuffer,
rBuffer.append( sal_Unicode('S'));
}
-/** convert ISO Time String to double; negative durations allowed */
-bool Converter::convertTime( double& fTime,
- const ::rtl::OUString& rString)
+/** convert ISO "duration" string to double; negative durations allowed */
+bool Converter::convertDuration(double& rfTime,
+ const ::rtl::OUString& rString)
{
rtl::OUString aTrimmed = rString.trim().toAsciiUpperCase();
const sal_Unicode* pStr = aTrimmed.getStr();
@@ -880,64 +880,403 @@ bool Converter::convertTime( double& fTime,
fTempTime = -fTempTime;
}
- fTime = fTempTime;
+ rfTime = fTempTime;
}
return bSuccess;
}
-/** convert util::DateTime to ISO Time String */
-void Converter::convertTime( ::rtl::OUStringBuffer& rBuffer,
- const ::com::sun::star::util::DateTime& rDateTime )
+/** convert util::Duration to ISO "duration" string */
+void Converter::convertDuration(::rtl::OUStringBuffer& rBuffer,
+ const ::util::Duration& rDuration)
{
- double fHour = rDateTime.Hours;
- double fMin = rDateTime.Minutes;
- double fSec = rDateTime.Seconds;
- double fSec100 = rDateTime.HundredthSeconds;
- double fTempTime = fHour / 24;
- fTempTime += fMin / (24 * 60);
- fTempTime += fSec / (24 * 60 * 60);
- fTempTime += fSec100 / (24 * 60 * 60 * 100);
- convertTime( rBuffer, fTempTime );
+ if (rDuration.Negative)
+ {
+ rBuffer.append(sal_Unicode('-'));
+ }
+ rBuffer.append(sal_Unicode('P'));
+ const bool bHaveDate(static_cast<sal_Int32>(rDuration.Years)
+ +static_cast<sal_Int32>(rDuration.Months)
+ +static_cast<sal_Int32>(rDuration.Days));
+ if (rDuration.Years)
+ {
+ rBuffer.append(static_cast<sal_Int32>(rDuration.Years));
+ rBuffer.append(sal_Unicode('Y'));
+ }
+ if (rDuration.Months)
+ {
+ rBuffer.append(static_cast<sal_Int32>(rDuration.Months));
+ rBuffer.append(sal_Unicode('M'));
+ }
+ if (rDuration.Days)
+ {
+ rBuffer.append(static_cast<sal_Int32>(rDuration.Days));
+ rBuffer.append(sal_Unicode('D'));
+ }
+ const sal_Int32 nHSecs(static_cast<sal_Int32>(rDuration.Seconds)
+ + static_cast<sal_Int32>(rDuration.HundredthSeconds));
+ if (static_cast<sal_Int32>(rDuration.Hours) +
+ static_cast<sal_Int32>(rDuration.Minutes) + nHSecs)
+ {
+ rBuffer.append(sal_Unicode('T')); // time separator
+ if (rDuration.Hours)
+ {
+ rBuffer.append(static_cast<sal_Int32>(rDuration.Hours));
+ rBuffer.append(sal_Unicode('H'));
+ }
+ if (rDuration.Minutes)
+ {
+ rBuffer.append(static_cast<sal_Int32>(rDuration.Minutes));
+ rBuffer.append(sal_Unicode('M'));
+ }
+ if (nHSecs)
+ {
+ // seconds must not be omitted (i.e. ".42S" is not valid)
+ rBuffer.append(static_cast<sal_Int32>(rDuration.Seconds));
+ if (rDuration.HundredthSeconds)
+ {
+ rBuffer.append(sal_Unicode('.'));
+ const sal_Int32 nHundredthSeconds(
+ rDuration.HundredthSeconds % 100);
+ if (nHundredthSeconds < 10)
+ {
+ rBuffer.append(sal_Unicode('0'));
+ }
+ rBuffer.append(nHundredthSeconds);
+ }
+ rBuffer.append(sal_Unicode('S'));
+ }
+ }
+ else if (!bHaveDate)
+ {
+ // zero duration: XMLSchema-2 says there must be at least one component
+ rBuffer.append(sal_Unicode('0'));
+ rBuffer.append(sal_Unicode('D'));
+ }
}
-/** convert ISO Time String to util::DateTime */
-bool Converter::convertTime( ::com::sun::star::util::DateTime& rDateTime,
- const ::rtl::OUString& rString )
+enum Result { R_NOTHING, R_OVERFLOW, R_SUCCESS };
+
+static Result
+readUnsignedNumber(const ::rtl::OUString & rString,
+ sal_Int32 & io_rnPos, sal_Int32 & o_rNumber)
{
- double fCalculatedTime = 0.0;
- if( convertTime( fCalculatedTime, rString ) )
+ bool bOverflow(false);
+ sal_Int32 nTemp(0);
+
+ for (sal_Int32 nPos = io_rnPos; (nPos < rString.getLength()); ++nPos)
{
- // #101357# declare as volatile to prevent optimization
- // (gcc 3.0.1 Linux)
- volatile double fTempTime = fCalculatedTime;
- fTempTime *= 24;
- double fHoursValue = ::rtl::math::approxFloor (fTempTime);
- fTempTime -= fHoursValue;
- fTempTime *= 60;
- double fMinsValue = ::rtl::math::approxFloor (fTempTime);
- fTempTime -= fMinsValue;
- fTempTime *= 60;
- double fSecsValue = ::rtl::math::approxFloor (fTempTime);
- fTempTime -= fSecsValue;
- double f100SecsValue = 0.0;
-
- if( fTempTime > 0.00001 )
- f100SecsValue = fTempTime;
-
- rDateTime.Year = 0;
- rDateTime.Month = 0;
- rDateTime.Day = 0;
- rDateTime.Hours = static_cast < sal_uInt16 > ( fHoursValue );
- rDateTime.Minutes = static_cast < sal_uInt16 > ( fMinsValue );
- rDateTime.Seconds = static_cast < sal_uInt16 > ( fSecsValue );
- rDateTime.HundredthSeconds = static_cast < sal_uInt16 > ( f100SecsValue * 100.0 );
+ const sal_Unicode c = rString[nPos];
+ if ((sal_Unicode('0') <= c) && (c <= sal_Unicode('9')))
+ {
+ nTemp *= 10;
+ nTemp += (c - sal_Unicode('0'));
+ if (nTemp >= SAL_MAX_INT16)
+ {
+ bOverflow = true;
+ }
+ }
+ else
+ {
+ if (io_rnPos != nPos) // read something?
+ {
+ io_rnPos = nPos;
+ if (bOverflow)
+ {
+ return R_OVERFLOW;
+ }
+ else
+ {
+ o_rNumber = nTemp;
+ return R_SUCCESS;
+ }
+ }
+ else break;
+ }
+ }
+
+ o_rNumber = -1;
+ return R_NOTHING;
+}
+static bool
+readDurationT(const ::rtl::OUString & rString, sal_Int32 & io_rnPos)
+{
+ if ((io_rnPos < rString.getLength()) &&
+ (rString[io_rnPos] == sal_Unicode('T')))
+ {
+ ++io_rnPos;
return true;
}
return false;
}
-/** convert util::DateTime to ISO Date String */
+static bool
+readDurationComponent(const ::rtl::OUString & rString,
+ sal_Int32 & io_rnPos, sal_Int32 & io_rnTemp, bool & io_rbTimePart,
+ sal_Int32 & o_rnTarget, const sal_Unicode c)
+{
+ if ((io_rnPos < rString.getLength()))
+ {
+ if (c == rString[io_rnPos])
+ {
+ ++io_rnPos;
+ if (-1 != io_rnTemp)
+ {
+ o_rnTarget = io_rnTemp;
+ io_rnTemp = -1;
+ if (!io_rbTimePart)
+ {
+ io_rbTimePart = readDurationT(rString, io_rnPos);
+ }
+ return (R_OVERFLOW !=
+ readUnsignedNumber(rString, io_rnPos, io_rnTemp));
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+/** convert ISO "duration" string to util::Duration */
+bool Converter::convertDuration(util::Duration& rDuration,
+ const ::rtl::OUString& rString)
+{
+ const ::rtl::OUString string = rString.trim().toAsciiUpperCase();
+ sal_Int32 nPos(0);
+
+ bool bIsNegativeDuration(false);
+ if (string.getLength() && (sal_Unicode('-') == string[0]))
+ {
+ bIsNegativeDuration = true;
+ ++nPos;
+ }
+
+ if ((nPos < string.getLength())
+ && (string[nPos] != sal_Unicode('P'))) // duration must start with "P"
+ {
+ return false;
+ }
+
+ ++nPos;
+
+ /// last read number; -1 == no valid number! always reset after using!
+ sal_Int32 nTemp(-1);
+ bool bTimePart(false); // have we read 'T'?
+ bool bSuccess(false);
+ sal_Int32 nYears(0);
+ sal_Int32 nMonths(0);
+ sal_Int32 nDays(0);
+ sal_Int32 nHours(0);
+ sal_Int32 nMinutes(0);
+ sal_Int32 nSeconds(0);
+ sal_Int32 nHundredthSeconds(0);
+
+ bTimePart = readDurationT(string, nPos);
+ bSuccess = (R_SUCCESS == readUnsignedNumber(string, nPos, nTemp));
+
+ if (!bTimePart && bSuccess)
+ {
+ bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+ nYears, sal_Unicode('Y'));
+ }
+
+ if (!bTimePart && bSuccess)
+ {
+ bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+ nMonths, sal_Unicode('M'));
+ }
+
+ if (!bTimePart && bSuccess)
+ {
+ bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+ nDays, sal_Unicode('D'));
+ }
+
+ if (bTimePart)
+ {
+ if (-1 == nTemp) // a 'T' must be followed by a component
+ {
+ bSuccess = false;
+ }
+
+ if (bSuccess)
+ {
+ bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+ nHours, sal_Unicode('H'));
+ }
+
+ if (bSuccess)
+ {
+ bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+ nMinutes, sal_Unicode('M'));
+ }
+
+ // eeek! seconds are icky.
+ if ((nPos < string.getLength()) && bSuccess)
+ {
+ if (sal_Unicode('.') == string[nPos])
+ {
+ ++nPos;
+ if (-1 != nTemp)
+ {
+ nSeconds = nTemp;
+ nTemp = -1;
+ const sal_Int32 nStart(nPos);
+ bSuccess =
+ (R_SUCCESS == readUnsignedNumber(string, nPos, nTemp));
+ if ((nPos < string.getLength()) && bSuccess)
+ {
+ if (sal_Unicode('S') == string[nPos])
+ {
+ ++nPos;
+ if (-1 != nTemp)
+ {
+ nTemp = -1;
+ const sal_Int32 nDigits = nPos - nStart;
+ OSL_ENSURE(nDigits > 0, "bad code monkey");
+ nHundredthSeconds = 10 *
+ (string[nStart] - sal_Unicode('0'));
+ if (nDigits >= 2)
+ {
+ nHundredthSeconds +=
+ (string[nStart+1] - sal_Unicode('0'));
+ }
+ }
+ else
+ {
+ bSuccess = false;
+ }
+ }
+ }
+ }
+ else
+ {
+ bSuccess = false;
+ }
+ }
+ else if (sal_Unicode('S') == string[nPos])
+ {
+ ++nPos;
+ if (-1 != nTemp)
+ {
+ nSeconds = nTemp;
+ nTemp = -1;
+ }
+ else
+ {
+ bSuccess = false;
+ }
+ }
+ }
+ }
+
+ if (nPos != string.getLength()) // string not processed completely?
+ {
+ bSuccess = false;
+ }
+
+ if (nTemp != -1) // unprocessed number?
+ {
+ bSuccess = false;
+ }
+
+ if (bSuccess)
+ {
+ rDuration.Negative = bIsNegativeDuration;
+ rDuration.Years = static_cast<sal_Int16>(nYears);
+ rDuration.Months = static_cast<sal_Int16>(nMonths);
+ rDuration.Days = static_cast<sal_Int16>(nDays);
+ rDuration.Hours = static_cast<sal_Int16>(nHours);
+ rDuration.Minutes = static_cast<sal_Int16>(nMinutes);
+ rDuration.Seconds = static_cast<sal_Int16>(nSeconds);
+ rDuration.HundredthSeconds = static_cast<sal_Int16>(nHundredthSeconds);
+ }
+
+ return bSuccess;
+}
+
+#if 0
+//FIXME
+struct Test {
+ static bool eqDuration(util::Duration a, util::Duration b) {
+ return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days
+ && a.Hours == b.Hours && a.Minutes == b.Minutes
+ && a.Seconds == b.Seconds
+ && a.HundredthSeconds == b.HundredthSeconds
+ && a.Negative == b.Negative;
+ }
+ static void doTest(util::Duration const & rid, const char * pis)
+ {
+ bool bSuccess(false);
+ ::rtl::OUStringBuffer buf;
+ Converter::convertDuration(buf, rid);
+ ::rtl::OUString os(buf.makeStringAndClear());
+ OSL_TRACE(::rtl::OUStringToOString(os.getStr(), RTL_TEXTENCODING_UTF8));
+ OSL_ASSERT(os.equalsAscii(pis));
+ util::Duration od;
+ bSuccess = Converter::convertDuration(od, os);
+ OSL_TRACE("%d %dY %dM %dD %dH %dM %dS %dH",
+ od.Negative, od.Years, od.Months, od.Days,
+ od.Hours, od.Minutes, od.Seconds, od.HundredthSeconds);
+ OSL_ASSERT(bSuccess);
+ OSL_ASSERT(eqDuration(rid, od));
+ }
+ static void doTestF(const char * pis)
+ {
+ util::Duration od;
+ bool bSuccess = Converter::convertDuration(od,
+ ::rtl::OUString::createFromAscii(pis));
+ OSL_TRACE("%d %dY %dM %dD %dH %dM %dS %dH",
+ od.Negative, od.Years, od.Months, od.Days,
+ od.Hours, od.Minutes, od.Seconds, od.HundredthSeconds);
+ OSL_ASSERT(!bSuccess);
+ }
+ Test() {
+ OSL_TRACE("\nSAX CONVERTER TEST BEGIN\n");
+ doTest( util::Duration(false, 1, 0, 0, 0, 0, 0, 0), "P1Y" );
+ doTest( util::Duration(false, 0, 42, 0, 0, 0, 0, 0), "P42M" );
+ doTest( util::Duration(false, 0, 0, 111, 0, 0, 0, 0), "P111D" );
+ doTest( util::Duration(false, 0, 0, 0, 52, 0, 0, 0), "PT52H" );
+ doTest( util::Duration(false, 0, 0, 0, 0, 717, 0, 0), "PT717M" );
+ doTest( util::Duration(false, 0, 0, 0, 0, 0, 121, 0), "PT121S" );
+ doTest( util::Duration(false, 0, 0, 0, 0, 0, 0, 19), "PT0.19S" );
+ doTest( util::Duration(false, 0, 0, 0, 0, 0, 0, 9), "PT0.09S" );
+ doTest( util::Duration(true , 0, 0, 9999, 0, 0, 0, 0), "-P9999D" );
+ doTest( util::Duration(true , 7, 6, 5, 4, 3, 2, 1),
+ "-P7Y6M5DT4H3M2.01S" );
+ doTest( util::Duration(false, 0, 6, 0, 0, 3, 0, 0), "P6MT3M" );
+ doTest( util::Duration(false, 0, 0, 0, 0, 0, 0, 0), "P0D" );
+ doTestF("1Y1M");
+ doTestF("P-1Y1M");
+ doTestF("P1M1Y");
+ doTestF("PT1Y");
+ doTestF("P1Y1M1M");
+ doTestF("P1YT1MT1M");
+ doTestF("P1YT");
+ doTestF("P99999999999Y");
+ doTestF("PT.1S");
+ doTestF("PT5M.134S");
+ doTestF("PT1.S");
+ OSL_TRACE("\nSAX CONVERTER TEST END\n");
+ }
+};
+static Test test;
+#endif
+
+/** convert util::Date to ISO "date" string */
+void Converter::convertDate(
+ ::rtl::OUStringBuffer& i_rBuffer,
+ const util::Date& i_rDate)
+{
+ const util::DateTime dt(
+ 0, 0, 0, 0, i_rDate.Day, i_rDate.Month, i_rDate.Year);
+ convertDateTime(i_rBuffer, dt, false);
+}
+
+/** convert util::DateTime to ISO "date" or "dateTime" string */
void Converter::convertDateTime(
::rtl::OUStringBuffer& i_rBuffer,
const com::sun::star::util::DateTime& i_rDateTime,
@@ -990,9 +1329,36 @@ void Converter::convertDateTime(
}
}
-/** convert ISO Date String to util::DateTime */
-bool Converter::convertDateTime( com::sun::star::util::DateTime& rDateTime,
- const ::rtl::OUString& rString )
+/** convert ISO "date" or "dateTime" string to util::DateTime */
+bool Converter::convertDateTime( util::DateTime& rDateTime,
+ const ::rtl::OUString& rString )
+{
+ bool isDateTime;
+ util::Date date;
+ if (convertDateOrDateTime(date, rDateTime, isDateTime, rString))
+ {
+ if (!isDateTime)
+ {
+ rDateTime.Year = date.Year;
+ rDateTime.Month = date.Month;
+ rDateTime.Day = date.Day;
+ rDateTime.Hours = 0;
+ rDateTime.Minutes = 0;
+ rDateTime.Seconds = 0;
+ rDateTime.HundredthSeconds = 0;
+ }
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+/** convert ISO "date" or "dateTime" string to util::DateTime or util::Date */
+bool Converter::convertDateOrDateTime(
+ util::Date & rDate, util::DateTime & rDateTime,
+ bool & rbDateTime, const ::rtl::OUString & rString )
{
bool bSuccess = true;
@@ -1077,13 +1443,25 @@ bool Converter::convertDateTime( com::sun::star::util::DateTime& rDateTime,
if (bSuccess)
{
- rDateTime.Year = (sal_uInt16)nYear;
- rDateTime.Month = (sal_uInt16)nMonth;
- rDateTime.Day = (sal_uInt16)nDay;
- rDateTime.Hours = (sal_uInt16)nHour;
- rDateTime.Minutes = (sal_uInt16)nMin;
- rDateTime.Seconds = (sal_uInt16)nSec;
- rDateTime.HundredthSeconds = (sal_uInt16)(sDoubleStr.toDouble() * 100);
+ if ( aTimeStr.getLength() > 0 ) // time is optional
+ {
+ rDateTime.Year = static_cast<sal_uInt16>(nYear);
+ rDateTime.Month = static_cast<sal_uInt16>(nMonth);
+ rDateTime.Day = static_cast<sal_uInt16>(nDay);
+ rDateTime.Hours = static_cast<sal_uInt16>(nHour);
+ rDateTime.Minutes = static_cast<sal_uInt16>(nMin);
+ rDateTime.Seconds = static_cast<sal_uInt16>(nSec);
+ rDateTime.HundredthSeconds =
+ static_cast<sal_uInt16>((sDoubleStr).toDouble() * 100);
+ rbDateTime = true;
+ }
+ else
+ {
+ rDate.Year = static_cast<sal_uInt16>(nYear);
+ rDate.Month = static_cast<sal_uInt16>(nMonth);
+ rDate.Day = static_cast<sal_uInt16>(nDay);
+ rbDateTime = false;
+ }
}
return bSuccess;
}
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index 07491bae33ec..8fe989676993 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.cxx
@@ -31,11 +31,6 @@
#include <stdio.h>
#include <string.h>
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-
#include <osl/time.h>
#include <osl/diagnose.h>
@@ -245,12 +240,12 @@ Reference < XInputStream > createStreamFromSequence(
{
Reference < XInterface > xOutStreamService =
xSMgr->createInstance( OUString::createFromAscii("com.sun.star.io.Pipe") );
- assert( xOutStreamService.is() );
+ OSL_ASSERT( xOutStreamService.is() );
Reference< XOutputStream > rOutStream( xOutStreamService , UNO_QUERY );
- assert( rOutStream.is() );
+ OSL_ASSERT( rOutStream.is() );
Reference< XInputStream > rInStream( xOutStreamService , UNO_QUERY );
- assert( rInStream.is() );
+ OSL_ASSERT( rInStream.is() );
rOutStream->writeBytes( seqBytes );
rOutStream->flush();
@@ -379,7 +374,7 @@ public: // ExtendedDocumentHandler
virtual void SAL_CALL endElement(const OUString& aName) throw (SAXException,RuntimeException)
{
- assert( m_iLevel );
+ OSL_ASSERT( m_iLevel );
m_iLevel --;
if( m_bPrint ) {
int i;
diff --git a/svtools/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx
index 7139a3ebe361..c915ebe3854a 100644
--- a/svtools/inc/PasswordHelper.hxx
+++ b/svl/inc/PasswordHelper.hxx
@@ -31,7 +31,7 @@
#ifndef _SVTOOLS_PASSWORDHELPER_HXX
#define _SVTOOLS_PASSWORDHELPER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include "sal/types.h"
#include "com/sun/star/uno/Sequence.hxx"
diff --git a/svtools/inc/adrparse.hxx b/svl/inc/adrparse.hxx
index 439168441057..a317e27b2779 100644
--- a/svtools/inc/adrparse.hxx
+++ b/svl/inc/adrparse.hxx
@@ -31,7 +31,7 @@
#ifndef _ADRPARSE_HXX
#define _ADRPARSE_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/list.hxx>
#include <tools/string.hxx>
diff --git a/svtools/inc/broadcast.hxx b/svl/inc/broadcast.hxx
index e3e409c46e96..e80a2e446ebf 100644
--- a/svtools/inc/broadcast.hxx
+++ b/svl/inc/broadcast.hxx
@@ -30,7 +30,7 @@
#ifndef _SVT_BROADCAST_HXX
#define _SVT_BROADCAST_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
class SvtListener;
diff --git a/svtools/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx
index 13553f7f16fd..13553f7f16fd 100644
--- a/svtools/inc/cntnrsrt.hxx
+++ b/svl/inc/cntnrsrt.hxx
diff --git a/svtools/inc/cntwids.hrc b/svl/inc/cntwids.hrc
index fcb9f855453b..fcb9f855453b 100644
--- a/svtools/inc/cntwids.hrc
+++ b/svl/inc/cntwids.hrc
diff --git a/svtools/source/svsql/converter.hxx b/svl/inc/converter.hxx
index f6a5d67ca966..d012a56e7416 100644
--- a/svtools/source/svsql/converter.hxx
+++ b/svl/inc/converter.hxx
@@ -30,7 +30,7 @@
#ifndef _SV_CONVERTER_HXX_
#define _SV_CONVERTER_HXX_
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
class SvDbaseConverter
diff --git a/svtools/inc/filenotation.hxx b/svl/inc/filenotation.hxx
index 460d425d471a..c74c6c39c803 100644
--- a/svtools/inc/filenotation.hxx
+++ b/svl/inc/filenotation.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_FILENOTATION_HXX
#define SVTOOLS_FILENOTATION_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <rtl/ustring.hxx>
//.........................................................................
diff --git a/svtools/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx
index f7e683b31ad6..82fb4e1efef5 100644
--- a/svtools/inc/folderrestriction.hxx
+++ b/svl/inc/folderrestriction.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_FOLDER_RESTRICTION_HXX
#define SVTOOLS_FOLDER_RESTRICTION_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/string.hxx>
#ifndef INCLUDED_VECTOR
diff --git a/svtools/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx
index b9761d7131a0..1e613782b4e6 100644
--- a/svtools/inc/fstathelper.hxx
+++ b/svl/inc/fstathelper.hxx
@@ -31,7 +31,7 @@
#ifndef _SVTOOLS_FSTATHELPER_HXX
#define _SVTOOLS_FSTATHELPER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
class UniString;
diff --git a/svtools/inc/inetdef.hxx b/svl/inc/inetdef.hxx
index 6ea380529147..6ea380529147 100644
--- a/svtools/inc/inetdef.hxx
+++ b/svl/inc/inetdef.hxx
diff --git a/svtools/inc/inetmsg.hxx b/svl/inc/inetmsg.hxx
index f011102a79e2..f011102a79e2 100644
--- a/svtools/inc/inetmsg.hxx
+++ b/svl/inc/inetmsg.hxx
diff --git a/svtools/inc/inetstrm.hxx b/svl/inc/inetstrm.hxx
index 46e15d5e4cf4..46e15d5e4cf4 100644
--- a/svtools/inc/inetstrm.hxx
+++ b/svl/inc/inetstrm.hxx
diff --git a/svtools/inc/instrm.hxx b/svl/inc/instrm.hxx
index 58a70fcc6917..add43d4cc380 100644
--- a/svtools/inc/instrm.hxx
+++ b/svl/inc/instrm.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_INSTRM_HXX
#define SVTOOLS_INSTRM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <com/sun/star/uno/Reference.h>
#include <tools/stream.hxx>
diff --git a/svtools/inc/listener.hxx b/svl/inc/listener.hxx
index 6d70f135eb92..a121197b1dd0 100644
--- a/svtools/inc/listener.hxx
+++ b/svl/inc/listener.hxx
@@ -30,7 +30,7 @@
#ifndef _SVT_LISTENER_HXX
#define _SVT_LISTENER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
class SvtBroadcaster;
diff --git a/svtools/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx
index e531ead6bf5d..a2ac5693f741 100644
--- a/svtools/inc/listeneriter.hxx
+++ b/svl/inc/listeneriter.hxx
@@ -30,7 +30,7 @@
#ifndef _SVT_LISTENERITER_HXX
#define _SVT_LISTENERITER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
class SvtListener;
diff --git a/svtools/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx
index 6bfe7b1c737c..55322246f773 100644
--- a/svtools/inc/lngmisc.hxx
+++ b/svl/inc/lngmisc.hxx
@@ -31,7 +31,7 @@
#ifndef _SVTOOLS_LNGMISC_HXX_
#define _SVTOOLS_LNGMISC_HXX_
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/svtools/source/syslocale/makefile.mk b/svl/inc/makefile.mk
index a393c174856f..9368bce7cde1 100644
--- a/svtools/source/syslocale/makefile.mk
+++ b/svl/inc/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.4 $
#
# This file is part of OpenOffice.org.
#
@@ -28,21 +28,25 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..
+PRJ=..
-PRJNAME=svtools
-TARGET=syslocale
+PRJNAME=svl
+TARGET=inc
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
+.INCLUDE : $(PRJ)$/util$/svl.pmk
# --- Files --------------------------------------------------------
+# --- Targets -------------------------------------------------------
-SLOFILES = \
- $(SLO)$/syslocale.obj
+.INCLUDE : target.mk
-# --- Targets ------------------------------------------------------
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+ $(SLO)$/precompiled.pch \
+ $(SLO)$/precompiled_ex.pch
+
+.ENDIF # "$(ENABLE_PCH)"!=""
-.INCLUDE : target.mk
diff --git a/svtools/inc/memberid.hrc b/svl/inc/memberid.hrc
index c917bd993e97..c917bd993e97 100644
--- a/svtools/inc/memberid.hrc
+++ b/svl/inc/memberid.hrc
diff --git a/svtools/inc/nfsymbol.hxx b/svl/inc/nfsymbol.hxx
index 46fe47599359..46fe47599359 100644
--- a/svtools/inc/nfsymbol.hxx
+++ b/svl/inc/nfsymbol.hxx
diff --git a/svtools/inc/numuno.hxx b/svl/inc/numuno.hxx
index c31829dec020..d243c49a3113 100644
--- a/svtools/inc/numuno.hxx
+++ b/svl/inc/numuno.hxx
@@ -30,7 +30,7 @@
#ifndef _NUMUNO_HXX
#define _NUMUNO_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/implbase2.hxx>
@@ -57,7 +57,7 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
// SvNumberFormatsSupplierObj: aggregate to document,
// construct with SvNumberFormatter
-class SVT_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
+class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
com::sun::star::util::XNumberFormatsSupplier,
com::sun::star::lang::XUnoTunnel>
{
diff --git a/svtools/inc/outstrm.hxx b/svl/inc/outstrm.hxx
index e11c7ed1c1a9..c01d8f460c58 100644
--- a/svtools/inc/outstrm.hxx
+++ b/svl/inc/outstrm.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_OUTSTRM_HXX
#define SVTOOLS_OUTSTRM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <com/sun/star/uno/Reference.h>
#include <tools/stream.hxx>
diff --git a/svl/inc/pch/precompiled_svl.cxx b/svl/inc/pch/precompiled_svl.cxx
new file mode 100644
index 000000000000..27b37170856c
--- /dev/null
+++ b/svl/inc/pch/precompiled_svl.cxx
@@ -0,0 +1,32 @@
+/*************************************************************************
+ *
+ * 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: precompiled_svl.cxx,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "precompiled_svl.hxx"
+
diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
new file mode 100644
index 000000000000..3a813a2db2dd
--- /dev/null
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -0,0 +1,435 @@
+/*************************************************************************
+ *
+ * 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: precompiled_svl.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * 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): Generated on 2006-09-01 17:50:05.076676
+
+#ifdef PRECOMPILED_HEADERS
+
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
+#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/io/XAsyncOutputMonitor.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/ucb/Command.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/IllegalIdentifierException.hpp"
+#include "com/sun/star/ucb/UnsupportedCommandException.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XCommandProcessor.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentIdentifier.hpp"
+#include "com/sun/star/ucb/XContentIdentifierFactory.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XContentProviderManager.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uri/XUriReference.hpp"
+#include "com/sun/star/uri/XUriReferenceFactory.hpp"
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/LineEndFormat.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <com/sun/star/awt/XImageConsumer.hpp>
+#include <com/sun/star/awt/XItemEventBroadcaster.hpp>
+#include <com/sun/star/awt/XTextArea.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyChangeEvent.hpp>
+#include <com/sun/star/beans/PropertyState.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/beans/XFastPropertySet.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/datatransfer/XMimeContentType.hpp>
+#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
+#include <com/sun/star/document/XEventsSupplier.hpp>
+#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/document/XTypeDetection.hpp>
+#include <com/sun/star/document/XViewDataSupplier.hpp>
+#include <com/sun/star/embed/Actions.hpp>
+#include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/EmbedMisc.hpp>
+#include <com/sun/star/embed/EmbedStates.hpp>
+#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
+#include <com/sun/star/embed/XActionsApproval.hpp>
+#include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/embed/XEmbedPersist.hpp>
+#include <com/sun/star/embed/XExtendedStorageStream.hpp>
+#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
+#include <com/sun/star/embed/XStateChangeListener.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/frame/DoubleInitializationException.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/frame/XConfigManager.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XDocumentTemplates.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
+#include <com/sun/star/frame/status/ItemState.hpp>
+#include <com/sun/star/frame/status/ItemStatus.hpp>
+#include <com/sun/star/frame/status/Visibility.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/i18n/AmPmValue.hpp>
+#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
+#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
+#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/CollatorOptions.hpp>
+#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
+#include <com/sun/star/i18n/KNumberFormatType.hpp>
+#include <com/sun/star/i18n/KNumberFormatUsage.hpp>
+#include <com/sun/star/i18n/NumberFormatCode.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <com/sun/star/i18n/Weekdays.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/i18n/XExtendedCalendar.hpp>
+#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <com/sun/star/io/XActiveDataControl.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XPersist.hpp>
+#include <com/sun/star/io/XPersistObject.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/io/XTruncate.hpp>
+#include <com/sun/star/java/InvalidJavaSettingsException.hpp>
+#include <com/sun/star/java/JavaDisabledException.hpp>
+#include <com/sun/star/java/JavaNotFoundException.hpp>
+#include <com/sun/star/java/JavaVMCreationFailureException.hpp>
+#include <com/sun/star/java/RestartRequiredException.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/registry/XSimpleRegistry.hpp>
+#include <com/sun/star/script/XTypeConverter.hpp>
+#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/sdb/XCompletedConnection.hpp>
+#include <com/sun/star/sdbc/SQLWarning.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/svg/XSVGWriter.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/system/XProxySettings.hpp>
+#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/task/DocumentPasswordRequest.hpp>
+#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
+#include <com/sun/star/task/MasterPasswordRequest.hpp>
+#include <com/sun/star/task/NoMasterException.hpp>
+#include <com/sun/star/task/PasswordRequestMode.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionContinuation.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/XInteractionPassword.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/task/XJobExecutor.hpp>
+#include <com/sun/star/task/XPasswordContainer.hpp>
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/ContentCreationException.hpp>
+#include <com/sun/star/ucb/FileSystemNotation.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
+#include <com/sun/star/ucb/InteractiveIOException.hpp>
+#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
+#include <com/sun/star/ucb/TransferResult.hpp>
+#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
+#include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/XContentProviderManager.hpp>
+#include <com/sun/star/ucb/XDynamicResultSet.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
+#include <com/sun/star/ui/XImageManager.hpp>
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/XAggregation.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/XCurrentContext.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/XWeak.hpp>
+#include <com/sun/star/util/AliasProgrammaticPair.hpp>
+#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/DateTimeRange.hpp>
+#include <com/sun/star/util/SearchAlgorithms.hpp>
+#include <com/sun/star/util/SearchFlags.hpp>
+#include <com/sun/star/util/SearchOptions.hpp>
+#include <com/sun/star/util/SearchResult.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/util/XCloseBroadcaster.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
+#include <com/sun/star/util/XStringSubstitution.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/util/XUpdatable.hpp>
+#include <com/sun/star/view/XPrintable.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <com/sun/star/xml/sax/XParser.hpp>
+
+#include <algorithm>
+#include <deque>
+#include <hash_map>
+#include <limits>
+
+#include <list>
+#include <map>
+#include <memory>
+#include <queue>
+#include <set>
+#include <stack>
+#include <utility>
+#include <vector>
+
+
+#include <i18npool/lang.h>
+#include <i18npool/mslangid.hxx>
+
+#include "comphelper/processfactory.hxx"
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/configurationhelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/regpathhelper.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/servicehelper.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/storagehelper.hxx>
+#include <comphelper/types.hxx>
+#include <comphelper/uno3.hxx>
+
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/weakref.hxx"
+#include <cppuhelper/bootstrap.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/interfacecontainer.h>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/propshlp.hxx>
+#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/servicefactory.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakagg.hxx>
+#include <cppuhelper/weakref.hxx>
+
+#include <osl/conditn.hxx>
+#include <osl/conditn.hxx>
+#include <osl/diagnose.h>
+#include <osl/endian.h>
+#include <osl/file.h>
+#include <osl/file.hxx>
+#include <osl/module.h>
+#include <osl/module.hxx>
+#include <osl/mutex.h>
+#include <osl/mutex.hxx>
+#include <osl/process.h>
+#include <osl/thread.h>
+#include <osl/thread.hxx>
+
+#include <rsc/rscsfx.hxx>
+
+#include "rtl/crc.h"
+#include "rtl/memory.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include <rtl/alloc.h>
+#include <rtl/byteseq.hxx>
+#include <rtl/cipher.h>
+#include <rtl/crc.h>
+#include <rtl/digest.h>
+#include <rtl/logfile.hxx>
+#include <rtl/math.hxx>
+#include <rtl/memory.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/tencinfo.h>
+#include <rtl/textcvt.h>
+#include <rtl/textenc.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <rtl/uuid.h>
+
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+
+#include <sot/clsids.hxx>
+
+#include <tools/inetdef.hxx>
+
+#include <ucbhelper/commandenvironment.hxx>
+#include <ucbhelper/content.hxx>
+#include <ucbhelper/contentbroker.hxx>
+#include <ucbhelper/fileidentifierconverter.hxx>
+
+#include <uno/mapping.hxx>
+
+#include <unotools/bootstrap.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <unotools/configitem.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/confignode.hxx>
+#include <unotools/configpathes.hxx>
+#include <unotools/nativenumberwrapper.hxx>
+#include <unotools/numberformatcodewrapper.hxx>
+#include <unotools/processfactory.hxx>
+
+#include <vos/mutex.hxx>
+#include <vos/process.hxx>
+#include <vos/ref.hxx>
+#include <vos/refernce.hxx>
+#include <vos/security.hxx>
+#include <vos/thread.hxx>
+#include <vos/timer.hxx>
+
+//---MARKER---
+
+#endif
+
diff --git a/svtools/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx
index 4be84296c678..e8ef23e145d4 100644
--- a/svtools/inc/pickerhelper.hxx
+++ b/svl/inc/pickerhelper.hxx
@@ -31,7 +31,7 @@
#ifndef _PICKERHELPER_HXX
#define _PICKERHELPER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include "sal/types.h"
#include "com/sun/star/uno/Reference.hxx"
diff --git a/svtools/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx
index f99ad5dcc0f1..e67729a1bbd8 100644
--- a/svtools/inc/pickerhistory.hxx
+++ b/svl/inc/pickerhistory.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_PICKERHISTORY_HXX
#define SVTOOLS_PICKERHISTORY_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <com/sun/star/uno/XInterface.hpp>
//.........................................................................
diff --git a/svtools/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx
index 983b0c416ef3..210fd9b92139 100644
--- a/svtools/inc/pickerhistoryaccess.hxx
+++ b/svl/inc/pickerhistoryaccess.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_PICKERHISTORYACCESS_HXX
#define SVTOOLS_PICKERHISTORYACCESS_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_
#include <com/sun/star/uno/Reference.hxx>
diff --git a/svtools/inc/poolcach.hxx b/svl/inc/poolcach.hxx
index 20d9e4d19c43..21cfec4662a0 100644
--- a/svtools/inc/poolcach.hxx
+++ b/svl/inc/poolcach.hxx
@@ -30,7 +30,7 @@
#ifndef _SFXPOOLCACH_HXX
#define _SFXPOOLCACH_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
class SfxItemModifyArr_Impl;
@@ -39,7 +39,7 @@ class SfxItemSet;
class SfxPoolItem;
class SfxSetItem;
-class SVT_DLLPUBLIC SfxItemPoolCache
+class SVL_DLLPUBLIC SfxItemPoolCache
{
SfxItemPool *pPool;
SfxItemModifyArr_Impl *pCache;
diff --git a/svtools/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx
index 7a080c1c7bcc..2fd190f9adef 100644
--- a/svtools/inc/strmadpt.hxx
+++ b/svl/inc/strmadpt.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_STRMADPT_HXX
#define SVTOOLS_STRMADPT_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
diff --git a/svtools/inc/stylepool.hxx b/svl/inc/stylepool.hxx
index 1b1f129d7f4c..d69bb928e432 100644
--- a/svtools/inc/stylepool.hxx
+++ b/svl/inc/stylepool.hxx
@@ -32,7 +32,7 @@
#include <boost/shared_ptr.hpp>
#include <rtl/ustring.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
class StylePoolImpl;
class StylePoolIterImpl;
diff --git a/svtools/inc/svtools/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 5cfd3d0fc15e..446d9b8aeeb7 100644
--- a/svtools/inc/svtools/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
@@ -30,14 +30,14 @@
#ifndef _AEITEM_HXX
#define _AEITEM_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
class SfxAllEnumValueArr;
class SvUShorts;
-class SVT_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
+class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
{
SfxAllEnumValueArr* pValues;
SvUShorts* pDisabledValues;
diff --git a/svtools/inc/svtools/brdcst.hxx b/svl/inc/svl/brdcst.hxx
index 2f9270f3cd4b..cfa45d5aa89a 100644
--- a/svtools/inc/svtools/brdcst.hxx
+++ b/svl/inc/svl/brdcst.hxx
@@ -30,9 +30,9 @@
#ifndef _SFXBRDCST_HXX
#define _SFXBRDCST_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
class SfxListener;
class SfxHint;
diff --git a/svtools/inc/svtools/cancel.hxx b/svl/inc/svl/cancel.hxx
index 5929fc4db47a..2808b77d3139 100644
--- a/svtools/inc/svtools/cancel.hxx
+++ b/svl/inc/svl/cancel.hxx
@@ -30,16 +30,16 @@
#ifndef _SFXCANCEL_HXX
#define _SFXCANCEL_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/string.hxx>
#include <tools/ref.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/smplhint.hxx>
class SfxCancellable;
#ifdef _SFX_CANCEL_CXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
SV_DECL_PTRARR( SfxCancellables_Impl, SfxCancellable*, 0, 4 )
diff --git a/svtools/inc/svtools/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index d65825849869..3d354899cd9d 100644
--- a/svtools/inc/svtools/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -31,9 +31,9 @@
#ifndef _SVTOOLS_CENUMITM_HXX
#define _SVTOOLS_CENUMITM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
//============================================================================
DBG_NAMEEX(SfxEnumItemInterface)
diff --git a/svtools/inc/svtools/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index a944e2139818..72421f93e0cb 100644
--- a/svtools/inc/svtools/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
@@ -31,9 +31,9 @@
#ifndef _SVTOOLS_CINTITEM_HXX
#define _SVTOOLS_CINTITEM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
//============================================================================
DBG_NAMEEX_VISIBILITY(CntByteItem, SVL_DLLPUBLIC)
diff --git a/svtools/inc/svtools/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx
index e4298b4d162c..720ead5422f0 100644
--- a/svtools/inc/svtools/cjkoptions.hxx
+++ b/svl/inc/svl/cjkoptions.hxx
@@ -30,15 +30,15 @@
#ifndef _SVTOOLS_CJKOPTIONS_HXX
#define _SVTOOLS_CJKOPTIONS_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <sal/types.h>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
class SvtCJKOptions_Impl;
// class SvtCJKOptions --------------------------------------------------
-class SVT_DLLPUBLIC SvtCJKOptions: public svt::detail::Options
+class SVL_DLLPUBLIC SvtCJKOptions: public utl::detail::Options
{
private:
SvtCJKOptions_Impl* pImp;
diff --git a/svtools/inc/svtools/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx
index 38781a6c2143..a2ce75ac1a4b 100644
--- a/svtools/inc/svtools/cnclhint.hxx
+++ b/svl/inc/svl/cnclhint.hxx
@@ -30,8 +30,8 @@
#ifndef _SFXCNCLHINT_HXX
#define _SFXCNCLHINT_HXX
-#include <svtools/hint.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/hint.hxx>
+#include <svl/cancel.hxx>
#include <tools/rtti.hxx>
#define SFXCANCELHINT_REMOVED 1
diff --git a/svtools/inc/svtools/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index 51b2982fe1dd..dca27f2284e6 100644
--- a/svtools/inc/svtools/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
@@ -30,14 +30,14 @@
#ifndef _CNTWALL_HXX
#define _CNTWALL_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#ifndef SHL_HXX
#include <tools/shl.hxx>
#endif
#include <tools/rtti.hxx>
#include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
class SvStream;
diff --git a/svtools/inc/svtools/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 6c09ad98a45e..28b2191cad94 100644
--- a/svtools/inc/svtools/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
@@ -30,18 +30,17 @@
#ifndef _SVTOOLS_CTLOPTIONS_HXX
#define _SVTOOLS_CTLOPTIONS_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <sal/types.h>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/options.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/options.hxx>
class SvtCTLOptions_Impl;
// class SvtCTLOptions --------------------------------------------------------
-class SVT_DLLPUBLIC SvtCTLOptions:
- public svt::detail::Options, public SfxBroadcaster, public SfxListener
+class SVL_DLLPUBLIC SvtCTLOptions : public utl::detail::Options
{
private:
SvtCTLOptions_Impl* m_pImp;
@@ -52,8 +51,6 @@ public:
SvtCTLOptions( sal_Bool bDontLoad = sal_False );
virtual ~SvtCTLOptions();
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
void SetCTLFontEnabled( sal_Bool _bEnabled );
sal_Bool IsCTLFontEnabled() const;
diff --git a/svtools/inc/svtools/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index 2592c6e0f388..808596397aa0 100644
--- a/svtools/inc/svtools/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
@@ -30,8 +30,8 @@
#ifndef _SVTOOLS_CTYPEITM_HXX
#define _SVTOOLS_CTYPEITM_HXX
-#include <svtools/inettype.hxx>
-#include <svtools/custritm.hxx>
+#include <svl/inettype.hxx>
+#include <svl/custritm.hxx>
//=========================================================================
diff --git a/svtools/inc/svtools/custritm.hxx b/svl/inc/svl/custritm.hxx
index 83a88b1f240f..8a3344f6dc0b 100644
--- a/svtools/inc/svtools/custritm.hxx
+++ b/svl/inc/svl/custritm.hxx
@@ -31,9 +31,9 @@
#ifndef _SVTOOLS_CUSTRITM_HXX
#define _SVTOOLS_CUSTRITM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
//============================================================================
DBG_NAMEEX_VISIBILITY(CntUnencodedStringItem, SVL_DLLPUBLIC)
diff --git a/svtools/inc/svtools/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index 073c1a6ef825..c66c9a84285d 100644
--- a/svtools/inc/svtools/dateitem.hxx
+++ b/svl/inc/svl/dateitem.hxx
@@ -33,7 +33,7 @@
#include <tools/rtti.hxx>
#include <tools/datetime.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
class SvStream;
diff --git a/svtools/inc/svtools/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx
index f2625f7955bb..c62f81bc77ef 100644
--- a/svtools/inc/svtools/documentlockfile.hxx
+++ b/svl/inc/svl/documentlockfile.hxx
@@ -32,7 +32,7 @@
#ifndef _SVT_DOCUMENTLOCKFILE_HXX
#define _SVT_DOCUMENTLOCKFILE_HXX
-#include <svtools/svtdllapi.h>
+#include <svl/svldllapi.h>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
@@ -41,11 +41,11 @@
#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/lockfilecommon.hxx>
+#include <svl/lockfilecommon.hxx>
namespace svt {
-class SVT_DLLPUBLIC DocumentLockFile : public LockFileCommon
+class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
{
// the workaround for automated testing!
static sal_Bool m_bAllowInteraction;
diff --git a/svtools/inc/svtools/eitem.hxx b/svl/inc/svl/eitem.hxx
index f9e1927a881d..55ed3c47ee33 100644
--- a/svtools/inc/svtools/eitem.hxx
+++ b/svl/inc/svl/eitem.hxx
@@ -31,11 +31,11 @@
#ifndef _SFXENUMITEM_HXX
#define _SFXENUMITEM_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/cenumitm.hxx>
+#include "svl/svldllapi.h"
+#include <svl/cenumitm.hxx>
//============================================================================
-class SVT_DLLPUBLIC SfxEnumItem: public CntEnumItem
+class SVL_DLLPUBLIC SfxEnumItem: public CntEnumItem
{
protected:
SfxEnumItem(USHORT which = 0, USHORT nValue = 0):
@@ -50,7 +50,7 @@ public:
};
//============================================================================
-class SVT_DLLPUBLIC SfxBoolItem: public CntBoolItem
+class SVL_DLLPUBLIC SfxBoolItem: public CntBoolItem
{
public:
TYPEINFO();
diff --git a/svtools/inc/svtools/filerec.hxx b/svl/inc/svl/filerec.hxx
index 77ba6c1b5c52..d28bb3033b56 100644
--- a/svtools/inc/svtools/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
@@ -33,10 +33,10 @@
//=========================================================================
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
diff --git a/svtools/inc/svtools/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index 5298bbd1678b..fa056bb00488 100644
--- a/svtools/inc/svtools/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
@@ -30,10 +30,10 @@
#ifndef _SFXFLAGITEM_HXX
#define _SFXFLAGITEM_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
#include <tools/rtti.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
class SvStream;
@@ -41,9 +41,9 @@ extern USHORT nSfxFlagVal[16];
// -----------------------------------------------------------------------
-DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC)
-class SVT_DLLPUBLIC SfxFlagItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
{
USHORT nVal;
diff --git a/svtools/inc/svtools/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
index f19ea1dd8457..4422220fe640 100644
--- a/svtools/inc/svtools/globalnameitem.hxx
+++ b/svl/inc/svl/globalnameitem.hxx
@@ -30,15 +30,15 @@
#ifndef _GLOBALNAMEITEM_HXX
#define _GLOBALNAMEITEM_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
#include <tools/rtti.hxx>
#include <tools/globname.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
// -----------------------------------------------------------------------
-class SVT_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
{
SvGlobalName m_aName;
diff --git a/svtools/inc/svtools/hint.hxx b/svl/inc/svl/hint.hxx
index 9417b2bc1702..e2d43ea602ca 100644
--- a/svtools/inc/svtools/hint.hxx
+++ b/svl/inc/svl/hint.hxx
@@ -30,7 +30,7 @@
#ifndef _SFXHINT_HXX
#define _SFXHINT_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
class SVL_DLLPUBLIC SfxHint
diff --git a/svtools/inc/svtools/httpcook.hxx b/svl/inc/svl/httpcook.hxx
index 354680a86f30..09769396eb11 100644
--- a/svtools/inc/svtools/httpcook.hxx
+++ b/svl/inc/svl/httpcook.hxx
@@ -34,7 +34,7 @@
#include <tools/datetime.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
/*=======================================================================
*
diff --git a/svtools/inc/svtools/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx
index 0bc76f1d0627..c581f938197f 100644
--- a/svtools/inc/svtools/ilstitem.hxx
+++ b/svl/inc/svl/ilstitem.hxx
@@ -31,8 +31,8 @@
#ifndef _SFXILSTITEM_HXX
#define _SFXILSTITEM_HXX
-#include "svtools/svldllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Sequence.hxx>
class SvULongs;
diff --git a/svtools/inc/svtools/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index e0151729c2e0..bfd888bdd944 100644
--- a/svtools/inc/svtools/imageitm.hxx
+++ b/svl/inc/svl/imageitm.hxx
@@ -31,13 +31,13 @@
#ifndef _SVT_IMAGEITM_HXX
#define _SVT_IMAGEITM_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/intitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/intitem.hxx>
class String;
struct SfxImageItem_Impl;
-class SVT_DLLPUBLIC SfxImageItem : public SfxInt16Item
+class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item
{
SfxImageItem_Impl* pImp;
public:
diff --git a/svtools/inc/svtools/inethist.hxx b/svl/inc/svl/inethist.hxx
index ad64e1131bf3..7d4577897faf 100644
--- a/svtools/inc/svtools/inethist.hxx
+++ b/svl/inc/svl/inethist.hxx
@@ -30,12 +30,12 @@
#ifndef _INETHIST_HXX
#define _INETHIST_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/hint.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/hint.hxx>
/*========================================================================
*
diff --git a/svtools/inc/svtools/inettype.hxx b/svl/inc/svl/inettype.hxx
index 2d9f0ba8694c..5f3bfbaab225 100644
--- a/svtools/inc/svtools/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -31,7 +31,7 @@
#ifndef _INETTYPE_HXX
#define _INETTYPE_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/inetmime.hxx>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/svtools/inc/svtools/intitem.hxx b/svl/inc/svl/intitem.hxx
index fe2a3543e630..7bfa3433c6b6 100644
--- a/svtools/inc/svtools/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -31,11 +31,11 @@
#ifndef _SFXINTITEM_HXX
#define _SFXINTITEM_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/cintitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/cintitem.hxx>
//============================================================================
-class SVT_DLLPUBLIC SfxByteItem: public CntByteItem
+class SVL_DLLPUBLIC SfxByteItem: public CntByteItem
{
public:
TYPEINFO();
@@ -53,9 +53,9 @@ public:
};
//============================================================================
-DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVL_DLLPUBLIC)
-class SVT_DLLPUBLIC SfxInt16Item: public SfxPoolItem
+class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem
{
INT16 m_nValue;
@@ -115,7 +115,7 @@ inline void SfxInt16Item::SetValue(INT16 nTheValue)
}
//============================================================================
-class SVT_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
+class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
{
public:
TYPEINFO();
@@ -134,7 +134,7 @@ public:
};
//============================================================================
-class SVT_DLLPUBLIC SfxInt32Item: public CntInt32Item
+class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item
{
public:
TYPEINFO();
@@ -154,7 +154,7 @@ public:
};
//============================================================================
-class SVT_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
+class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
{
public:
TYPEINFO();
diff --git a/svtools/inc/svtools/isethint.hxx b/svl/inc/svl/isethint.hxx
index d30fc4a65b27..d08819723f43 100644
--- a/svtools/inc/svtools/isethint.hxx
+++ b/svl/inc/svl/isethint.hxx
@@ -30,10 +30,10 @@
#ifndef _SFXISETHINT_HXX
#define _SFXISETHINT_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#ifndef _HINT_HXX
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
#endif
class SfxItemSet;
diff --git a/svtools/inc/svtools/itemiter.hxx b/svl/inc/svl/itemiter.hxx
index 6a9b5e212720..50bbe7902e83 100644
--- a/svtools/inc/svtools/itemiter.hxx
+++ b/svl/inc/svl/itemiter.hxx
@@ -30,9 +30,9 @@
#ifndef _SFXITEMITER_HXX
#define _SFXITEMITER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
class SfxPoolItem;
class SfxItemSet;
diff --git a/svtools/inc/svtools/itempool.hxx b/svl/inc/svl/itempool.hxx
index 81407cee2d0c..d99f29626d38 100644
--- a/svtools/inc/svtools/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -31,7 +31,7 @@
#ifndef _SFXITEMPOOL_HXX
#define _SFXITEMPOOL_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#ifndef INCLUDED_LIMITS_H
#include <limits.h>
@@ -39,8 +39,8 @@
#endif
#include <tools/solar.h>
#include <tools/string.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/svarray.hxx>
+#include <svl/poolitem.hxx>
#include <vector>
class SvStream;
diff --git a/svtools/inc/svtools/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index feab0eab004b..873c34785d5f 100644
--- a/svtools/inc/svtools/itemprop.hxx
+++ b/svl/inc/svl/itemprop.hxx
@@ -30,10 +30,10 @@
#ifndef _SFX_ITEMPROP_HXX
#define _SFX_ITEMPROP_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
#include <tools/string.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
diff --git a/svtools/inc/svtools/itemset.hxx b/svl/inc/svl/itemset.hxx
index 4cc3edcf65c7..a09cfbc2bbb2 100644
--- a/svtools/inc/svtools/itemset.hxx
+++ b/svl/inc/svl/itemset.hxx
@@ -30,14 +30,14 @@
#ifndef _SFXITEMSET_HXX
#define _SFXITEMSET_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#if STLPORT_VERSION<321
#include <stdarg.h>
#else
#include <cstdarg> // std::va_list and friends
#endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <tools/rtti.hxx>
#include <tools/solar.h>
diff --git a/svtools/inc/svtools/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index ed247ac01fa3..0cba5235674a 100644
--- a/svtools/inc/svtools/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
@@ -30,11 +30,12 @@
#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX
#define _SVTOOLS_LANGUAGEOPTIONS_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <sal/types.h>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
#include <unotools/configitem.hxx>
+#include <unotools/options.hxx>
#include <i18npool/lang.h>
// class SvtLanguageOptions ----------------------------------------------------
@@ -47,7 +48,7 @@
class SvtCJKOptions;
class SvtCTLOptions;
-class SVT_DLLPUBLIC SvtLanguageOptions : public SfxBroadcaster, public SfxListener
+class SVL_DLLPUBLIC SvtLanguageOptions : public ::utl::detail::Options
{
private:
SvtCJKOptions* m_pCJKOptions;
@@ -78,8 +79,6 @@ public:
SvtLanguageOptions( sal_Bool _bDontLoad = sal_False );
~SvtLanguageOptions();
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
// CJK options
sal_Bool IsCJKFontEnabled() const;
sal_Bool IsVerticalTextEnabled() const;
@@ -113,7 +112,7 @@ public:
};
/** #i42730# Gives access to the Windows 16bit system locale
*/
-class SVT_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem
+class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem
{
private:
::rtl::OUString m_sWin16SystemLocale;
@@ -123,6 +122,7 @@ public:
~SvtSystemLanguageOptions();
virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
LanguageType GetWin16SystemLanguage();
};
diff --git a/svtools/inc/svtools/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx
index b21e91a3fd46..77cb63414f4e 100644
--- a/svtools/inc/svtools/lckbitem.hxx
+++ b/svl/inc/svl/lckbitem.hxx
@@ -30,11 +30,11 @@
#ifndef _LCKBITEM_HXX
#define _LCKBITEM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/solar.h>
#include <tools/rtti.hxx>
#include <tools/stream.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
// -----------------------------------------------------------------------
diff --git a/svtools/inc/svtools/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx
index c8bd6251f9cb..c1e18aac7e14 100644
--- a/svtools/inc/svtools/lockfilecommon.hxx
+++ b/svl/inc/svl/lockfilecommon.hxx
@@ -32,7 +32,7 @@
#ifndef _SVT_LOCKFILECOMMON_HXX
#define _SVT_LOCKFILECOMMON_HXX
-#include <svtools/svtdllapi.h>
+#include <svl/svldllapi.h>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
@@ -54,7 +54,7 @@
namespace svt {
// This is a general implementation that is used in document lock file implementation and in sharing control file implementation
-class SVT_DLLPUBLIC LockFileCommon
+class SVL_DLLPUBLIC LockFileCommon
{
protected:
::osl::Mutex m_aMutex;
diff --git a/svtools/inc/svtools/lstner.hxx b/svl/inc/svl/lstner.hxx
index 99a6e10701f5..c9993834b42a 100644
--- a/svtools/inc/svtools/lstner.hxx
+++ b/svl/inc/svl/lstner.hxx
@@ -30,9 +30,9 @@
#ifndef _SFXLSTNER_HXX
#define _SFXLSTNER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
class SfxBroadcaster;
class SfxHint;
diff --git a/svtools/inc/svtools/macitem.hxx b/svl/inc/svl/macitem.hxx
index 2e43120f653d..747b9ec0bf17 100644
--- a/svtools/inc/svtools/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -32,8 +32,8 @@
// class SvxMacroItem ----------------------------------------------------
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
#include <tools/rtti.hxx>
#include <tools/debug.hxx>
#include <tools/string.hxx>
@@ -72,7 +72,7 @@ public:
class SjJSbxObject;
-class SVT_DLLPUBLIC SvxMacro
+class SVL_DLLPUBLIC SvxMacro
{
String aMacName;
String aLibName;
@@ -125,7 +125,7 @@ DECLARE_TABLE( _SvxMacroTableDtor, SvxMacro* )
#define SVX_MACROTBL_AKTVERSION SVX_MACROTBL_VERSION40
-class SVT_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor
+class SVL_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor
{
public:
inline SvxMacroTableDtor( const USHORT nInitSz = 0, const USHORT nReSz = 1 );
@@ -152,7 +152,7 @@ inline SvxMacroTableDtor::SvxMacroTableDtor( const USHORT nInitSz,
Dieses Item beschreibt eine Makro-Tabelle.
*/
-class SVT_DLLPUBLIC SvxMacroItem: public SfxPoolItem
+class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem
{
public:
TYPEINFO();
diff --git a/svtools/inc/svtools/metitem.hxx b/svl/inc/svl/metitem.hxx
index a37d119d57c1..5a1e6627542f 100644
--- a/svtools/inc/svtools/metitem.hxx
+++ b/svl/inc/svl/metitem.hxx
@@ -30,14 +30,14 @@
#ifndef _SFXMETRICITEM_HXX
#define _SFXMETRICITEM_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/intitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/intitem.hxx>
-DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC)
// -----------------------------------------------------------------------
-class SVT_DLLPUBLIC SfxMetricItem: public SfxInt32Item
+class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
{
public:
TYPEINFO();
diff --git a/svtools/inc/svtools/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx
index ba8c24f319f6..ba8c24f319f6 100644
--- a/svtools/inc/svtools/nfkeytab.hxx
+++ b/svl/inc/svl/nfkeytab.hxx
diff --git a/svtools/inc/svtools/nfversi.hxx b/svl/inc/svl/nfversi.hxx
index 23375369ddb3..23375369ddb3 100644
--- a/svtools/inc/svtools/nfversi.hxx
+++ b/svl/inc/svl/nfversi.hxx
diff --git a/svtools/inc/svtools/nranges.hxx b/svl/inc/svl/nranges.hxx
index 6996669cdeb1..e527a456a014 100644
--- a/svtools/inc/svtools/nranges.hxx
+++ b/svl/inc/svl/nranges.hxx
@@ -40,12 +40,12 @@
#define NUMTYPE USHORT
#define SfxNumRanges SfxUShortRanges
-#include <svtools/nranges.hxx>
+#include <svl/nranges.hxx>
#undef NUMTYPE
#define NUMTYPE ULONG
#define SfxNumRanges SfxULongRanges
-#include <svtools/nranges.hxx>
+#include <svl/nranges.hxx>
#define _SFXNRANGES_HXX
diff --git a/svtools/inc/svtools/ondemand.hxx b/svl/inc/svl/ondemand.hxx
index e8361307eb9e..3369f286b2cd 100644
--- a/svtools/inc/svtools/ondemand.hxx
+++ b/svl/inc/svl/ondemand.hxx
@@ -31,7 +31,7 @@
#ifndef INCLUDED_SVTOOLS_ONDEMAND_HXX
#define INCLUDED_SVTOOLS_ONDEMAND_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <i18npool/lang.h>
#include <unotools/localedatawrapper.hxx>
#include <unotools/calendarwrapper.hxx>
diff --git a/svtools/inc/svtools/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 472f50e6ef60..21e9ffa74210 100644
--- a/svtools/inc/svtools/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -31,7 +31,7 @@
#ifndef _OWNLIST_HXX
#define _OWNLIST_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/stream.hxx>
#include <tools/ownlist.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -79,7 +79,7 @@ public:
};
//=========================================================================
-class SVT_DLLPUBLIC SvCommandList
+class SVL_DLLPUBLIC SvCommandList
/* [Beschreibung]
Die Liste enth"alt Objekte vom Typ SvCommand. Wird ein Objekt
@@ -95,8 +95,8 @@ class SVT_DLLPUBLIC SvCommandList
BOOL FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
- SVT_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & );
- SVT_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & );
+ SVL_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & );
+ SVL_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & );
};
#endif // _OWNLIST_HXX
diff --git a/svtools/inc/svtools/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 7e0fea44b87a..1d0a2e982fae 100644
--- a/svtools/inc/svtools/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -30,7 +30,7 @@
#ifndef _SFXPOOLITEM_HXX
#define _SFXPOOLITEM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <com/sun/star/uno/Any.hxx>
#define TF_POOLABLE
@@ -40,8 +40,8 @@
#include <tools/solar.h>
#include <tools/debug.hxx>
#include <tools/string.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/hint.hxx>
+#include <svl/svarray.hxx>
+#include <svl/hint.hxx>
typedef long SfxArgumentError;
diff --git a/svtools/inc/svtools/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 923ab73da1d5..b0deff81e884 100644
--- a/svtools/inc/svtools/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -30,17 +30,17 @@
#ifndef _SFXPTITEM_HXX
#define _SFXPTITEM_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
#include <tools/gen.hxx>
class SvStream;
-DBG_NAMEEX_VISIBILITY(SfxPointItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC)
// -----------------------------------------------------------------------
-class SVT_DLLPUBLIC SfxPointItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem
{
Point aVal;
diff --git a/svtools/inc/svtools/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index 39c85d9ab228..1f944bab4102 100644
--- a/svtools/inc/svtools/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -30,18 +30,18 @@
#ifndef _SFXRECTITEM_HXX
#define _SFXRECTITEM_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/debug.hxx>
#include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
class SvStream;
-DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC)
// -----------------------------------------------------------------------
-class SVT_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
{
Rectangle aVal;
diff --git a/svtools/inc/svtools/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx
index 218e34cd4556..a3ced1b93019 100644
--- a/svtools/inc/svtools/restrictedpaths.hxx
+++ b/svl/inc/svl/restrictedpaths.hxx
@@ -31,15 +31,15 @@
#ifndef SVTOOLS_RESTRICTEDPATHS_HXX
#define SVTOOLS_RESTRICTEDPATHS_HXX
-#include <svtools/urlfilter.hxx>
-#include <svtools/svtdllapi.h>
+#include <svl/urlfilter.hxx>
+#include <svl/svldllapi.h>
#include <tools/string.hxx>
#include <vector>
namespace svt
{
- class SVT_DLLPUBLIC RestrictedPaths : public IUrlFilter
+ class SVL_DLLPUBLIC RestrictedPaths : public IUrlFilter
{
private:
::std::vector< String > m_aUnrestrictedURLs;
diff --git a/svtools/inc/svtools/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 52831f93f71f..d55ba25a06c2 100644
--- a/svtools/inc/svtools/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -35,7 +35,7 @@
#define NUMTYPE USHORT
#define SfxXRangeItem SfxRangeItem
#define SfxXRangesItem SfxUShortRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
#undef NUMTYPE
#undef SfxXRangeItem
#undef SfxXRangesItem
@@ -44,7 +44,7 @@
#define NUMTYPE ULONG
#define SfxXRangeItem SfxULongRangeItem
#define SfxXRangesItem SfxULongRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
#undef NUMTYPE
#undef SfxXRangeItem
#undef SfxXRangesItem
@@ -53,14 +53,14 @@
#define _SFXRNGITEM_HXX
#else
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
class SvStream;
// -----------------------------------------------------------------------
-class SVT_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
{
private:
NUMTYPE nFrom;
@@ -89,7 +89,7 @@ public:
// -----------------------------------------------------------------------
-class SVT_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
{
private:
NUMTYPE* _pRanges;
diff --git a/svtools/inc/svtools/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index e1394dec91b3..a12466519d1b 100644
--- a/svtools/inc/svtools/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.hxx
@@ -34,7 +34,7 @@
#include <tools/color.hxx>
#include <tools/gen.hxx>
#include <i18npool/lang.h>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
//============================================================================
class SfxFontItem: public SfxPoolItem
diff --git a/svtools/inc/svtools/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx
index 8735f8c5ccf7..1febb4e77583 100644
--- a/svtools/inc/svtools/sharecontrolfile.hxx
+++ b/svl/inc/svl/sharecontrolfile.hxx
@@ -31,7 +31,7 @@
#ifndef _SVT_SHARECONTROLFILE_HXX
#define _SVT_SHARECONTROLFILE_HXX
-#include <svtools/svtdllapi.h>
+#include <svl/svldllapi.h>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
@@ -40,7 +40,7 @@
#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/lockfilecommon.hxx>
+#include <svl/lockfilecommon.hxx>
#define SHARED_OOOUSERNAME_ID LOCKFILE_OOOUSERNAME_ID
#define SHARED_SYSUSERNAME_ID LOCKFILE_SYSUSERNAME_ID
@@ -51,7 +51,7 @@
namespace svt {
-class SVT_DLLPUBLIC ShareControlFile : public LockFileCommon
+class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
{
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream;
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
diff --git a/svtools/inc/svtools/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index 742d437fb842..9b1c0050cf6b 100644
--- a/svtools/inc/svtools/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -30,10 +30,10 @@
#ifndef _SFXSLSTITM_HXX
#define _SFXSLSTITM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
#include <tools/list.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Sequence.h>
class SfxImpStringList;
diff --git a/svtools/inc/svtools/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index 9858fefd86f0..089a86dae3f2 100644
--- a/svtools/inc/svtools/smplhint.hxx
+++ b/svl/inc/svl/smplhint.hxx
@@ -30,8 +30,8 @@
#ifndef _SFXSMPLHINT_HXX
#define _SFXSMPLHINT_HXX
-#include "svtools/svldllapi.h"
-#include <svtools/hint.hxx>
+#include "svl/svldllapi.h"
+#include <svl/hint.hxx>
#include <tools/rtti.hxx>
#define SFX_HINT_DYING 0x00000001
diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc
new file mode 100644
index 000000000000..96149b89131c
--- /dev/null
+++ b/svl/inc/svl/solar.hrc
@@ -0,0 +1,305 @@
+/*************************************************************************
+ *
+ * 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: solar.hrc,v $
+ * $Revision: 1.6 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _SOLAR_HRC
+#define _SOLAR_HRC
+
+// defines ------------------------------------------------------------------
+
+#define CREATERESMGR_NAME( Name ) #Name
+#define CREATERESMGR( Name ) ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) )
+
+#define RID_SFX_START 260
+#define RID_SFX_END 9999
+
+#define RID_LIB_START 10000
+#define RID_LIB_END 19999
+
+#define RID_SVX_START (RID_LIB_START)
+#define RID_SVX_END (RID_LIB_START+499)
+
+#define RID_SBASIC_START (RID_LIB_START+500)
+#define RID_SBASIC_END (RID_LIB_START+2999)
+
+#define RID_BASIC_START (RID_LIB_START+3000)
+#define RID_BASIC_END (RID_LIB_START+4499)
+
+#define RID_UUI_START (RID_LIB_START+4500)
+#define RID_UUI_END (RID_LIB_START+4599)
+
+#define RID_HELP_START (RID_LIB_START+4600)
+#define RID_HELP_END (RID_LIB_START+4799)
+
+#define RID_MAIL_START (RID_LIB_START+4800)
+#define RID_MAIL_END (RID_LIB_START+4849)
+
+#define RID_BASICIDE_START (RID_LIB_START+4850)
+#define RID_BASICIDE_END (RID_LIB_START+4949)
+
+#define RID_SVXITEMS_START (RID_LIB_START+4950)
+#define RID_SVXITEMS_END (RID_LIB_START+5599)
+
+#define RID_SBA_START (RID_LIB_START+5600)
+#define RID_SBA_END (RID_LIB_START+5649)
+
+#define RID_ISETBRW_START (RID_LIB_START+5650)
+#define RID_ISETBRW_END (RID_LIB_START+5699)
+
+#define RID_EXTENSIONS_START (RID_LIB_START+5700)
+#define RID_EXTENSIONS_END (RID_LIB_START+5799)
+
+#define RID_EDIT_START (RID_LIB_START+5800)
+#define RID_EDIT_END (RID_LIB_START+5899)
+
+#define RID_EDIT_START (RID_LIB_START+5800)
+#define RID_EDIT_END (RID_LIB_START+5899)
+
+#define RID_OUTL_START (RID_LIB_START+5900)
+#define RID_OUTL_END (RID_LIB_START+5919)
+
+#define RID_SVTOOLS_START (RID_LIB_START+5920)
+#define RID_SVTOOLS_END (RID_LIB_START+5999)
+
+#define RID_INET_START (RID_LIB_START+6000)
+#define RID_INET_END (RID_LIB_START+6059)
+
+#define RID_SO2_START (RID_LIB_START+6060)
+#define RID_SO2_END (RID_LIB_START+6099)
+
+#define RID_GOODIES_START (RID_LIB_START+6100)
+#define RID_GOODIES_END (RID_LIB_START+6149)
+
+#define RID_SJ_START (RID_LIB_START+6150)
+#define RID_SJ_END (RID_LIB_START+6199)
+
+#define RID_SI_START (RID_LIB_START+6200)
+#define RID_SI_END (RID_LIB_START+6399)
+
+#define RID_DLG_START (RID_LIB_START+6400)
+#define RID_DLG_END (RID_LIB_START+6499)
+
+#define RID_OFA_START (RID_LIB_START+6500)
+#define RID_OFA_END (RID_LIB_START+6999)
+
+#define RID_CHANNEL_START (RID_LIB_START+7000)
+#define RID_CHANNEL_END (RID_LIB_START+7499)
+
+#define RID_CHAOS_START (RID_LIB_START+7500)
+#define RID_CHAOS_END (RID_LIB_START+7999)
+
+#define RID_FORMS_START (RID_LIB_START+8000)
+#define RID_FORMS_END (RID_LIB_START+8999)
+
+#define RID_FORMLAYER_START (RID_LIB_START+9000)
+#define RID_FORMLAYER_END (RID_LIB_START+9199)
+
+#define RID_DBACCESS_START (RID_LIB_START+9200)
+#define RID_DBACCESS_END (RID_LIB_START+9699)
+
+#define RID_MORE_EXTENSIONS_START (RID_LIB_START+9700)
+#define RID_MORE_EXTENSIONS_END (RID_LIB_START+9999)
+
+#define RID_DB_EXTENSIONS_START (RID_LIB_START+10000)
+#define RID_DB_EXTENSIONS_END (RID_LIB_START+10199)
+
+#define RID_FILTER_START (RID_LIB_START+10200)
+#define RID_FILTER_END (RID_LIB_START+10299)
+
+// do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000)
+
+#define RID_APP_START 20000
+#define RID_APP_END 31999
+
+#define RID_SW_START (20000)
+#define RID_SW_END (25999)
+
+#define RID_SC_START (26000)
+#define RID_SC_END (26999)
+
+#define RID_SD_START (27000)
+#define RID_SD_END (27999)
+
+#define RID_OBJ_START (30000)
+#define RID_OBJ_END (32767)
+
+#define RID_SIM_START (RID_OBJ_START+ 0)
+#define RID_SIM_END (RID_OBJ_START+ 255)
+
+#define RID_SMA_START (RID_OBJ_START+ 256)
+#define RID_SMA_END (RID_OBJ_START+ 511)
+
+#define RID_SCH_START (RID_OBJ_START+ 512)
+#define RID_SCH_END (RID_OBJ_START+ 767)
+
+#define RID_RPT_START (RID_OBJ_START+768)
+#define RID_RPT_END (RID_OBJ_START+1000)
+
+#define RID_FORMULA_START (RID_OBJ_START+1001)
+#define RID_FORMULA_END (RID_OBJ_START+1200)
+// Help-Ids --------------------------------------------------------------
+
+#define HID_OK_BUTTON 0
+#define HID_CANCEL_BUTTON 0
+#define HID_HELP_BUTTON 0
+
+#define HID_START 32768
+
+#define HID_SVTOOLS_START (HID_START+200)
+#define HID_SVTOOLS_END (HID_START+299)
+
+#define HID_SFX_START (HID_START+300)
+#define HID_SFX_END (HID_START+999)
+
+#define HID_LIB_START (HID_START+1000)
+#define HID_LIB_END (HID_START+19999)
+
+#define HID_SVX_START (HID_LIB_START)
+#define HID_SVX_END (HID_LIB_START+431)
+
+#define HID_WIZARD_START (HID_LIB_START+432)
+#define HID_WIZARD_END (HID_LIB_START+999)
+//please note: There is also HID_WIZARD2 below
+
+// FREE
+
+#define HID_CUI_START (HID_LIB_START+1100)
+#define HID_CUI_END (HID_LIB_START+1699)
+
+#define HID_OFA_START (HID_LIB_START+1760)
+#define HID_OFA_END (HID_LIB_START+1999)
+
+#define HID_HELP_START (HID_LIB_START+2000)
+#define HID_HELP_END (HID_LIB_START+2050)
+
+#define HID_CHAOS_START (HID_LIB_START+2051)
+#define HID_CHAOS_END (HID_LIB_START+2069)
+
+#define HID_UUI_START (HID_LIB_START+2070)
+#define HID_UUI_END (HID_LIB_START+2099)
+
+#define HID_GOODIES_START (HID_LIB_START+2100)
+#define HID_GOODIES_END (HID_LIB_START+2199)
+
+#define HID_SCHEDULE_START (HID_LIB_START+2200)
+#define HID_SCHEDULE_END (HID_LIB_START+3399)
+
+#define HID_CHANNEL_START (HID_LIB_START+3400)
+#define HID_CHANNEL_END (HID_LIB_START+3499)
+
+#define HID_SBA_START (HID_LIB_START+ 3500)
+#define HID_SBA_END (HID_LIB_START+ 3999)
+
+#define HID_FORMS_START (HID_LIB_START+4000)
+#define HID_FORMS_END (HID_LIB_START+4999)
+
+#define HID_DBACCESS_START (HID_LIB_START+5000)
+#define HID_DBACCESS_END (HID_LIB_START+5299)
+
+#define HID_PORTAL_START (HID_LIB_START+5300)
+#define HID_PORTAL_END (HID_LIB_START+5599)
+
+#define HID_PORTAL_ADMIN_START (HID_LIB_START+5600)
+#define HID_PORTAL_ADMIN_END (HID_LIB_START+5999)
+
+#define HID_SYNCACCESS_START (HID_LIB_START+6000)
+#define HID_SYNCACCESS_END (HID_LIB_START+6099)
+
+#define HID_SVX_EXT0_START (HID_LIB_START+6100)
+#define HID_SVX_EXT0_END (HID_LIB_START+6599)
+
+#define HID_FRAMEWORK_START (HID_LIB_START+6600)
+#define HID_FRAMEWORK_END (HID_LIB_START+6999)
+
+#define HID_WIZARD2_START (HID_LIB_START+7000)
+#define HID_WIZARD2_END (HID_LIB_START+8999)
+
+#define HID_DESKTOP_START (HID_LIB_START+9000)
+#define HID_DESKTOP_END (HID_LIB_START+9299)
+
+#define HID_XMLSECURITY_START (HID_LIB_START+9300)
+#define HID_XMLSECURITY_END (HID_LIB_START+9999)
+
+#define HID_APP_START (HID_START+20000)
+#define HID_APP_END (HID_START+29999)
+
+#define HID_SW_START (HID_START+20000)
+#define HID_SW_END (HID_START+24999)
+
+#define HID_SC_START (HID_START+25000)
+#define HID_SC_END (HID_START+26999)
+
+#define HID_SD_START (HID_START+27000)
+#define HID_SD_END (HID_START+27999)
+
+#define HID_Sa_START (HID_START+28000)
+#define HID_Sa_END (HID_START+28999)
+
+#define HID_Sb_START (HID_START+29000)
+#define HID_Sb_END (HID_START+29999)
+
+#define HID_OBJ_START (HID_START+30000)
+#define HID_OBJ_END (HID_START+32767)
+
+#define HID_CUI3_START (HID_OBJ_START+ 0)
+#define HID_CUI3_END (HID_OBJ_START+ 239)
+
+#define HID_AVMEDIA_START (HID_OBJ_START+ 240)
+#define HID_AVMEDIA_END (HID_OBJ_START+ 255)
+
+#define HID_SMA_START (HID_OBJ_START+ 256)
+#define HID_SMA_END (HID_OBJ_START+ 511)
+
+#define HID_SCH_START (HID_OBJ_START+ 512)
+#define HID_SCH_END (HID_OBJ_START+ 767)
+
+#define HID_BASICIDE_START (HID_OBJ_START+ 768)
+#define HID_BASICIDE_END (HID_OBJ_START+1023)
+
+#define HID_SMA2_START (HID_OBJ_START+1024)
+#define HID_SMA2_END (HID_OBJ_START+1280)
+
+#define HID_FILTER_START (HID_OBJ_START+1281)
+#define HID_FILTER_END (HID_OBJ_START+1580)
+
+#define HID_LICENSING_START (HID_OBJ_START+1581)
+#define HID_LICENSING_END (HID_OBJ_START+1680)
+
+#define HID_RPT_START (HID_OBJ_START+1681)
+#define HID_RPT_END (HID_OBJ_START+2080)
+
+#define HID_FORMULA_START (HID_OBJ_START+2081)
+#define HID_FORMULA_END (HID_OBJ_START+2280)
+
+#define HID_EXTENSIONS_START (HID_OBJ_START+2281)
+#define HID_EXTENSIONS_END (HID_OBJ_START+2800)
+
+
+#endif
+
diff --git a/svtools/inc/svtools/stritem.hxx b/svl/inc/svl/stritem.hxx
index a2430b142c1d..21ee9fadd1ec 100644
--- a/svtools/inc/svtools/stritem.hxx
+++ b/svl/inc/svl/stritem.hxx
@@ -31,11 +31,11 @@
#ifndef _SFXSTRITEM_HXX
#define _SFXSTRITEM_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/custritm.hxx>
+#include "svl/svldllapi.h"
+#include <svl/custritm.hxx>
//============================================================================
-class SVT_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
+class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
{
public:
TYPEINFO();
diff --git a/svtools/inc/svtools/style.hrc b/svl/inc/svl/style.hrc
index ed4db1bf46d0..ed4db1bf46d0 100644
--- a/svtools/inc/svtools/style.hrc
+++ b/svl/inc/svl/style.hrc
diff --git a/svtools/inc/svtools/style.hxx b/svl/inc/svl/style.hxx
index 17e4bf7b9c06..66c130d346dd 100644
--- a/svtools/inc/svtools/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -38,16 +38,16 @@
#include <vector>
#include <comphelper/weak.hxx>
#include <cppuhelper/implbase2.hxx>
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <rsc/rscsfx.hxx>
#include <tools/string.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/hint.hxx>
+#include <svl/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/poolitem.hxx>
#ifndef _SFX_STYLE_HRC
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
#endif
class SfxItemSet;
@@ -91,7 +91,7 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from:
#define VIRTUAL510 virtual
-class SVT_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
+class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
{
friend class SfxStyleSheetBasePool;
@@ -165,7 +165,7 @@ typedef std::vector< rtl::Reference< SfxStyleSheetBase > > SfxStyles;
//=========================================================================
-class SVT_DLLPUBLIC SfxStyleSheetIterator
+class SVL_DLLPUBLIC SfxStyleSheetIterator
/* [Beschreibung]
@@ -195,8 +195,8 @@ protected:
private:
USHORT GetPos(){return nAktPosition;}
- SVT_DLLPRIVATE BOOL IsTrivialSearch();
- SVT_DLLPRIVATE BOOL DoesStyleMatch(SfxStyleSheetBase *pStyle);
+ SVL_DLLPRIVATE BOOL IsTrivialSearch();
+ SVL_DLLPRIVATE BOOL DoesStyleMatch(SfxStyleSheetBase *pStyle);
void* pImp;
SfxStyleSheetBase* pAktStyle;
@@ -210,7 +210,7 @@ friend class SfxStyleSheetBasePool;
class SfxStyleSheetBasePool_Impl;
-class SVT_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject
+class SVL_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject
{
friend class SfxStyleSheetIterator;
friend class SfxStyleSheetBase;
@@ -218,8 +218,8 @@ friend class SfxStyleSheetBase;
SfxStyleSheetBasePool_Impl *pImp;
private:
- SVT_DLLPRIVATE BOOL Load1_Impl( SvStream& );
- SVT_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl();
+ SVL_DLLPRIVATE BOOL Load1_Impl( SvStream& );
+ SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl();
protected:
String aAppName;
SfxItemPool& rPool;
@@ -287,7 +287,7 @@ public:
//=========================================================================
-class SVT_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
+class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
public SfxListener, public SfxBroadcaster
{
public:
@@ -306,7 +306,7 @@ protected:
//=========================================================================
-class SVT_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
+class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
{
protected:
using SfxStyleSheetBasePool::Create;
@@ -334,7 +334,7 @@ public:
//========================================================================
-class SVT_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
+class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
{
USHORT nHint;
@@ -348,7 +348,7 @@ public:
//=========================================================================
-class SVT_DLLPUBLIC SfxStyleSheetHint: public SfxHint
+class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint
{
SfxStyleSheetBase* pStyleSh;
USHORT nHint;
@@ -364,7 +364,7 @@ public:
{ return nHint; }
};
-class SVT_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
+class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
{
String aName;
@@ -379,7 +379,7 @@ public:
const String& GetOldName() { return aName; }
};
-class SVT_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
+class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
{
public:
SfxUnoStyleSheet( const UniString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, USHORT _nMaske );
diff --git a/svtools/inc/svtools/svarray.hxx b/svl/inc/svl/svarray.hxx
index 3ab3676fa5e0..555b7ad5fe84 100644
--- a/svtools/inc/svtools/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -101,7 +101,7 @@
***********************************************************************
#endif
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#ifndef INCLUDED_STRING_H
#include <string.h> // memmove()
@@ -1034,7 +1034,7 @@ public:\
#define C40_PTR_REPLACE( c, p) Replace( (c const *) p )
#define C40_GETPOS( c, r) GetPos( (c const *)r )
#else
-#if defined WTC || defined IRIX || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
+#if defined WTC || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
#define C40_PUSH( c, p) Push( (c const *&) p )
#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
diff --git a/svtools/inc/svtools/svdde.hxx b/svl/inc/svl/svdde.hxx
index 82681ed9d240..96a1ffa6bf22 100644
--- a/svtools/inc/svtools/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -31,7 +31,7 @@
#ifndef _SVDDE_HXX
#define _SVDDE_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <sot/exchange.hxx>
#include <tools/string.hxx>
#include <tools/list.hxx>
@@ -84,7 +84,7 @@ DECLARE_LIST( StringList, String * )
// - DdeData -
// -----------
-class SVT_DLLPUBLIC DdeData
+class SVL_DLLPUBLIC DdeData
{
friend class DdeInternal;
friend class DdeService;
@@ -93,7 +93,7 @@ class SVT_DLLPUBLIC DdeData
DdeDataImp* pImp;
//#if 0 // _SOLAR__PRIVATE
- SVT_DLLPRIVATE void Lock();
+ SVL_DLLPRIVATE void Lock();
//#endif
void SetFormat( ULONG nFmt );
@@ -155,7 +155,7 @@ public:
// - DdeTransaction -
// ------------------
-class SVT_DLLPUBLIC DdeTransaction
+class SVL_DLLPUBLIC DdeTransaction
{
public:
virtual void Data( const DdeData* );
@@ -205,7 +205,7 @@ private:
// - DdeLink -
// -----------
-class SVT_DLLPUBLIC DdeLink : public DdeTransaction
+class SVL_DLLPUBLIC DdeLink : public DdeTransaction
{
Link aNotify;
@@ -222,7 +222,7 @@ public:
// - DdeWarmLink -
// ---------------
-class SVT_DLLPUBLIC DdeWarmLink : public DdeLink
+class SVL_DLLPUBLIC DdeWarmLink : public DdeLink
{
public:
DdeWarmLink( DdeConnection&, const String&, long = 0 );
@@ -232,7 +232,7 @@ public:
// - DdeHotLink -
// --------------
-class SVT_DLLPUBLIC DdeHotLink : public DdeLink
+class SVL_DLLPUBLIC DdeHotLink : public DdeLink
{
public:
DdeHotLink( DdeConnection&, const String&, long = 0 );
@@ -242,7 +242,7 @@ public:
// - DdeRequest -
// --------------
-class SVT_DLLPUBLIC DdeRequest : public DdeTransaction
+class SVL_DLLPUBLIC DdeRequest : public DdeTransaction
{
public:
DdeRequest( DdeConnection&, const String&, long = 0 );
@@ -252,7 +252,7 @@ public:
// - DdePoke -
// -----------
-class SVT_DLLPUBLIC DdePoke : public DdeTransaction
+class SVL_DLLPUBLIC DdePoke : public DdeTransaction
{
public:
DdePoke( DdeConnection&, const String&, const char*, long,
@@ -265,7 +265,7 @@ public:
// - DdeExecute -
// --------------
-class SVT_DLLPUBLIC DdeExecute : public DdeTransaction
+class SVL_DLLPUBLIC DdeExecute : public DdeTransaction
{
public:
DdeExecute( DdeConnection&, const String&, long = 0 );
@@ -275,7 +275,7 @@ public:
// - DdeConnection -
// -----------------
-class SVT_DLLPUBLIC DdeConnection
+class SVL_DLLPUBLIC DdeConnection
{
friend class DdeInternal;
friend class DdeTransaction;
@@ -307,7 +307,7 @@ private:
// - DdeItem -
// -----------
-class SVT_DLLPUBLIC DdeItem
+class SVL_DLLPUBLIC DdeItem
{
friend class DdeInternal;
friend class DdeTopic;
@@ -336,7 +336,7 @@ public:
// - DdeItem -
// -----------
-class SVT_DLLPUBLIC DdeGetPutItem : public DdeItem
+class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem
{
public:
DdeGetPutItem( const sal_Unicode* p );
@@ -352,9 +352,9 @@ public:
// - DdeTopic -
// ------------
-class SVT_DLLPUBLIC DdeTopic
+class SVL_DLLPUBLIC DdeTopic
{
- SVT_DLLPRIVATE void _Disconnect( long );
+ SVL_DLLPRIVATE void _Disconnect( long );
public:
virtual void Connect( long );
@@ -421,7 +421,7 @@ private:
// - DdeService -
// --------------
-class SVT_DLLPUBLIC DdeService
+class SVL_DLLPUBLIC DdeService
{
friend class DdeInternal;
@@ -448,7 +448,7 @@ private:
ConvList* pConv;
short nStatus;
- SVT_DLLPRIVATE BOOL HasCbFormat( USHORT );
+ SVL_DLLPRIVATE BOOL HasCbFormat( USHORT );
public:
DdeService( const String& );
diff --git a/svtools/inc/iniadrtk.hxx b/svl/inc/svl/svldata.hxx
index 1e42abcc6261..468e6025cb5a 100644
--- a/svtools/inc/iniadrtk.hxx
+++ b/svl/inc/svl/svldata.hxx
@@ -6,8 +6,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: iniadrtk.hxx,v $
- * $Revision: 1.3 $
+ * $RCSfile: svldata.hxx,v $
+ * $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
@@ -28,36 +28,48 @@
*
************************************************************************/
-#ifndef SVTOOLS_INIADRTK_HXX
-#define SVTOOLS_INIADRTK_HXX
+#ifndef _SVL_SVLDATA_HXX
+#define _SVL_SVLDATA_HXX
-class String;
+#include <tools/simplerm.hxx>
+
+class SfxItemPool;
//============================================================================
-enum AddressToken
+class ImpSvlData
{
- ADDRESS_COMPANY,
- ADDRESS_STREET,
- ADDRESS_COUNTRY,
- ADDRESS_PLZ,
- ADDRESS_CITY,
- ADDRESS_TITLE,
- ADDRESS_POSITION,
- ADDRESS_TEL_PRIVATE,
- ADDRESS_TEL_COMPANY,
- ADDRESS_FAX,
- ADDRESS_EMAIL,
- ADDRESS_STATE,
- ADDRESS_FATHERSNAME,
- ADDRESS_APARTMENT
+public:
+ const SfxItemPool * pStoringPool;
+ 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:
+ ImpSvlData():
+ pStoringPool(0), m_pThreadsafeRMs(NULL)
+ {}
+
+ ~ImpSvlData();
+
+public:
+ SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale);
+ static ImpSvlData & GetSvlData();
};
//============================================================================
-class SfxIniManagerAddressEntry
+class SvtSimpleResId
{
+ String m_sValue;
+
public:
- static String get(const String & rAddress, AddressToken eToken);
+ SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvlData::GetSvlData().GetSimpleRM(aLocale)->ReadString(nId)) { };
+
+ operator String () const { return m_sValue; }
};
-#endif // SVTOOLS_INIADRTK_HXX
+
+
+#endif // _SVL_SVLDATA_HXX
diff --git a/svtools/inc/svtools/svldllapi.h b/svl/inc/svl/svldllapi.h
index 29b2ae29100a..29b2ae29100a 100644
--- a/svtools/inc/svtools/svldllapi.h
+++ b/svl/inc/svl/svldllapi.h
diff --git a/svtools/inc/svtools/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 050b228be4ab..869c70e1cac6 100644
--- a/svtools/inc/svtools/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -43,8 +43,8 @@
***********************************************************************
#endif
-#include "svtools/svldllapi.h"
-#include <svtools/svarray.hxx>
+#include "svl/svldllapi.h"
+#include <svl/svarray.hxx>
//#ifdef _SVSTDARR_BOOLS
#ifndef _SVSTDARR_BOOLS_DECL
diff --git a/svtools/inc/svtools/svtools.hrc b/svl/inc/svl/svtools.hrc
index 0be076d6333a..ec3bf093d753 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svl/inc/svl/svtools.hrc
@@ -90,17 +90,7 @@
#define STR_SVT_SAMPLES_HELP (RID_SVTOOLS_START+66)
#define STR_WARNING_ITEM (RID_SVTOOLS_START+90)
-#define STR_CSTAT_NEVER_UPD (RID_SVTOOLS_START+91)
-#define STR_CSTAT_IN_UPD (RID_SVTOOLS_START+92)
-#define STR_CSTAT_UPD_NEWER (RID_SVTOOLS_START+93)
-#define STR_CSTAT_UPD_NOT_NEWER (RID_SVTOOLS_START+94)
-#define STR_CSTAT_UPD_CANCEL (RID_SVTOOLS_START+95)
-#define STR_CSTAT_ERR_GENERAL (RID_SVTOOLS_START+96)
-#define STR_CSTAT_ERR_NOTEXISTS (RID_SVTOOLS_START+97)
-#define STR_CSTAT_ERR_NOTREACHED (RID_SVTOOLS_START+98)
#define STR_COLUM_DT_AUTO (RID_SVTOOLS_START+99)
-#define STR_CSTAT_UPD_IMMEDIATELY (RID_SVTOOLS_START+100)
-#define STR_CSTAT_ERR_OFFLINE (RID_SVTOOLS_START+101)
#define CONFIG_BASIC_FORMAT_START (RID_SVTOOLS_START+102)
#define STR_BASICKEY_FORMAT_ON (RID_SVTOOLS_START+103)
diff --git a/svtools/inc/svtools/szitem.hxx b/svl/inc/svl/szitem.hxx
index d3fb920aa012..c4b52d4939c0 100644
--- a/svtools/inc/svtools/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
@@ -32,7 +32,7 @@
#include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
class SfxArguments;
class SvStream;
diff --git a/svtools/inc/svtools/undo.hxx b/svl/inc/svl/undo.hxx
index 38cbfb227f1b..354de8b451c7 100644
--- a/svtools/inc/svtools/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -30,14 +30,14 @@
#ifndef _UNDO_HXX
#define _UNDO_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
#include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
//====================================================================
-class SVT_DLLPUBLIC SfxRepeatTarget
+class SVL_DLLPUBLIC SfxRepeatTarget
{
public:
TYPEINFO();
@@ -46,7 +46,7 @@ public:
//====================================================================
-class SVT_DLLPUBLIC SfxUndoAction
+class SVL_DLLPUBLIC SfxUndoAction
{
BOOL bLinked;
public:
@@ -79,7 +79,7 @@ SV_DECL_PTRARR( SfxUndoActions, SfxUndoAction*, 20, 8 )
/** do not make use of this implementation details, unless you
really really have to! */
-struct SVT_DLLPUBLIC SfxUndoArray
+struct SVL_DLLPUBLIC SfxUndoArray
{
SfxUndoActions aUndoActions;
USHORT nMaxUndoActions;
@@ -95,7 +95,7 @@ struct SVT_DLLPUBLIC SfxUndoArray
/** do not make use of this implementation details, unless you
really really have to! */
-class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray
+class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray
/* [Beschreibung]
@@ -135,7 +135,7 @@ class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
//=========================================================================
-class SVT_DLLPUBLIC SfxUndoManager
+class SVL_DLLPUBLIC SfxUndoManager
{
friend class SfxLinkUndoAction;
@@ -197,7 +197,7 @@ public:
//=========================================================================
-class SVT_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
+class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
/* [Beschreibung]
diff --git a/svtools/inc/svtools/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx
index 6370a75a1fd7..6370a75a1fd7 100644
--- a/svtools/inc/svtools/urlfilter.hxx
+++ b/svl/inc/svl/urlfilter.hxx
diff --git a/svtools/inc/svtools/visitem.hxx b/svl/inc/svl/visitem.hxx
index 9ace1212d967..1a3918526def 100644
--- a/svtools/inc/svtools/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -31,9 +31,9 @@
#ifndef _SFXVISIBILITYITEM_HXX
#define _SFXVISIBILITYITEM_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <com/sun/star/frame/status/Visibility.hpp>
//============================================================================
diff --git a/svtools/inc/svtools/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 814ca385d61a..4e653caf0238 100644
--- a/svtools/inc/svtools/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -30,20 +30,20 @@
#ifndef _ZFORLIST_HXX
#define _ZFORLIST_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/string.hxx>
#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
#endif
#include <i18npool/lang.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/i18n/NumberFormatCode.hpp>
#include <unotools/localedatawrapper.hxx>
-#include <svtools/ondemand.hxx>
+#include <svl/ondemand.hxx>
#include <tools/link.hxx>
-#include <svtools/nfkeytab.hxx>
+#include <svl/nfkeytab.hxx>
#include <map>
@@ -231,7 +231,7 @@ typedef ::std::map< sal_uInt32, sal_uInt32 > SvNumberFormatterMergeMap;
/** Language/country dependent currency entries
*/
-class SVT_DLLPUBLIC NfCurrencyEntry
+class SVL_DLLPUBLIC NfCurrencyEntry
{
String aSymbol; /// currency symbol
String aBankSymbol; /// currency abbreviation
@@ -251,7 +251,7 @@ private:
//#if 0 // _SOLAR__PRIVATE
// nDecimalFormat := 0, 1, 2
// #,##0 or #,##0.00 or #,##0.-- are assigned
- SVT_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&,
+ SVL_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&,
const LocaleDataWrapper&, USHORT nDecimalFormat ) const;
//#endif // __PRIVATE
@@ -328,12 +328,12 @@ public:
typedef NfCurrencyEntry* NfCurrencyEntryPtr;
SV_DECL_PTRARR_DEL( NfCurrencyTable, NfCurrencyEntryPtr, 128, 1 )
typedef String* WSStringPtr;
-SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVT_DLLPUBLIC )
+SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVL_DLLPUBLIC )
class SvNumberFormatterRegistry_Impl;
-class SVT_DLLPUBLIC SvNumberFormatter
+class SVL_DLLPUBLIC SvNumberFormatter
{
public:
@@ -813,37 +813,37 @@ private:
#ifdef _ZFORLIST_CXX // ----- private Methoden -----
- SVT_DLLPRIVATE static BOOL bCurrencyTableInitialized;
- SVT_DLLPRIVATE static USHORT nSystemCurrencyPosition;
- SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
+ SVL_DLLPRIVATE static BOOL bCurrencyTableInitialized;
+ SVL_DLLPRIVATE static USHORT nSystemCurrencyPosition;
+ SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
// get the registry, create one if none exists
- SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry();
+ SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry();
// called by ctors
- SVT_DLLPRIVATE void ImpConstruct( LanguageType eLang );
+ SVL_DLLPRIVATE void ImpConstruct( LanguageType eLang );
// Changes initialized language/country, clears the entries and generates
// new ones, may ONLY be called by the binary file format load
- SVT_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 );
+ SVL_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 );
// Generate builtin formats provided by i18n behind CLOffset,
// if bLoadingSO5==FALSE also generate additional i18n formats.
- SVT_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 );
+ SVL_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 );
// Generate additional formats provided by i18n
- SVT_DLLPRIVATE void ImpGenerateAdditionalFormats(
+ SVL_DLLPRIVATE void ImpGenerateAdditionalFormats(
sal_uInt32 CLOffset,
NumberFormatCodeWrapper& rNumberFormatCode,
BOOL bAfterLoadingSO5 );
- SVT_DLLPRIVATE SvNumberformat* ImpInsertFormat(
+ SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat(
const ::com::sun::star::i18n::NumberFormatCode& rCode,
sal_uInt32 nPos,
BOOL bAfterLoadingSO5 = FALSE,
sal_Int16 nOrgIndex = 0 );
// ImpInsertNewStandardFormat for new (since version ...) builtin formats
- SVT_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat(
+ SVL_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat(
const ::com::sun::star::i18n::NumberFormatCode& rCode,
sal_uInt32 nPos,
USHORT nVersion,
@@ -851,41 +851,41 @@ private:
sal_Int16 nOrgIndex = 0 );
// Return CLOffset or (MaxCLOffset + SV_COUNTRY_LANGUAGE_OFFSET) if new language/country
- SVT_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const;
+ SVL_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const;
// Test whether format code already exists, then return index key,
// otherwise NUMBERFORMAT_ENTRY_NOT_FOUND
- SVT_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString,
+ SVL_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString,
sal_uInt32 CLOffset,
LanguageType eLnge );
// Create builtin formats for language/country if necessary, return CLOffset
- SVT_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE );
+ SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE );
// Build negative currency format, old compatibility style
- SVT_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol );
+ SVL_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol );
// Build positive currency format, old compatibility style
- SVT_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol );
+ SVL_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol );
// Create <type>theCurrencyTable</type> with all <type>NfCurrencyEntry</type>
- SVT_DLLPRIVATE static void ImpInitCurrencyTable();
+ SVL_DLLPRIVATE static void ImpInitCurrencyTable();
// Return the format index of the currency format of the system locale.
// Format is created if not already present.
- SVT_DLLPRIVATE sal_uInt32 ImpGetDefaultSystemCurrencyFormat();
+ SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultSystemCurrencyFormat();
// Return the format index of the currency format of the current locale.
// Format is created if not already present.
- SVT_DLLPRIVATE sal_uInt32 ImpGetDefaultCurrencyFormat();
+ SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultCurrencyFormat();
// Return the default format for a given type and current locale.
// May ONLY be called from within GetStandardFormat().
- SVT_DLLPRIVATE sal_uInt32 ImpGetDefaultFormat( short nType );
+ SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultFormat( short nType );
// Return the index in a sequence of format codes matching an enum of
// NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't
// contain any format code elements a default element is created and inserted.
- SVT_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex(
+ SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex(
::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq,
const NfIndexTableOffset nTabOff );
@@ -895,13 +895,13 @@ private:
// Return the default index in the sequence.
// Non-PRODUCT version may check locale data for matching defaults in one
// FormatElement group.
- SVT_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault(
+ SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault(
::com::sun::star::i18n::NumberFormatCode * pFormatArr,
sal_Int32 nCount, BOOL bCheckCorrectness = TRUE
);
// used as a loop body inside of GetNewCurrencySymbolString() and GetCurrencyEntry()
-#ifdef PRODUCT
+#ifndef DBG_UTIL
inline
#endif
static BOOL ImpLookupCurrencyEntryLoopBody(
diff --git a/svtools/inc/svtools/zformat.hxx b/svl/inc/svl/zformat.hxx
index ae7d961c0bc6..991460015e6d 100644
--- a/svtools/inc/svtools/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -30,12 +30,12 @@
#ifndef _ZFORMAT_HXX
#define _ZFORMAT_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include <tools/string.hxx>
#include <i18npool/mslangid.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/nfversi.hxx>
-#include <svtools/nfkeytab.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/nfversi.hxx>
+#include <svl/nfkeytab.hxx>
// We need ImpSvNumberformatScan for the private SvNumberformat definitions.
#ifdef _ZFORMAT_CXX
@@ -175,7 +175,7 @@ private:
};
-class SVT_DLLPUBLIC SvNumberformat
+class SVL_DLLPUBLIC SvNumberformat
{
public:
// Ctor for Load
@@ -461,11 +461,11 @@ private:
BOOL bStandard; // If this is a default standard format
BOOL bIsUsed; // Flag as used for storing
- SVT_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const;
+ SVL_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const;
- SVT_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
+ SVL_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
- SVT_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
+ SVL_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const;
#ifdef _ZFORMAT_CXX // ----- private implementation methods -----
@@ -476,36 +476,36 @@ private:
const SvNumberFormatter& GetFormatter() const { return *rScan.GetNumberformatter(); }
// divide in substrings and color conditions
- SVT_DLLPRIVATE short ImpNextSymbol( String& rString,
+ SVL_DLLPRIVATE short ImpNextSymbol( String& rString,
xub_StrLen& nPos,
String& sSymbol );
// read string until ']' and strip blanks (after condition)
- SVT_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString,
+ SVL_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString,
xub_StrLen& nPos,
String& sSymbol );
// get xxx of "[$-xxx]" as LanguageType, starting at and advancing position nPos
- SVT_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos );
+ SVL_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos );
// standard number output
- SVT_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString );
+ SVL_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString );
// numbers in input line
- SVT_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString );
+ SVL_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString );
// check subcondition
// OP undefined => -1
// else 0 or 1
- SVT_DLLPRIVATE short ImpCheckCondition(double& fNumber,
+ SVL_DLLPRIVATE short ImpCheckCondition(double& fNumber,
double& fLimit,
SvNumberformatLimitOps eOp);
- SVT_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y);
- SVT_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y);
+ SVL_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y);
+ SVL_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y);
// Helper function for number strings
// append string symbols, insert leading 0 or ' ', or ...
- SVT_DLLPRIVATE BOOL ImpNumberFill( String& sStr,
+ SVL_DLLPRIVATE BOOL ImpNumberFill( String& sStr,
double& rNumber,
xub_StrLen& k,
USHORT& j,
@@ -513,7 +513,7 @@ private:
short eSymbolType );
// Helper function to fill in the integer part and the group (AKA thousand) separators
- SVT_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr,
+ SVL_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr,
double& rNumber,
xub_StrLen k,
USHORT j,
@@ -524,20 +524,20 @@ private:
// Helper function to fill in the group (AKA thousand) separators
// or to skip additional digits
- SVT_DLLPRIVATE void ImpDigitFill( String& sStr,
+ SVL_DLLPRIVATE void ImpDigitFill( String& sStr,
xub_StrLen nStart,
xub_StrLen& k,
USHORT nIx,
xub_StrLen & nDigitCount,
utl::DigitGroupingIterator & );
- SVT_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber,
+ SVL_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber,
USHORT nIx,
String& OutString );
- SVT_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber,
+ SVL_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber,
USHORT nIx,
String& OutString );
- SVT_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber,
+ SVL_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber,
USHORT nIx,
String& OutString );
@@ -546,23 +546,23 @@ private:
// know a "before" era (like zh_TW ROC or ja_JP Gengou). If switched and
// rOrgCalendar was "gregorian" the string is emptied. If rOrgCalendar was
// empty the previous calendar name and date/time are returned.
- SVT_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
+ SVL_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
// Append a "G" short era string of the given calendar. In the case of a
// Gengou calendar this is a one character abbreviation, for other
// calendars the XExtendedCalendar::getDisplayString() method is called.
- SVT_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal,
+ SVL_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal,
sal_Int16 nNatNum );
- SVT_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber,
+ SVL_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber,
USHORT nIx,
String& OutString );
- SVT_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
+ SVL_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
// normal digits or other digits, depending on ImpSvNumFor.aNatNum,
// [NatNum1], [NatNum2], ...
- SVT_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal,
+ SVL_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal,
USHORT nMinDigits = 0 ) const;
String ImpIntToString( USHORT nIx, sal_Int32 nVal, USHORT nMinDigits = 0 ) const
@@ -574,7 +574,7 @@ private:
}
// transliterate according to NativeNumber
- SVT_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
+ SVL_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
void ImpTransliterate( String& rStr, const SvNumberNatNum& rNum ) const
{
diff --git a/svtools/inc/urihelper.hxx b/svl/inc/urihelper.hxx
index 209f3f04e28a..8be500e438ce 100644
--- a/svtools/inc/urihelper.hxx
+++ b/svl/inc/urihelper.hxx
@@ -31,7 +31,7 @@
#ifndef SVTOOLS_URIHELPER_HXX
#define SVTOOLS_URIHELPER_HXX
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
#include "com/sun/star/uno/Reference.hxx"
#include <com/sun/star/uno/RuntimeException.hpp>
#include <rtl/textenc.h>
@@ -64,7 +64,7 @@ namespace URIHelper {
existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
if you want to generate file URLs without checking for their existence.
*/
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
ByteString const & rTheRelURIRef,
Link const & rMaybeFileHdl = Link(),
@@ -91,7 +91,7 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
if you want to generate file URLs without checking for their existence.
*/
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
UniString const & rTheRelURIRef,
Link const & rMaybeFileHdl = Link(),
@@ -106,10 +106,10 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
//============================================================================
-SVT_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
+SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
//============================================================================
-SVT_DLLPUBLIC Link GetMaybeFileHdl();
+SVL_DLLPUBLIC Link GetMaybeFileHdl();
/**
Converts a URI reference to a relative one, ignoring certain differences (for
@@ -131,7 +131,7 @@ SVT_DLLPUBLIC Link GetMaybeFileHdl();
@exception com::sun::star::uno::RuntimeException if any error occurs
*/
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
+SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
normalizedMakeRelative(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context,
@@ -159,11 +159,11 @@ normalizedMakeRelative(
@deprecated
No code should rely on the default component context.
*/
-SVT_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative(
+SVL_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative(
rtl::OUString const & baseUriReference, rtl::OUString const & uriReference);
//============================================================================
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
FindFirstURLInText(UniString const & rText,
xub_StrLen & rBegin,
xub_StrLen & rEnd,
@@ -200,7 +200,7 @@ FindFirstURLInText(UniString const & rText,
@return The input URI with any password component removed.
*/
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
removePassword(UniString const & rURI,
INetURLObject::EncodeMechanism eEncodeMechanism
= INetURLObject::WAS_ENCODED,
@@ -229,7 +229,7 @@ removePassword(UniString const & rURI,
@return The style bit corresponding to the queried content provider's
conventions, or FSysStyle(0) if these cannot be determined.
*/
-SVT_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl,
+SVL_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl,
bool bAddConvenienceStyles = true)
throw (com::sun::star::uno::RuntimeException);
diff --git a/svtools/inc/urlbmk.hxx b/svl/inc/urlbmk.hxx
index d3342b398878..d3342b398878 100644
--- a/svtools/inc/urlbmk.hxx
+++ b/svl/inc/urlbmk.hxx
diff --git a/svtools/inc/whiter.hxx b/svl/inc/whiter.hxx
index 87ed2cbc76f0..d2bd7c88d521 100644
--- a/svtools/inc/whiter.hxx
+++ b/svl/inc/whiter.hxx
@@ -30,7 +30,7 @@
#ifndef _SFX_WHITER_HXX
#define _SFX_WHITER_HXX
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
#ifndef INCLUDED_LIMITS_H
#include <limits.h>
diff --git a/svtools/inc/xmlement.hxx b/svl/inc/xmlement.hxx
index ed0e4dafc57a..ed0e4dafc57a 100644
--- a/svtools/inc/xmlement.hxx
+++ b/svl/inc/xmlement.hxx
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
new file mode 100644
index 000000000000..f2d4bf324d01
--- /dev/null
+++ b/svl/prj/build.lst
@@ -0,0 +1,22 @@
+sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL
+sl svl usr1 - all svl_mkout NULL
+sl svl\inc nmake - all svl_inc NULL
+sl svl\unx\source\svdde nmake - u svl_usdde svl_inc NULL
+sl svl\unx\source\svdde nmake - p svl_psdde svl_inc NULL
+sl svl\source\config nmake - all svl_conf svl_inc NULL
+sl svl\source\filepicker nmake - all svl_filepick svl_inc NULL
+sl svl\source\filerec nmake - all svl_file svl_inc NULL
+sl svl\source\items nmake - all svl__item svl_inc NULL
+sl svl\source\memtools nmake - all svl_mem svl_inc NULL
+sl svl\source\misc nmake - all svl__misc svl_inc NULL
+sl svl\source\notify nmake - all svl_not svl_inc NULL
+sl svl\source\numbers nmake - all svl_num svl_inc NULL
+sl svl\source\svdde nmake - all svl__dde svl_inc NULL
+sl svl\source\svsql nmake - all svl_sql svl_inc NULL
+sl svl\source\undo nmake - all svl_undo svl_inc NULL
+sl svl\source\uno nmake - all svl_uno svl_inc NULL
+sl svl\util nmake - all svl_util svl_usdde.u svl_psdde.p svl_conf svl_filepick svl_file svl__item svl_mem svl__misc svl_not svl_num svl__dde svl_sql svl_undo svl_uno NULL
+sl svl\source\fsstor nmake - all svl_fsstor svl_inc NULL
+sl svl\source\passwordcontainer nmake - all svl_passcont svl_inc NULL
+
+
diff --git a/svl/prj/d.lst b/svl/prj/d.lst
new file mode 100644
index 000000000000..a5c2564e81cd
--- /dev/null
+++ b/svl/prj/d.lst
@@ -0,0 +1,22 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+mkdir: %_DEST%\inc%_EXT%\svl
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
+..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
+
+..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
+..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
+..\inc\svl\*.h %_DEST%\inc%_EXT%\svl\*.h
+..\inc\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
+..\inc\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
+..\inc\*.h %_DEST%\inc%_EXT%\svl\*.h
+
+dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
+
+*.xml %_DEST%\xml%_EXT%\*.xml
+
diff --git a/svtools/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java
index 97cc21fdec9f..6f4d0ba3d945 100644
--- a/svtools/qa/complex/ConfigItems/CheckConfigItems.java
+++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java
@@ -102,7 +102,7 @@ public class CheckConfigItems extends ComplexTestCase
// create module manager
m_xTest = (XJob)UnoRuntime.queryInterface(
XJob.class,
- m_xSmgr.createInstance("com.sun.star.comp.svtools.ConfigItemTest"));
+ m_xSmgr.createInstance("com.sun.star.comp.svl.ConfigItemTest"));
}
//-------------------------------------------
diff --git a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
index d853bf926467..d853bf926467 100644
--- a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
index fc2f4681e4fe..58bb58f8c215 100644
--- a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
@@ -37,7 +37,7 @@
#define SVTOOLS_ACCESSIBILITYOPTTEST_HXX
#include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/accessibilityoptions.hxx>
+#include <svl/accessibilityoptions.hxx>
namespace css = ::com::sun::star;
diff --git a/svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index b21d9d76755e..ad9dda313a5c 100644
--- a/svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
@@ -51,7 +51,7 @@
//=============================================================================
namespace css = ::com::sun::star;
-namespace svtools{
+namespace svl{
//=============================================================================
static const ::rtl::OUString PROP_TEST = ::rtl::OUString::createFromAscii("Test");
@@ -196,7 +196,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::getSupportedServi
//=============================================================================
::rtl::OUString SAL_CALL ConfigItemTest::st_getImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.svtools.ConfigItemTest");
+ return ::rtl::OUString::createFromAscii("com.sun.star.comp.svl.ConfigItemTest");
}
//=============================================================================
@@ -215,15 +215,15 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ConfigItemTest::st_create(c
return xObject;
}
-} // namespace svtools
+} // namespace svl
//=============================================================================
static ::cppu::ImplementationEntry const lRegEntries[] =
{
{
- &::svtools::ConfigItemTest::st_create,
- &::svtools::ConfigItemTest::st_getImplementationName,
- &::svtools::ConfigItemTest::st_getSupportedServiceNames,
+ &::svl::ConfigItemTest::st_create,
+ &::svl::ConfigItemTest::st_getImplementationName,
+ &::svl::ConfigItemTest::st_getSupportedServiceNames,
&::cppu::createSingleComponentFactory, 0, 0
},
diff --git a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index 723b3e44f3e5..082328835fca 100644
--- a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
@@ -34,7 +34,7 @@
************************************************************************/
#include "HistoryOptTest.hxx"
-#include "configitems/historyoptions_const.hxx"
+#include <unotools/historyoptions_const.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
index fca9802d2781..8415d9f989b9 100644
--- a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
@@ -37,7 +37,7 @@
#define SVTOOLS_HISTORYOPTTEST_HXX
#include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
namespace css = ::com::sun::star;
diff --git a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
index 69504e4d5d7e..69504e4d5d7e 100644
--- a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
index 14d4267b8878..79505a4e6faf 100644
--- a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
@@ -37,7 +37,7 @@
#define SVTOOLS_PRINTOPTTEST_HXX
#include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/printoptions.hxx>
+#include <svl/printoptions.hxx>
namespace css = ::com::sun::star;
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
index 14ee513ee0cb..14ee513ee0cb 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
index 8234b0b7edf4..72ff71cafe2d 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
@@ -37,7 +37,7 @@
#define SVTOOLS_USEROPTTEST_HXX
#include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
namespace css = ::com::sun::star;
diff --git a/svtools/qa/complex/ConfigItems/helper/exports.map b/svl/qa/complex/ConfigItems/helper/exports.map
index 85610ad80888..85610ad80888 100644
--- a/svtools/qa/complex/ConfigItems/helper/exports.map
+++ b/svl/qa/complex/ConfigItems/helper/exports.map
diff --git a/svtools/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index 6070d25b7bd4..d41fe6c129c6 100644
--- a/svtools/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/makefile.mk
@@ -34,7 +34,7 @@
#*************************************************************************
PRJ=..$/..$/..$/..
-PRJNAME= svtools
+PRJNAME= svl
TARGET= ConfigItemTest
USE_DEFFILE= TRUE