[Libreoffice-commits] core.git: 42 commits - accessibility/source basctl/source basic/source chart2/source comphelper/source compilerplugins/clang connectivity/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source idl/source l10ntools/source lotuswordpro/source oox/source reportdesign/source sal/qa sax/source sc/qa sc/source sdext/source sd/source sfx2/source starmath/source store/source svgio/source svl/source svtools/source svx/source sw/qa sw/source toolkit/source ucb/source unotest/source uui/source vcl/generic vcl/source vcl/unx writerfilter/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Fri Jun 13 08:55:55 PDT 2014
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 2
accessibility/source/extended/AccessibleGridControlBase.cxx | 2
basctl/source/basicide/baside2.cxx | 10
basctl/source/basicide/baside2b.cxx | 2
basctl/source/dlged/propbrw.cxx | 2
basic/source/classes/sbxmod.cxx | 2
basic/source/comp/exprtree.cxx | 12
basic/source/runtime/inputbox.cxx | 2
basic/source/runtime/iosys.cxx | 2
basic/source/runtime/methods.cxx | 12
basic/source/runtime/methods1.cxx | 2
basic/source/runtime/runtime.cxx | 14 -
basic/source/runtime/stdobj1.cxx | 8
basic/source/sbx/sbxdate.cxx | 4
basic/source/sbx/sbxscan.cxx | 4
chart2/source/controller/main/ChartFrameloader.cxx | 4
chart2/source/controller/main/ElementSelector.cxx | 2
chart2/source/view/axes/VCartesianAxis.cxx | 2
chart2/source/view/axes/VCartesianGrid.cxx | 2
chart2/source/view/axes/VPolarAngleAxis.cxx | 2
chart2/source/view/axes/VPolarGrid.cxx | 2
chart2/source/view/charttypes/AreaChart.cxx | 4
chart2/source/view/charttypes/BubbleChart.cxx | 2
chart2/source/view/charttypes/NetChart.cxx | 4
comphelper/source/misc/accessiblewrapper.cxx | 2
comphelper/source/property/propagg.cxx | 8
compilerplugins/clang/staticcall.cxx | 49 +++
connectivity/source/commontools/dbtools.cxx | 4
connectivity/source/commontools/parameters.cxx | 6
connectivity/source/drivers/dbase/dindexnode.cxx | 2
connectivity/source/drivers/jdbc/JConnection.cxx | 4
connectivity/source/drivers/kab/KConnection.cxx | 4
connectivity/source/manager/mdrivermanager.cxx | 8
connectivity/source/parse/sqlnode.cxx | 2
cui/source/customize/eventdlg.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 2
dbaccess/source/core/api/TableDeco.cxx | 2
dbaccess/source/core/api/resultset.cxx | 6
dbaccess/source/core/dataaccess/connection.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 2
dbaccess/source/core/dataaccess/documentdefinition.cxx | 4
dbaccess/source/filter/xml/xmlfilter.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 8
dbaccess/source/ui/control/opendoccontrols.cxx | 6
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 4
dbaccess/source/ui/dlg/dbadmin.cxx | 2
dbaccess/source/ui/dlg/dbwiz.cxx | 4
dbaccess/source/ui/dlg/dbwizsetup.cxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
dbaccess/source/ui/uno/composerdialogs.cxx | 2
dbaccess/source/ui/uno/copytablewizard.cxx | 2
desktop/source/app/app.cxx | 2
desktop/source/app/sofficemain.cxx | 4
desktop/source/deployment/gui/dp_gui_service.cxx | 6
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4
editeng/source/editeng/eertfpar.cxx | 2
editeng/source/misc/hangulhanja.cxx | 8
editeng/source/uno/unofdesc.cxx | 14 -
editeng/source/uno/unoipset.cxx | 2
editeng/source/uno/unotext.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 2
extensions/source/propctrlr/cellbindinghelper.cxx | 16 -
extensions/source/propctrlr/eformshelper.cxx | 10
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/formlinkdialog.cxx | 4
extensions/source/propctrlr/genericpropertyhandler.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 4
extensions/source/propctrlr/sqlcommanddesign.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/propctrlr/xsdvalidationhelper.cxx | 4
extensions/source/update/check/updatecheck.cxx | 2
filter/source/graphicfilter/egif/egif.cxx | 2
filter/source/graphicfilter/eos2met/eos2met.cxx | 4
filter/source/graphicfilter/eps/eps.cxx | 6
filter/source/graphicfilter/ieps/ieps.cxx | 4
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/eschesdo.cxx | 2
filter/source/msfilter/msdffimp.cxx | 14 -
filter/source/svg/svgwriter.cxx | 8
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/Filter.cxx | 2
forms/source/component/FormComponent.cxx | 8
forms/source/component/FormattedField.cxx | 4
forms/source/component/Grid.cxx | 2
forms/source/component/clickableimage.cxx | 4
forms/source/component/cloneable.cxx | 2
forms/source/helper/controlfeatureinterception.cxx | 2
forms/source/misc/InterfaceContainer.cxx | 2
forms/source/runtime/formoperations.cxx | 12
forms/source/xforms/model.cxx | 2
fpicker/source/office/commonpicker.cxx | 2
framework/source/uielement/fontsizemenucontroller.cxx | 2
framework/source/uielement/recentfilesmenucontroller.cxx | 2
idl/source/objects/slot.cxx | 8
idl/source/prj/command.cxx | 2
l10ntools/source/helpex.cxx | 2
l10ntools/source/idxdict/idxdict.cxx | 2
lotuswordpro/source/filter/lwpdrawobj.cxx | 2
lotuswordpro/source/filter/lwpparastyle.cxx | 2
lotuswordpro/source/filter/lwpsilverbullet.cxx | 4
oox/source/ppt/timenode.cxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 6
reportdesign/source/filter/xml/xmlfilter.cxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 2
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2
sal/qa/osl/file/osl_File.cxx | 2
sax/source/expatwrap/sax_expat.cxx | 4
sc/qa/extras/macros-test.cxx | 6
sc/source/core/tool/interpr4.cxx | 2
sc/source/filter/excel/xestream.cxx | 4
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/ui/app/inputwin.cxx | 6
sc/source/ui/dbgui/scendlg.cxx | 2
sc/source/ui/docshell/servobj.cxx | 2
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 6
sc/source/ui/miscdlgs/instbdlg.cxx | 2
sc/source/ui/miscdlgs/redcom.cxx | 2
sc/source/ui/namedlg/namepast.cxx | 2
sc/source/ui/undo/undoblk.cxx | 2
sc/source/ui/undo/undoblk3.cxx | 2
sc/source/ui/unoobj/celllistsource.cxx | 2
sc/source/ui/unoobj/cellvaluebinding.cxx | 4
sc/source/ui/vba/vbarange.cxx | 4
sc/source/ui/view/cellsh1.cxx | 2
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/gridwin2.cxx | 2
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/notemark.cxx | 8
sc/source/ui/view/tabvwsh4.cxx | 2
sd/source/core/drawdoc4.cxx | 2
sd/source/filter/eppt/epptso.cxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 4
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/framework/factories/BasicViewFactory.cxx | 4
sd/source/ui/framework/module/ResourceManager.cxx | 2
sd/source/ui/func/fuhhconv.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 6
sd/source/ui/presenter/PresenterTextView.cxx | 2
sd/source/ui/slideshow/SlideShowRestarter.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/tools/IdleDetection.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 2
sd/source/ui/unoidl/unosrch.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 6
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 2
sdext/source/pdfimport/tree/writertreevisiting.cxx | 2
sdext/source/presenter/PresenterScreen.cxx | 4
sdext/source/presenter/PresenterTheme.cxx | 4
sfx2/source/appl/appserv.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/shutdowniconunx.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 4
sfx2/source/control/dispatch.cxx | 2
sfx2/source/control/msgpool.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/doc/docfile.cxx | 2
sfx2/source/menu/mnumgr.cxx | 4
sfx2/source/notify/hintpost.cxx | 2
starmath/source/document.cxx | 2
starmath/source/format.cxx | 2
store/source/stordata.cxx | 19 -
svgio/source/svgreader/svgimagenode.cxx | 2
svgio/source/svgreader/svgstyleattributes.cxx | 4
svl/source/numbers/numfmuno.cxx | 4
svtools/source/config/apearcfg.cxx | 6
svtools/source/config/colorcfg.cxx | 4
svtools/source/config/extcolorcfg.cxx | 10
svtools/source/contnr/imivctl1.cxx | 12
svtools/source/contnr/treelistbox.cxx | 12
svtools/source/control/ctrlbox.cxx | 6
svtools/source/control/stdmenu.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 2
svtools/source/graphic/grfmgr.cxx | 2
svtools/source/graphic/provider.cxx | 2
svtools/source/misc/imageresourceaccess.cxx | 4
svtools/source/misc/itemdel.cxx | 4
svtools/source/uno/treecontrolpeer.cxx | 8
svx/source/accessibility/AccessibleControlShape.cxx | 4
svx/source/dialog/svxruler.cxx | 14 -
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 4
svx/source/form/filtnav.cxx | 2
svx/source/form/fmPropBrw.cxx | 4
svx/source/form/fmexpl.cxx | 4
svx/source/form/fmpgeimp.cxx | 2
svx/source/form/fmshimp.cxx | 8
svx/source/form/fmtextcontrolshell.cxx | 4
svx/source/form/fmtools.cxx | 8
svx/source/form/fmundo.cxx | 4
svx/source/form/fmvwimp.cxx | 16 -
svx/source/form/formcontrolfactory.cxx | 8
svx/source/form/formcontroller.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/inc/fmexpl.hxx | 2
svx/source/sdr/contact/viewcontactofgraphic.cxx | 4
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 2
svx/source/svdraw/svdattr.cxx | 4
svx/source/svdraw/svddrgmt.cxx | 2
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdomeas.cxx | 2
svx/source/table/cell.cxx | 6
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/unoshape.cxx | 8
sw/qa/core/macros-test.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/accselectionhelper.cxx | 8
sw/source/core/doc/docxforms.cxx | 2
sw/source/core/docnode/retrievedinputstreamdata.cxx | 2
sw/source/core/fields/expfld.cxx | 2
sw/source/core/layout/fly.cxx | 4
sw/source/core/layout/ftnfrm.cxx | 2
sw/source/core/layout/layact.cxx | 2
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/itratr.cxx | 4
sw/source/core/text/porrst.cxx | 2
sw/source/core/text/redlnitr.cxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtftn.cxx | 20 -
sw/source/filter/html/htmlctxt.cxx | 2
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/htmlsect.cxx | 2
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/swhtml.cxx | 4
sw/source/filter/html/wrthtml.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/filter/ww8/wrtww8gr.cxx | 10
sw/source/filter/ww8/ww8par.cxx | 6
sw/source/filter/xml/xmlexpit.cxx | 8
sw/source/filter/xml/xmlimpit.cxx | 12
sw/source/filter/xml/xmlithlp.cxx | 4
sw/source/ui/config/optpage.cxx | 10
sw/source/ui/fldui/flddb.cxx | 6
sw/source/ui/fldui/flddok.cxx | 6
sw/source/ui/fldui/fldedt.cxx | 4
sw/source/ui/fldui/fldfunc.cxx | 6
sw/source/ui/fldui/fldref.cxx | 4
sw/source/ui/fldui/fldvar.cxx | 6
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/misc/insfnote.cxx | 4
sw/source/ui/misc/num.cxx | 2
sw/source/ui/vba/vbarow.cxx | 2
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docsh2.cxx | 4
sw/source/uibase/app/docshini.cxx | 4
sw/source/uibase/dbui/dbmgr.cxx | 4
sw/source/uibase/dochdl/gloshdl.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/docvw/SidebarTxtControl.cxx | 4
sw/source/uibase/docvw/SidebarWin.cxx | 8
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/docvw/srcedtw.cxx | 3
sw/source/uibase/lingu/hhcwrp.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 8
sw/source/uibase/shells/annotsh.cxx | 2
sw/source/uibase/shells/drwtxtsh.cxx | 2
sw/source/uibase/shells/textfld.cxx | 4
sw/source/uibase/shells/textsh2.cxx | 2
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 2
sw/source/uibase/uno/dlelstnr.cxx | 4
sw/source/uibase/uno/unomod.cxx | 8
sw/source/uibase/uno/unotxdoc.cxx | 2
sw/source/uibase/utlui/navipi.cxx | 4
sw/source/uibase/utlui/prcntfld.cxx | 20 -
toolkit/source/awt/vclxaccessiblecomponent.cxx | 2
toolkit/source/awt/vclxmenu.cxx | 2
toolkit/source/controls/accessiblecontrolcontext.cxx | 6
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
toolkit/source/controls/roadmapcontrol.cxx | 2
toolkit/source/controls/stdtabcontroller.cxx | 2
toolkit/source/controls/unocontrol.cxx | 52 +--
toolkit/source/helper/formpdfexport.cxx | 4
toolkit/source/helper/vclunohelper.cxx | 2
ucb/source/ucp/file/filid.cxx | 4
unotest/source/cpp/bootstrapfixturebase.cxx | 3
uui/source/iahndl.cxx | 4
vcl/generic/print/printerjob.cxx | 2
vcl/source/control/field2.cxx | 12
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/filter/wmf/emfwr.cxx | 14 -
vcl/source/filter/wmf/wmfwr.cxx | 20 -
vcl/source/font/PhysicalFontFamily.cxx | 2
vcl/source/gdi/embeddedfontshelper.cxx | 2
vcl/source/gdi/gdimtf.cxx | 84 +++---
vcl/source/gdi/image.cxx | 8
vcl/source/gdi/impanmvw.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 4
vcl/source/gdi/pdfwriter_impl2.cxx | 4
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/textlayout.cxx | 2
vcl/source/helper/evntpost.cxx | 4
vcl/source/outdev/font.cxx | 2
vcl/source/window/event.cxx | 4
vcl/source/window/menu.cxx | 2
vcl/source/window/window.cxx | 12
vcl/source/window/winproc.cxx | 10
vcl/source/window/wrkwin.cxx | 2
vcl/unx/generic/gdi/salgdi3.cxx | 4
vcl/unx/kde/fpicker/kdecommandthread.cxx | 4
vcl/unx/kde/salnativewidgets-kde.cxx | 154 +++++------
vcl/unx/kde4/KDEData.cxx | 2
vcl/unx/kde4/KDESalDisplay.cxx | 2
vcl/unx/kde4/KDESalFrame.cxx | 10
vcl/unx/kde4/KDESalGraphics.cxx | 74 ++---
vcl/unx/kde4/KDEXLib.cxx | 2
vcl/unx/kde4/VCLKDEApplication.cxx | 2
writerfilter/source/dmapper/DomainMapper.cxx | 4
xmloff/source/chart/SchXMLAxisContext.cxx | 9
xmloff/source/chart/SchXMLChartContext.cxx | 4
xmloff/source/chart/SchXMLLegendContext.cxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 10
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 2
xmloff/source/chart/SchXMLSeries2Context.cxx | 10
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/draw/XMLShapePropertySetContext.cxx | 2
xmloff/source/draw/XMLShapeStyleContext.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 4
xmloff/source/draw/sdxmlimp.cxx | 4
xmloff/source/draw/shapeexport.cxx | 22 -
xmloff/source/draw/ximp3dobject.cxx | 8
xmloff/source/draw/ximp3dscene.cxx | 8
xmloff/source/forms/elementexport.cxx | 4
xmloff/source/forms/elementimport.cxx | 9
xmloff/source/forms/formcellbinding.cxx | 10
xmloff/source/forms/layerimport.cxx | 4
xmloff/source/forms/propertyexport.cxx | 2
xmloff/source/forms/propertyimport.cxx | 10
xmloff/source/forms/propertyimport.hxx | 1
xmloff/source/style/DashStyle.cxx | 4
xmloff/source/style/HatchStyle.cxx | 4
xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 4
xmloff/source/style/bordrhdl.cxx | 4
xmloff/source/style/xmltabe.cxx | 2
xmloff/source/text/XMLTextColumnsContext.cxx | 6
xmloff/source/text/txtflde.cxx | 2
xmloff/source/transform/ChartOASISTContext.cxx | 2
xmloff/source/transform/MergeElemTContext.cxx | 2
xmloff/source/transform/NotesTContext.cxx | 2
xmloff/source/transform/Oasis2OOo.cxx | 2
xmloff/source/transform/StyleOASISTContext.cxx | 16 -
xmloff/source/transform/StyleOOoTContext.cxx | 8
354 files changed, 954 insertions(+), 917 deletions(-)
New commits:
commit 5f500adec8a84e4a6455d9c24533dc96bdbdff20
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 13 17:53:53 2014 +0200
loplugin:staticcall
Change-Id: Id46b391c09555c9ec30916fdd93b05455835d81b
diff --git a/compilerplugins/clang/staticcall.cxx b/compilerplugins/clang/staticcall.cxx
new file mode 100644
index 0000000..8bbfcb6
--- /dev/null
+++ b/compilerplugins/clang/staticcall.cxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "plugin.hxx"
+
+namespace {
+
+class StaticCall:
+ public RecursiveASTVisitor<StaticCall>, public loplugin::Plugin
+{
+public:
+ explicit StaticCall(InstantiationData const & data): Plugin(data) {}
+
+ void run() override
+ { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+ bool VisitCallExpr(CallExpr const * expr);
+};
+
+bool StaticCall::VisitCallExpr(CallExpr const * expr) {
+ if (ignoreLocation(expr)
+ || !isa<MemberExpr>(expr->getCallee()->IgnoreImpCasts()))
+ {
+ return true;
+ }
+ CXXMethodDecl const * decl = dyn_cast_or_null<CXXMethodDecl>(
+ expr->getDirectCallee());
+ if (decl != nullptr && decl->isStatic()) {
+ report(
+ DiagnosticsEngine::Warning,
+ ("calling static member function through member call syntax, use"
+ " '%0' instead"),
+ expr->getLocStart())
+ << decl->getQualifiedNameAsString() << expr->getSourceRange();
+ }
+ return true;
+}
+
+loplugin::Plugin::Registration<StaticCall> X("staticcall");
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c21979a3279953ec28fc3d6e379b9a3ba98c4fd3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 13 17:53:15 2014 +0200
loplugin:staticcall
Change-Id: I7691a6d267ea572e3fdd028c1cfae7b721a76da7
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 0308c8e..5dc939e 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -225,7 +225,7 @@ void SchXMLAxisContext::CreateGrid( const OUString& sAutoStyleName, bool bIsMajo
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- m_rImportHelper.GetChartFamilyID(), sAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName );
if( pStyle && pStyle->ISA( XMLPropStyleContext ))
(( XMLPropStyleContext* )pStyle )->FillPropertySet( xGridProp );
@@ -270,7 +270,6 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList
{
// parse attributes
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
- SchXMLImport& rImport = ( SchXMLImport& )GetImport();
const SvXMLTokenMap& rAttrTokenMap = theAxisAttributeTokenMap::get();
for( sal_Int16 i = 0; i < nAttrCount; i++ )
@@ -285,7 +284,7 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList
case XML_TOK_AXIS_DIMENSION:
{
sal_uInt16 nEnumVal;
- if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisDimensionMap ))
+ if( SvXMLUnitConverter::convertEnum( nEnumVal, aValue, aXMLAxisDimensionMap ))
m_aCurrentAxis.eDimension = ( SchXMLAxisDimension )nEnumVal;
}
break;
@@ -295,7 +294,7 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList
case XML_TOK_AXIS_TYPE:
case XML_TOK_AXIS_TYPE_EXT:
sal_uInt16 nEnumVal;
- if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisTypeMap ))
+ if( SvXMLUnitConverter::convertEnum( nEnumVal, aValue, aXMLAxisTypeMap ))
{
m_nAxisType = nEnumVal;
m_bAxisTypeImported = true;
@@ -472,7 +471,7 @@ void SchXMLAxisContext::CreateAxis()
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- m_rImportHelper.GetChartFamilyID(), m_aAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), m_aAutoStyleName );
if( pStyle && pStyle->ISA( XMLPropStyleContext ))
{
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index ca84814..c88aac7 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -370,7 +370,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), sAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName );
if( pStyle && pStyle->ISA( XMLPropStyleContext ))
(( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp );
@@ -1196,7 +1196,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), msAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), msAutoStyleName );
if( pStyle && pStyle->ISA( XMLPropStyleContext ))
(( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp );
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index bfb122f..c072ab9 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -204,7 +204,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), sAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName );
if( pStyle && pStyle->ISA( XMLPropStyleContext ))
(( XMLPropStyleContext* )pStyle )->FillPropertySet( xLegendProps );
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 9353c80..0e915ea 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -323,7 +323,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), msAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), msAutoStyleName );
XMLPropStyleContext* pPropStyleContext =
const_cast< XMLPropStyleContext * >(
@@ -843,7 +843,7 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), sAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName );
if( pStyle && pStyle->ISA( XMLPropStyleContext ))
(( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp );
@@ -913,7 +913,7 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), sAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName );
if( pStyle && pStyle->ISA( XMLPropStyleContext ))
(( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp );
@@ -1015,7 +1015,7 @@ void SetErrorBarStyleProperties( const OUString& rStyleName, uno::Reference< bea
SchXMLImportHelper& rImportHelper )
{
const SvXMLStylesContext* pStylesCtxt = rImportHelper.GetAutoStylesContext();
- const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(),
+ const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(SchXMLImportHelper::GetChartFamilyID(),
rStyleName);
XMLPropStyleContext &rSeriesStyleContext =
@@ -1028,7 +1028,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere
SchXMLImportHelper& rImportHelper, OUString& aPosRange, OUString& aNegRange)
{
const SvXMLStylesContext* pStylesCtxt = rImportHelper.GetAutoStylesContext();
- const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(),
+ const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(SchXMLImportHelper::GetChartFamilyID(),
aStyleName);
XMLPropStyleContext * pSeriesStyleContext =
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index acb0134..32eb725 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -181,7 +181,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), sAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName );
XMLPropStyleContext* pPropStyleContext =
const_cast< XMLPropStyleContext* >( dynamic_cast< const XMLPropStyleContext* >( pStyle ));
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index beebfa0..9f69e4d 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -397,7 +397,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
mrGlobalChartTypeUsedBySeries = (maSeriesChartTypeName.equals( maGlobalChartTypeName ));
sal_Int32 nCoordinateSystemIndex = 0;//so far we can only import one coordinate system
m_xSeries.set(
- mrImportHelper.GetNewDataSeries( mxNewDoc, nCoordinateSystemIndex, maSeriesChartTypeName, ! mrGlobalChartTypeUsedBySeries ));
+ SchXMLImportHelper::GetNewDataSeries( mxNewDoc, nCoordinateSystemIndex, maSeriesChartTypeName, ! mrGlobalChartTypeUsedBySeries ));
Reference< chart2::data::XLabeledDataSequence > xLabeledSeq( SchXMLTools::GetNewLabeledDataSequence(), uno::UNO_QUERY_THROW );
if( bIsCandleStick )
@@ -477,7 +477,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
if( pStylesCtxt )
{
const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), msAutoStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), msAutoStyleName );
const XMLPropStyleContext* pPropStyleContext = dynamic_cast< const XMLPropStyleContext * >( pStyle );
@@ -808,7 +808,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe
{
rCurrStyleName = iStyle->msStyleName;
rpStyle = pStylesCtxt->FindStyleChildContext(
- rImportHelper.GetChartFamilyID(), rCurrStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), rCurrStyleName );
}
//set style to series
@@ -1057,7 +1057,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
{
rCurrStyleName = iStyle->msSeriesStyleNameForDonuts;
rpStyle = pStylesCtxt->FindStyleChildContext(
- rImportHelper.GetChartFamilyID(), rCurrStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), rCurrStyleName );
}
// note: SvXMLStyleContext::FillPropertySet is not const
@@ -1082,7 +1082,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
{
rCurrStyleName = iStyle->msStyleName;
rpStyle = pStylesCtxt->FindStyleChildContext(
- rImportHelper.GetChartFamilyID(), rCurrStyleName );
+ SchXMLImportHelper::GetChartFamilyID(), rCurrStyleName );
}
// note: SvXMLStyleContext::FillPropertySet is not const
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 5f4d9b9..7730c88 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -602,7 +602,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
if(!mxNumberFormatsSupplier.is() )
{
- mxNumberFormatsSupplier = mxNumberFormatsSupplier.query( mxModel );
+ mxNumberFormatsSupplier.set(mxModel, css::uno::UNO_QUERY);
if(mxNumberFormatsSupplier.is() && mxHandler.is())
mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier);
}
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 226954d..b8a1e8a 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -53,7 +53,7 @@ void XMLShapePropertySetContext::EndElement()
if( mxBulletStyle.Is() )
{
SvxXMLListStyleContext* pBulletStyle = (SvxXMLListStyleContext*)&mxBulletStyle;
- xNumRule = pBulletStyle->CreateNumRule( GetImport().GetModel() );
+ xNumRule = SvxXMLListStyleContext::CreateNumRule( GetImport().GetModel() );
if( xNumRule.is() )
pBulletStyle->FillUnoNumRule(xNumRule, NULL /* const SvI18NMap * ??? */ );
}
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 4dbafca..fad3975 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -175,7 +175,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
DBG_ASSERT( pListStyle, "list-style not found for shape style" );
if( pListStyle )
{
- uno::Reference< container::XIndexReplace > xNumRule( pListStyle->CreateNumRule( GetImport().GetModel() ) );
+ uno::Reference< container::XIndexReplace > xNumRule( SvxXMLListStyleContext::CreateNumRule( GetImport().GetModel() ) );
pListStyle->FillUnoNumRule(xNumRule, NULL /* const SvI18NMap * ??? */ );
property->maValue <<= xNumRule;
}
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 4eacdcf..90b7642 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -485,7 +485,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
Reference < drawing::XMasterPagesSupplier > xMasterPagesSupplier(GetModel(), UNO_QUERY);
if(xMasterPagesSupplier.is())
{
- mxDocMasterPages = mxDocMasterPages.query( xMasterPagesSupplier->getMasterPages() );
+ mxDocMasterPages.set(xMasterPagesSupplier->getMasterPages(), css::uno::UNO_QUERY);
if(mxDocMasterPages.is())
{
mnDocMasterPageCount = mxDocMasterPages->getCount();
@@ -497,7 +497,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
Reference <XDrawPagesSupplier> xDrawPagesSupplier(GetModel(), UNO_QUERY);
if(xDrawPagesSupplier.is())
{
- mxDocDrawPages = mxDocDrawPages.query( xDrawPagesSupplier->getDrawPages() );
+ mxDocDrawPages.set(xDrawPagesSupplier->getDrawPages(), css::uno::UNO_QUERY);
if(mxDocDrawPages.is())
{
mnDocDrawPageCount = mxDocDrawPages->getCount();
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 8fb0ea1..bc7565b 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -345,14 +345,14 @@ void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
// prepare access to master pages
uno::Reference < drawing::XMasterPagesSupplier > xMasterPagesSupplier(GetModel(), uno::UNO_QUERY);
if(xMasterPagesSupplier.is())
- mxDocMasterPages = mxDocMasterPages.query( xMasterPagesSupplier->getMasterPages() );
+ mxDocMasterPages.set(xMasterPagesSupplier->getMasterPages(), css::uno::UNO_QUERY);
// prepare access to draw pages
uno::Reference <drawing::XDrawPagesSupplier> xDrawPagesSupplier(GetModel(), uno::UNO_QUERY);
if(!xDrawPagesSupplier.is())
throw lang::IllegalArgumentException();
- mxDocDrawPages = mxDocDrawPages.query( xDrawPagesSupplier->getDrawPages() );
+ mxDocDrawPages.set(xDrawPagesSupplier->getDrawPages(), css::uno::UNO_QUERY);
if(!mxDocDrawPages.is())
throw lang::IllegalArgumentException();
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index acccb67..16782d8 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -3426,7 +3426,7 @@ void XMLShapeExport::ImpExport3DShape(
// write minEdge
if(aPos3D != ::basegfx::B3DVector(-2500.0, -2500.0, -2500.0)) // write only when not default
{
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aPos3D);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aPos3D);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_MIN_EDGE, aStr);
}
@@ -3434,7 +3434,7 @@ void XMLShapeExport::ImpExport3DShape(
// write maxEdge
if(aDir3D != ::basegfx::B3DVector(2500.0, 2500.0, 2500.0)) // write only when not default
{
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aDir3D);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aDir3D);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_MAX_EDGE, aStr);
}
@@ -3463,7 +3463,7 @@ void XMLShapeExport::ImpExport3DShape(
// write Center
if(aPos3D != ::basegfx::B3DVector(0.0, 0.0, 0.0)) // write only when not default
{
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aPos3D);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aPos3D);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_CENTER, aStr);
}
@@ -3471,7 +3471,7 @@ void XMLShapeExport::ImpExport3DShape(
// write Size
if(aDir3D != ::basegfx::B3DVector(5000.0, 5000.0, 5000.0)) // write only when not default
{
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aDir3D);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aDir3D);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SIZE, aStr);
}
@@ -3567,7 +3567,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
::basegfx::B3DVector aVRP(aCamGeo.vrp.PositionX, aCamGeo.vrp.PositionY, aCamGeo.vrp.PositionZ);
if(aVRP != ::basegfx::B3DVector(0.0, 0.0, 1.0)) // write only when not default
{
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aVRP);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aVRP);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VRP, aStr);
}
@@ -3575,7 +3575,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
::basegfx::B3DVector aVPN(aCamGeo.vpn.DirectionX, aCamGeo.vpn.DirectionY, aCamGeo.vpn.DirectionZ);
if(aVPN != ::basegfx::B3DVector(0.0, 0.0, 1.0)) // write only when not default
{
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aVPN);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aVPN);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VPN, aStr);
}
@@ -3583,7 +3583,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
::basegfx::B3DVector aVUP(aCamGeo.vup.DirectionX, aCamGeo.vup.DirectionY, aCamGeo.vup.DirectionZ);
if(aVUP != ::basegfx::B3DVector(0.0, 1.0, 0.0)) // write only when not default
{
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aVUP);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aVUP);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VUP, aStr);
}
@@ -3696,7 +3696,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s
aPropName += aIndexStr;
xPropSet->getPropertyValue(aPropName) >>= xLightDir;
aLightDirection = ::basegfx::B3DVector(xLightDir.DirectionX, xLightDir.DirectionY, xLightDir.DirectionZ);
- mrExport.GetMM100UnitConverter().convertB3DVector(sStringBuffer, aLightDirection);
+ SvXMLUnitConverter::convertB3DVector(sStringBuffer, aLightDirection);
aStr = sStringBuffer.makeStringAndClear();
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DIRECTION, aStr);
@@ -4336,7 +4336,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
{
::basegfx::B3DVector aVec3D( aExtrusionFirstLightDirection.DirectionX, aExtrusionFirstLightDirection.DirectionY,
aExtrusionFirstLightDirection.DirectionZ );
- rUnitConverter.convertB3DVector( aStrBuffer, aVec3D );
+ SvXMLUnitConverter::convertB3DVector( aStrBuffer, aVec3D );
aStr = aStrBuffer.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_FIRST_LIGHT_DIRECTION, aStr );
}
@@ -4349,7 +4349,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
{
::basegfx::B3DVector aVec3D( aExtrusionSecondLightDirection.DirectionX, aExtrusionSecondLightDirection.DirectionY,
aExtrusionSecondLightDirection.DirectionZ );
- rUnitConverter.convertB3DVector( aStrBuffer, aVec3D );
+ SvXMLUnitConverter::convertB3DVector( aStrBuffer, aVec3D );
aStr = aStrBuffer.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SECOND_LIGHT_DIRECTION, aStr );
}
@@ -4405,7 +4405,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
{
::basegfx::B3DVector aVec3D( aExtrusionRotationCenter.DirectionX, aExtrusionRotationCenter.DirectionY,
aExtrusionRotationCenter.DirectionZ );
- rUnitConverter.convertB3DVector( aStrBuffer, aVec3D );
+ SvXMLUnitConverter::convertB3DVector( aStrBuffer, aVec3D );
aStr = aStrBuffer.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_ROTATION_CENTER, aStr );
}
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index e5d5d9e..623584d 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -133,7 +133,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
case XML_TOK_3DCUBEOBJ_MINEDGE:
{
::basegfx::B3DVector aNewVec;
- GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue);
+ SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maMinEdge)
{
@@ -145,7 +145,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
case XML_TOK_3DCUBEOBJ_MAXEDGE:
{
::basegfx::B3DVector aNewVec;
- GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue);
+ SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maMaxEdge)
{
@@ -235,7 +235,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
case XML_TOK_3DSPHEREOBJ_CENTER:
{
::basegfx::B3DVector aNewVec;
- GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue);
+ SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maCenter)
{
@@ -247,7 +247,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
case XML_TOK_3DSPHEREOBJ_SIZE:
{
::basegfx::B3DVector aNewVec;
- GetImport().GetMM100UnitConverter().convertB3DVector(aNewVec, sValue);
+ SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maSize)
{
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index b3e5953..f1dc679 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -64,7 +64,7 @@ SdXML3DLightContext::SdXML3DLightContext(
}
case XML_TOK_3DLIGHT_DIRECTION:
{
- GetImport().GetMM100UnitConverter().convertB3DVector(maDirection, sValue);
+ SvXMLUnitConverter::convertB3DVector(maDirection, sValue);
break;
}
case XML_TOK_3DLIGHT_ENABLED:
@@ -255,7 +255,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
else if( IsXMLToken( rLocalName, XML_VRP ) )
{
::basegfx::B3DVector aNewVec;
- mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue);
+ SvXMLUnitConverter::convertB3DVector(aNewVec, rValue);
if(aNewVec != maVRP)
{
@@ -267,7 +267,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
else if( IsXMLToken( rLocalName, XML_VPN ) )
{
::basegfx::B3DVector aNewVec;
- mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue);
+ SvXMLUnitConverter::convertB3DVector(aNewVec, rValue);
if(aNewVec != maVPN)
{
@@ -279,7 +279,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
else if( IsXMLToken( rLocalName, XML_VUP ) )
{
::basegfx::B3DVector aNewVec;
- mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue);
+ SvXMLUnitConverter::convertB3DVector(aNewVec, rValue);
if(aNewVec != maVUP)
{
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 6a94b34..c30699d 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1791,7 +1791,7 @@ namespace xmloff
sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0;
OUStringBuffer sBuffer;
- m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum(
+ SvXMLUnitConverter::convertEnum(
sBuffer,
(sal_uInt16)nLinkageType,
OEnumMapper::getEnumMap( OEnumMapper::epListLinkageType )
@@ -1835,7 +1835,7 @@ namespace xmloff
Reference< XListEntrySink > xSink( m_xProps, UNO_QUERY );
Reference< XListEntrySource > xSource;
if ( xSink.is() )
- xSource = xSource.query( xSink->getListEntrySource() );
+ xSource.set(xSink->getListEntrySource(), css::uno::UNO_QUERY);
OSL_ENSURE( xSource.is(), "OControlExport::exportCellListSourceRange: list source or sink!" );
if ( xSource.is() )
{
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 201291e..1d1dc06 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -949,7 +949,7 @@ namespace xmloff
_rPropValue.Value <<= sValue;
}
else
- _rPropValue.Value = PropertyConversion::convertString(GetImport(), aProp.Type, sValue);
+ _rPropValue.Value = PropertyConversion::convertString(aProp.Type, sValue);
}
void OControlImport::EndElement()
@@ -1125,7 +1125,7 @@ namespace xmloff
if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) )
{
OSL_VERIFY( PropertyConversion::convertString(
- m_rContext.getGlobalContext(), ::getCppuType( &m_nImagePosition ),
+ ::getCppuType( &m_nImagePosition ),
_rValue, OEnumMapper::getEnumMap( OEnumMapper::epImagePosition )
) >>= m_nImagePosition );
m_bHaveImagePosition = true;
@@ -1135,7 +1135,7 @@ namespace xmloff
if ( _rLocalName == GetXMLToken( XML_IMAGE_ALIGN ) )
{
OSL_VERIFY( PropertyConversion::convertString(
- m_rContext.getGlobalContext(), ::getCppuType( &m_nImageAlign ),
+ ::getCppuType( &m_nImageAlign ),
_rValue, OEnumMapper::getEnumMap( OEnumMapper::epImageAlign )
) >>= m_nImageAlign );
return true;
@@ -1243,7 +1243,7 @@ namespace xmloff
OSL_ENSURE(pProperty, "ORadioImport::handleAttribute: invalid property map!");
if (pProperty)
{
- const Any aBooleanValue( PropertyConversion::convertString(m_rContext.getGlobalContext(), pProperty->aPropertyType, _rValue, pProperty->pEnumMap) );
+ const Any aBooleanValue( PropertyConversion::convertString(pProperty->aPropertyType, _rValue, pProperty->pEnumMap) );
// create and store a new PropertyValue
PropertyValue aNewValue;
@@ -1673,7 +1673,6 @@ namespace xmloff
{
sal_Int16 nLinkageType = 0;
PropertyConversion::convertString(
- m_rContext.getGlobalContext(),
::cppu::UnoType<sal_Int16>::get(),
_rValue,
OEnumMapper::getEnumMap( OEnumMapper::epListLinkageType )
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index c7ba0fd..b8720e9 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -103,7 +103,7 @@ FormCellBindingHelper::FormCellBindingHelper( const Reference< XPropertySet >& _
OSL_ENSURE( m_xControlModel.is(), "FormCellBindingHelper::FormCellBindingHelper: invalid control model!" );
if ( !m_xDocument.is() )
- m_xDocument = m_xDocument.query( getDocument( m_xControlModel ) );
+ m_xDocument.set(getDocument( m_xControlModel ), css::uno::UNO_QUERY);
OSL_ENSURE( m_xDocument.is(), "FormCellBindingHelper::FormCellBindingHelper: Did not find the spreadsheet document!" );
}
@@ -152,11 +152,11 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd
if ( _rAddress.isEmpty() || !convertStringAddress( _rAddress, aAddress ) )
return xBinding;
- xBinding = xBinding.query( createDocumentDependentInstance(
+ xBinding.set(createDocumentDependentInstance(
_bUseIntegerBinding ? OUString(SERVICE_LISTINDEXCELLBINDING) : OUString(SERVICE_CELLVALUEBINDING),
PROPERTY_BOUND_CELL,
makeAny( aAddress )
- ) );
+ ), css::uno::UNO_QUERY);
return xBinding;
}
@@ -170,11 +170,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr
return xSource;
// create a range object for this address
- xSource = xSource.query( createDocumentDependentInstance(
+ xSource.set(createDocumentDependentInstance(
SERVICE_CELLRANGELISTSOURCE,
PROPERTY_LIST_CELL_RANGE,
makeAny( aRangeAddress )
- ) );
+ ), css::uno::UNO_QUERY);
return xSource;
}
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index fa1ff91..4da67a7 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -384,7 +384,7 @@ void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPa
m_xCurrentPageFormsSupp.clear();
OSL_ENSURE(_rxDrawPage.is(), "OFormLayerXMLImport_Impl::startPage: NULL page!");
- m_xCurrentPageFormsSupp = m_xCurrentPageFormsSupp.query( _rxDrawPage );
+ m_xCurrentPageFormsSupp.set(_rxDrawPage, css::uno::UNO_QUERY);
OSL_ENSURE( m_xCurrentPageFormsSupp.is(), "OFormLayerXMLImport_Impl::startPage: invalid draw page (no XFormsSupplier)!" );
if ( !m_xCurrentPageFormsSupp.is() )
return;
@@ -444,7 +444,7 @@ void OFormLayerXMLImport_Impl::endPage()
// now that we have all children of the forms collection, attach the events
Reference< XIndexAccess > xIndexContainer;
if ( m_xCurrentPageFormsSupp.is() && m_xCurrentPageFormsSupp->hasForms() )
- xIndexContainer = xIndexContainer.query( m_xCurrentPageFormsSupp->getForms() );
+ xIndexContainer.set(m_xCurrentPageFormsSupp->getForms(), css::uno::UNO_QUERY);
if ( xIndexContainer.is() )
ODefaultEventAttacherManager::setEvents( xIndexContainer );
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 8f016d2..5fca30d 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -371,7 +371,7 @@ namespace xmloff
// let the formatter of the export context build a string
OUStringBuffer sBuffer;
- m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum(sBuffer, (sal_uInt16)nCurrentValue, _pValueMap);
+ SvXMLUnitConverter::convertEnum(sBuffer, (sal_uInt16)nCurrentValue, _pValueMap);
AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear());
}
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index c992b6f..5840928 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -83,7 +83,7 @@ namespace
}
}
-Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType,
+Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpectedType,
const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const bool _bInvertBoolean )
{
Any aReturn;
@@ -131,7 +131,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun
#if OSL_DEBUG_LEVEL > 0
bool bSuccess =
#endif
- _rImporter.GetMM100UnitConverter().convertEnum(nEnumValue, _rReadCharacters, _pEnumMap);
+ SvXMLUnitConverter::convertEnum(nEnumValue, _rReadCharacters, _pEnumMap);
OSL_ENSURE(bSuccess, "PropertyConversion::convertString: could not convert to an enum value!");
if (bEnumAsInt)
if (TypeClass_SHORT == _rExpectedType.getTypeClass())
@@ -336,7 +336,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUStr
aNewValue.Name = pProperty->sPropertyName;
// convert the value string into the target type
- aNewValue.Value = PropertyConversion::convertString(m_rContext.getGlobalContext(), pProperty->aPropertyType, _rValue, pProperty->pEnumMap, pProperty->bInverseSemantics);
+ aNewValue.Value = PropertyConversion::convertString(pProperty->aPropertyType, _rValue, pProperty->pEnumMap, pProperty->bInverseSemantics);
implPushBackPropertyValue( aNewValue );
return true;
}
@@ -463,7 +463,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx
else
{
aPropValue.Value =
- PropertyConversion::convertString(GetImport(), aPropType,
+ PropertyConversion::convertString(aPropType,
sValue);
}
@@ -527,7 +527,7 @@ void OListPropertyContext::EndElement()
++values, ++pListElement
)
{
- *pListElement = PropertyConversion::convertString( GetImport(), aType, *values );
+ *pListElement = PropertyConversion::convertString( aType, *values );
}
PropertyValue aSequenceValue;
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index fc90556..f7b9145 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -43,7 +43,6 @@ namespace xmloff
{
public:
static ::com::sun::star::uno::Any convertString(
- SvXMLImport& _rImporter,
const ::com::sun::star::uno::Type& _rExpectedType,
const OUString& _rReadCharacters,
const SvXMLEnumMapEntry* _pEnumMap = NULL,
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index fa0471f..a4e26b2 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -129,7 +129,7 @@ void XMLDashStyleImport::importXML(
case XML_TOK_DASH_STYLE:
{
sal_uInt16 eValue;
- if( rUnitConverter.convertEnum( eValue, rStrValue, pXML_DashStyle_Enum ) )
+ if( SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_DashStyle_Enum ) )
{
aLineDash.Style = (drawing::DashStyle) eValue;
}
@@ -245,7 +245,7 @@ bool XMLDashStyleExport::exportXML(
rStrName );
// Style
- rUnitConverter.convertEnum( aOut, aLineDash.Style, pXML_DashStyle_Enum );
+ SvXMLUnitConverter::convertEnum( aOut, aLineDash.Style, pXML_DashStyle_Enum );
aStrValue = aOut.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 6d1db91..f3d3244 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -122,7 +122,7 @@ bool XMLHatchStyleImport::importXML(
case XML_TOK_HATCH_STYLE:
{
sal_uInt16 eValue;
- bHasStyle = rUnitConverter.convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum );
+ bHasStyle = SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum );
if( bHasStyle )
aHatch.Style = (drawing::HatchStyle) eValue;
}
@@ -194,7 +194,7 @@ bool XMLHatchStyleExport::exportXML(
rExport.GetMM100UnitConverter();
// Style
- if( !rUnitConverter.convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
+ if( !SvXMLUnitConverter::convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
{
bRet = false;
}
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 5404963..9aaf858 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -143,7 +143,7 @@ void XMLFootnoteSeparatorExport::exportXML(
{ XML_DASH, 3 },
{ XML_TOKEN_INVALID, 0 }
};
- if (rExport.GetMM100UnitConverter().convertEnum(
+ if (SvXMLUnitConverter::convertEnum(
sBuf, nLineStyle, aXML_LineStyle_Enum ) )
{
rExport.AddAttribute(XML_NAMESPACE_STYLE, XML_LINE_STYLE,
@@ -159,7 +159,7 @@ void XMLFootnoteSeparatorExport::exportXML(
{ XML_TOKEN_INVALID, 0 }
};
- if (rExport.GetMM100UnitConverter().convertEnum(
+ if (SvXMLUnitConverter::convertEnum(
sBuf, eLineAdjust, aXML_HorizontalAdjust_Enum))
{
rExport.AddAttribute(XML_NAMESPACE_STYLE, XML_ADJUSTMENT,
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 860f9a4..0e12efc 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -192,13 +192,13 @@ bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, co
while( aTokens.getNextToken( aToken ) && !aToken.isEmpty() )
{
if( !bHasWidth &&
- rUnitConverter.convertEnum( nNamedWidth, aToken,
+ SvXMLUnitConverter::convertEnum( nNamedWidth, aToken,
pXML_NamedBorderWidths ) )
{
bHasWidth = true;
}
else if( !bHasStyle &&
- rUnitConverter.convertEnum( nStyle, aToken,
+ SvXMLUnitConverter::convertEnum( nStyle, aToken,
pXML_BorderStyles ) )
{
bHasStyle = true;
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 5c16c9d..d1c92f2 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -57,7 +57,7 @@ void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop*
// type attribute
if( style::TabAlign_LEFT != pTabStop->Alignment )
{
- rUnitConv.convertEnum( sBuffer, pTabStop->Alignment,
+ SvXMLUnitConverter::convertEnum( sBuffer, pTabStop->Alignment,
pXML_tabstop_style );
rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_TYPE,
sBuffer.makeStringAndClear() );
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 1e7f98b..348471c 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -242,8 +242,7 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl(
case XML_TOK_COLUMN_SEP_ALIGN:
{
sal_uInt16 nAlign;
- if( GetImport().GetMM100UnitConverter().
- convertEnum( nAlign, rValue,
+ if( SvXMLUnitConverter::convertEnum( nAlign, rValue,
pXML_Sep_Align_Enum ) )
eVertAlign = (VerticalAlignment)nAlign;
}
@@ -251,8 +250,7 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl(
case XML_TOK_COLUMN_SEP_STYLE:
{
sal_uInt16 nStyleVal;
- if( GetImport().GetMM100UnitConverter().
- convertEnum( nStyleVal, rValue,
+ if( SvXMLUnitConverter::convertEnum( nStyleVal, rValue,
pXML_Sep_Style_Enum ) )
nStyle = (sal_Int8)nStyleVal;
}
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 3729993..3eee437 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -446,7 +446,7 @@ enum FieldIdEnum XMLTextFieldExport::MapFieldName(
{
// map name to prelim. ID
sal_uInt16 nTmp;
- bool bRet = GetExport().GetMM100UnitConverter().convertEnum(
+ bool bRet = SvXMLUnitConverter::convertEnum(
nTmp, sFieldName, aFieldServiceNameMapping);
// check return
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx
index 62e48b7..1311a3e 100644
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -85,7 +85,7 @@ void XMLChartOASISTransformerContext::StartElement(
case XML_ATACTION_DECODE_STYLE_NAME_REF:
{
OUString aAttrValue( rAttrValue );
- if( GetTransformer().DecodeStyleName(aAttrValue) )
+ if( XMLTransformerBase::DecodeStyleName(aAttrValue) )
pMutableAttrList->SetValueByIndex( i, aAttrValue );
}
break;
diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx
index 404d25f..7a5381c 100644
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -136,7 +136,7 @@ XMLPersTextContentRNGTransformTContext::~XMLPersTextContentRNGTransformTContext(
void XMLPersTextContentRNGTransformTContext::Characters( const OUString& rChars )
{
OUString aConvChars( rChars );
- GetTransformer().ConvertRNGDateTimeToISO( aConvChars );
+ XMLTransformerBase::ConvertRNGDateTimeToISO( aConvChars );
XMLPersTextContentTContext::Characters( aConvChars );
}
diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx
index 121a63c..85bddde 100644
--- a/xmloff/source/transform/NotesTContext.cxx
+++ b/xmloff/source/transform/NotesTContext.cxx
@@ -106,7 +106,7 @@ void XMLNotesTransformerContext::StartElement(
case XML_ATACTION_DECODE_STYLE_NAME_REF:
{
OUString aAttrValue( rAttrValue );
- if( GetTransformer().DecodeStyleName(aAttrValue) )
+ if( XMLTransformerBase::DecodeStyleName(aAttrValue) )
pMutableAttrList->SetValueByIndex( i, aAttrValue );
}
break;
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index e6e8070..2969ef1 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1213,7 +1213,7 @@ void XMLTableTransformerContext_Impl::StartElement(
{
const OUString& rValue = xAttrList->getValueByIndex( i );
OUString aAttrValue( rValue );
- if( GetTransformer().DecodeStyleName(aAttrValue) )
+ if( XMLTransformerBase::DecodeStyleName(aAttrValue) )
{
if ( !pMutableAttrList )
{
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 6ea187f..0e78db0 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -207,7 +207,7 @@ void XMLPropertiesTContext_Impl::StartElement(
case XML_ATACTION_DECODE_STYLE_NAME_REF:
{
OUString aAttrValue( rAttrValue );
- GetTransformer().DecodeStyleName(aAttrValue);
+ XMLTransformerBase::DecodeStyleName(aAttrValue);
pAttrList->AddAttribute( rAttrName, aAttrValue );
}
break;
@@ -219,14 +219,14 @@ void XMLPropertiesTContext_Impl::StartElement(
::xmloff::token::GetXMLToken(
(*aIter).second.GetQNameTokenFromParam1()) ) );
OUString aAttrValue( rAttrValue );
- GetTransformer().DecodeStyleName(aAttrValue);
+ XMLTransformerBase::DecodeStyleName(aAttrValue);
pAttrList->AddAttribute( aNewAttrQName, aAttrValue );
}
break;
case XML_ATACTION_NEG_PERCENT:
{
OUString aAttrValue( rAttrValue );
- GetTransformer().NegPercent(aAttrValue);
+ XMLTransformerBase::NegPercent(aAttrValue);
pAttrList->AddAttribute( rAttrName, aAttrValue );
}
break;
@@ -238,7 +238,7 @@ void XMLPropertiesTContext_Impl::StartElement(
::xmloff::token::GetXMLToken(
(*aIter).second.GetQNameTokenFromParam1()) ) );
OUString aAttrValue( rAttrValue );
- GetTransformer().NegPercent(aAttrValue);
+ XMLTransformerBase::NegPercent(aAttrValue);
pAttrList->AddAttribute( aNewAttrQName, aAttrValue );
}
break;
@@ -400,13 +400,13 @@ void XMLPropertiesTContext_Impl::StartElement(
// #i25616#
case XML_OPTACTION_OPACITY:
aOpacityValueRemember = rAttrValue;
- GetTransformer().NegPercent(aOpacityValueRemember);
+ XMLTransformerBase::NegPercent(aOpacityValueRemember);
break;
// #i25616#
case XML_OPTACTION_IMAGE_OPACITY:
aImageOpacityValueRemember = rAttrValue;
- GetTransformer().NegPercent(aImageOpacityValueRemember);
+ XMLTransformerBase::NegPercent(aImageOpacityValueRemember);
break;
case XML_OPTACTION_KEEP_TOGETHER:
@@ -867,7 +867,7 @@ void XMLStyleOASISTContext::StartElement(
case XML_ATACTION_DECODE_STYLE_NAME_REF:
{
OUString aAttrValue( rAttrValue );
- if( GetTransformer().DecodeStyleName(aAttrValue) )
+ if( XMLTransformerBase::DecodeStyleName(aAttrValue) )
pMutableAttrList->SetValueByIndex( i, aAttrValue );
}
break;
@@ -882,7 +882,7 @@ void XMLStyleOASISTContext::StartElement(
case XML_ATACTION_NEG_PERCENT:
{
OUString aAttrValue( rAttrValue );
- if( GetTransformer().NegPercent(aAttrValue) )
+ if( XMLTransformerBase::NegPercent(aAttrValue) )
pMutableAttrList->SetValueByIndex( i, aAttrValue );
}
break;
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 62afb7c..e8b225a 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -476,14 +476,14 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
case XML_ATACTION_NEG_PERCENT:
{
OUString aAttrValue( sAttrValue );
- GetTransformer().NegPercent(aAttrValue);
+ XMLTransformerBase::NegPercent(aAttrValue);
pContext->AddAttribute( sAttrName, aAttrValue );
}
break;
case XML_ATACTION_RENAME_NEG_PERCENT:
{
OUString aAttrValue( sAttrValue );
- GetTransformer().NegPercent(aAttrValue);
+ XMLTransformerBase::NegPercent(aAttrValue);
pContext->AddAttribute( aAction.GetQNamePrefixFromParam1(),
aAction.GetQNameTokenFromParam1(),
aAttrValue );
@@ -836,7 +836,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
case XML_PTACTION_TRANSPARENCY :
{
OUString aAttrValue( sAttrValue );
- GetTransformer().NegPercent(aAttrValue);
+ XMLTransformerBase::NegPercent(aAttrValue);
pContext->AddAttribute( XML_NAMESPACE_DRAW,
XML_OPACITY,
aAttrValue );
@@ -1256,7 +1256,7 @@ void XMLStyleOOoTContext::StartElement(
case XML_ATACTION_NEG_PERCENT:
{
OUString aAttrValue( sAttrValue );
- if( GetTransformer().NegPercent(aAttrValue) )
+ if( XMLTransformerBase::NegPercent(aAttrValue) )
pMutableAttrList->SetValueByIndex( i, aAttrValue );
}
break;
commit b2d0d7172a7fb3db7370b9dbe5733ff7c9689a2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 13 17:53:10 2014 +0200
loplugin:staticcall
Change-Id: I697406da402d0b96a5bdcc153e2106d0a26c7d40
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 2652083..fea2828 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1183,7 +1183,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
rContext->Insert(eBorderDistId, uno::makeAny( pBorderHandler->getLineDistance()), true);
if (nSprmId == NS_ooxml::LN_CT_PBdr_right && pBorderHandler->getShadow())
{
- table::ShadowFormat aFormat = rContext->getShadowFromBorder(pBorderHandler->getBorderLine());
+ table::ShadowFormat aFormat = writerfilter::dmapper::PropertyMap::getShadowFromBorder(pBorderHandler->getBorderLine());
rContext->Insert(PROP_PARA_SHADOW_FORMAT, uno::makeAny(aFormat));
}
}
@@ -1730,7 +1730,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
if( pBorderHandler->getShadow() )
{
- table::ShadowFormat aFormat = rContext->getShadowFromBorder(pBorderHandler->getBorderLine());
+ table::ShadowFormat aFormat = writerfilter::dmapper::PropertyMap::getShadowFromBorder(pBorderHandler->getBorderLine());
rContext->Insert(PROP_CHAR_SHADOW_FORMAT, uno::makeAny(aFormat));
}
}
commit 17b1cf0a0384cb2851cde023adadfefe76d41045
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jun 13 17:53:02 2014 +0200
loplugin:staticcall
Change-Id: I16195f2278ae67f17db55e02bb38fe3c5cd063be
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 41a8741..84dbd42 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -107,7 +107,7 @@ PrinterJob::CreateSpoolFile (const OUString& rName, const OUString& rExtension)
return NULL;
}
- pFile->setAttributes (aFileURL,
+ osl::File::setAttributes (aFileURL,
osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead);
return pFile;
}
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index c70bf09..0668fc5 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1441,12 +1441,12 @@ void DateFormatter::ImplLoadRes( const ResId& rResId )
if ( DATEFORMATTER_MIN & nMask )
{
maMin = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
- pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
+ pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
}
if ( DATEFORMATTER_MAX & nMask )
{
maMax = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
- pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
+ pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
}
if ( DATEFORMATTER_LONGFORMAT & nMask )
mbLongFormat = pMgr->ReadShort() != 0;
@@ -1457,7 +1457,7 @@ void DateFormatter::ImplLoadRes( const ResId& rResId )
if ( DATEFORMATTER_VALUE & nMask )
{
maFieldDate = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
- pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
+ pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
if ( maFieldDate > maMax )
maFieldDate = maMax;
if ( maFieldDate < maMin )
@@ -2422,13 +2422,13 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId )
if ( TIMEFORMATTER_MIN & nMask )
{
SetMin( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) );
- pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
+ pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
}
if ( TIMEFORMATTER_MAX & nMask )
{
SetMax( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) );
- pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
+ pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
}
if ( TIMEFORMATTER_TIMEFIELDFORMAT & nMask )
@@ -2449,7 +2449,7 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId )
maFieldTime = GetMin();
maLastTime = maFieldTime;
- pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
+ pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) );
}
}
}
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 2274e83..e03fb34 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -844,7 +844,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
if ( aPrefMapMode == MAP_PIXEL )
aOriginalSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MAP_100TH_MM );
else
- aOriginalSize = Application::GetDefaultDevice()->LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM );
+ aOriginalSize = OutputDevice::LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM );
if ( !nLogicalWidth )
nLogicalWidth = aOriginalSize.Width();
if ( !nLogicalHeight )
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index b25bb20..af017b1 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -301,7 +301,7 @@ bool EMFWriter::WriteEMF(const GDIMetaFile& rMtf)
mnHorTextAlign = 0;
const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) );
- const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) );
+ const Size aMtfSizeLog( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) );
// seek over header
// use [MS-EMF 2.2.11] HeaderExtension2 Object, otherwise resulting EMF cannot be converted with GetWinMetaFileBits()
@@ -637,25 +637,25 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop )
void EMFWriter::ImplWriteExtent( long nExtent )
{
- nExtent = maVDev.LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width();
+ nExtent = OutputDevice::LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width();
m_rStm.WriteInt32( (sal_Int32) nExtent );
}
void EMFWriter::ImplWritePoint( const Point& rPoint )
{
- const Point aPoint( maVDev.LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode ));
+ const Point aPoint( OutputDevice::LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode ));
m_rStm.WriteInt32( (sal_Int32) aPoint.X() ).WriteInt32( (sal_Int32) aPoint.Y() );
}
void EMFWriter::ImplWriteSize( const Size& rSize)
{
- const Size aSize( maVDev.LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode ));
+ const Size aSize( OutputDevice::LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode ));
m_rStm.WriteInt32( (sal_Int32) aSize.Width() ).WriteInt32( (sal_Int32) aSize.Height() );
}
void EMFWriter::ImplWriteRect( const Rectangle& rRect )
{
- const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode ));
+ const Rectangle aRect( OutputDevice::LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode ));
m_rStm
.WriteInt32( static_cast<sal_Int32>(aRect.Left()) )
.WriteInt32( static_cast<sal_Int32>(aRect.Top()) )
@@ -1251,10 +1251,10 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
ImplEndRecord();
MapMode aMapMode( aSubstitute.GetPrefMapMode() );
- Size aOutSize( maVDev.LogicToLogic( pA->GetSize(), maVDev.GetMapMode(), aMapMode ) );
+ Size aOutSize( OutputDevice::LogicToLogic( pA->GetSize(), maVDev.GetMapMode(), aMapMode ) );
aMapMode.SetScaleX( Fraction( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) );
aMapMode.SetScaleY( Fraction( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) );
- aMapMode.SetOrigin( maVDev.LogicToLogic( pA->GetPoint(), maVDev.GetMapMode(), aMapMode ) );
+ aMapMode.SetOrigin( OutputDevice::LogicToLogic( pA->GetPoint(), maVDev.GetMapMode(), aMapMode ) );
maVDev.SetMapMode( aMapMode );
ImplWrite( aSubstitute );
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index dab173c..9362d2d 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -210,31 +210,31 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF )
void WMFWriter::WritePointXY(const Point & rPoint)
{
- Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) );
+ Point aPt( OutputDevice::LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) );
pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() );
}
void WMFWriter::WritePointYX(const Point & rPoint)
{
- Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) );
+ Point aPt( OutputDevice::LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) );
pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() );
}
sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX )
{
- Size aSz( pVirDev->LogicToLogic(Size(nDX,0),aSrcMapMode,aTargetMapMode) );
+ Size aSz( OutputDevice::LogicToLogic(Size(nDX,0),aSrcMapMode,aTargetMapMode) );
return aSz.Width();
}
void WMFWriter::WriteSize(const Size & rSize)
{
- Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) );
+ Size aSz( OutputDevice::LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) );
pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() );
}
void WMFWriter::WriteHeightWidth(const Size & rSize)
{
- Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) );
+ Size aSz( OutputDevice::LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) );
pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() );
}
@@ -507,7 +507,7 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r
+ sizeof( nSkipActions );
SvMemoryStream aMemoryStream( nStrmLen );
- Point aPt( pVirDev->LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) );
+ Point aPt( OutputDevice::LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) );
aMemoryStream.WriteInt32( static_cast<sal_Int32>(aPt.X()) )
.WriteInt32( static_cast<sal_Int32>(aPt.Y()) )
.WriteUInt32( nStringLen );
@@ -1642,7 +1642,7 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable )
if( bPlaceable )
{
sal_uInt16 nCheckSum, nValue;
- Size aSize( pVirDev->LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) );
+ Size aSize( OutputDevice::LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) );
sal_uInt16 nUnitsPerInch = (sal_uInt16) ( ( aSize.Width() + aSize.Height() ) >> 1 );
nCheckSum=0;
@@ -1733,7 +1733,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
aTargetMapMode.SetScaleX( aFrac );
aTargetMapMode.SetScaleY( aFrac );
- aTargetSize = pVirDev->LogicToLogic( rMTF.GetPrefSize(), aSrcMapMode, aTargetMapMode );
+ aTargetSize = OutputDevice::LogicToLogic( rMTF.GetPrefSize(), aSrcMapMode, aTargetMapMode );
}
pVirDev->SetMapMode( aTargetMapMode );
@@ -1816,7 +1816,7 @@ sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode,
Fraction aDivFrac(2, 1);
sal_uInt16 nDivisor = 1;
- Size aSize = pVirDev->LogicToLogic( rPrefSize, aSrcMapMode, rMapMode );
+ Size aSize = OutputDevice::LogicToLogic( rPrefSize, aSrcMapMode, rMapMode );
while( nDivisor <= 64 && (aSize.Width() > 32767 || aSize.Height() > 32767) )
{
@@ -1828,7 +1828,7 @@ sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode,
aFrac *= aDivFrac;
rMapMode.SetScaleY(aFrac);
nDivisor <<= 1;
- aSize = pVirDev->LogicToLogic( rPrefSize, aSrcMapMode, rMapMode );
+ aSize = OutputDevice::LogicToLogic( rPrefSize, aSrcMapMode, rMapMode );
}
return nDivisor;
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index a98a60d..3cba470 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -217,7 +217,7 @@ void PhysicalFontFamily::InitMatchData( const utl::FontSubstConfiguration& rFont
OUString aShortName;
OUString aMatchFamilyName(maMatchFamilyName);
// get font attributes from the decorated font name
- rFontSubst.getMapName( rSearchName, aShortName, aMatchFamilyName,
+ utl::FontSubstConfiguration::getMapName( rSearchName, aShortName, aMatchFamilyName,
meMatchWeight, meMatchWidth, mnMatchType );
maMatchFamilyName = aMatchFamilyName;
const utl::FontNameAttr* pFontAttr = rFontSubst.getSubstInfo( rSearchName );
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 1eca07e..5706022 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -182,7 +182,7 @@ void EmbeddedFontsHelper::activateFont( const OUString& fontName, const OUString
{
OutputDevice *pDevice = Application::GetDefaultDevice();
pDevice->AddTempDevFont( fileUrl, fontName );
- pDevice->ImplUpdateAllFontData( true );
+ OutputDevice::ImplUpdateAllFontData( true );
}
// Check if it's (legally) allowed to embed the font file into a document
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index cebb19c..7158d4d 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -743,7 +743,7 @@ void GDIMetaFile::Move( long nX, long nY )
( META_POP_ACTION == nType ) )
{
pModAct->Execute( &aMapVDev );
- aOffset = aMapVDev.LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() );
+ aOffset = OutputDevice::LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() );
}
pModAct->Move( aOffset.Width(), aOffset.Height() );
@@ -786,7 +786,7 @@ void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY )
aOffset.Height() = static_cast<long>(aOffset.Height() * (double)aMap.GetScaleY());
}
else
- aOffset = aMapVDev.LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() );
+ aOffset = OutputDevice::LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() );
}
pModAct->Move( aOffset.Width(), aOffset.Height() );
@@ -836,7 +836,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect )
( META_POP_ACTION == nType ) )
{
pAct->Execute( &aMapVDev );
- aCurRect = aMapVDev.LogicToLogic( i_rClipRect, GetPrefMapMode(), aMapVDev.GetMapMode() );
+ aCurRect = OutputDevice::LogicToLogic( i_rClipRect, GetPrefMapMode(), aMapVDev.GetMapMode() );
}
else if( nType == META_CLIPREGION_ACTION )
{
@@ -1354,8 +1354,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
( META_PUSH_ACTION == nActionType ) ||
( META_POP_ACTION == nActionType ) )
{
- aRotAnchor = aMapVDev.LogicToLogic( aOrigin, aPrefMapMode, aMapVDev.GetMapMode() );
- aRotOffset = aMapVDev.LogicToLogic( aOffset, aPrefMapMode, aMapVDev.GetMapMode() );
+ aRotAnchor = OutputDevice::LogicToLogic( aOrigin, aPrefMapMode, aMapVDev.GetMapMode() );
+ aRotOffset = OutputDevice::LogicToLogic( aOffset, aPrefMapMode, aMapVDev.GetMapMode() );
}
}
break;
@@ -1424,7 +1424,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaPixelAction* pAct = (MetaPixelAction*) pAction;
ImplActionBounds( aBound,
- Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
+ Rectangle( OutputDevice::LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ),
aClipStack, pUseHairline );
}
@@ -1434,7 +1434,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaPointAction* pAct = (MetaPointAction*) pAction;
ImplActionBounds( aBound,
- Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
+ Rectangle( OutputDevice::LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ),
aClipStack, pUseHairline );
}
@@ -1455,28 +1455,28 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
pUseHairline = 0;
}
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
case( META_RECT_ACTION ):
{
MetaRectAction* pAct = (MetaRectAction*) pAction;
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
case( META_ROUNDRECT_ACTION ):
{
MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction;
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
case( META_ELLIPSE_ACTION ):
{
MetaEllipseAction* pAct = (MetaEllipseAction*) pAction;
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
@@ -1485,7 +1485,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
MetaArcAction* pAct = (MetaArcAction*) pAction;
// FIXME: this is imprecise
// e.g. for small arcs the whole rectangle is WAY too large
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
@@ -1494,7 +1494,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
MetaPieAction* pAct = (MetaPieAction*) pAction;
// FIXME: this is imprecise
// e.g. for small arcs the whole rectangle is WAY too large
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
@@ -1503,7 +1503,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
MetaChordAction* pAct = (MetaChordAction*) pAction;
// FIXME: this is imprecise
// e.g. for small arcs the whole rectangle is WAY too large
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
@@ -1520,7 +1520,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
pUseHairline = 0;
}
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
@@ -1528,7 +1528,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaPolygonAction* pAct = (MetaPolygonAction*) pAction;
Rectangle aRect( pAct->GetPolygon().GetBoundRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
@@ -1536,7 +1536,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction;
Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline );
}
break;
@@ -1548,7 +1548,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen() );
Point aPt( pAct->GetPoint() );
aRect.Move( aPt.X(), aPt.Y() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1561,7 +1561,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
0, pAct->GetDXArray() );
Point aPt( pAct->GetPoint() );
aRect.Move( aPt.X(), aPt.Y() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1574,7 +1574,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
pAct->GetWidth(), NULL );
Point aPt( pAct->GetPoint() );
aRect.Move( aPt.X(), aPt.Y() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1590,7 +1590,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
Point aPt( pAct->GetStartPoint() );
aRect.Move( aPt.X(), aPt.Y() );
aRect.Right() = aRect.Left() + pAct->GetWidth();
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1598,7 +1598,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction;
Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1606,7 +1606,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction;
Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1614,7 +1614,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction;
Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1622,7 +1622,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction;
Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1630,7 +1630,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaGradientAction* pAct = (MetaGradientAction*) pAction;
Rectangle aRect( pAct->GetRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1638,7 +1638,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaGradientExAction* pAct = (MetaGradientExAction*) pAction;
Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1652,7 +1652,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaHatchAction* pAct = (MetaHatchAction*) pAction;
Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1660,7 +1660,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaTransparentAction* pAct = (MetaTransparentAction*) pAction;
Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1670,7 +1670,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
// MetaFloatTransparentAction is defined limiting it's content Metafile
// to it's geometry definition(Point, Size), so use these directly
const Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1678,7 +1678,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaEPSAction* pAct = (MetaEPSAction*) pAction;
Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1686,7 +1686,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction;
if( pAct->IsClipping() )
- aClipStack.back() = aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() );
+ aClipStack.back() = OutputDevice::LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() );
else
aClipStack.back() = Rectangle();
}
@@ -1695,7 +1695,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
case( META_ISECTRECTCLIPREGION_ACTION ):
{
MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction;
- Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
+ Rectangle aRect( OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
if( aClipStack.back().IsEmpty() )
aClipStack.back() = aRect;
else
@@ -1706,7 +1706,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
case( META_ISECTREGIONCLIPREGION_ACTION ):
{
MetaISectRegionClipRegionAction* pAct = (MetaISectRegionClipRegionAction*) pAction;
- Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
+ Rectangle aRect( OutputDevice::LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
if( aClipStack.back().IsEmpty() )
aClipStack.back() = aRect;
else
@@ -1718,7 +1718,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaBmpAction* pAct = (MetaBmpAction*) pAction;
Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1726,7 +1726,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaBmpExAction* pAct = (MetaBmpExAction*) pAction;
Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmapEx().GetSizePixel() ) );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1734,7 +1734,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaMaskAction* pAct = (MetaMaskAction*) pAction;
Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1742,7 +1742,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1750,7 +1750,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1758,7 +1758,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction;
Rectangle aRect( pAct->GetRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1766,7 +1766,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
{
MetaTextRectAction* pAct = (MetaTextRectAction*) pAction;
Rectangle aRect( pAct->GetRect() );
- ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
+ ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
}
break;
@@ -1776,7 +1776,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
if( ! aClipStack.back().IsEmpty() )
{
Size aDelta( pAct->GetHorzMove(), pAct->GetVertMove() );
- aDelta = aMapVDev.LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() );
+ aDelta = OutputDevice::LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() );
aClipStack.back().Move( aDelta.Width(), aDelta.Width() );
}
}
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 163e8ef..478f049 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -64,7 +64,7 @@ Image::Image( const ResId& rResId ) :
if( nObjMask & RSC_IMAGE_IMAGEBITMAP )
{
aBmpEx = BitmapEx( ResId( (RSHEADER_TYPE*)pResMgr->GetClass(), *pResMgr ) );
- pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
+ pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
}
if( nObjMask & RSC_IMAGE_MASKBITMAP )
@@ -75,7 +75,7 @@ Image::Image( const ResId& rResId ) :
aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMaskBitmap );
}
- pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
+ pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
}
if( nObjMask & RSC_IMAGE_MASKCOLOR )
@@ -86,7 +86,7 @@ Image::Image( const ResId& rResId ) :
aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMaskColor );
}
- pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
+ pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
}
if( ! aBmpEx.IsEmpty() )
ImplInit( aBmpEx );
@@ -306,7 +306,7 @@ ImageList::ImageList( const ResId& rResId ) :
if( nObjMask & RSC_IMAGE_MASKCOLOR )
spMaskColor.reset( new Color( ResId( (RSHEADER_TYPE*)pResMgr->GetClass(), *pResMgr ) ) );
- pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
+ pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
if( nObjMask & RSC_IMAGELIST_IDLIST )
{
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 394bdd2..bf87081 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -42,7 +42,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut,
mbHMirr ( maSz.Width() < 0L ),
mbVMirr ( maSz.Height() < 0L )
{
- mpParent->ImplIncAnimCount();
+ Animation::ImplIncAnimCount();
// Mirrored horizontally?
if( mbHMirr )
@@ -97,7 +97,7 @@ ImplAnimView::~ImplAnimView()
delete mpBackground;
delete mpRestore;
- mpParent->ImplDecAnimCount();
+ Animation::ImplDecAnimCount();
}
bool ImplAnimView::ImplMatches( OutputDevice* pOut, long nExtraData ) const
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3e083e2..4a4d745 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7715,7 +7715,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool
aLine.setLength( 0 );
aLine.append( "q\n" );
- nEmphMark = m_pReferenceDevice->ImplGetEmphasisMarkStyle( m_aCurrentPDFState.m_aFont );
+ nEmphMark = OutputDevice::ImplGetEmphasisMarkStyle( m_aCurrentPDFState.m_aFont );
if ( nEmphMark & EMPHASISMARK_POS_BELOW )
nEmphHeight = m_pReferenceDevice->mnEmphasisDescent;
else
@@ -7902,7 +7902,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const OUString& rOrigStr,
OUString aStr = rOrigStr;
if ( nStyle & TEXT_DRAW_MNEMONIC )
- aStr = m_pReferenceDevice->GetNonMnemonicString( aStr, nMnemonicPos );
+ aStr = OutputDevice::GetNonMnemonicString( aStr, nMnemonicPos );
// multiline text
if ( nStyle & TEXT_DRAW_MULTILINE )
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 502e120..60563f9 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -496,10 +496,10 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
pDummyVDev->Push();
MapMode aMapMode( aSubstitute.GetPrefMapMode() );
- Size aOutSize( pDummyVDev->LogicToLogic( pA->GetSize(), pDummyVDev->GetMapMode(), aMapMode ) );
+ Size aOutSize( OutputDevice::LogicToLogic( pA->GetSize(), pDummyVDev->GetMapMode(), aMapMode ) );
aMapMode.SetScaleX( Fraction( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) );
aMapMode.SetScaleY( Fraction( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) );
- aMapMode.SetOrigin( pDummyVDev->LogicToLogic( pA->GetPoint(), pDummyVDev->GetMapMode(), aMapMode ) );
+ aMapMode.SetOrigin( OutputDevice::LogicToLogic( pA->GetPoint(), pDummyVDev->GetMapMode(), aMapMode ) );
m_rOuterFace.SetMapMode( aMapMode );
pDummyVDev->SetMapMode( aMapMode );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index e6e1e36..6c8bdc4 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1799,7 +1799,7 @@ void Printer::updatePrinters()
{
DataChangedEvent aDCEvt( DATACHANGED_PRINTER );
pApp->DataChanged( aDCEvt );
- pApp->NotifyAllWindows( aDCEvt );
+ Application::NotifyAllWindows( aDCEvt );
}
}
else
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 35010b1..e891e17 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -143,7 +143,7 @@ namespace vcl
// now that the Zoom is part of the map mode, reset the target device's font to the "unzoomed" version
Font aDrawFont( m_aUnzoomedPointFont );
- aDrawFont.SetSize( m_rTargetDevice.LogicToLogic( aDrawFont.GetSize(), MAP_POINT, eTargetMapUnit ) );
+ aDrawFont.SetSize( OutputDevice::LogicToLogic( aDrawFont.GetSize(), MAP_POINT, eTargetMapUnit ) );
_rTargetDevice.SetFont( aDrawFont );
// transfer font to the reference device
diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx
index 28ede4a..06ba4a3 100644
--- a/vcl/source/helper/evntpost.cxx
+++ b/vcl/source/helper/evntpost.cxx
@@ -36,14 +36,14 @@ EventPoster::~EventPoster()
{
DBG_TESTSOLARMUTEX();
if ( m_nId )
- GetpApp()->RemoveUserEvent( m_nId );
+ Application::RemoveUserEvent( m_nId );
}
void EventPoster::Post( UserEvent* pEvent )
{
DBG_TESTSOLARMUTEX();
- m_nId = GetpApp()->PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent );
+ m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent );
}
IMPL_LINK( EventPoster, DoEvent_Impl, UserEvent*, pEvent )
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 7104caa..5c0333f 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -648,7 +648,7 @@ void OutputDevice::EndFontSubstitution()
Application* pApp = GetpApp();
DataChangedEvent aDCEvt( DATACHANGED_FONTSUBSTITUTION );
pApp->DataChanged( aDCEvt );
- pApp->NotifyAllWindows( aDCEvt );
+ Application::NotifyAllWindows( aDCEvt );
pSVData->maGDIData.mbFontSubChanged = false;
}
}
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 66e2d74..b7176cb 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -213,7 +213,7 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData )
ImplDelData aDelData;
ImplAddDel( &aDelData );
- ImplGetSVData()->mpApp->ImplCallEventListeners( &aEvent );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list