[Libreoffice-commits] core.git: solenv/clang-format svx/inc svx/qa svx/source
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 16 10:43:11 UTC 2020
solenv/clang-format/excludelist | 71 ----
svx/inc/AffineMatrixItem.hxx | 8
svx/inc/DescriptionGenerator.hxx | 41 +-
svx/inc/GalleryControl.hxx | 7
svx/inc/dbcharsethelper.hxx | 6
svx/inc/extrusiondepthdialog.hxx | 5
svx/inc/polygn3d.hxx | 6
svx/inc/sdr/contact/viewcontactofe3d.hxx | 37 +-
svx/inc/sdr/contact/viewcontactofpageobj.hxx | 18 -
svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx | 20 -
svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx | 13
svx/inc/sdr/contact/viewcontactoftextobj.hxx | 5
svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx | 10
svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx | 8
svx/inc/sdr/primitive2d/sdrprimitivetools.hxx | 14
svx/inc/sxcaitm.hxx | 8
svx/inc/sxmoitm.hxx | 8
svx/inc/sxmsitm.hxx | 8
svx/inc/sxroaitm.hxx | 8
svx/inc/sxsaitm.hxx | 8
svx/inc/textchain.hxx | 41 +-
svx/inc/textchainflow.hxx | 35 --
svx/inc/uiobject.hxx | 11
svx/inc/unomlstr.hxx | 9
svx/qa/unit/svdraw/test_SdrTextObject.cxx | 17
svx/qa/unit/svx-dialogs-test.cxx | 9
svx/source/accessibility/DescriptionGenerator.cxx | 85 +---
svx/source/accessibility/lookupcolorname.cxx | 40 +-
svx/source/accessibility/lookupcolorname.hxx | 5
svx/source/dialog/SvxNumOptionsTabPageHelper.cxx | 18 -
svx/source/dialog/dialmgr.cxx | 10
svx/source/dialog/dlgunit.hxx | 15
svx/source/dialog/measctrl.cxx | 24 -
svx/source/dialog/rubydialog.cxx | 174 ++++------
svx/source/dialog/srchctrl.hxx | 7
svx/source/dialog/strarray.cxx | 16
svx/source/dialog/svxdlg.cxx | 7
svx/source/engine3d/camera3d.cxx | 26 -
svx/source/engine3d/deflt3d.cxx | 6
svx/source/engine3d/helperminimaldepth3d.hxx | 3
svx/source/engine3d/polygn3d.cxx | 59 +--
svx/source/engine3d/svx3ditems.cxx | 121 +++---
svx/source/gallery2/codec.hxx | 11
svx/source/inc/celltypes.hxx | 36 --
svx/source/inc/fmslotinvalidator.hxx | 3
svx/source/inc/tbxform.hxx | 35 --
svx/source/items/numfmtsh.cxx | 152 +++++---
svx/source/sdr/contact/viewcontact.cxx | 91 ++---
svx/source/sdr/contact/viewcontactofpageobj.cxx | 24 -
svx/source/sdr/contact/viewcontactoftextobj.cxx | 11
svx/source/sdr/contact/viewobjectcontactredirector.cxx | 19 -
svx/source/sidebar/EmptyPanel.cxx | 11
svx/source/sidebar/EmptyPanel.hxx | 7
svx/source/sidebar/SelectionAnalyzer.cxx | 88 ++---
svx/source/sidebar/line/LineWidthPopup.cxx | 62 +--
svx/source/sidebar/nbdtmgfact.cxx | 11
svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 17
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 19 -
svx/source/sidebar/text/TextUnderlinePopup.cxx | 19 -
svx/source/svdraw/sdrundomanager.cxx | 34 -
svx/source/svdraw/svdoattr.cxx | 21 -
svx/source/svdraw/svdviter.cxx | 39 --
svx/source/table/tablerows.hxx | 20 -
svx/source/tbxctrls/SvxPresetListBox.cxx | 26 -
svx/source/tbxctrls/verttexttbxctrl.cxx | 33 -
svx/source/uitest/sdrobject.cxx | 37 --
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx | 8
svx/source/unodraw/gluepts.hxx | 8
svx/source/unodraw/unodtabl.cxx | 31 -
svx/source/unodraw/unogtabl.cxx | 35 --
svx/source/unodraw/unottabl.cxx | 26 -
svx/source/xoutdev/XPropertyEntry.cxx | 8
72 files changed, 906 insertions(+), 1083 deletions(-)
New commits:
commit 69397a13d9458174ea3d0160cb65d77ac83c205c
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 13:19:58 2020 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon Nov 16 11:42:31 2020 +0100
tdf#123936 Formatting files in module svx with clang-format
Change-Id: I482a00c9f65fd08be03f101c0e18f044c9323137
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105716
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 9c5739ffe451..cda2ce74d579 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -12666,20 +12666,14 @@ svtools/source/uno/wizard/wizardpagecontroller.hxx
svtools/source/uno/wizard/wizardshell.cxx
svtools/source/uno/wizard/wizardshell.hxx
svx/inc/AccessibleTableShape.hxx
-svx/inc/AffineMatrixItem.hxx
-svx/inc/DescriptionGenerator.hxx
-svx/inc/GalleryControl.hxx
svx/inc/XPropertyTable.hxx
svx/inc/colrctrl.hxx
-svx/inc/dbcharsethelper.hxx
svx/inc/dragmt3d.hxx
svx/inc/extrud3d.hxx
-svx/inc/extrusiondepthdialog.hxx
svx/inc/galbrws2.hxx
svx/inc/galobj.hxx
svx/inc/helpids.h
svx/inc/palettes.hxx
-svx/inc/polygn3d.hxx
svx/inc/sdgcoitm.hxx
svx/inc/sdginitm.hxx
svx/inc/sdgtritm.hxx
@@ -12691,7 +12685,6 @@ svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx
svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx
svx/inc/sdr/attribute/sdrtextattribute.hxx
svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx
-svx/inc/sdr/contact/viewcontactofe3d.hxx
svx/inc/sdr/contact/viewcontactofe3dcube.hxx
svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
@@ -12700,26 +12693,20 @@ svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
svx/inc/sdr/contact/viewcontactofgraphic.hxx
svx/inc/sdr/contact/viewcontactofgroup.hxx
svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
-svx/inc/sdr/contact/viewcontactofpageobj.hxx
svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
-svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
svx/inc/sdr/contact/viewcontactofsdrpage.hxx
svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
-svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx
-svx/inc/sdr/contact/viewcontactoftextobj.hxx
svx/inc/sdr/contact/viewcontactofunocontrol.hxx
svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
-svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx
svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
-svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
svx/inc/sdr/overlay/overlaycrosshair.hxx
@@ -12743,7 +12730,6 @@ svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
-svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
@@ -12769,37 +12755,26 @@ svx/inc/sdr/properties/rectangleproperties.hxx
svx/inc/sdr/properties/textproperties.hxx
svx/inc/strings.hxx
svx/inc/sxallitm.hxx
-svx/inc/sxcaitm.hxx
svx/inc/sxcikitm.hxx
svx/inc/sxfiitm.hxx
svx/inc/sxlayitm.hxx
svx/inc/sxlogitm.hxx
svx/inc/sxmfsitm.hxx
svx/inc/sxmkitm.hxx
-svx/inc/sxmoitm.hxx
svx/inc/sxmovitm.hxx
-svx/inc/sxmsitm.hxx
svx/inc/sxmtaitm.hxx
svx/inc/sxoneitm.hxx
svx/inc/sxopitm.hxx
svx/inc/sxreaitm.hxx
svx/inc/sxreoitm.hxx
-svx/inc/sxroaitm.hxx
svx/inc/sxrooitm.hxx
-svx/inc/sxsaitm.hxx
svx/inc/sxsalitm.hxx
svx/inc/sxsiitm.hxx
svx/inc/sxsoitm.hxx
svx/inc/sxtraitm.hxx
svx/inc/tbxcolorupdate.hxx
-svx/inc/textchain.hxx
svx/inc/textchaincursor.hxx
-svx/inc/textchainflow.hxx
-svx/inc/uiobject.hxx
-svx/inc/unomlstr.hxx
svx/inc/xpolyimp.hxx
-svx/qa/unit/svdraw/test_SdrTextObject.cxx
-svx/qa/unit/svx-dialogs-test.cxx
svx/source/accessibility/AccessibleControlShape.cxx
svx/source/accessibility/AccessibleEmptyEditSource.cxx
svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -12815,13 +12790,10 @@ svx/source/accessibility/AccessibleTextHelper.cxx
svx/source/accessibility/ChildrenManager.cxx
svx/source/accessibility/ChildrenManagerImpl.cxx
svx/source/accessibility/ChildrenManagerImpl.hxx
-svx/source/accessibility/DescriptionGenerator.cxx
svx/source/accessibility/GraphCtlAccessibleContext.cxx
svx/source/accessibility/ShapeTypeHandler.cxx
svx/source/accessibility/SvxShapeTypes.cxx
svx/source/accessibility/charmapacc.cxx
-svx/source/accessibility/lookupcolorname.cxx
-svx/source/accessibility/lookupcolorname.hxx
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
svx/source/accessibility/svxrectctaccessiblecontext.cxx
svx/source/core/extedit.cxx
@@ -12843,7 +12815,6 @@ svx/source/dialog/ClassificationEditView.hxx
svx/source/dialog/SafeModeDialog.cxx
svx/source/dialog/SafeModeUI.cxx
svx/source/dialog/SpellDialogChildWindow.cxx
-svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
svx/source/dialog/_bmpmask.cxx
svx/source/dialog/_contdlg.cxx
svx/source/dialog/charmap.cxx
@@ -12857,10 +12828,8 @@ svx/source/dialog/crashreportui.cxx
svx/source/dialog/ctredlin.cxx
svx/source/dialog/databaseregistrationui.cxx
svx/source/dialog/dialcontrol.cxx
-svx/source/dialog/dialmgr.cxx
svx/source/dialog/dlgctl3d.cxx
svx/source/dialog/dlgctrl.cxx
-svx/source/dialog/dlgunit.hxx
svx/source/dialog/dlgutil.cxx
svx/source/dialog/docrecovery.cxx
svx/source/dialog/fntctrl.cxx
@@ -12877,7 +12846,6 @@ svx/source/dialog/imapimp.hxx
svx/source/dialog/imapwnd.cxx
svx/source/dialog/imapwnd.hxx
svx/source/dialog/langbox.cxx
-svx/source/dialog/measctrl.cxx
svx/source/dialog/optgrid.cxx
svx/source/dialog/pagectrl.cxx
svx/source/dialog/papersizelistbox.cxx
@@ -12886,25 +12854,19 @@ svx/source/dialog/passwd.cxx
svx/source/dialog/relfld.cxx
svx/source/dialog/rlrcitem.cxx
svx/source/dialog/rlrcitem.hxx
-svx/source/dialog/rubydialog.cxx
svx/source/dialog/rulritem.cxx
svx/source/dialog/samecontentlistbox.cxx
svx/source/dialog/searchcharmap.cxx
svx/source/dialog/spacinglistbox.cxx
svx/source/dialog/srchctrl.cxx
-svx/source/dialog/srchctrl.hxx
svx/source/dialog/srchdlg.cxx
-svx/source/dialog/strarray.cxx
svx/source/dialog/svxbmpnumvalueset.cxx
-svx/source/dialog/svxdlg.cxx
svx/source/dialog/svxgraphicitem.cxx
svx/source/dialog/svxruler.cxx
svx/source/dialog/swframeexample.cxx
svx/source/dialog/swframeposstrings.cxx
svx/source/dialog/txencbox.cxx
-svx/source/engine3d/camera3d.cxx
svx/source/engine3d/cube3d.cxx
-svx/source/engine3d/deflt3d.cxx
svx/source/engine3d/dragmt3d.cxx
svx/source/engine3d/e3dsceneupdater.cxx
svx/source/engine3d/e3dundo.cxx
@@ -12912,14 +12874,11 @@ svx/source/engine3d/extrud3d.cxx
svx/source/engine3d/float3d.cxx
svx/source/engine3d/helperhittest3d.cxx
svx/source/engine3d/helperminimaldepth3d.cxx
-svx/source/engine3d/helperminimaldepth3d.hxx
svx/source/engine3d/lathe3d.cxx
svx/source/engine3d/obj3d.cxx
svx/source/engine3d/objfac3d.cxx
-svx/source/engine3d/polygn3d.cxx
svx/source/engine3d/scene3d.cxx
svx/source/engine3d/sphere3d.cxx
-svx/source/engine3d/svx3ditems.cxx
svx/source/engine3d/view3d.cxx
svx/source/engine3d/view3d1.cxx
svx/source/engine3d/viewpt3d2.cxx
@@ -12981,7 +12940,6 @@ svx/source/form/tbxform.cxx
svx/source/form/xfm_addcondition.cxx
svx/source/gallery2/GalleryControl.cxx
svx/source/gallery2/codec.cxx
-svx/source/gallery2/codec.hxx
svx/source/gallery2/galbrws1.cxx
svx/source/gallery2/galbrws1.hxx
svx/source/gallery2/galbrws2.cxx
@@ -12998,7 +12956,6 @@ svx/source/inc/DefaultShapesPanel.hxx
svx/source/inc/GraphCtlAccessibleContext.hxx
svx/source/inc/ShapesUtil.hxx
svx/source/inc/cell.hxx
-svx/source/inc/celltypes.hxx
svx/source/inc/charmapacc.hxx
svx/source/inc/datalistener.hxx
svx/source/inc/datanavi.hxx
@@ -13017,7 +12974,6 @@ svx/source/inc/fmprop.hxx
svx/source/inc/fmscriptingenv.hxx
svx/source/inc/fmservs.hxx
svx/source/inc/fmshimp.hxx
-svx/source/inc/fmslotinvalidator.hxx
svx/source/inc/fmtextcontroldialogs.hxx
svx/source/inc/fmtextcontrolfeature.hxx
svx/source/inc/fmtextcontrolshell.hxx
@@ -13041,7 +12997,6 @@ svx/source/inc/svxpixelctlaccessiblecontext.hxx
svx/source/inc/svxrectctaccessiblecontext.hxx
svx/source/inc/tablemodel.hxx
svx/source/inc/tabwin.hxx
-svx/source/inc/tbxform.hxx
svx/source/inc/treevisitor.hxx
svx/source/inc/xfm_addcondition.hxx
svx/source/inc/xmlxtexp.hxx
@@ -13058,7 +13013,6 @@ svx/source/items/galleryitem.cxx
svx/source/items/grfitem.cxx
svx/source/items/hlnkitem.cxx
svx/source/items/legacyitem.cxx
-svx/source/items/numfmtsh.cxx
svx/source/items/numinf.cxx
svx/source/items/ofaitem.cxx
svx/source/items/pageitem.cxx
@@ -13086,7 +13040,6 @@ svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
svx/source/sdr/contact/objectcontactofpageview.cxx
svx/source/sdr/contact/sdrmediawindow.cxx
svx/source/sdr/contact/sdrmediawindow.hxx
-svx/source/sdr/contact/viewcontact.cxx
svx/source/sdr/contact/viewcontactofe3d.cxx
svx/source/sdr/contact/viewcontactofe3dcube.cxx
svx/source/sdr/contact/viewcontactofe3dextrude.cxx
@@ -13097,7 +13050,6 @@ svx/source/sdr/contact/viewcontactofe3dsphere.cxx
svx/source/sdr/contact/viewcontactofgraphic.cxx
svx/source/sdr/contact/viewcontactofgroup.cxx
svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
-svx/source/sdr/contact/viewcontactofpageobj.cxx
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
@@ -13109,7 +13061,6 @@ svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
svx/source/sdr/contact/viewcontactofsdrpage.cxx
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
-svx/source/sdr/contact/viewcontactoftextobj.cxx
svx/source/sdr/contact/viewcontactofunocontrol.cxx
svx/source/sdr/contact/viewcontactofvirtobj.cxx
svx/source/sdr/contact/viewobjectcontact.cxx
@@ -13124,7 +13075,6 @@ svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
-svx/source/sdr/contact/viewobjectcontactredirector.cxx
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
svx/source/sdr/overlay/overlaybitmapex.cxx
svx/source/sdr/overlay/overlaycrosshair.cxx
@@ -13183,10 +13133,7 @@ svx/source/sdr/properties/properties.cxx
svx/source/sdr/properties/rectangleproperties.cxx
svx/source/sdr/properties/textproperties.cxx
svx/source/sidebar/ContextChangeEventMultiplexer.cxx
-svx/source/sidebar/EmptyPanel.cxx
-svx/source/sidebar/EmptyPanel.hxx
svx/source/sidebar/PanelFactory.cxx
-svx/source/sidebar/SelectionAnalyzer.cxx
svx/source/sidebar/SelectionChangeHandler.cxx
svx/source/sidebar/area/AreaPropertyPanel.cxx
svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -13197,15 +13144,12 @@ svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
svx/source/sidebar/line/LinePropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.hxx
svx/source/sidebar/line/LinePropertyPanelBase.cxx
-svx/source/sidebar/line/LineWidthPopup.cxx
svx/source/sidebar/line/LineWidthValueSet.cxx
svx/source/sidebar/line/LineWidthValueSet.hxx
svx/source/sidebar/media/MediaPlaybackPanel.cxx
svx/source/sidebar/media/MediaPlaybackPanel.hxx
svx/source/sidebar/nbdtmg.cxx
-svx/source/sidebar/nbdtmgfact.cxx
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
-svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -13220,11 +13164,9 @@ svx/source/sidebar/styles/StylesPropertyPanel.cxx
svx/source/sidebar/styles/StylesPropertyPanel.hxx
svx/source/sidebar/text/TextCharacterSpacingControl.cxx
svx/source/sidebar/text/TextCharacterSpacingControl.hxx
-svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
svx/source/sidebar/text/TextPropertyPanel.cxx
svx/source/sidebar/text/TextPropertyPanel.hxx
svx/source/sidebar/text/TextUnderlineControl.cxx
-svx/source/sidebar/text/TextUnderlinePopup.cxx
svx/source/sidebar/tools/ValueSetWithTextControl.cxx
svx/source/smarttags/SmartTagMgr.cxx
svx/source/stbctrls/insctrl.cxx
@@ -13248,7 +13190,6 @@ svx/source/svdraw/sdrhittesthelper.cxx
svx/source/svdraw/sdrmasterpagedescriptor.cxx
svx/source/svdraw/sdrpagewindow.cxx
svx/source/svdraw/sdrpaintwindow.cxx
-svx/source/svdraw/sdrundomanager.cxx
svx/source/svdraw/selectioncontroller.cxx
svx/source/svdraw/svdattr.cxx
svx/source/svdraw/svdcrtv.cxx
@@ -13273,7 +13214,6 @@ svx/source/svdraw/svdmodel.cxx
svx/source/svdraw/svdmrkv.cxx
svx/source/svdraw/svdmrkv1.cxx
svx/source/svdraw/svdoashp.cxx
-svx/source/svdraw/svdoattr.cxx
svx/source/svdraw/svdobj.cxx
svx/source/svdraw/svdobjplusdata.cxx
svx/source/svdraw/svdobjuserdatalist.cxx
@@ -13310,7 +13250,6 @@ svx/source/svdraw/svdtext.cxx
svx/source/svdraw/svdtrans.cxx
svx/source/svdraw/svdundo.cxx
svx/source/svdraw/svdview.cxx
-svx/source/svdraw/svdviter.cxx
svx/source/svdraw/svdxcgv.cxx
svx/source/svdraw/textchain.cxx
svx/source/svdraw/textchaincursor.cxx
@@ -13340,7 +13279,6 @@ svx/source/table/tablemodel.cxx
svx/source/table/tablerow.cxx
svx/source/table/tablerow.hxx
svx/source/table/tablerows.cxx
-svx/source/table/tablerows.hxx
svx/source/table/tablertfexporter.cxx
svx/source/table/tablertfimporter.cxx
svx/source/table/tableundo.cxx
@@ -13351,7 +13289,6 @@ svx/source/tbxctrls/Palette.cxx
svx/source/tbxctrls/PaletteManager.cxx
svx/source/tbxctrls/SvxColorChildWindow.cxx
svx/source/tbxctrls/SvxColorValueSet.cxx
-svx/source/tbxctrls/SvxPresetListBox.cxx
svx/source/tbxctrls/bulletsnumbering.cxx
svx/source/tbxctrls/colrctrl.cxx
svx/source/tbxctrls/extrusioncontrols.cxx
@@ -13372,24 +13309,20 @@ svx/source/tbxctrls/tbunosearchcontrollers.cxx
svx/source/tbxctrls/tbxcolor.cxx
svx/source/tbxctrls/tbxcolorupdate.cxx
svx/source/tbxctrls/tbxdrctl.cxx
-svx/source/tbxctrls/verttexttbxctrl.cxx
svx/source/toolbars/extrusionbar.cxx
svx/source/toolbars/fontworkbar.cxx
-svx/source/uitest/sdrobject.cxx
svx/source/uitest/uiobject.cxx
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
-svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
svx/source/unodraw/UnoGraphicExporter.cxx
svx/source/unodraw/UnoNameItemTable.cxx
svx/source/unodraw/UnoNameItemTable.hxx
svx/source/unodraw/UnoNamespaceMap.cxx
svx/source/unodraw/XPropertyTable.cxx
svx/source/unodraw/gluepts.cxx
-svx/source/unodraw/gluepts.hxx
svx/source/unodraw/recoveryui.cxx
svx/source/unodraw/shapeimpl.hxx
svx/source/unodraw/shapepropertynotifier.cxx
@@ -13397,8 +13330,6 @@ svx/source/unodraw/tableshape.cxx
svx/source/unodraw/unobrushitemhelper.cxx
svx/source/unodraw/unobtabl.cxx
svx/source/unodraw/unoctabl.cxx
-svx/source/unodraw/unodtabl.cxx
-svx/source/unodraw/unogtabl.cxx
svx/source/unodraw/unohtabl.cxx
svx/source/unodraw/unomlstr.cxx
svx/source/unodraw/unomod.cxx
@@ -13412,7 +13343,6 @@ svx/source/unodraw/unoshap4.cxx
svx/source/unodraw/unoshape.cxx
svx/source/unodraw/unoshcol.cxx
svx/source/unodraw/unoshtxt.cxx
-svx/source/unodraw/unottabl.cxx
svx/source/unogallery/unogalitem.cxx
svx/source/unogallery/unogalitem.hxx
svx/source/unogallery/unogaltheme.cxx
@@ -13423,7 +13353,6 @@ svx/source/xml/xmlexport.cxx
svx/source/xml/xmlgrhlp.cxx
svx/source/xml/xmlxtexp.cxx
svx/source/xml/xmlxtimp.cxx
-svx/source/xoutdev/XPropertyEntry.cxx
svx/source/xoutdev/_xoutbmp.cxx
svx/source/xoutdev/_xpoly.cxx
svx/source/xoutdev/xattr.cxx
diff --git a/svx/inc/AffineMatrixItem.hxx b/svx/inc/AffineMatrixItem.hxx
index 7d1c48a538f6..c7eb5cb71e8e 100644
--- a/svx/inc/AffineMatrixItem.hxx
+++ b/svx/inc/AffineMatrixItem.hxx
@@ -27,7 +27,7 @@ class SfxItemPool;
class AffineMatrixItem final : public SfxPoolItem
{
private:
- css::geometry::AffineMatrix2D maMatrix;
+ css::geometry::AffineMatrix2D maMatrix;
public:
AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix);
@@ -35,10 +35,10 @@ public:
virtual ~AffineMatrixItem() override;
virtual bool operator==(const SfxPoolItem&) const override;
- virtual AffineMatrixItem* Clone( SfxItemPool* pPool = nullptr ) const override;
+ virtual AffineMatrixItem* Clone(SfxItemPool* pPool = nullptr) const override;
- virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
+ virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/DescriptionGenerator.hxx
index c1407a769188..5895b310b3fe 100644
--- a/svx/inc/DescriptionGenerator.hxx
+++ b/svx/inc/DescriptionGenerator.hxx
@@ -17,18 +17,22 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#pragma once
#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ustrbuf.hxx>
-namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::drawing { class XShape; }
-
-
-namespace accessibility {
+namespace com::sun::star::beans
+{
+class XPropertySet;
+}
+namespace com::sun::star::drawing
+{
+class XShape;
+}
+namespace accessibility
+{
/** This class creates description strings for shapes.
<p>Initialized with a given shape additional calls to the
<member>addProperty</member> method will build a descriptive string that
@@ -39,7 +43,8 @@ namespace accessibility {
class DescriptionGenerator
{
public:
- enum class PropertyType {
+ enum class PropertyType
+ {
Color,
Integer
};
@@ -51,8 +56,7 @@ public:
The shape from which properties will be extracted by later calls
to <member>addProperty</member>.
*/
- DescriptionGenerator (const css::uno::Reference<
- css::drawing::XShape>& xShape);
+ DescriptionGenerator(const css::uno::Reference<css::drawing::XShape>& xShape);
~DescriptionGenerator();
@@ -62,7 +66,7 @@ public:
An introductory description of the shape that is made more
specific by later calls to <member>addProperty</member>.
*/
- void Initialize (const OUString& sPrefix);
+ void Initialize(const OUString& sPrefix);
/** Initialize the description with the specified string from the
resource followed by the shape style in parentheses and a colon.
@@ -78,7 +82,7 @@ public:
@return
The description string in its current form.
*/
- OUString operator() (void);
+ OUString operator()(void);
/** Add the given property name and its associated value to the
description string. If the property value does not differ from the
@@ -93,22 +97,21 @@ public:
Localized name of the property. An empty string tells the
method to use the property name instead.
*/
- void AddProperty (const OUString& sPropertyName,
- PropertyType aType);
+ void AddProperty(const OUString& sPropertyName, PropertyType aType);
/** Append the given string as is to the current description.
@param sString
String to append to the current description. It is not modified
in any way.
*/
- void AppendString (const OUString& sString);
+ void AppendString(const OUString& sString);
private:
/// Reference to the shape from which the properties are extracted.
- css::uno::Reference< css::drawing::XShape> mxShape;
+ css::uno::Reference<css::drawing::XShape> mxShape;
/// Reference to the shape's property set.
- css::uno::Reference< css::beans::XPropertySet> mxSet;
+ css::uno::Reference<css::beans::XPropertySet> mxSet;
/// The description string that is build.
OUStringBuffer msDescription;
@@ -120,15 +123,13 @@ private:
/** Add a property value formatted as color to the description string.
*/
- void AddColor (const OUString& sPropertyName);
+ void AddColor(const OUString& sPropertyName);
/** Add a property value formatted as integer to the description string.
*/
- void AddInteger (const OUString& sPropertyName);
+ void AddInteger(const OUString& sPropertyName);
};
-
} // end of namespace accessibility
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 5b40f4bc83be..8f8e6339df85 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -31,13 +31,12 @@ class GalleryBrowser2;
class FmFormModel;
class Splitter;
-namespace svx::sidebar {
-
-
+namespace svx::sidebar
+{
class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) GalleryControl final : public PanelLayout
{
public:
- GalleryControl( vcl::Window* pParentWindow );
+ GalleryControl(vcl::Window* pParentWindow);
private:
Gallery* mpGallery;
diff --git a/svx/inc/dbcharsethelper.hxx b/svx/inc/dbcharsethelper.hxx
index 207d89fb25d6..8dfaf27ca693 100644
--- a/svx/inc/dbcharsethelper.hxx
+++ b/svx/inc/dbcharsethelper.hxx
@@ -25,12 +25,10 @@
namespace svxform::charset_helper
{
-
- /** enumerates all supported charsets
+/** enumerates all supported charsets
@return the number of charsets supported
*/
- sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
-
+sal_Int32 getSupportedTextEncodings(::std::vector<rtl_TextEncoding>& _rEncs);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index e7f2e07a514b..11d69c17033f 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -22,8 +22,8 @@
#include <vcl/weld.hxx>
-namespace svx {
-
+namespace svx
+{
class ExtrusionDepthDialog final : public weld::GenericDialogController
{
std::unique_ptr<weld::MetricSpinButton> m_xMtrDepth;
@@ -34,7 +34,6 @@ public:
double getDepth() const;
};
-
}
#endif // INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX
diff --git a/svx/inc/polygn3d.hxx b/svx/inc/polygn3d.hxx
index 05b15c83fd1d..2665efdffcb8 100644
--- a/svx/inc/polygn3d.hxx
+++ b/svx/inc/polygn3d.hxx
@@ -29,7 +29,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dPolygonObj final : public E3dCompou
basegfx::B3DPolyPolygon aPolyPoly3D;
basegfx::B3DPolyPolygon aPolyNormals3D;
basegfx::B2DPolyPolygon aPolyTexture2D;
- bool bLineOnly;
+ bool bLineOnly;
SVX_DLLPRIVATE void CreateDefaultNormals();
SVX_DLLPRIVATE void CreateDefaultTexture();
@@ -44,9 +44,7 @@ public:
void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
- E3dPolygonObj(
- SdrModel& rSdrModel,
- const basegfx::B3DPolyPolygon& rPolyPoly3D);
+ E3dPolygonObj(SdrModel& rSdrModel, const basegfx::B3DPolyPolygon& rPolyPoly3D);
E3dPolygonObj(SdrModel& rSdrModel);
const basegfx::B3DPolyPolygon& GetPolyPolygon3D() const { return aPolyPoly3D; }
diff --git a/svx/inc/sdr/contact/viewcontactofe3d.hxx b/svx/inc/sdr/contact/viewcontactofe3d.hxx
index 982d28752984..2f24460cd106 100644
--- a/svx/inc/sdr/contact/viewcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3d.hxx
@@ -23,14 +23,18 @@
#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
-namespace drawinglayer::attribute { class SdrLineAttribute; }
-namespace basegfx {
- class BColor;
- class B3DHomMatrix;
+namespace drawinglayer::attribute
+{
+class SdrLineAttribute;
+}
+namespace basegfx
+{
+class BColor;
+class B3DHomMatrix;
}
-namespace sdr::contact {
-
+namespace sdr::contact
+{
class ViewContactOfE3dScene;
class ViewContactOfE3d : public ViewContactOfSdrObj
@@ -38,7 +42,8 @@ class ViewContactOfE3d : public ViewContactOfSdrObj
protected:
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
- virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
+ virtual ViewObjectContact&
+ CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
public:
// basic constructor, used from E3dObject.
@@ -46,38 +51,36 @@ public:
virtual ~ViewContactOfE3d() override;
// access to E3dObject
- const E3dObject& GetE3dObject() const
- {
- return static_cast<const E3dObject&>(GetSdrObject());
- }
+ const E3dObject& GetE3dObject() const { return static_cast<const E3dObject&>(GetSdrObject()); }
// public helpers
drawinglayer::primitive2d::Primitive2DContainer impCreateWithGivenPrimitive3DContainer(
const drawinglayer::primitive3d::Primitive3DContainer& rxContent3D) const;
-
// primitive stuff
// Primitive3DContainer of the ViewContact. This contains all necessary information
// for the graphical visualisation and needs to be supported by all 3D VCs which
// can be visualized. It does NOT contain the object transformation to be able to
// buffer for all possible usages
- drawinglayer::primitive3d::Primitive3DContainer mxViewIndependentPrimitive3DContainer;
+ drawinglayer::primitive3d::Primitive3DContainer mxViewIndependentPrimitive3DContainer;
protected:
// This method is responsible for creating the graphical visualisation data which is
// stored in mxViewIndependentPrimitive3DContainer, but without object transformation
- virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const = 0;
+ virtual drawinglayer::primitive3d::Primitive3DContainer
+ createViewIndependentPrimitive3DContainer() const = 0;
// This method is responsible for creating the graphical visualisation data derived ONLY from
// the model data. The default implementation will try to create a 3D to 2D embedding (will work
// when scene is known) which can then be used for 2D processing concerning ranges
- virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer
+ createViewIndependentPrimitive2DSequence() const override;
public:
// access to the local primitive without the object's local 3D transform. This is e.g. needed
// to get the not-yet transformed BoundVolume for e.g. interactions
- drawinglayer::primitive3d::Primitive3DContainer const & getVIP3DSWithoutObjectTransform() const;
+ drawinglayer::primitive3d::Primitive3DContainer const& getVIP3DSWithoutObjectTransform() const;
// access to the local primitive. This will ensure that the list is
// current in comparing the local list content with a fresh created incarnation. It will
@@ -85,8 +88,6 @@ public:
// local 3d transform is used
drawinglayer::primitive3d::Primitive3DContainer getViewIndependentPrimitive3DContainer() const;
};
-
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/sdr/contact/viewcontactofpageobj.hxx
index e1cb66a8b42a..f7ca5a7efd63 100644
--- a/svx/inc/sdr/contact/viewcontactofpageobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofpageobj.hxx
@@ -25,16 +25,19 @@
class SdrPage;
-namespace sdr::contact {
-
+namespace sdr::contact
+{
class ViewContactOfPageObj final : public ViewContactOfSdrObj
{
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
- virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
+ virtual ViewObjectContact&
+ CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
// create graphical visualisation data
- virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer
+ createViewIndependentPrimitive2DSequence() const override;
+
public:
// basic constructor, used from SdrObject.
explicit ViewContactOfPageObj(SdrPageObj& rPageObj);
@@ -44,13 +47,8 @@ public:
virtual void ActionChanged() override;
// access to SdrObject
- const SdrPageObj& GetPageObj() const
- {
- return static_cast<const SdrPageObj&>(GetSdrObject());
- }
+ const SdrPageObj& GetPageObj() const { return static_cast<const SdrPageObj&>(GetSdrObject()); }
};
-
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
index 7a79e3ee4f12..ac7a861e924f 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -26,8 +26,8 @@
class Graphic;
-namespace sdr::contact {
-
+namespace sdr::contact
+{
class ViewContactOfSdrOle2Obj final : public ViewContactOfSdrRectObj
{
private:
@@ -36,14 +36,12 @@ private:
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
- virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
+ virtual ViewObjectContact&
+ CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
public:
// access to SdrOle2Obj
- const SdrOle2Obj& GetOle2Obj() const
- {
- return static_cast<const SdrOle2Obj&>(GetSdrObject());
- }
+ const SdrOle2Obj& GetOle2Obj() const { return static_cast<const SdrOle2Obj&>(GetSdrObject()); }
/// helper to create transformation from SdrObject
basegfx::B2DHomMatrix createObjectTransform() const;
@@ -61,17 +59,17 @@ public:
// #i123539# get rid of buffered chart content (if there) on change
virtual void ActionChanged() override;
- virtual basegfx::B2DRange getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const override;
+ virtual basegfx::B2DRange
+ getRange(const drawinglayer::geometry::ViewInformation2D& rViewInfo2D) const override;
private:
// This method is responsible for creating the graphical visualisation data
// ONLY based on model data, just wraps to call createPrimitive2DSequenceWithParameters(false)
- virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer
+ createViewIndependentPrimitive2DSequence() const override;
};
-
}
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx
index b1de079e3177..3477ce4f8f87 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx
@@ -22,16 +22,13 @@
#include <sdr/contact/viewcontactoftextobj.hxx>
#include <svx/svdorect.hxx>
-namespace sdr::contact {
-
+namespace sdr::contact
+{
class ViewContactOfSdrRectObj : public ViewContactOfTextObj
{
protected:
// internal access to SdrRectObj
- const SdrRectObj& GetRectObj() const
- {
- return static_cast<const SdrRectObj&>(GetSdrObject());
- }
+ const SdrRectObj& GetRectObj() const { return static_cast<const SdrRectObj&>(GetSdrObject()); }
public:
// basic constructor, used from SdrObject.
@@ -41,9 +38,9 @@ public:
protected:
// This method is responsible for creating the graphical visualisation data
// ONLY based on model data
- virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer
+ createViewIndependentPrimitive2DSequence() const override;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/sdr/contact/viewcontactoftextobj.hxx
index 132744d0019e..cdf88e10c7bd 100644
--- a/svx/inc/sdr/contact/viewcontactoftextobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactoftextobj.hxx
@@ -23,8 +23,8 @@
class SdrTextObj;
-namespace sdr::contact {
-
+namespace sdr::contact
+{
class ViewContactOfTextObj : public ViewContactOfSdrObj
{
public:
@@ -32,7 +32,6 @@ public:
explicit ViewContactOfTextObj(SdrTextObj& rTextObj);
virtual ~ViewContactOfTextObj() override;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx
index c0f67e83ed53..16e168c41235 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx
@@ -24,8 +24,8 @@
class SdrPage;
-namespace sdr::contact {
-
+namespace sdr::contact
+{
class PagePrimitiveExtractor;
class ViewObjectContactOfPageObj final : public ViewObjectContactOfSdrObj
@@ -37,15 +37,13 @@ private:
// This method is responsible for creating the graphical visualisation data which is
// stored/cached in the local primitive.
// This method will not handle included hierarchies and not check geometric visibility.
- virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer
+ createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
public:
ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact);
virtual ~ViewObjectContactOfPageObj() override;
};
-
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index 4d227a9c20e5..8afd0c2cc76d 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
@@ -24,18 +24,18 @@
class SdrOle2Obj;
-namespace sdr::contact {
-
+namespace sdr::contact
+{
class ViewObjectContactOfSdrOle2Obj final : public ViewObjectContactOfSdrObj
{
// This method is responsible for creating the graphical visualisation data
- virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer
+ createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
public:
ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact);
virtual ~ViewObjectContactOfSdrOle2Obj() override;
};
-
}
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
diff --git a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
index 5b2bd6d30535..71e50cdf7fd8 100644
--- a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
@@ -22,23 +22,21 @@
#include <vcl/bitmapex.hxx>
-
// predefines
-namespace basegfx {
- class BColor;
+namespace basegfx
+{
+class BColor;
}
-
// helper methods
namespace drawinglayer::primitive2d
- {
- // create a 3x3 cross in given color as BitmapEx
- BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor);
+{
+// create a 3x3 cross in given color as BitmapEx
+BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor);
} // end of namespace drawinglayer::primitive2d
-
#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sxcaitm.hxx b/svx/inc/sxcaitm.hxx
index 8ffaec240f30..d6e216bf5493 100644
--- a/svx/inc/sxcaitm.hxx
+++ b/svx/inc/sxcaitm.hxx
@@ -32,9 +32,13 @@
// only if Type2, Type3 and Type4
// and only if SdrCaptionIsFixedAngleItem=TRUE
-class SdrCaptionAngleItem final : public SdrAngleItem {
+class SdrCaptionAngleItem final : public SdrAngleItem
+{
public:
- SdrCaptionAngleItem(tools::Long nAngle=0): SdrAngleItem(SDRATTR_CAPTIONANGLE,nAngle) {}
+ SdrCaptionAngleItem(tools::Long nAngle = 0)
+ : SdrAngleItem(SDRATTR_CAPTIONANGLE, nAngle)
+ {
+ }
virtual SdrCaptionAngleItem* Clone(SfxItemPool*) const override
{
return new SdrCaptionAngleItem(*this);
diff --git a/svx/inc/sxmoitm.hxx b/svx/inc/sxmoitm.hxx
index db4989134990..24ee1fc32b6b 100644
--- a/svx/inc/sxmoitm.hxx
+++ b/svx/inc/sxmoitm.hxx
@@ -24,9 +24,13 @@
// Overlap of the measure line over the measure helper lines
// Only of the measure arrows are on the outside
-class SdrMeasureOverhangItem: public SdrMetricItem {
+class SdrMeasureOverhangItem : public SdrMetricItem
+{
public:
- SdrMeasureOverhangItem(tools::Long nVal): SdrMetricItem(SDRATTR_MEASUREOVERHANG,nVal) {}
+ SdrMeasureOverhangItem(tools::Long nVal)
+ : SdrMetricItem(SDRATTR_MEASUREOVERHANG, nVal)
+ {
+ }
virtual SdrMeasureOverhangItem* Clone(SfxItemPool*) const override
{
return new SdrMeasureOverhangItem(*this);
diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx
index 78dea13bf74e..f821c73fe047 100644
--- a/svx/inc/sxmsitm.hxx
+++ b/svx/inc/sxmsitm.hxx
@@ -25,9 +25,13 @@
// Measure scale setting
// We do not overwrite a measure scale (UIScale), If the model already has one set.
// Instead, we multiply them with each other.
-class SdrMeasureScaleItem final : public SdrScaleItem {
+class SdrMeasureScaleItem final : public SdrScaleItem
+{
public:
- SdrMeasureScaleItem() : SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {}
+ SdrMeasureScaleItem()
+ : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1))
+ {
+ }
virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override
{
return new SdrMeasureScaleItem(*this);
diff --git a/svx/inc/sxroaitm.hxx b/svx/inc/sxroaitm.hxx
index dde8f989cde1..66785c68af7e 100644
--- a/svx/inc/sxroaitm.hxx
+++ b/svx/inc/sxroaitm.hxx
@@ -22,9 +22,13 @@
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
-class SdrRotateAllItem final : public SdrAngleItem {
+class SdrRotateAllItem final : public SdrAngleItem
+{
public:
- SdrRotateAllItem(): SdrAngleItem(SDRATTR_ROTATEALL,0) {}
+ SdrRotateAllItem()
+ : SdrAngleItem(SDRATTR_ROTATEALL, 0)
+ {
+ }
virtual SdrRotateAllItem* Clone(SfxItemPool*) const override
{
return new SdrRotateAllItem(*this);
diff --git a/svx/inc/sxsaitm.hxx b/svx/inc/sxsaitm.hxx
index 8d9fbd6a5c7f..1591dfa4938f 100644
--- a/svx/inc/sxsaitm.hxx
+++ b/svx/inc/sxsaitm.hxx
@@ -22,9 +22,13 @@
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
-class SdrShearAngleItem: public SdrAngleItem {
+class SdrShearAngleItem : public SdrAngleItem
+{
public:
- SdrShearAngleItem(tools::Long nAngle=0): SdrAngleItem(SDRATTR_SHEARANGLE,nAngle) {}
+ SdrShearAngleItem(tools::Long nAngle = 0)
+ : SdrAngleItem(SDRATTR_SHEARANGLE, nAngle)
+ {
+ }
virtual SdrShearAngleItem* Clone(SfxItemPool*) const override
{
return new SdrShearAngleItem(*this);
diff --git a/svx/inc/textchain.hxx b/svx/inc/textchain.hxx
index d5cae0be281c..a74b6c9f6768 100644
--- a/svx/inc/textchain.hxx
+++ b/svx/inc/textchain.hxx
@@ -26,8 +26,9 @@ class ImpChainLinkProperties;
class SdrTextObj;
class SdrModel;
-namespace rtl {
- class OUString;
+namespace rtl
+{
+class OUString;
}
typedef OUString ChainLinkId;
@@ -45,11 +46,12 @@ class ImpChainLinkProperties
protected:
friend class TextChain;
- ImpChainLinkProperties() {
+ ImpChainLinkProperties()
+ {
aNilChainingEvent = false;
aCursorEvent = CursorChainingEvent::NULL_EVENT;
- aPreChainingSel = ESelection(0,0,0,0);
- aPostChainingSel = ESelection(0,0,0,0);
+ aPreChainingSel = ESelection(0, 0, 0, 0);
+ aPostChainingSel = ESelection(0, 0, 0, 0);
aIsPartOfLastParaInNextLink = false; // XXX: Should come from file
aSwitchingToNextBox = false;
}
@@ -64,40 +66,39 @@ private:
bool aSwitchingToNextBox;
};
-
class TextChain
{
public:
~TextChain();
- ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *);
+ ImpChainLinkProperties* GetLinkProperties(const SdrTextObj*);
// Specific Link Properties
- CursorChainingEvent const & GetCursorEvent(const SdrTextObj *);
- void SetCursorEvent(const SdrTextObj *, CursorChainingEvent const &);
+ CursorChainingEvent const& GetCursorEvent(const SdrTextObj*);
+ void SetCursorEvent(const SdrTextObj*, CursorChainingEvent const&);
- bool GetNilChainingEvent(const SdrTextObj *);
- void SetNilChainingEvent(const SdrTextObj *, bool);
+ bool GetNilChainingEvent(const SdrTextObj*);
+ void SetNilChainingEvent(const SdrTextObj*, bool);
- ESelection const & GetPreChainingSel(const SdrTextObj *);
- void SetPreChainingSel(const SdrTextObj *, ESelection const &);
+ ESelection const& GetPreChainingSel(const SdrTextObj*);
+ void SetPreChainingSel(const SdrTextObj*, ESelection const&);
- ESelection const & GetPostChainingSel(const SdrTextObj *);
- void SetPostChainingSel(const SdrTextObj *, ESelection const &);
+ ESelection const& GetPostChainingSel(const SdrTextObj*);
+ void SetPostChainingSel(const SdrTextObj*, ESelection const&);
// return whether a paragraph is split between this box and the next
- bool GetIsPartOfLastParaInNextLink(const SdrTextObj *);
- void SetIsPartOfLastParaInNextLink(const SdrTextObj *, bool );
+ bool GetIsPartOfLastParaInNextLink(const SdrTextObj*);
+ void SetIsPartOfLastParaInNextLink(const SdrTextObj*, bool);
// return whether we are currently moving the cursor to the next box (useful to know whether we should prevent SetOutlinerParaObject invocations in SdrTextObj::EndTextEdit)
- bool GetSwitchingToNextBox(const SdrTextObj *);
- void SetSwitchingToNextBox(const SdrTextObj *, bool);
+ bool GetSwitchingToNextBox(const SdrTextObj*);
+ void SetSwitchingToNextBox(const SdrTextObj*, bool);
protected:
TextChain();
private:
- std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
+ std::map<ChainLinkId, ImpChainLinkProperties*> maLinkPropertiesMap;
friend class SdrModel;
};
diff --git a/svx/inc/textchainflow.hxx b/svx/inc/textchainflow.hxx
index c823663d631b..e8ffd654b5b6 100644
--- a/svx/inc/textchainflow.hxx
+++ b/svx/inc/textchainflow.hxx
@@ -34,21 +34,21 @@ class UFlowChainedText;
class TextChainFlow
{
public:
- TextChainFlow(SdrTextObj *pChainTarget);
+ TextChainFlow(SdrTextObj* pChainTarget);
virtual ~TextChainFlow();
// Check for flow events in Outliner
- virtual void CheckForFlowEvents(SdrOutliner *);
+ virtual void CheckForFlowEvents(SdrOutliner*);
- void ExecuteUnderflow(SdrOutliner *);
+ void ExecuteUnderflow(SdrOutliner*);
// Uses two outliners: one for the non-overflow text and one for overflowing (might be the same)
- void ExecuteOverflow(SdrOutliner *, SdrOutliner *);
+ void ExecuteOverflow(SdrOutliner*, SdrOutliner*);
bool IsOverflow() const;
bool IsUnderflow() const;
- SdrTextObj *GetLinkTarget() const;
+ SdrTextObj* GetLinkTarget() const;
protected:
// Cursor related
@@ -59,43 +59,42 @@ protected:
std::unique_ptr<OFlowChainedText> mpOverflChText;
std::unique_ptr<UFlowChainedText> mpUnderflChText;
- void impCheckForFlowEvents(SdrOutliner *, SdrOutliner *);
+ void impCheckForFlowEvents(SdrOutliner*, SdrOutliner*);
- TextChain *GetTextChain() const;
+ TextChain* GetTextChain() const;
- virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *);
- void impMoveChainedTextToNextLink(SdrOutliner *);
+ virtual void impLeaveOnlyNonOverflowingText(SdrOutliner*);
+ void impMoveChainedTextToNextLink(SdrOutliner*);
- virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *);
+ virtual void impSetFlowOutlinerParams(SdrOutliner*, SdrOutliner*);
private:
bool mbOFisUFinduced;
void impUpdateCursorInfo();
- SdrTextObj *mpTargetLink;
- SdrTextObj *mpNextLink;
+ SdrTextObj* mpTargetLink;
+ SdrTextObj* mpNextLink;
- TextChain *mpTextChain;
+ TextChain* mpTextChain;
bool bUnderflow;
bool bOverflow;
};
-
// NOTE: EditingTextChainFlow might be strongly coupled with behavior in SdrTextObj::onChainingEvent
class EditingTextChainFlow : public TextChainFlow
{
public:
- EditingTextChainFlow(SdrTextObj *);
- virtual void CheckForFlowEvents(SdrOutliner *) override;
+ EditingTextChainFlow(SdrTextObj*);
+ virtual void CheckForFlowEvents(SdrOutliner*) override;
//virtual void ExecuteOverflow(SdrOutliner *, SdrOutliner *) override;
protected:
- virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *) override;
+ virtual void impLeaveOnlyNonOverflowingText(SdrOutliner*) override;
- virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *) override;
+ virtual void impSetFlowOutlinerParams(SdrOutliner*, SdrOutliner*) override;
private:
void impBroadcastCursorInfo() const;
diff --git a/svx/inc/uiobject.hxx b/svx/inc/uiobject.hxx
index 34659619cf83..bddf321a130e 100644
--- a/svx/inc/uiobject.hxx
+++ b/svx/inc/uiobject.hxx
@@ -24,36 +24,29 @@ class SvxShowCharSetUIObject final : public DrawingAreaUIObject
public:
SvxShowCharSetUIObject(const VclPtr<vcl::Window>& rCharSetWin);
- virtual void execute(const OUString& rAction,
- const StringMap& rParameters) override;
+ virtual void execute(const OUString& rAction, const StringMap& rParameters) override;
static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
private:
-
OUString get_name() const override;
};
-
class SvxNumValueSetUIObject final : public DrawingAreaUIObject
{
SvxNumValueSet* mpNumValueSet;
public:
-
SvxNumValueSetUIObject(vcl::Window* pNumValueSetWin);
- virtual void execute(const OUString& rAction,
- const StringMap& rParameters) override;
+ virtual void execute(const OUString& rAction, const StringMap& rParameters) override;
static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
virtual StringMap get_state() override;
private:
-
OUString get_name() const override;
-
};
#endif // INCLUDED_SVX_INC_UIOBJECT_HXX
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index af2559fa09b4..55cae9c0dfdc 100644
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.hxx
@@ -25,12 +25,13 @@
class SdrObject;
-class SvxUnoShapeModifyListener final : public ::cppu::WeakAggImplHelper1< css::util::XModifyListener >
+class SvxUnoShapeModifyListener final
+ : public ::cppu::WeakAggImplHelper1<css::util::XModifyListener>
{
- SdrObject* mpObj;
+ SdrObject* mpObj;
public:
- SvxUnoShapeModifyListener( SdrObject* pObj ) throw();
+ SvxUnoShapeModifyListener(SdrObject* pObj) throw();
virtual ~SvxUnoShapeModifyListener() throw() override;
// css::util::XModifyListener
@@ -43,8 +44,6 @@ public:
void invalidate() throw();
};
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/qa/unit/svdraw/test_SdrTextObject.cxx b/svx/qa/unit/svdraw/test_SdrTextObject.cxx
index 7af646b0bb16..93b06272fd3d 100644
--- a/svx/qa/unit/svdraw/test_SdrTextObject.cxx
+++ b/svx/qa/unit/svdraw/test_SdrTextObject.cxx
@@ -15,7 +15,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
-class SdrTextObjTest : public CppUnit::TestFixture {
+class SdrTextObjTest : public CppUnit::TestFixture
+{
public:
void AllFamiliesCanBeRestoredFromSavedString();
@@ -24,18 +25,20 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-void SdrTextObjTest::AllFamiliesCanBeRestoredFromSavedString() {
+void SdrTextObjTest::AllFamiliesCanBeRestoredFromSavedString()
+{
std::vector<SfxStyleFamily> allFamilies;
allFamilies.push_back(SfxStyleFamily::Char);
allFamilies.push_back(SfxStyleFamily::Para);
allFamilies.push_back(SfxStyleFamily::Page);
allFamilies.push_back(SfxStyleFamily::Pseudo);
- for (SfxStyleFamily family : allFamilies) {
- OUString styleName = "styleName";
- SdrTextObj::AppendFamilyToStyleName(styleName, family);
- SfxStyleFamily readFamily = SdrTextObj::ReadFamilyFromStyleName(styleName);
- CPPUNIT_ASSERT_EQUAL(static_cast<int>(family), static_cast<int>(readFamily));
+ for (SfxStyleFamily family : allFamilies)
+ {
+ OUString styleName = "styleName";
+ SdrTextObj::AppendFamilyToStyleName(styleName, family);
+ SfxStyleFamily readFamily = SdrTextObj::ReadFamilyFromStyleName(styleName);
+ CPPUNIT_ASSERT_EQUAL(static_cast<int>(family), static_cast<int>(readFamily));
}
}
diff --git a/svx/qa/unit/svx-dialogs-test.cxx b/svx/qa/unit/svx-dialogs-test.cxx
index eaa829569914..0a182e7fb026 100644
--- a/svx/qa/unit/svx-dialogs-test.cxx
+++ b/svx/qa/unit/svx-dialogs-test.cxx
@@ -36,19 +36,14 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-SvxDialogsTest::SvxDialogsTest()
-{
-}
+SvxDialogsTest::SvxDialogsTest() {}
void SvxDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
{
// fill map of known dialogs
}
-VclPtr<VclAbstractDialog> SvxDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
-{
- return nullptr;
-}
+VclPtr<VclAbstractDialog> SvxDialogsTest::createDialogByID(sal_uInt32 /*nID*/) { return nullptr; }
void SvxDialogsTest::openAnyDialog()
{
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index ae2e90240baa..2ed65c5dbf38 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <DescriptionGenerator.hxx>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -34,23 +33,16 @@
using namespace ::com::sun::star;
-
-namespace accessibility {
-
-
-DescriptionGenerator::DescriptionGenerator (
- const uno::Reference<drawing::XShape>& xShape)
- : mxShape (xShape),
- mxSet (mxShape, uno::UNO_QUERY),
- mbIsFirstProperty (true)
+namespace accessibility
{
-}
-
-
-DescriptionGenerator::~DescriptionGenerator()
+DescriptionGenerator::DescriptionGenerator(const uno::Reference<drawing::XShape>& xShape)
+ : mxShape(xShape)
+ , mxSet(mxShape, uno::UNO_QUERY)
+ , mbIsFirstProperty(true)
{
}
+DescriptionGenerator::~DescriptionGenerator() {}
void DescriptionGenerator::Initialize(const char* pResourceId)
{
@@ -62,11 +54,10 @@ void DescriptionGenerator::Initialize(const char* pResourceId)
}
// Forward the call with the resulting string.
- Initialize (sPrefix);
+ Initialize(sPrefix);
}
-
-void DescriptionGenerator::Initialize (const OUString& sPrefix)
+void DescriptionGenerator::Initialize(const OUString& sPrefix)
{
msDescription = sPrefix;
if (!mxSet.is())
@@ -79,7 +70,7 @@ void DescriptionGenerator::Initialize (const OUString& sPrefix)
msDescription.append(SvxResId(RID_SVXSTR_A11Y_WITH));
msDescription.append(' ');
- msDescription.append(SvxResId (RID_SVXSTR_A11Y_STYLE));
+ msDescription.append(SvxResId(RID_SVXSTR_A11Y_STYLE));
msDescription.append('=');
}
@@ -87,41 +78,38 @@ void DescriptionGenerator::Initialize (const OUString& sPrefix)
{
if (mxSet.is())
{
- uno::Any aValue = mxSet->getPropertyValue ("Style");
- uno::Reference<container::XNamed> xStyle (aValue, uno::UNO_QUERY);
+ uno::Any aValue = mxSet->getPropertyValue("Style");
+ uno::Reference<container::XNamed> xStyle(aValue, uno::UNO_QUERY);
if (xStyle.is())
- msDescription.append (xStyle->getName());
+ msDescription.append(xStyle->getName());
}
else
- msDescription.append ("<no style>");
+ msDescription.append("<no style>");
}
- catch (const css::beans::UnknownPropertyException &)
+ catch (const css::beans::UnknownPropertyException&)
{
- msDescription.append ("<unknown>");
+ msDescription.append("<unknown>");
}
}
-
-OUString DescriptionGenerator::operator() ()
+OUString DescriptionGenerator::operator()()
{
msDescription.append('.');
return msDescription.makeStringAndClear();
}
-
-void DescriptionGenerator::AddProperty (const OUString& sPropertyName,
- PropertyType aType)
+void DescriptionGenerator::AddProperty(const OUString& sPropertyName, PropertyType aType)
{
- uno::Reference<beans::XPropertyState> xState (mxShape, uno::UNO_QUERY);
+ uno::Reference<beans::XPropertyState> xState(mxShape, uno::UNO_QUERY);
if (!xState.is()
- || xState->getPropertyState(sPropertyName)==beans::PropertyState_DEFAULT_VALUE)
+ || xState->getPropertyState(sPropertyName) == beans::PropertyState_DEFAULT_VALUE)
return;
if (!mxSet.is())
return;
// Append a separator from previous Properties.
- if ( ! mbIsFirstProperty)
+ if (!mbIsFirstProperty)
msDescription.append(',');
else
{
@@ -137,48 +125,41 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName,
switch (aType)
{
case PropertyType::Color:
- AddColor (sPropertyName);
+ AddColor(sPropertyName);
break;
case PropertyType::Integer:
- AddInteger (sPropertyName);
+ AddInteger(sPropertyName);
break;
}
}
-
-void DescriptionGenerator::AppendString (const OUString& sString)
-{
- msDescription.append (sString);
-}
-
+void DescriptionGenerator::AppendString(const OUString& sString) { msDescription.append(sString); }
/** Search for the given color in the global color table. If found append
its name to the description. Otherwise append its RGB tuple.
*/
-void DescriptionGenerator::AddColor (const OUString& sPropertyName)
+void DescriptionGenerator::AddColor(const OUString& sPropertyName)
{
msDescription.append('=');
try
{
-
tools::Long nValue(0);
if (mxSet.is())
{
- uno::Any aValue = mxSet->getPropertyValue (sPropertyName);
+ uno::Any aValue = mxSet->getPropertyValue(sPropertyName);
aValue >>= nValue;
}
- msDescription.append (lookUpColorName(nValue));
+ msDescription.append(lookUpColorName(nValue));
}
- catch (const css::beans::UnknownPropertyException &)
+ catch (const css::beans::UnknownPropertyException&)
{
- msDescription.append ("<unknown>");
+ msDescription.append("<unknown>");
}
}
-
-void DescriptionGenerator::AddInteger (const OUString& sPropertyName)
+void DescriptionGenerator::AddInteger(const OUString& sPropertyName)
{
msDescription.append('=');
@@ -186,15 +167,15 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName)
{
if (mxSet.is())
{
- uno::Any aValue = mxSet->getPropertyValue (sPropertyName);
+ uno::Any aValue = mxSet->getPropertyValue(sPropertyName);
tools::Long nValue = 0;
aValue >>= nValue;
- msDescription.append (nValue);
+ msDescription.append(nValue);
}
}
- catch (const css::beans::UnknownPropertyException &)
+ catch (const css::beans::UnknownPropertyException&)
{
- msDescription.append ("<unknown>");
+ msDescription.append("<unknown>");
}
}
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index d74c22d3d984..520843c26caa 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -33,9 +33,10 @@
#include "lookupcolorname.hxx"
#include <unordered_map>
-namespace {
-
-class ColorNameMap {
+namespace
+{
+class ColorNameMap
+{
public:
ColorNameMap();
ColorNameMap(const ColorNameMap&) = delete;
@@ -44,20 +45,21 @@ public:
OUString lookUp(tools::Long color) const;
private:
- typedef std::unordered_map< tools::Long, OUString > Map;
+ typedef std::unordered_map<tools::Long, OUString> Map;
Map map_;
};
-ColorNameMap::ColorNameMap() {
- css::uno::Sequence< OUString > aNames;
- css::uno::Reference< css::container::XNameAccess > xNA;
+ColorNameMap::ColorNameMap()
+{
+ css::uno::Sequence<OUString> aNames;
+ css::uno::Reference<css::container::XNameAccess> xNA;
try
{
// Create color table in which to look up the given color.
- css::uno::Reference< css::container::XNameContainer > xColorTable =
- css::drawing::ColorTable::create( comphelper::getProcessComponentContext() );
+ css::uno::Reference<css::container::XNameContainer> xColorTable
+ = css::drawing::ColorTable::create(comphelper::getProcessComponentContext());
// Get list of color names in order to iterate over the color table.
@@ -95,25 +97,25 @@ ColorNameMap::ColorNameMap() {
}
}
-OUString ColorNameMap::lookUp(tools::Long color) const {
+OUString ColorNameMap::lookUp(tools::Long color) const
+{
Map::const_iterator i(map_.find(color));
- if (i != map_.end()) {
+ if (i != map_.end())
+ {
return i->second;
}
// Did not find the given color; return its RGB tuple representation:
return "#" + OUString::number(color, 16);
}
-struct theColorNameMap: public rtl::Static< ColorNameMap, theColorNameMap > {};
-
-}
-
-namespace accessibility {
-
-OUString lookUpColorName(tools::Long color) {
- return theColorNameMap::get().lookUp(color);
+struct theColorNameMap : public rtl::Static<ColorNameMap, theColorNameMap>
+{
+};
}
+namespace accessibility
+{
+OUString lookUpColorName(tools::Long color) { return theColorNameMap::get().lookUp(color); }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/lookupcolorname.hxx b/svx/source/accessibility/lookupcolorname.hxx
index f6e4c9234d38..2dc31ff92b2e 100644
--- a/svx/source/accessibility/lookupcolorname.hxx
+++ b/svx/source/accessibility/lookupcolorname.hxx
@@ -24,8 +24,8 @@
#include <rtl/ustring.hxx>
-namespace accessibility {
-
+namespace accessibility
+{
/** This is a color name lookup targeted to be used by the accessibility
<type>DescriptionGenerator</type> class. It encapsulates a
<type>com.sun.star.drawing.ColorTable</type> and provides an inverse look
@@ -49,7 +49,6 @@ namespace accessibility {
digits for each color component.
*/
OUString lookUpColorName(tools::Long color);
-
}
#endif
diff --git a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
index 5eb062b176e9..7c6e010e9c2f 100644
--- a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
+++ b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
@@ -30,7 +30,7 @@ using namespace css::style;
Reference<XDefaultNumberingProvider> SvxNumOptionsTabPageHelper::GetNumberingProvider()
{
- Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
+ Reference<XComponentContext> xContext(::comphelper::getProcessComponentContext());
Reference<XDefaultNumberingProvider> xRet = text::DefaultNumberingProvider::create(xContext);
return xRet;
}
@@ -44,19 +44,19 @@ void SvxNumOptionsTabPageHelper::GetI18nNumbering(weld::ComboBox& rFmtLB, sal_uI
// the i18n framework per configuration must be removed from the listbox.
// Do not remove a special entry matching nDoNotRemove.
const sal_uInt16 nDontRemove = SAL_MAX_UINT16;
- ::std::vector< sal_uInt16> aRemove( rFmtLB.get_count(), nDontRemove);
- for (size_t i=0; i<aRemove.size(); ++i)
+ ::std::vector<sal_uInt16> aRemove(rFmtLB.get_count(), nDontRemove);
+ for (size_t i = 0; i < aRemove.size(); ++i)
{
sal_uInt16 nEntryData = rFmtLB.get_id(i).toInt32();
if (nEntryData > NumberingType::CHARS_LOWER_LETTER_N && nEntryData != nDoNotRemove)
aRemove[i] = nEntryData;
}
- if(xInfo.is())
+ if (xInfo.is())
{
- Sequence<sal_Int16> aTypes = xInfo->getSupportedNumberingTypes( );
- for(const sal_Int16 nCurrent : aTypes)
+ Sequence<sal_Int16> aTypes = xInfo->getSupportedNumberingTypes();
+ for (const sal_Int16 nCurrent : aTypes)
{
- if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
+ if (nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
{
bool bInsert = true;
for (int nEntry = 0; nEntry < rFmtLB.get_count(); ++nEntry)
@@ -69,9 +69,9 @@ void SvxNumOptionsTabPageHelper::GetI18nNumbering(weld::ComboBox& rFmtLB, sal_uI
break;
}
}
- if(bInsert)
+ if (bInsert)
{
- OUString aIdent = xInfo->getNumberingIdentifier( nCurrent );
+ OUString aIdent = xInfo->getNumberingIdentifier(nCurrent);
rFmtLB.append(OUString::number(nCurrent), aIdent);
}
}
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index cba8fbcc9e03..4e4389bd8463 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -20,14 +20,8 @@
#include <unotools/resmgr.hxx>
#include <svx/dialmgr.hxx>
-std::locale SvxResLocale()
-{
- return Translate::Create("svx");
-}
+std::locale SvxResLocale() { return Translate::Create("svx"); }
-OUString SvxResId(const char* pId)
-{
- return Translate::get(pId, SvxResLocale());
-}
+OUString SvxResId(const char* pId) { return Translate::get(pId, SvxResLocale()); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
index 7d9a98ac5a9a..bb8ac83d28d5 100644
--- a/svx/source/dialog/dlgunit.hxx
+++ b/svx/source/dialog/dlgunit.hxx
@@ -24,17 +24,18 @@
#include <svx/svdtrans.hxx>
#include <vcl/fieldvalues.hxx>
-inline OUString GetUnitString( tools::Long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep )
+inline OUString GetUnitString(tools::Long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep)
{
- OUStringBuffer aVal = OUString::number(
- vcl::ConvertValue(nVal_100, 2, MapUnit::Map100thMM, eFieldUnit));
+ OUStringBuffer aVal
+ = OUString::number(vcl::ConvertValue(nVal_100, 2, MapUnit::Map100thMM, eFieldUnit));
- while( aVal.getLength() < 3 )
- aVal.insert( 0, "0" );
+ while (aVal.getLength() < 3)
+ aVal.insert(0, "0");
- aVal.insert( aVal.getLength() - 2, cSep );
+ aVal.insert(aVal.getLength() - 2, cSep);
OUString aSuffix = SdrFormatter::GetUnitStr(eFieldUnit);
- if (eFieldUnit != FieldUnit::NONE && eFieldUnit != FieldUnit::DEGREE && eFieldUnit != FieldUnit::INCH)
+ if (eFieldUnit != FieldUnit::NONE && eFieldUnit != FieldUnit::DEGREE
+ && eFieldUnit != FieldUnit::INCH)
aVal.append(" ");
if (eFieldUnit == FieldUnit::INCH)
{
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 0bad56b64454..c3fbee97ef3c 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -71,9 +71,7 @@ void SvxXMeasurePreview::Resize()
Invalidate();
}
-SvxXMeasurePreview::~SvxXMeasurePreview()
-{
-}
+SvxXMeasurePreview::~SvxXMeasurePreview() {}
void SvxXMeasurePreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{
@@ -99,9 +97,9 @@ void SvxXMeasurePreview::SetAttributes(const SfxItemSet& rInAttrs)
bool SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
{
- bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
+ bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
- bool bCtrl = rMEvt.IsMod1();
+ bool bCtrl = rMEvt.IsMod1();
if (bZoomIn || bZoomOut)
{
@@ -127,8 +125,8 @@ bool SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
aXFrac *= *pMultFrac;
aYFrac *= *pMultFrac;
- if (double(aXFrac) > 0.001 && double(aXFrac) < 1000.0 &&
- double(aYFrac) > 0.001 && double(aYFrac) < 1000.0)
+ if (double(aXFrac) > 0.001 && double(aXFrac) < 1000.0 && double(aYFrac) > 0.001
+ && double(aYFrac) < 1000.0)
{
m_aMapMode.SetScaleX(aXFrac);
m_aMapMode.SetScaleY(aYFrac);
@@ -140,10 +138,14 @@ bool SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
rRefDevice.Pop();
Point aPt(m_aMapMode.GetOrigin());
- tools::Long nX = tools::Long((double(aOutSize.Width()) - (double(aOutSize.Width()) * double(*pMultFrac))) / 2.0 + 0.5);
- tools::Long nY = tools::Long((double(aOutSize.Height()) - (double(aOutSize.Height()) * double(*pMultFrac))) / 2.0 + 0.5);
- aPt.AdjustX(nX );
- aPt.AdjustY(nY );
+ tools::Long nX = tools::Long(
+ (double(aOutSize.Width()) - (double(aOutSize.Width()) * double(*pMultFrac))) / 2.0
+ + 0.5);
+ tools::Long nY = tools::Long(
+ (double(aOutSize.Height()) - (double(aOutSize.Height()) * double(*pMultFrac))) / 2.0
+ + 0.5);
+ aPt.AdjustX(nX);
+ aPt.AdjustY(nY);
m_aMapMode.SetOrigin(aPt);
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index a2769bb6f09b..361a5828a2d3 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -57,7 +57,6 @@ SFX_IMPL_CHILDWINDOW(SvxRubyChildWindow, SID_RUBY_DIALOG);
namespace
{
-
const char cRubyBaseText[] = "RubyBaseText";
const char cRubyText[] = "RubyText";
const char cRubyAdjust[] = "RubyAdjust";
@@ -66,7 +65,8 @@ const char cRubyCharStyleName[] = "RubyCharStyleName";
} // end anonymous namespace
-SvxRubyChildWindow::SvxRubyChildWindow(vcl::Window* _pParent, sal_uInt16 nId,SfxBindings* pBindings, SfxChildWinInfo const * pInfo)
+SvxRubyChildWindow::SvxRubyChildWindow(vcl::Window* _pParent, sal_uInt16 nId,
+ SfxBindings* pBindings, SfxChildWinInfo const* pInfo)
: SfxChildWindow(_pParent, nId)
{
auto xDlg = std::make_shared<SvxRubyDialog>(pBindings, this, _pParent->GetFrameWeld());
@@ -74,10 +74,7 @@ SvxRubyChildWindow::SvxRubyChildWindow(vcl::Window* _pParent, sal_uInt16 nId,Sfx
xDlg->Initialize(pInfo);
}
-SfxChildWinInfo SvxRubyChildWindow::GetInfo() const
-{
- return SfxChildWindow::GetInfo();
-}
+SfxChildWinInfo SvxRubyChildWindow::GetInfo() const { return SfxChildWindow::GetInfo(); }
class SvxRubyData_Impl : public cppu::WeakImplHelper<css::view::XSelectionChangeListener>
{
@@ -92,7 +89,7 @@ public:
virtual ~SvxRubyData_Impl() override;
void SetController(const Reference<XController>& xCtrl);
- Reference<XModel> const & GetModel()
+ Reference<XModel> const& GetModel()
{
if (!xController.is())
xModel = nullptr;
@@ -100,11 +97,8 @@ public:
xModel = xController->getModel();
return xModel;
}
- bool HasSelectionChanged() const
- {
- return bHasSelectionChanged;
- }
- Reference<XRubySelection> const & GetRubySelection()
+ bool HasSelectionChanged() const { return bHasSelectionChanged; }
+ Reference<XRubySelection> const& GetRubySelection()
{
xSelection.set(xController, UNO_QUERY);
return xSelection;
@@ -117,15 +111,11 @@ public:
aRubyValues = xSelection->getRubyList(false);
bHasSelectionChanged = false;
}
- Sequence<PropertyValues>& GetRubyValues()
- {
- return aRubyValues;
- }
+ Sequence<PropertyValues>& GetRubyValues() { return aRubyValues; }
void AssertOneEntry();
virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent) override;
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source) override;
-
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
};
SvxRubyData_Impl::SvxRubyData_Impl()
@@ -133,9 +123,7 @@ SvxRubyData_Impl::SvxRubyData_Impl()
{
}
-SvxRubyData_Impl::~SvxRubyData_Impl()
-{
-}
+SvxRubyData_Impl::~SvxRubyData_Impl() {}
void SvxRubyData_Impl::SetController(const Reference<XController>& xCtrl)
{
@@ -159,10 +147,7 @@ void SvxRubyData_Impl::SetController(const Reference<XController>& xCtrl)
}
}
-void SvxRubyData_Impl::selectionChanged(const EventObject& )
-{
- bHasSelectionChanged = true;
-}
+void SvxRubyData_Impl::selectionChanged(const EventObject&) { bHasSelectionChanged = true; }
void SvxRubyData_Impl::disposing(const EventObject&)
{
@@ -196,13 +181,13 @@ void SvxRubyData_Impl::AssertOneEntry()
}
SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, weld::Window* pParent)
- : SfxModelessDialogController(pBind, pCW, pParent,
- "svx/ui/asianphoneticguidedialog.ui", "AsianPhoneticGuideDialog")
+ : SfxModelessDialogController(pBind, pCW, pParent, "svx/ui/asianphoneticguidedialog.ui",
+ "AsianPhoneticGuideDialog")
, nLastPos(0)
, nCurrentEdit(0)
, bModified(false)
, pBindings(pBind)
- , m_pImpl( new SvxRubyData_Impl )
+ , m_pImpl(new SvxRubyData_Impl)
, m_xLeftFT(m_xBuilder->weld_label("basetextft"))
, m_xRightFT(m_xBuilder->weld_label("rubytextft"))
, m_xLeft1ED(m_xBuilder->weld_entry("Left1ED"))
@@ -231,10 +216,14 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, weld::Wind
m_xScrolledWindow->set_size_request(-1, m_xGrid->get_preferred_size().Height());
m_xScrolledWindow->set_vpolicy(VclPolicyType::NEVER);
- aEditArr[0] = m_xLeft1ED.get(); aEditArr[1] = m_xRight1ED.get();
- aEditArr[2] = m_xLeft2ED.get(); aEditArr[3] = m_xRight2ED.get();
- aEditArr[4] = m_xLeft3ED.get(); aEditArr[5] = m_xRight3ED.get();
- aEditArr[6] = m_xLeft4ED.get(); aEditArr[7] = m_xRight4ED.get();
+ aEditArr[0] = m_xLeft1ED.get();
+ aEditArr[1] = m_xRight1ED.get();
+ aEditArr[2] = m_xLeft2ED.get();
+ aEditArr[3] = m_xRight2ED.get();
+ aEditArr[4] = m_xLeft3ED.get();
+ aEditArr[5] = m_xRight3ED.get();
+ aEditArr[6] = m_xLeft4ED.get();
+ aEditArr[7] = m_xRight4ED.get();
m_xApplyPB->connect_clicked(LINK(this, SvxRubyDialog, ApplyHdl_Impl));
m_xClosePB->connect_clicked(LINK(this, SvxRubyDialog, CloseHdl_Impl));
@@ -246,10 +235,10 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, weld::Wind
Link<weld::ScrolledWindow&, void> aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl));
m_xScrolledWindow->connect_vadjustment_changed(aScrLk);
- Link<weld::Entry&,void> aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl));
- Link<weld::Widget&,void> aFocusLk(LINK(this, SvxRubyDialog, EditFocusHdl_Impl));
- Link<const KeyEvent&,bool> aKeyUpDownLk(LINK(this, SvxRubyDialog, KeyUpDownHdl_Impl));
- Link<const KeyEvent&,bool> aKeyTabUpDownLk(LINK(this, SvxRubyDialog, KeyUpDownTabHdl_Impl));
+ Link<weld::Entry&, void> aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl));
+ Link<weld::Widget&, void> aFocusLk(LINK(this, SvxRubyDialog, EditFocusHdl_Impl));
+ Link<const KeyEvent&, bool> aKeyUpDownLk(LINK(this, SvxRubyDialog, KeyUpDownHdl_Impl));
+ Link<const KeyEvent&, bool> aKeyTabUpDownLk(LINK(this, SvxRubyDialog, KeyUpDownTabHdl_Impl));
for (sal_uInt16 i = 0; i < 8; i++)
{
aEditArr[i]->connect_changed(aEditLk);
@@ -268,10 +257,7 @@ SvxRubyDialog::~SvxRubyDialog()
m_pImpl->disposing(aEvent);
}
-void SvxRubyDialog::ClearCharStyleList()
-{
- m_xCharStyleLB->clear();
-}
+void SvxRubyDialog::ClearCharStyleList() { m_xCharStyleLB->clear(); }
void SvxRubyDialog::Close()
{
@@ -287,17 +273,17 @@ void SvxRubyDialog::Activate()
SfxModelessDialogController::Activate();
//get selection from current view frame
SfxViewFrame* pCurFrm = SfxViewFrame::Current();
- Reference< XController > xCtrl = pCurFrm->GetFrame().GetController();
+ Reference<XController> xCtrl = pCurFrm->GetFrame().GetController();
m_pImpl->SetController(xCtrl);
if (!m_pImpl->HasSelectionChanged())
return;
- Reference< XRubySelection > xRubySel = m_pImpl->GetRubySelection();
+ Reference<XRubySelection> xRubySel = m_pImpl->GetRubySelection();
m_pImpl->UpdateRubyValues();
EnableControls(xRubySel.is());
if (xRubySel.is())
{
- Reference< XModel > xModel = m_pImpl->GetModel();
+ Reference<XModel> xModel = m_pImpl->GetModel();
const OUString sCharStyleSelect = m_xCharStyleLB->get_active_text();
ClearCharStyleList();
Reference<XStyleFamiliesSupplier> xSupplier(xModel, UNO_QUERY);
@@ -338,7 +324,6 @@ void SvxRubyDialog::Activate()
if (!sName.isEmpty())
{
m_xCharStyleLB->append(sCoreName, sName);
-
}
}
}
@@ -388,17 +373,17 @@ void SvxRubyDialog::SetRubyText(sal_Int32 nPos, weld::Entry& rLeft, weld::Entry&
void SvxRubyDialog::GetRubyText()
{
tools::Long nTempLastPos = GetLastPos();
- for (int i = 0; i < 8; i+=2)
+ for (int i = 0; i < 8; i += 2)
{
- if (aEditArr[i]->get_sensitive() &&
- (aEditArr[i]->get_value_changed_from_saved() ||
- aEditArr[i + 1]->get_value_changed_from_saved()))
+ if (aEditArr[i]->get_sensitive()
+ && (aEditArr[i]->get_value_changed_from_saved()
+ || aEditArr[i + 1]->get_value_changed_from_saved()))
{
Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues();
- DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" );
+ DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index");
SetModified(true);
Sequence<PropertyValue>& rProps = aRubyValues.getArray()[i / 2 + nTempLastPos];
- for (PropertyValue & propVal : rProps)
+ for (PropertyValue& propVal : rProps)
{
if (propVal.Name == cRubyBaseText)
propVal.Value <<= aEditArr[i]->get_text();
@@ -427,7 +412,7 @@ void SvxRubyDialog::Update()
bool bCharStyleEqual = true;
for (sal_Int32 nRuby = 0; nRuby < nLen; nRuby++)
{
- const Sequence<PropertyValue> &rProps = aRubyValues.getConstArray()[nRuby];
+ const Sequence<PropertyValue>& rProps = aRubyValues.getConstArray()[nRuby];
for (const PropertyValue& rProp : rProps)
{
if (nAdjust > -2 && rProp.Name == cRubyAdjust)
@@ -436,16 +421,16 @@ void SvxRubyDialog::Update()
rProp.Value >>= nTmp;
if (!nRuby)
nAdjust = nTmp;
- else if(nAdjust != nTmp)
+ else if (nAdjust != nTmp)
nAdjust = -2;
}
- if (nPosition > -2 && rProp.Name == cRubyPosition )
+ if (nPosition > -2 && rProp.Name == cRubyPosition)
{
sal_Int16 nTmp = sal_Int16();
rProp.Value >>= nTmp;
if (!nRuby)
nPosition = nTmp;
- else if(nPosition != nTmp)
+ else if (nPosition != nTmp)
nPosition = -2;
}
if (bCharStyleEqual && rProp.Name == cRubyCharStyleName)
@@ -539,16 +524,14 @@ IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl, weld::Button&, void)
}
}
-IMPL_LINK_NOARG(SvxRubyDialog, CloseHdl_Impl, weld::Button&, void)
-{
- Close();
-}
+IMPL_LINK_NOARG(SvxRubyDialog, CloseHdl_Impl, weld::Button&, void) { Close(); }
IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl, weld::Button&, void)
{
std::unique_ptr<SfxPoolItem> pState;
SfxItemState eState = pBindings->QueryState(SID_STYLE_DESIGNER, pState);
- if (eState <= SfxItemState::SET || !pState || !static_cast<SfxBoolItem*>(pState.get())->GetValue())
+ if (eState <= SfxItemState::SET || !pState
+ || !static_cast<SfxBoolItem*>(pState.get())->GetValue())
{
pBindings->GetDispatcher()->Execute(SID_STYLE_DESIGNER,
SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
@@ -560,9 +543,9 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, weld::ComboBox&, rBox, void)
AssertOneEntry();
sal_Int16 nAdjust = rBox.get_active();
Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues();
- for (PropertyValues & rProps : aRubyValues)
+ for (PropertyValues& rProps : aRubyValues)
{
- for (PropertyValue & propVal : rProps)
+ for (PropertyValue& propVal : rProps)
{
if (propVal.Name == cRubyAdjust)
propVal.Value <<= nAdjust;
@@ -577,9 +560,9 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, weld::ComboBox&, rBox, void)
AssertOneEntry();
sal_Int16 nPosition = rBox.get_active();
Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues();
- for (PropertyValues & rProps : aRubyValues)
+ for (PropertyValues& rProps : aRubyValues)
{
- for (PropertyValue & propVal : rProps)
+ for (PropertyValue& propVal : rProps)
{
if (propVal.Name == cRubyPosition)
propVal.Value <<= nPosition;
@@ -596,9 +579,9 @@ IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl, weld::ComboBox&, void)
if (m_xCharStyleLB->get_active() != -1)
sStyleName = m_xCharStyleLB->get_active_id();
Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues();
- for (PropertyValues & rProps : aRubyValues)
+ for (PropertyValues& rProps : aRubyValues)
{
- for (PropertyValue & propVal : rProps)
+ for (PropertyValue& propVal : rProps)
{
if (propVal.Name == cRubyCharStyleName)
{
@@ -631,18 +614,21 @@ bool SvxRubyDialog::EditScrollHdl_Impl(sal_Int32 nParam)
{
bool bRet = false;
//scroll forward
- if (nParam > 0 && (aEditArr[7]->has_focus() || aEditArr[6]->has_focus() ))
+ if (nParam > 0 && (aEditArr[7]->has_focus() || aEditArr[6]->has_focus()))
{
- if (m_xScrolledWindow->vadjustment_get_upper() >
- m_xScrolledWindow->vadjustment_get_value() + m_xScrolledWindow->vadjustment_get_page_size())
+ if (m_xScrolledWindow->vadjustment_get_upper()
+ > m_xScrolledWindow->vadjustment_get_value()
+ + m_xScrolledWindow->vadjustment_get_page_size())
{
- m_xScrolledWindow->vadjustment_set_value(m_xScrolledWindow->vadjustment_get_value() + 1);
+ m_xScrolledWindow->vadjustment_set_value(m_xScrolledWindow->vadjustment_get_value()
+ + 1);
aEditArr[6]->grab_focus();
bRet = true;
}
}
//scroll backward
- else if (m_xScrolledWindow->vadjustment_get_value() && (aEditArr[0]->has_focus()||aEditArr[1]->has_focus()) )
+ else if (m_xScrolledWindow->vadjustment_get_value()
+ && (aEditArr[0]->has_focus() || aEditArr[1]->has_focus()))
{
m_xScrolledWindow->vadjustment_set_value(m_xScrolledWindow->vadjustment_get_value() - 1);
aEditArr[1]->grab_focus();
@@ -659,7 +645,7 @@ bool SvxRubyDialog::EditJumpHdl_Impl(sal_Int32 nParam)
sal_uInt16 nIndex = USHRT_MAX;
for (sal_uInt16 i = 0; i < 8; i++)
{
- if(aEditArr[i]->has_focus())
+ if (aEditArr[i]->has_focus())
nIndex = i;
}
if (nIndex < 8)
@@ -668,14 +654,14 @@ bool SvxRubyDialog::EditJumpHdl_Impl(sal_Int32 nParam)
{
if (nIndex < 6)
aEditArr[nIndex + 2]->grab_focus();
- else if( EditScrollHdl_Impl(nParam))
+ else if (EditScrollHdl_Impl(nParam))
aEditArr[nIndex]->grab_focus();
}
else
{
if (nIndex > 1)
aEditArr[nIndex - 2]->grab_focus();
- else if( EditScrollHdl_Impl(nParam))
+ else if (EditScrollHdl_Impl(nParam))
aEditArr[nIndex]->grab_focus();
}
bHandled = true;
@@ -683,10 +669,7 @@ bool SvxRubyDialog::EditJumpHdl_Impl(sal_Int32 nParam)
return bHandled;
}
-void SvxRubyDialog::AssertOneEntry()
-{
- m_pImpl->AssertOneEntry();
-}
+void SvxRubyDialog::AssertOneEntry() { m_pImpl->AssertOneEntry(); }
void SvxRubyDialog::EnableControls(bool bEnable)
{
@@ -699,9 +682,7 @@ RubyPreview::RubyPreview()
{
}
-RubyPreview::~RubyPreview()
-{
-}
+RubyPreview::~RubyPreview() {}
void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/)
{
@@ -749,7 +730,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
bool bRubyStretch = nBaseWidth >= nRubyWidth;
tools::Long nCenter = aWinSize.Width() / 2;
- tools::Long nHalfWidth = std::max( nBaseWidth, nRubyWidth ) /2;
+ tools::Long nHalfWidth = std::max(nBaseWidth, nRubyWidth) / 2;
tools::Long nLeftStart = nCenter - nHalfWidth;
tools::Long nRightEnd = nCenter + nHalfWidth;
@@ -758,17 +739,17 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
tools::Long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2;
sal_Int16 nRubyPos = m_pParentDlg->m_xPositionLB->get_active();
- if ( nRubyPos == 1 ) // BOTTOM
+ if (nRubyPos == 1) // BOTTOM
{
tools::Long nTmp = nYRuby;
nYRuby = nYBase;
nYBase = nTmp;
}
- else if ( nRubyPos == 2 ) // RIGHT ( vertically )
+ else if (nRubyPos == 2) // RIGHT ( vertically )
{
// Align the ruby text and base text to the vertical center.
- nYBase = ( aWinSize.Height() - nTextHeight ) / 2;
- nYRuby = ( aWinSize.Height() - nRubyWidth ) / 2;
+ nYBase = (aWinSize.Height() - nTextHeight) / 2;
+ nYRuby = (aWinSize.Height() - nRubyWidth) / 2;
// Align the ruby text at the right side of the base text
nAdjust = RubyAdjust_RIGHT;
@@ -788,7 +769,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
if (bRubyStretch)
{
- rRenderContext.DrawText(Point(nLeftStart , nYBase), sBaseText);
+ rRenderContext.DrawText(Point(nLeftStart, nYBase), sBaseText);
nYOutput = nYRuby;
sOutputText = sRubyText;
nOutTextWidth = nRubyWidth;
@@ -797,7 +778,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
else
{
rRenderContext.SetFont(aRubyFont);
- rRenderContext.DrawText(Point(nLeftStart , nYRuby), sRubyText);
+ rRenderContext.DrawText(Point(nLeftStart, nYRuby), sRubyText);
nYOutput = nYBase;
sOutputText = sBaseText;
nOutTextWidth = nBaseWidth;
@@ -807,11 +788,11 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
switch (nAdjust)
{
case RubyAdjust_LEFT:
- rRenderContext.DrawText(Point(nLeftStart , nYOutput), sOutputText);
- break;
+ rRenderContext.DrawText(Point(nLeftStart, nYOutput), sOutputText);
+ break;
case RubyAdjust_RIGHT:
rRenderContext.DrawText(Point(nRightEnd - nOutTextWidth, nYOutput), sOutputText);
- break;
+ break;
case RubyAdjust_INDENT_BLOCK:
{
tools::Long nCharWidth = rRenderContext.GetTextWidth("X");
@@ -828,11 +809,13 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
if (sOutputText.getLength() > 1)
{
sal_Int32 nCount = sOutputText.getLength();
- tools::Long nSpace = ((nRightEnd - nLeftStart) - rRenderContext.GetTextWidth(sOutputText)) / (nCount - 1);
+ tools::Long nSpace
+ = ((nRightEnd - nLeftStart) - rRenderContext.GetTextWidth(sOutputText))
+ / (nCount - 1);
for (sal_Int32 i = 0; i < nCount; i++)
{
OUString sChar(sOutputText[i]);
- rRenderContext.DrawText(Point(nLeftStart , nYOutput), sChar);
+ rRenderContext.DrawText(Point(nLeftStart, nYOutput), sChar);
tools::Long nCharWidth = rRenderContext.GetTextWidth(sChar);
nLeftStart += nCharWidth + nSpace;
}
@@ -841,9 +824,10 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
[[fallthrough]];
}
case RubyAdjust_CENTER:
- rRenderContext.DrawText(Point(nCenter - nOutTextWidth / 2 , nYOutput), sOutputText);
- break;
- default: break;
+ rRenderContext.DrawText(Point(nCenter - nOutTextWidth / 2, nYOutput), sOutputText);
+ break;
+ default:
+ break;
}
rRenderContext.Pop();
}
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index 96fe59b66e22..ec220a52fb8f 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -24,16 +24,15 @@ class SvxSearchDialog;
class SvxSearchController : public SfxControllerItem
{
- SvxSearchDialog& rSrchDlg;
+ SvxSearchDialog& rSrchDlg;
protected:
- virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ) override;
+ virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState) override;
public:
- SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
+ SvxSearchController(sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index 2742c3f9584e..33564245230f 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -24,10 +24,7 @@
#include <fieldunit.hrc>
#include <numberingtype.hrc>
-sal_uInt32 SvxFieldUnitTable::Count()
-{
- return SAL_N_ELEMENTS(RID_SVXSTR_FIELDUNIT_TABLE);
-}
+sal_uInt32 SvxFieldUnitTable::Count() { return SAL_N_ELEMENTS(RID_SVXSTR_FIELDUNIT_TABLE); }
OUString SvxFieldUnitTable::GetString(sal_uInt32 nPos)
{
@@ -50,10 +47,7 @@ OUString SvxAttrNameTable::GetString(sal_uInt32 nPos)
return OUString();
}
-sal_uInt32 SvxAttrNameTable::Count()
-{
- return SAL_N_ELEMENTS(RID_ATTR_NAMES);
-}
+sal_uInt32 SvxAttrNameTable::Count() { return SAL_N_ELEMENTS(RID_ATTR_NAMES); }
sal_uInt32 SvxAttrNameTable::FindIndex(int nValue)
{
@@ -72,10 +66,7 @@ OUString SvxNumberingTypeTable::GetString(sal_uInt32 nPos)
return OUString();
}
-sal_uInt32 SvxNumberingTypeTable::Count()
-{
- return SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE);
-}
+sal_uInt32 SvxNumberingTypeTable::Count() { return SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE); }
int SvxNumberingTypeTable::GetValue(sal_uInt32 nPos)
{
@@ -94,5 +85,4 @@ sal_uInt32 SvxNumberingTypeTable::FindIndex(int nValue)
return RESARRAY_INDEX_NOTFOUND;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx
index 152811ed867d..c073fb241f89 100644
--- a/svx/source/dialog/svxdlg.cxx
+++ b/svx/source/dialog/svxdlg.cxx
@@ -17,16 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svx/svxdlg.hxx>
SvxAbstractDialogFactory* SvxAbstractDialogFactory::Create()
{
- return dynamic_cast< SvxAbstractDialogFactory* >( VclAbstractDialogFactory::Create() );
+ return dynamic_cast<SvxAbstractDialogFactory*>(VclAbstractDialogFactory::Create());
}
-SvxAbstractDialogFactory::~SvxAbstractDialogFactory()
-{
-}
+SvxAbstractDialogFactory::~SvxAbstractDialogFactory() {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index abb7b39910f8..30a1b09fb36e 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -20,9 +20,9 @@
#include <svx/camera3d.hxx>
Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
- double fFocalLen) :
- fBankAngle(0),
- bAutoAdjustProjection(true)
+ double fFocalLen)
+ : fBankAngle(0)
+ , bAutoAdjustProjection(true)
{
SetPosition(rPos);
SetLookAt(rLookAt);
@@ -41,13 +41,13 @@ Camera3D::Camera3D()
void Camera3D::SetViewWindow(double fX, double fY, double fW, double fH)
{
Viewport3D::SetViewWindow(fX, fY, fW, fH);
- if ( bAutoAdjustProjection )
+ if (bAutoAdjustProjection)
SetFocalLength(fFocalLength);
}
void Camera3D::SetPosition(const basegfx::B3DPoint& rNewPos)
{
- if ( rNewPos != aPosition )
+ if (rNewPos != aPosition)
{
aPosition = rNewPos;
SetVRP(aPosition);
@@ -58,7 +58,7 @@ void Camera3D::SetPosition(const basegfx::B3DPoint& rNewPos)
void Camera3D::SetLookAt(const basegfx::B3DPoint& rNewLookAt)
{
- if ( rNewLookAt != aLookAt )
+ if (rNewLookAt != aLookAt)
{
aLookAt = rNewLookAt;
SetVPN(aPosition - aLookAt);
@@ -69,7 +69,7 @@ void Camera3D::SetLookAt(const basegfx::B3DPoint& rNewLookAt)
void Camera3D::SetPosAndLookAt(const basegfx::B3DPoint& rNewPos,
const basegfx::B3DPoint& rNewLookAt)
{
- if ( rNewPos != aPosition || rNewLookAt != aLookAt )
+ if (rNewPos != aPosition || rNewLookAt != aLookAt)
{
aPosition = rNewPos;
aLookAt = rNewLookAt;
@@ -86,15 +86,15 @@ void Camera3D::SetBankAngle(double fAngle)
basegfx::B3DVector aPrj(aDiff);
fBankAngle = fAngle;
- if ( aDiff.getY() == 0 )
+ if (aDiff.getY() == 0)
{
aPrj.setY(-1.0);
}
else
- { // aPrj = Projection from aDiff on the XZ-plane
+ { // aPrj = Projection from aDiff on the XZ-plane
aPrj.setY(0.0);
- if ( aDiff.getY() < 0.0 )
+ if (aDiff.getY() < 0.0)
{
aPrj = -aPrj;
}
@@ -110,7 +110,7 @@ void Camera3D::SetBankAngle(double fAngle)
basegfx::B3DHomMatrix aTf;
const double fV(sqrt(aDiff.getY() * aDiff.getY() + aDiff.getZ() * aDiff.getZ()));
- if ( fV != 0.0 )
+ if (fV != 0.0)
{
basegfx::B3DHomMatrix aTemp;
const double fSin(aDiff.getY() / fV);
@@ -152,7 +152,7 @@ void Camera3D::SetBankAngle(double fAngle)
aTf *= aTemp;
}
- if ( fV != 0.0 )
+ if (fV != 0.0)
{
basegfx::B3DHomMatrix aTemp;
const double fSin(-aDiff.getY() / fV);
@@ -171,7 +171,7 @@ void Camera3D::SetBankAngle(double fAngle)
void Camera3D::SetFocalLength(double fLen)
{
- if ( fLen < 5 )
+ if (fLen < 5)
fLen = 5;
SetPRP(basegfx::B3DPoint(0.0, 0.0, fLen / 35.0 * aViewWin.W));
fFocalLength = fLen;
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index 76589032bca6..89342e67601d 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -17,15 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svx/deflt3d.hxx>
// Class to manage the 3D default attributes
-E3dDefaultAttributes::E3dDefaultAttributes()
-{
- Reset();
-}
+E3dDefaultAttributes::E3dDefaultAttributes() { Reset(); }
void E3dDefaultAttributes::Reset()
{
diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx
index 15da40d099be..392ba49f64e6 100644
--- a/svx/source/engine3d/helperminimaldepth3d.hxx
+++ b/svx/source/engine3d/helperminimaldepth3d.hxx
@@ -20,12 +20,10 @@
#ifndef INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX
#define INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX
-
// predefines
class E3dCompoundObject;
-
/** support extracting the minimal depth of a 3d object in its scene
@param rObject
@@ -42,7 +40,6 @@ class E3dCompoundObject;
double getMinimalDepthInViewCoordinates(const E3dCompoundObject& rObject);
-
#endif // INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 5d2d290b3821..2a14e7efdd2f 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -30,11 +30,9 @@ std::unique_ptr<sdr::contact::ViewContact> E3dPolygonObj::CreateObjectSpecificVi
return std::make_unique<sdr::contact::ViewContactOfE3dPolygon>(*this);
}
-E3dPolygonObj::E3dPolygonObj(
- SdrModel& rSdrModel,
- const basegfx::B3DPolyPolygon& rPolyPoly3D)
-: E3dCompoundObject(rSdrModel),
- bLineOnly(true)
+E3dPolygonObj::E3dPolygonObj(SdrModel& rSdrModel, const basegfx::B3DPolyPolygon& rPolyPoly3D)
+ : E3dCompoundObject(rSdrModel)
+ , bLineOnly(true)
{
// Set geometry
SetPolyPolygon3D(rPolyPoly3D);
@@ -47,8 +45,8 @@ E3dPolygonObj::E3dPolygonObj(
}
E3dPolygonObj::E3dPolygonObj(SdrModel& rSdrModel)
-: E3dCompoundObject(rSdrModel),
- bLineOnly(false)
+ : E3dCompoundObject(rSdrModel)
+ , bLineOnly(false)
{
// Create no geometry
}
@@ -58,7 +56,7 @@ void E3dPolygonObj::CreateDefaultNormals()
basegfx::B3DPolyPolygon aPolyNormals;
// Create a complete tools::PolyPolygon with the plane normal
- for(sal_uInt32 a(0); a < aPolyPoly3D.count(); a++)
+ for (sal_uInt32 a(0); a < aPolyPoly3D.count(); a++)
{
// Find source polygon
const basegfx::B3DPolygon aPolygon(aPolyPoly3D.getB3DPolygon(a));
@@ -70,7 +68,7 @@ void E3dPolygonObj::CreateDefaultNormals()
basegfx::B3DVector aNormal(-aPolygon.getNormal());
// Fill new polygon
- for(sal_uInt32 b(0); b < aPolygon.count(); b++)
+ for (sal_uInt32 b(0); b < aPolygon.count(); b++)
{
aNormals.append(aNormal);
}
@@ -89,7 +87,7 @@ void E3dPolygonObj::CreateDefaultTexture()
// Create a complete tools::PolyPolygon with the texture coordinates
// The texture coordinates extend over X,Y and Z
// on the whole extreme values in the range 0.0 .. 1.0
- for(sal_uInt32 a(0); a < aPolyPoly3D.count(); a++)
+ for (sal_uInt32 a(0); a < aPolyPoly3D.count(); a++)
{
// Find source polygon
const basegfx::B3DPolygon& aPolygon(aPolyPoly3D.getB3DPolygon(a));
@@ -107,9 +105,9 @@ void E3dPolygonObj::CreateDefaultTexture()
sal_uInt16 nSourceMode = 0;
// Determine the greatest degree of freedom
- if(aNormal.getX() <= aNormal.getY() || aNormal.getX() <= aNormal.getZ())
+ if (aNormal.getX() <= aNormal.getY() || aNormal.getX() <= aNormal.getZ())
{
- if(aNormal.getY() > aNormal.getZ())
+ if (aNormal.getY() > aNormal.getZ())
{
// Y is the largest, use X,Z as mapping
nSourceMode = 1;
@@ -125,31 +123,31 @@ void E3dPolygonObj::CreateDefaultTexture()
basegfx::B2DPolygon aTexture;
// Fill new polygon
- for(sal_uInt32 b(0); b < aPolygon.count(); b++)
+ for (sal_uInt32 b(0); b < aPolygon.count(); b++)
{
basegfx::B2DPoint aTex;
const basegfx::B3DPoint aCandidate(aPolygon.getB3DPoint(b));
- switch(nSourceMode)
+ switch (nSourceMode)
{
case 0: //Source is Y,Z
- if(aVolume.getHeight())
+ if (aVolume.getHeight())
aTex.setX((aCandidate.getY() - aVolume.getMinY()) / aVolume.getHeight());
- if(aVolume.getDepth())
+ if (aVolume.getDepth())
aTex.setY((aCandidate.getZ() - aVolume.getMinZ()) / aVolume.getDepth());
break;
case 1: // Source is X,Z
- if(aVolume.getWidth())
+ if (aVolume.getWidth())
aTex.setX((aCandidate.getX() - aVolume.getMinX()) / aVolume.getWidth());
- if(aVolume.getDepth())
+ if (aVolume.getDepth())
aTex.setY((aCandidate.getZ() - aVolume.getMinZ()) / aVolume.getDepth());
break;
case 2: // Source is X,Y
- if(aVolume.getWidth())
+ if (aVolume.getWidth())
aTex.setX((aCandidate.getX() - aVolume.getMinX()) / aVolume.getWidth());
- if(aVolume.getHeight())
+ if (aVolume.getHeight())
aTex.setY((aCandidate.getY() - aVolume.getMinY()) / aVolume.getHeight());
break;
}
@@ -165,18 +163,13 @@ void E3dPolygonObj::CreateDefaultTexture()
SetPolyTexture2D(aPolyTexture);
}
-E3dPolygonObj::~E3dPolygonObj()
-{
-}
+E3dPolygonObj::~E3dPolygonObj() {}
-SdrObjKind E3dPolygonObj::GetObjIdentifier() const
-{
- return E3D_POLYGONOBJ_ID;
-}
+SdrObjKind E3dPolygonObj::GetObjIdentifier() const { return E3D_POLYGONOBJ_ID; }
void E3dPolygonObj::SetPolyPolygon3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D)
{
- if ( aPolyPoly3D != rNewPolyPoly3D )
+ if (aPolyPoly3D != rNewPolyPoly3D)
{
// New PolyPolygon; copying
aPolyPoly3D = rNewPolyPoly3D;
@@ -188,7 +181,7 @@ void E3dPolygonObj::SetPolyPolygon3D(const basegfx::B3DPolyPolygon& rNewPolyPoly
void E3dPolygonObj::SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyNormals3D)
{
- if ( aPolyNormals3D != rNewPolyNormals3D )
+ if (aPolyNormals3D != rNewPolyNormals3D)
{
// New PolyPolygon; copying
aPolyNormals3D = rNewPolyNormals3D;
@@ -200,7 +193,7 @@ void E3dPolygonObj::SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyNorm
void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyTexture2D)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list