[Libreoffice-commits] .: 13 commits - autodoc/inc autodoc/source basctl/source basegfx/inc basegfx/Package_inc.mk basic/source bridges/inc canvas/inc canvas/Package_inc.mk canvas/source chart2/source connectivity/inc connectivity/Package_inc.mk connectivity/source cosv/inc cui/source dbaccess/inc dbaccess/source desktop/source desktop/win32 dtrans/source editeng/source editeng/util extensions/source filter/source forms/source formula/inc formula/source fpicker/source framework/inc framework/source i18npool/inc ios/qa lotuswordpro/source oox/source reportdesign/source sax/inc sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/sdi sfx2/source solenv/bin soltools/inc sot/inc sot/Package_inc.mk starmath/source stoc/source svl/inc svl/Package_inc.mk svtools/inc svtools/Package_inc.mk svtools/source svx/inc svx/Package_inc.mk svx/source sw/inc sw/source toolkit/inc toolkit/source toolkit/src2xml ucb/source unotools/inc unotools/Package_inc.mk uui/source vbahelper/inc vbahelper/Package_inc.mk vcl/i nc vcl/source vcl/unx wizards/AllLangResTarget_wwz.mk wizards/Module_wizards.mk wizards/source xml2cmp/source xmlhelp/source xmloff/inc xmloff/Package_inc.mk xmlsecurity/inc xmlsecurity/source xmlsecurity/tools
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Jun 27 04:37:01 PDT 2012
autodoc/inc/ary/info/docstore.hxx | 110
autodoc/source/ary/inc/loc_internalgate.hxx | 57
autodoc/source/ary/inc/sortedids.hxx | 231 -
basctl/source/basicide/brkdlg.src | 32
basctl/source/basicide/macrodlg.src | 28
basctl/source/basicide/moptions.src | 29
basctl/source/dlged/dlgresid.src | 38
basctl/source/dlged/managelang.src | 38
basegfx/Package_inc.mk | 1
basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx | 60
basic/source/classes/sb.src | 41
basic/source/sbx/format.src | 28
bridges/inc/bridges/cpp_uno/type_misc.hxx | 123
canvas/Package_inc.mk | 3
canvas/inc/canvas/base/basemutexhelper.hxx | 63
canvas/inc/canvas/base/doublebitmapbase.hxx | 145
canvas/inc/canvas/base/floatbitmapbase.hxx | 149
canvas/source/cairo/cairo_spritesurface.hxx | 64
canvas/source/tools/imagecachedprimitive.hxx | 60
chart2/source/controller/dialogs/res_LegendPosition.hxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc | 2
chart2/source/inc/Strings.hrc | 2
chart2/source/inc/servicenames_dlwrapper.hxx | 35
chart2/source/model/inc/DataSeriesTree.hxx | 85
connectivity/Package_inc.mk | 1
connectivity/inc/connectivity/DateConversion.hxx | 87
connectivity/source/drivers/hsqldb/HStorage.hxx | 111
connectivity/source/drivers/hsqldb/hsqlui.hrc | 2
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 1
connectivity/source/inc/UStringDescription_Impl.hxx | 99
connectivity/source/inc/ado/ACollection.hxx | 224 -
connectivity/source/inc/ado/AIndexColumn.hxx | 51
connectivity/source/inc/ado/AKeyColumn.hxx | 51
connectivity/source/inc/ado/AKeyColumns.hxx | 48
connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx | 186
connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx | 101
cosv/inc/cosv/commandline.hxx | 174
cosv/inc/cosv/tpl/funcall.hxx | 301 -
cui/source/customize/cfg.hrc | 2
cui/source/customize/cfg.src | 27
cui/source/dialogs/gallery.src | 2
cui/source/dialogs/hangulhanjadlg.src | 3
cui/source/dialogs/hlmarkwn.hrc | 2
cui/source/dialogs/iconcdlg.src | 28
cui/source/dialogs/linkdlg.cxx | 3
cui/source/dialogs/postdlg.src | 28
cui/source/dialogs/srchxtra.src | 41
cui/source/inc/gallery.hrc | 2
cui/source/options/connpooloptions.hrc | 2
cui/source/options/connpooloptions.src | 37
cui/source/options/optcolor.hrc | 5
cui/source/options/optcolor.src | 28
cui/source/options/optdict.src | 36
cui/source/options/optfltr.src | 35
cui/source/options/optgdlg.src | 2
cui/source/options/optgenrl.src | 36
cui/source/options/optjsearch.src | 52
cui/source/options/optlingu.hrc | 2
cui/source/options/optlingu.src | 1
cui/source/options/optsave.src | 47
cui/source/tabpages/autocdlg.hrc | 2
cui/source/tabpages/backgrnd.src | 36
cui/source/tabpages/bbdlg.src | 25
cui/source/tabpages/chardlg.src | 164
cui/source/tabpages/connect.src | 34
cui/source/tabpages/frmdirlbox.src | 24
cui/source/tabpages/labdlg.src | 24
cui/source/tabpages/macroass.src | 21
cui/source/tabpages/measure.src | 46
cui/source/tabpages/numfmt.src | 32
cui/source/tabpages/numpages.src | 39
cui/source/tabpages/page.src | 67
cui/source/tabpages/paragrph.hrc | 2
cui/source/tabpages/tabarea.hrc | 3
cui/source/tabpages/tabline.hrc | 14
cui/source/tabpages/tabline.src | 39
cui/source/tabpages/tabstpge.hrc | 2
cui/source/tabpages/textanim.src | 23
cui/source/tabpages/textattr.src | 33
cui/source/tabpages/transfrm.src | 88
dbaccess/inc/dbaccess_helpid.hrc | 2
dbaccess/source/inc/stringconstants.hrc | 2
dbaccess/source/ui/dlg/RelationDlg.hrc | 2
dbaccess/source/ui/dlg/adtabdlg.hrc | 2
dbaccess/source/ui/inc/dbu_dlg.hrc | 2
dbaccess/source/ui/inc/dbu_misc.hrc | 3
dbaccess/source/ui/inc/dbu_rel.hrc | 2
dbaccess/source/ui/inc/dbu_tbl.hrc | 2
dbaccess/source/ui/inc/dbu_uno.hrc | 2
dbaccess/source/ui/misc/WizardPages.hrc | 2
dbaccess/source/ui/querydesign/querydlg.hrc | 3
desktop/source/app/appinit.hxx | 44
desktop/source/deployment/gui/dp_gui_dialog2.src | 2
desktop/source/deployment/registry/sfwk/dp_sfwk.src | 2
desktop/win32/source/QuickStart/QuickStart.h | 32
dtrans/source/cnttype/wbench/testcnttype.cxx | 43
editeng/source/accessibility/accessibility.src | 2
editeng/source/items/page.src | 67
editeng/source/misc/lingu.src | 37
editeng/source/misc/unolingu.cxx | 6
editeng/source/outliner/outliner.src | 31
editeng/util/hidother.src | 2
extensions/source/bibliography/bib.src | 29
extensions/source/bibliography/datman.src | 18
extensions/source/bibliography/sections.src | 92
extensions/source/bibliography/toolbar.src | 7
extensions/source/dbpilots/dbpilots.src | 2
extensions/source/dbpilots/gridpages.src | 2
extensions/source/dbpilots/groupboxpages.src | 2
extensions/source/dbpilots/listcombopages.src | 17
extensions/source/propctrlr/stlops.hxx | 63
extensions/source/scanner/grid.src | 30
extensions/source/scanner/sanedlg.src | 36
filter/source/flash/impswfdialog.src | 18
filter/source/graphicfilter/eps/epsstr.src | 36
filter/source/pdf/pdf.src | 32
filter/source/xsltdialog/xmlfileview.src | 9
filter/source/xsltdialog/xmlfilterdialogstrings.src | 9
filter/source/xsltdialog/xmlfiltersettingsdialog.src | 12
filter/source/xsltdialog/xmlfiltertabdialog.src | 8
filter/source/xsltdialog/xmlfiltertabpagebasic.src | 8
filter/source/xsltdialog/xmlfiltertestdialog.src | 8
forms/source/xforms/xforms_services.hxx | 46
formula/inc/AddressConvention.hxx | 32
formula/source/core/resource/core_resource.src | 2
formula/source/ui/dlg/formdlgs.hrc | 2
formula/source/ui/dlg/formula.cxx | 4
fpicker/source/win32/filepicker/propmap.hxx | 104
framework/inc/classes/servicemanager.hxx | 282 -
framework/inc/dispatch/blankdispatcher.hxx | 123
framework/inc/dispatch/createdispatcher.hxx | 121
framework/inc/dispatch/selfdispatcher.hxx | 106
framework/inc/helper/fixeddocumentproperties.hxx | 60
framework/inc/helper/otasksaccess.hxx | 248 -
framework/inc/helper/otasksenumeration.hxx | 264 -
framework/inc/helper/timerhelper.hxx | 46
framework/inc/loadstate.h | 109
framework/inc/macros/debug/memorymeasure.hxx | 224 -
framework/inc/services/detectorfactory.hxx | 460 --
framework/inc/services/pluginframe.hxx | 367 -
framework/source/inc/loadenv/loadenv.hxx | 24
framework/source/inc/pattern/storages.hxx | 96
i18npool/inc/cclass_cjk.hxx | 89
ios/qa/sc/filters-test.m | 1
lotuswordpro/source/filter/lwpdefs.hxx | 202 -
lotuswordpro/source/filter/xfilter/xfconditionformat.hxx | 72
lotuswordpro/source/filter/xfilter/xfframetable.hxx | 89
lotuswordpro/source/filter/xfilter/xfpvector.hxx | 98
lotuswordpro/source/filter/xfilter/xfstylefamily.hxx | 74
lotuswordpro/source/filter/xfilter/xfsubject.hxx | 83
lotuswordpro/source/filter/xfilter/xftitle.hxx | 87
oox/source/drawingml/textbodypropertiescontext.cxx | 1
oox/source/dump/dumperbase.cxx | 1
reportdesign/source/filter/xml/xmlRow.hxx | 57
reportdesign/source/ui/dlg/Navigator.src | 18
sax/inc/sax/parser/saxparser.hxx | 141
sc/inc/sc.hrc | 1
sc/inc/scfuncs.hrc | 2
sc/source/filter/inc/fkttab.h | 39
sc/source/filter/inc/funktion.h | 43
sc/source/ui/app/inputhdl.cxx | 3
sc/source/ui/dbgui/scendlg.hrc | 2
sc/source/ui/inc/filter.hrc | 1
sc/source/ui/inc/fuedipo.hxx | 53
sc/source/ui/src/popup.src | 2
sd/inc/glob.hrc | 3
sd/inc/movedef.hxx | 35
sd/inc/sd_primitivetypes2d.hxx | 41
sd/source/filter/html/pubdlg.src | 31
sd/source/ui/accessibility/accessibility.src | 23
sd/source/ui/dlg/animobjs.src | 52
sd/source/ui/dlg/brkdlg.src | 20
sd/source/ui/dlg/copydlg.src | 49
sd/source/ui/dlg/custsdlg.src | 2
sd/source/ui/dlg/dlg_char.src | 38
sd/source/ui/dlg/dlgass.src | 27
sd/source/ui/dlg/dlgfield.src | 22
sd/source/ui/dlg/dlgpage.src | 33
sd/source/ui/dlg/headerfooterdlg.src | 2
sd/source/ui/dlg/ins_paste.src | 20
sd/source/ui/dlg/inspagob.src | 36
sd/source/ui/dlg/layeroptionsdlg.src | 45
sd/source/ui/dlg/masterlayoutdlg.src | 4
sd/source/ui/dlg/morphdlg.src | 33
sd/source/ui/dlg/paragr.src | 30
sd/source/ui/dlg/present.src | 8
sd/source/ui/dlg/prltempl.src | 36
sd/source/ui/dlg/prntopts.src | 32
sd/source/ui/dlg/sdpreslt.src | 31
sd/source/ui/dlg/tabtempl.src | 35
sd/source/ui/dlg/tpaction.src | 27
sd/source/ui/dlg/tpoption.src | 40
sd/source/ui/dlg/vectdlg.src | 36
sd/source/ui/inc/3dchld.hxx | 43
sd/source/ui/inc/CustomAnimation.hxx | 34
sd/source/ui/inc/ViewTabControl.hxx | 113
sd/source/ui/inc/animobjs.hrc | 2
sd/source/ui/inc/fugrid.hxx | 52
sd/source/ui/inc/navigatr.hrc | 4
sd/source/ui/inc/paragr.hrc | 2
sd/source/ui/inc/tpaction.hrc | 2
sd/source/ui/inc/unslsel.hxx | 44
sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | 313 -
sd/source/ui/toolpanel/ControlList.hxx | 53
sd/source/ui/toolpanel/ToolPanelDescriptor.hxx | 83
sfx2/inc/filedlghelper.hrc | 2
sfx2/inc/progind.hxx | 76
sfx2/inc/sfx2/sfx.hrc | 2
sfx2/inc/sfx2/sfxsids.hrc | 12
sfx2/sdi/sfx.sdi | 185
sfx2/source/appl/appbas.cxx | 7
sfx2/source/appl/appcfg.cxx | 19
sfx2/source/bastyp/bastyp.src | 34
sfx2/source/bastyp/fltfnc.src | 35
sfx2/source/dialog/alienwarn.src | 2
sfx2/source/dialog/dinfdlg.hrc | 2
sfx2/source/dialog/dinfedt.src | 32
sfx2/source/dialog/filedlghelper.src | 41
sfx2/source/dialog/mailwindow.src | 36
sfx2/source/dialog/mgetempl.src | 30
sfx2/source/dialog/newstyle.src | 31
sfx2/source/dialog/recfloat.src | 20
sfx2/source/dialog/sfxdlg.cxx | 1
sfx2/source/dialog/templdlg.src | 18
sfx2/source/dialog/versdlg.src | 25
sfx2/source/doc/doctdlg.src | 35
sfx2/source/doc/doctempl.src | 36
sfx2/source/doc/new.src | 31
sfx2/source/inc/hexplwnd.hxx | 94
sfx2/source/inc/mailmodel.hxx | 107
sfx2/source/inc/tplcomp.hxx | 208 -
sfx2/source/menu/menu.src | 7
solenv/bin/modules/installer/systemactions.pm | 2
soltools/inc/st_types.hxx | 33
sot/Package_inc.mk | 1
sot/inc/sot/absdev.hxx | 40
starmath/source/commands.src | 2
starmath/source/toolbox.src | 3
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx | 56
svl/Package_inc.mk | 2
svl/inc/svl/httpcook.hxx | 162
svl/inc/svl/pickerhelper.hxx | 63
svtools/Package_inc.mk | 1
svtools/inc/svtools/fltdefs.hxx | 120
svtools/inc/svtools/ttprops.hxx | 101
svtools/source/control/ruler.cxx | 6
svtools/source/dialogs/addresstemplate.src | 34
svtools/source/dialogs/so3res.src | 8
svtools/source/filter/exportdialog.src | 39
svtools/source/inc/filectrl.hrc | 2
svtools/source/inc/msgrd.hxx | 31
svtools/source/inc/msgwr.hxx | 31
svx/Package_inc.mk | 1
svx/inc/dgdefs_.hxx | 335 -
svx/inc/drawuiks.hxx | 67
svx/inc/lightdlg.hxx | 75
svx/inc/sjctrl.hxx | 588 --
svx/inc/svx/dialogs.hrc | 3
svx/inc/svx/hyprlink.hxx | 36
svx/inc/svx/svdstr.hrc | 2
svx/inc/svx/svimbase.hxx | 208 -
svx/source/accessibility/accessibility.src | 52
svx/source/dialog/bmpmask.hrc | 2
svx/source/dialog/contdlg.src | 38
svx/source/dialog/ctredlin.hrc | 2
svx/source/dialog/ctredlin.src | 38
svx/source/dialog/dlgctrl.src | 2
svx/source/dialog/fontwork.src | 48
svx/source/dialog/hdft.src | 39
svx/source/dialog/hyprdlg.hxx | 136
svx/source/dialog/language.src | 27
svx/source/dialog/optgrid.src | 33
svx/source/dialog/passwd.src | 34
svx/source/dialog/prtqry.src | 28
svx/source/dialog/ruler.src | 30
svx/source/dialog/sdstring.src | 2
svx/source/engine3d/string3d.src | 34
svx/source/fmcomp/gridctrl.src | 53
svx/source/form/fmexpl.src | 27
svx/source/inc/fmgroup.hxx | 120
svx/source/mnuctrls/mnuctrls.src | 4
svx/source/tbxctrls/colrctrl.src | 2
svx/source/tbxctrls/extrusioncontrols.src | 2
svx/source/tbxctrls/grafctrl.src | 35
svx/source/tbxctrls/tbcontrl.src | 2
sw/inc/access.hrc | 2
sw/inc/comcore.hrc | 3
sw/inc/dbui.hrc | 2
sw/inc/envelp.hrc | 2
sw/inc/fldinit.hxx | 39
sw/inc/inetfld.hxx | 108
sw/inc/newhdl.hxx | 64
sw/inc/pageiter.hxx | 46
sw/inc/poolfmt.hrc | 2
sw/inc/redlnaut.hxx | 48
sw/inc/statstr.hrc | 3
sw/inc/swgstr.hxx | 152
sw/inc/unomap.hxx | 2
sw/source/core/inc/drawdev.hxx | 115
sw/source/core/inc/toxhlp.hxx | 78
sw/source/core/view/viewsh.cxx | 3
sw/source/filter/inc/fltbase.hxx | 118
sw/source/ui/chrdlg/break.hrc | 2
sw/source/ui/chrdlg/chardlg.src | 41
sw/source/ui/chrdlg/chrdlg.src | 30
sw/source/ui/chrdlg/drpcps.src | 39
sw/source/ui/chrdlg/numpara.hrc | 4
sw/source/ui/chrdlg/numpara.src | 42
sw/source/ui/chrdlg/paradlg.src | 27
sw/source/ui/chrdlg/swbreak.src | 36
sw/source/ui/config/optdlg.src | 40
sw/source/ui/config/optpage.cxx | 3
sw/source/ui/config/redlopt.src | 41
sw/source/ui/dbui/createaddresslistdialog.src | 2
sw/source/ui/dbui/mmaddressblockpage.hrc | 2
sw/source/ui/dbui/mmdocselectpage.src | 3
sw/source/ui/dbui/mmgreetingspage.hrc | 2
sw/source/ui/dbui/mmgreetingspage.src | 2
sw/source/ui/dbui/mmlayoutpage.src | 3
sw/source/ui/dbui/mmmergepage.hrc | 2
sw/source/ui/dbui/mmmergepage.src | 3
sw/source/ui/dbui/mmoutputtypepage.hrc | 2
sw/source/ui/dbui/mmoutputtypepage.src | 3
sw/source/ui/dbui/mmpreparemergepage.hrc | 2
sw/source/ui/dbui/mmpreparemergepage.src | 2
sw/source/ui/dialog/abstract.src | 34
sw/source/ui/dialog/ascfldlg.hrc | 2
sw/source/ui/dialog/ascfldlg.src | 37
sw/source/ui/dialog/docstdlg.src | 36
sw/source/ui/dochdl/selglos.src | 34
sw/source/ui/docvw/access.src | 2
sw/source/ui/envelp/envelp.src | 33
sw/source/ui/envelp/envfmt.src | 35
sw/source/ui/envelp/envlop.hrc | 2
sw/source/ui/envelp/envlop.src | 30
sw/source/ui/envelp/label.src | 69
sw/source/ui/envelp/labfmt.src | 33
sw/source/ui/envelp/labprt.hrc | 2
sw/source/ui/envelp/labprt.src | 27
sw/source/ui/envelp/mailmrge.hrc | 2
sw/source/ui/fldui/DropDownFieldDialog.src | 32
sw/source/ui/fldui/changedb.hrc | 2
sw/source/ui/fldui/changedb.src | 2
sw/source/ui/fldui/flddb.src | 34
sw/source/ui/fldui/flddinf.src | 31
sw/source/ui/fldui/flddok.src | 32
sw/source/ui/fldui/fldfunc.src | 35
sw/source/ui/fldui/fldtdlg.src | 28
sw/source/ui/fldui/fldvar.src | 32
sw/source/ui/fldui/inpdlg.src | 33
sw/source/ui/fldui/javaedit.src | 31
sw/source/ui/frmdlg/column.src | 2
sw/source/ui/frmdlg/frmpage.src | 7
sw/source/ui/inc/cfgdesc.hxx | 62
sw/source/ui/index/cnttab.hrc | 4
sw/source/ui/index/cnttab.src | 4
sw/source/ui/index/idxmrk.src | 42
sw/source/ui/index/multmrk.src | 31
sw/source/ui/lingu/olmenu.hrc | 4
sw/source/ui/misc/autocorr.src | 2
sw/source/ui/misc/bookmark.src | 34
sw/source/ui/misc/glosbib.src | 36
sw/source/ui/misc/glossary.src | 2
sw/source/ui/misc/insfnote.hrc | 2
sw/source/ui/misc/insfnote.src | 33
sw/source/ui/misc/insrule.src | 37
sw/source/ui/misc/linenum.src | 34
sw/source/ui/misc/num.src | 24
sw/source/ui/misc/numberingtypelistbox.src | 36
sw/source/ui/misc/redlndlg.src | 23
sw/source/ui/misc/srtdlg.src | 51
sw/source/ui/ribbar/inputwin.hrc | 17
sw/source/ui/ribbar/inputwin.src | 37
sw/source/ui/ribbar/tbxanchr.src | 37
sw/source/ui/shells/shells.src | 2
sw/source/ui/table/chartins.src | 2
sw/source/ui/table/colwd.src | 34
sw/source/ui/table/convert.hrc | 2
sw/source/ui/table/convert.src | 5
sw/source/ui/table/instable.src | 2
sw/source/ui/table/mergetbl.src | 37
sw/source/ui/table/rowht.src | 30
sw/source/ui/table/splittbl.src | 34
sw/source/ui/table/table.src | 27
sw/source/ui/table/tabledlg.cxx | 4
sw/source/ui/table/tautofmt.src | 50
sw/source/ui/uiview/view0.cxx | 1
sw/source/ui/utlui/gloslst.src | 32
sw/source/ui/utlui/initui.src | 98
sw/source/ui/utlui/navipi.src | 2
sw/source/ui/utlui/poolfmt.src | 2
sw/source/ui/utlui/unotools.src | 34
sw/source/ui/web/web.src | 2
toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx | 1
toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx | 1
toolkit/source/awt/forward.hxx | 67
toolkit/src2xml/src.lst | 1
ucb/source/ucp/ftp/test_interactionhandler.hxx | 69
unotools/Package_inc.mk | 1
unotools/inc/unotools/querydeep.hxx | 479 --
unotools/inc/unotools/useroptions_const.hxx | 37
uui/source/fltdlg.src | 34
uui/source/ids.src | 27
uui/source/masterpasscrtdlg.src | 21
uui/source/masterpassworddlg.src | 21
uui/source/mphndl.hxx | 89
uui/source/passworderrs.src | 22
vbahelper/Package_inc.mk | 1
vbahelper/inc/vbahelper/weakreference.hxx | 88
vcl/inc/aqua/aquavclevents.hxx | 90
vcl/inc/aqua/salfontutils.hxx | 59
vcl/inc/unx/tde/tdedata.hxx | 114
vcl/inc/unx/x11_cursors/drawcrook_curs.h | 45
vcl/inc/unx/x11_cursors/drawcrook_mask.h | 43
vcl/inc/unx/x11_cursors/drawcrop_curs.h | 45
vcl/inc/unx/x11_cursors/drawcrop_mask.h | 43
vcl/inc/unx/x11_cursors/drawmirror_curs.h | 45
vcl/inc/unx/x11_cursors/drawmirror_mask.h | 43
vcl/source/app/svmain.cxx | 10
vcl/source/window/dialog.cxx | 17
vcl/unx/generic/gdi/dtsetenum.hxx | 140
wizards/AllLangResTarget_wwz.mk | 41
wizards/Module_wizards.mk | 1
wizards/source/importwizard/importwi.src | 117
wizards/source/webwizard/webwizar.src | 158
xml2cmp/source/inc/lst_str.h | 92
xml2cmp/source/inc/new_del.h | 48
xml2cmp/source/inc/str.h | 64
xml2cmp/source/inc/textbuff.h | 78
xml2cmp/source/inc/textfile.h | 69
xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx | 44
xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx | 64
xmloff/Package_inc.mk | 2
xmloff/inc/xmloff/PropertySetInfoKey.hxx | 61
xmloff/inc/xmloff/txtstyle.hxx | 54
xmloff/inc/xmloff/xmlkywd.hxx | 1990 ----------
xmlsecurity/inc/xmlsecurity/sigstruct.hxx | 11
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 2
xmlsecurity/tools/standalone/csfit/helper.cxx | 2
xmlsecurity/tools/standalone/csfit/helper.hxx | 3
440 files changed, 10 insertions(+), 21412 deletions(-)
New commits:
commit bbac35af148ed6c9f19386e4721fa38b500f45a1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jun 26 19:14:44 2012 +0200
Remove unused header files
These were only referenced by Package_inc.mk...
Change-Id: Idc771477595b9d221f9f2003b293fdd1ba7e1588
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
index 390c77f..76d40ab 100644
--- a/basegfx/Package_inc.mk
+++ b/basegfx/Package_inc.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygon
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygontools.hxx,basegfx/polygon/b2dpolypolygontools.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dtrapezoid.hxx,basegfx/polygon/b2dtrapezoid.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygon.hxx,basegfx/polygon/b3dpolygon.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygonclipper.hxx,basegfx/polygon/b3dpolygonclipper.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygontools.hxx,basegfx/polygon/b3dpolygontools.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygon.hxx,basegfx/polygon/b3dpolypolygon.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygontools.hxx,basegfx/polygon/b3dpolypolygontools.hxx))
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
deleted file mode 100644
index d1bce0e..0000000
--- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
+++ /dev/null
@@ -1,60 +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 _BGFX_POLYPOLYGON_B3DPOLYGONCLIPPER_HXX
-#define _BGFX_POLYPOLYGON_B3DPOLYGONCLIPPER_HXX
-
-#include <basegfx/polygon/b3dpolypolygon.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
-#include <basegfx/basegfxdllapi.h>
-
-//////////////////////////////////////////////////////////////////////////////
-
-namespace basegfx
-{
- // predefinitions
- class B3DRange;
- class B2DRange;
-
- namespace tools
- {
- /** define for deciding one of X,Y,Z directions
- */
- enum B3DOrientation
- {
- B3DORIENTATION_X, // X-Axis
- B3DORIENTATION_Y, // Y-Axis
- B3DORIENTATION_Z // Z-Axis
- };
-
- } // end of namespace tools
-} // end of namespace basegfx
-
-#endif /* _BGFX_POLYPOLYGON_B3DPOLYGONCLIPPER_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/Package_inc.mk b/canvas/Package_inc.mk
index 500ed44..f5fa6b5 100644
--- a/canvas/Package_inc.mk
+++ b/canvas/Package_inc.mk
@@ -27,15 +27,12 @@
#*************************************************************************
$(eval $(call gb_Package_Package,canvas_inc,$(SRCDIR)/canvas/inc))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/basemutexhelper.hxx,canvas/base/basemutexhelper.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bitmapcanvasbase.hxx,canvas/base/bitmapcanvasbase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bufferedgraphicdevicebase.hxx,canvas/base/bufferedgraphicdevicebase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/cachedprimitivebase.hxx,canvas/base/cachedprimitivebase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvasbase.hxx,canvas/base/canvasbase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritebase.hxx,canvas/base/canvascustomspritebase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritehelper.hxx,canvas/base/canvascustomspritehelper.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/doublebitmapbase.hxx,canvas/base/doublebitmapbase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/floatbitmapbase.hxx,canvas/base/floatbitmapbase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/graphicdevicebase.hxx,canvas/base/graphicdevicebase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/integerbitmapbase.hxx,canvas/base/integerbitmapbase.hxx))
$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/sprite.hxx,canvas/base/sprite.hxx))
diff --git a/canvas/inc/canvas/base/basemutexhelper.hxx b/canvas/inc/canvas/base/basemutexhelper.hxx
deleted file mode 100644
index f53138c..0000000
--- a/canvas/inc/canvas/base/basemutexhelper.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CANVAS_BASEMUTEXHELPER_HXX
-#define INCLUDED_CANVAS_BASEMUTEXHELPER_HXX
-
-#include <osl/mutex.hxx>
-
-
-/* Definition of the BaseMutexHelper class */
-
-namespace canvas
-{
- /** Base class, deriving from ::comphelper::OBaseMutex and
- initializing its own baseclass with m_aMutex.
-
- This is necessary to make the CanvasBase, GraphicDeviceBase,
- etc. classes freely combinable - letting them perform this
- initialization would prohibit deriving e.g. CanvasBase from
- GraphicDeviceBase.
- */
- template< class Base > class BaseMutexHelper : public Base
- {
- public:
- typedef Base BaseType;
-
- /** Construct BaseMutexHelper
-
- This method is the whole purpose of this template:
- initializing a base class with the provided m_aMutex
- member (the WeakComponentImplHelper templates need that,
- as they require the lifetime of the mutex to extend
- theirs).
- */
- BaseMutexHelper() :
- BaseType( m_aMutex )
- {
- }
-
-protected:
- mutable ::osl::Mutex m_aMutex;
- };
-}
-
-#endif /* INCLUDED_CANVAS_BASEMUTEXHELPER_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/canvas/base/doublebitmapbase.hxx b/canvas/inc/canvas/base/doublebitmapbase.hxx
deleted file mode 100644
index 8ca808d..0000000
--- a/canvas/inc/canvas/base/doublebitmapbase.hxx
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CANVAS_DOUBLEBITMAPBASE_HXX
-#define INCLUDED_CANVAS_DOUBLEBITMAPBASE_HXX
-
-#include <com/sun/star/rendering/XIeeeDoubleBitmap.hpp>
-#include <canvas/bitmapcanvasbase.hxx>
-
-
-namespace canvas
-{
- /** Helper template to handle XIeeeDoubleBitmap method forwarding to
- BitmapCanvasHelper
-
- Use this helper to handle the XIeeeDoubleBitmap part of your
- implementation.
-
- @tpl Base
- Base class to use, most probably one of the
- WeakComponentImplHelperN templates with the appropriate
- interfaces. At least XIeeeDoubleBitmap should be among them (why
- else would you use this template, then?). Base class must have
- an Base( const Mutex& ) constructor (like the
- WeakComponentImplHelperN templates have).
-
- @tpl CanvasHelper
- Canvas helper implementation for the backend in question
-
- @tpl Mutex
- Lock strategy to use. Defaults to using the
- OBaseMutex-provided lock. Everytime one of the methods is
- entered, an object of type Mutex is created with m_aMutex as
- the sole parameter, and destroyed again when the method scope
- is left.
-
- @tpl UnambiguousBase
- Optional unambiguous base class for XInterface of Base. It's
- sometimes necessary to specify this parameter, e.g. if Base
- derives from multiple UNO interface (were each provides its
- own version of XInterface, making the conversion ambiguous)
-
- @see CanvasBase for further contractual requirements towards
- the CanvasHelper type, and some examples.
- */
- template< class Base,
- class CanvasHelper,
- class Mutex=::osl::MutexGuard,
- class UnambiguousBase=::com::sun::star::uno::XInterface > class DoubleBitmapBase :
- public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
- {
- public:
- typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType;
-
- // XIeeeDoubleBitmap
- virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::rendering::VolatileContentDestroyedException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(rect, this);
- verifyIndexRange(rect, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maCanvasHelper.getData( bitmapLayout,
- rect );
- }
-
- virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< double >& data,
- const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(bitmapLayout, rect, this);
- verifyIndexRange(rect, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- BaseType::mbSurfaceDirty = true;
- BaseType::maCanvasHelper.modifying();
-
- BaseType::maCanvasHelper.setData( data, bitmapLayout, rect );
- }
-
- virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< double >& color,
- const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(bitmapLayout, pos, this);
- verifyIndexRange(pos, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- BaseType::mbSurfaceDirty = true;
- BaseType::maCanvasHelper.modifying();
-
- BaseType::maCanvasHelper.setPixel( color, bitmapLayout, pos );
- }
-
- virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::rendering::VolatileContentDestroyedException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(pos, this);
- verifyIndexRange(pos, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maCanvasHelper.getPixel( bitmapLayout,
- pos );
- }
-
- virtual ::com::sun::star::rendering::FloatingPointBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException)
- {
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maCanvasHelper.getMemoryLayout();
- }
- };
-}
-
-#endif /* INCLUDED_CANVAS_DOUBLEBITMAPBASE_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/canvas/base/floatbitmapbase.hxx b/canvas/inc/canvas/base/floatbitmapbase.hxx
deleted file mode 100644
index 597bc04..0000000
--- a/canvas/inc/canvas/base/floatbitmapbase.hxx
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CANVAS_FLOATBITMAPBASE_HXX
-#define INCLUDED_CANVAS_FLOATBITMAPBASE_HXX
-
-#include <com/sun/star/rendering/XIeeeFloatBitmap.hpp>
-#include <canvas/bitmapcanvasbase.hxx>
-
-
-namespace canvas
-{
- /** Helper template to handle XIeeeFloatBitmap method forwarding to
- BitmapCanvasHelper
-
- Use this helper to handle the XIeeeFloatBitmap part of your
- implementation.
-
- @tpl Base
- Base class to use, most probably one of the
- WeakComponentImplHelperN templates with the appropriate
- interfaces. At least XIeeeFloatBitmap should be among them (why
- else would you use this template, then?). Base class must have
- an Base( const Mutex& ) constructor (like the
- WeakComponentImplHelperN templates have).
-
- @tpl CanvasHelper
- Canvas helper implementation for the backend in question
-
- @tpl Mutex
- Lock strategy to use. Defaults to using the
- OBaseMutex-provided lock. Everytime one of the methods is
- entered, an object of type Mutex is created with m_aMutex as
- the sole parameter, and destroyed again when the method scope
- is left.
-
- @tpl UnambiguousBase
- Optional unambiguous base class for XInterface of Base. It's
- sometimes necessary to specify this parameter, e.g. if Base
- derives from multiple UNO interface (were each provides its
- own version of XInterface, making the conversion ambiguous)
-
- @see CanvasBase for further contractual requirements towards
- the CanvasHelper type, and some examples.
- */
- template< class Base,
- class CanvasHelper,
- class Mutex=::osl::MutexGuard,
- class UnambiguousBase=::com::sun::star::uno::XInterface > class FloatBitmapBase :
- public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
- {
- public:
- typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType;
-
- // XIeeeFloatBitmap
- virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::rendering::VolatileContentDestroyedException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(rect,
- static_cast< typename BaseType::UnambiguousBaseType* >(this));
- verifyIndexRange(rect, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maCanvasHelper.getData( bitmapLayout,
- rect );
- }
-
- virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< float >& data,
- const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(bitmapLayout, rect,
- static_cast< typename BaseType::UnambiguousBaseType* >(this));
- verifyIndexRange(rect, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- BaseType::mbSurfaceDirty = true;
- BaseType::maCanvasHelper.modifying();
-
- BaseType::maCanvasHelper.setData( data, bitmapLayout, rect );
- }
-
- virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< float >& color,
- const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(bitmapLayout, pos,
- static_cast< typename BaseType::UnambiguousBaseType* >(this));
- verifyIndexRange(pos, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- BaseType::mbSurfaceDirty = true;
- BaseType::maCanvasHelper.modifying();
-
- BaseType::maCanvasHelper.setPixel( color, bitmapLayout, pos );
- }
-
- virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::rendering::VolatileContentDestroyedException,
- ::com::sun::star::uno::RuntimeException)
- {
- verifyInput(pos,
- static_cast< typename BaseType::UnambiguousBaseType* >(this));
- verifyIndexRange(pos, getSize() );
-
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maCanvasHelper.getPixel( bitmapLayout,
- pos );
- }
-
- virtual ::com::sun::star::rendering::FloatingPointBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException)
- {
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maCanvasHelper.getMemoryLayout();
- }
- };
-}
-
-#endif /* INCLUDED_CANVAS_FLOATBITMAPBASE_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/Package_inc.mk b/connectivity/Package_inc.mk
index 3325e60..6c2b42d 100644
--- a/connectivity/Package_inc.mk
+++ b/connectivity/Package_inc.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/BlobHelper.h
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/CommonTools.hxx,CommonTools.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,conncleanup.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ConnectionWrapper.hxx,ConnectionWrapper.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/DateConversion.hxx,DateConversion.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbcharset.hxx,dbcharset.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbconversion.hxx,dbconversion.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbexception.hxx,dbexception.hxx))
diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx
deleted file mode 100644
index 7a6a9e4..0000000
--- a/connectivity/inc/connectivity/DateConversion.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _CONNECTIVITY_DATECONVERSION_HXX_
-#define _CONNECTIVITY_DATECONVERSION_HXX_
-
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/DateTime.hpp>
-#include "connectivity/dbtoolsdllapi.hxx"
-
-namespace connectivity
-{
- class OOO_DLLPUBLIC_DBTOOLS DateConversion
- {
- public:
- static sal_Int32 toINT32(const ::com::sun::star::util::Date&)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return 0;
- }
- static sal_Int32 toINT32(const ::com::sun::star::util::Time&)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return 0;
- }
- static sal_Int64 toINT64(const ::com::sun::star::util::DateTime&)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return 0;
- }
- static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time&)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return 0;
- }
- static double toDouble(const ::com::sun::star::util::Date&)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return 0;
- }
- static double toDouble(const ::com::sun::star::util::Time&)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return 0;
- }
- static double toDouble(const ::com::sun::star::util::DateTime&)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return 0;
- }
- static ::com::sun::star::util::Date toDate(double,const ::com::sun::star::util::Date& =::com::sun::star::util::Date(01,01,1900))
- {
- OSL_FAIL("Please use DBConversion instead!");
- return ::com::sun::star::util::Date();
- }
- static ::com::sun::star::util::Time toTime(double)
- {
- OSL_FAIL("Please use DBConversion instead!");
- return ::com::sun::star::util::Time();
- }
- static ::com::sun::star::util::DateTime toDateTime(double,const ::com::sun::star::util::Date& =::com::sun::star::util::Date(01,01,1900))
- {
- OSL_FAIL("Please use DBConversion instead!");
- return ::com::sun::star::util::DateTime();
- }
- };
-}
-#endif // _CONNECTIVITY_DATECONVERSION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cosv/inc/cosv/commandline.hxx b/cosv/inc/cosv/commandline.hxx
deleted file mode 100644
index 92afd1d..0000000
--- a/cosv/inc/cosv/commandline.hxx
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef CSV_COMMANDLINE_HXX
-#define CSV_COMMANDLINE_HXX
-
-#include <cosv/string.hxx>
-
-
-
-
-namespace csv
-{
-
-/** Does the standards in handling command line parameters.
-
- This class provides a default behaviour this way:
-
- * Each option can have several forms
-
- like: "-f" and "--file"
-
- which are identified by having the same id.
- The option id is used when calling ->do_HandleOption().
-
- * For each recognized option together with its parameters
- ->do_HandleOption() is called.
-
- * For the first unrecognized argument ->do_HandleFreeArgument() is
- called.
- After the first unrecognized argument, ->do_HandleFreeArgument()
- is called for all remaining arguments.
-
- @howtoderive
- - Overwrite ->do_HandleOption() to act on all known options.
- Overwrite ->do_HandleFreeArgument() to act on additional
- arguments not connected to an option.
-*/
-class CommandLine
-{
- public:
- // LIFECYCLE
- virtual ~CommandLine() {}
-
- // OPERATIONS
- bool Interpret(
- int argc,
- char * argv[] );
- // INQUIRY
- const StringVector &
- Arguments() const;
- bool IsOk() const;
-
- protected:
- CommandLine();
- void Add_Option(
- intt i_id,
- String i_text );
- void Set_Error();
-
- private:
- // public for use by struct commandline.cxx-anonymous::FindOptionByText;
- struct OptionDescription
- {
- intt nId;
- String sText;
-
- OptionDescription(
- intt i_id,
- String i_text );
- }; private:
-
- struct FindOptionByText;
-
- typedef std::vector<OptionDescription> OptionList;
- typedef std::vector<StringVector::const_iterator> StringCIteratorList;
- typedef std::vector<intt> OptionIdList;
-
- // Locals
- void Get_Arguments(
- int argc,
- char * argv[] );
- intt Find_Option(
- const String & i_text ) const;
- bool Store_Argument(
- const String & i_arg );
- void Find_OptionPoints();
- void Handle_FreeArguments(
- StringVector::const_iterator
- i_begin,
- StringVector::const_iterator
- i_end );
-
- // Helpers for options included via file
- bool Try2Include_Options(
- const String & i_optionsFile );
- bool Include_Options(
- const String & i_optionsFile );
- bool Load_Options(
- StreamStr & o_text,
- const String & i_optionsFile );
-
- /** Handles an option found in the command line.
- Needs to be overwritten.
-
- @return
- The first argument within the range
- i_next_argument .. i_comandLine_end that does not belong as a
- parameter to the handled option.
- */
- virtual StringVector::const_iterator
- do_HandleOption(
- intt i_id,
- StringVector::const_iterator
- i_paramsBegin,
- StringVector::const_iterator
- i_paramsEnd ) = 0;
- /** Handles arguments on the command line that do not belong to
- an option.
- */
- virtual void do_HandleFreeArgument(
- const String & i_argument ) = 0;
- // DATA
- OptionList aOptions;
-
- /// Used during and after ->GetArguments()
- StringVector aCommandLine;
- StringCIteratorList aOptionPoints;
- OptionIdList aOptionIds;
- bool bIsOk;
-};
-
-
-inline const StringVector &
-CommandLine::Arguments() const
-{
- return aCommandLine;
-}
-
-inline bool
-CommandLine::IsOk() const
-{
- return bIsOk;
-}
-
-inline void
-CommandLine::Set_Error()
-{
- bIsOk = false;
-}
-
-
-
-
-} // namespace csv
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/Package_inc.mk b/sot/Package_inc.mk
index 3cee056..371ab98 100644
--- a/sot/Package_inc.mk
+++ b/sot/Package_inc.mk
@@ -18,7 +18,6 @@
#
$(eval $(call gb_Package_Package,sot_inc,$(SRCDIR)/sot/inc))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/absdev.hxx,sot/absdev.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/clsids.hxx,sot/clsids.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/exchange.hxx,sot/exchange.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/factory.hxx,sot/factory.hxx))
diff --git a/sot/inc/sot/absdev.hxx b/sot/inc/sot/absdev.hxx
deleted file mode 100644
index 2c581fb..0000000
--- a/sot/inc/sot/absdev.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SOT_ABSDEV_HXX
-#define _SOT_ABSDEV_HXX
-
-#include <tools/solar.h>
-
-class JobSetup;
-class AbstractDeviceData
-{
-protected:
- JobSetup * pJobSetup;
-public:
- virtual ~AbstractDeviceData() {}
- virtual AbstractDeviceData * Copy() const = 0;
- virtual sal_Bool Equals( const AbstractDeviceData & ) const = 0;
-
- JobSetup * GetJobSetup() const { return pJobSetup; }
-};
-
-#endif // _SOT_ABSDEV_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index dd71260..525c3ac 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/fold
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx))
@@ -89,7 +88,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx))
diff --git a/svl/inc/svl/httpcook.hxx b/svl/inc/svl/httpcook.hxx
deleted file mode 100644
index 2da2668..0000000
--- a/svl/inc/svl/httpcook.hxx
+++ /dev/null
@@ -1,162 +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 SVTOOLS_HTTPCOOK_HXX
-#define SVTOOLS_HTTPCOOK_HXX
-
-#include <tools/datetime.hxx>
-#include <tools/stream.hxx>
-#include <tools/string.hxx>
-#include <svl/poolitem.hxx>
-#include <vector>
-
-/*=======================================================================
- *
- *=====================================================================*/
-#define CNTHTTP_COOKIE_FLAG_SECURE 0x01
-
-#define CNTHTTP_COOKIE_POLICY_INTERACTIVE 0x00
-#define CNTHTTP_COOKIE_POLICY_ACCEPTED 0x01
-#define CNTHTTP_COOKIE_POLICY_BANNED 0x02
-
-#define CNTHTTP_COOKIE_DOMAIN_POLICY 0x10
-
-#define CNTHTTP_COOKIE_DOMAIN_ACCEPTED \
- (CNTHTTP_COOKIE_DOMAIN_POLICY | CNTHTTP_COOKIE_POLICY_ACCEPTED)
-#define CNTHTTP_COOKIE_DOMAIN_BANNED \
- (CNTHTTP_COOKIE_DOMAIN_POLICY | CNTHTTP_COOKIE_POLICY_BANNED)
-
-/*=======================================================================
- *
- * CntHTTPCookie.
- *
- *=====================================================================*/
-struct CntHTTPCookie
-{
- String m_aName;
- String m_aValue;
- String m_aDomain;
- String m_aPath;
- DateTime m_aExpires;
- sal_uInt16 m_nFlags;
- sal_uInt16 m_nPolicy;
-
- CntHTTPCookie (void)
- : m_aExpires (Date(0), Time(0)),
- m_nFlags (0),
- m_nPolicy (CNTHTTP_COOKIE_POLICY_INTERACTIVE)
- {}
-
- sal_Bool replaces (const CntHTTPCookie& rOther) const
- {
- return ((m_aDomain == rOther.m_aDomain) &&
- (m_aPath == rOther.m_aPath ) &&
- (m_aName == rOther.m_aName ) );
- }
-
- sal_Bool operator== (const CntHTTPCookie& rOther) const
- {
- return ((m_aName == rOther.m_aName ) &&
- (m_aValue == rOther.m_aValue ) &&
- (m_aDomain == rOther.m_aDomain ) &&
- (m_aPath == rOther.m_aPath ) &&
- (m_aExpires == rOther.m_aExpires) &&
- (m_nFlags == rOther.m_nFlags ) &&
- (m_nPolicy == rOther.m_nPolicy ) );
- }
-
- void write (SvStream& rStrm) const
- {
- SfxPoolItem::writeUnicodeString(rStrm, m_aName);
- SfxPoolItem::writeUnicodeString(rStrm, m_aValue);
- SfxPoolItem::writeUnicodeString(rStrm, m_aDomain);
- SfxPoolItem::writeUnicodeString(rStrm, m_aPath);
-
- rStrm << m_aExpires.GetDate();
- rStrm << m_aExpires.GetTime();
-
- rStrm << m_nFlags;
- rStrm << m_nPolicy;
- }
-
- void read (SvStream& rStrm, bool bUnicode)
- {
- m_aName = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
- m_aValue = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
- m_aDomain = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
- m_aPath = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
-
- sal_uInt32 nValue = 0;
- rStrm >> nValue;
- m_aExpires.SetDate (nValue);
- rStrm >> nValue;
- m_aExpires.SetTime (nValue);
-
- rStrm >> m_nFlags;
- rStrm >> m_nPolicy;
- }
-};
-
-/*=======================================================================
- *
- * CntHTTPCookieRequest.
- *
- *=====================================================================*/
-enum CntHTTPCookieRequestType
-{
- CNTHTTP_COOKIE_REQUEST_RECV = 0,
- CNTHTTP_COOKIE_REQUEST_SEND
-};
-
-typedef ::std::vector< CntHTTPCookie* > CntHTTPCookieList_impl;
-
-struct CntHTTPCookieRequest
-{
- const String& m_rURL;
- CntHTTPCookieList_impl& m_rCookieList;
- CntHTTPCookieRequestType m_eType;
- sal_uInt16 m_nRet;
-
- CntHTTPCookieRequest (
- const String& rURL,
- CntHTTPCookieList_impl& rCookieList,
- CntHTTPCookieRequestType eType)
- : m_rURL (rURL),
- m_rCookieList (rCookieList),
- m_eType(eType),
- m_nRet (CNTHTTP_COOKIE_POLICY_BANNED) {}
- ~CntHTTPCookieRequest() {
- for ( size_t i = 0, n = m_rCookieList.size(); i < n; ++i ) {
- delete m_rCookieList[ i ];
- }
- }
-};
-
-#endif // SVTOOLS_HTTPCOOK_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/inc/svl/pickerhelper.hxx b/svl/inc/svl/pickerhelper.hxx
deleted file mode 100644
index b482691..0000000
--- a/svl/inc/svl/pickerhelper.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _PICKERHELPER_HXX
-#define _PICKERHELPER_HXX
-
-#include "svl/svldllapi.h"
-#include "sal/types.h"
-#include "com/sun/star/uno/Reference.hxx"
-
-namespace com
-{
- namespace sun
- {
- namespace star
- {
- namespace ui
- {
- namespace dialogs
- {
- class XFilePicker;
- class XFolderPicker;
- }
- }
- }
- }
-}
-
-
-namespace svt
-{
-
- SVL_DLLPUBLIC void SetDialogHelpId(
- ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg,
- sal_Int32 _nHelpId );
-
- SVL_DLLPUBLIC void SetDialogHelpId(
- ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg,
- sal_Int32 _nHelpId );
-
-}
-
-//-----------------------------------------------------------------------------
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 0dfc219..cd33c9e 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/fil
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx))
diff --git a/svtools/inc/svtools/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx
deleted file mode 100644
index ae75584..0000000
--- a/svtools/inc/svtools/fltdefs.hxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <tools/solar.h>
-#include <vcl/bitmap.hxx>
-
-#include <string.h>
-
-#ifndef _FLTDEFS_HXX
-#define _FLTDEFS_HXX
-
-
-#if defined ( WNT )
-
-#define RGBQUAD RGBQUADWIN
-
-typedef struct RGBQUAD
-{
- sal_uInt8 rgbBlue;
- sal_uInt8 rgbGreen;
- sal_uInt8 rgbRed;
- sal_uInt8 rgbReserved;
-
- RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) :
- rgbBlue ( cBlue ),
- rgbGreen ( cGreen ),
- rgbRed ( cRed ),
- rgbReserved ( 0 ) {};
-} RGBQUAD;
-
-
-typedef sal_uInt8* PDIBBYTE;
-#define MEMCPY memcpy
-#define MEMSET memset
-#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize)))
-#define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer))
-#define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer))
-
-#else
-
-typedef sal_uInt8* PDIBBYTE;
-#define MEMCPY memcpy
-#define MEMSET memset
-#define GLOBALALLOC(nSize) ((PDIBBYTE)new sal_uInt8[(nSize)])
-#define GLOBALFREE(pPointer) (delete[] (pPointer))
-
-#endif
-
-
-#if defined ( UNX )
-void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uLong nOffBits = 0 );
-void ReplaceInfoHeader( SvStream& rStm, sal_uInt8* pBuffer );
-
-typedef struct RGBQUAD
-{
- sal_uInt8 rgbBlue;
- sal_uInt8 rgbGreen;
- sal_uInt8 rgbRed;
- sal_uInt8 rgbReserved;
-
- RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) :
- rgbBlue ( cBlue ),
- rgbGreen ( cGreen ),
- rgbRed ( cRed ),
- rgbReserved ( 0 ) {};
-} RGBQUAD;
-
-typedef struct BITMAPFILEHEADER
-{
- sal_uInt16 bfType;
- sal_uInt32 bfSize;
- sal_uInt16 bfReserved1;
- sal_uInt16 bfReserved2;
- sal_uInt32 bfOffBits;
-} BITMAPFILEHEADER;
-typedef BITMAPFILEHEADER* PBITMAPFILEHEADER;
-
-typedef struct BITMAPINFOHEADER
-{
- sal_uInt32 biSize;
- sal_uInt32 biWidth;
- sal_uInt32 biHeight;
- sal_uInt16 biPlanes;
- sal_uInt16 biBitCount;
- sal_uInt32 biCompression;
- sal_uInt32 biSizeImage;
- sal_uInt32 biXPelsPerMeter;
- sal_uInt32 biYPelsPerMeter;
- sal_uInt32 biClrUsed;
- sal_uInt32 biClrImportant;
-} BITMAPINFOHEADER;
-typedef BITMAPINFOHEADER* PBITMAPINFOHEADER;
-
-typedef struct BITMAPINFO
-{
- BITMAPINFOHEADER bmiHeader;
- RGBQUAD bmiColors[1];
-} BITMAPINFO;
-typedef BITMAPINFO* PBITMAPINFO;
-
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 4c14c78..df90d0f 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -540,7 +540,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflgrit.hxx,svx/xflgrit.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ActionDescriptionProvider.hxx,svx/ActionDescriptionProvider.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gridctrl.hxx,svx/gridctrl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxalign.hxx,svx/tbxalign.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svimbase.hxx,svx/svimbase.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomctrl.hxx,svx/zoomctrl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgv.hxx,svx/svddrgv.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/XPropertyTable.hxx,svx/XPropertyTable.hxx))
diff --git a/svx/inc/svx/svimbase.hxx b/svx/inc/svx/svimbase.hxx
deleted file mode 100644
index df195bd..0000000
--- a/svx/inc/svx/svimbase.hxx
+++ /dev/null
@@ -1,208 +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 _SVIMBASE_HXX
-#define _SVIMBASE_HXX
-
-#include <vcl/bitmap.hxx>
-#include <vcl/salbtype.hxx>
-
-
-// -----------
-// - Defines -
-// -----------
-
-#define _SVHUGE
-
-// ----------------
-// - SimDepthType -
-// ----------------
-
-enum SimDepthType
-{
- SIM_DEPTH_1,
- SIM_DEPTH_4,
- SIM_DEPTH_8,
- SIM_DEPTH_24
-};
-
-// ------------
-// - SimColor -
-// ------------
-
-struct SimColor
-{
- sal_uInt8 cBlue;
- sal_uInt8 cGreen;
- sal_uInt8 cRed;
-};
-
-// ------------------------------------------------------------------------
-
-inline sal_Bool operator==( const SimColor& rCol1, const SimColor& rCol2 )
-{
- return ( ( rCol1.cRed == rCol2.cRed ) &&
- ( rCol1.cGreen == rCol2.cGreen ) &&
- ( rCol1.cBlue == rCol2.cBlue ) );
-}
-
-// --------------
-// - SimPalette -
-// --------------
-
-struct SimPalette
-{
- sal_uIntPtr nColors;
- SimColor aColorArray[ 256 ];
-};
-
-// ---------------
-// - SvImageBase -
-// ---------------
-
-class SfxViewFrame;
-class SfxProgress;
-
-class SvImageBase
-{
-private:
-
- Bitmap aOutBitmap;
- HPBYTE pArray1;
- HPBYTE pArray2;
- HPBYTE pArray3;
- HPBYTE pArray4;
- HPBYTE pOrgArray;
- HPBYTE pDestArray;
- SimPalette* pPal1;
- SimPalette* pPal2;
- SimPalette* pPal3;
- SimPalette* pPal4;
- sal_uIntPtr nWidth1;
- sal_uIntPtr nWidth2;
- sal_uIntPtr nWidth3;
- sal_uIntPtr nWidth4;
- sal_uIntPtr nHeight1;
- sal_uIntPtr nHeight2;
- sal_uIntPtr nHeight3;
- sal_uIntPtr nHeight4;
- sal_uIntPtr nAlignedWidth1;
- sal_uIntPtr nAlignedWidth2;
- sal_uIntPtr nAlignedWidth3;
- sal_uIntPtr nAlignedWidth4;
- sal_uIntPtr nWhichOrg;
- SimDepthType eOrgDepth;
- SimDepthType eUndoDepth;
- SimDepthType eRedoDepth;
- sal_Bool bIsUndo;
- sal_Bool bIsRedo;
- sal_Bool bCreateUndo;
- sal_Bool bValid;
- sal_Bool bDitherAll;
-
- HPBYTE BitmapToArray24( const Bitmap& rBitmap, sal_uIntPtr* pWidth,
- sal_uIntPtr* pHeight, sal_uIntPtr* pAlignedWidth,
- SfxViewFrame *pFrame = NULL );
- sal_Bool Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap,
- const sal_uIntPtr nWidth, const sal_uIntPtr nHeight,
- const sal_uIntPtr nColorCount = 256,
- sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
-
- Bitmap CreateSaveBitmap( const SimDepthType eDepth, SfxViewFrame *pFrame = NULL );
-
- HPBYTE CreateArray24( sal_uIntPtr nWidth, sal_uIntPtr nHeight );
- void DeleteArray( HPBYTE pArray );
-
- SvImageBase(const SvImageBase& rSvImageBase);
- const SvImageBase& operator=(const SvImageBase& rSvImageBase);
-
-public:
-
- SvImageBase();
- SvImageBase( const Bitmap& rBitmap,
- const sal_uIntPtr nColorCount = 256,
- sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
- ~SvImageBase();
-
- sal_Bool IsValid() { return bValid; }
-
- sal_uIntPtr GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; }
- sal_uIntPtr GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; }
-
- sal_uIntPtr GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; }
- sal_uIntPtr GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; }
-
- sal_uIntPtr GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; }
- sal_uIntPtr GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; }
-
- sal_uIntPtr GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); }
- sal_uIntPtr GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); }
-
- // Get and set the color depth of the origin picture
- SimDepthType GetDepth() const { return eOrgDepth; }
- void SetDepth( const SimDepthType eDepth ) { eOrgDepth = eDepth; }
-
- // Get and set the color depth after Undo and Redo
- SimDepthType GetUndoDepth() const { return eUndoDepth; }
- void SetUndoDepth(const SimDepthType eDepth) { eUndoDepth = eDepth; }
-
- SimDepthType GetRedoDepth() const { return eRedoDepth; }
- void SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; }
-
- sal_Bool BeginProcessing( sal_Bool bUndo = sal_True );
- void EndProcessing();
-
- sal_Bool BeginProcessingExt(sal_uIntPtr nWidth, sal_uIntPtr nHeight, sal_Bool bUndo = sal_True);
- void EndProcessingExt() { EndProcessing(); }
-
- HPBYTE GetOrgPointer() { return pOrgArray; }
- HPBYTE GetDestPointer() { return pDestArray; }
-
- sal_Bool CreateOutBitmap( const sal_uIntPtr nColorCount = 256, sal_uIntPtr nLast = 0,
- SfxProgress* pProgress = NULL );
-
- sal_Bool DoUndo( SfxProgress* pProgress = NULL );
- sal_Bool DoRedo( SfxProgress* pProgress = NULL );
-
- const Bitmap& GetOutBitmap() const;
-
- Bitmap GetSaveBitmap();
-
- SimPalette* GetOrgPalette() const { return nWhichOrg == 1 ? pPal1 : pPal2; }
- SimPalette* GetDestPalette() const { return nWhichOrg == 1 ? pPal2 : pPal1; }
-};
-
-// ----------------
-// - DitherBitmap -
-// ----------------
-
-sal_Bool DitherBitmap( Bitmap& rBitmap, sal_Bool bDitherAlways = sal_False );
-
-#endif // _SVIMBASE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index 1442941..2ddb5f2 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/options.hxx,unotools
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/pathoptions.hxx,unotools/pathoptions.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/printwarningoptions.hxx,unotools/printwarningoptions.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/progresshandlerwrap.hxx,unotools/progresshandlerwrap.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/querydeep.hxx,unotools/querydeep.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/readwritemutexguard.hxx,unotools/readwritemutexguard.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/saveopt.hxx,unotools/saveopt.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/searchopt.hxx,unotools/searchopt.hxx))
diff --git a/unotools/inc/unotools/querydeep.hxx b/unotools/inc/unotools/querydeep.hxx
deleted file mode 100644
index c76d26f..0000000
--- a/unotools/inc/unotools/querydeep.hxx
+++ /dev/null
@@ -1,479 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _UNOTOOLS_QUERYDEEPINTERFACE_HXX
-#define _UNOTOOLS_QUERYDEEPINTERFACE_HXX
-
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Type.hxx>
-
-/** */ //for docpp
-namespace utl
-{
-
-//--------------------------------------------------------------------------------------------------------
-/**
- * Inspect interfaces types whether they are related by inheritance.
- *<BR>
- * @return true if rType is derived from rBaseType
- * @param rBaseType a <type>Type</type> of an interface.
- * @param rType a <type>Type</type> of an interface.
- */
-sal_Bool isDerivedFrom(
- const ::com::sun::star::uno::Type & rBaseType,
- const ::com::sun::star::uno::Type & rType );
-
-//--------------------------------------------------------------------------------------------------------
-/**
- * Inspect interface types whether they are related by inheritance.
- *<BR>
- * @return true if p is of a type derived from rBaseType
- * @param rBaseType a <type>Type</type> of an interface.
- * @param p a pointer to an interface.
- */
-template <class Interface>
-inline sal_Bool isDerivedFrom(
- const ::com::sun::star::uno::Type& rBaseType,
- Interface* /*p*/)
-{
- return isDerivedFrom(
- rBaseType,
- ::getCppuType(static_cast<const ::com::sun::star::uno::Reference<Interface> *>(0)));
-}
-
-//--------------------------------------------------------------------------------------------------------
-// possible optimization ?
-// Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12));
-// if (aRet.hasValue())
-// return aRet;
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- */
-template< class Interface1 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- */
-template< class Interface1, class Interface2 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- * @param p6 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
- class Interface6 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
- Interface6 * p6 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface6 > *>(0))))
- return ::com::sun::star::uno::Any( &p6, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- * @param p6 a pointer to an interface.
- * @param p7 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
- class Interface6, class Interface7 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
- Interface6 * p6, Interface7 * p7 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface6 > *>(0))))
- return ::com::sun::star::uno::Any( &p6, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface7 > *>(0))))
- return ::com::sun::star::uno::Any( &p7, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- * @param p6 a pointer to an interface.
- * @param p7 a pointer to an interface.
- * @param p8 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
- class Interface6, class Interface7, class Interface8 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
- Interface6 * p6, Interface7 * p7, Interface8 * p8 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface6 > *>(0))))
- return ::com::sun::star::uno::Any( &p6, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface7 > *>(0))))
- return ::com::sun::star::uno::Any( &p7, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface8 > *>(0))))
- return ::com::sun::star::uno::Any( &p8, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- * @param p6 a pointer to an interface.
- * @param p7 a pointer to an interface.
- * @param p8 a pointer to an interface.
- * @param p9 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
- class Interface6, class Interface7, class Interface8, class Interface9 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
- Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface6 > *>(0))))
- return ::com::sun::star::uno::Any( &p6, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface7 > *>(0))))
- return ::com::sun::star::uno::Any( &p7, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface8 > *>(0))))
- return ::com::sun::star::uno::Any( &p8, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface9 > *>(0))))
- return ::com::sun::star::uno::Any( &p9, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- * @param p6 a pointer to an interface.
- * @param p7 a pointer to an interface.
- * @param p8 a pointer to an interface.
- * @param p9 a pointer to an interface.
- * @param p10 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
- class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
- Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface6 > *>(0))))
- return ::com::sun::star::uno::Any( &p6, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface7 > *>(0))))
- return ::com::sun::star::uno::Any( &p7, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface8 > *>(0))))
- return ::com::sun::star::uno::Any( &p8, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface9 > *>(0))))
- return ::com::sun::star::uno::Any( &p9, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface10 > *>(0))))
- return ::com::sun::star::uno::Any( &p10, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- * @param p6 a pointer to an interface.
- * @param p7 a pointer to an interface.
- * @param p8 a pointer to an interface.
- * @param p9 a pointer to an interface.
- * @param p10 a pointer to an interface.
- * @param p11 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
- class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
- class Interface11 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
- Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10,
- Interface11 * p11 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface6 > *>(0))))
- return ::com::sun::star::uno::Any( &p6, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface7 > *>(0))))
- return ::com::sun::star::uno::Any( &p7, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface8 > *>(0))))
- return ::com::sun::star::uno::Any( &p8, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface9 > *>(0))))
- return ::com::sun::star::uno::Any( &p9, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface10 > *>(0))))
- return ::com::sun::star::uno::Any( &p10, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface11 > *>(0))))
- return ::com::sun::star::uno::Any( &p11, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param p1 a pointer to an interface.
- * @param p2 a pointer to an interface.
- * @param p3 a pointer to an interface.
- * @param p4 a pointer to an interface.
- * @param p5 a pointer to an interface.
- * @param p6 a pointer to an interface.
- * @param p7 a pointer to an interface.
- * @param p8 a pointer to an interface.
- * @param p9 a pointer to an interface.
- * @param p10 a pointer to an interface.
- * @param p11 a pointer to an interface.
- * @param p12 a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
- class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
- class Interface11, class Interface12 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
- const ::com::sun::star::uno::Type & rType,
- Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
- Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10,
- Interface11 * p11, Interface12 * p12 )
-{
- if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface1 > *>(0))))
- return ::com::sun::star::uno::Any( &p1, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface2 > *>(0))))
- return ::com::sun::star::uno::Any( &p2, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface3 > *>(0))))
- return ::com::sun::star::uno::Any( &p3, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface4 > *>(0))))
- return ::com::sun::star::uno::Any( &p4, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface5 > *>(0))))
- return ::com::sun::star::uno::Any( &p5, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface6 > *>(0))))
- return ::com::sun::star::uno::Any( &p6, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface7 > *>(0))))
- return ::com::sun::star::uno::Any( &p7, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface8 > *>(0))))
- return ::com::sun::star::uno::Any( &p8, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface9 > *>(0))))
- return ::com::sun::star::uno::Any( &p9, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface10 > *>(0))))
- return ::com::sun::star::uno::Any( &p10, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface11 > *>(0))))
- return ::com::sun::star::uno::Any( &p11, rType );
- else if (isDerivedFrom(rType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference< Interface12 > *>(0))))
- return ::com::sun::star::uno::Any( &p12, rType );
- else
- return ::com::sun::star::uno::Any();
-}
-
-} // namespace utl
-
-#endif // _UNOTOOLS_QUERYDEEPINTERFACE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/Package_inc.mk b/vbahelper/Package_inc.mk
index 0fc088d..10c3ce1 100644
--- a/vbahelper/Package_inc.mk
+++ b/vbahelper/Package_inc.mk
@@ -39,6 +39,5 @@ $(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashaperange.hxx,
$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashapes.hxx,vbahelper/vbashapes.hxx))
$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbatextframe.hxx,vbahelper/vbatextframe.hxx))
$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbawindowbase.hxx,vbahelper/vbawindowbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/weakreference.hxx,vbahelper/weakreference.hxx))
# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/inc/vbahelper/weakreference.hxx b/vbahelper/inc/vbahelper/weakreference.hxx
deleted file mode 100644
index f8c3263..0000000
--- a/vbahelper/inc/vbahelper/weakreference.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef VBAHELPER_WEAKREFERENCE_HXX
-#define VBAHELPER_WEAKREFERENCE_HXX
-
-#include <cppuhelper/weakref.hxx>
-#include <rtl/ref.hxx>
-
-namespace vbahelper {
-
-// ============================================================================
-
-/** A weak reference holding any UNO implementation object.
-
- The held object must implement the ::com::sun::star::uno::XWeak interface.
-
- In difference to the ::com::sun::star::uno::WeakReference<> implementation
- from cppuhelper/weakref.hxx, the class type of this weak reference is not
- restricted to UNO interface types, but can be used for any C++ class type
- implementing the XWeak interface somehow (e.g. ::cppu::WeakImplHelperN<>,
- ::cppu::ImplInheritanceHelperN<>, etc.).
- */
-template< typename ObjectType >
-class WeakReference
-{
-public:
- /** Default constructor. Creates an empty weak reference.
- */
- inline explicit WeakReference() SAL_THROW(()) : mpObject( 0 ) {}
-
- /** Initializes this weak reference with the passed reference to an object.
- */
- inline explicit WeakReference( const ::rtl::Reference< ObjectType >& rxObject ) SAL_THROW(()) :
- mxWeakRef( rxObject.get() ), mpObject( rxObject.get() ) {}
-
- /** Releases this weak reference and takes over the passed reference.
- */
- inline WeakReference& SAL_CALL operator=( const ::rtl::Reference< ObjectType >& rxObject ) SAL_THROW(())
- {
- mxWeakRef = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >( rxObject.get() );
- mpObject = rxObject.get();
- return *this;
- }
-
- /** Gets an RTL reference to the referenced object.
-
- @return Reference or null, if the weakly referenced object is gone.
- */
- inline SAL_CALL operator ::rtl::Reference< ObjectType >() SAL_THROW(())
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak > xRef = mxWeakRef;
- ::rtl::Reference< ObjectType > xObject;
- if( xRef.is() )
- xObject = mpObject;
- else
- mpObject = 0;
- return xObject;
- }
-
-private:
- ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XWeak > mxWeakRef;
- ObjectType* mpObject;
-};
-
-// ============================================================================
-
-} // namespace vbahelper
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
index c1c142c..e65a44d 100644
--- a/xmloff/Package_inc.mk
+++ b/xmloff/Package_inc.mk
@@ -91,7 +91,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txtstyle.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx))
@@ -109,7 +108,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmle
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlkywd.hxx,xmloff/xmlkywd.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx))
diff --git a/xmloff/inc/xmloff/txtstyle.hxx b/xmloff/inc/xmloff/txtstyle.hxx
deleted file mode 100644
index 4fb8da6..0000000
--- a/xmloff/inc/xmloff/txtstyle.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _XMLOFF_TEXTSTYLE_HXX_
-#define _XMLOFF_TEXTSTYLE_HXX_
-
-#include <xmloff/styleexp.hxx>
-#include <xmloff/uniref.hxx>
-
-class XMLPropertySetMapper;
-
-class XMLTextStyleExport : public XMLStyleExport
-{
- UniReference < XMLPropertySetMapper > xParaPropMapper;
-
- void exportNumStyles( sal_Bool bUsed );
-
-public:
-
- XMLTextStyleExport(
- SvXMLExport& rExp,
-// const ::com::sun::star::uno::Reference<
-// ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-// const ::com::sun::star::uno::Reference<
-// ::com::sun::star::frame::XModel > & rModel,
- const ::rtl::OUString& rPoolStyleName,
-// const SvXMLNamespaceMap &rNamespaceMap,
-// MapUnit eDUnit,
- SvXMLAutoStylePoolP *pAutoStyleP=0 );
- virtual ~XMLTextStyleExport();
-
- void exportStyles( sal_Bool bUsed );
-
- UniReference < XMLPropertySetMapper >& getParaPropMapper();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/xmloff/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx
deleted file mode 100644
index 8174ad8..0000000
--- a/xmloff/inc/xmloff/xmlkywd.hxx
+++ /dev/null
@@ -1,1990 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _XMLOFF_XMLKYWD_HXX
-#define _XMLOFF_XMLKYWD_HXX
-
-/*
- * THIS FILE IS DEPRECATED. IT IS SUPERSEDED BY XMLTOKEN.HXX.
- *
- * Please use xmltoken.hxx / xmltoken.cxx from now on.
- */
-
-
-/* if XML_DEFINE_KEYWORDS is defined the variables are
- defined rather than declared. So this file MUST be included
- WITHOUT this define.
-
- (Except the xmlkywd.cxx file that actually defines the
- variables which sets this define.)
- */
-
-#ifndef XML_DEFINE_KEYWORDS
-#define XML_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
-#else
-#define XML_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
-#endif
-
-// common XML
-XML_CONSTASCII_ACTION( sXML_CDATA, "CDATA" );
-XML_CONSTASCII_ACTION( sXML_WS, " " );
-XML_CONSTASCII_ACTION( sXML_xml, "xml" );
-XML_CONSTASCII_ACTION( sXML_xmlns, "xmlns" );
-XML_CONSTASCII_ACTION( sXML_xml_pi, "version=\"1.0\" encoding=\"UTF-8\"" );
-XML_CONSTASCII_ACTION( sXML_xml_doctype_prefix, "<!DOCTYPE " );
-XML_CONSTASCII_ACTION( sXML_xml_doctype_suffix, " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">" );
-
-// namespace prefixes and names
-XML_CONSTASCII_ACTION( sXML_np_office, "office" );
-XML_CONSTASCII_ACTION( sXML_n_office, "http://openoffice.org/2000/office" );
-XML_CONSTASCII_ACTION( sXML_n_office_old, "http://sun.com/xmlns/staroffice/office" );
-XML_CONSTASCII_ACTION( sXML_np_meta, "meta" );
-XML_CONSTASCII_ACTION( sXML_n_meta, "http://openoffice.org/2000/meta" );
-XML_CONSTASCII_ACTION( sXML_n_meta_old, "http://sun.com/xmlns/staroffice/meta" );
-XML_CONSTASCII_ACTION( sXML_np_style, "style" );
-XML_CONSTASCII_ACTION( sXML_n_style, "http://openoffice.org/2000/style" );
-XML_CONSTASCII_ACTION( sXML_n_style_old, "http://sun.com/xmlns/staroffice/style" );
-XML_CONSTASCII_ACTION( sXML_np_number, "number" );
-XML_CONSTASCII_ACTION( sXML_n_number, "http://openoffice.org/2000/datastyle" );
-XML_CONSTASCII_ACTION( sXML_n_number_old, "http://sun.com/xmlns/staroffice/number" );
-XML_CONSTASCII_ACTION( sXML_np_text, "text" );
-XML_CONSTASCII_ACTION( sXML_n_text, "http://openoffice.org/2000/text" );
-XML_CONSTASCII_ACTION( sXML_n_text_old, "http://sun.com/xmlns/staroffice/text" );
-XML_CONSTASCII_ACTION( sXML_np_table, "table" );
-XML_CONSTASCII_ACTION( sXML_n_table, "http://openoffice.org/2000/table" );
-XML_CONSTASCII_ACTION( sXML_n_table_old, "http://sun.com/xmlns/staroffice/table" );
-XML_CONSTASCII_ACTION( sXML_np_draw, "draw" );
-XML_CONSTASCII_ACTION( sXML_n_draw, "http://openoffice.org/2000/drawing" );
-XML_CONSTASCII_ACTION( sXML_np_dr3d, "dr3d" );
-XML_CONSTASCII_ACTION( sXML_n_dr3d, "http://openoffice.org/2000/dr3d" );
-XML_CONSTASCII_ACTION( sXML_n_draw_old, "http://sun.com/xmlns/staroffice/draw" );
-XML_CONSTASCII_ACTION( sXML_np_presentation, "presentation" );
-XML_CONSTASCII_ACTION( sXML_n_presentation, "http://openoffice.org/2000/presentation" );
-XML_CONSTASCII_ACTION( sXML_n_presentation_old, "http://sun.com/xmlns/staroffice/presentation" );
-XML_CONSTASCII_ACTION( sXML_np_chart, "chart" );
-XML_CONSTASCII_ACTION( sXML_n_chart, "http://openoffice.org/2000/chart" );
-XML_CONSTASCII_ACTION( sXML_np_config, "config" );
-XML_CONSTASCII_ACTION( sXML_n_config, "http://openoffice.org/2001/config" );
-XML_CONSTASCII_ACTION( sXML_n_chart_old, "http://sun.com/xmlns/staroffice/chart" );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list