[Libreoffice-commits] .: 11 commits - binfilter/bf_basic binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/binfilterdetect binfilter/filter binfilter/inc filter/source oox/prj
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Oct 25 19:27:01 PDT 2010
binfilter/bf_basic/source/classes/sb.cxx | 8
binfilter/bf_basic/source/classes/sbunoobj.cxx | 2
binfilter/bf_basic/source/classes/sbxmod.cxx | 3
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 8
binfilter/bf_forms/source/component/forms_FormattedField.cxx | 4
binfilter/bf_forms/source/component/forms_Image.cxx | 6
binfilter/bf_forms/util/makefile.mk | 1
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 4
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 4
binfilter/bf_sc/source/core/data/sc_documen9.cxx | 4
binfilter/bf_sc/source/core/data/sc_document.cxx | 2
binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx | 4
binfilter/bf_sc/source/core/data/sc_poolhelp.cxx | 1
binfilter/bf_sc/source/core/inc/poolhelp.hxx | 4
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 3
binfilter/bf_sc/source/core/tool/sc_addinlis.cxx | 4
binfilter/bf_sc/source/core/tool/sc_callform.cxx | 35
binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx | 3
binfilter/bf_sc/source/filter/xml/sc_XMLTableMasterPageExport.cxx | 3
binfilter/bf_sc/source/filter/xml/sc_XMLTableShapeImportHelper.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLTrackedChangesContext.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmldpimp.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx | 18
binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx | 20
binfilter/bf_sc/source/filter/xml/sc_xmlsceni.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx | 3
binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx | 2
binfilter/bf_sc/source/filter/xml/xmlimprt.hxx | 6
binfilter/bf_sc/source/filter/xml/xmlstyle.hxx | 2
binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx | 6
binfilter/bf_sc/source/ui/unoobj/makefile.mk | 1
binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx | 52 -
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 36
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 392 +++++-----
binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx | 40 -
binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx | 8
binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx | 36
binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx | 94 +-
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 110 +-
binfilter/bf_sc/source/ui/unoobj/sc_defltuno.cxx | 16
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 178 ++--
binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx | 54 -
binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_fmtuno.cxx | 66 -
binfilter/bf_sc/source/ui/unoobj/sc_forbiuno.cxx | 6
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx | 12
binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx | 130 +--
binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx | 14
binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx | 70 -
binfilter/bf_sc/source/ui/unoobj/sc_notesuno.cxx | 32
binfilter/bf_sc/source/ui/unoobj/sc_optuno.cxx | 6
binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx | 58 -
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 70 -
binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx | 64 -
binfilter/bf_sc/source/ui/unoobj/sc_unodoc.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_unoguard.cxx | 50 -
binfilter/bf_sc/util/makefile.mk | 2
binfilter/bf_sch/source/core/sch_chtmodel.cxx | 1
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx | 17
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx | 13
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx | 11
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 25
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx | 7
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx | 27
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx | 15
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx | 15
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 36
binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx | 4
binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx | 4
binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx | 4
binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx | 4
binfilter/bf_sch/source/ui/unoidl/sch_ChartTitle.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx | 4
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 1
binfilter/bf_sd/source/filter/sd_sdfilter.cxx | 2
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 3
binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx | 8
binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx | 31
binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx | 6
binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx | 21
binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx | 11
binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx | 23
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 63 -
binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx | 11
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 31
binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx | 13
binfilter/bf_sd/source/ui/unoidl/sd_unopool.cxx | 1
binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx | 9
binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx | 9
binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx | 23
binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx | 8
binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx | 5
binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx | 2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 8
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx | 21
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx | 4
binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx | 88 +-
binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx | 3
binfilter/bf_sfx2/source/inc/eventsupplier.hxx | 2
binfilter/bf_so3/source/inplace/outplace.cxx | 5
binfilter/bf_so3/source/ole/socli.cxx | 14
binfilter/bf_so3/source/persist/transbnd.cxx | 12
binfilter/bf_so3/source/persist/transprt.cxx | 58 -
binfilter/bf_so3/util/makefile.mk | 3
binfilter/bf_starmath/source/starmath_unodoc.cxx | 4
binfilter/bf_starmath/source/starmath_unomodel.cxx | 19
binfilter/bf_svtools/source/config/svt_colorcfg.cxx | 8
binfilter/bf_svtools/source/config/svt_ctloptions.cxx | 4
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx | 1
binfilter/bf_svtools/source/config/svt_languageoptions.cxx | 2
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 1
binfilter/bf_svtools/source/config/svt_undoopt.cxx | 4
binfilter/bf_svtools/source/config/svt_useroptions.cxx | 4
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx | 2
binfilter/bf_svtools/source/misc/svt_asynclink.cxx | 4
binfilter/bf_svtools/source/misc/svt_ehdl.cxx | 8
binfilter/bf_svtools/source/misc/svt_templatefoldercache.cxx | 4
binfilter/bf_svtools/source/misc1/svt_svtdata.cxx | 1
binfilter/bf_svtools/source/notify/svt_cancel.cxx | 12
binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx | 60 -
binfilter/bf_svtools/source/numbers/svt_numuno.cxx | 6
binfilter/bf_svtools/source/numbers/svt_supservs.cxx | 13
binfilter/bf_svtools/source/svdde/svt_ddecli.cxx | 6
binfilter/bf_svtools/source/uno/svt_unoimap.cxx | 4
binfilter/bf_svtools/util/makefile.mk | 3
binfilter/bf_svx/source/editeng/eerdll2.hxx | 12
binfilter/bf_svx/source/editeng/impedit.hxx | 16
binfilter/bf_svx/source/editeng/svx_editeng.cxx | 2
binfilter/bf_svx/source/editeng/svx_eerdll.cxx | 4
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 8
binfilter/bf_svx/source/form/svx_ParseContext.cxx | 4
binfilter/bf_svx/source/inc/trace.hxx | 2
binfilter/bf_svx/source/items/svx_xmlcnitm.cxx | 3
binfilter/bf_svx/source/outliner/svx_outlin2.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 6
binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx | 17
binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx | 17
binfilter/bf_svx/source/unodraw/svx_unoipset.cxx | 3
binfilter/bf_svx/source/unodraw/svx_unomod.cxx | 13
binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx | 17
binfilter/bf_svx/source/unodraw/svx_unonrule.cxx | 9
binfilter/bf_svx/source/unodraw/svx_unopage.cxx | 14
binfilter/bf_svx/source/unodraw/svx_unopool.cxx | 15
binfilter/bf_svx/source/unodraw/svx_unoprov.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 47 -
binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx | 38
binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx | 17
binfilter/bf_svx/source/unodraw/svx_unoshape.cxx | 72 -
binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx | 3
binfilter/bf_svx/source/unoedit/svx_UnoForbiddenCharsTable.cxx | 29
binfilter/bf_svx/source/unoedit/svx_unofield.cxx | 11
binfilter/bf_svx/source/unoedit/svx_unotext.cxx | 47 -
binfilter/bf_svx/source/unoedit/svx_unotext2.cxx | 31
binfilter/bf_svx/source/xml/svx_xmltxtexp.cxx | 3
binfilter/bf_svx/source/xml/svx_xmltxtimp.cxx | 3
binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx | 3
binfilter/bf_svx/util/makefile.mk | 2
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 6
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 3
binfilter/bf_sw/source/core/text/sw_guess.cxx | 3
binfilter/bf_sw/source/core/unocore/sw_SwXTextDefaults.cxx | 11
binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx | 12
binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx | 81 +-
binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx | 3
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 55 -
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 57 -
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 59 -
binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx | 25
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 63 -
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 78 -
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 49 -
binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx | 37
binfilter/bf_sw/source/core/unocore/sw_unoport.cxx | 47 -
binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx | 9
binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx | 26
binfilter/bf_sw/source/core/unocore/sw_unoredlines.cxx | 13
binfilter/bf_sw/source/core/unocore/sw_unorefmk.cxx | 15
binfilter/bf_sw/source/core/unocore/sw_unosect.cxx | 35
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 35
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx | 21
binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx | 59 -
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 169 ++--
binfilter/bf_sw/source/core/unocore/sw_unotext.cxx | 55 -
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 8
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx | 3
binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx | 3
binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx | 3
binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx | 8
binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx | 3
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 13
binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx | 3
binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 9
binfilter/bf_sw/source/filter/xml/sw_xmltext.cxx | 3
binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx | 14
binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx | 4
binfilter/bf_sw/source/ui/inc/unodispatch.hxx | 4
binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx | 9
binfilter/bf_sw/source/ui/uno/sw_SwXFilterOptions.cxx | 4
binfilter/bf_sw/source/ui/uno/sw_unodoc.cxx | 8
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 6
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 94 +-
binfilter/bf_sw/util/makefile.mk | 1
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 4
binfilter/bf_xmloff/source/core/xmloff_XMLBase64Export.cxx | 4
binfilter/bf_xmloff/source/core/xmloff_XMLBase64ImportContext.cxx | 3
binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx | 3
binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx | 10
binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_XMLShapePropertySetContext.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_animexp.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_layerexp.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_layerimp.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_ximpshow.cxx | 3
binfilter/bf_xmloff/source/draw/xmloff_ximpstyl.cxx | 3
binfilter/bf_xmloff/source/forms/callbacks.hxx | 4
binfilter/bf_xmloff/source/forms/controlpropertyhdl.hxx | 2
binfilter/bf_xmloff/source/forms/layerexport.hxx | 6
binfilter/bf_xmloff/source/forms/layerimport.hxx | 8
binfilter/bf_xmloff/source/forms/propertyimport.hxx | 2
binfilter/bf_xmloff/source/forms/xmloff_formlayerimport.cxx | 2
binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx | 8
binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx | 6
binfilter/bf_xmloff/source/script/xmloff_xmlscripti.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_prstylei.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx | 5
binfilter/bf_xmloff/source/text/xmloff_XMLCalculationSettingsContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsExport.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameHyperlinkContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_XMLTextListBlockContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextListItemContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextMasterPageContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextMasterPageExport.cxx | 1
binfilter/bf_xmloff/source/text/xmloff_XMLTextMasterStylesContext.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_XMLTextShapeImportHelper.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtftne.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtstyle.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx | 3
binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx | 4
binfilter/bf_xmloff/util/makefile.mk | 2
binfilter/binfilterdetect/source/bindetect.cxx | 4
binfilter/filter/source/bf_offwrp/bf_wrapper.cxx | 4
binfilter/inc/bf_goodies/base3d.hxx | 4
binfilter/inc/bf_sc/document.hxx | 15
binfilter/inc/bf_sc/refreshtimer.hxx | 6
binfilter/inc/bf_sc/unoguard.hxx | 44 -
binfilter/inc/bf_sd/sdfilter.hxx | 5
binfilter/inc/bf_starmath/symbol.hxx | 2
binfilter/inc/bf_svtools/asynclink.hxx | 8
binfilter/inc/bf_svx/UnoForbiddenCharsTable.hxx | 6
binfilter/inc/bf_svx/editeng.hxx | 4
binfilter/inc/bf_svx/forbiddencharacterstable.hxx | 4
binfilter/inc/bf_svx/outliner.hxx | 6
binfilter/inc/bf_svx/svdmodel.hxx | 6
binfilter/inc/bf_svx/unolingu.hxx | 2
binfilter/inc/bf_sw/doc.hxx | 8
binfilter/inc/bf_sw/flddropdown.hxx | 3
binfilter/inc/bf_xmloff/ControlBorderHandler.hxx | 2
binfilter/inc/bf_xmloff/formlayerexport.hxx | 6
binfilter/inc/bf_xmloff/formlayerimport.hxx | 8
binfilter/inc/bf_xmloff/nmspmap.hxx | 6
filter/source/msfilter/escherex.cxx | 4
filter/source/msfilter/msdffimp.cxx | 5
filter/source/svg/svgfilter.cxx | 4
filter/source/xsltdialog/xmlfileview.cxx | 6
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 8
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 5
oox/prj/build.lst | 2
308 files changed, 2376 insertions(+), 2406 deletions(-)
New commits:
commit 42ce3ec57c371b50230fc8b8fe61e6c004b8da4b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 16:17:14 2010 -0500
Finally, gut the vos module out of the build
diff --git a/binfilter/bf_forms/util/makefile.mk b/binfilter/bf_forms/util/makefile.mk
index e67b9e1..06e1530 100644
--- a/binfilter/bf_forms/util/makefile.mk
+++ b/binfilter/bf_forms/util/makefile.mk
@@ -64,7 +64,6 @@ SHL1STDLIBS= \
$(VCLLIB) \
$(BFSVTOOLLIB) \
$(BFSVXLIB) \
- $(VOSLIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB) \
$(DBTOOLSLIB) \
diff --git a/binfilter/bf_sc/util/makefile.mk b/binfilter/bf_sc/util/makefile.mk
index 5834dac..ef96a28 100644
--- a/binfilter/bf_sc/util/makefile.mk
+++ b/binfilter/bf_sc/util/makefile.mk
@@ -75,7 +75,6 @@ SHL1STDLIBS+= \
$(CPPUHELPERLIB) \
$(COMPHELPERLIB) \
$(UCBHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(TOOLSLIB) \
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index dba7b03..6b92173 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -72,7 +72,6 @@ SHL1STDLIBS=\
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
$(BFSVTOOLLIB) \
- $(VOSLIB) \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
@@ -89,7 +88,7 @@ SHL1STDLIBS+= \
.ENDIF
.IF "$(GUI)"=="WIN"
-SHL1STDLIBS=$(VOSLIB) \
+SHL1STDLIBS= \
ole2.lib compobj.lib storage.lib shell.lib \
ole2disp.lib typelib.lib
.ENDIF
diff --git a/binfilter/bf_svtools/util/makefile.mk b/binfilter/bf_svtools/util/makefile.mk
index 442bcbe..c486509 100644
--- a/binfilter/bf_svtools/util/makefile.mk
+++ b/binfilter/bf_svtools/util/makefile.mk
@@ -91,9 +91,8 @@ SHL1STDLIBS+= \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB)
-
+
.IF "$(OS)"=="MACOSX"
# static libraries go at end
SHL1STDLIBS+= $(JPEG3RDLIB)
diff --git a/binfilter/bf_svx/util/makefile.mk b/binfilter/bf_svx/util/makefile.mk
index 582c6cd..26bca9c 100644
--- a/binfilter/bf_svx/util/makefile.mk
+++ b/binfilter/bf_svx/util/makefile.mk
@@ -63,7 +63,6 @@ SHL1STDLIBS= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(ICUUCLIB)\
diff --git a/binfilter/bf_xmloff/util/makefile.mk b/binfilter/bf_xmloff/util/makefile.mk
index d6bff91..0a10793 100644
--- a/binfilter/bf_xmloff/util/makefile.mk
+++ b/binfilter/bf_xmloff/util/makefile.mk
@@ -73,7 +73,6 @@ SHL1STDLIBS= \
$(BFSVTOOLLIB) \
$(TOOLSLIB) \
$(I18NISOLANGLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB)\
$(COMPHELPERLIB)\
diff --git a/oox/prj/build.lst b/oox/prj/build.lst
index 1650e02..57fde11 100644
--- a/oox/prj/build.lst
+++ b/oox/prj/build.lst
@@ -1,4 +1,4 @@
-oox oox : vos cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
+oox oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
oox oox usr1 - all oox_mkout NULL
oox oox\prj get - all oox_prj NULL
oox oox\source\token nmake - all oox_token NULL
commit d336cbeaca9a5b6529f6a47f8d852237ba6fcad1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 15:36:32 2010 -0500
convert vos/process.hxx and related API
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index aa2d11e..e1fced7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -30,7 +30,6 @@
#include <tools/debug.hxx>
#include <i18npool/mslangid.hxx>
#include <vcl/svapp.hxx>
-#include <vos/xception.hxx>
#include <bf_sfx2/objsh.hxx>
#include <unotools/charclass.hxx>
@@ -53,7 +52,7 @@
#include "scmatrix.hxx"
#include "addinlis.hxx"
#include "scfuncs.hrc"
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx>
namespace binfilter {
using namespace ::com::sun::star;
diff --git a/binfilter/bf_sch/source/core/sch_chtmodel.cxx b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
index 28e68a7..1af1da6 100644
--- a/binfilter/bf_sch/source/core/sch_chtmodel.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
@@ -115,7 +115,6 @@ class SbxArray;
#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <bf_svx/langitem.hxx>
-#include <vos/xception.hxx>
#include <bf_svtools/undo.hxx>
#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index 5ad3963..5ad456b 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -64,7 +64,6 @@
#include <bf_svx/outlobj.hxx>
#include <bf_svtools/saveopt.hxx>
#include <comphelper/extract.hxx>
-#include <vos/xception.hxx>
#include <i18npool/mslangid.hxx>
#include <unotools/charclass.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
index 5b26df8..8eb0837 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
@@ -42,7 +42,6 @@
#include <bf_svtools/itempool.hxx>
#include <bf_svtools/urihelper.hxx>
#include <bf_svtools/helpopt.hxx>
-#include <vos/process.hxx>
#include "appimp.hxx"
#include "sfxtypes.hxx"
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
index c55e211..380b792 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
@@ -28,8 +28,6 @@
#include <vcl/status.hxx>
#include <vcl/msgbox.hxx>
-#include <vos/process.hxx>
-#include <vos/xception.hxx>
#include <bf_svtools/whiter.hxx>
#include <bf_svtools/stritem.hxx>
#include <bf_svtools/intitem.hxx>
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index d5670d2..07fb77e 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -36,7 +36,6 @@
#include <sal/types.h>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/ucb/XContent.hpp>
-#include <vos/process.hxx>
#include <rtl/logfile.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index 0604001..8103e73 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/mutex.hxx>
-#include <vos/process.hxx>
#include <unotools/localfilehelper.hxx>
#include <rtl/instance.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index 2804c7f..3c6d16f 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -48,7 +48,6 @@
#include <unotools/bootstrap.hxx>
#include <unotools/ucbhelper.hxx>
-#include <vos/process.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx b/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
index 21e0cb3..752fc09 100644
--- a/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
+++ b/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
@@ -33,7 +33,6 @@
#include <tools/resmgr.hxx>
#include <tools/shl.hxx>
-#include <vos/process.hxx>
#include <bf_svtools/svtdata.hxx>
diff --git a/binfilter/inc/bf_goodies/base3d.hxx b/binfilter/inc/bf_goodies/base3d.hxx
index aad9f57..eb72fec 100644
--- a/binfilter/inc/bf_goodies/base3d.hxx
+++ b/binfilter/inc/bf_goodies/base3d.hxx
@@ -68,7 +68,7 @@ namespace binfilter {
// // Texturverwaltung
// Container maTextureStore;
// AutoTimer maTimer;
-// vos::OMutex maMutex;
+// osl::Mutex maMutex;
//
// // link for timer
// DECL_LINK(TimerHdl, AutoTimer*);
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfilter/inc/bf_sd/sdfilter.hxx
index 4d9a19a..aedcb66 100644
--- a/binfilter/inc/bf_sd/sdfilter.hxx
+++ b/binfilter/inc/bf_sd/sdfilter.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -32,7 +32,6 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
-namespace vos { class OModule; }
namespace binfilter {
// ------------
@@ -64,7 +63,7 @@ protected:
void CreateProgress();
public:
-
+
SdFilter( SfxMedium& rMedium, SdDrawDocShell& rDocShell, sal_Bool bShowProgress );
~SdFilter();
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 96a4da6..cc561b8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -94,10 +94,6 @@
#include <toolkit/unohlp.hxx>
#include <vcl/virdev.hxx>
#include <rtl/crc.h>
-#include <vos/xception.hxx>
-#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
-#endif
using namespace ::rtl;
using namespace ::com::sun::star;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 0446414..44a0a7e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -128,10 +128,7 @@
#include <svx/sdasaitm.hxx>
#include <ucbhelper/content.hxx>
#include <ucbhelper/contentbroker.hxx>
-#include <vos/xception.hxx>
-#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
-#endif
+
#include "svx/EnhancedCustomShapeTypeNames.hxx"
#include "svx/EnhancedCustomShapeGeometry.hxx"
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
commit a1cb9b1438f9c9bea2daae12ef4c3b70df6892ca
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 20 19:21:48 2010 -0500
remvove vos/macros.h usage
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index 1879ce5..4f954d2 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -28,7 +28,6 @@
#include <list>
-#include <vos/macros.hxx>
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
commit f016b2bbd2e9af472abe92a6a6495e338eb46fc9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 03:49:49 2010 -0500
migrate vos::OModule to osl:Module
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index 738f828..294db28 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -32,7 +32,7 @@
// INCLUDE ---------------------------------------------------------------
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include "adiasync.hxx"
#include <tools/debug.hxx>
@@ -150,15 +150,15 @@ class ModuleData : public DataObject
{
friend class ModuleCollection;
String aName;
- vos::OModule* pInstance;
+ osl::Module* pInstance;
public:
- ModuleData(const String& rStr, vos::OModule* pInst) : aName (rStr), pInstance (pInst) {}
- ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new vos::OModule(aName);}
+ ModuleData(const String& rStr, osl::Module* pInst) : aName (rStr), pInstance (pInst) {}
+ ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new osl::Module(aName);}
~ModuleData() { delete pInstance; }
virtual DataObject* Clone() const { return new ModuleData(*this); }
const String& GetName() const { return aName; }
- vos::OModule* GetInstance() const { return pInstance; }
+ osl::Module* GetInstance() const { return pInstance; }
void FreeInstance() { delete pInstance; pInstance = 0; }
};
@@ -210,7 +210,7 @@ public:
/*N*/ BOOL FuncData::Call(void** ppParam)
/*N*/ {
/*N*/ BOOL bRet = FALSE;
- vos::OModule* pLib = pModuleData->GetInstance();
+ osl::Module* pLib = pModuleData->GetInstance();
/*N*/ FARPROC fProc = (FARPROC)pLib->getSymbol(aFuncName);
/*N*/ if (fProc != NULL)
/*N*/ {
diff --git a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
index 7e00980..034087e 100644
--- a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -30,7 +30,7 @@
#include <tools/debug.hxx>
#include <osl/file.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <bf_svtools/pathoptions.hxx>
#include <bf_sfx2/docfile.hxx>
#include <bf_sfx2/progress.hxx>
diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index 679ee74..09924cf 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -51,7 +51,7 @@
#include "insdlg.hxx"
#include "bf_so3/outplace.hxx"
#include <viscache.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <sot/formats.hxx>
#include <bf_svtools/filter.hxx>
#include <comphelper/classids.hxx>
@@ -60,7 +60,6 @@
#include <unotools/ucbstreamhelper.hxx>
#include <bf_svtools/wmf.hxx>
-using namespace vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::datatransfer;
@@ -636,7 +635,7 @@ SvInPlaceObjectRef SvOutPlaceObject::InsertObject
io.dwFlags=IOF_SELECTCREATENEW | IOF_DISABLELINK;
io.clsid = rName.GetCLSID();
- OModule aOleDlgLib;
+ osl::Module aOleDlgLib;
if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )
return &xRet;
commit 5ef8b0f0616a981b89d5bbd325fda4270a039402
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 03:16:59 2010 -0500
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
diff --git a/binfilter/bf_basic/source/classes/sb.cxx b/binfilter/bf_basic/source/classes/sb.cxx
index 4b75db6..df3f3f4 100644
--- a/binfilter/bf_basic/source/classes/sb.cxx
+++ b/binfilter/bf_basic/source/classes/sb.cxx
@@ -47,7 +47,7 @@
#include "image.hxx"
#include "filefmt.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
namespace binfilter {
diff --git a/binfilter/bf_basic/source/classes/sbunoobj.cxx b/binfilter/bf_basic/source/classes/sbunoobj.cxx
index a4fdab0..4853691 100644
--- a/binfilter/bf_basic/source/classes/sbunoobj.cxx
+++ b/binfilter/bf_basic/source/classes/sbunoobj.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/errcode.hxx>
#include <bf_svtools/hint.hxx>
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index 36c1acc..1879ce5 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -43,7 +43,7 @@
#include "sbunoobj.hxx"
#include "basrdll.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
// for the bsearch
diff --git a/binfilter/bf_forms/source/component/forms_FormattedField.cxx b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
index 58b72dc..9bee716 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
@@ -59,7 +59,7 @@
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// needed as long as we use the SolarMutex
#include <comphelper/streamsection.hxx>
diff --git a/binfilter/bf_forms/source/component/forms_Image.cxx b/binfilter/bf_forms/source/component/forms_Image.cxx
index 00d13aa..c4e8795 100644
--- a/binfilter/bf_forms/source/component/forms_Image.cxx
+++ b/binfilter/bf_forms/source/component/forms_Image.cxx
@@ -39,7 +39,7 @@
#include <vcl/svapp.hxx>
#include <bf_sfx2/docfile.hxx>
#include <bf_sfx2/objsh.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "services.hxx"
#include <comphelper/container.hxx>
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index ac713b1..09dfd5b 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -405,7 +405,7 @@ using namespace ::com::sun::star;
/*?*/ // This check is done after calling EndListening, so a later BroadcastUno call
/*?*/ // won't touch this object.
/*?*/
-/*?*/ vos::IMutex& rSolarMutex = Application::GetSolarMutex();
+/*?*/ osl::SolarMutex& rSolarMutex = Application::GetSolarMutex();
/*?*/ if ( rSolarMutex.tryToAcquire() )
/*?*/ {
/*?*/ // BroadcastUno is always called with the SolarMutex locked, so if it
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index 544ca56..738f828 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -38,7 +38,6 @@
#include <tools/debug.hxx>
namespace binfilter {
-using namespace ::vos;
//------------------------------------------------------------------------
@@ -147,21 +146,21 @@ typedef void (CALLTYPE* FARPROC) ( void );
/*N*/ }
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-/*N*/ class ModuleData : public DataObject
-/*N*/ {
-/*N*/ friend class ModuleCollection;
-/*N*/ String aName;
-/*N*/ OModule* pInstance;
-/*N*/ public:
-/*N*/ ModuleData(const String& rStr, OModule* pInst) : aName (rStr), pInstance (pInst) {}
-/*N*/ ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new OModule(aName);}
-/*N*/ ~ModuleData() { delete pInstance; }
-/*N*/ virtual DataObject* Clone() const { return new ModuleData(*this); }
-/*N*/
-/*N*/ const String& GetName() const { return aName; }
-/*N*/ OModule* GetInstance() const { return pInstance; }
-/*N*/ void FreeInstance() { delete pInstance; pInstance = 0; }
-/*N*/ };
+class ModuleData : public DataObject
+{
+ friend class ModuleCollection;
+ String aName;
+ vos::OModule* pInstance;
+public:
+ ModuleData(const String& rStr, vos::OModule* pInst) : aName (rStr), pInstance (pInst) {}
+ ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new vos::OModule(aName);}
+ ~ModuleData() { delete pInstance; }
+ virtual DataObject* Clone() const { return new ModuleData(*this); }
+
+ const String& GetName() const { return aName; }
+ vos::OModule* GetInstance() const { return pInstance; }
+ void FreeInstance() { delete pInstance; pInstance = 0; }
+};
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
/*N*/ class ModuleCollection : public SortedCollection
@@ -211,7 +210,7 @@ typedef void (CALLTYPE* FARPROC) ( void );
/*N*/ BOOL FuncData::Call(void** ppParam)
/*N*/ {
/*N*/ BOOL bRet = FALSE;
-/*N*/ OModule* pLib = pModuleData->GetInstance();
+ vos::OModule* pLib = pModuleData->GetInstance();
/*N*/ FARPROC fProc = (FARPROC)pLib->getSymbol(aFuncName);
/*N*/ if (fProc != NULL)
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
index d7aacd4..392942d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
@@ -42,7 +42,7 @@ namespace binfilter {
/*N*/ {
/*N*/ (*ppControl)->SetAllowRefresh( FALSE );
/*N*/ // wait for any running refresh in another thread to finnish
-/*N*/ ::vos::OGuard aGuard( (*ppControl)->GetMutex() );
+/*N*/ ::osl::MutexGuard aGuard( (*ppControl)->GetMutex() );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_unodoc.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_unodoc.cxx
index 130e035..10efeaf 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_unodoc.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_unodoc.cxx
@@ -32,7 +32,7 @@
#include "scmod.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
index 1343131..021e4ad 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
@@ -63,13 +63,12 @@
namespace binfilter {
-using namespace vos;
using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-
+
ChXChartAxis::ChXChartAxis( ChartModel* _Model, long _WhichId ) :
ChXChartObject( CHMAP_AXIS, _Model, _WhichId )
{
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx
index f1c6374..0f03b7f 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx
@@ -44,7 +44,6 @@ namespace binfilter {
#define SCH_ASCII_TO_OU( s ) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( s ) )
#endif
-using namespace vos;
using namespace ::com::sun::star;
#define SCH_BIN_MIN(a,b) ( ((a)<(b))? (a) : (b) )
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx
index 8a97fa1..598aa44 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx
@@ -29,7 +29,7 @@
// header for class Application
#include <vcl/svapp.hxx>
// header for class OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "ChXChartDataChangeEventListener.hxx"
#include "ChXChartDocument.hxx"
@@ -41,7 +41,6 @@ namespace binfilter {
// using namespace osl;
using namespace rtl;
-using namespace vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
index c3c559d..d2b0c01 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
@@ -76,7 +76,6 @@ namespace binfilter {
extern SchUnoPropertyMapProvider aSchMapProvider;
-using namespace vos;
using namespace ::com::sun::star;
using ::rtl::OUString;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx
index 04a9e89..4c54aa0 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx
@@ -36,7 +36,6 @@
namespace binfilter {
-using namespace vos;
using namespace ::com::sun::star;
#define CHART_DRAW_PAGE_WIDTH_ID 1
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
index 979dfd0..8c85f92 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
@@ -73,7 +73,6 @@ namespace binfilter {
extern SchUnoPropertyMapProvider aSchMapProvider;
-using namespace vos;
using namespace ::com::sun::star;
using namespace ::rtl;
using namespace ::com::sun::star::uno;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
index 2dbf3ce..25f6aab 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
@@ -69,7 +69,6 @@ namespace binfilter {
extern SchUnoPropertyMapProvider aSchMapProvider;
-using namespace vos;
using namespace ::com::sun::star;
ChXDataPoint::ChXDataPoint( sal_Int32 _Col, sal_Int32 _Row, ChartModel* _Model ) :
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
index 35c991d..42a1632 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
@@ -71,7 +71,6 @@ namespace binfilter {
extern SchUnoPropertyMapProvider aSchMapProvider;
-using namespace vos;
using namespace ::com::sun::star;
ChXDataRow::ChXDataRow( sal_Int32 _Row, ChartModel* _Model ) :
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 0cde242..946386e 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -102,7 +102,6 @@ namespace
namespace binfilter {
-using namespace ::vos;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx
index 51f1778..9ac4e66 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx
@@ -30,7 +30,7 @@
#include "mapprov.hxx"
// header for class OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// header for class Application
#include <vcl/svapp.hxx>
#include <rtl/uuid.h>
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx
index ec9d908..48b8649 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx
@@ -30,7 +30,7 @@
#include "mapprov.hxx"
// header for class OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// header for class Application
#include <vcl/svapp.hxx>
#include <rtl/uuid.h>
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx
index e0ae372..a0ab36e 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx
@@ -30,7 +30,7 @@
#include "defines.hxx"
// header for class OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// header for class Application
#include <vcl/svapp.hxx>
#include <rtl/uuid.h>
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx
index 7ca9299..27eb421 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx
@@ -30,7 +30,7 @@
#include "mapprov.hxx"
// header for class OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// header for class Application
#include <vcl/svapp.hxx>
#include <rtl/uuid.h>
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx
index a7ef71b..238d6fd 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx
@@ -33,7 +33,7 @@
#include "schmod.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
index 41626ab..a8c0b2e 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
@@ -53,7 +53,6 @@ namespace binfilter {
using namespace ::comphelper;
using namespace ::osl;
using namespace ::cppu;
-using namespace ::vos;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@@ -208,7 +207,7 @@ DocumentSettings::~DocumentSettings() throw()
void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdDrawDocument* pDoc = mpModel->GetDoc();
SdDrawDocShell* pDocSh = mpModel->GetDocShell();
@@ -741,7 +740,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) throw(UnknownPropertyException, WrappedTargetException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdDrawDocument* pDoc = mpModel->GetDoc();
SdDrawDocShell* pDocSh = mpModel->GetDocShell();
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx
index 2f4c70b..0629501 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <bf_svx/svdpage.hxx>
@@ -40,7 +40,6 @@
namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx
index b01668d..67c0821 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx
@@ -33,7 +33,7 @@
#include "sdmod.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
index 292efe0..d986b89 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
@@ -27,7 +27,7 @@
************************************************************************/
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -51,7 +51,6 @@ namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
UNO3_GETIMPLEMENTATION_IMPL( SdUnoGraphicStyleFamily );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
index 4ed4ee6..74d16d0 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -48,7 +48,6 @@
namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
SdUnoGraphicStyle::SdUnoGraphicStyle( SdXImpressDocument* pModel /* = NULL */,
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
index be92369..442d442 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
@@ -55,7 +55,6 @@
namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
#define WID_LAYER_LOCKED 1
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index b7b01f0..499aa7b 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -92,7 +92,6 @@ namespace binfilter {
using namespace ::osl;
using namespace ::rtl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -634,7 +633,7 @@ void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container:
uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( const uno::Reference< drawing::XDrawPage >& xPage )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -663,7 +662,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con
uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -683,7 +682,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages(
uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPages()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -703,7 +702,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPage
uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerManager( )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -720,7 +719,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerMa
uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCustomPresentations()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -737,7 +736,7 @@ uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCust
uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPresentation()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -754,7 +753,7 @@ uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPr
uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMasterPage()
throw (uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -775,7 +774,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMast
uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( const OUString& aServiceSpecifier )
throw(uno::Exception, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -1082,14 +1081,14 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames(
uno::Reference< beans::XPropertySetInfo > SAL_CALL SdXImpressDocument::getPropertySetInfo( )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return aPropSet.getPropertySetInfo();
}
void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -1159,7 +1158,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam
uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& PropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Any aAny;
if( NULL == pDoc )
@@ -1234,7 +1233,7 @@ void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString&
uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -1246,7 +1245,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks()
uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFamilies( )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -1271,7 +1270,7 @@ sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelect
const uno::Sequence< beans::PropertyValue >& rxOptions )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Int32 nRet = 0;
if( NULL == pDoc )
@@ -1305,7 +1304,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer(
const uno::Sequence< beans::PropertyValue >& rxOptions )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -1391,7 +1390,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
const uno::Sequence< beans::PropertyValue >& rxOptions )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == pDoc )
throw lang::DisposedException();
@@ -1441,7 +1440,7 @@ void SdXImpressDocument::initializeDocument()
void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::RuntimeException)
{
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( pDoc )
{
EndListening( *pDoc );
@@ -1481,7 +1480,7 @@ SdDrawPagesAccess::~SdDrawPagesAccess() throw()
sal_Int32 SAL_CALL SdDrawPagesAccess::getCount()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1492,7 +1491,7 @@ sal_Int32 SAL_CALL SdDrawPagesAccess::getCount()
uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index )
throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1515,7 +1514,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index )
// XNameAccess
uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1545,7 +1544,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(co
uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1566,7 +1565,7 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(un
sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1608,7 +1607,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements()
uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1634,7 +1633,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByInde
void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1705,7 +1704,7 @@ SdMasterPagesAccess::~SdMasterPagesAccess() throw()
sal_Int32 SAL_CALL SdMasterPagesAccess::getCount()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1720,7 +1719,7 @@ sal_Int32 SAL_CALL SdMasterPagesAccess::getCount()
uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index )
throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1757,7 +1756,7 @@ sal_Bool SAL_CALL SdMasterPagesAccess::hasElements()
uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIndex( sal_Int32 nInsertPos )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1860,7 +1859,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.pDoc )
throw lang::DisposedException();
@@ -1928,7 +1927,7 @@ SdDocLinkTargets::~SdDocLinkTargets() throw()
uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName )
throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.GetDoc() )
throw lang::DisposedException();
@@ -1950,7 +1949,7 @@ uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName )
uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.GetDoc() )
throw lang::DisposedException();
@@ -1983,7 +1982,7 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames()
sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( NULL == rModel.GetDoc() )
throw lang::DisposedException();
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
index e32a762..c83583f 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
@@ -81,7 +81,6 @@ namespace binfilter {
#endif
#endif
-using namespace ::vos;
using namespace ::rtl;
using namespace ::com::sun::star;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
index 81ccf4c..b0a2a3c 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
@@ -59,7 +59,6 @@
#include "unohelp.hxx"
namespace binfilter {
-using namespace ::vos;
using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star;
@@ -329,14 +328,14 @@ uno::Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType )
uno::Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetInfo()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return maPropSet.getPropertySetInfo();
}
void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( (GetPage() == NULL) || (mpModel == NULL) )
throw uno::RuntimeException();
@@ -553,7 +552,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
uno::Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Any aAny;
if( (GetPage() == NULL) || (mpModel == NULL) )
@@ -1154,7 +1153,7 @@ uno::Type SAL_CALL SdPageLinkTargets::getElementType()
sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdPage* pPage = mpUnoPage->GetPage();
if( pPage != NULL )
@@ -1181,7 +1180,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
uno::Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName )
throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdPage* pPage = mpUnoPage->GetPage();
if( pPage != NULL )
@@ -1200,7 +1199,7 @@ uno::Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName )
uno::Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_uInt32 nObjCount = 0;
@@ -1242,7 +1241,7 @@ uno::Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames()
sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return FindObject( aName ) != NULL;
}
@@ -1484,7 +1483,7 @@ sal_Bool SAL_CALL SdDrawPage::supportsService( const OUString& ServiceName )
void SAL_CALL SdDrawPage::setName( const OUString& rName )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
DBG_ASSERT( GetPage() && !GetPage()->IsMasterPage(), "Don't call base implementation for masterpages!" );
@@ -1533,7 +1532,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
OUString SAL_CALL SdDrawPage::getName()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return getPageApiName( GetPage() );
}
@@ -1542,7 +1541,7 @@ OUString SAL_CALL SdDrawPage::getName()
uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
DBG_ASSERT(mpModel,"SdDrawPage hat kein Model??");
if(mpModel && GetPage())
@@ -1561,7 +1560,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( )
void SAL_CALL SdDrawPage::setMasterPage( const uno::Reference< drawing::XDrawPage >& xMasterPage )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
DBG_ASSERT(mpModel,"SdDrawPage hat kein Model??");
if(mpModel && pPage)
@@ -1600,7 +1599,7 @@ void SAL_CALL SdDrawPage::setMasterPage( const uno::Reference< drawing::XDrawPag
uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pPage && mpModel && mpModel->GetDoc() )
{
@@ -2138,7 +2137,7 @@ void SdMasterPage::getBackground( uno::Any& rValue ) throw()
void SAL_CALL SdMasterPage::setName( const OUString& aName )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pPage && GetPage()->GetPageKind() != PK_NOTES)
{
@@ -2155,7 +2154,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& aName )
OUString SAL_CALL SdMasterPage::getName( )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pPage)
{
@@ -2172,7 +2171,7 @@ OUString SAL_CALL SdMasterPage::getName( )
uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pPage && mpModel && mpModel->GetDoc() )
{
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx
index a64be50..e7d6d6f 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx
@@ -45,7 +45,6 @@
namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
const SfxItemPropertyMap* ImplGetPageBackgroundPropertyMap()
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
index 7050687..03c167e 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
@@ -39,13 +39,12 @@
#include "unohelp.hxx"
#include "unopage.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
namespace binfilter {
using namespace ::rtl;
using namespace ::cppu;
-using namespace ::vos;
using namespace ::com::sun::star;
const SfxItemPropertyMap* ImplGetPresentationPropertyMap()
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
index 8a6ace5..2d2a28c 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
@@ -51,7 +51,6 @@
namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
static struct StyleNameMapping_t
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
index 7310e2b..baf7620 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
@@ -28,7 +28,7 @@
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -59,7 +59,6 @@
namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
#define WID_STYLE_DISPNAME 7998
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx
index bc0ef25..325e2dc 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx
@@ -42,7 +42,6 @@
namespace binfilter {
using namespace ::rtl;
-using namespace ::vos;
using namespace ::com::sun::star;
SdUnoStyleFamilies::SdUnoStyleFamilies( SdXImpressDocument* pModel ) throw()
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
index 51ecb05..6cdf2ff 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
@@ -81,7 +81,7 @@
#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
index f1304aa..c55e211 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
@@ -46,7 +46,7 @@
#include <com/sun/star/uno/Reference.h>
#include <tools/config.hxx>
#include <tools/rcid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#ifdef _MSC_VER
#pragma hdrstop
#endif
@@ -80,7 +80,6 @@
#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx b/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
index 13af0ba..dae1a17 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
@@ -38,7 +38,7 @@
#include "osl/diagnose.h"
#include "rtl/ustring.h"
#include "sal/types.h"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
namespace binfilter {
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index 5930ec5..d5670d2 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -44,7 +44,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::rtl;
-using namespace ::vos;
#include <bf_svtools/ctypeitm.hxx>
#include <bf_svtools/sfxecode.hxx>
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index dec2ecf..85a991d 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -124,7 +124,7 @@ namespace binfilter {
/*N*/ {
/*N*/ ULONG m_nAcquireCount;
/*N*/ SfxMedium* m_pMedium;
-/*N*/ ::vos::OMutex m_aMutex;
+/*N*/ ::osl::Mutex m_aMutex;
/*N*/ public:
/*N*/ SfxLockBytesHandler_Impl( SfxMedium* pMedium )
/*N*/ : m_pMedium( pMedium )
@@ -132,7 +132,7 @@ namespace binfilter {
/*N*/ {}
/*N*/
/*N*/ virtual void Handle( ::utl::UcbLockBytesHandler::LoadHandlerItem nWhich, ::utl::UcbLockBytesRef xLockBytes );
-/*N*/ ::vos::OMutex& GetMutex()
+/*N*/ ::osl::Mutex& GetMutex()
/*N*/ { return m_aMutex; }
/*N*/ void ReleaseMedium()
/*N*/ { m_pMedium = NULL; }
@@ -142,7 +142,7 @@ namespace binfilter {
/*N*/ void SfxLockBytesHandler_Impl::Handle( ::utl::UcbLockBytesHandler::LoadHandlerItem nWhich, ::utl::UcbLockBytesRef xLockBytes )
/*N*/ {
-/*N*/ ::vos::OGuard aGuard( m_aMutex );
+/*N*/ ::osl::MutexGuard aGuard( m_aMutex );
/*N*/ if ( IsActive() && xLockBytes.Is()&& m_pMedium )
/*N*/ {
/*N*/ switch( nWhich )
@@ -1541,7 +1541,7 @@ namespace binfilter {
=> further the help will be empty then ... #100490#
*/
/*N*/ //CancelTransfers();
-/*N*/ ::vos::OClearableGuard aGuard( pImp->aHandler->GetMutex() );
+/*N*/ ::osl::ClearableMutexGuard aGuard( pImp->aHandler->GetMutex() );
/*N*/ pImp->aHandler->ReleaseMedium();
/*N*/ aGuard.clear();
/*N*/
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
index 2c1b9b1..316d2ae 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
@@ -31,7 +31,7 @@
#include <bf_svtools/stritem.hxx>
#include <bf_svtools/intitem.hxx>
#include <bf_so3/inetbnd.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <bf_sfx2/app.hxx>
#ifdef _MSC_VER
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
index b9fd94b..0874572 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
@@ -63,10 +63,9 @@
#include "objshimp.hxx"
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
namespace binfilter {
-using namespace vos;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index 2f39047..176560a 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/util/XCloseable.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/resary.hxx>
#include <vcl/svapp.hxx>
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
index 2298608..3eee360 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
@@ -85,7 +85,7 @@
#include <ucbhelper/content.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/salctype.hxx>
//________________________________________________________________________________________________________
diff --git a/binfilter/bf_sfx2/source/inc/eventsupplier.hxx b/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
index 3b62d35..f500443 100644
--- a/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
+++ b/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
@@ -47,7 +47,7 @@
#include <sfxuno.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <bf_svtools/lstner.hxx>
namespace binfilter {
diff --git a/binfilter/bf_so3/source/ole/socli.cxx b/binfilter/bf_so3/source/ole/socli.cxx
index fcd5d14..af79348 100644
--- a/binfilter/bf_so3/source/ole/socli.cxx
+++ b/binfilter/bf_so3/source/ole/socli.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "socont.h"
@@ -106,15 +106,13 @@ STDMETHODIMP_(ULONG) CImpIOleClientSite::Release(void)
*/
STDMETHODIMP CImpIOleClientSite::SaveObject(void)
- {
- //We're already set up with the tenant to save; this is trivial.
- vos::IMutex& mutex= Application::GetSolarMutex();
- sal_Bool bAquired= mutex.tryToAcquire();
+{
+ ::SolarMuexGuard aGuard;
+
m_pTen->Update();
- if( bAquired)
- mutex.release();
+
return NOERROR;
- }
+}
diff --git a/binfilter/bf_so3/source/persist/transbnd.cxx b/binfilter/bf_so3/source/persist/transbnd.cxx
index 97d5c23..1e25ab3 100644
--- a/binfilter/bf_so3/source/persist/transbnd.cxx
+++ b/binfilter/bf_so3/source/persist/transbnd.cxx
@@ -38,7 +38,7 @@
#include <rtl/ustring.h>
#endif
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/solar.h>
#include <tools/debug.hxx>
@@ -169,7 +169,7 @@ void SvBinding::OnDataAvailable (
case SVBSCF_INTERMEDIATEDATANOTIFICATION:
if (m_bMimeAvail && m_xLockBytes.Is() && nSize)
{
- vos::IMutex &rAppMutex = Application::GetSolarMutex();
+ osl::SolarMutex &rAppMutex = Application::GetSolarMutex();
if (m_xCallback.Is() && rAppMutex.tryToAcquire())
{
m_xCallback->OnDataAvailable (
@@ -198,7 +198,7 @@ void SvBinding::OnProgress (
SvBindingRef xThis (this);
if (m_xCallback.Is())
{
- vos::IMutex &rAppMutex = Application::GetSolarMutex();
+ osl::SolarMutex &rAppMutex = Application::GetSolarMutex();
if (m_xCallback.Is() && rAppMutex.tryToAcquire())
{
m_xCallback->OnProgress (
diff --git a/binfilter/bf_so3/source/persist/transprt.cxx b/binfilter/bf_so3/source/persist/transprt.cxx
index 1d8e509..1be1e0c 100644
--- a/binfilter/bf_so3/source/persist/transprt.cxx
+++ b/binfilter/bf_so3/source/persist/transprt.cxx
@@ -62,8 +62,8 @@
#include <cppuhelper/weak.hxx>
-#include <vos/macros.hxx>
-#include <vos/mutex.hxx>
+#include <sal/macros.h>
+#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
#include <tools/solar.h>
@@ -515,7 +515,7 @@ ErrCode UcbTransportLockBytes::ReadAt (
Sequence<sal_Int8> aData;
sal_Int32 nSize;
- nCount = VOS_MIN(nCount, 0x7FFFFFFF);
+ nCount = SAL_MIN(nCount, 0x7FFFFFFF);
try
{
while (!m_bTerminated)
@@ -547,7 +547,7 @@ ErrCode UcbTransportLockBytes::ReadAt (
if (pRead)
*pRead = ULONG(nSize);
- sal_uInt32 nRead = VOS_MAX(m_nRead, nPos + nSize);
+ sal_uInt32 nRead = SAL_MAX(m_nRead, nPos + nSize);
SAL_CONST_CAST(UcbTransportLockBytes*, this)->m_nRead = nRead;
return ERRCODE_NONE;
@@ -1144,7 +1144,7 @@ protected:
/** getMutex_Impl.
*/
- inline vos::IMutex& getMutex_Impl (void);
+ inline osl::Mutex& getMutex_Impl (void);
/** createContent_Impl.
*/
@@ -1159,7 +1159,7 @@ protected:
private:
/** Representation.
*/
- vos::OMutex m_aMutex;
+ osl::Mutex m_aMutex;
Reference<XInteractionHandler> m_xInteractionHdl;
oslInterlockedCount m_nProgressDepth;
sal_Int32 m_nProgressMin;
@@ -1175,7 +1175,7 @@ private:
*/
inline sal_Bool UcbTransport_Impl::getCallback_Impl ( SvBindingTransportCallback *&rpCallback)
{
- vos::OGuard aGuard (m_aMutex);
+ osl::MutexGuard aGuard (m_aMutex);
rpCallback = m_pCallback;
return (!!rpCallback);
}
@@ -1183,7 +1183,7 @@ inline sal_Bool UcbTransport_Impl::getCallback_Impl ( SvBindingTransportCallback
/*
* getMutex_Impl.
*/
-inline vos::IMutex& UcbTransport_Impl::getMutex_Impl (void)
+inline osl::Mutex& UcbTransport_Impl::getMutex_Impl (void)
{
return m_aMutex;
}
@@ -1453,7 +1453,7 @@ Reference<XProgressHandler> SAL_CALL UcbTransport_Impl::getProgressHandler (void
*/
void SAL_CALL UcbTransport_Impl::disposing ( const EventObject & ) throw(RuntimeException)
{
- vos::OGuard aGuard (m_aMutex);
+ osl::MutexGuard aGuard (m_aMutex);
// m_xTask = NULL;
}
@@ -1595,7 +1595,7 @@ void SAL_CALL UcbTransport_Impl::propertiesChange ( const Sequence<PropertyChang
*/
void UcbTransport_Impl::dispose_Impl (void)
{
- vos::OGuard aGuard (m_aMutex);
+ osl::MutexGuard aGuard (m_aMutex);
Reference<XPropertiesChangeNotifier> xProps (m_xContent, UNO_QUERY);
if (xProps.is())
@@ -1970,7 +1970,7 @@ void UcbHTTPTransport_Impl::analyzeHeader_Impl (
if (aName.CompareIgnoreCaseToAscii("Content-Type") == COMPARE_EQUAL)
{
- vos::OGuard aGuard (getMutex_Impl());
+ osl::MutexGuard aGuard (getMutex_Impl());
m_aContentType = aValue;
m_bNeedMime = sal_False;
diff --git a/binfilter/bf_starmath/source/starmath_unodoc.cxx b/binfilter/bf_starmath/source/starmath_unodoc.cxx
index 9316c97..1d0fd63 100644
--- a/binfilter/bf_starmath/source/starmath_unodoc.cxx
+++ b/binfilter/bf_starmath/source/starmath_unodoc.cxx
@@ -35,7 +35,7 @@
#include "smmod.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
namespace binfilter {
diff --git a/binfilter/bf_starmath/source/starmath_unomodel.cxx b/binfilter/bf_starmath/source/starmath_unomodel.cxx
index 55c06ed..9551226 100644
--- a/binfilter/bf_starmath/source/starmath_unomodel.cxx
+++ b/binfilter/bf_starmath/source/starmath_unomodel.cxx
@@ -30,7 +30,7 @@
#pragma hdrstop
#endif
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <bf_sfx2/printer.hxx>
#include <vcl/svapp.hxx>
@@ -61,7 +61,6 @@
#include <rtl/uuid.h>
namespace binfilter {
-using namespace ::vos;
using namespace ::rtl;
using namespace ::cppu;
using namespace ::std;
diff --git a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx
index 21ff2ad..a2e11e0 100644
--- a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx
+++ b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/uno/Sequence.h>
#include <bf_svtools/poolitem.hxx> //Any2Bool
#include <bf_svtools/smplhint.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <itemholder2.hxx>
#include <vcl/svapp.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_ctloptions.cxx b/binfilter/bf_svtools/source/config/svt_ctloptions.cxx
index c1804a9..c599f1e 100644
--- a/binfilter/bf_svtools/source/config/svt_ctloptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_ctloptions.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <bf_svtools/smplhint.hxx>
#include <vcl/svapp.hxx>
#include <rtl/instance.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_languageoptions.cxx b/binfilter/bf_svtools/source/config/svt_languageoptions.cxx
index cd6d56d..0228595 100644
--- a/binfilter/bf_svtools/source/config/svt_languageoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_languageoptions.cxx
@@ -33,7 +33,7 @@
#include <vcl/svapp.hxx>
#include <i18npool/mslangid.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_undoopt.cxx b/binfilter/bf_svtools/source/config/svt_undoopt.cxx
index 16b7784..8b94c1c 100644
--- a/binfilter/bf_svtools/source/config/svt_undoopt.cxx
+++ b/binfilter/bf_svtools/source/config/svt_undoopt.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <bf_svtools/smplhint.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_useroptions.cxx b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
index 5edb754..d3cb2f6 100644
--- a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <bf_svtools/smplhint.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <rtl/instance.hxx>
#include <rtl/logfile.hxx>
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
index b7518e0..12766aa 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
@@ -32,7 +32,7 @@
#if defined UNX && defined ALPHA
#include <fstream.hxx>
#endif
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
#include <ucbhelper/content.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/binfilter/bf_svtools/source/misc/svt_asynclink.cxx b/binfilter/bf_svtools/source/misc/svt_asynclink.cxx
index 3e42d9d..884de6c 100644
--- a/binfilter/bf_svtools/source/misc/svt_asynclink.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_asynclink.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <asynclink.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <vcl/timer.hxx>
#include <vcl/svapp.hxx>
@@ -39,7 +39,7 @@ namespace binfilter
void AsynchronLink::CreateMutex()
{
- if( !_pMutex ) _pMutex = new vos::OMutex;
+ if( !_pMutex ) _pMutex = new osl::Mutex;
}
void AsynchronLink::Call( void* pObj, BOOL
diff --git a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
index b30e964..beab827 100644
--- a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <tools/rcid.h>
#include <vcl/wintypes.hxx>
diff --git a/binfilter/bf_svtools/source/notify/svt_cancel.cxx b/binfilter/bf_svtools/source/notify/svt_cancel.cxx
index 54a8029..6fded87 100644
--- a/binfilter/bf_svtools/source/notify/svt_cancel.cxx
+++ b/binfilter/bf_svtools/source/notify/svt_cancel.cxx
@@ -31,7 +31,7 @@
#define _SFX_CANCEL_CXX
#include <bf_svtools/cancel.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <bf_svtools/smplhint.hxx>
@@ -39,7 +39,7 @@
#include <rtl/instance.hxx>
-namespace { struct lclMutex : public rtl::Static< ::vos::OMutex, lclMutex >{}; }
+namespace { struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex >{}; }
namespace binfilter
{
@@ -71,7 +71,7 @@ BOOL SfxCancelManager::CanCancel() const
*/
{
- ::vos::OGuard aGuard( lclMutex::get() );
+ ::osl::MutexGuard aGuard( lclMutex::get() );
return _aJobs.Count() > 0 || ( _pParent && _pParent->CanCancel() );
}
@@ -86,7 +86,7 @@ void SfxCancelManager::Cancel( BOOL bDeep )
*/
{
- ::vos::OGuard aGuard( lclMutex::get() );
+ ::osl::MutexGuard aGuard( lclMutex::get() );
SfxCancelManagerWeak xWeak( this );
for ( USHORT n = _aJobs.Count(); n-- && xWeak.Is(); )
if ( n < _aJobs.Count() )
@@ -115,7 +115,7 @@ void SfxCancelManager::InsertCancellable( SfxCancellable *pJob )
}
#endif
- ::vos::OClearableGuard aGuard( lclMutex::get() );
+ ::osl::ClearableMutexGuard aGuard( lclMutex::get() );
_aJobs.C40_INSERT( SfxCancellable, pJob, _aJobs.Count() );
aGuard.clear();
@@ -136,7 +136,7 @@ void SfxCancelManager::RemoveCancellable( SfxCancellable *pJob )
*/
{
- ::vos::OClearableGuard aGuard( lclMutex::get() );
+ ::osl::ClearableMutexGuard aGuard( lclMutex::get() );
const SfxCancellable *pTmp = pJob;
USHORT nPos = _aJobs.GetPos( pTmp );
if ( nPos != 0xFFFF )
diff --git a/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx b/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx
index 5226b60..0e4cd20 100644
--- a/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx
@@ -32,7 +32,7 @@
#include <tools/color.hxx>
#include <tools/debug.hxx>
#include <i18npool/mslangid.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/util/Date.hpp>
diff --git a/binfilter/bf_svtools/source/numbers/svt_numuno.cxx b/binfilter/bf_svtools/source/numbers/svt_numuno.cxx
index 40a59e0..a33676c 100644
--- a/binfilter/bf_svtools/source/numbers/svt_numuno.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_numuno.cxx
@@ -33,7 +33,7 @@
#include <vcl/svapp.hxx>
#include <tools/color.hxx>
#include <tools/debug.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <rtl/uuid.h>
diff --git a/binfilter/bf_svtools/source/numbers/svt_supservs.cxx b/binfilter/bf_svtools/source/numbers/svt_supservs.cxx
index 8775b4f..4416954 100644
--- a/binfilter/bf_svtools/source/numbers/svt_supservs.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_supservs.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <i18npool/mslangid.hxx>
#include <tools/debug.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <strmadpt.hxx>
#include "instrm.hxx"
@@ -41,7 +41,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
-using namespace ::vos;
using namespace ::utl;
namespace binfilter
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx b/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx
index af4fa0e..fd1922f 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx
@@ -38,7 +38,7 @@
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
namespace binfilter
{
diff --git a/binfilter/bf_svtools/source/uno/svt_unoimap.cxx b/binfilter/bf_svtools/source/uno/svt_unoimap.cxx
index 071b04e..fd78095 100644
--- a/binfilter/bf_svtools/source/uno/svt_unoimap.cxx
+++ b/binfilter/bf_svtools/source/uno/svt_unoimap.cxx
@@ -48,7 +48,7 @@
#include <list>
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "unoevent.hxx"
diff --git a/binfilter/bf_svx/source/form/svx_ParseContext.cxx b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
index db1a469..bc90a95 100644
--- a/binfilter/bf_svx/source/form/svx_ParseContext.cxx
+++ b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
@@ -30,7 +30,7 @@
#include "fmresids.hrc"
#include "dialmgr.hxx"
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/shl.hxx>
diff --git a/binfilter/bf_svx/source/inc/trace.hxx b/binfilter/bf_svx/source/inc/trace.hxx
index 305fb75..d4f626a 100644
--- a/binfilter/bf_svx/source/inc/trace.hxx
+++ b/binfilter/bf_svx/source/inc/trace.hxx
@@ -39,7 +39,7 @@ class Tracer
DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int );
static MapThreadId2Int s_aThreadIndents;
- static ::vos::OMutex s_aMapSafety;
+ static ::osl::Mutex s_aMapSafety;
public:
Tracer(const char* _pBlockDescription);
diff --git a/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx b/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
index 8afe5e1..bcc2d5a 100644
--- a/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
@@ -39,7 +39,7 @@
#include "UnoNameItemTable.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "unoapi.hxx"
@@ -48,7 +48,6 @@ namespace binfilter {
using namespace ::com::sun::star;
using namespace ::rtl;
using namespace ::cppu;
-using namespace ::vos;
SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw()
: mpModel( pModel ),
diff --git a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
index 8c611e4..adc0d31 100644
--- a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase2.hxx>
@@ -54,7 +54,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace ::cppu;
using namespace ::rtl;
-using namespace ::vos;
class SvxUnoXPropertyTable : public WeakImplHelper2< XNameContainer, XServiceInfo >
{
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
index d0d1cd3..8551e55 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
@@ -66,7 +66,6 @@ namespace binfilter {
using namespace ::rtl;
using namespace ::osl;
-using namespace ::vos;
using namespace ::com::sun::star;
//-////////////////////////////////////////////////////////////////////
@@ -394,7 +393,7 @@ sal_Bool SAL_CALL SvxUnoDrawingModel::hasControllersLocked( )
uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Reference< drawing::XDrawPages > xDrawPages( mxDrawPagesAccess );
@@ -408,7 +407,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages(
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier )
throw(uno::Exception, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) )
{
@@ -627,7 +626,7 @@ SvxUnoDrawPagesAccess::~SvxUnoDrawPagesAccess() throw()
sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Int32 nCount = 0;
@@ -640,7 +639,7 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index )
throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Any aAny;
@@ -692,7 +691,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Reference< drawing::XDrawPage > xDrawPage;
@@ -715,7 +714,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewBy
void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_uInt16 nPageCount = mrModel.mpDoc->GetPageCount();
if( nPageCount > 1 )
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
index ff5376e..79a18cf 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
@@ -50,7 +50,7 @@
#include <vector>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -60,7 +60,6 @@ namespace binfilter {
using namespace ::com::sun::star;
using namespace ::rtl;
using namespace ::cppu;
-using namespace ::vos;
typedef std::vector< SfxItemSet* > ItemPoolVector;
diff --git a/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx b/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
index ab24901..5d9e2d1 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
@@ -36,7 +36,7 @@
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <toolkit/unohlp.hxx>
#include <rtl/uuid.h>
@@ -51,7 +51,6 @@
using namespace ::com::sun::star;
using namespace ::rtl;
-using namespace ::vos;
using namespace ::std;
/******************************************************************
diff --git a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
index 014d580..0ef3568 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
@@ -55,7 +55,6 @@
namespace binfilter {
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
index c560ac0..cef7612 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
@@ -52,8 +52,6 @@ class SvStream;
namespace binfilter {
-using namespace ::osl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -214,7 +212,7 @@ void SAL_CALL SvxShapeGroup::leaveGroup( ) throw(uno::RuntimeException)
void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -253,7 +251,7 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap
void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdrObject* pSdrShape = NULL;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -294,7 +292,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
//----------------------------------------------------------------------
sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Int32 nRetval = 0;
@@ -310,7 +308,7 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index )
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( pObj == NULL || pObj->GetSubList() == NULL )
throw uno::RuntimeException();
@@ -341,7 +339,7 @@ uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException
//----------------------------------------------------------------------
sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
return pObj && pObj->GetSubList() && (pObj->GetSubList()->GetObjCount() > 0);
}
@@ -459,7 +457,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize )
void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType nPos ) throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Reference< drawing::XShape > xRef( xShape, UNO_QUERY );
SvxShape* pShape = SvxShape::getImplementation( xRef );
@@ -475,7 +473,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC
void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType nPos )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Reference< drawing::XShape > xRef( xShape, UNO_QUERY );
SvxShape* pShape = SvxShape::getImplementation( xRef );
@@ -491,7 +489,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon
void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& xShape )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj)
pObj->DisconnectFromNode( sal_True );
@@ -504,7 +502,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing:
void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& xShape )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj)
pObj->DisconnectFromNode( sal_False );
@@ -626,7 +624,7 @@ void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize )
Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Reference< awt::XControlModel > xModel;
@@ -641,7 +639,7 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl )
throw( uno::RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
SdrUnoObj* pUnoObj = PTR_CAST(SdrUnoObj, pObj);
if( pUnoObj )
@@ -1033,7 +1031,7 @@ void SAL_CALL ImplSvxPolyPolygonToPointSequenceSequence( const drawing::PointSeq
void SAL_CALL SvxShapePolyPolygon::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_POLYPOLYGON)))
{
@@ -1137,7 +1135,7 @@ void SAL_CALL ImplSvxPointSequenceSequenceToPolyPolygon( const XPolyPolygon& rPo
uno::Any SAL_CALL SvxShapePolyPolygon::getPropertyValue( const OUString& aPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_POLYPOLYGON)))
{
@@ -1208,7 +1206,7 @@ drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw()
//----------------------------------------------------------------------
void SvxShapePolyPolygon::SetPolygon(const XPolyPolygon& rNew) throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj)
((SdrPathObj*)pObj)->SetPathPoly(rNew);
@@ -1217,7 +1215,7 @@ void SvxShapePolyPolygon::SetPolygon(const XPolyPolygon& rNew) throw()
//----------------------------------------------------------------------
const XPolyPolygon& SvxShapePolyPolygon::GetPolygon() const throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj)
return ((SdrPathObj*)pObj)->GetPathPoly();
@@ -1366,7 +1364,7 @@ void SAL_CALL ImplSvxPolyPolygonBezierCoordsToPolyPolygon( drawing::PolyPolygonB
void SAL_CALL SvxShapePolyPolygonBezier::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_POLYPOLYGONBEZIER)))
{
@@ -1439,7 +1437,7 @@ void SAL_CALL ImplSvxPolyPolygonToPolyPolygonBezierCoords( const XPolyPolygon& r
uno::Any SAL_CALL SvxShapePolyPolygonBezier::getPropertyValue( const OUString& aPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Any aAny;
if(aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_POLYPOLYGONBEZIER)))
@@ -1487,7 +1485,7 @@ drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw()
//----------------------------------------------------------------------
void SvxShapePolyPolygonBezier::SetPolygon(const XPolyPolygon& rNew) throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj)
((SdrPathObj*)pObj)->SetPathPoly(rNew);
@@ -1496,7 +1494,7 @@ void SvxShapePolyPolygonBezier::SetPolygon(const XPolyPolygon& rNew) throw()
//----------------------------------------------------------------------
const XPolyPolygon& SvxShapePolyPolygonBezier::GetPolygon() const throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj)
return ((SdrPathObj*)pObj)->GetPathPoly();
@@ -1539,7 +1537,7 @@ SvxGraphicObject::~SvxGraphicObject() throw()
void SAL_CALL SvxGraphicObject::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_GRAPHOBJ_FILLBITMAP)))
{
@@ -1660,7 +1658,7 @@ void SAL_CALL SvxGraphicObject::setPropertyValue( const OUString& aPropertyName,
uno::Any SAL_CALL SvxGraphicObject::getPropertyValue( const OUString& aPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_GRAPHOBJ_FILLBITMAP)))
{
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
index 5fc394e..ff29c72 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
@@ -48,7 +48,6 @@
#include "svdmodel.hxx"
namespace binfilter {
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
index 989af11..be6bd87 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
@@ -55,7 +55,6 @@ namespace binfilter {
///////////////////////////////////////////////////////////////////////
using namespace ::osl;
-using namespace ::vos;
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
@@ -84,7 +83,7 @@ SvxOle2Shape::~SvxOle2Shape() throw()
//XPropertySet
void SAL_CALL SvxOle2Shape::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CLSID" ) ) )
{
@@ -181,7 +180,7 @@ void SAL_CALL SvxOle2Shape::setPropertyValue( const OUString& aPropertyName, con
Any SAL_CALL SvxOle2Shape::getPropertyValue( const OUString& PropertyName ) throw( UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ThumbnailGraphicURL" ) ) )
{
@@ -391,7 +390,7 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (
//XPropertySet
void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Bool bOwn = sal_False;
@@ -494,7 +493,7 @@ void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, c
Any SAL_CALL SvxAppletShape::getPropertyValue( const OUString& PropertyName ) throw( UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(PropertyName);
@@ -558,7 +557,7 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (
void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Bool bOwn = sal_False;
@@ -639,7 +638,7 @@ void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, c
Any SAL_CALL SvxPluginShape::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(PropertyName);
@@ -705,7 +704,7 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw ()
void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
sal_Bool bOwn = sal_False;
@@ -834,7 +833,7 @@ void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, co
Any SAL_CALL SvxFrameShape::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(PropertyName);
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
index 99d4ac1..8eff008 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
@@ -90,7 +90,6 @@ class SvStream;
namespace binfilter {
using namespace ::osl;
-using namespace ::vos;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -201,7 +200,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMap* pPropertyMap )
//----------------------------------------------------------------------
SvxShape::~SvxShape() throw()
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
DBG_ASSERT( mnLockCount == 0, "Locked shape was disposed!" );
@@ -942,7 +941,7 @@ void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( pObj && pModel)
{
@@ -965,7 +964,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
//----------------------------------------------------------------------
void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( pObj && pModel )
{
@@ -995,7 +994,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
//----------------------------------------------------------------------
awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( pObj && pModel)
{
@@ -1012,7 +1011,7 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
throw(beans::PropertyVetoException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( pObj && pModel)
{
@@ -1082,7 +1081,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException)
//----------------------------------------------------------------------
void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( bDisposing )
return; // catched a recursion
@@ -1385,7 +1384,7 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u
void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(rPropertyName);
@@ -2002,7 +2001,7 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName )
uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(PropertyName);
@@ -2613,7 +2612,7 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper
beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(PropertyName);
@@ -2729,7 +2728,7 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName )
void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(PropertyName);
@@ -2772,7 +2771,7 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName )
uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
const SfxItemPropertyMap* pMap = aPropSet.getPropertyMapEntry(aPropertyName);
@@ -2879,7 +2878,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_GroupServices;
@@ -2899,7 +2898,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_LineServices;
@@ -2934,7 +2933,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_RectServices;
@@ -2972,7 +2971,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_CircServices;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list