[Libreoffice-commits] .: Branch 'feature/gnumake4' - 378 commits - basebmp/inc basebmp/source basegfx/inc basegfx/prj basegfx/source basegfx/test canvas/prj canvas/source comphelper/inc comphelper/Library_comphelp.mk comphelper/prj comphelper/source cppcanvas/prj cppcanvas/source dtrans/prj dtrans/source dtrans/test dtrans/util i18npool/inc i18npool/prj i18npool/qa i18npool/source i18nutil/inc i18nutil/prj i18nutil/source l10ntools/inc l10ntools/source padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk padmin/source regexp/prj regexp/source rsc/inc rsc/prj rsc/source sax/prj sax/source sax/test sot/inc sot/Library_sot.mk sot/source sot/util svl/inc svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svl/prj svl/qa svl/source svl/util svtools/bmpmaker svtools/CppunitTest_svtools_filters_test.mk svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/inc svtools/Library_hatchwindowfactory.mk svtools/Library_productregistration.mk svtools/Library_svt.mk svtools/Module_svtools.mk svtools/Package_inc.mk svtools/prj svtools/qa svtools/source svtools/util svtools/workben toolkit/inc toolkit/Library_tk.mk toolkit/source toolkit/util tools/bootstrp tools/Executable_mkunroll.mk tools/inc tools/Library_tl.mk tools/Module_tools.mk tools/prj tools/source tools/StaticLibrary_ooopathutils.mk tools/StaticLibrary_toolshelpers.mk ucbhelper/prj ucbhelper/source ucbhelper/workben unotools/inc unotools/Library_utl.mk unotools/prj unotools/source unotools/util vcl/aqua vcl/inc vcl/ios vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/null vcl/prj vcl/source vcl/StaticLibrary_vclmain.mk vcl/unx vcl/util vcl/vcl.android.component vcl/vcl.ios.component vcl/vcl.macosx.component vcl/vcl.unx.component vcl/vcl.windows.component vcl/win vcl/workben
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jul 21 10:06:40 PDT 2011
basebmp/inc/basebmp/bitmapdevice.hxx | 13
basebmp/source/bitmapdevice.cxx | 150
basegfx/inc/basegfx/matrix/b3dhommatrix.hxx | 13
basegfx/inc/basegfx/point/b3dhompoint.hxx | 409
basegfx/inc/basegfx/tools/unotools.hxx | 55
basegfx/prj/build.lst | 2
basegfx/prj/d.lst | 1
basegfx/source/matrix/b3dhommatrix.cxx | 54
basegfx/source/point/b3dhompoint.cxx | 47
basegfx/source/polygon/b2dpolypolygon.cxx | 19
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 7
basegfx/source/tools/unotools.cxx | 264
basegfx/test/basegfx3d.cxx | 28
canvas/prj/build.lst | 2
canvas/prj/d.lst | 1
canvas/source/cairo/cairo_canvashelper.cxx | 10
canvas/source/cairo/cairo_quartz_cairo.cxx | 17
canvas/source/cairo/cairo_quartz_cairo.hxx | 6
canvas/source/cairo/cairo_spritecanvashelper.cxx | 4
canvas/source/cairo/cairo_textlayout.cxx | 7
canvas/source/factory/cf_service.cxx | 6
comphelper/Library_comphelp.mk | 6
comphelper/inc/comphelper/componentmodule.hxx | 97
comphelper/inc/comphelper/servicedecl.hxx | 6
comphelper/inc/comphelper/storagehelper.hxx | 8
comphelper/prj/build.lst | 2
comphelper/source/inc/comphelper_module.hxx | 50
comphelper/source/misc/comphelper_module.cxx | 19
comphelper/source/misc/comphelper_services.cxx | 7
comphelper/source/misc/storagehelper.cxx | 17
cppcanvas/prj/build.lst | 2
cppcanvas/source/uno/exports.dxp | 1
cppcanvas/source/uno/exports.map | 1
dtrans/prj/build.lst | 2
dtrans/source/cnttype/exports.dxp | 1
dtrans/source/cnttype/mctfentry.cxx | 15
dtrans/source/generic/clipboardmanager.cxx | 3
dtrans/source/generic/dtrans.cxx | 8
dtrans/source/generic/exports.dxp | 1
dtrans/source/test/test_dtrans.cxx | 4
dtrans/source/win32/clipb/WinClipbImpl.cxx | 14
dtrans/source/win32/clipb/WinClipbImpl.hxx | 2
dtrans/source/win32/clipb/exports.dxp | 2
dtrans/source/win32/clipb/wcbentry.cxx | 15
dtrans/source/win32/dnd/dndentry.cxx | 10
dtrans/source/win32/dnd/exports.dxp | 1
dtrans/source/win32/dtobj/DOTransferable.cxx | 6
dtrans/source/win32/dtobj/DTransHelper.hxx | 2
dtrans/source/win32/dtobj/DataFmtTransl.cxx | 4
dtrans/source/win32/dtobj/DtObjFactory.cxx | 2
dtrans/source/win32/dtobj/Fetc.cxx | 2
dtrans/source/win32/dtobj/FetcList.cxx | 4
dtrans/source/win32/dtobj/FmtFilter.cxx | 4
dtrans/source/win32/dtobj/TxtCnvtHlp.cxx | 2
dtrans/source/win32/dtobj/XNotifyingDataObject.cxx | 6
dtrans/source/win32/dtobj/XTDataObject.cxx | 2
dtrans/source/win32/ftransl/exports.dxp | 1
dtrans/source/win32/ftransl/ftransl.cxx | 2
dtrans/source/win32/ftransl/ftransl.hxx | 2
dtrans/source/win32/ftransl/ftranslentry.cxx | 15
dtrans/source/win32/misc/ImplHelper.cxx | 4
dtrans/source/win32/mtaole/MtaOleClipb.cxx | 2
dtrans/source/win32/workbench/XTDo.cxx | 2
dtrans/source/win32/workbench/test_wincb.cxx | 2
dtrans/test/win32/dnd/transferable.hxx | 2
dtrans/util/exports.dxp | 1
i18npool/inc/i18npool/lang.h | 2
i18npool/inc/i18npool/mslangid.hxx | 36
i18npool/prj/build.lst | 2
i18npool/prj/d.lst | 2
i18npool/qa/cppunit/test_breakiterator.cxx | 51
i18npool/source/breakiterator/breakiteratorImpl.cxx | 200
i18npool/source/breakiterator/data/makefile.mk | 2
i18npool/source/breakiterator/makefile.mk | 4
i18npool/source/collator/data/makefile.mk | 2
i18npool/source/collator/makefile.mk | 4
i18npool/source/indexentry/data/makefile.mk | 2
i18npool/source/indexentry/makefile.mk | 5
i18npool/source/isolang/isolang.cxx | 20
i18npool/source/isolang/makefile.mk | 4
i18npool/source/isolang/mslangid.cxx | 31
i18npool/source/localedata/LocaleNode.cxx | 12
i18npool/source/localedata/data/gd_GB.xml | 357
i18npool/source/localedata/data/localedata_euro.map | 17
i18npool/source/localedata/data/makefile.mk | 15
i18npool/source/localedata/localedata.cxx | 1
i18npool/source/localedata/makefile.mk | 4
i18npool/source/paper/makefile.mk | 4
i18npool/source/paper/paper.cxx | 6
i18npool/source/registerservices/registerservices.cxx | 5
i18npool/source/search/textsearch.cxx | 6
i18npool/source/textconversion/data/makefile.mk | 2
i18npool/source/textconversion/makefile.mk | 4
i18nutil/inc/i18nutil/oneToOneMapping.hxx | 4
i18nutil/inc/i18nutil/x_rtl_ustring.h | 10
i18nutil/prj/build.lst | 2
i18nutil/prj/d.lst | 1
i18nutil/source/utility/makefile.mk | 4
l10ntools/inc/cfgmerge.hxx | 3
l10ntools/inc/export.hxx | 25
l10ntools/inc/helpmerge.hxx | 13
l10ntools/inc/l10ntools/directory.hxx | 1
l10ntools/inc/l10ntools/file.hxx | 1
l10ntools/source/cfglex.l | 6
l10ntools/source/cfgmerge.cxx | 51
l10ntools/source/directory.cxx | 6
l10ntools/source/export.cxx | 382
l10ntools/source/export2.cxx | 142
l10ntools/source/file.cxx | 5
l10ntools/source/gsicheck.cxx | 27
l10ntools/source/help/HelpCompiler.cxx | 4
l10ntools/source/help/HelpCompiler.hxx | 7
l10ntools/source/help/HelpLinker.cxx | 8
l10ntools/source/helpmerge.cxx | 101
l10ntools/source/lngmerge.cxx | 9
l10ntools/source/localize.cxx | 259
l10ntools/source/merge.cxx | 20
l10ntools/source/tagtest.cxx | 14
l10ntools/source/xrmlex.l | 6
l10ntools/source/xrmmerge.cxx | 17
padmin/Executable_spadmin.bin.mk | 6
padmin/Library_spa.mk | 10
padmin/source/cmddlg.cxx | 8
padmin/source/newppdlg.cxx | 10
regexp/prj/d.lst | 1
regexp/source/reclass.cxx | 7
rsc/inc/rscclass.hxx | 9
rsc/inc/rscdb.hxx | 5
rsc/inc/rscdef.hxx | 22
rsc/inc/rscinst.hxx | 2
rsc/inc/rsckey.hxx | 2
rsc/inc/rscpar.hxx | 3
rsc/inc/rscrsc.hxx | 10
rsc/inc/rsctools.hxx | 1
rsc/prj/build.lst | 2
rsc/prj/d.lst | 4
rsc/source/misc/rscdbl.cxx | 11
rsc/source/parser/erscerr.cxx | 4
rsc/source/parser/rscdb.cxx | 59
rsc/source/parser/rsckey.cxx | 10
rsc/source/parser/rsclex.cxx | 34
rsc/source/parser/rscpar.cxx | 17
rsc/source/parser/rscyacc.cxx | 7
rsc/source/prj/gui.cxx | 11
rsc/source/prj/makefile.mk | 21
rsc/source/prj/start.cxx | 186
rsc/source/res/rscclass.cxx | 27
rsc/source/rsc/rsc.cxx | 60
rsc/source/rscpp/cpp.h | 4
rsc/source/rscpp/cpp1.c | 2
rsc/source/rscpp/cppmain.c | 43
rsc/source/rscpp/makefile.mk | 16
rsc/source/tools/rscdef.cxx | 317
rsc/source/tools/rsctools.cxx | 23
sax/prj/build.lst | 1
sax/prj/d.lst | 1
sax/source/expatwrap/sax_expat.cxx | 6
sax/source/fastparser/facreg.cxx | 6
sax/test/sax/exports.dxp | 2
sax/test/sax/testsax.cxx | 8
sax/test/saxdemo.cxx | 46
sax/test/testcomponent.cxx | 17
sot/Library_sot.mk | 6
sot/inc/sot/stg.hxx | 1
sot/inc/sot/storage.hxx | 6
sot/source/base/factory.cxx | 7
sot/source/sdstor/stgdir.cxx | 5
sot/source/sdstor/stgstrms.cxx | 2
sot/source/sdstor/storage.cxx | 155
sot/source/sdstor/ucbstorage.cxx | 12
sot/source/unoolestorage/register.cxx | 7
sot/util/sot.component | 2
svl/Library_fsstorage.mk | 6
svl/Library_passwordcontainer.mk | 6
svl/Library_svl.mk | 7
svl/inc/svl/adrparse.hxx | 22
svl/inc/svl/httpcook.hxx | 20
svl/inc/svl/ilstitem.hxx | 8
svl/inc/svl/inettype.hxx | 74
svl/inc/svl/itempool.hxx | 1
svl/inc/svl/ownlist.hxx | 16
svl/inc/svl/style.hxx | 2
svl/inc/svl/svstdarr.hxx | 20
svl/inc/svl/urihelper.hxx | 54
svl/prj/build.lst | 2
svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx | 7
svl/source/fsstor/fsfactory.cxx | 8
svl/source/fsstor/fsstorage.component | 2
svl/source/items/ilstitem.cxx | 24
svl/source/items/poolio.cxx | 34
svl/source/items/style.cxx | 4
svl/source/items/whassert.hxx | 10
svl/source/memtools/svarray.cxx | 97
svl/source/misc/adrparse.cxx | 138
svl/source/misc/inethist.cxx | 39
svl/source/misc/inettype.cxx | 221
svl/source/misc/ownlist.cxx | 58
svl/source/misc/strmadpt.cxx | 44
svl/source/misc/urihelper.cxx | 87
svl/source/numbers/zforlist.cxx | 240
svl/source/numbers/zformat.cxx | 17
svl/source/passwordcontainer/passwordcontainer.component | 2
svl/source/passwordcontainer/passwordcontainer.cxx | 8
svl/source/svdde/ddesvr.cxx | 29
svl/source/uno/registerservices.cxx | 8
svl/util/svl.component | 2
svtools/CppunitTest_svtools_filters_test.mk | 69
svtools/Executable_bmp.mk | 6
svtools/Executable_bmpsum.mk | 6
svtools/Executable_g2g.mk | 6
svtools/Library_hatchwindowfactory.mk | 6
svtools/Library_productregistration.mk | 6
svtools/Library_svt.mk | 10
svtools/Module_svtools.mk | 15
svtools/Package_inc.mk | 1
svtools/bmpmaker/bmp.cxx | 1
svtools/bmpmaker/bmpsum.cxx | 2
svtools/inc/svtools/brwbox.hxx | 21
svtools/inc/svtools/ctrlbox.hxx | 3
svtools/inc/svtools/filter.hxx | 1
svtools/inc/svtools/grfmgr.hxx | 712 +
svtools/inc/svtools/helpopt.hxx | 4
svtools/inc/svtools/imap.hxx | 32
svtools/inc/svtools/imapcirc.hxx | 2
svtools/inc/svtools/imapobj.hxx | 13
svtools/inc/svtools/ivctrl.hxx | 2
svtools/inc/svtools/prnsetup.hxx | 1
svtools/inc/svtools/svicnvw.hxx | 289
svtools/inc/svtools/svtreebx.hxx | 2
svtools/inc/svtools/syntaxhighlight.hxx | 8
svtools/inc/svtools/tabbar.hxx | 12
svtools/inc/svtools/taskbar.hxx | 62
svtools/inc/svtools/texteng.hxx | 5
svtools/inc/svtools/textview.hxx | 10
svtools/inc/svtools/transfer.hxx | 6
svtools/inc/svtools/treelist.hxx | 6
svtools/inc/svtools/txtattr.hxx | 8
svtools/inc/svtools/unitconv.hxx | 4
svtools/inc/svtools/wmf.hxx | 2
svtools/prj/build.lst | 2
svtools/qa/cppunit/data/emf/fail/CVE-2004-0209-1.emf |binary
svtools/qa/cppunit/data/emf/fail/CVE-2008-1083-1.emf |binary
svtools/qa/cppunit/data/emf/fail/CVE-2009-1217-1.emf |binary
svtools/qa/cppunit/data/emf/pass/CVE-2008-1087-1.emf |binary
svtools/qa/cppunit/data/wmf/fail/CVE-2005-2124-1.wmf |binary
svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-1.wmf |binary
svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-2.wmf |binary
svtools/qa/cppunit/data/wmf/pass/CVE-2005-2123-1.wmf |binary
svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf |binary
svtools/qa/cppunit/data/wmf/pass/CVE-2007-1090-1.wmf |binary
svtools/qa/cppunit/data/wmf/pass/CVE-2007-1238-1.wmf |binary
svtools/qa/cppunit/data/wmf/pass/CVE-2007-1245-1.wmf |binary
svtools/qa/cppunit/filters-test.cxx | 214
svtools/source/brwbox/brwbox1.cxx | 188
svtools/source/brwbox/brwbox2.cxx | 7
svtools/source/config/helpopt.cxx | 18
svtools/source/config/optionsdrawinglayer.cxx | 9
svtools/source/contnr/fileview.cxx | 14
svtools/source/contnr/imivctl.hxx | 997 +-
svtools/source/contnr/imivctl1.cxx | 362
svtools/source/contnr/imivctl2.cxx | 87
svtools/source/contnr/ivctrl.cxx | 6
svtools/source/contnr/svicnvw.cxx | 813 -
svtools/source/contnr/svimpbox.cxx | 39
svtools/source/contnr/svimpicn.cxx | 4093 ----------
svtools/source/contnr/svtreebx.cxx | 27
svtools/source/control/ctrlbox.cxx | 4
svtools/source/control/tabbar.cxx | 167
svtools/source/control/taskbar.cxx | 64
svtools/source/control/taskmisc.cxx | 161
svtools/source/control/taskstat.cxx | 101
svtools/source/dialogs/mcvmath.cxx | 159
svtools/source/dialogs/mcvmath.hxx | 9
svtools/source/dialogs/prnsetup.cxx | 5
svtools/source/edit/syntaxhighlight.cxx | 39
svtools/source/edit/textdoc.cxx | 33
svtools/source/edit/textdoc.hxx | 4
svtools/source/edit/texteng.cxx | 58
svtools/source/edit/textundo.cxx | 41
svtools/source/edit/textview.cxx | 36
svtools/source/edit/txtattr.cxx | 21
svtools/source/filter/exportdialog.cxx | 1
svtools/source/filter/filter2.cxx | 1
svtools/source/filter/sgfbram.cxx | 12
svtools/source/filter/sgvtext.cxx | 42
svtools/source/filter/wmf/emfwr.cxx | 5
svtools/source/filter/wmf/enhwmf.cxx | 35
svtools/source/filter/wmf/winmtf.hxx | 937 +-
svtools/source/filter/wmf/wmf.cxx | 7
svtools/source/graphic/grfcache.cxx | 99
svtools/source/graphic/grfmgr.cxx | 6
svtools/source/graphic/grfmgr2.cxx | 45
svtools/source/hatchwindow/hatchwindowfactory.component | 2
svtools/source/hatchwindow/hatchwindowfactory.cxx | 8
svtools/source/inc/svimpbox.hxx | 1
svtools/source/misc/imap.cxx | 121
svtools/source/misc/imap2.cxx | 315
svtools/source/misc/transfer.cxx | 54
svtools/source/misc/transfer2.cxx | 9
svtools/source/misc/unitconv.cxx | 58
svtools/source/productregistration/productregistration.cxx | 8
svtools/source/productregistration/productregistration.uno.component | 2
svtools/source/svhtml/htmlout.cxx | 44
svtools/source/svhtml/parhtml.cxx | 7
svtools/source/svrtf/parrtf.cxx | 22
svtools/source/svrtf/rtfout.cxx | 21
svtools/source/uno/miscservices.cxx | 8
svtools/source/uno/unoiface.cxx | 1
svtools/util/svt.component | 2
svtools/workben/unodialog/udlg_services.cxx | 7
toolkit/Library_tk.mk | 11
toolkit/inc/toolkit/helper/macros.hxx | 12
toolkit/source/awt/vclxgraphics.cxx | 16
toolkit/source/awt/vclxsystemdependentwindow.cxx | 11
toolkit/source/awt/vclxtoolkit.cxx | 13
toolkit/source/awt/vclxtopwindow.cxx | 11
toolkit/source/awt/vclxwindow1.cxx | 6
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/helper/registerservices.cxx | 7
toolkit/source/helper/unowrapper.cxx | 20
toolkit/source/layout/core/root.cxx | 6
toolkit/source/layout/vcl/wbutton.cxx | 4
toolkit/util/tk.component | 2
tools/Executable_mkunroll.mk | 4
tools/Library_tl.mk | 6
tools/Module_tools.mk | 13
tools/StaticLibrary_ooopathutils.mk | 2
tools/StaticLibrary_toolshelpers.mk | 1
tools/bootstrp/appdef.cxx | 54
tools/bootstrp/md5.cxx | 13
tools/bootstrp/md5.hxx | 4
tools/bootstrp/mkunroll/mkunroll.cxx | 2
tools/bootstrp/prj.cxx | 16
tools/bootstrp/rscdep.cxx | 6
tools/bootstrp/so_checksum.cxx | 12
tools/inc/bootstrp/appdef.hxx | 49
tools/inc/bootstrp/prj.hxx | 5
tools/inc/impstrg.hxx | 6
tools/inc/tools/b3dtrans.hxx | 50
tools/inc/tools/bigint.hxx | 1
tools/inc/tools/fsys.hxx | 28
tools/inc/tools/inetmime.hxx | 79
tools/inc/tools/inetmsg.hxx | 134
tools/inc/tools/inetstrm.hxx | 19
tools/inc/tools/prex.h | 10
tools/inc/tools/stream.hxx | 8
tools/inc/tools/string.hxx | 32
tools/inc/tools/table.hxx | 2
tools/inc/tools/tempfile.hxx | 8
tools/inc/tools/urlobj.hxx | 75
tools/prj/build.lst | 2
tools/source/fsys/dirent.cxx | 257
tools/source/fsys/tdir.cxx | 52
tools/source/fsys/tempfile.cxx | 33
tools/source/fsys/unx.cxx | 19
tools/source/fsys/urlobj.cxx | 139
tools/source/fsys/wntmsc.cxx | 40
tools/source/fsys/wntmsc.hxx | 4
tools/source/generic/b3dtrans.cxx | 362
tools/source/generic/bigint.cxx | 69
tools/source/generic/config.cxx | 33
tools/source/inet/inetmime.cxx | 298
tools/source/inet/inetmsg.cxx | 497 -
tools/source/inet/inetstrm.cxx | 46
tools/source/memtools/table.cxx | 39
tools/source/rc/isofallback.cxx | 2
tools/source/rc/resmgr.cxx | 74
tools/source/ref/errinf.cxx | 36
tools/source/ref/globname.cxx | 43
tools/source/ref/pstm.cxx | 32
tools/source/stream/stream.cxx | 122
tools/source/stream/strmunx.cxx | 28
tools/source/string/strcvt.cxx | 55
tools/source/string/strimp.cxx | 376
tools/source/string/tstring.cxx | 60
tools/source/string/tustring.cxx | 346
ucbhelper/prj/build.lst | 2
ucbhelper/source/provider/propertyvalueset.cxx | 12
ucbhelper/workben/myucp/myucp_services.cxx | 7
unotools/Library_utl.mk | 6
unotools/inc/unotools/localedatawrapper.hxx | 2
unotools/inc/unotools/regoptions.hxx | 6
unotools/inc/unotools/tempfile.hxx | 1
unotools/prj/build.lst | 2
unotools/source/config/configmgr.cxx | 56
unotools/source/config/fontcfg.cxx | 40
unotools/source/config/regoptions.cxx | 51
unotools/source/config/saveopt.cxx | 1
unotools/source/i18n/localedatawrapper.cxx | 42
unotools/source/ucbhelper/tempfile.cxx | 12
unotools/source/ucbhelper/ucblockbytes.cxx | 68
unotools/source/ucbhelper/xtempfile.cxx | 14
unotools/util/utl.component | 2
vcl/Library_desktop_detector.mk | 6
vcl/Library_vcl.mk | 145
vcl/Library_vclplug_gen.mk | 23
vcl/Library_vclplug_gtk.mk | 6
vcl/Library_vclplug_gtk3.mk | 6
vcl/Library_vclplug_kde.mk | 6
vcl/Library_vclplug_kde4.mk | 6
vcl/Library_vclplug_svp.mk | 6
vcl/StaticLibrary_vclmain.mk | 15
vcl/aqua/source/a11y/aqua11yactionwrapper.mm | 3
vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm | 3
vcl/aqua/source/a11y/aqua11yfactory.mm | 3
vcl/aqua/source/a11y/aqua11yrolehelper.mm | 7
vcl/aqua/source/a11y/aqua11yselectionwrapper.mm | 3
vcl/aqua/source/a11y/aqua11ytablewrapper.mm | 3
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 3
vcl/aqua/source/a11y/aqua11ytextwrapper.mm | 3
vcl/aqua/source/a11y/aqua11yutil.mm | 3
vcl/aqua/source/a11y/aqua11yvaluewrapper.mm | 3
vcl/aqua/source/a11y/aqua11ywrapper.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperbutton.mm | 3
vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm | 3
vcl/aqua/source/a11y/aqua11ywrappercombobox.mm | 3
vcl/aqua/source/a11y/aqua11ywrappergroup.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperlist.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperrow.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm | 3
vcl/aqua/source/a11y/aqua11ywrappersplitter.mm | 3
vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm | 3
vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm | 3
vcl/aqua/source/a11y/aqua11ywrappertextarea.mm | 3
vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm | 3
vcl/aqua/source/app/salnstimer.mm | 2
vcl/aqua/source/app/vclnsapp.mm | 6
vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 3
vcl/aqua/source/gdi/aquaprintview.mm | 3
vcl/aqua/source/gdi/salatslayout.cxx | 2
vcl/aqua/source/gdi/salbmp.cxx | 2
vcl/aqua/source/window/salframeview.mm | 2
vcl/aqua/source/window/salnsmenu.mm | 2
vcl/inc/android/svsys.h | 36
vcl/inc/impgraph.hxx | 2
vcl/inc/ios/iosvcltypes.h | 37
vcl/inc/ios/salbmp.h | 117
vcl/inc/ios/salcolorutils.hxx | 46
vcl/inc/ios/saldata.hxx | 126
vcl/inc/ios/salframe.h | 208
vcl/inc/ios/salframeview.h | 144
vcl/inc/ios/salgdi.h | 401
vcl/inc/ios/salinst.h | 199
vcl/inc/ios/salmathutils.hxx | 90
vcl/inc/ios/salmenu.h | 122
vcl/inc/ios/salnstimer.h | 43
vcl/inc/ios/salobj.h | 86
vcl/inc/ios/salprn.h | 173
vcl/inc/ios/salsys.h | 56
vcl/inc/ios/saltimer.h | 54
vcl/inc/ios/saluimenu.h | 62
vcl/inc/ios/salvd.h | 79
vcl/inc/ios/svsys.h | 36
vcl/inc/ios/vcluiapp.h | 53
vcl/inc/list.h | 3
vcl/inc/sallayout.hxx | 1
vcl/inc/saltimer.hxx | 3
vcl/inc/svsys.h | 7
vcl/inc/unx/Xproto.h | 3
vcl/inc/unx/gtk/gtkdata.hxx | 3
vcl/inc/unx/gtk/gtkframe.hxx | 1
vcl/inc/unx/gtk/gtkgdi.hxx | 3
vcl/inc/unx/headless/svpbmp.hxx | 72
vcl/inc/unx/headless/svpdummies.hxx | 100
vcl/inc/unx/headless/svpelement.hxx | 49
vcl/inc/unx/headless/svpframe.hxx | 132
vcl/inc/unx/headless/svpgdi.hxx | 174
vcl/inc/unx/headless/svpinst.hxx | 204
vcl/inc/unx/headless/svpprn.hxx | 57
vcl/inc/unx/headless/svppspgraphics.hxx | 189
vcl/inc/unx/headless/svpvd.hxx | 62
vcl/inc/unx/salbmp.h | 294
vcl/inc/unx/saldata.hxx | 3
vcl/inc/unx/saldisp.hxx | 7
vcl/inc/unx/x11_cursors/salcursors.h | 3
vcl/inc/vcl/accel.hxx | 16
vcl/inc/vcl/animate.hxx | 249
vcl/inc/vcl/bitmap.hxx | 2
vcl/inc/vcl/canvastools.hxx | 5
vcl/inc/vcl/displayconnectiondispatch.hxx | 3
vcl/inc/vcl/field.hxx | 19
vcl/inc/vcl/fontmanager.hxx | 2
vcl/inc/vcl/gdimtf.hxx | 1
vcl/inc/vcl/graph.hxx | 3
vcl/inc/vcl/graphictools.hxx | 12
vcl/inc/vcl/help.hxx | 2
vcl/inc/vcl/image.hxx | 3
vcl/inc/vcl/outdev.hxx | 25
vcl/inc/vcl/ppdparser.hxx | 10
vcl/inc/vcl/print.hxx | 6
vcl/inc/vcl/quickselectionengine.hxx | 3
vcl/inc/vcl/rendergraphic.hxx | 3
vcl/inc/vcl/rendergraphicrasterizer.hxx | 3
vcl/inc/vcl/settings.hxx | 1
vcl/inc/vcl/strhelper.hxx | 14
vcl/inc/vcl/svapp.hxx | 54
vcl/inc/vcl/svgread.hxx | 1
vcl/inc/vcl/syschild.hxx | 1
vcl/inc/vcl/sysdata.hxx | 23
vcl/inc/vcl/syswin.hxx | 8
vcl/inc/vcl/tabctrl.hxx | 3
vcl/inc/vcl/taskpanelist.hxx | 1
vcl/inc/vcl/threadex.hxx | 18
vcl/inc/vcl/throbber.hxx | 2
vcl/inc/vcl/toolbox.hxx | 31
vcl/inc/vcl/wall.hxx | 3
vcl/inc/vcl/window.hxx | 1
vcl/inc/win/saldata.hxx | 2
vcl/inc/win/salprn.h | 3
vcl/ios/source/app/saldata.cxx | 128
vcl/ios/source/app/salinst.cxx | 828 ++
vcl/ios/source/app/salnstimer.mm | 59
vcl/ios/source/app/salsys.cxx | 253
vcl/ios/source/app/saltimer.cxx | 104
vcl/ios/source/app/vcluiapp.mm | 101
vcl/null/printerinfomanager.cxx | 51
vcl/prj/build.lst | 2
vcl/source/app/help.cxx | 28
vcl/source/app/settings.cxx | 40
vcl/source/app/svapp.cxx | 147
vcl/source/app/svdata.cxx | 17
vcl/source/app/svmainhook.cxx | 78
vcl/source/components/factory.cxx | 11
vcl/source/components/makefile.mk | 55
vcl/source/components/rasterizer_rsvg.cxx | 139
vcl/source/components/stringmirror.cxx | 3
vcl/source/control/field2.cxx | 210
vcl/source/control/quickselectionengine.cxx | 3
vcl/source/control/tabctrl.cxx | 30
vcl/source/control/throbber.cxx | 3
vcl/source/fontsubset/cff.cxx | 15
vcl/source/fontsubset/gsub.cxx | 4
vcl/source/fontsubset/list.c | 33
vcl/source/gdi/animate.cxx | 291
vcl/source/gdi/cvtsvm.cxx | 10
vcl/source/gdi/gdimtf.cxx | 1
vcl/source/gdi/graph.cxx | 7
vcl/source/gdi/graphictools.cxx | 20
vcl/source/gdi/image.cxx | 39
vcl/source/gdi/impgraph.cxx | 7
vcl/source/gdi/makefile.mk | 127
vcl/source/gdi/metaact.cxx | 1
vcl/source/gdi/pdfwriter_impl2.cxx | 3
vcl/source/gdi/print.cxx | 66
vcl/source/gdi/print2.cxx | 43
vcl/source/gdi/print3.cxx | 4
vcl/source/gdi/region.cxx | 28
vcl/source/gdi/rendergraphic.cxx | 3
vcl/source/gdi/rendergraphicrasterizer.cxx | 3
vcl/source/gdi/sallayout.cxx | 85
vcl/source/gdi/svgread.cxx | 3
vcl/source/gdi/wall.cxx | 42
vcl/source/helper/canvastools.cxx | 17
vcl/source/helper/strhelper.cxx | 29
vcl/source/helper/threadex.cxx | 40
vcl/source/salmain/salmain.cxx | 2
vcl/source/window/accel.cxx | 273
vcl/source/window/dndlcon.cxx | 30
vcl/source/window/floatwin.cxx | 17
vcl/source/window/menu.cxx | 2
vcl/source/window/syschild.cxx | 13
vcl/source/window/syswin.cxx | 169
vcl/source/window/taskpanelist.cxx | 35
vcl/source/window/toolbox.cxx | 209
vcl/source/window/toolbox2.cxx | 182
vcl/source/window/window.cxx | 22
vcl/source/window/window2.cxx | 5
vcl/source/window/window4.cxx | 2
vcl/source/window/wpropset.cxx | 3
vcl/unx/generic/app/i18n_xkb.cxx | 34
vcl/unx/generic/app/keysymnames.cxx | 6
vcl/unx/generic/app/saldisp.cxx | 40
vcl/unx/generic/app/wmadaptor.cxx | 30
vcl/unx/generic/fontmanager/fontcache.cxx | 121
vcl/unx/generic/fontmanager/fontconfig.cxx | 722 -
vcl/unx/generic/fontmanager/fontmanager.cxx | 81
vcl/unx/generic/gdi/salbmp.cxx | 400
vcl/unx/generic/gdi/salgdi3.cxx | 325
vcl/unx/generic/gdi/salprnpsp.cxx | 20
vcl/unx/generic/plugadapt/salplug.cxx | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/generic/printer/jobdata.cxx | 69
vcl/unx/generic/printer/ppdparser.cxx | 45
vcl/unx/generic/printer/printerinfomanager.cxx | 41
vcl/unx/generic/printergfx/common_gfx.cxx | 2
vcl/unx/generic/printergfx/printerjob.cxx | 11
vcl/unx/generic/window/salframe.cxx | 2
vcl/unx/gtk/a11y/atkutil.cxx | 136
vcl/unx/gtk/app/gtkdata.cxx | 75
vcl/unx/gtk/app/gtksys.cxx | 25
vcl/unx/gtk/window/gtkframe.cxx | 13
vcl/unx/gtk3/a11y/gtk3atkaction.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkbridge.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkfactory.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkimage.cxx | 3
vcl/unx/gtk3/a11y/gtk3atklistener.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkregistry.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkselection.cxx | 3
vcl/unx/gtk3/a11y/gtk3atktable.cxx | 3
vcl/unx/gtk3/a11y/gtk3atktext.cxx | 3
vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkutil.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkvalue.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkwindow.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx | 3
vcl/unx/gtk3/app/gtk3gtkdata.cxx | 3
vcl/unx/gtk3/app/gtk3gtkinst.cxx | 3
vcl/unx/gtk3/app/gtk3gtksys.cxx | 3
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 6
vcl/unx/gtk3/window/gtk3gtkframe.cxx | 3
vcl/unx/gtk3/window/gtk3gtkobject.cxx | 3
vcl/unx/headless/svpbmp.cxx | 2
vcl/unx/headless/svpbmp.hxx | 72
vcl/unx/headless/svpdummies.cxx | 4
vcl/unx/headless/svpdummies.hxx | 100
vcl/unx/headless/svpelement.cxx | 8
vcl/unx/headless/svpelement.hxx | 49
vcl/unx/headless/svpframe.cxx | 6
vcl/unx/headless/svpframe.hxx | 132
vcl/unx/headless/svpgdi.cxx | 6
vcl/unx/headless/svpgdi.hxx | 174
vcl/unx/headless/svpinst.cxx | 10
vcl/unx/headless/svpinst.hxx | 204
vcl/unx/headless/svpprn.cxx | 6
vcl/unx/headless/svpprn.hxx | 57
vcl/unx/headless/svppspgraphics.cxx | 12
vcl/unx/headless/svppspgraphics.hxx | 189
vcl/unx/headless/svptext.cxx | 6
vcl/unx/headless/svpvd.cxx | 4
vcl/unx/headless/svpvd.hxx | 62
vcl/unx/kde4/KDESalFrame.cxx | 2
vcl/util/makefile.mk | 465 -
vcl/vcl.android.component | 43
vcl/vcl.ios.component | 43
vcl/vcl.macosx.component | 2
vcl/vcl.unx.component | 2
vcl/vcl.windows.component | 2
vcl/win/source/app/salinst.cxx | 19
vcl/win/source/app/saltimer.cxx | 7
vcl/win/source/gdi/salgdi_gdiplus.cxx | 104
vcl/win/source/gdi/salprn.cxx | 752 -
vcl/win/source/gdi/winlayout.cxx | 6
vcl/win/source/src/salsrc.rc | 167
vcl/win/source/window/salframe.cxx | 195
vcl/workben/makefile.mk | 4
vcl/workben/svdem.cxx | 2
vcl/workben/vcldemo.cxx | 2
653 files changed, 12586 insertions(+), 22283 deletions(-)
New commits:
commit bc5dd970bf3cffc97e28b6c966083617f1b2d805
Merge: 4001f42... ee748b2...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:56:16 2011 +0200
resyncing to master
diff --cc basebmp/inc/basebmp/bitmapdevice.hxx
index 2502b67,addecb1..0fc0933
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@@ -646,9 -647,10 +654,10 @@@ private
/** Factory method to create a BitmapDevice for given scanline format
*/
-BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
+BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
bool bTopDown,
- sal_Int32 nScanlineFormat );
+ sal_Int32 nScanlineFormat,
+ BitmapDeviceDamageTracker* pDamage = NULL );
/** Factory method to create a BitmapDevice for given scanline format
with the given palette
diff --cc basegfx/prj/build.lst
index ed12d71,8d55325..ab5cf9b
--- a/basegfx/prj/build.lst
+++ b/basegfx/prj/build.lst
@@@ -1,3 -1,18 +1,3 @@@
- fx basegfx : o3tl sal offuh cppuhelper cppu CPPUNIT:cppunit NULL
+ fx basegfx : o3tl sal offapi comphelper cppuhelper cppu CPPUNIT:cppunit NULL
-fx basegfx usr1 - all fx_mkout NULL
-fx basegfx\inc nmake - all fx_inc NULL
-fx basegfx\prj get - all fx_prj NULL
-fx basegfx\source\curve nmake - all fx_curve fx_inc NULL
-fx basegfx\source\matrix nmake - all fx_matrix fx_inc NULL
-fx basegfx\source\numeric nmake - all fx_numeric fx_inc NULL
-fx basegfx\source\point nmake - all fx_point fx_inc NULL
-fx basegfx\source\polygon nmake - all fx_polygon fx_inc NULL
-fx basegfx\source\range nmake - all fx_range fx_inc NULL
-fx basegfx\source\tuple nmake - all fx_tuple fx_inc NULL
-fx basegfx\source\tools nmake - all fx_tools fx_inc NULL
-fx basegfx\source\vector nmake - all fx_vector fx_inc NULL
-fx basegfx\source\color nmake - all fx_color fx_inc NULL
-fx basegfx\source\pixel nmake - all fx_pixel fx_inc NULL
-fx basegfx\source\raster nmake - all fx_raster fx_inc NULL
-fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector fx_color fx_pixel fx_raster NULL
-fx basegfx\test nmake - all fx_tests fx_util NULL
+fx basegfx\prj nmake - all fx_prj NULL
+
diff --cc basegfx/prj/d.lst
index e69de29,4c71015..997a233
--- a/basegfx/prj/d.lst
+++ b/basegfx/prj/d.lst
@@@ -1,0 -1,113 +1,1 @@@
+ ..\inc\basegfx\tools\unotools.hxx %_DEST%\inc\basegfx\tools\unotools.hxx
-..\%__SRC%\lib\ibasegfx.lib %_DEST%\lib\ibasegfx.lib
-..\%__SRC%\lib\basegfx_s.lib %_DEST%\lib\basegfx_s.lib
-
-..\%__SRC%\bin\basegfx?????.dll %_DEST%\bin\basegfx?????.dll
-..\%__SRC%\bin\bgfx*.dll %_DEST%\bin\bgfx*.dll
-
-..\%__SRC%\lib\libbasegfx*.* %_DEST%\lib\libbasegfx*.*
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-
-mkdir: %_DEST%\inc\basegfx
-
-mkdir: %_DEST%\inc\basegfx\matrix
-..\inc\basegfx\matrix\b2dhommatrix.hxx %_DEST%\inc\basegfx\matrix\b2dhommatrix.hxx
-..\inc\basegfx\matrix\b2dhommatrixtools.hxx %_DEST%\inc\basegfx\matrix\b2dhommatrixtools.hxx
-..\inc\basegfx\matrix\b3dhommatrix.hxx %_DEST%\inc\basegfx\matrix\b3dhommatrix.hxx
-
-mkdir: %_DEST%\inc\basegfx\point
-..\inc\basegfx\point\b2dpoint.hxx %_DEST%\inc\basegfx\point\b2dpoint.hxx
-..\inc\basegfx\point\b3dpoint.hxx %_DEST%\inc\basegfx\point\b3dpoint.hxx
-..\inc\basegfx\point\b2ipoint.hxx %_DEST%\inc\basegfx\point\b2ipoint.hxx
-..\inc\basegfx\point\b3ipoint.hxx %_DEST%\inc\basegfx\point\b3ipoint.hxx
-..\inc\basegfx\point\b2dhompoint.hxx %_DEST%\inc\basegfx\point\b2dhompoint.hxx
-
-mkdir: %_DEST%\inc\basegfx\range
-..\inc\basegfx\range\rangeexpander.hxx %_DEST%\inc\basegfx\range\rangeexpander.hxx
-..\inc\basegfx\range\basicrange.hxx %_DEST%\inc\basegfx\range\basicrange.hxx
-..\inc\basegfx\range\basicbox.hxx %_DEST%\inc\basegfx\range\basicbox.hxx
-..\inc\basegfx\range\b1drange.hxx %_DEST%\inc\basegfx\range\b1drange.hxx
-..\inc\basegfx\range\b2dpolyrange.hxx %_DEST%\inc\basegfx\range\b2dpolyrange.hxx
-..\inc\basegfx\range\b2drange.hxx %_DEST%\inc\basegfx\range\b2drange.hxx
-..\inc\basegfx\range\b2drectangle.hxx %_DEST%\inc\basegfx\range\b2drectangle.hxx
-..\inc\basegfx\range\b2dconnectedranges.hxx %_DEST%\inc\basegfx\range\b2dconnectedranges.hxx
-..\inc\basegfx\range\b3drange.hxx %_DEST%\inc\basegfx\range\b3drange.hxx
-..\inc\basegfx\range\b3dvolume.hxx %_DEST%\inc\basegfx\range\b3dvolume.hxx
-..\inc\basegfx\range\b1irange.hxx %_DEST%\inc\basegfx\range\b1irange.hxx
-..\inc\basegfx\range\b2irange.hxx %_DEST%\inc\basegfx\range\b2irange.hxx
-..\inc\basegfx\range\b2irectangle.hxx %_DEST%\inc\basegfx\range\b2irectangle.hxx
-..\inc\basegfx\range\b3irange.hxx %_DEST%\inc\basegfx\range\b3irange.hxx
-..\inc\basegfx\range\b3ivolume.hxx %_DEST%\inc\basegfx\range\b3ivolume.hxx
-..\inc\basegfx\range\b1ibox.hxx %_DEST%\inc\basegfx\range\b1ibox.hxx
-..\inc\basegfx\range\b2ibox.hxx %_DEST%\inc\basegfx\range\b2ibox.hxx
-..\inc\basegfx\range\b3ibox.hxx %_DEST%\inc\basegfx\range\b3ibox.hxx
-
-mkdir: %_DEST%\inc\basegfx\vector
-..\inc\basegfx\vector\b2dvector.hxx %_DEST%\inc\basegfx\vector\b2dvector.hxx
-..\inc\basegfx\vector\b2enums.hxx %_DEST%\inc\basegfx\vector\b2enums.hxx
-..\inc\basegfx\vector\b2dsize.hxx %_DEST%\inc\basegfx\vector\b2dsize.hxx
-..\inc\basegfx\vector\b3dvector.hxx %_DEST%\inc\basegfx\vector\b3dvector.hxx
-..\inc\basegfx\vector\b3dsize.hxx %_DEST%\inc\basegfx\vector\b3dsize.hxx
-..\inc\basegfx\vector\b2ivector.hxx %_DEST%\inc\basegfx\vector\b2ivector.hxx
-..\inc\basegfx\vector\b2isize.hxx %_DEST%\inc\basegfx\vector\b2isize.hxx
-..\inc\basegfx\vector\b3ivector.hxx %_DEST%\inc\basegfx\vector\b3ivector.hxx
-..\inc\basegfx\vector\b3isize.hxx %_DEST%\inc\basegfx\vector\b3isize.hxx
-
-mkdir: %_DEST%\inc\basegfx\curve
-..\inc\basegfx\curve\b2dcubicbezier.hxx %_DEST%\inc\basegfx\curve\b2dcubicbezier.hxx
-..\inc\basegfx\curve\b2dquadraticbezier.hxx %_DEST%\inc\basegfx\curve\b2dquadraticbezier.hxx
-..\inc\basegfx\curve\b2dbeziertools.hxx %_DEST%\inc\basegfx\curve\b2dbeziertools.hxx
-
-mkdir: %_DEST%\inc\basegfx\numeric
-..\inc\basegfx\numeric\ftools.hxx %_DEST%\inc\basegfx\numeric\ftools.hxx
-
-mkdir: %_DEST%\inc\basegfx\polygon
-..\inc\basegfx\polygon\b2dpolygon.hxx %_DEST%\inc\basegfx\polygon\b2dpolygon.hxx
-..\inc\basegfx\polygon\b2dpolypolygon.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygon.hxx
-..\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx
-..\inc\basegfx\polygon\b2dpolygontools.hxx %_DEST%\inc\basegfx\polygon\b2dpolygontools.hxx
-..\inc\basegfx\polygon\b2dpolypolygontools.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygontools.hxx
-..\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx
-..\inc\basegfx\polygon\b2dlinegeometry.hxx %_DEST%\inc\basegfx\polygon\b2dlinegeometry.hxx
-..\inc\basegfx\polygon\b2dpolygonclipper.hxx %_DEST%\inc\basegfx\polygon\b2dpolygonclipper.hxx
-..\inc\basegfx\polygon\b2dpolygontriangulator.hxx %_DEST%\inc\basegfx\polygon\b2dpolygontriangulator.hxx
-..\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx %_DEST%\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx
-..\inc\basegfx\polygon\b2dpolypolygoncutter.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygoncutter.hxx
-..\inc\basegfx\polygon\b2dtrapezoid.hxx %_DEST%\inc\basegfx\polygon\b2dtrapezoid.hxx
-..\inc\basegfx\polygon\b3dpolygon.hxx %_DEST%\inc\basegfx\polygon\b3dpolygon.hxx
-..\inc\basegfx\polygon\b3dpolypolygon.hxx %_DEST%\inc\basegfx\polygon\b3dpolypolygon.hxx
-..\inc\basegfx\polygon\b3dpolygontools.hxx %_DEST%\inc\basegfx\polygon\b3dpolygontools.hxx
-..\inc\basegfx\polygon\b3dpolypolygontools.hxx %_DEST%\inc\basegfx\polygon\b3dpolypolygontools.hxx
-..\inc\basegfx\polygon\b3dpolygonclipper.hxx %_DEST%\inc\basegfx\polygon\b3dpolygonclipper.hxx
-
-mkdir: %_DEST%\inc\basegfx\tuple
-..\inc\basegfx\tuple\b2dtuple.hxx %_DEST%\inc\basegfx\tuple\b2dtuple.hxx
-..\inc\basegfx\tuple\b3dtuple.hxx %_DEST%\inc\basegfx\tuple\b3dtuple.hxx
-..\inc\basegfx\tuple\b2ituple.hxx %_DEST%\inc\basegfx\tuple\b2ituple.hxx
-..\inc\basegfx\tuple\b3ituple.hxx %_DEST%\inc\basegfx\tuple\b3ituple.hxx
-..\inc\basegfx\tuple\b2i64tuple.hxx %_DEST%\inc\basegfx\tuple\b2i64tuple.hxx
-..\inc\basegfx\tuple\b3i64tuple.hxx %_DEST%\inc\basegfx\tuple\b3i64tuple.hxx
-
-mkdir: %_DEST%\inc\basegfx\tools
-..\inc\basegfx\tools\canvastools.hxx %_DEST%\inc\basegfx\tools\canvastools.hxx
-..\inc\basegfx\tools\keystoplerp.hxx %_DEST%\inc\basegfx\tools\keystoplerp.hxx
-..\inc\basegfx\tools\lerp.hxx %_DEST%\inc\basegfx\tools\lerp.hxx
-..\inc\basegfx\tools\unopolypolygon.hxx %_DEST%\inc\basegfx\tools\unopolypolygon.hxx
-..\inc\basegfx\tools\b2dclipstate.hxx %_DEST%\inc\basegfx\tools\b2dclipstate.hxx
-..\inc\basegfx\tools\rectcliptools.hxx %_DEST%\inc\basegfx\tools\rectcliptools.hxx
-..\inc\basegfx\tools\tools.hxx %_DEST%\inc\basegfx\tools\tools.hxx
-..\inc\basegfx\tools\gradienttools.hxx %_DEST%\inc\basegfx\tools\gradienttools.hxx
-
-mkdir: %_DEST%\inc\basegfx\color
-..\inc\basegfx\color\bcolor.hxx %_DEST%\inc\basegfx\color\bcolor.hxx
-..\inc\basegfx\color\bcolortools.hxx %_DEST%\inc\basegfx\color\bcolortools.hxx
-..\inc\basegfx\color\bcolormodifier.hxx %_DEST%\inc\basegfx\color\bcolormodifier.hxx
-
-mkdir: %_DEST%\inc\basegfx\pixel
-..\inc\basegfx\pixel\bpixel.hxx %_DEST%\inc\basegfx\pixel\bpixel.hxx
-..\inc\basegfx\pixel\bzpixel.hxx %_DEST%\inc\basegfx\pixel\bzpixel.hxx
-
-mkdir: %_DEST%\inc\basegfx\raster
-..\inc\basegfx\raster\bpixelraster.hxx %_DEST%\inc\basegfx\raster\bpixelraster.hxx
-..\inc\basegfx\raster\bzpixelraster.hxx %_DEST%\inc\basegfx\raster\bzpixelraster.hxx
-..\inc\basegfx\raster\rasterconvert3d.hxx %_DEST%\inc\basegfx\raster\rasterconvert3d.hxx
diff --cc canvas/prj/build.lst
index 79acfc9,dad6e28..7d6a51b
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@@ -1,3 -1,10 +1,3 @@@
- cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
+ cv canvas : javaunohelper comphelper cppuhelper offapi unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
-cv canvas usr1 - all cv_mkout NULL
-cv canvas\inc nmake - all cv_inc NULL
-cv canvas\source\tools nmake - all cv_tools cv_inc NULL
-cv canvas\source\vcl nmake - all cv_vcl cv_tools cv_inc NULL
-cv canvas\source\simplecanvas nmake - all cv_simplecanvas cv_tools cv_inc NULL
-cv canvas\source\cairo nmake - all cv_cairo cv_tools cv_inc NULL
-cv canvas\source\directx nmake - w cv_directx cv_tools cv_inc NULL
-cv canvas\source\null nmake - all cv_null cv_tools cv_inc NULL
-cv canvas\source\factory nmake - all cv_factory cv_inc NULL
+cv canvas\prj nmake - all cv_prj NULL
+
diff --cc canvas/prj/d.lst
index e69de29,933e114..cde5ebe
--- a/canvas/prj/d.lst
+++ b/canvas/prj/d.lst
@@@ -1,0 -1,34 +1,1 @@@
+ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\bin\canvasto*.dll %_DEST%\bin\canvasto*.dll
-..\%__SRC%\bin\cairocan*.dll %_DEST%\bin\cairocan*.dll
-..\%__SRC%\bin\directx*.dll %_DEST%\bin\directx*.dll
-..\%__SRC%\bin\gdiplus*.dll %_DEST%\bin\gdiplus*.dll
-..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin\vclcanva*.dll
-..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin\nullcanv*.dll
-..\%__SRC%\bin\simpleca*.dll %_DEST%\bin\simpleca*.dll
-..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin\canvasfa*.dll
-..\%__SRC%\lib\icanvastools.lib %_DEST%\lib\icanvastools.lib
-..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib\
-..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib\cairocanvas.uno.so
-..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib\vclcanvas.uno.so
-..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib\nullcanvas.uno.so
-..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib\simplecanvas.uno.so
-..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib\canvasfactory.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin\javacanvas.uno.jar
-..\%__SRC%\misc\cairocanvas.component %_DEST%\xml\cairocanvas.component
-
-mkdir: %_DEST%\inc\canvas\base
-..\inc\canvas\base\*.hxx %_DEST%\inc\canvas\base\*.hxx
-
-mkdir: %_DEST%\inc\canvas\rendering
-..\inc\canvas\rendering\*.hxx %_DEST%\inc\canvas\rendering\*.hxx
-
-mkdir: %_DEST%\inc\canvas
-..\inc\canvas\*.hxx %_DEST%\inc\canvas\*.hxx
-..\%__SRC%\misc\canvasfactory.component %_DEST%\xml\canvasfactory.component
-..\%__SRC%\misc\directx5canvas.component %_DEST%\xml\directx5canvas.component
-..\%__SRC%\misc\directx9canvas.component %_DEST%\xml\directx9canvas.component
-..\%__SRC%\misc\gdipluscanvas.component %_DEST%\xml\gdipluscanvas.component
-..\%__SRC%\misc\simplecanvas.component %_DEST%\xml\simplecanvas.component
-..\%__SRC%\misc\vclcanvas.component %_DEST%\xml\vclcanvas.component
diff --cc comphelper/Library_comphelp.mk
index d000788,64c58cc..acacafc
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@@ -37,10 -37,10 +37,9 @@@ $(eval $(call gb_Library_set_include,co
-I$(realpath $(SRCDIR)/comphelper/inc/pch) \
-I$(realpath $(SRCDIR)/comphelper/source/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,comphelper,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,comphelper,\
-DCOMPHELPER_DLLIMPLEMENTATION \
))
diff --cc cppcanvas/prj/build.lst
index 2e42309,143af13..bab151c
--- a/cppcanvas/prj/build.lst
+++ b/cppcanvas/prj/build.lst
@@@ -1,2 -1,8 +1,2 @@@
- cx cppcanvas : comphelper cppuhelper offuh tools vcl basegfx canvas NULL
+ cx cppcanvas : comphelper cppuhelper offapi tools vcl basegfx canvas NULL
-cx cppcanvas usr1 - all cx_mkout NULL
-cx cppcanvas\inc nmake - all cx_inc NULL
-cx cppcanvas\source\tools nmake - all cx_tools cx_inc NULL
-cx cppcanvas\source\wrapper nmake - all cx_wrapper cx_inc NULL
-cx cppcanvas\source\mtfrenderer nmake - all cx_mtfrenderer cx_inc NULL
-cx cppcanvas\util nmake - all cx_util cx_tools cx_wrapper cx_mtfrenderer NULL
-cx cppcanvas\source\uno nmake - all cx_uno cx_tools cx_wrapper cx_mtfrenderer cx_util NULL
+cx cppcanvas\prj nmake - all cx_prj NULL
diff --cc padmin/Executable_spadmin.bin.mk
index eef72e1,4ec56f2..6b44b64
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@@ -30,9 -30,12 +30,8 @@@ $(eval $(call gb_Executable_Executable,
$(eval $(call gb_Executable_set_include,spadmin.bin,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
- $$(CXXFLAGS) \
-))
-
$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
vclmain \
))
diff --cc padmin/Library_spa.mk
index 8d19fe4,e72c676..87b08ac
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@@ -27,12 -27,8 +27,7 @@@
$(eval $(call gb_Library_Library,spa))
- $(eval $(call gb_Library_set_include,spa,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
- ))
-
-$(eval $(call gb_Library_set_defs,spa,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,spa,\
-DSPA_DLLIMPLEMENTATION \
))
diff --cc regexp/prj/d.lst
index e69de29,0408e36..3f38fbe
--- a/regexp/prj/d.lst
+++ b/regexp/prj/d.lst
@@@ -1,0 -1,9 +1,1 @@@
+ ..\%__SRC%\lib\libi18nregexp*.dll.a %_DEST%\lib\libi18nregexp*.dll.a
-mkdir: %_DEST%\inc\external\regexp
-
-..\source\reclass.hxx %_DEST%\inc\external\regexp\reclass.hxx
-
-..\%__SRC%\bin\i18nrege*.dll %_DEST%\bin\i18nrege*.dll
-..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib\libi18nregexp*.so
-..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib\libi18nregexp*.dylib
-..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib\ii18nregexp.lib
diff --cc sax/prj/build.lst
index 0a8a378,658ec97..940ef70
--- a/sax/prj/build.lst
+++ b/sax/prj/build.lst
@@@ -1,3 -1,7 +1,4 @@@
ax sax : offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL
-ax sax usr1 - all ax_mkout NULL
-ax sax\source\expatwrap nmake - all ax_expatwrap NULL
-ax sax\source\tools nmake - all ax_tools NULL
-ax sax\source\fastparser nmake - all ax_fastparser ax_expatwrap ax_tools NULL
-ax sax\qa\cppunit nmake - all ax_qa_cppunit ax_tools NULL
+ax sax\prj nmake - all ax_prj NULL
+
+ ax sax\test nmake - all ax_test NULL
diff --cc sax/prj/d.lst
index 7416200,12cd6cd..54fab39
--- a/sax/prj/d.lst
+++ b/sax/prj/d.lst
@@@ -1,1 -1,18 +1,2 @@@
+ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\misc\fastsax.component %_DEST%\xml\fastsax.component
-..\%__SRC%\misc\sax.component %_DEST%\xml\sax.component
-..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml\sax.inbuild.component
-
-mkdir: %_DEST%\inc\sax
-mkdir: %_DEST%\inc\sax\tools
-..\inc\sax\dllapi.h %_DEST%\inc\sax\dllapi.h
-..\inc\sax\fshelper.hxx %_DEST%\inc\sax\fshelper.hxx
-..\inc\sax\fastattribs.hxx %_DEST%\inc\sax\fastattribs.hxx
-..\inc\sax\tools\converter.hxx %_DEST%\inc\sax\tools\converter.hxx
..\inc\sax\tools\documenthandleradapter.hxx %_DEST%\inc\sax\tools\documenthandleradapter.hxx
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib\*.dylib; fi"
diff --cc sot/Library_sot.mk
index 79f9485,927fdc0..dc4d191
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@@ -36,10 -36,15 +36,14 @@@ $(eval $(call gb_Library_set_componentf
$(eval $(call gb_Library_set_include,sot,\
-I$(realpath $(SRCDIR)/sot/inc/pch) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+ ))
+
+ $(eval $(call gb_Library_add_api,sot,\
+ udkapi \
+ offapi \
))
-$(eval $(call gb_Library_set_defs,sot,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sot,\
-DSOT_DLLIMPLEMENTATION \
))
diff --cc svl/Library_svl.mk
index d1996dc,638ab9c..08988c4
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@@ -37,10 -37,16 +37,15 @@@ $(eval $(call gb_Library_set_include,sv
$$(SOLARINC) \
-I$(realpath $(SRCDIR)/svl/source/inc) \
-I$(realpath $(SRCDIR)/svl/inc/pch) \
- -I$(OUTDIR)/inc/offuh \
+ -I$(SRCDIR)/svl/inc/pch \
+ ))
+
+ $(eval $(call gb_Library_add_api,svl,\
+ udkapi \
+ offapi \
))
-$(eval $(call gb_Library_set_defs,svl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svl,\
-DSVL_DLLIMPLEMENTATION \
))
diff --cc svtools/Library_svt.mk
index 98f1128,c3dac5e..ea6a568
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@@ -42,11 -47,11 +47,10 @@@ $(eval $(call gb_Library_set_include,sv
-I$(realpath $(SRCDIR)/svtools/inc/svtools) \
-I$(realpath $(SRCDIR)/svtools/source/inc) \
-I$(realpath $(SRCDIR)/svtools/inc/pch) \
- -I$(OUTDIR)/inc/offuh \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
))
-$(eval $(call gb_Library_set_defs,svt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svt,\
-DSVT_DLLIMPLEMENTATION \
))
diff --cc toolkit/Library_tk.mk
index 6cae730,e07878f..c663330
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@@ -38,10 -38,10 +38,9 @@@ $(eval $(call gb_Library_set_include,tk
-I$(realpath $(SRCDIR)/toolkit/inc) \
-I$(realpath $(SRCDIR)/toolkit/inc/pch) \
-I$(realpath $(SRCDIR)/toolkit/source) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,tk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,tk,\
-DTOOLKIT_DLLIMPLEMENTATION \
))
@@@ -158,11 -163,15 +162,16 @@@ $(eval $(call gb_Library_add_exception_
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
- $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+$(eval $(call gb_Library_add_cxxflags,tk,\
+ $(gb_OBJCXXFLAGS) \
+))
endif
+ ifeq ($(GUIBASE),cocoatouch)
+ $(eval $(call gb_Library_set_cxxflags,tk,\
+ $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+ endif
+
ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
$(eval $(call gb_Library_add_linked_libs,tk,\
X11 \
diff --cc ucbhelper/prj/build.lst
index 2bc7d16,f971733..07a598c
--- a/ucbhelper/prj/build.lst
+++ b/ucbhelper/prj/build.lst
@@@ -1,3 -1,7 +1,3 @@@
- uh ucbhelper : offuh sal cppu cppuhelper salhelper NULL
+ uh ucbhelper : offapi sal cppu cppuhelper salhelper NULL
-uh ucbhelper usr1 - all uh_mkout NULL
-uh ucbhelper\inc nmake - all uh_inc NULL
-uh ucbhelper\source\client nmake - all uh_client uh_inc NULL
-uh ucbhelper\source\provider nmake - all uh_provider uh_inc NULL
-uh ucbhelper\util nmake - all uh_util uh_client uh_provider NULL
-uh ucbhelper\workben\myucp nmake - all uh_wb_myucp uh_util NULL
+uh ucbhelper\prj nmake - all uh_prj NULL
+
diff --cc unotools/Library_utl.mk
index 70647da,b77a8eb..75c5ab1
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@@ -45,17 -35,18 +45,21 @@@ $(eval $(call gb_Library_set_include,ut
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/unotools/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,utl,\
- $$(DEFS) \
+# add any additional definitions to be set for compilation here
+# (e.g. -DLIB_DLLIMPLEMENTATION)
+$(eval $(call gb_Library_add_defs,utl,\
-DUNOTOOLS_DLLIMPLEMENTATION \
))
+ $(eval $(call gb_Library_add_api,utl,\
+ offapi \
+ udkapi \
+ ))
+
+# add libraries to be linked to utl; again these names need to be given as
+# specified in Repository.mk
$(eval $(call gb_Library_add_linked_libs,utl,\
comphelper \
cppu \
diff --cc vcl/Library_vcl.mk
index fb7ab96,19c1c9e..7ca41ba
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@@ -28,11 -28,15 +28,15 @@@
$(eval $(call gb_Library_Library,vcl))
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+ else ifeq ($(GUIBASE),android)
+ $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android,vcl/vcl))
+ else ifeq ($(OS),IOS)
+ $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios,vcl/vcl))
else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
endif
$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
@@@ -48,8 -56,9 +56,9 @@@ $(eval $(call gb_Library_set_include,vc
-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
))
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ $$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
endif
@@@ -77,26 -94,11 +91,15 @@@ $(eval $(call gb_Library_add_linked_lib
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vcl,\
+ icule \
+ icuuc \
+)
+
- ifeq ($(GUIBASE),unx)
- $(eval $(call gb_Library_add_linked_libs,vcl,\
- freetype \
- ))
- endif
-
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
- $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+ $(gb_OBJCXXFLAGS) \
))
- ifeq ($(ENABLE_CAIRO),TRUE)
- $(eval $(call gb_Library_add_defs,vcl,\
- -DCAIRO \
- ))
- endif
$(eval $(call gb_Library_add_objcxxobjects,vcl,\
vcl/aqua/source/a11y/aqua11yactionwrapper \
vcl/aqua/source/a11y/aqua11ycomponentwrapper \
@@@ -172,14 -175,10 +175,9 @@@ $(eval $(call gb_Library_add_defs,vcl,
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
))
- ## handle fontconfig
- ifneq ($(ENABLE_FONTCONFIG),)
- $(eval $(call gb_Library_add_defs,vcl,\
- -DENABLE_FONTCONFIG \
- ))
## handle CUPS
ifneq ($(ENABLE_CUPS),)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_CUPS \
))
endif
@@@ -411,11 -436,15 +435,15 @@@ $(eval $(call gb_Library_add_exception_
vcl/source/window/wpropset \
vcl/source/window/wrkwin \
))
-
+ ifneq ($(OS),IOS)
+ $(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/salmain/salmain \
+ ))
+ endif
## handle Graphite
ifneq ($(ENABLE_GRAPHITE),)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+# add defines, graphite sources for all platforms
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_GRAPHITE \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
@@@ -434,10 -471,64 +462,66 @@@ $(eval $(call gb_Library_add_linked_lib
version \
))
endif
+
+$(call gb_Library_use_external,vcl,graphite)
endif
+ ## handle Cairo
+ ifneq ($(ENABLE_LIBRSVG),NO)
+
+ $(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/components/rasterizer_rsvg \
+ ))
+
+ $(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DENABLE_LIBRSVG \
+ ))
+ ifeq ($(SYSTEM_CAIRO),YES)
+ $(eval $(call gb_Library_set_cxxflags,vcl,\
+ $$(CXXFLAGS) \
+ $$(CAIRO_CFLAGS) \
+ -DSYSTEM_CAIRO \
+ ))
+
+ # CAIRO_LIBS contains both -L and -l options. Thes sets LDFLAGS which
+ # goes early into the linking command line before the object files. So
+ # on platforms where libraries are searched for symbols undefined at
+ # that point as they occur on the command line, it is pointless to
+ # search the cairo library at that point as no references to cairo
+ # entries have been read from object files yet.
+ $(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ $$(CAIRO_LIBS) \
+ ))
+
+ # Thus we also need to add cairo to the list of linked libs. These go
+ # after the object files on the linking command line.
+ $(eval $(call gb_Library_add_linked_libs,vcl,\
+ cairo \
+ ))
+
+ else
+ $(eval $(call gb_Library_add_linked_libs,vcl,\
+ cairo \
+ ))
+ ifeq ($(OS),LINUX)
+ $(eval $(call gb_Library_add_linked_libs,vcl,\
+ freetype \
+ fontconfig \
+ ))
+ endif
+ endif
+ endif
+
+ ifeq ($(GUIBASE),unx)
+ $(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ $$(FONTCONFIG_LIBS) \
+ $$(FREETYPE_LIBS) \
+ ))
+ endif
+
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vcl,\
dl \
@@@ -471,9 -565,17 +555,16 @@@ $(eval $(call gb_Library_add_libs,vcl,
endif
ifeq ($(OS),WNT)
+ ifeq ($(COM),MSC)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain at 12 \
))
+ endif
+ ifeq ($(COM),GCC)
+ $(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ ))
+ endif
$(eval $(call gb_Library_add_linked_libs,vcl,\
advapi32 \
gdi32 \
diff --cc vcl/Library_vclplug_gen.mk
index 95428ae,d195400..819d9ce
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@@ -58,11 -64,27 +62,27 @@@ $(eval $(call gb_Library_add_linked_lib
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_CAIRO),YES)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
- $$(CAIRO_CFLAGS) \
- -DSYSTEM_CAIRO \
+$(call gb_Library_use_externals,vclplug_gen,\
+ icule \
+ icuuc \
+)
+
+ ))
+ $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ $$(CAIRO_LIBS) \
+ ))
+ else
+ $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+ $$(CXXFLAGS) \
+ $$(FONTCONFIG_CFLAGS) \
+ $$(FREETYPE_CFLAGS) \
+ ))
+ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+ cairo \
+ ))
+ endif
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/app/i18n_cb \
vcl/unx/generic/app/i18n_ic \
@@@ -117,10 -140,10 +137,9 @@@ $(eval $(call gb_Library_add_defs,vclpl
-DVCLPLUG_GEN_IMPLEMENTATION \
))
-
## handle RandR
ifneq ($(ENABLE_RANDR),)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_RANDR \
))
ifeq ($(XRANDR_DLOPEN),FALSE)
diff --cc vcl/Library_vclplug_gtk.mk
index cf4ac76,da001a2..d9674f0
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@@ -59,7 -61,13 +58,12 @@@ $(eval $(call gb_Library_add_libs,vclpl
))
endif
+ $(eval $(call gb_Library_add_api,vclplug_gtk,\
+ offapi \
+ udkapi \
+ ))
+
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
$$(GTK_LIBS) \
$$(GTHREAD_LIBS) \
))
diff --cc vcl/Library_vclplug_kde.mk
index ddc4291,bcec467..e4586b8
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@@ -45,8 -45,14 +44,13 @@@ $(eval $(call gb_Library_add_defs,vclpl
-DVCLPLUG_KDE_IMPLEMENTATION \
))
+ $(eval $(call gb_Library_add_api,vclplug_kde,\
+ offapi \
+ udkapi \
+ ))
+
-$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
- $$(KDE_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+ $$(KDE_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
diff --cc vcl/Library_vclplug_kde4.mk
index 25695d9,c075ca3..bbc64aa
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@@ -48,8 -48,14 +47,13 @@@ $(eval $(call gb_Library_add_defs,vclpl
-DVCLPLUG_KDE4_IMPLEMENTATION \
))
+ $(eval $(call gb_Library_add_api,vclplug_kde4,\
+ offapi \
+ udkapi \
+ ))
+
-$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
- $$(KDE4_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+ $$(KDE4_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
diff --cc vcl/aqua/source/app/vclnsapp.mm
index fc4945e,e103a6b..2424d37
mode 100755,100644..100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
commit ee748b288e7c04e52fd5d9b1798149236adb99f5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jul 21 10:50:29 2011 +0200
callcatcher: clean up Dir and DirEntry
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index c379c05..bd76d57 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -290,7 +290,6 @@ public:
void SetExtension( const String& rExt, char cSep = '.' );
String GetExtension( char cSep = '.' ) const;
- String CutExtension( char cSep = '.' );
void SetName( const String& rName, FSysPathStyle eFormatter = FSYS_STYLE_HOST );
inline const String GetNameDirect() const { return String(aName, osl_getThreadTextEncoding()); }
String GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const;
@@ -336,7 +335,6 @@ public:
sal_Bool operator !=( const DirEntry& rAnotherDir ) const
{ return !(DirEntry::operator==( rAnotherDir )); }
- StringCompare NameCompare( const DirEntry &rWith ) const;
inline StringCompare NameCompareDirect( const DirEntry &rWith ) const
{
#ifdef UNX
@@ -447,12 +445,8 @@ protected:
#endif
public:
- Dir();
Dir( const DirEntry& rDirEntry,
DirEntryKind nKind = FSYS_KIND_ALL );
- Dir( const DirEntry& rDirEntry,
- DirEntryKind nKind,
- FSysSort nSort, ... );
~Dir();
void Reset();
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 0e8f37e..ea3db76 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1135,31 +1135,6 @@ String DirEntry::CutName( FSysPathStyle eStyle )
/*************************************************************************
|*
-|* DirEntry::NameCompare
-|*
-|* Beschreibung Vergleich nur die Namen (ohne Pfad, aber mit Gross/Klein)
-|*
-*************************************************************************/
-
-StringCompare DirEntry::NameCompare( const DirEntry &rWith ) const
-{
- ByteString aThisName;
- ByteString aParameterName;
-
-#ifdef UNX
- aThisName = aName;
- aParameterName = rWith.aName;
-#else
- aThisName = ByteString(aName).ToLowerAscii();
- aParameterName = ByteString(rWith.aName).ToLowerAscii();
-#endif
-
- return aThisName.CompareTo( aParameterName );
-}
-
-
-/*************************************************************************
-|*
|* DirEntry::operator==()
|*
*************************************************************************/
@@ -1375,31 +1350,6 @@ void DirEntry::SetExtension( const String& rExtension, char cSep )
/*************************************************************************
|*
-|* DirEntry::CutExtension()
-|*
-*************************************************************************/
-
-String DirEntry::CutExtension( char cSep )
-{
- DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
- const char *p0 = ( aName.GetBuffer() );
- const char *p1 = p0 + aName.Len() - 1;
- while ( p1 >= p0 && *p1 != cSep )
- p1--;
-
- if ( p1 >= p0 )
- {
- // es wurde ein cSep an der Position p1 gefunden
- aName.Erase( static_cast< xub_StrLen >(p1-p0) );
- return String(p1 + 1, osl_getThreadTextEncoding());
- }
-
- return String();
-}
-
-/*************************************************************************
-|*
|* DirEntry::SetName()
|*
*************************************************************************/
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index faedb70..f20a58e 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -386,27 +386,6 @@ sal_uInt16 Dir::Scan( sal_uInt16 nCount )
|*
*************************************************************************/
-Dir::Dir( const DirEntry& rDirEntry, DirEntryKind nKindFlags, FSysSort nSort, ... ):
- DirEntry( rDirEntry ),
- pReader( 0 )
-{
- DBG_CTOR( Dir, NULL );
-
- Construct( nKindFlags );
-
- std::va_list pArgs;
- va_start( pArgs, nSort );
- ImpSetSort( pArgs, nSort );
-
- Reset();
-}
-
-/*************************************************************************
-|*
-|* Dir::Dir()
-|*
-*************************************************************************/
-
Dir::Dir( const DirEntry& rDirEntry, DirEntryKind nKindFlags ):
DirEntry( rDirEntry ),
pReader( 0 )
@@ -419,24 +398,6 @@ Dir::Dir( const DirEntry& rDirEntry, DirEntryKind nKindFlags ):
/*************************************************************************
|*
-|* Dir::Dir()
-|*
-*************************************************************************/
-
-Dir::Dir():
- pReader( 0 )
-{
- DBG_CTOR( Dir, NULL );
-
- pLst = NULL;
- pSortLst = NULL;
- pStatLst = NULL;
- eAttrMask = FSYS_KIND_ALL;
- aNameMask = String("*", osl_getThreadTextEncoding());
-}
-
-/*************************************************************************
-|*
|* Dir::~Dir()
|*
*************************************************************************/
commit 4421325b6a2045043bc3e05deb9628d0ae4111ca
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jul 21 10:36:32 2011 +0200
callcatcher: completely remove SvIconView
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 2dee92a..c3dac5e 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -112,9 +112,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/contnr/imivctl1 \
svtools/source/contnr/imivctl2 \
svtools/source/contnr/ivctrl \
- svtools/source/contnr/svicnvw \
svtools/source/contnr/svimpbox \
- svtools/source/contnr/svimpicn \
svtools/source/contnr/svlbitm \
svtools/source/contnr/svlbox \
svtools/source/contnr/svtabbx \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 39d2331..428dac1 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -133,7 +133,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hx
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx
deleted file mode 100644
index 4ec2ffd..0000000
--- a/svtools/inc/svtools/svicnvw.hxx
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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 _SVICNVW_HXX
-#define _SVICNVW_HXX
-
-#include <vcl/image.hxx>
-#include <svtools/svlbox.hxx>
-
-class SvImpIconView;
-class SvLBoxEntry;
-class SvLBoxItem;
-class SvLBoxString;
-class SvLBoxContextBmp;
-class SvPtrarr;
-
-#define WB_ICON 0x0001
-#define WB_NAME 0x0002
-#define WB_TEXT 0x0004
-#define WB_FLOW 0x0008
-
-#define ICNVW_FLAG_POS_LOCKED 0x0001
-#define ICNVW_FLAG_USER1 0x1000
-#define ICNVW_FLAG_USER2 0x2000
-#define ICNVW_FLAG_USER3 0x4000
-#define ICNVW_FLAG_USER4 0x8000
-
-enum SvIconViewTextMode
-{
- ShowTextFull = 1,
- ShowTextShort,
- ShowTextSmart, // not implemented
- ShowTextDontKnow // only for entries (uses config? from the view)
-};
-
-class SvIcnVwDataEntry : public SvViewDataEntry
-{
-friend class SvImpIconView;
- sal_uInt16 nIcnVwFlags;
- SvIconViewTextMode eTextMode;
-public:
- Rectangle aRect; // Bounding-Rect of the Entry
- Rectangle aGridRect; // set in grid mode
- Size aTextSize; // set in grid mode only
- sal_uInt16 nX,nY; // for keyboard control
- SvIcnVwDataEntry();
- virtual ~SvIcnVwDataEntry();
-
- sal_Bool IsEntryPosLocked() const { return (sal_Bool)((nIcnVwFlags & ICNVW_FLAG_POS_LOCKED) !=0); }
- void ClearVwFlags( sal_uInt16 nMask ) { nIcnVwFlags &= (~nMask); }
- void SetVwFlags( sal_uInt16 nMask ) { nIcnVwFlags |= nMask; }
- sal_uInt16 GetVwFlags() const { return nIcnVwFlags; }
- SvIconViewTextMode GetTextMode() const { return eTextMode; }
-};
-
-#define SV_LISTBOX_ID_ICONVIEW 2
-
-class SvIconView : public SvLBox
-{
- friend class SvImpIconView;
-
- SvImpIconView* pImp;
- Image aCollapsedEntryBmp;
- Image aExpandedEntryBmp;
- sal_uInt16 nIcnVwFlags;
- void SetModel( SvLBoxTreeList* );
-
-protected:
-
- using SvLBox::CreateEntry;
- SvLBoxEntry* CreateEntry( const XubString&, const Image&, const Image&);
- void ViewDataInitialized( SvLBoxEntry* );
- virtual SvViewData* CreateViewData( SvListEntry* );
- virtual void InitViewData( SvViewData* pData, SvListEntry* pEntry );
-
- void EditingRequest(SvLBoxEntry*,SvLBoxItem*,const Point& );
- void EditedText( const XubString& );
- void EditItemText( SvLBoxEntry*,SvLBoxItem*,const Selection& );
- SvLBoxEntry* pCurEdEntry;
- SvLBoxItem* pCurEdItem;
-
- virtual void WriteDragServerInfo( const Point&, SvLBoxDDInfo* );
- virtual void ReadDragServerInfo( const Point&, SvLBoxDDInfo* );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void PreparePaint( SvLBoxEntry* );
- virtual void StateChanged( StateChangedType nStateChange );
-
-public:
-
- SvIconView( Window* pParent,WinBits nWinStyle=0 );
- SvIconView( Window* pParent,const ResId& rResId );
- ~SvIconView();
-
- void DisconnectFromModel();
-
- SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
- sal_Bool bChildsOnDemand = sal_False,
- sal_uLong nPos=LIST_APPEND );
-
- SvLBoxEntry* InsertEntry( const XubString& rText,
- const Image& rExpandedEntryBmp,
- const Image& rCollapsedEntryBmp,
- SvLBoxEntry* pParent = 0,
- sal_Bool bChildsOnDemand = sal_False,
- sal_uLong nPos = LIST_APPEND );
-
- const Image& GetDefaultExpandedEntryBmp() const { return aExpandedEntryBmp;}
- const Image& GetDefaultCollapsedEntryBmp() const { return aCollapsedEntryBmp;}
- void SetDefaultExpandedEntryBmp( const Image& rBmp) { aExpandedEntryBmp=rBmp;}
- void SetDefaultCollapsedEntryBmp( const Image& rBmp ) { aCollapsedEntryBmp=rBmp;}
-
- void SetEntryText(SvLBoxEntry*, const XubString& );
- void SetExpandedEntryBmp(SvLBoxEntry*, const Image& );
- void SetCollapsedEntryBmp(SvLBoxEntry*, const Image& );
-
- XubString GetEntryText(SvLBoxEntry*) const;
- Image GetExpandedEntryBmp(SvLBoxEntry*) const;
- Image GetCollapsedEntryBmp(SvLBoxEntry*) const;
-
- virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
-
- virtual sal_uInt16 IsA();
-
- virtual void RequestingChilds( SvLBoxEntry* pParent );
-
- virtual void Paint( const Rectangle& rRect );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void Resize();
- virtual void GetFocus();
- virtual void LoseFocus();
- void SetUpdateMode( sal_Bool );
-
- using SvListView::SetModel;
- virtual void SetModel( SvLBoxTreeList*, SvLBoxEntry* pParent );
- virtual void ModelHasCleared();
- virtual void ModelHasInserted( SvListEntry* pEntry );
- virtual void ModelHasInsertedTree( SvListEntry* pEntry );
- virtual void ModelIsMoving(SvListEntry* pSource,
- SvListEntry* pTargetParent, sal_uLong nChildPos );
- virtual void ModelHasMoved(SvListEntry* pSource );
- virtual void ModelIsRemoving( SvListEntry* pEntry );
- virtual void ModelHasRemoved( SvListEntry* pEntry );
- virtual void ModelHasEntryInvalidated( SvListEntry* pEntry );
-
- virtual void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow );
- using Window::GetDropTarget;
- virtual SvLBoxEntry* GetDropTarget( const Point& );
- virtual Region GetDragRegion() const;
- // NotifyMoving/Copying is overloaded, since GetDropTarget
- // returns a "magic pointer" if the drop happens in/on an empty
- // area(?) of the IconView
- virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos);
- virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos);
-
- // returns TopLeft of the BoundingRect. Add MapMode.Origin to get the
- // position relative to the window
- Point GetEntryPosition( SvLBoxEntry* ) const;
- void SetEntryPosition( SvLBoxEntry*, const Point& rDocPos);
- void SetEntryPosition( SvLBoxEntry*, const Point& rDocPos,
- sal_Bool bAdjustAtGrid );
-
- void SetFont( const Font& rFont );
- void SetDefaultFont();
-
- using SvLBox::GetEntry;
- SvLBoxEntry* GetEntry( const Point& rPixPos, sal_Bool ) const;
- // returns the entry just above pCurEntry (z-wise)
- SvLBoxEntry* GetNextEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const;
- // returns the entry just below pCurEntry (z-wise)
- SvLBoxEntry* GetPrevEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const;
-
- SvLBoxEntry* GetEntryFromLogicPos( const Point& rDocPos ) const;
-
- virtual void PaintEntry( SvLBoxEntry* );
- virtual void PaintEntry( SvLBoxEntry*, const Point& rDocPos );
- Rectangle GetFocusRect( SvLBoxEntry* );
- void InvalidateEntry( SvLBoxEntry* );
- void MakeVisible( SvLBoxEntry* );
-
- void SetDragDropMode( DragDropMode );
- void SetSelectionMode( SelectionMode );
-
- using SvListView::Select;
- sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- void SelectAll( sal_Bool bSelect, sal_Bool bPaint=sal_True );
- virtual void SetCurEntry( SvLBoxEntry* _pEntry );
- virtual SvLBoxEntry*
- GetCurEntry() const;
-
- // locigal coordinates
- void SelectRect(
- const Rectangle& rRect,
- sal_Bool bAdd = sal_False,
- // inverts the intersection with rRect
- // (ignored if bAdd == sal_False)
- SvPtrarr* pOtherRects = 0,
- short nBorderOffs = -5 );
- sal_uLong GetSelectionCount() const;
-
- virtual void Arrange();
- void SetSpaceBetweenEntries( long nHor, long Ver );
- long GetHorSpaceBetweenEntries();
- long GetVerSpaceBetweenEntries();
-
- void EnableInplaceEditing( sal_Bool bEnable );
- void EditEntry( SvLBoxEntry* pEntry = 0 );
- virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& );
- virtual sal_Bool EditedEntry( SvLBoxEntry*, const XubString& rNewText );
-
- void SetCurParent( SvLBoxEntry* pNewParent );
- SvLBoxEntry* GetCurParent() const;
-
- virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
- SvListEntry* pEntry2, sal_uLong nPos );
-
- // pass (0, 0) to switch off grid mode
- void SetGrid( long nDX, long nDY );
-
- // nDeltaY < 0 : View moves up relative to Doc
- // nDeltaY > 0 : View moves down relative to Doc
- // nDeltaX < 0 : View moves left relative to Doc
- // nDeltaX > 0 : View moves right relative to Doc
- using Window::Scroll;
- virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 );
-
- virtual void PrepareCommandEvent( const CommandEvent& );
- virtual void StartDrag( sal_Int8 nAction, const Point& );
- virtual void DragFinished( sal_Int8 );
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- using SvLBox::ExecuteDrop;
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
-
- void ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
- void HideDDIcon();
- void HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
-
- // to scroll during Drag&Drop
- void CalcScrollOffsets(
- const Point& rRefPosPixel,
- long& rScrollX,
- long& rScrollY,
- sal_Bool bInDragDrop = sal_False,
- sal_uInt16 nBorderWidth = 10 );
-
- using Window::EndTracking;
- void EndTracking();
- void AdjustAtGrid( SvLBoxEntry* pEntry = 0 );
- void LockEntryPos( SvLBoxEntry* pEntry, sal_Bool bLock = sal_True );
- sal_Bool IsEntryPosLocked( const SvLBoxEntry* pEntry ) const;
-
- void SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 );
- SvIconViewTextMode GetTextMode( const SvLBoxEntry* pEntry = 0 ) const;
-
- void ShowFocusRect( const SvLBoxEntry* pEntry );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
deleted file mode 100644
index c8dca4a..0000000
--- a/svtools/source/contnr/svicnvw.cxx
+++ /dev/null
@@ -1,813 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#include <svtools/svlbox.hxx>
-#include <svtools/svicnvw.hxx>
-#include <svimpicn.hxx>
-#include <svtools/svlbitm.hxx>
-
-#define ICNVW_BLOCK_ENTRYINS 0x0001
-
-SvIcnVwDataEntry::SvIcnVwDataEntry()
- : nIcnVwFlags(0),eTextMode(ShowTextDontKnow)
-{
-}
-
-SvIcnVwDataEntry::~SvIcnVwDataEntry()
-{
-}
-
-SvIconView::SvIconView( Window* pParent, WinBits nWinStyle ) :
- SvLBox( pParent, nWinStyle | WB_BORDER )
-{
- nIcnVwFlags = 0;
- pImp = new SvImpIconView( this, GetModel(), nWinStyle | WB_ICON );
- pImp->mpViewData = 0;
- SetSelectionMode( SINGLE_SELECTION );
- SetLineColor();
- const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
- SetDefaultFont();
-}
-
-SvIconView::SvIconView( Window* pParent , const ResId& rResId ) :
- SvLBox( pParent, rResId )
-{
- pImp = new SvImpIconView( this, GetModel(), WB_BORDER | WB_ICON );
- nIcnVwFlags = 0;
- pImp->mpViewData = 0;
- SetLineColor();
- const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
- SetDefaultFont();
- pImp->SetSelectionMode( GetSelectionMode() );
-}
-
-SvIconView::~SvIconView()
-{
- delete pImp;
-}
-
-void SvIconView::SetDefaultFont()
-{
- SetFont( GetFont() );
-}
-
-SvLBoxEntry* SvIconView::CreateEntry( const XubString& rStr,
- const Image& rCollEntryBmp, const Image& rExpEntryBmp )
-{
- SvLBoxEntry* pEntry = new SvLBoxEntry;
-
- SvLBoxContextBmp* pContextBmp =
- new SvLBoxContextBmp( pEntry,0, rCollEntryBmp,rExpEntryBmp, 0xffff );
- pEntry->AddItem( pContextBmp );
-
- SvLBoxString* pString = new SvLBoxString( pEntry, 0, rStr );
- pEntry->AddItem( pString );
-
- return pEntry;
-}
-
-void SvIconView::DisconnectFromModel()
-{
- SvLBox::DisconnectFromModel();
- pImp->SetModel( GetModel(), 0 );
-}
-
-
-SvLBoxEntry* SvIconView::InsertEntry( const XubString& rText,
- SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uLong nPos )
-{
- SvLBoxEntry* pEntry = CreateEntry(
- rText, aCollapsedEntryBmp, aExpandedEntryBmp );
- pEntry->EnableChildsOnDemand( bChildsOnDemand );
-
- if ( !pParent )
- SvLBox::Insert( pEntry, nPos );
- else
- SvLBox::Insert( pEntry, pParent, nPos );
- return pEntry;
-}
-
-SvLBoxEntry* SvIconView::InsertEntry( const XubString& rText,
- const Image& rExpEntryBmp,
- const Image& rCollEntryBmp,
- SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uLong nPos)
-{
- SvLBoxEntry* pEntry = CreateEntry(
- rText, rCollEntryBmp, rExpEntryBmp );
-
- pEntry->EnableChildsOnDemand( bChildsOnDemand );
- if ( !pParent )
- SvLBox::Insert( pEntry, nPos );
- else
- SvLBox::Insert( pEntry, pParent, nPos );
- return pEntry;
-}
-
-
-void SvIconView::SetEntryText(SvLBoxEntry* pEntry, const XubString& rStr)
-{
- SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
- if ( pItem )
- {
- pItem->SetText( pEntry, rStr );
- GetModel()->InvalidateEntry( pEntry );
- }
-}
-
-void SvIconView::SetExpandedEntryBmp(SvLBoxEntry* pEntry, const Image& rBmp)
-{
- SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
- if ( pItem )
- {
- pItem->SetBitmap2( rBmp );
- GetModel()->InvalidateEntry( pEntry );
- }
-}
-
-void SvIconView::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,
- const Image& rBmp )
-{
- SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
- if ( pItem )
- {
- pItem->SetBitmap1( rBmp );
- GetModel()->InvalidateEntry( pEntry );
- }
-}
-
-XubString SvIconView::GetEntryText(SvLBoxEntry* pEntry ) const
-{
- XubString aStr;
- SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
- if ( pItem )
- aStr = pItem->GetText();
- return aStr;
-}
-
-Image SvIconView::GetExpandedEntryBmp(SvLBoxEntry* pEntry) const
-{
- Image aBmp;
- SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
- if ( pItem )
- aBmp = pItem->GetBitmap2();
- return aBmp;
-}
-
-Image SvIconView::GetCollapsedEntryBmp(SvLBoxEntry* pEntry) const
-{
- Image aBmp;
- SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
- if ( pItem )
- aBmp = pItem->GetBitmap1();
- return aBmp;
-}
-
-
-SvLBoxEntry* SvIconView::CloneEntry( SvLBoxEntry* pSource )
-{
- XubString aStr;
- Image aCollEntryBmp;
- Image aExpEntryBmp;
-
- SvLBoxString* pStringItem = (SvLBoxString*)(pSource->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
- if ( pStringItem )
- aStr = pStringItem->GetText();
- SvLBoxContextBmp* pBmpItem =(SvLBoxContextBmp*)(pSource->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
- if ( pBmpItem )
- {
- aCollEntryBmp = pBmpItem->GetBitmap1();
- aExpEntryBmp = pBmpItem->GetBitmap2();
- }
- SvLBoxEntry* pEntry = CreateEntry( aStr, aCollEntryBmp, aExpEntryBmp );
- pEntry->SvListEntry::Clone( pSource );
- pEntry->EnableChildsOnDemand( pSource->HasChildsOnDemand() );
- pEntry->SetUserData( pSource->GetUserData() );
- return pEntry;
-}
-
-
-sal_uInt16 SvIconView::IsA()
-{
- return SV_LISTBOX_ID_ICONVIEW;
-}
-
-void SvIconView::RequestingChilds( SvLBoxEntry* pParent )
-{
- if ( !pParent->HasChilds() )
- InsertEntry( String::CreateFromAscii("<dummy>"), pParent, sal_False, LIST_APPEND );
-}
-
-void SvIconView::Paint( const Rectangle& rRect )
-{
- pImp->Paint( rRect );
-}
-
-void SvIconView::MouseButtonDown( const MouseEvent& rMEvt )
-{
- pImp->MouseButtonDown( rMEvt );
-}
-
-void SvIconView::MouseButtonUp( const MouseEvent& rMEvt )
-{
- pImp->MouseButtonUp( rMEvt );
-}
-
-void SvIconView::MouseMove( const MouseEvent& rMEvt )
-{
- pImp->MouseMove( rMEvt );
-}
-
-void SvIconView::KeyInput( const KeyEvent& rKEvt )
-{
- // unter OS/2 bekommen wir auch beim Editieren Key-Up/Down
- if( IsEditingActive() )
- return;
-
- nImpFlags |= SVLBOX_IS_TRAVELSELECT;
- sal_Bool bKeyUsed = pImp->KeyInput( rKEvt );
- if ( !bKeyUsed )
- SvLBox::KeyInput( rKEvt );
- nImpFlags &= ~SVLBOX_IS_TRAVELSELECT;
-}
-
-void SvIconView::Resize()
-{
- pImp->Resize();
- SvLBox::Resize();
-}
-
-void SvIconView::GetFocus()
-{
- pImp->GetFocus();
- SvLBox::GetFocus();
-}
-
-void SvIconView::LoseFocus()
-{
- pImp->LoseFocus();
- SvLBox::LoseFocus();
-}
-
-void SvIconView::SetUpdateMode( sal_Bool bUpdate )
-{
- Control::SetUpdateMode( bUpdate );
- if ( bUpdate )
- pImp->UpdateAll();
-}
-
-void SvIconView::SetModel( SvLBoxTreeList* )
-{
-}
-
-void SvIconView::SetModel( SvLBoxTreeList* pNewModel, SvLBoxEntry* pParent )
-{
- nIcnVwFlags |= ICNVW_BLOCK_ENTRYINS;
- SvLBox::SetModel( pNewModel );
- nIcnVwFlags &= (~ICNVW_BLOCK_ENTRYINS);
- if ( pParent && pParent->HasChildsOnDemand() )
- RequestingChilds( pParent );
- pImp->SetModel( pNewModel, pParent );
-}
-
-void SvIconView::ModelHasCleared()
-{
- SvLBox::ModelHasCleared();
- pImp->Clear();
-}
-
-void SvIconView::ModelHasInserted( SvListEntry* pEntry )
-{
- if( !(nIcnVwFlags & ICNVW_BLOCK_ENTRYINS ) )
- pImp->EntryInserted( (SvLBoxEntry*)pEntry );
-}
-
-void SvIconView::ModelHasInsertedTree( SvListEntry* pEntry )
-{
- pImp->TreeInserted( (SvLBoxEntry*)pEntry );
-}
-
-void SvIconView::ModelIsMoving(SvListEntry* pSource,
- SvListEntry* /* pTargetParent */ , sal_uLong /* nChildPos */ )
-{
- pImp->MovingEntry( (SvLBoxEntry*)pSource );
-}
-
-void SvIconView::ModelHasMoved(SvListEntry* pSource )
-{
- pImp->EntryMoved( (SvLBoxEntry*)pSource );
-}
-
-void SvIconView::ModelIsRemoving( SvListEntry* pEntry )
-{
- pImp->RemovingEntry( (SvLBoxEntry*)pEntry );
- NotifyRemoving( (SvLBoxEntry*)pEntry );
-}
-
-void SvIconView::ModelHasRemoved( SvListEntry* /* pEntry */ )
-{
- pImp->EntryRemoved();
-}
-
-void SvIconView::ModelHasEntryInvalidated( SvListEntry* pEntry )
-{
- // die einzelnen Items des Entries reinitialisieren
- SvLBox::ModelHasEntryInvalidated( pEntry );
- // painten
- pImp->ModelHasEntryInvalidated( pEntry );
-}
-
-void SvIconView::ShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow )
-{
- pImp->ShowTargetEmphasis( pEntry, bShow );
-}
-
-Point SvIconView::GetEntryPosition( SvLBoxEntry* pEntry ) const
-{
- return ((SvIconView*)this)->pImp->GetEntryPosition( pEntry );
-}
-
-void SvIconView::SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos)
-{
- pImp->SetEntryPosition( pEntry, rPos, sal_False, sal_True );
-}
-
-void SvIconView::SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos, sal_Bool bAdjustAtGrid )
-{
- pImp->SetEntryPosition( pEntry, rPos, bAdjustAtGrid );
-}
-
-void SvIconView::SetFont( const Font& rFont )
-{
- Font aTempFont( rFont );
- aTempFont.SetTransparent( sal_True );
- SvLBox::SetFont( aTempFont );
- RecalcViewData();
- pImp->ChangedFont();
-}
-
-void SvIconView::ViewDataInitialized( SvLBoxEntry* pEntry )
-{
- pImp->ViewDataInitialized( pEntry );
-}
-
-SvLBoxEntry* SvIconView::GetDropTarget( const Point& rPos )
-{
- return pImp->GetDropTarget( rPos );
-}
-
-SvLBoxEntry* SvIconView::GetEntry( const Point& rPixPos, sal_Bool ) const
-{
- Point aPos( rPixPos );
- aPos -= GetMapMode().GetOrigin();
- return ((SvIconView*)this)->pImp->GetEntry( aPos );
-}
-
-SvLBoxEntry* SvIconView::GetEntryFromLogicPos( const Point& rDocPos ) const
-{
- return ((SvIconView*)this)->pImp->GetEntry( rDocPos );
-}
-
-
-void SvIconView::StateChanged( StateChangedType i_nStateChange )
-{
- SvLBox::StateChanged( i_nStateChange );
- if ( i_nStateChange == STATE_CHANGE_STYLE )
- pImp->SetStyle( GetStyle() );
-}
-
-void SvIconView::PaintEntry( SvLBoxEntry* pEntry )
-{
- pImp->PaintEntry( pEntry );
-}
-
-
-void SvIconView::PaintEntry( SvLBoxEntry* pEntry, const Point& rPos )
-{
- pImp->PaintEntry( pEntry, rPos );
-}
-
-Rectangle SvIconView::GetFocusRect( SvLBoxEntry* pEntry )
-{
- return pImp->CalcFocusRect( pEntry );
-}
-
-void SvIconView::InvalidateEntry( SvLBoxEntry* pEntry )
-{
- pImp->InvalidateEntry( pEntry );
-}
-
-void SvIconView::SetDragDropMode( DragDropMode nDDMode )
-{
- SvLBox::SetDragDropMode( nDDMode );
- pImp->SetDragDropMode( nDDMode );
-}
-
-void SvIconView::SetSelectionMode( SelectionMode eSelectMode )
-{
- SvLBox::SetSelectionMode( eSelectMode );
- pImp->SetSelectionMode( eSelectMode );
-}
-
-sal_Bool SvIconView::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
-{
- EndEditing();
- sal_Bool bRetVal = SvListView::Select( pEntry, bSelect );
- if( bRetVal )
- {
- pImp->EntrySelected( pEntry, bSelect );
- pHdlEntry = pEntry;
- SelectHdl();
- }
- return bRetVal;
-}
-
-void SvIconView::SelectAll( sal_Bool bSelect, sal_Bool )
-{
- SvLBoxEntry* pEntry = pImp->GetCurParent();
- pEntry = FirstChild( pEntry );
- while( pEntry )
- {
- Select( pEntry, bSelect );
- pEntry = NextSibling( pEntry );
- }
-}
-
-void SvIconView::SetCurEntry( SvLBoxEntry* _pEntry )
-{
- pImp->SetCursor( _pEntry );
- OnCurrentEntryChanged();
-}
-
-SvLBoxEntry* SvIconView::GetCurEntry() const
-{
- return pImp->GetCurEntry();
-}
-
-void SvIconView::Arrange()
-{
-#ifdef DBG_UTIL
- sal_uInt16 n=1;
- if( n == 1 && n-1 == 0 )
- {
- pImp->Arrange();
- }
- else
- {
- pImp->AdjustAtGrid();
- }
-#else
- pImp->Arrange();
-#endif
-}
-
-
-void SvIconView::SetSpaceBetweenEntries( long nX, long nY )
-{
- pImp->SetSpaceBetweenEntries( nX, nY );
-}
-
-sal_Bool SvIconView::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos )
-{
- return pImp->NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos);
-}
-
-sal_Bool SvIconView::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos )
-{
- return pImp->NotifyCopying(pTarget,pEntry,rpNewParent,rNewChildPos);
-}
-
-
-void SvIconView::EnableInplaceEditing( sal_Bool bEnable )
-{
- SvLBox::EnableInplaceEditing( bEnable );
-}
-
-void SvIconView::EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
- const Point& )
-{
- if ( pItem->IsA() == SV_ITEM_ID_LBOXSTRING )
- {
- Selection aSel( SELECTION_MIN, SELECTION_MAX );
- if ( EditingEntry( pEntry, aSel ) )
- {
- SelectAll( sal_False );
- EditItemText( pEntry, (SvLBoxString*)pItem, aSel );
- }
- }
-}
-
-
-void SvIconView::EditItemText( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
- const Selection& rSel )
-{
- DBG_ASSERT(pEntry&&pItem,"EditItemText:Params?");
- pCurEdEntry = pEntry;
- pCurEdItem = pItem;
- Rectangle aRect( pImp->CalcTextRect( pEntry, (SvLBoxString*)pItem,0,sal_True ));
-
- aRect.Bottom() += 4;
- pImp->MakeVisible( aRect ); // vor der Umrechnung in Pixel-Koord. rufen!
- aRect.Bottom() -= 4;
-
- Point aPos( aRect.TopLeft() );
- aPos += GetMapMode().GetOrigin(); // Dok-Koord. -> Window-Koord.
- aRect.SetPos( aPos );
-
- aRect.Bottom() += 2; // sieht huebscher aus
-
- EditText( ((SvLBoxString*)pItem)->GetText(), aRect, rSel, sal_True );
-}
-
-void SvIconView::EditEntry( SvLBoxEntry* pEntry )
-{
- if( !pEntry )
- pEntry = pImp->GetCurEntry();
- if( pEntry )
- {
- SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
- if( pItem )
- {
- Selection aSel( SELECTION_MIN, SELECTION_MAX );
- if( EditingEntry( pEntry, aSel ) )
- {
- SelectAll( sal_False );
- EditItemText( pEntry, pItem, aSel );
- }
- }
- }
-}
-
-void SvIconView::EditedText( const XubString& rStr )
-{
- XubString aRefStr( ((SvLBoxString*)pCurEdItem)->GetText() );
- if ( EditedEntry( pCurEdEntry, rStr ) )
- {
- ((SvLBoxString*)pCurEdItem)->SetText( pCurEdEntry, rStr );
- pModel->InvalidateEntry( pCurEdEntry );
- }
- if( GetSelectionMode()==SINGLE_SELECTION && !GetSelectionCount())
- Select( pCurEdEntry );
-}
-
-
-sal_Bool SvIconView::EditingEntry( SvLBoxEntry*, Selection& )
-{
- return sal_True;
-}
-
-sal_Bool SvIconView::EditedEntry( SvLBoxEntry*, const XubString& )
-{
- return sal_True;
-}
-
-
-void SvIconView::WriteDragServerInfo( const Point& rPos, SvLBoxDDInfo* pInfo)
-{
- pImp->WriteDragServerInfo( rPos, pInfo );
-}
-
-void SvIconView::ReadDragServerInfo( const Point& rPos, SvLBoxDDInfo* pInfo )
-{
- pImp->ReadDragServerInfo( rPos, pInfo );
-}
-
-void SvIconView::Command( const CommandEvent& rCEvt )
-{
- pImp->PrepareCommandEvent( rCEvt.GetMousePosPixel() );
-}
-
-void SvIconView::SetCurParent( SvLBoxEntry* pNewParent )
-{
- if ( pNewParent && pNewParent->HasChildsOnDemand() )
- RequestingChilds( pNewParent );
- pImp->SetCurParent( pNewParent );
-}
-
-SvLBoxEntry* SvIconView::GetCurParent() const
-{
- return pImp->GetCurParent();
-}
-
-SvViewData* SvIconView::CreateViewData( SvListEntry* )
-{
- SvIcnVwDataEntry* pEntryData = new SvIcnVwDataEntry;
- return (SvViewData*)pEntryData;
-}
-
-void SvIconView::InitViewData( SvViewData* pData, SvListEntry* pEntry )
-{
- SvLBox::InitViewData( pData, pEntry );
- pImp->InvalidateBoundingRect( ((SvIcnVwDataEntry*)pData)->aRect );
-}
-
-Region SvIconView::GetDragRegion() const
-{
- Rectangle aRect;
- SvLBoxEntry* pEntry = GetCurEntry();
- if( pEntry )
- aRect = pImp->GetBoundingRect( pEntry );
- Region aRegion( aRect );
- return aRegion;
-}
-
-sal_uLong SvIconView::GetSelectionCount() const
-{
- return (sal_uLong)(pImp->GetSelectionCount());
-}
-
-void SvIconView::SetGrid( long nDX, long nDY )
-{
- pImp->SetGrid( nDX, nDY );
-}
-
-void SvIconView::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
- SvListEntry* pEntry2, sal_uLong nPos )
-{
- SvLBox::ModelNotification( nActionId, pEntry1, pEntry2, nPos );
- switch( nActionId )
- {
- case LISTACTION_RESORTING:
- SetUpdateMode( sal_False );
- break;
-
- case LISTACTION_RESORTED:
- SetUpdateMode( sal_True );
- Arrange();
- break;
-
- case LISTACTION_CLEARED:
- if( IsUpdateMode() )
- Update();
- break;
- }
-}
-
-
-void SvIconView::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
-{
- pImp->Scroll( nDeltaX, nDeltaY, sal_False );
-}
-
-void SvIconView::PrepareCommandEvent( const CommandEvent& rCEvt )
-{
- pImp->PrepareCommandEvent( rCEvt.GetMousePosPixel() );
-}
-
-void SvIconView::StartDrag( sal_Int8 nAction, const Point& rPos )
-{
- pImp->SttDrag( rPos );
- SvLBoxEntry* pEntry = GetEntry( rPos, sal_True );
- pImp->mpViewData = pEntry;
- SvLBox::StartDrag( nAction, rPos );
-}
-
-void SvIconView::DragFinished( sal_Int8 )
-{
- pImp->EndDrag();
-}
-
-sal_Int8 SvIconView::AcceptDrop( const AcceptDropEvent& rEvt )
-{
- if( pImp->mpViewData )
- pImp->HideDDIcon();
- sal_Int8 nRet = SvLBox::AcceptDrop( rEvt );
- if( DND_ACTION_NONE != nRet )
- pImp->ShowDDIcon( pImp->mpViewData, rEvt.maPosPixel );
-
- return nRet;
-}
-
-sal_Int8 SvIconView::ExecuteDrop( const ExecuteDropEvent& rEvt )
-{
- if( pImp->mpViewData )
- {
- pImp->HideDDIcon();
- pImp->mpViewData = 0;
- }
- return SvLBox::ExecuteDrop( rEvt );
-}
-
-void SvIconView::ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos )
-{
- pImp->ShowDDIcon( pRefEntry, rPos );
-}
-
-void SvIconView::HideDDIcon()
-{
- pImp->HideDDIcon();
-}
-
-void SvIconView::HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos )
-{
- pImp->HideShowDDIcon( pRefEntry, rPos );
-}
-
-void SvIconView::SelectRect( const Rectangle& rRect, sal_Bool bAdd,
- SvPtrarr* pRects, short nOffs )
-{
- pImp->SelectRect( rRect, bAdd, pRects, nOffs );
-}
-
-void SvIconView::CalcScrollOffsets( const Point& rRefPosPixel, long& rX, long& rY,
- sal_Bool b, sal_uInt16 nBorderWidth )
-{
- pImp->CalcScrollOffsets( rRefPosPixel, rX, rY, b, nBorderWidth );
-}
-
-void SvIconView::EndTracking()
-{
- pImp->EndTracking();
-}
-
-void SvIconView::MakeVisible( SvLBoxEntry* pEntry )
-{
- pImp->MakeVisible( pEntry );
-}
-
-void SvIconView::PreparePaint( SvLBoxEntry* )
-{
-}
-
-void SvIconView::AdjustAtGrid( SvLBoxEntry* pEntry )
-{
- pImp->AdjustAtGrid( pEntry );
-}
-
-void SvIconView::LockEntryPos( SvLBoxEntry* pEntry, sal_Bool bLock )
-{
- SvIcnVwDataEntry* pViewData = (SvIcnVwDataEntry*)GetViewData( pEntry );
- if( bLock )
- pViewData->SetVwFlags( ICNVW_FLAG_POS_LOCKED );
- else
- pViewData->ClearVwFlags( ICNVW_FLAG_POS_LOCKED );
-}
-
-sal_Bool SvIconView::IsEntryPosLocked( const SvLBoxEntry* pEntry ) const
-{
- const SvIcnVwDataEntry* pViewData = (const SvIcnVwDataEntry*)GetViewData( (SvListEntry*)pEntry );
- return pViewData->IsEntryPosLocked();
-}
-
-void SvIconView::SetTextMode( SvIconViewTextMode eMode, SvLBoxEntry* pEntry )
-{
- pImp->SetTextMode( eMode, pEntry );
-}
-
-SvIconViewTextMode SvIconView::GetTextMode( const SvLBoxEntry* pEntry ) const
-{
- return pImp->GetTextMode( pEntry );
-}
-
-SvLBoxEntry* SvIconView::GetNextEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const
-{
- Point aPos( rPixPos );
- aPos -= GetMapMode().GetOrigin();
- return ((SvIconView*)this)->pImp->GetNextEntry( aPos, pCurEntry );
-}
-
-SvLBoxEntry* SvIconView::GetPrevEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const
-{
- Point aPos( rPixPos );
- aPos -= GetMapMode().GetOrigin();
- return ((SvIconView*)this)->pImp->GetPrevEntry( aPos, pCurEntry );
-}
-
-void SvIconView::ShowFocusRect( const SvLBoxEntry* pEntry )
-{
- pImp->ShowFocusRect( pEntry );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
deleted file mode 100644
index d573b18..0000000
--- a/svtools/source/contnr/svimpicn.cxx
+++ /dev/null
@@ -1,4093 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#include <limits.h>
-#include <vcl/metric.hxx>
-#include <vcl/svapp.hxx>
-#ifdef DBG_UTIL
-#include <vcl/sound.hxx>
-#endif
-
-#include <svtools/svlbox.hxx>
-#include <svtools/svicnvw.hxx>
-#include <svimpicn.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svl/svarray.hxx>
-
-
-
-#define VIEWMODE_ICON 0x0001 // Text unter Bitmap
-#define VIEWMODE_NAME 0x0002 // Text rechts neben Bitmap
-#define VIEWMODE_TEXT 0x0004 // Text ohne Bitmap
-
-#define DD_SCROLL_PIXEL 10
-
-// alle Angaben in Pixel
-
-#define ICONVIEW_OFFS_BMP_STRING 3
-
-// fuer das Bounding-Rectangle
-#define LROFFS_BOUND 2
-#define TBOFFS_BOUND 2
-
-// fuer das Focus-Rectangle um Icons
-#define LROFFS_ICON 2
-#define TBOFFS_ICON 2
-
-#define NAMEVIEW_OFFS_BMP_STRING 3
-
-// Abstaende von Fensterraendern
-#define LROFFS_WINBORDER 4
-#define TBOFFS_WINBORDER 4
-
-// Breitenoffset Highlight-Rect bei Text
-#define LROFFS_TEXT 2
-
-
-#define ICNVIEWDATA(xPtr) (SvIcnVwDataEntry*)(pView->GetViewDataEntry(xPtr))
-#define ICNVIEWDATA2(xPtr) (SvIcnVwDataEntry*)(pView->pView->GetViewDataEntry(xPtr))
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-// -------------------------------------------------------------------------
-// Hilfsfunktionen von Thomas Hosemann zur mehrzeiligen Ausgabe von
-// Strings. Die Funktionen werden spaeter in StarView integriert.
-// -------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
-// keine doppelten Defines
-#ifdef TEXT_DRAW_CLIP
-#undef TEXT_DRAW_CLIP
-#endif
-#ifdef TEXT_DRAW_MULTILINE
-#undef TEXT_DRAW_MULTILINE
-#endif
-#ifdef TEXT_DRAW_WORDBREAK
-#undef TEXT_DRAW_WORDBREAK
-#endif
-
-// #define TEXT_DRAW_DISABLE ((sal_uInt16)0x0001)
-// #define TEXT_DRAW_3DLOOK ((sal_uInt16)0x0002)
-// #define TEXT_DRAW_MNEMONIC ((sal_uInt16)0x0004)
-#define TEXT_DRAW_LEFT ((sal_uInt16)0x0010)
-#define TEXT_DRAW_CENTER ((sal_uInt16)0x0020)
-#define TEXT_DRAW_RIGHT ((sal_uInt16)0x0040)
-#define TEXT_DRAW_TOP ((sal_uInt16)0x0080)
-#define TEXT_DRAW_VCENTER ((sal_uInt16)0x0100)
-#define TEXT_DRAW_BOTTOM ((sal_uInt16)0x0200)
-#define TEXT_DRAW_ENDELLIPSIS ((sal_uInt16)0x0400)
-#define TEXT_DRAW_PATHELLIPSIS ((sal_uInt16)0x0800)
-#define TEXT_DRAW_CLIP ((sal_uInt16)0x1000)
-#define TEXT_DRAW_MULTILINE ((sal_uInt16)0x2000)
-#define TEXT_DRAW_WORDBREAK ((sal_uInt16)0x4000)
-
-XubString GetEllipsisString( OutputDevice* pDev,
- const XubString& rStr, long nMaxWidth,
- sal_uInt16 nStyle = TEXT_DRAW_ENDELLIPSIS )
-{
- XubString aStr = rStr;
-
- if ( nStyle & TEXT_DRAW_ENDELLIPSIS )
- {
- sal_uInt16 nIndex = pDev->GetTextBreak( rStr, nMaxWidth );
- if ( nIndex != STRING_LEN )
- {
- aStr.Erase( nIndex );
- if ( nIndex > 1 )
- {
- aStr.AppendAscii("...");
- while ( aStr.Len() &&
- (pDev->GetTextWidth( aStr ) > nMaxWidth) )
- {
- if ( (nIndex > 1) || (nIndex == aStr.Len()) )
- nIndex--;
- aStr.Erase( nIndex, 1 );
- }
- }
-
- if ( !aStr.Len() && (nStyle & TEXT_DRAW_CLIP) )
- aStr += rStr.GetChar( 0 );
- }
- }
-
- return aStr;
-}
-
-class TextLineInfo
-{
-private:
- long mnWidth;
- sal_uInt16 mnIndex;
- sal_uInt16 mnLen;
-
-public:
- TextLineInfo( long nWidth, sal_uInt16 nIndex, sal_uInt16 nLen )
- {
- mnWidth = nWidth;
- mnIndex = nIndex;
- mnLen = nLen;
- }
-
- long GetWidth() const { return mnWidth; }
- sal_uInt16 GetIndex() const { return mnIndex; }
- sal_uInt16 GetLen() const { return mnLen; }
-};
-
-#define MULTITEXTLINEINFO_RESIZE 16
-typedef TextLineInfo* PTextLineInfo;
-
-class MultiTextLineInfo
-{
-private:
- PTextLineInfo* mpLines;
- sal_uInt16 mnLines;
- sal_uInt16 mnSize;
-
-public:
- MultiTextLineInfo();
- ~MultiTextLineInfo();
-
- void AddLine( TextLineInfo* pLine );
- void Clear();
-
- TextLineInfo* GetLine( sal_uInt16 nLine ) const
- { return mpLines[nLine]; }
- sal_uInt16 Count() const { return mnLines; }
-
-private:
- MultiTextLineInfo( const MultiTextLineInfo& );
- MultiTextLineInfo& operator=( const MultiTextLineInfo& );
-};
-
-MultiTextLineInfo::MultiTextLineInfo()
-{
- mpLines = new PTextLineInfo[MULTITEXTLINEINFO_RESIZE];
- mnLines = 0;
- mnSize = MULTITEXTLINEINFO_RESIZE;
-}
-
-MultiTextLineInfo::~MultiTextLineInfo()
-{
- for ( sal_uInt16 i = 0; i < mnLines; i++ )
- delete mpLines[i];
- delete [] mpLines;
-}
-
-void MultiTextLineInfo::AddLine( TextLineInfo* pLine )
-{
- if ( mnSize == mnLines )
- {
- mnSize += MULTITEXTLINEINFO_RESIZE;
- PTextLineInfo* pNewLines = new PTextLineInfo[mnSize];
- memcpy( pNewLines, mpLines, mnLines*sizeof(PTextLineInfo) );
- mpLines = pNewLines;
- }
-
- mpLines[mnLines] = pLine;
- mnLines++;
-}
-
-void MultiTextLineInfo::Clear()
-{
- for ( sal_uInt16 i = 0; i < mnLines; i++ )
- delete mpLines[i];
- mnLines = 0;
-}
-
-// -----------------------------------------------------------------------
-
-long GetTextLines( OutputDevice* pDev, MultiTextLineInfo& rLineInfo,
- long nWidth, const XubString& rStr,
- sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK )
-{
- rLineInfo.Clear();
- if ( !rStr.Len() )
- return 0;
- if ( nWidth <= 0 )
- nWidth = 1;
-
- sal_uInt16 nStartPos = 0; // Start-Position der Zeile
- sal_uInt16 nLastLineLen = 0; // Zeilenlaenge bis zum vorherigen Wort
- sal_uInt16 nLastWordPos = 0; // Position des letzten Wortanfangs
- sal_uInt16 i = 0;
- sal_uInt16 nPos; // StartPositon der Zeile (nur Temp)
- sal_uInt16 nLen; // Laenge der Zeile (nur Temp)
- sal_uInt16 nStrLen = rStr.Len();
- long nMaxLineWidth = 0; // Maximale Zeilenlaenge
- long nLineWidth; // Aktuelle Zeilenlaenge
- long nLastLineWidth = 0; // Zeilenlaenge der letzten Zeile
- xub_Unicode c;
- xub_Unicode c2;
- const xub_Unicode* pStr = rStr.GetBuffer();
- sal_Bool bHardBreak = sal_False;
-
- do
- {
- c = pStr[i];
-
- // Auf Zeilenende ermitteln
- if ( (c == _CR) || (c == _LF) )
- bHardBreak = sal_True;
- else
- bHardBreak = sal_False;
-
- // Testen, ob ein Wortende erreicht ist
- if ( bHardBreak || (i == nStrLen) ||
- (((c == ' ') || (c == '-')) && (nStyle & TEXT_DRAW_WORDBREAK)) )
- {
- nLen = i-nStartPos;
- if ( c == '-' )
- nLen++;
- nLineWidth = pDev->GetTextWidth( rStr, nStartPos, nLen );
-
- // Findet ein Zeilenumbruch statt
- if ( bHardBreak || (i == nStrLen) ||
- ((nLineWidth >= nWidth) && (nStyle & TEXT_DRAW_WORDBREAK)) )
- {
- nPos = nStartPos;
-
- if ( (nLineWidth >= nWidth) && (nStyle & TEXT_DRAW_WORDBREAK) )
- {
- nLineWidth = nLastLineWidth;
- nLen = nLastLineLen;
- nStartPos = nLastWordPos;
- nLastLineLen = i-nStartPos;
- nLastWordPos = nStartPos+nLastLineLen+1;
- if ( c == '-' )
- nLastLineLen++;
- else if ( bHardBreak && (i > nStartPos) )
- i--;
- }
- else
- {
- nStartPos = i;
- // Zeilenende-Zeichen und '-' beruecksichtigen
- if ( bHardBreak )
- {
- nStartPos++;
- c2 = pStr[i+1];
- if ( (c != c2) && ((c2 == _CR) || (c2 == _LF)) )
- {
- nStartPos++;
- i++;
- }
- }
- else if ( c != '-' )
- nStartPos++;
- nLastWordPos = nStartPos;
- nLastLineLen = 0;
- }
-
- if ( nLineWidth > nMaxLineWidth )
- nMaxLineWidth = nLineWidth;
-
- if ( nLen || bHardBreak )
- rLineInfo.AddLine( new TextLineInfo( nLineWidth, nPos, nLen ) );
-
- // Testen, ob aktuelles Wort noch auf die Zeile passt,
- // denn ansonsten mueessen wir es auftrennen
- if ( nLastLineLen )
- {
- nLineWidth = pDev->GetTextWidth( rStr, nStartPos, nLastLineLen );
- if ( nLineWidth > nWidth )
- {
- // Wenn ein Wortumbruch in einem Wort stattfindet,
- // ist die maximale Zeilenlaenge die Laenge
- // des laengsten Wortes
- if ( nLineWidth > nMaxLineWidth )
- nMaxLineWidth = nLineWidth;
-
- // Solange Wort auftrennen, bis es auf eine Zeile passt
- do
- {
- nPos = pDev->GetTextBreak( rStr, nWidth, nStartPos, nLastLineLen );
- nLen = nPos-nStartPos;
- if ( !nLen )
- {
- nPos++;
- nLen++;
- }
- nLineWidth = pDev->GetTextWidth( rStr, nStartPos, nLen );
- rLineInfo.AddLine( new TextLineInfo( nLineWidth, nStartPos, nLen ) );
- nStartPos = nPos;
- nLastLineLen = nLastLineLen - nLen;
- nLineWidth = pDev->GetTextWidth( rStr, nStartPos, nLastLineLen );
- }
- while ( nLineWidth > nWidth );
- }
- nLastLineWidth = nLineWidth;
-
- // Bei Stringende muessen wir die letzte Zeile auch noch
- // dranhaengen
- if ( (i == nStrLen) && nLastLineLen )
- rLineInfo.AddLine( new TextLineInfo( nLastLineWidth, nStartPos, nLastLineLen ) );
- }
- else
- nLastLineWidth = 0;
- }
- else
- {
- nLastLineWidth = nLineWidth;
- nLastLineLen = nLen;
- nLastWordPos = nStartPos+nLastLineLen;
- if ( c != '-' )
- nLastWordPos++;
- }
- }
-
- i++;
- }
- while ( i <= nStrLen );
-
- return nMaxLineWidth;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 GetTextLines( OutputDevice* pDev, const Rectangle& rRect,
- const XubString& rStr,
- sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK,
- long* pMaxWidth = NULL )
-{
- MultiTextLineInfo aMultiLineInfo;
- long nMaxWidth = GetTextLines( pDev, aMultiLineInfo,
- rRect.GetWidth(), rStr, nStyle );
- if ( pMaxWidth )
- *pMaxWidth = nMaxWidth;
- return aMultiLineInfo.Count();
-}
-
-// -----------------------------------------------------------------------
-
-Rectangle GetTextRect( OutputDevice* pDev, const Rectangle& rRect,
- const XubString& rStr,
- sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK )
-{
- Rectangle aRect = rRect;
- sal_uInt16 nLines;
- long nWidth = rRect.GetWidth();
- long nMaxWidth;
- long nTextHeight;
-
- if ( nStyle & TEXT_DRAW_MULTILINE )
- {
- MultiTextLineInfo aMultiLineInfo;
- TextLineInfo* pLineInfo;
- sal_uInt16 nFormatLines;
-
- nMaxWidth = 0;
- GetTextLines( pDev, aMultiLineInfo, nWidth, rStr, nStyle );
- nFormatLines = aMultiLineInfo.Count();
- nTextHeight = pDev->GetTextHeight();
- nLines = (sal_uInt16)(aRect.GetHeight()/nTextHeight);
- if ( nFormatLines <= nLines )
- nLines = nFormatLines;
- else
- {
- if ( !(nStyle & TEXT_DRAW_ENDELLIPSIS) )
- nLines = nFormatLines;
- else
- nMaxWidth = nWidth;
- }
- for ( sal_uInt16 i = 0; i < nLines; i++ )
- {
- pLineInfo = aMultiLineInfo.GetLine( i );
- if ( pLineInfo->GetWidth() > nMaxWidth )
- nMaxWidth = pLineInfo->GetWidth();
- }
- }
- else
- {
- nLines = 1;
- nMaxWidth = pDev->GetTextWidth( rStr );
- nTextHeight = pDev->GetTextHeight();
- if ( (nMaxWidth > nWidth) && (nStyle & TEXT_DRAW_ENDELLIPSIS) )
- nMaxWidth = nWidth;
- }
-
- if ( nStyle & TEXT_DRAW_RIGHT )
- aRect.Left() = aRect.Right()-nMaxWidth+1;
- else if ( nStyle & TEXT_DRAW_CENTER )
- {
- aRect.Left() += (nWidth-nMaxWidth)/2;
- aRect.Right() = aRect.Left()+nMaxWidth-1;
- }
- else
- aRect.Right() = aRect.Left()+nMaxWidth-1;
-
- if ( nStyle & TEXT_DRAW_BOTTOM )
- aRect.Top() = aRect.Bottom()-(nTextHeight*nLines)+1;
- else if ( nStyle & TEXT_DRAW_VCENTER )
- {
- aRect.Top() += (aRect.GetHeight()-(nTextHeight*nLines))/2;
- aRect.Bottom() = aRect.Top()+(nTextHeight*nLines)-1;
- }
- else
- aRect.Bottom() = aRect.Top()+(nTextHeight*nLines)-1;
-
- return aRect;
-}
-
-// -----------------------------------------------------------------------
-
-void DrawText( OutputDevice* pDev, const Rectangle& rRect,
- const XubString& rStr, sal_uInt16 nStyle = 0 )
-{
- if ( !rStr.Len() || rRect.IsEmpty() )
- return;
-
- Point aPos = rRect.TopLeft();
- long nWidth = rRect.GetWidth();
- long nHeight = rRect.GetHeight();
- FontAlign eAlign = pDev->GetFont().GetAlign();
-
- if ( ((nWidth <= 0) || (nHeight <= 0)) && (nStyle & TEXT_DRAW_CLIP) )
- return;
-
- // Mehrzeiligen Text behandeln wir anders
- if ( nStyle & TEXT_DRAW_MULTILINE )
- {
- String aLastLine;
- Region aOldRegion;
- MultiTextLineInfo aMultiLineInfo;
- TextLineInfo* pLineInfo;
- long nTextHeight = pDev->GetTextHeight();
- long nMaxTextWidth;
- sal_uInt16 i;
- sal_uInt16 nLines = (sal_uInt16)(nHeight/nTextHeight);
- sal_uInt16 nFormatLines;
- sal_Bool bIsClipRegion = sal_False;
- nMaxTextWidth = GetTextLines( pDev, aMultiLineInfo, nWidth, rStr, nStyle );
-
- nFormatLines = aMultiLineInfo.Count();
- if ( nFormatLines > nLines )
- {
- if ( nStyle & TEXT_DRAW_ENDELLIPSIS )
- {
- // Letzte Zeile zusammenbauen und kuerzen
- nFormatLines = nLines-1;
- pLineInfo = aMultiLineInfo.GetLine( nFormatLines );
- aLastLine = rStr.Copy( pLineInfo->GetIndex() );
- aLastLine.ConvertLineEnd( LINEEND_LF );
- aLastLine.SearchAndReplace( _LF, ' ' );
- aLastLine = GetEllipsisString( pDev, aLastLine, nWidth, nStyle );
- nStyle &= ~(TEXT_DRAW_VCENTER | TEXT_DRAW_BOTTOM);
- nStyle |= TEXT_DRAW_TOP;
- }
- }
- else
- {
- if ( nMaxTextWidth <= nWidth )
- nStyle &= ~TEXT_DRAW_CLIP;
- }
-
- // Clipping setzen
- if ( nStyle & TEXT_DRAW_CLIP )
- {
- bIsClipRegion = pDev->IsClipRegion();
- if ( bIsClipRegion )
- {
- aOldRegion = pDev->GetClipRegion();
- pDev->IntersectClipRegion( rRect );
- }
- else
- {
- Region aRegion( rRect );
- pDev->SetClipRegion( aRegion );
- }
- }
-
- // Vertikales Alignment
- if ( nStyle & TEXT_DRAW_BOTTOM )
- aPos.Y() += nHeight-(nFormatLines*nTextHeight);
- else if ( nStyle & TEXT_DRAW_VCENTER )
- aPos.Y() += (nHeight-(nFormatLines*nTextHeight))/2;
-
- // Font Alignment
- if ( eAlign == ALIGN_BOTTOM )
- aPos.Y() += nTextHeight;
- else if ( eAlign == ALIGN_BASELINE )
- aPos.Y() += pDev->GetFontMetric().GetAscent();
-
- // Alle Zeilen ausgeben, bis auf die letzte
- for ( i = 0; i < nFormatLines; i++ )
- {
- pLineInfo = aMultiLineInfo.GetLine( i );
- if ( nStyle & TEXT_DRAW_RIGHT )
- aPos.X() += nWidth-pLineInfo->GetWidth();
- else if ( nStyle & TEXT_DRAW_CENTER )
- aPos.X() += (nWidth-pLineInfo->GetWidth())/2;
- pDev->DrawText( aPos, rStr, pLineInfo->GetIndex(), pLineInfo->GetLen() );
- aPos.Y() += nTextHeight;
- aPos.X() = rRect.Left();
- }
-
- // Gibt es noch eine letzte Zeile, dann diese linksbuendig ausgeben,
- // da die Zeile gekuerzt wurde
- if ( aLastLine.Len() )
- pDev->DrawText( aPos, aLastLine );
-
- // Clipping zuruecksetzen
- if ( nStyle & TEXT_DRAW_CLIP )
- {
- if ( bIsClipRegion )
- pDev->SetClipRegion( aOldRegion );
- else
- pDev->SetClipRegion();
- }
- }
- else
- {
- XubString aStr = rStr;
- Size aTextSize(pDev->GetTextWidth( aStr ), pDev->GetTextHeight());
-
- // Evt. Text kuerzen
- if ( aTextSize.Width() > nWidth )
- {
- if ( nStyle & TEXT_DRAW_ENDELLIPSIS )
- {
- aStr = GetEllipsisString( pDev, rStr, nWidth, nStyle );
- nStyle &= ~(TEXT_DRAW_CENTER | TEXT_DRAW_RIGHT);
- nStyle |= TEXT_DRAW_LEFT;
- aTextSize.Width() = pDev->GetTextWidth(aStr);
- }
- }
- else
- {
- if ( aTextSize.Height() <= nHeight )
- nStyle &= ~TEXT_DRAW_CLIP;
- }
-
- // Vertikales Alignment
- if ( nStyle & TEXT_DRAW_RIGHT )
- aPos.X() += nWidth-aTextSize.Width();
- else if ( nStyle & TEXT_DRAW_CENTER )
- aPos.X() += (nWidth-aTextSize.Width())/2;
-
- // Font Alignment
- if ( eAlign == ALIGN_BOTTOM )
- aPos.Y() += aTextSize.Height();
- else if ( eAlign == ALIGN_BASELINE )
- aPos.Y() += pDev->GetFontMetric().GetAscent();
-
- if ( nStyle & TEXT_DRAW_BOTTOM )
- aPos.Y() += nHeight-aTextSize.Height();
- else if ( nStyle & TEXT_DRAW_VCENTER )
- aPos.Y() += (nHeight-aTextSize.Height())/2;
-
- if ( nStyle & TEXT_DRAW_CLIP )
- {
- sal_Bool bIsClipRegion = pDev->IsClipRegion();
- if ( bIsClipRegion )
- {
- Region aOldRegion = pDev->GetClipRegion();
- pDev->IntersectClipRegion( rRect );
- pDev->DrawText( aPos, aStr );
- pDev->SetClipRegion( aOldRegion );
- }
- else
- {
- Region aRegion( rRect );
- pDev->SetClipRegion( aRegion );
- pDev->DrawText( aPos, aStr );
- pDev->SetClipRegion();
- }
- }
- else
- pDev->DrawText( aPos, aStr );
- }
-}
-
-// -----------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
-
-#define DRAWTEXT_FLAGS (TEXT_DRAW_CENTER|TEXT_DRAW_TOP|TEXT_DRAW_ENDELLIPSIS|\
- TEXT_DRAW_CLIP|TEXT_DRAW_MULTILINE|TEXT_DRAW_WORDBREAK)
-
-
-class ImpIcnCursor
-{
- SvImpIconView* pView;
- SvPtrarr* pColumns;
- SvPtrarr* pRows;
- sal_Bool* pGridMap;
- long nGridDX, nGridDY;
- long nGridCols, nGridRows;
- long nCols;
- long nRows;
- short nDeltaWidth;
- short nDeltaHeight;
- SvLBoxEntry* pCurEntry;
- void SetDeltas();
- void ImplCreate();
- void Create() { if( !pColumns ) ImplCreate(); }
-
- sal_uInt16 GetSortListPos( SvPtrarr* pList, long nValue, int bVertical);
- SvLBoxEntry* SearchCol(sal_uInt16 nCol,sal_uInt16 nTop,sal_uInt16 nBottom,sal_uInt16 nPref,
- sal_Bool bDown, sal_Bool bSimple );
- SvLBoxEntry* SearchRow(sal_uInt16 nRow,sal_uInt16 nRight,sal_uInt16 nLeft,sal_uInt16 nPref,
- sal_Bool bRight, sal_Bool bSimple );
-
- void CreateGridMap();
- // Rueckgabe sal_False: Eintrag liegt nicht in der GridMap. rGridx,y werden
- // dann an nGridCols, nGridRows geclippt
- sal_Bool GetGrid( const Point& rDocPos, sal_uInt16& rGridX, sal_uInt16& rGridY ) const;
- void SetGridUsed( sal_uInt16 nDX, sal_uInt16 nDY, sal_Bool bUsed )
- {
- pGridMap[ (nDY * nGridCols) + nDX ] = bUsed;
- }
-public:
- ImpIcnCursor( SvImpIconView* pOwner );
- ~ImpIcnCursor();
- void Clear( sal_Bool bGridToo = sal_True );
-
- // fuer Cursortravelling usw.
- SvLBoxEntry* GoLeftRight( SvLBoxEntry*, sal_Bool bRight );
- SvLBoxEntry* GoUpDown( SvLBoxEntry*, sal_Bool bDown );
-
- // Rueckgaebe: sal_False == Das leere Rect steht hinter dem letzten
- // Eintrag; d.h. beim naechsten Einfuegen ergibt sich das naechste
- // leere Rechteck durch Addition. Hinweis: Das Rechteck kann dann
- // ausserhalb des View-Space liegen
- sal_Bool FindEmptyGridRect( Rectangle& rRect );
-
- // Erzeugt fuer jede Zeile (Hoehe=nGridDY) eine nach BoundRect.Left()
- // sortierte Liste der Eintraege, die in ihr stehen. Eine Liste kann
- // leer sein. Die Listen gehen in das Eigentum des Rufenden ueber und
- // muessen mit DestroyGridAdjustData geloescht werden
- void CreateGridAjustData( SvPtrarr& pLists, SvLBoxEntry* pRow=0);
- static void DestroyGridAdjustData( SvPtrarr& rLists );
- void SetGridUsed( const Rectangle&, sal_Bool bUsed = sal_True );
-};
-
-
-
-
-SvImpIconView::SvImpIconView( SvIconView* pCurView, SvLBoxTreeList* pTree,
- WinBits i_nWinStyle ) :
- aVerSBar( pCurView, WB_DRAG | WB_VSCROLL ),
- aHorSBar( pCurView, WB_DRAG | WB_HSCROLL )
-{
- pView = pCurView;
- pModel = pTree;
- pCurParent = 0;
- pZOrderList = new SvPtrarr;
- SetStyle( i_nWinStyle );
- nHorDist = 0;
- nVerDist = 0;
- nFlags = 0;
- nCurUserEvent = 0;
- nMaxVirtWidth = 200;
- pDDRefEntry = 0;
- pDDDev = 0;
- pDDBufDev = 0;
- pDDTempDev = 0;
- eTextMode = ShowTextShort;
- pImpCursor = new ImpIcnCursor( this );
-
- aVerSBar.SetScrollHdl( LINK( this, SvImpIconView, ScrollUpDownHdl ) );
- aHorSBar.SetScrollHdl( LINK( this, SvImpIconView, ScrollLeftRightHdl ) );
- nHorSBarHeight = aHorSBar.GetSizePixel().Height();
- nVerSBarWidth = aVerSBar.GetSizePixel().Width();
-
- aMouseMoveTimer.SetTimeout( 20 );
- aMouseMoveTimer.SetTimeoutHdl(LINK(this,SvImpIconView,MouseMoveTimeoutHdl));
-
- aEditTimer.SetTimeout( 800 );
- aEditTimer.SetTimeoutHdl(LINK(this,SvImpIconView,EditTimeoutHdl));
-
- Clear( sal_True );
-}
-
-SvImpIconView::~SvImpIconView()
-{
- StopEditTimer();
- CancelUserEvent();
- delete pZOrderList;
- delete pImpCursor;
- delete pDDDev;
- delete pDDBufDev;
- delete pDDTempDev;
- ClearSelectedRectList();
-}
-
-void SvImpIconView::Clear( sal_Bool bInCtor )
-{
- StopEditTimer();
- CancelUserEvent();
- nMaxBmpWidth = 0;
- nMaxBmpHeight = 0;
- nMaxTextWidth = 0;
- bMustRecalcBoundingRects = sal_False;
- nMaxBoundHeight = 0;
-
- //XXX
- nFlags |= F_GRID_INSERT;
- nFlags &= ~F_PAINTED;
- SetNextEntryPos( Point( LROFFS_WINBORDER, TBOFFS_WINBORDER ) );
- pCursor = 0;
- if( !bInCtor )
- {
- pImpCursor->Clear();
- aVirtOutputSize.Width() = 0;
- aVirtOutputSize.Height() = 0;
- pZOrderList->Remove(0,pZOrderList->Count());
- MapMode aMapMode( pView->GetMapMode());
- aMapMode.SetOrigin( Point() );
- pView->SetMapMode( aMapMode );
- if( pView->IsUpdateMode() )
- pView->Invalidate();
- }
- AdjustScrollBars();
-}
-
-void SvImpIconView::SetStyle( const WinBits i_nWinStyle )
-{
- nViewMode = VIEWMODE_TEXT;
- if( i_nWinStyle & WB_NAME )
- nViewMode = VIEWMODE_NAME;
- if( i_nWinStyle & WB_ICON )
- nViewMode = VIEWMODE_ICON;
-}
-
-
-IMPL_LINK( SvImpIconView, ScrollUpDownHdl, ScrollBar *, pScrollBar )
-{
- pView->EndEditing( sal_True );
- // Pfeil hoch: delta=-1; Pfeil runter: delta=+1
- Scroll( 0, pScrollBar->GetDelta(), sal_True );
- return 0;
-}
-
-IMPL_LINK( SvImpIconView, ScrollLeftRightHdl, ScrollBar *, pScrollBar )
-{
- pView->EndEditing( sal_True );
- // Pfeil links: delta=-1; Pfeil rechts: delta=+1
- Scroll( pScrollBar->GetDelta(), 0, sal_True );
- return 0;
-}
-
-void SvImpIconView::ChangedFont()
-{
- StopEditTimer();
- ImpArrange();
-}
-
-
-void SvImpIconView::CheckAllSizes()
-{
- nMaxTextWidth = 0;
- nMaxBmpWidth = 0;
- nMaxBmpHeight = 0;
- SvLBoxEntry* pEntry = pModel->First();
- while( pEntry )
- {
- CheckSizes( pEntry );
- pEntry = pModel->Next( pEntry );
- }
-}
-
-void SvImpIconView::CheckSizes( SvLBoxEntry* pEntry,
- const SvIcnVwDataEntry* pViewData )
-{
- Size aSize;
-
- if( !pViewData )
- pViewData = ICNVIEWDATA(pEntry);
-
- SvLBoxString* pStringItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
- if( pStringItem )
- {
- aSize = GetItemSize( pView, pEntry, pStringItem, pViewData );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list