include/LibreOfficeKit/LibreOfficeKitTypes.h | 3
include/apple_remote/RemoteMainController.h | 9
include/avmedia/avmediadllapi.h | 4
include/basegfx/basegfxdllapi.h | 1
include/basegfx/color/bcolortools.hxx | 6
include/basegfx/range/b2drectangle.hxx | 8
include/basegfx/range/b2irectangle.hxx | 8
include/basegfx/utils/zoomtools.hxx | 2
include/basegfx/vector/b2dsize.hxx | 8
include/basegfx/vector/b2isize.hxx | 8
include/basic/basicdllapi.h | 4
include/basic/basrdll.hxx | 4
include/canvas/canvastoolsdllapi.h | 4
include/codemaker/codemaker.hxx | 14
include/codemaker/generatedtypeset.hxx | 19
include/com/sun/star/uno/genfunc.h | 8
include/comphelper/anytostring.hxx | 9
include/comphelper/base64.hxx | 10
include/comphelper/comphelperdllapi.h | 4
include/comphelper/evtmethodhelper.hxx | 6
include/comphelper/extract.hxx | 22
include/comphelper/fileformat.h | 10
include/comphelper/fileurl.hxx | 7
include/comphelper/genericpropertyset.hxx | 13
include/comphelper/getexpandeduri.hxx | 18
include/comphelper/lok.hxx | 14
include/comphelper/make_shared_from_uno.hxx | 17
include/comphelper/namecontainer.hxx | 9
include/comphelper/profilezone.hxx | 16
include/comphelper/random.hxx | 1
include/comphelper/refcountedmutex.hxx | 2
include/comphelper/streamsection.hxx | 32
include/cppu/EnvDcp.hxx | 7
include/cppu/cppudllapi.h | 8
include/cppuhelper/cppuhelperdllapi.h | 4
include/cppuhelper/exc_hlp.hxx | 4
include/cppuhelper/unourl.hxx | 40 -
include/dbaccess/dbaccessdllapi.h | 4
include/desktop/dllapi.h | 8
include/desktop/exithelper.h | 3
include/desktop/minidump.hxx | 7
include/editeng/AccessibleComponentBase.hxx | 30
include/editeng/Trie.hxx | 2
include/editeng/editengdllapi.h | 4
include/editeng/editerr.hxx | 4
include/editeng/editund2.hxx | 19
include/editeng/eerdll.hxx | 6
include/editeng/fieldupdater.hxx | 7
include/editeng/frmdir.hxx | 1
include/editeng/misspellrange.hxx | 5
include/editeng/mutxhelp.hxx | 1
include/editeng/numdef.hxx | 4
include/editeng/section.hxx | 5
include/editeng/unofdesc.hxx | 24
include/filter/msfilter/svxmsbas.hxx | 16
include/formula/formuladllapi.h | 4
include/formula/funcvarargs.h | 4
include/formula/types.hxx | 9
include/framework/interaction.hxx | 43 -
include/i18nlangtag/i18nlangtagdllapi.h | 4
include/i18nutil/i18nutildllapi.h | 4
include/i18nutil/paper.hxx | 18
include/i18nutil/unicode.hxx | 33
include/jvmaccess/classpath.hxx | 26
include/jvmaccess/jvmaccessdllapi.h | 4
include/jvmaccess/unovirtualmachine.hxx | 29
include/jvmaccess/virtualmachine.hxx | 32
include/jvmfwk/framework.hxx | 46 -
include/jvmfwk/jvmfwkdllapi.hxx | 4
include/linguistic/lngdllapi.h | 4
include/linguistic/lngprops.hxx | 2
include/o3tl/deleter.hxx | 11
include/o3tl/lru_map.hxx | 21
include/o3tl/make_shared.hxx | 10
include/o3tl/runtimetooustring.hxx | 17
include/onlineupdate/mozilla/Likely.h | 8
include/oox/mathml/importutils.hxx | 84 +-
include/oox/token/namespacemap.hxx | 18
include/oox/token/propertynames.hxx | 15
include/oox/token/relationship.hxx | 5
include/opencl/OpenCLZone.hxx | 4
include/opencl/opencldllapi.h | 4
include/osl/detail/file.h | 6
include/osl/getglobalmutex.hxx | 10
include/osl/pipe_decl.hxx | 36 -
include/package/packagedllapi.hxx | 4
include/prewin.h | 10
include/registry/refltype.hxx | 4
include/registry/regdllapi.h | 4
include/registry/regtype.h | 16
include/registry/types.hxx | 47 -
include/rtl/character.hxx | 122 ++-
include/sal/alloca.h | 9
include/sal/backtrace.hxx | 13
include/sal/config.h | 13
include/sal/saldllapi.h | 4
include/salhelper/salhelperdllapi.h | 4
include/salhelper/thread.hxx | 21
include/sfx2/QuerySaveDocument.hxx | 8
include/sfx2/brokenpackageint.hxx | 25
include/sfx2/charmappopup.hxx | 4
include/sfx2/classificationhelper.hxx | 72 --
include/sfx2/dialoghelper.hxx | 5
include/sfx2/emojipopup.hxx | 4
include/sfx2/flatpak.hxx | 7
include/sfx2/frmhtml.hxx | 5
include/sfx2/groupid.hxx | 12
include/sfx2/htmlmode.hxx | 3
include/sfx2/inputdlg.hxx | 2
include/sfx2/mieclip.hxx | 5
include/sfx2/newstyle.hxx | 7
include/sfx2/notebookbar/SfxNotebookBar.hxx | 21
include/sfx2/safemode.hxx | 5
include/sfx2/sidebar/AsynchronousCall.hxx | 8
include/sfx2/sidebar/Context.hxx | 14
include/sfx2/sidebar/Deck.hxx | 31
include/sfx2/sidebar/IContextChangeReceiver.hxx | 15
include/sfx2/sidebar/ILayoutableWindow.hxx | 8
include/sfx2/sidebar/Panel.hxx | 48 -
include/sfx2/sidebar/SidebarModelUpdate.hxx | 15
include/sfx2/signaturestate.hxx | 14
include/sfx2/templatedlg.hxx | 68 --
include/sfx2/templateproperties.hxx | 4
include/sot/filelist.hxx | 2
include/sot/object.hxx | 4
include/sot/sotdllapi.h | 4
include/sot/storinfo.hxx | 13
include/store/storedllapi.h | 4
include/svl/IndexedStyleSheets.hxx | 59 -
include/svl/cjkoptions.hxx | 11
include/svl/converter.hxx | 1
include/svl/currencytable.hxx | 4
include/svl/gridprinter.hxx | 11
include/svl/inettype.hxx | 16
include/svl/itemiter.hxx | 11
include/svl/outstrm.hxx | 14
include/svl/sharedstringpool.hxx | 13
include/svl/stylesheetuser.hxx | 3
include/svl/svldllapi.h | 4
include/svl/whiter.hxx | 12
include/svtools/PlaceEditDialog.hxx | 26
include/svtools/collatorres.hxx | 3
include/svtools/htmlkywd.hxx | 7
include/svtools/imgdef.hxx | 8
include/svtools/indexentryres.hxx | 7
include/svtools/menuoptions.hxx | 92 +-
include/svtools/popupwindowcontroller.hxx | 28
include/svtools/sampletext.hxx | 15
include/svtools/svtdllapi.h | 4
include/svx/AccessibleTextHelper.hxx | 602 +++++++++---------
include/svx/ChildrenManager.hxx | 52 -
include/svx/ClassificationDialog.hxx | 24
include/svx/EnhancedCustomShapeTypeNames.hxx | 6
include/svx/IAccessibleViewForwarder.hxx | 19
include/svx/IAccessibleViewForwarderListener.hxx | 6
include/svx/ParaLineSpacingPopup.hxx | 13
include/svx/ParaSpacingControl.hxx | 31
include/svx/SpellDialogChildWindow.hxx | 28
include/svx/SvxShapeTypes.hxx | 4
include/svx/TextCharacterSpacingPopup.hxx | 8
include/svx/TextUnderlinePopup.hxx | 9
include/svx/UnoNamespaceMap.hxx | 8
include/svx/XPropertyEntry.hxx | 10
include/svx/camera3d.hxx | 17
include/svx/clipfmtitem.hxx | 22
include/svx/colorbox.hxx | 27
include/svx/def3d.hxx | 10
include/svx/dlgutil.hxx | 8
include/svx/e3dsceneupdater.hxx | 9
include/svx/extrusionbar.hxx | 8
include/svx/f3dchild.hxx | 6
include/svx/fmdmod.hxx | 8
include/svx/fmobjfac.hxx | 4
include/svx/fontworkbar.hxx | 8
include/svx/frmdirlbox.hxx | 21
include/svx/insctrl.hxx | 10
include/svx/ipolypolygoneditorcontroller.hxx | 21
include/svx/itemwin.hxx | 12
include/svx/layctrl.hxx | 8
include/svx/lboxctrl.hxx | 8
include/svx/measctrl.hxx | 3
include/svx/modctrl.hxx | 12
include/svx/nbdtmgfact.hxx | 5
include/svx/objfac3d.hxx | 2
include/svx/papersizelistbox.hxx | 6
include/svx/rectenum.hxx | 2
include/svx/samecontentlistbox.hxx | 2
include/svx/sderitm.hxx | 3
include/svx/sdr/contact/viewcontact.hxx | 30
include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 30
include/svx/sdr/contact/viewcontactofvirtobj.hxx | 8
include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx | 5
include/svx/sdr/table/tabledesign.hxx | 8
include/svx/sdrundomanager.hxx | 9
include/svx/sdshcitm.hxx | 3
include/svx/sdshitm.hxx | 3
include/svx/sdshtitm.hxx | 3
include/svx/sdsxyitm.hxx | 6
include/svx/sdtagitm.hxx | 6
include/svx/sdtcfitm.hxx | 3
include/svx/sdtditm.hxx | 12
include/svx/sdtmfitm.hxx | 12
include/svx/selctrl.hxx | 14
include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 8
include/svx/sidebar/LinePropertyPanelBase.hxx | 18
include/svx/sidebar/LineWidthPopup.hxx | 10
include/svx/sidebar/ValueSetWithTextControl.hxx | 12
include/svx/spacinglistbox.hxx | 10
include/svx/svdogrp.hxx | 11
include/svx/svdovirt.hxx | 26
include/svx/svdtext.hxx | 14
include/svx/svdtypes.hxx | 17
include/svx/svxdllapi.h | 4
include/svx/swframetypes.hxx | 14
include/svx/sxcgitm.hxx | 8
include/svx/sxciaitm.hxx | 6
include/svx/sxelditm.hxx | 17
include/svx/sxmlhitm.hxx | 15
include/svx/tabline.hxx | 8
include/svx/verttexttbxctrl.hxx | 12
include/svx/xftshcit.hxx | 6
include/svx/xpool.hxx | 5
include/svx/zoom_def.hxx | 8
include/svx/zoomctrl.hxx | 17
include/systools/win32/qswin32.h | 6
include/systools/win32/uwinapi.h | 8
include/test/bootstrapfixture.hxx | 21
include/test/container/xnamed.hxx | 9
include/test/htmltesttools.hxx | 2
include/test/screenshot_test.hxx | 8
include/test/sheet/cellproperties.hxx | 7
include/test/sheet/databaserange.hxx | 7
include/test/sheet/datapilotfield.hxx | 7
include/test/sheet/datapilotitem.hxx | 7
include/test/sheet/xarealink.hxx | 9
include/test/sheet/xcelladdressable.hxx | 9
include/test/sheet/xcellrangedata.hxx | 9
include/test/sheet/xcellrangereferrer.hxx | 9
include/test/sheet/xcellrangesquery.hxx | 7
include/test/sheet/xdatabaserange.hxx | 7
include/test/sheet/xgoalseek.hxx | 7
include/test/sheet/xnamedrange.hxx | 9
include/test/sheet/xsheetannotation.hxx | 10
include/test/sheet/xsheetlinkable.hxx | 10
include/test/sheet/xsheetoperation.hxx | 8
include/test/sheet/xsheetoutline.hxx | 7
include/test/sheet/xsheetpagebreak.hxx | 7
include/test/sheet/xspreadsheet.hxx | 9
include/test/sheet/xspreadsheets.hxx | 9
include/test/sheet/xsubtotalcalculatable.hxx | 9
include/test/sheet/xsubtotaldescriptor.hxx | 7
include/test/sheet/xsubtotalfield.hxx | 7
include/test/sheet/xusedareacursor.hxx | 11
include/test/sheet/xviewfreezable.hxx | 9
include/test/sheet/xviewpane.hxx | 8
include/test/text/xtext.hxx | 5
include/test/unoapi_test.hxx | 3
include/toolkit/helper/emptyfontdescriptor.hxx | 2
include/toolkit/helper/mutexhelper.hxx | 5
include/tools/contnr.hxx | 4
include/tools/datetimeutils.hxx | 6
include/tools/extendapplicationenvironment.hxx | 5
include/tools/pathutils.hxx | 12
include/tools/svlibrary.h | 2
include/tools/tenccvt.hxx | 10
include/tools/toolsdllapi.h | 4
include/typelib/typeclass.h | 3
include/typelib/uik.h | 16
include/ucbhelper/activedatasink.hxx | 13
include/ucbhelper/commandenvironment.hxx | 21
include/ucbhelper/content.hxx | 237 ++-----
include/ucbhelper/contentidentifier.hxx | 15
include/ucbhelper/simpleinteractionrequest.hxx | 22
include/ucbhelper/simplenameclashresolverequest.hxx | 14
include/ucbhelper/ucbhelperdllapi.h | 4
include/uno/lbnames.h | 2
include/unoidl/detail/dllapi.hxx | 1
include/unotest/directories.hxx | 14
include/unotest/macros_test.hxx | 17
include/unotools/accessiblerelationsethelper.hxx | 29
include/unotools/accessiblestatesethelper.hxx | 30
include/unotools/caserotate.hxx | 4
include/unotools/cmdoptions.hxx | 117 +--
include/unotools/defaultoptions.hxx | 3
include/unotools/docinfohelper.hxx | 3
include/unotools/progresshandlerwrap.hxx | 19
include/unotools/unotoolsdllapi.h | 4
include/vbahelper/vbadllapi.h | 4
include/vcl/IContext.hxx | 8
include/vcl/IconThemeInfo.hxx | 16
include/vcl/NotebookbarContextControl.hxx | 2
include/vcl/dllapi.h | 2
include/vcl/exceptiontypes.hxx | 7
include/vcl/extoutdevdata.hxx | 3
include/vcl/gdimetafiletools.hxx | 3
include/vcl/introwin.hxx | 5
include/vcl/keycodes.hxx | 47 -
include/vcl/mtfxmldump.hxx | 5
include/vcl/opengl/OpenGLWrapper.hxx | 5
include/vcl/pngread.hxx | 2
include/vcl/sound.hxx | 3
include/vcl/uitest/factory.hxx | 5
include/vcl/vclmain.hxx | 4
include/vcl/wmfexternal.hxx | 9
include/xmloff/SchXMLExportHelper.hxx | 11
include/xmloff/XMLGraphicsDefaultStyle.hxx | 9
include/xmloff/XMLTextMasterStylesContext.hxx | 12
include/xmloff/animexp.hxx | 16
include/xmloff/odffields.hxx | 1
include/xmloff/prhdlfac.hxx | 14
include/xmlreader/pad.hxx | 18
include/xmlscript/xmlscriptdllapi.h | 4
solenv/clang-format/excludelist | 312 ---------
313 files changed, 2345 insertions(+), 2632 deletions(-)
New commits:
commit 01baeab99890e5650b3dabc15f8d900490a5a133
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 13:03:16 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sat Nov 21 13:19:17 2020 +0100
tdf#123936 Formatting files in module include with clang-format
Change-Id: I0507dd797cd5a35e0ae14f4b69ee4e172d08a71a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105681
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/include/LibreOfficeKit/LibreOfficeKitTypes.h
b/include/LibreOfficeKit/LibreOfficeKitTypes.h
index e12ddad19161..5f4e3d4d870f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitTypes.h
+++ b/include/LibreOfficeKit/LibreOfficeKitTypes.h
@@ -13,8 +13,7 @@
#include <stddef.h>
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
/** @see lok::Office::registerCallback().
diff --git a/include/apple_remote/RemoteMainController.h
b/include/apple_remote/RemoteMainController.h
index c4ee0ac6ed74..3d1951d31bde 100644
--- a/include/apple_remote/RemoteMainController.h
+++ b/include/apple_remote/RemoteMainController.h
@@ -42,15 +42,16 @@
//static void sendTheEvent( unichar, int );
-SAL_DLLPUBLIC_EXPORT @interface AppleRemoteMainController : NSObject {
+SAL_DLLPUBLIC_EXPORT @interface AppleRemoteMainController : NSObject
+{
@public // else remoteControl is not reachable from
GetSalData()->mpMainController
RemoteControl* remoteControl;
@private
MultiClickRemoteBehavior* remoteControlBehavior;
}
-- (RemoteControl*) remoteControl;
-- (MultiClickRemoteBehavior*) remoteBehavior;
+- (RemoteControl*)remoteControl;
+- (MultiClickRemoteBehavior*)remoteBehavior;
@end
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/avmedia/avmediadllapi.h b/include/avmedia/avmediadllapi.h
index cca250a6e56b..abe4fb48c844 100644
--- a/include/avmedia/avmediadllapi.h
+++ b/include/avmedia/avmediadllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(AVMEDIA_DLLIMPLEMENTATION)
-#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/basegfx/basegfxdllapi.h b/include/basegfx/basegfxdllapi.h
index 2aadbc3a4219..b1ef1709bc5e 100644
--- a/include/basegfx/basegfxdllapi.h
+++ b/include/basegfx/basegfxdllapi.h
@@ -40,5 +40,4 @@
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/color/bcolortools.hxx
b/include/basegfx/color/bcolortools.hxx
index 5c16802cff4a..8af2b7c94715 100644
--- a/include/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
@@ -21,11 +21,13 @@
#include <basegfx/basegfxdllapi.h>
-namespace basegfx { class BColor; }
+namespace basegfx
+{
+class BColor;
+}
namespace basegfx::utils
{
-
/// Transform from RGB to HSL
BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor);
/// Transform from HSL to RGB
diff --git a/include/basegfx/range/b2drectangle.hxx
b/include/basegfx/range/b2drectangle.hxx
index 9c1ad86c0f9e..ad8744b5dd5d 100644
--- a/include/basegfx/range/b2drectangle.hxx
+++ b/include/basegfx/range/b2drectangle.hxx
@@ -23,11 +23,11 @@
namespace basegfx
{
- // syntactic sugar: a B2DRange exactly models a Rectangle, thus,
- // for interface clarity, we provide an alias name
+// syntactic sugar: a B2DRange exactly models a Rectangle, thus,
+// for interface clarity, we provide an alias name
- /// Alias name for interface clarity (not everybody is aware of the
identity)
- typedef B2DRange B2DRectangle;
+/// Alias name for interface clarity (not everybody is aware of the identity)
+typedef B2DRange B2DRectangle;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2irectangle.hxx
b/include/basegfx/range/b2irectangle.hxx
index 2c6a932a2ede..6356fa6cf0a8 100644
--- a/include/basegfx/range/b2irectangle.hxx
+++ b/include/basegfx/range/b2irectangle.hxx
@@ -23,11 +23,11 @@
namespace basegfx
{
- // syntactic sugar: a B2IRange exactly models a Rectangle, thus,
- // for interface clarity, we provide an alias name
+// syntactic sugar: a B2IRange exactly models a Rectangle, thus,
+// for interface clarity, we provide an alias name
- /// Alias name for interface clarity (not everybody is aware of the
identity)
- typedef B2IRange B2IRectangle;
+/// Alias name for interface clarity (not everybody is aware of the identity)
+typedef B2IRange B2IRectangle;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/zoomtools.hxx
b/include/basegfx/utils/zoomtools.hxx
index 4f347c3ba992..242c10e6dafc 100644
--- a/include/basegfx/utils/zoomtools.hxx
+++ b/include/basegfx/utils/zoomtools.hxx
@@ -14,12 +14,10 @@
namespace basegfx::zoomtools
{
-
/** This namespace provides functions for optimized geometric zooming
*/
BASEGFX_DLLPUBLIC tools::Long zoomOut(tools::Long nCurrent);
BASEGFX_DLLPUBLIC tools::Long zoomIn(tools::Long nCurrent);
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2dsize.hxx
b/include/basegfx/vector/b2dsize.hxx
index 6ae6de5e8045..1179126991e0 100644
--- a/include/basegfx/vector/b2dsize.hxx
+++ b/include/basegfx/vector/b2dsize.hxx
@@ -23,11 +23,11 @@
namespace basegfx
{
- // syntactic sugar: a B2DVector exactly models a Size object,
- // thus, for interface clarity, we provide an alias name
+// syntactic sugar: a B2DVector exactly models a Size object,
+// thus, for interface clarity, we provide an alias name
- /// Alias name for interface clarity (not everybody is aware of the
identity)
- typedef B2DVector B2DSize;
+/// Alias name for interface clarity (not everybody is aware of the identity)
+typedef B2DVector B2DSize;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2isize.hxx
b/include/basegfx/vector/b2isize.hxx
index 5d299f4fd8e5..926910b4827d 100644
--- a/include/basegfx/vector/b2isize.hxx
+++ b/include/basegfx/vector/b2isize.hxx
@@ -23,11 +23,11 @@
namespace basegfx
{
- // syntactic sugar: a B2IVector exactly models a Size object,
- // thus, for interface clarity, we provide an alias name
+// syntactic sugar: a B2IVector exactly models a Size object,
+// thus, for interface clarity, we provide an alias name
- /// Alias name for interface clarity (not everybody is aware of the
identity)
- typedef B2IVector B2ISize;
+/// Alias name for interface clarity (not everybody is aware of the identity)
+typedef B2IVector B2ISize;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/basicdllapi.h b/include/basic/basicdllapi.h
index 3bdd9e519f36..90b1f786166c 100644
--- a/include/basic/basicdllapi.h
+++ b/include/basic/basicdllapi.h
@@ -12,9 +12,9 @@
#include <sal/types.h>
#if defined(BASIC_DLLIMPLEMENTATION)
-#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define BASIC_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx
index 53768deb5760..2748bf3fd37c 100644
--- a/include/basic/basrdll.hxx
+++ b/include/basic/basrdll.hxx
@@ -34,8 +34,8 @@ public:
static void BasicBreak();
- static void EnableBreak( bool bEnable );
- static void SetDebugMode( bool bDebugMode );
+ static void EnableBreak(bool bEnable);
+ static void SetDebugMode(bool bDebugMode);
};
#endif // INCLUDED_BASIC_BASRDLL_HXX
diff --git a/include/canvas/canvastoolsdllapi.h
b/include/canvas/canvastoolsdllapi.h
index 1f24c1e897ed..a3748371a9e2 100644
--- a/include/canvas/canvastoolsdllapi.h
+++ b/include/canvas/canvastoolsdllapi.h
@@ -24,9 +24,9 @@
#include <sal/types.h>
#if defined(CANVASTOOLS_DLLIMPLEMENTATION)
-#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/codemaker/codemaker.hxx b/include/codemaker/codemaker.hxx
index 81e4a5e370e1..cf22b8a1f47f 100644
--- a/include/codemaker/codemaker.hxx
+++ b/include/codemaker/codemaker.hxx
@@ -22,15 +22,15 @@
#include <sal/config.h>
-namespace rtl {
- class OString;
- class OUString;
+namespace rtl
+{
+class OString;
+class OUString;
}
-namespace codemaker {
-
-rtl::OString convertString(rtl::OUString const & string);
-
+namespace codemaker
+{
+rtl::OString convertString(rtl::OUString const& string);
}
#endif // INCLUDED_CODEMAKER_CODEMAKER_HXX
diff --git a/include/codemaker/generatedtypeset.hxx
b/include/codemaker/generatedtypeset.hxx
index d82c8fb1cb20..cc2827cb9aa7 100644
--- a/include/codemaker/generatedtypeset.hxx
+++ b/include/codemaker/generatedtypeset.hxx
@@ -26,15 +26,16 @@
/// @HTML
-namespace codemaker {
-
+namespace codemaker
+{
/**
A simple class to track which types have already been processed by a code
maker.
<p>This class is not multi-thread–safe.</p>
*/
-class GeneratedTypeSet {
+class GeneratedTypeSet
+{
public:
GeneratedTypeSet() {}
@@ -45,7 +46,7 @@ public:
@param type a UNO type registry name
*/
- void add(OString const & type) { m_set.insert(type); }
+ void add(OString const& type) { m_set.insert(type); }
/**
Checks whether a given type has already been generated.
@@ -54,16 +55,14 @@ public:
@return true iff the given type has already been generated
*/
- bool contains(OString const & type) const
- { return m_set.find(type) != m_set.end(); }
+ bool contains(OString const& type) const { return m_set.find(type) !=
m_set.end(); }
private:
- GeneratedTypeSet(GeneratedTypeSet const &) = delete;
- GeneratedTypeSet& operator =(GeneratedTypeSet const &) = delete;
+ GeneratedTypeSet(GeneratedTypeSet const&) = delete;
+ GeneratedTypeSet& operator=(GeneratedTypeSet const&) = delete;
- std::unordered_set< OString > m_set;
+ std::unordered_set<OString> m_set;
};
-
}
#endif // INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX
diff --git a/include/com/sun/star/uno/genfunc.h
b/include/com/sun/star/uno/genfunc.h
index eb1b028cce4a..f9c547421119 100644
--- a/include/com/sun/star/uno/genfunc.h
+++ b/include/com/sun/star/uno/genfunc.h
@@ -31,25 +31,23 @@ namespace star
{
namespace uno
{
-
/** Function to acquire a C++ interface.
@param pCppI C++ interface pointer
*/
-inline void SAL_CALL cpp_acquire( void * pCppI );
+inline void SAL_CALL cpp_acquire(void* pCppI);
/** Function to release a C++ interface.
@param pCppI C++ interface pointer
*/
-inline void SAL_CALL cpp_release( void * pCppI );
+inline void SAL_CALL cpp_release(void* pCppI);
/** Function to query for a C++ interface.
@param pCppI C++ interface pointer
@param pType demanded interface type
@return acquired C++ interface pointer or null
*/
-inline void * SAL_CALL cpp_queryInterface( void * pCppI,
typelib_TypeDescriptionReference * pType );
-
+inline void* SAL_CALL cpp_queryInterface(void* pCppI,
typelib_TypeDescriptionReference* pType);
}
}
}
diff --git a/include/comphelper/anytostring.hxx
b/include/comphelper/anytostring.hxx
index 21afda1a6cd1..6d100221e7d8 100644
--- a/include/comphelper/anytostring.hxx
+++ b/include/comphelper/anytostring.hxx
@@ -23,11 +23,13 @@
#include <rtl/ustring.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno
+{
+class Any;
+}
namespace comphelper
{
-
/** Creates a STRING representation out of an ANY value.
@param value
@@ -35,8 +37,7 @@ namespace comphelper
@return
STRING representation of given ANY value
*/
-COMPHELPER_DLLPUBLIC OUString anyToString( css::uno::Any const & value );
-
+COMPHELPER_DLLPUBLIC OUString anyToString(css::uno::Any const& value);
}
#endif
diff --git a/include/comphelper/base64.hxx b/include/comphelper/base64.hxx
index d962aabacda0..a77ac4ebe3b2 100644
--- a/include/comphelper/base64.hxx
+++ b/include/comphelper/base64.hxx
@@ -26,10 +26,13 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
-namespace com::sun::star::uno { template <class E> class Sequence; }
-
-namespace comphelper {
+namespace com::sun::star::uno
+{
+template <class E> class Sequence;
+}
+namespace comphelper
+{
class COMPHELPER_DLLPUBLIC Base64
{
public:
@@ -47,7 +50,6 @@ public:
static sal_Int32 decodeSomeChars(css::uno::Sequence<sal_Int8>& aPass,
const OUString& sBuffer);
};
-
}
#endif // INCLUDED_COMPHELPER_BASE64_HXX
diff --git a/include/comphelper/comphelperdllapi.h
b/include/comphelper/comphelperdllapi.h
index 3416513b94eb..361326a4e406 100644
--- a/include/comphelper/comphelperdllapi.h
+++ b/include/comphelper/comphelperdllapi.h
@@ -22,9 +22,9 @@
#include <sal/types.h>
#if defined(COMPHELPER_DLLIMPLEMENTATION)
-#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define COMPHELPER_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/comphelper/evtmethodhelper.hxx
b/include/comphelper/evtmethodhelper.hxx
index 7c900a1a8324..f420b1869422 100644
--- a/include/comphelper/evtmethodhelper.hxx
+++ b/include/comphelper/evtmethodhelper.hxx
@@ -24,9 +24,9 @@
namespace comphelper
{
- COMPHELPER_DLLPUBLIC css::uno::Sequence< OUString>
getEventMethodsForType(const css::uno::Type& type);
+COMPHELPER_DLLPUBLIC css::uno::Sequence<OUString>
+getEventMethodsForType(const css::uno::Type& type);
-
-} // namespace comphelper
+} // namespace comphelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx
index 91682400d770..c8ab9c6e6e7b 100644
--- a/include/comphelper/extract.hxx
+++ b/include/comphelper/extract.hxx
@@ -30,7 +30,6 @@
namespace cppu
{
-
/**
* Sets enum from int32 value. This function does NOT check for valid enum
values!
*
@@ -38,11 +37,10 @@ namespace cppu
* @param rType enum type
* @return enum or empty any.
*/
-inline css::uno::Any int2enum(
- sal_Int32 nEnum, const css::uno::Type & rType )
+inline css::uno::Any int2enum(sal_Int32 nEnum, const css::uno::Type& rType)
{
assert(rType.getTypeClass() == css::uno::TypeClass_ENUM);
- return css::uno::Any( &nEnum, rType );
+ return css::uno::Any(&nEnum, rType);
}
/**
@@ -53,11 +51,11 @@ inline css::uno::Any int2enum(
* @retval true if enum or int value was set
* @retval false otherwise
*/
-inline bool enum2int( sal_Int32 & rnEnum, const css::uno::Any & rAny )
+inline bool enum2int(sal_Int32& rnEnum, const css::uno::Any& rAny)
{
if (rAny.getValueTypeClass() == css::uno::TypeClass_ENUM)
{
- rnEnum = * static_cast< const sal_Int32 * >( rAny.getValue() );
+ rnEnum = *static_cast<const sal_Int32*>(rAny.getValue());
return true;
}
@@ -72,15 +70,14 @@ inline bool enum2int( sal_Int32 & rnEnum, const
css::uno::Any & rAny )
* @param rAny enum or int
* @throws css::lang::IllegalArgumentException
*/
-template< typename E >
-inline void any2enum( E & eRet, const css::uno::Any & rAny )
+template <typename E> inline void any2enum(E& eRet, const css::uno::Any& rAny)
{
// check for typesafe enum
- if (! (rAny >>= eRet))
+ if (!(rAny >>= eRet))
{
// if not enum, maybe integer?
sal_Int32 nValue = 0;
- if (! (rAny >>= nValue))
+ if (!(rAny >>= nValue))
throw css::lang::IllegalArgumentException();
eRet = static_cast<E>(nValue);
@@ -94,7 +91,7 @@ inline void any2enum( E & eRet, const css::uno::Any & rAny )
*
* @throws css::lang::IllegalArgumentException
*/
-inline bool any2bool( const css::uno::Any & rAny )
+inline bool any2bool(const css::uno::Any& rAny)
{
bool b;
if (rAny >>= b)
@@ -104,12 +101,11 @@ inline bool any2bool( const css::uno::Any & rAny )
else
{
sal_Int32 nValue = 0;
- if (! (rAny >>= nValue))
+ if (!(rAny >>= nValue))
throw css::lang::IllegalArgumentException();
return nValue != 0;
}
}
-
}
#endif
diff --git a/include/comphelper/fileformat.h b/include/comphelper/fileformat.h
index fb9d8175f2e3..7eabf5829733 100644
--- a/include/comphelper/fileformat.h
+++ b/include/comphelper/fileformat.h
@@ -22,11 +22,11 @@
/* file format versions *************************************************/
-#define SOFFICE_FILEFORMAT_31 3450
-#define SOFFICE_FILEFORMAT_40 3580
-#define SOFFICE_FILEFORMAT_50 5050
-#define SOFFICE_FILEFORMAT_60 6200
-#define SOFFICE_FILEFORMAT_8 6800
+#define SOFFICE_FILEFORMAT_31 3450
+#define SOFFICE_FILEFORMAT_40 3580
+#define SOFFICE_FILEFORMAT_50 5050
+#define SOFFICE_FILEFORMAT_60 6200
+#define SOFFICE_FILEFORMAT_8 6800
#define SOFFICE_FILEFORMAT_CURRENT SOFFICE_FILEFORMAT_8
#endif
diff --git a/include/comphelper/fileurl.hxx b/include/comphelper/fileurl.hxx
index 9275d4abbfc4..27ac6b576b2e 100644
--- a/include/comphelper/fileurl.hxx
+++ b/include/comphelper/fileurl.hxx
@@ -25,11 +25,10 @@
#include <comphelper/comphelperdllapi.h>
#include <rtl/ustring.hxx>
-namespace comphelper {
-
+namespace comphelper
+{
// Return true iff url is an absolute URL of "file" scheme:
-COMPHELPER_DLLPUBLIC bool isFileUrl(OUString const & url);
-
+COMPHELPER_DLLPUBLIC bool isFileUrl(OUString const& url);
}
#endif
diff --git a/include/comphelper/genericpropertyset.hxx
b/include/comphelper/genericpropertyset.hxx
index 8f61ac14befb..2450ef04799b 100644
--- a/include/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
@@ -23,12 +23,19 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com::sun::star::beans { class XPropertySet; }
-namespace comphelper { class PropertySetInfo; }
+namespace com::sun::star::beans
+{
+class XPropertySet;
+}
+namespace comphelper
+{
+class PropertySetInfo;
+}
namespace comphelper
{
- COMPHELPER_DLLPUBLIC css::uno::Reference< css::beans::XPropertySet >
GenericPropertySet_CreateInstance( PropertySetInfo* pInfo );
+COMPHELPER_DLLPUBLIC css::uno::Reference<css::beans::XPropertySet>
+GenericPropertySet_CreateInstance(PropertySetInfo* pInfo);
}
#endif // INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
diff --git a/include/comphelper/getexpandeduri.hxx
b/include/comphelper/getexpandeduri.hxx
index 90eb101b7b2c..5b75c43d48fe 100644
--- a/include/comphelper/getexpandeduri.hxx
+++ b/include/comphelper/getexpandeduri.hxx
@@ -15,11 +15,17 @@
#include <comphelper/comphelperdllapi.h>
#include <rtl/ustring.hxx>
-namespace com::sun::star::uno { class XComponentContext; }
-namespace com::sun::star::uno { template <typename > class Reference; }
-
-namespace comphelper {
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
+namespace com::sun::star::uno
+{
+template <typename> class Reference;
+}
+namespace comphelper
+{
/**
A helper function to expand vnd.sun.star.expand URLs.
@@ -28,9 +34,7 @@ namespace comphelper {
is returned unchanged.
*/
COMPHELPER_DLLPUBLIC OUString getExpandedUri(
- css::uno::Reference<css::uno::XComponentContext> const & context,
- OUString const & uri);
-
+ css::uno::Reference<css::uno::XComponentContext> const& context, OUString
const& uri);
}
#endif
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 2391ceab3661..07b8ef6aa426 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -20,16 +20,20 @@ class LanguageTag;
namespace comphelper::LibreOfficeKit
{
-
// Functions to be called only from the LibreOfficeKit implementation in
desktop, not from other
// places in LibreOffice code.
COMPHELPER_DLLPUBLIC void setActive(bool bActive = true);
-enum class statusIndicatorCallbackType { Start, SetValue, Finish };
-
-COMPHELPER_DLLPUBLIC void setStatusIndicatorCallback(void (*callback)(void
*data, statusIndicatorCallbackType type, int percent), void *data);
+enum class statusIndicatorCallbackType
+{
+ Start,
+ SetValue,
+ Finish
+};
+COMPHELPER_DLLPUBLIC void setStatusIndicatorCallback(
+ void (*callback)(void* data, statusIndicatorCallbackType type, int
percent), void* data);
// Functions that can be called from arbitrary places in LibreOffice.
@@ -80,7 +84,6 @@ COMPHELPER_DLLPUBLIC void setCompatFlag(Compat flag);
/// Get compatibility flags
COMPHELPER_DLLPUBLIC bool isCompatFlagSet(Compat flag);
-
/// Check whether clients want viewId in visible cursor invalidation payload.
COMPHELPER_DLLPUBLIC bool isViewIdForVisCursorInvalidation();
/// Set whether clients want viewId in visible cursor invalidation payload.
@@ -104,7 +107,6 @@ COMPHELPER_DLLPUBLIC bool isAllowlistedLanguage(const
OUString& lang);
COMPHELPER_DLLPUBLIC void statusIndicatorStart();
COMPHELPER_DLLPUBLIC void statusIndicatorSetValue(int percent);
COMPHELPER_DLLPUBLIC void statusIndicatorFinish();
-
}
#endif // INCLUDED_COMPHELPER_LOK_HXX
diff --git a/include/comphelper/make_shared_from_uno.hxx
b/include/comphelper/make_shared_from_uno.hxx
index b30dde09d115..7075e300042c 100644
--- a/include/comphelper/make_shared_from_uno.hxx
+++ b/include/comphelper/make_shared_from_uno.hxx
@@ -21,13 +21,15 @@
#include <memory>
-namespace comphelper {
-
+namespace comphelper
+{
/// @internal
-namespace detail {
+namespace detail
+{
/// @internal
-template <typename T> struct ReleaseFunc {
- void operator()( T * p ) const { p->release(); }
+template <typename T> struct ReleaseFunc
+{
+ void operator()(T* p) const { p->release(); }
};
} // namespace detail
@@ -53,11 +55,10 @@ template <typename T> struct ReleaseFunc {
@param p object pointer
@return shared_ptr to object
*/
-template <typename T>
-inline std::shared_ptr<T> make_shared_from_UNO( T * p )
+template <typename T> inline std::shared_ptr<T> make_shared_from_UNO(T* p)
{
p->acquire();
- return std::shared_ptr<T>( p, detail::ReleaseFunc<T>() );
+ return std::shared_ptr<T>(p, detail::ReleaseFunc<T>());
}
} // namespace comphelper
diff --git a/include/comphelper/namecontainer.hxx
b/include/comphelper/namecontainer.hxx
index 86553e52ff6c..616b07f1a342 100644
--- a/include/comphelper/namecontainer.hxx
+++ b/include/comphelper/namecontainer.hxx
@@ -24,12 +24,15 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::container
+{
+class XNameContainer;
+}
namespace comphelper
{
- COMPHELPER_DLLPUBLIC css::uno::Reference< css::container::XNameContainer >
- NameContainer_createInstance( const css::uno::Type& aType );
+COMPHELPER_DLLPUBLIC css::uno::Reference<css::container::XNameContainer>
+NameContainer_createInstance(const css::uno::Type& aType);
}
#endif // INCLUDED_COMPHELPER_NAMECONTAINER_HXX
diff --git a/include/comphelper/profilezone.hxx
b/include/comphelper/profilezone.hxx
index 81294a4c41c6..f1276e64cd67 100644
--- a/include/comphelper/profilezone.hxx
+++ b/include/comphelper/profilezone.hxx
@@ -22,13 +22,11 @@
namespace comphelper
{
-
namespace ProfileRecording
{
-
COMPHELPER_DLLPUBLIC void startRecording(bool bRecording);
-COMPHELPER_DLLPUBLIC long long addRecording(const char * aProfileId, long long
aCreateTime);
+COMPHELPER_DLLPUBLIC long long addRecording(const char* aProfileId, long long
aCreateTime);
COMPHELPER_DLLPUBLIC css::uno::Sequence<OUString> getRecordingAndClear();
@@ -37,11 +35,12 @@ COMPHELPER_DLLPUBLIC css::uno::Sequence<OUString>
getRecordingAndClear();
class COMPHELPER_DLLPUBLIC ProfileZone
{
private:
- const char * m_sProfileId;
+ const char* m_sProfileId;
long long m_aCreateTime;
bool m_bConsole;
void startConsole();
void stopConsole();
+
public:
static std::atomic<bool> g_bRecording; // true during recording
@@ -60,10 +59,10 @@ public:
* Similar to the DEBUG macro in sal/log.hxx, don't forget to remove these
lines before
* committing.
*/
- ProfileZone(const char *sProfileId, bool bConsole = false)
- : m_sProfileId(sProfileId),
- m_aCreateTime(g_bRecording ?
ProfileRecording::addRecording(sProfileId, 0) : 0),
- m_bConsole(bConsole)
+ ProfileZone(const char* sProfileId, bool bConsole = false)
+ : m_sProfileId(sProfileId)
+ , m_aCreateTime(g_bRecording ?
ProfileRecording::addRecording(sProfileId, 0) : 0)
+ , m_bConsole(bConsole)
{
if (m_bConsole)
{
@@ -83,7 +82,6 @@ public:
} // namespace comphelper
-
#endif // INCLUDED_COMPHELPER_PROFILEZONE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/random.hxx b/include/comphelper/random.hxx
index 4eee4ff2de1f..345d57c7158d 100644
--- a/include/comphelper/random.hxx
+++ b/include/comphelper/random.hxx
@@ -14,7 +14,6 @@
namespace comphelper::rng
{
-
// These functions obey the SAL_RAND_REPEATABLE environment
// variable: If it is set, use a fixed seed.
diff --git a/include/comphelper/refcountedmutex.hxx
b/include/comphelper/refcountedmutex.hxx
index cda0c981890a..fcda72097988 100644
--- a/include/comphelper/refcountedmutex.hxx
+++ b/include/comphelper/refcountedmutex.hxx
@@ -26,10 +26,10 @@
namespace comphelper
{
-
class COMPHELPER_DLLPUBLIC RefCountedMutex final : public
salhelper::SimpleReferenceObject
{
osl::Mutex m_aMutex;
+
public:
~RefCountedMutex() override;
diff --git a/include/comphelper/streamsection.hxx
b/include/comphelper/streamsection.hxx
index c4f945966ab5..fa1fe8ac93f2 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -24,13 +24,21 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com::sun::star::io { class XDataInputStream; }
-namespace com::sun::star::io { class XDataOutputStream; }
-namespace com::sun::star::io { class XMarkableStream; }
+namespace com::sun::star::io
+{
+class XDataInputStream;
+}
+namespace com::sun::star::io
+{
+class XDataOutputStream;
+}
+namespace com::sun::star::io
+{
+class XMarkableStream;
+}
namespace comphelper
{
-
/** implements handling for compatibly reading/writing data from/into an
input/output stream.
data written in a block secured by this class should be readable by older
versions which
use the same mechanism.
@@ -38,25 +46,25 @@ namespace comphelper
class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OStreamSection
{
- css::uno::Reference< css::io::XMarkableStream > m_xMarkStream;
- css::uno::Reference< css::io::XDataInputStream > m_xInStream;
- css::uno::Reference< css::io::XDataOutputStream > m_xOutStream;
+ css::uno::Reference<css::io::XMarkableStream> m_xMarkStream;
+ css::uno::Reference<css::io::XDataInputStream> m_xInStream;
+ css::uno::Reference<css::io::XDataOutputStream> m_xOutStream;
- sal_Int32 m_nBlockStart;
- sal_Int32 m_nBlockLen;
+ sal_Int32 m_nBlockStart;
+ sal_Int32 m_nBlockLen;
public:
/** starts reading of a "skippable" section of data within the given input
stream<BR>
@param _rxInput the stream to read from. Must support the
css::io::XMarkableStream interface
*/
- OStreamSection(const css::uno::Reference< css::io::XDataInputStream >&
_rxInput);
+ OStreamSection(const css::uno::Reference<css::io::XDataInputStream>&
_rxInput);
/** starts writing of a "skippable" section of data into the given output
stream
@param _rxOutput the stream the stream to write to.
Must support the
css::io::XMarkableStream interface
*/
- OStreamSection(const css::uno::Reference< css::io::XDataOutputStream >&
_rxOutput);
+ OStreamSection(const css::uno::Reference<css::io::XDataOutputStream>&
_rxOutput);
/** dtor. <BR>If constructed for writing, the section "opened" by this
object will be "closed".<BR>
If constructed for reading, any remaining bytes 'til the end of the
section will be skipped.
@@ -64,7 +72,7 @@ public:
~OStreamSection();
};
-} // namespace comphelper
+} // namespace comphelper
#endif // INCLUDED_COMPHELPER_STREAMSECTION_HXX
diff --git a/include/cppu/EnvDcp.hxx b/include/cppu/EnvDcp.hxx
index 7f879573b42c..49f5d46ddc7c 100644
--- a/include/cppu/EnvDcp.hxx
+++ b/include/cppu/EnvDcp.hxx
@@ -23,7 +23,6 @@
#include "rtl/ustring.hxx"
#include "uno/EnvDcp.h"
-
namespace cppu
{
namespace EnvDcp
@@ -35,7 +34,7 @@ namespace EnvDcp
@return the OBI type
@since UDK 3.2.7
*/
-inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp)
+inline rtl::OUString getTypeName(rtl::OUString const& rEnvDcp)
{
rtl::OUString typeName;
@@ -51,7 +50,7 @@ inline rtl::OUString getTypeName(rtl::OUString const &
rEnvDcp)
@return the purpose
@since UDK 3.2.7
*/
-inline rtl::OUString getPurpose(rtl::OUString const & rEnvDcp)
+inline rtl::OUString getPurpose(rtl::OUString const& rEnvDcp)
{
rtl::OUString purpose;
@@ -59,11 +58,9 @@ inline rtl::OUString getPurpose(rtl::OUString const &
rEnvDcp)
return purpose;
}
-
}
}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppu/cppudllapi.h b/include/cppu/cppudllapi.h
index c2bcc559bbea..fecbdca71164 100644
--- a/include/cppu/cppudllapi.h
+++ b/include/cppu/cppudllapi.h
@@ -5,15 +5,15 @@
#include "sal/types.h"
#if defined(CPPU_DLLIMPLEMENTATION)
-#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#if defined(PURPENV_DLLIMPLEMENTATION)
-#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#endif // INCLUDED_CPPU_CPPUDLLAPI_H
diff --git a/include/cppuhelper/cppuhelperdllapi.h
b/include/cppuhelper/cppuhelperdllapi.h
index 1eff7bedc313..00effe9b1ae6 100644
--- a/include/cppuhelper/cppuhelperdllapi.h
+++ b/include/cppuhelper/cppuhelperdllapi.h
@@ -23,9 +23,9 @@
#include "sal/types.h"
#if defined(CPPUHELPER_DLLIMPLEMENTATION)
-#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx
index ea7353693936..570513ff38fa 100644
--- a/include/cppuhelper/exc_hlp.hxx
+++ b/include/cppuhelper/exc_hlp.hxx
@@ -25,7 +25,6 @@
namespace cppu
{
-
/** This function throws the exception given by rExc. The given value has to
be of typeclass EXCEPTION and must be derived from or of
type com.sun.star.uno.Exception.
@@ -33,7 +32,7 @@ namespace cppu
@param rExc
exception to be thrown.
*/
-CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const css::uno::Any & rExc
);
+CPPUHELPER_DLLPUBLIC void SAL_CALL throwException(const css::uno::Any& rExc);
/** Use this function to get the dynamic type of a caught C++-UNO exception;
completes the above function throwing exceptions generically.
@@ -85,7 +84,6 @@ CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const
css::uno::Any & rExc );
same C++ compiler (and linking against one runtime library).
*/
CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL getCaughtException();
-
}
#endif
diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx
index 8771c0c44396..510002e406a8 100644
--- a/include/cppuhelper/unourl.hxx
+++ b/include/cppuhelper/unourl.hxx
@@ -24,10 +24,13 @@
#include "cppuhelper/cppuhelperdllapi.h"
-namespace rtl { class OUString; }
-
-namespace cppu {
+namespace rtl
+{
+class OUString;
+}
+namespace cppu
+{
/** A descriptor as part of a UNO URL (connection descriptor or protocol
descriptor).
@@ -48,13 +51,13 @@ public:
@exception rtl::MalformedUriException
Thrown when the given string representation is invalid.
*/
- explicit UnoUrlDescriptor(rtl::OUString const & rDescriptor);
+ explicit UnoUrlDescriptor(rtl::OUString const& rDescriptor);
- UnoUrlDescriptor(UnoUrlDescriptor const & rOther);
+ UnoUrlDescriptor(UnoUrlDescriptor const& rOther);
~UnoUrlDescriptor();
- UnoUrlDescriptor & operator =(UnoUrlDescriptor const & rOther);
+ UnoUrlDescriptor& operator=(UnoUrlDescriptor const& rOther);
/** Return the string representation of the descriptor.
@@ -63,7 +66,7 @@ public:
descriptor, without any modifications. The reference is valid for the
lifetime of this URL object.
*/
- rtl::OUString const & getDescriptor() const;
+ rtl::OUString const& getDescriptor() const;
/** Return the name component of the descriptor.
@@ -71,7 +74,7 @@ public:
A reference to the (case insensitive) name, in lower case form. The
reference is valid for the lifetime of this URL object.
*/
- rtl::OUString const & getName() const;
+ rtl::OUString const& getName() const;
/** Test whether the parameters contain a key.
@@ -81,7 +84,7 @@ public:
@return
True if the parameters contain a matching key/value pair.
*/
- bool hasParameter(rtl::OUString const & rKey) const;
+ bool hasParameter(rtl::OUString const& rKey) const;
/** Return the parameter value for a key.
@@ -92,10 +95,10 @@ public:
The (case sensitive) value associated with the given key, or an empty
string if there is no matching key/value pair.
*/
- rtl::OUString getParameter(rtl::OUString const & rKey) const;
+ rtl::OUString getParameter(rtl::OUString const& rKey) const;
private:
- Impl * m_pImpl;
+ Impl* m_pImpl;
};
/** Parse UNO URLs into their components.
@@ -137,13 +140,13 @@ public:
@exception rtl::MalformedUriException
Thrown when the given string representation is invalid.
*/
- explicit UnoUrl(rtl::OUString const & rUrl);
+ explicit UnoUrl(rtl::OUString const& rUrl);
- UnoUrl(UnoUrl const & rOther);
+ UnoUrl(UnoUrl const& rOther);
~UnoUrl();
- UnoUrl & operator =(UnoUrl const & rOther);
+ UnoUrl& operator=(UnoUrl const& rOther);
/** Return the connection descriptor component of the URL.
@@ -151,7 +154,7 @@ public:
A reference to the connection descriptor. The reference is valid for
the lifetime of this URL object.
*/
- UnoUrlDescriptor const & getConnection() const;
+ UnoUrlDescriptor const& getConnection() const;
/** Return the protocol descriptor component of the URL.
@@ -159,7 +162,7 @@ public:
A reference to the protocol descriptor. The reference is valid for the
lifetime of this URL object.
*/
- UnoUrlDescriptor const & getProtocol() const;
+ UnoUrlDescriptor const& getProtocol() const;
/** Return the object-name component of the URL.
@@ -167,14 +170,13 @@ public:
A reference to the (case sensitive) object-name. The reference is
valid
for the lifetime of this URL object.
*/
- rtl::OUString const & getObjectName() const;
+ rtl::OUString const& getObjectName() const;
private:
class Impl;
- Impl * m_pImpl;
+ Impl* m_pImpl;
};
-
}
#endif // INCLUDED_RTL_UNOURL_HXX
diff --git a/include/dbaccess/dbaccessdllapi.h
b/include/dbaccess/dbaccessdllapi.h
index 8f211a0ed67b..2f3771dcea80 100644
--- a/include/dbaccess/dbaccessdllapi.h
+++ b/include/dbaccess/dbaccessdllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(DBACCESS_DLLIMPLEMENTATION)
-#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/desktop/dllapi.h b/include/desktop/dllapi.h
index fd23aeb7f973..5cf948ce08a4 100644
--- a/include/desktop/dllapi.h
+++ b/include/desktop/dllapi.h
@@ -14,15 +14,15 @@
#include <sal/types.h>
#if defined(DESKTOP_DLLIMPLEMENTATION)
-# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#if defined(CRASHREPORT_DLLIMPLEMENTATION)
-# define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-# define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#endif
diff --git a/include/desktop/exithelper.h b/include/desktop/exithelper.h
index fbb37c583233..b4f618783e33 100644
--- a/include/desktop/exithelper.h
+++ b/include/desktop/exithelper.h
@@ -20,7 +20,8 @@
#ifndef INCLUDED_DESKTOP_EXITHELPER_H
#define INCLUDED_DESKTOP_EXITHELPER_H
-enum EExitCodes {
+enum EExitCodes
+{
/* e.g. used to force showing of the command line help */
EXITHELPER_NO_ERROR = 0,
/* a uno exception was caught during startup */
diff --git a/include/desktop/minidump.hxx b/include/desktop/minidump.hxx
index 6ed0e18277f8..0f49075fad5e 100644
--- a/include/desktop/minidump.hxx
+++ b/include/desktop/minidump.hxx
@@ -14,8 +14,8 @@
#include <desktop/dllapi.h>
-namespace crashreport {
-
+namespace crashreport
+{
// when response = nullptr only make test
/** Read+Send, Test and send info from the Dump.ini .
@@ -27,8 +27,7 @@ namespace crashreport {
@retval false Read+Send, Test is a error
*/
-CRASHREPORT_DLLPUBLIC bool readConfig(const std::string& iniPath, std::string
* response);
-
+CRASHREPORT_DLLPUBLIC bool readConfig(const std::string& iniPath, std::string*
response);
}
#endif
diff --git a/include/editeng/AccessibleComponentBase.hxx
b/include/editeng/AccessibleComponentBase.hxx
index d3c5805ef75a..80b0c2b95030 100644
--- a/include/editeng/AccessibleComponentBase.hxx
+++ b/include/editeng/AccessibleComponentBase.hxx
@@ -17,18 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef INCLUDED_EDITENG_ACCESSIBLECOMPONENTBASE_HXX
#define INCLUDED_EDITENG_ACCESSIBLECOMPONENTBASE_HXX
-
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
#include <editeng/editengdllapi.h>
-namespace com::sun::star::accessibility { class XAccessible; }
-
-namespace accessibility {
+namespace com::sun::star::accessibility
+{
+class XAccessible;
+}
+namespace accessibility
+{
/** @descr
This base class provides (will provide) a base implementation of the
XAccessibleComponent and the
@@ -39,28 +40,25 @@ namespace accessibility {
XServiceInfo, and <type>XTypeProvider</type>.
*/
class EDITENG_DLLPUBLIC AccessibleComponentBase
- : public css::accessibility::XAccessibleExtendedComponent
+ : public css::accessibility::XAccessibleExtendedComponent
{
public:
//===== internal ========================================================
AccessibleComponentBase();
virtual ~AccessibleComponentBase();
-
//===== XAccessibleComponent
================================================
/** The default implementation uses the result of
<member>getBounds</member> to determine whether the given point lies
inside this object.
*/
- virtual sal_Bool SAL_CALL containsPoint (
- const css::awt::Point& aPoint) override;
+ virtual sal_Bool SAL_CALL containsPoint(const css::awt::Point& aPoint)
override;
/** The default implementation returns an empty reference.
*/
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getAccessibleAtPoint (
- const css::awt::Point& aPoint) override;
+ virtual css::uno::Reference<css::accessibility::XAccessible>
+ SAL_CALL getAccessibleAtPoint(const css::awt::Point& aPoint) override;
/** The default implementation returns an empty rectangle.
*/
@@ -94,18 +92,14 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
//===== XAccessibleExtendedComponent ====================================
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL
- getFont() override;
+ virtual css::uno::Reference<css::awt::XFont> SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;
-
//===== XTypeProvider ===================================================
/// @throws css::uno::RuntimeException
- virtual css::uno::Sequence< css::uno::Type> SAL_CALL
- getTypes();
-
+ virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes();
};
} // end of namespace accessibility
diff --git a/include/editeng/Trie.hxx b/include/editeng/Trie.hxx
index 87d4a54ecdb3..e6ee659c3c99 100644
--- a/include/editeng/Trie.hxx
+++ b/include/editeng/Trie.hxx
@@ -17,7 +17,6 @@
namespace editeng
{
-
struct TrieNode;
class EDITENG_DLLPUBLIC Trie final
@@ -33,7 +32,6 @@ public:
void findSuggestions(const OUString& sWordPart, std::vector<OUString>&
rSuggestionList) const;
size_t size() const;
};
-
}
#endif // INCLUDED_EDITENG_TRIE_HXX
diff --git a/include/editeng/editengdllapi.h b/include/editeng/editengdllapi.h
index 896dea0705d3..5d77e453e0d9 100644
--- a/include/editeng/editengdllapi.h
+++ b/include/editeng/editengdllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(EDITENG_DLLIMPLEMENTATION)
-#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define EDITENG_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/editeng/editerr.hxx b/include/editeng/editerr.hxx
index 23cc549a9cdb..e88b7b0f134f 100644
--- a/include/editeng/editerr.hxx
+++ b/include/editeng/editerr.hxx
@@ -21,8 +21,8 @@
#include <vcl/errcode.hxx>
-#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS ErrCode(ErrCodeArea::Svx, 2)
-#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT ErrCode(ErrCodeArea::Svx,
ErrCodeClass::Read, 8)
+#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS ErrCode(ErrCodeArea::Svx, 2)
+#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT ErrCode(ErrCodeArea::Svx,
ErrCodeClass::Read, 8)
#endif
diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx
index bac1178648f1..7ed52849ed05 100644
--- a/include/editeng/editund2.hxx
+++ b/include/editeng/editund2.hxx
@@ -34,6 +34,7 @@ class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) EditUndoManager :
public SfxUndoManage
EditEngine* mpEditEngine;
void SetEditEngine(EditEngine* pNew);
+
public:
EditUndoManager(sal_uInt16 nMaxUndoActionCount = 20);
@@ -41,33 +42,31 @@ public:
virtual bool Redo() override;
};
-
// EditUndo
class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction
{
private:
- sal_uInt16 nId;
- ViewShellId mnViewShellId;
- EditEngine* mpEditEngine;
+ sal_uInt16 nId;
+ ViewShellId mnViewShellId;
+ EditEngine* mpEditEngine;
public:
EditUndo(sal_uInt16 nI, EditEngine* pEE);
virtual ~EditUndo() override;
- EditEngine* GetEditEngine() { return mpEditEngine;}
+ EditEngine* GetEditEngine() { return mpEditEngine; }
- virtual void Undo() override = 0;
- virtual void Redo() override = 0;
+ virtual void Undo() override = 0;
+ virtual void Redo() override = 0;
- virtual bool CanRepeat(SfxRepeatTarget&) const override;
+ virtual bool CanRepeat(SfxRepeatTarget&) const override;
virtual OUString GetComment() const override;
/// See SfxUndoAction::GetViewShellId().
ViewShellId GetViewShellId() const override;
- sal_uInt16 GetId() const;
+ sal_uInt16 GetId() const;
};
#endif // INCLUDED_EDITENG_EDITUND2_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx
index ba31c72380d9..d57ad101fcfd 100644
--- a/include/editeng/eerdll.hxx
+++ b/include/editeng/eerdll.hxx
@@ -27,10 +27,10 @@
class GlobalEditData;
namespace editeng
{
- class SharedVclResources;
+class SharedVclResources;
}
-OUString EDITENG_DLLPUBLIC EditResId(const char *pId);
+OUString EDITENG_DLLPUBLIC EditResId(const char* pId);
class EditDLL
{
@@ -41,7 +41,7 @@ public:
EditDLL();
~EditDLL();
- GlobalEditData* GetGlobalData() const { return pGlobalData.get(); }
+ GlobalEditData* GetGlobalData() const { return pGlobalData.get(); }
std::shared_ptr<editeng::SharedVclResources> GetSharedVclResources();
static EditDLL& Get();
};
diff --git a/include/editeng/fieldupdater.hxx b/include/editeng/fieldupdater.hxx
index b6057015f592..aba367653308 100644
--- a/include/editeng/fieldupdater.hxx
+++ b/include/editeng/fieldupdater.hxx
@@ -15,8 +15,8 @@
class EditTextObject;
-namespace editeng {
-
+namespace editeng
+{
class FieldUpdaterImpl;
/**
@@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC FieldUpdater
std::unique_ptr<FieldUpdaterImpl> mpImpl;
public:
- FieldUpdater(EditTextObject const & rObj);
+ FieldUpdater(EditTextObject const& rObj);
FieldUpdater(const FieldUpdater& r);
~FieldUpdater();
@@ -39,7 +39,6 @@ public:
*/
void updateTableFields(int nTab);
};
-
}
#endif
diff --git a/include/editeng/frmdir.hxx b/include/editeng/frmdir.hxx
index f8801cc77020..ca3cc615b773 100644
--- a/include/editeng/frmdir.hxx
+++ b/include/editeng/frmdir.hxx
@@ -58,5 +58,4 @@ const char* getFrmDirResId(size_t nIndex);
#endif // INCLUDED_EDITENG_FRMDIR_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/misspellrange.hxx
b/include/editeng/misspellrange.hxx
index 611546c99c6d..d67fc82f592c 100644
--- a/include/editeng/misspellrange.hxx
+++ b/include/editeng/misspellrange.hxx
@@ -14,8 +14,8 @@
#include <vector>
-namespace editeng {
-
+namespace editeng
+{
struct MisspellRange
{
size_t mnStart;
@@ -31,7 +31,6 @@ struct MisspellRanges
MisspellRanges(sal_Int32 nParagraph, const std::vector<MisspellRange>&
rRanges);
};
-
}
#endif
diff --git a/include/editeng/mutxhelp.hxx b/include/editeng/mutxhelp.hxx
index 2b8aacb518c8..7487fee48e46 100644
--- a/include/editeng/mutxhelp.hxx
+++ b/include/editeng/mutxhelp.hxx
@@ -33,5 +33,4 @@ public:
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/numdef.hxx b/include/editeng/numdef.hxx
index 152e7566e8cf..6039ec555783 100644
--- a/include/editeng/numdef.hxx
+++ b/include/editeng/numdef.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_EDITENG_NUMDEF_HXX
#define INCLUDED_EDITENG_NUMDEF_HXX
-#define SVX_MAX_NUM 10 // max. possible numbering level
-#define SVX_DEF_BULLET (0xF000 + 149)// Character for lists
+#define SVX_MAX_NUM 10 // max. possible numbering level
+#define SVX_DEF_BULLET (0xF000 + 149) // Character for lists
#endif // INCLUDED_EDITENG_NUMDEF_HXX
diff --git a/include/editeng/section.hxx b/include/editeng/section.hxx
index 19a506a12d0f..d14189c241da 100644
--- a/include/editeng/section.hxx
+++ b/include/editeng/section.hxx
@@ -16,8 +16,8 @@
class SfxPoolItem;
-namespace editeng {
-
+namespace editeng
+{
struct Section
{
sal_Int32 mnParagraph;
@@ -28,7 +28,6 @@ struct Section
Section(sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd);
};
-
}
#endif
diff --git a/include/editeng/unofdesc.hxx b/include/editeng/unofdesc.hxx
index 218ce288b603..fbc94b09ca6e 100644
--- a/include/editeng/unofdesc.hxx
+++ b/include/editeng/unofdesc.hxx
@@ -23,24 +23,28 @@
#include <svl/itemset.hxx>
#include <editeng/editengdllapi.h>
-namespace com::sun::star::awt { struct FontDescriptor; }
-namespace vcl { class Font; }
+namespace com::sun::star::awt
+{
+struct FontDescriptor;
+}
+namespace vcl
+{
+class Font;
+}
class EDITENG_DLLPUBLIC SvxUnoFontDescriptor
{
public:
- static void ConvertToFont( const css::awt::FontDescriptor& rDesc,
vcl::Font& rFont );
- static void ConvertFromFont( const vcl::Font& rFont,
css::awt::FontDescriptor& rDesc );
+ static void ConvertToFont(const css::awt::FontDescriptor& rDesc,
vcl::Font& rFont);
+ static void ConvertFromFont(const vcl::Font& rFont,
css::awt::FontDescriptor& rDesc);
- static void FillItemSet( const css::awt::FontDescriptor& rDesc,
SfxItemSet& rSet );
- static void FillFromItemSet( const SfxItemSet& rSet,
css::awt::FontDescriptor& rDesc );
-
- static void setPropertyToDefault( SfxItemSet& rSet );
- static css::uno::Any getPropertyDefault( SfxItemPool* pPool );
+ static void FillItemSet(const css::awt::FontDescriptor& rDesc, SfxItemSet&
rSet);
+ static void FillFromItemSet(const SfxItemSet& rSet,
css::awt::FontDescriptor& rDesc);
+ static void setPropertyToDefault(SfxItemSet& rSet);
+ static css::uno::Any getPropertyDefault(SfxItemPool* pPool);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/filter/msfilter/svxmsbas.hxx
b/include/filter/msfilter/svxmsbas.hxx
index 10d6784675d4..190e289c42bf 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -43,27 +43,29 @@ class SfxObjectShell;
* probably what the user expects to see when viewing the code
*/
-
class MSFILTER_DLLPUBLIC SvxImportMSVBasic
{
public:
- SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot )
- : xRoot(&rRoot), rDocSh(rDocS)
- {}
+ SvxImportMSVBasic(SfxObjectShell& rDocS, SotStorage& rRoot)
+ : xRoot(&rRoot)
+ , rDocSh(rDocS)
+ {
+ }
// only for the export - copy or delete the saved VBA-macro-storage
// form the ObjectShell
// - returns a warning code if a modified basic exist, in all other
// cases return ERRCODE_NONE.
- ErrCode SaveOrDelMSVBAStorage( bool bSaveInto, const OUString&
rStorageName );
+ ErrCode SaveOrDelMSVBAStorage(bool bSaveInto, const OUString&
rStorageName);
// check if the MS-VBA-Storage exist in the RootStorage of the DocShell.
// If it exist, then return the WarningId for losing the information.
- static ErrCode GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
+ static ErrCode GetSaveWarningOfMSVBAStorage(SfxObjectShell& rDocS);
static OUString GetMSBasicStorageName();
+
private:
tools::SvRef<SotStorage> xRoot;
- SfxObjectShell &rDocSh;
+ SfxObjectShell& rDocSh;
};
#endif
diff --git a/include/formula/formuladllapi.h b/include/formula/formuladllapi.h
index 7b011a6d7ade..ae408fd42f89 100644
--- a/include/formula/formuladllapi.h
+++ b/include/formula/formuladllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(FORMULA_DLLIMPLEMENTATION)
-#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define FORMULA_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/formula/funcvarargs.h b/include/formula/funcvarargs.h
index ed529ee98680..7a1f1e4e7f5f 100644
--- a/include/formula/funcvarargs.h
+++ b/include/formula/funcvarargs.h
@@ -32,7 +32,7 @@
functionDescription.isInfiniteParameterCount() which though looks like it
could be easily adapted.
*/
-#define VAR_ARGS 255
+#define VAR_ARGS 255
/** Used to indicate a variable number of paired parameters for the Function
Wizard.
@@ -42,7 +42,7 @@
@see VAR_ARGS
*/
-#define PAIRED_VAR_ARGS (VAR_ARGS + VAR_ARGS)
+#define PAIRED_VAR_ARGS (VAR_ARGS + VAR_ARGS)
#endif
diff --git a/include/formula/types.hxx b/include/formula/types.hxx
index c9e29929b9c5..c0c8b64c2498 100644
--- a/include/formula/types.hxx
+++ b/include/formula/types.hxx
@@ -22,12 +22,11 @@
#include <boost/intrusive_ptr.hpp>
-namespace formula {
-
+namespace formula
+{
class FormulaToken;
-typedef ::boost::intrusive_ptr<FormulaToken> FormulaTokenRef;
-typedef ::boost::intrusive_ptr<const FormulaToken> FormulaConstTokenRef;
-
+typedef ::boost::intrusive_ptr<FormulaToken> FormulaTokenRef;
+typedef ::boost::intrusive_ptr<const FormulaToken> FormulaConstTokenRef;
}
#endif
diff --git a/include/framework/interaction.hxx
b/include/framework/interaction.hxx
index 4e3df9e8afba..d02c5cd99067 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -26,12 +26,21 @@
#include <com/sun/star/uno/Reference.hxx>
#include <framework/fwkdllapi.h>
-namespace com::sun::star::task { class XInteractionContinuation; }
-namespace com::sun::star::task { class XInteractionRequest; }
-namespace com::sun::star::uno { template <class E> class Sequence; }
-
-namespace framework{
+namespace com::sun::star::task
+{
+class XInteractionContinuation;
+}
+namespace com::sun::star::task
+{
+class XInteractionRequest;
+}
+namespace com::sun::star::uno
+{
+template <class E> class Sequence;
+}
+namespace framework
+{
/*-************************************************************************************************************
@short special request for interaction to ask user for right
filter
@descr These helper can be used to ask user for right filter, if
filter detection failed.
@@ -51,22 +60,22 @@ namespace framework{
@devstatus ready to use
@threadsafe no (used on once position only!)
-*//*-*************************************************************************************************************/
+*/
/*-*************************************************************************************************************/
class RequestFilterSelect_Impl;
class UNLESS_MERGELIBS(FWK_DLLPUBLIC) RequestFilterSelect
{
rtl::Reference<RequestFilterSelect_Impl> mxImpl;
public:
- RequestFilterSelect( const OUString& sURL );
+ RequestFilterSelect(const OUString& sURL);
~RequestFilterSelect();
- RequestFilterSelect& operator=(RequestFilterSelect const &) = delete; //
MSVC2019 workaround
- RequestFilterSelect(RequestFilterSelect const &) = delete; // MSVC2019
workaround
+ RequestFilterSelect& operator=(RequestFilterSelect const&) = delete; //
MSVC2019 workaround
+ RequestFilterSelect(RequestFilterSelect const&) = delete; // MSVC2019
workaround
- bool isAbort () const;
+ bool isAbort() const;
OUString getFilter() const;
- css::uno::Reference < css::task::XInteractionRequest > GetRequest();
+ css::uno::Reference<css::task::XInteractionRequest> GetRequest();
};
/*-************************************************************************************************************
@@ -79,18 +88,18 @@ public:
@devstatus ready to use
@threadsafe no (used on once position only!)
-*//*-*************************************************************************************************************/
+*/
/*-*************************************************************************************************************/
class FWK_DLLPUBLIC InteractionRequest
{
public:
- static css::uno::Reference < css::task::XInteractionRequest >
CreateRequest(
+ static css::uno::Reference<css::task::XInteractionRequest> CreateRequest(
const css::uno::Any& aRequest,
- const css::uno::Sequence< css::uno::Reference<
css::task::XInteractionContinuation > >& lContinuations );
+ const
css::uno::Sequence<css::uno::Reference<css::task::XInteractionContinuation>>&
+ lContinuations);
};
+} // namespace framework
-} // namespace framework
-
-#endif // #define INCLUDED_FRAMEWORK_INTERACTION_HXX
+#endif // #define INCLUDED_FRAMEWORK_INTERACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nlangtag/i18nlangtagdllapi.h
b/include/i18nlangtag/i18nlangtagdllapi.h
index 74d548468cb9..4222c0e95cbb 100644
--- a/include/i18nlangtag/i18nlangtagdllapi.h
+++ b/include/i18nlangtag/i18nlangtagdllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(I18NLANGTAG_DLLIMPLEMENTATION)
-#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define I18NLANGTAG_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/i18nutil/i18nutildllapi.h
b/include/i18nutil/i18nutildllapi.h
index 7cd2d5e36563..9797e87a3613 100644
--- a/include/i18nutil/i18nutildllapi.h
+++ b/include/i18nutil/i18nutildllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(I18NUTIL_DLLIMPLEMENTATION)
-#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define I18NUTIL_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index 5c64d646d7f7..1fc09f1f1267 100644
--- a/include/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
@@ -24,7 +24,10 @@
#include <rtl/string.hxx>
#include <tools/long.hxx>
-namespace com::sun::star::lang { struct Locale; }
+namespace com::sun::star::lang
+{
+struct Locale;
+}
//!! The values of the following enumerators must correspond to the array
position
//!! of the respective paper size in the file i18nutil/source/utility/paper.cxx
@@ -116,14 +119,13 @@ enum Paper : unsigned
};
// defined for 'equal size' test with the implementation array
-#define NUM_PAPER_ENTRIES (PAPER_16K_197x273 - PAPER_A0 + 1)
-
+#define NUM_PAPER_ENTRIES (PAPER_16K_197x273 - PAPER_A0 + 1)
class I18NUTIL_DLLPUBLIC PaperInfo
{
Paper m_eType;
- tools::Long m_nPaperWidth; // width in 100thMM
- tools::Long m_nPaperHeight; // height in 100thMM
+ tools::Long m_nPaperWidth; // width in 100thMM
+ tools::Long m_nPaperHeight; // height in 100thMM
public:
PaperInfo(Paper eType);
PaperInfo(tools::Long nPaperWidth, tools::Long nPaperHeight);
@@ -131,13 +133,13 @@ public:
Paper getPaper() const { return m_eType; }
tools::Long getWidth() const { return m_nPaperWidth; }
tools::Long getHeight() const { return m_nPaperHeight; }
- bool sloppyEqual(const PaperInfo &rOther) const;
+ bool sloppyEqual(const PaperInfo& rOther) const;
void doSloppyFit();
static PaperInfo getSystemDefaultPaper();
- static PaperInfo getDefaultPaperForLocale(const css::lang::Locale &
rLocale);
+ static PaperInfo getDefaultPaperForLocale(const css::lang::Locale&
rLocale);
- static Paper fromPSName(const OString &rName);
+ static Paper fromPSName(const OString& rName);
static OString toPSName(Paper eType);
static tools::Long sloppyFitPageDimension(tools::Long nDimension);
diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index f0db87095f71..0ca14290981e 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -27,7 +27,8 @@
class LanguageTag;
-struct ScriptTypeList {
+struct ScriptTypeList
+{
css::i18n::UnicodeScript from;
css::i18n::UnicodeScript to;
sal_Int16 value;
@@ -36,16 +37,16 @@ struct ScriptTypeList {
class I18NUTIL_DLLPUBLIC unicode
{
public:
-
- static sal_Int16 getUnicodeType( const sal_Unicode ch );
- static sal_Int16 getUnicodeScriptType( const sal_Unicode ch, const
ScriptTypeList *typeList, sal_Int16 unknownType = 0 );
+ static sal_Int16 getUnicodeType(const sal_Unicode ch);
+ static sal_Int16 getUnicodeScriptType(const sal_Unicode ch, const
ScriptTypeList* typeList,
+ sal_Int16 unknownType = 0);
static sal_Unicode getUnicodeScriptStart(css::i18n::UnicodeScript type);
static sal_Unicode getUnicodeScriptEnd(css::i18n::UnicodeScript type);
- static sal_uInt8 getUnicodeDirection( const sal_Unicode ch );
- static bool isControl( const sal_Unicode ch);
- static bool isAlpha( const sal_Unicode ch);
- static bool isSpace( const sal_Unicode ch);
- static bool isWhiteSpace( const sal_Unicode ch);
+ static sal_uInt8 getUnicodeDirection(const sal_Unicode ch);
+ static bool isControl(const sal_Unicode ch);
+ static bool isAlpha(const sal_Unicode ch);
+ static bool isSpace(const sal_Unicode ch);
+ static bool isWhiteSpace(const sal_Unicode ch);
/** Check for Unicode variation sequence selectors
@@ -55,8 +56,8 @@ public:
*/
static bool isIVSSelector(sal_uInt32 nCode)
{
- return (nCode >= 0xFE00 && nCode <= 0xFE0F) // Variation Selectors
block
- || (nCode >= 0xE0100 && nCode <= 0xE01EF);// Variation Selectors
Supplement block
+ return (nCode >= 0xFE00 && nCode <= 0xFE0F) // Variation Selectors
block
+ || (nCode >= 0xE0100 && nCode <= 0xE01EF); // Variation
Selectors Supplement block
}
/** Check for base characters of a CJK ideographic variation sequence (IVS)
@@ -67,9 +68,9 @@ public:
*/
static bool isCJKIVSCharacter(sal_uInt32 nCode)
{
- return (nCode >= 0x4E00 && nCode <= 0x9FFF) // CJK Unified
Ideographs
- || (nCode >= 0x3400 && nCode <= 0x4DBF) // CJK Unified
Ideographs Extension A
- || (nCode >= 0x20000 && nCode <= 0x2A6DF); // CJK Unified
Ideographs Extension B
+ return (nCode >= 0x4E00 && nCode <= 0x9FFF) // CJK Unified Ideographs
+ || (nCode >= 0x3400 && nCode <= 0x4DBF) // CJK Unified
Ideographs Extension A
+ || (nCode >= 0x20000 && nCode <= 0x2A6DF); // CJK Unified
Ideographs Extension B
}
//Map an ISO 15924 script code to Latin/Asian/Complex/Weak
@@ -80,8 +81,7 @@ public:
//Format a number as a percentage according to the rules of the given
//language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE
- static OUString formatPercent(double dNumber,
- const LanguageTag &rLangTag);
+ static OUString formatPercent(double dNumber, const LanguageTag& rLangTag);
};
/*
@@ -128,5 +128,4 @@ public:
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/jvmaccess/classpath.hxx b/include/jvmaccess/classpath.hxx
index 9882a42ce25e..d1e1c658a44c 100644
--- a/include/jvmaccess/classpath.hxx
+++ b/include/jvmaccess/classpath.hxx
@@ -27,19 +27,23 @@
#include <jvmaccess/jvmaccessdllapi.h>
#include <rtl/ustring.hxx>
-namespace com::sun::star::uno {
- class XComponentContext;
+namespace com::sun::star::uno
+{
+class XComponentContext;
}
-namespace com::sun::star::uno { template <typename > class Reference; }
-
-namespace jvmaccess {
+namespace com::sun::star::uno
+{
+template <typename> class Reference;
+}
+namespace jvmaccess
+{
/**
Helper functions for class path handling.
*/
-namespace ClassPath {
-
+namespace ClassPath
+{
/**
translates a class path into a java.net.URL[] instance.
@@ -65,12 +69,10 @@ namespace ClassPath {
@throws com::sun::star::uno::RuntimeException
*/
-JVMACCESS_DLLPUBLIC jobjectArray translateToUrls(
- css::uno::Reference<css::uno::XComponentContext> const & context,
- JNIEnv * environment, OUString const & classPath);
-
+JVMACCESS_DLLPUBLIC jobjectArray
+translateToUrls(css::uno::Reference<css::uno::XComponentContext> const&
context,
+ JNIEnv* environment, OUString const& classPath);
}
-
}
#endif
diff --git a/include/jvmaccess/jvmaccessdllapi.h
b/include/jvmaccess/jvmaccessdllapi.h
index 0f6651b5dbf8..1c57d1484266 100644
--- a/include/jvmaccess/jvmaccessdllapi.h
+++ b/include/jvmaccess/jvmaccessdllapi.h
@@ -13,9 +13,9 @@
#include <sal/types.h>
#if defined JVMACCESS_DLLIMPLEMENTATION
-# define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-# define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define JVMACCESS_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/jvmaccess/unovirtualmachine.hxx
b/include/jvmaccess/unovirtualmachine.hxx
index c412b34b959f..ac7cf107f4d4 100644
--- a/include/jvmaccess/unovirtualmachine.hxx
+++ b/include/jvmaccess/unovirtualmachine.hxx
@@ -25,14 +25,15 @@
#include <salhelper/simplereferenceobject.hxx>
#include <rtl/ref.hxx>
-namespace jvmaccess {
-
+namespace jvmaccess
+{
class VirtualMachine;
/** An encapsulating wrapper around a Java virtual machine and an appropriate
UNO class loader.
*/
-class JVMACCESS_DLLPUBLIC UnoVirtualMachine final : public
salhelper::SimpleReferenceObject {
+class JVMACCESS_DLLPUBLIC UnoVirtualMachine final : public
salhelper::SimpleReferenceObject
+{
public:
/** An exception indicating failure to create a UnoVirtualMachine.
*/
@@ -41,11 +42,11 @@ public:
public:
CreationException();
- CreationException(CreationException const &);
+ CreationException(CreationException const&);
~CreationException();
- CreationException & operator =(CreationException const &);
+ CreationException& operator=(CreationException const&);
};
/** Create a wrapper around a Java virtual machine and an appropriate UNO
@@ -65,16 +66,15 @@ public:
@exception CreationException
Thrown in case creation fails (due to a JNI problem).
*/
- UnoVirtualMachine(
- rtl::Reference< jvmaccess::VirtualMachine > const & virtualMachine,
- void * classLoader);
+ UnoVirtualMachine(rtl::Reference<jvmaccess::VirtualMachine> const&
virtualMachine,
+ void* classLoader);
/** Get the Java virtual machine wrapper.
@return
The Java virtual machine wrapper. Will never be null.
*/
- const rtl::Reference< jvmaccess::VirtualMachine >& getVirtualMachine()
const;
+ const rtl::Reference<jvmaccess::VirtualMachine>& getVirtualMachine() const;
/** Get the UNO class loader.
@@ -85,18 +85,17 @@ public:
different for different JDK versions, so that the mangled C++ name of
the function would depend on the JDK version used at compile time.
*/
- void * getClassLoader() const { return m_classLoader;}
+ void* getClassLoader() const { return m_classLoader; }
private:
- UnoVirtualMachine(UnoVirtualMachine const &) = delete;
- UnoVirtualMachine& operator =(UnoVirtualMachine const &) = delete;
+ UnoVirtualMachine(UnoVirtualMachine const&) = delete;
+ UnoVirtualMachine& operator=(UnoVirtualMachine const&) = delete;
virtual ~UnoVirtualMachine() override;
- rtl::Reference< jvmaccess::VirtualMachine > m_virtualMachine;
- void * m_classLoader;
+ rtl::Reference<jvmaccess::VirtualMachine> m_virtualMachine;
+ void* m_classLoader;
};
-
}
#endif
diff --git a/include/jvmaccess/virtualmachine.hxx
b/include/jvmaccess/virtualmachine.hxx
index 2076a02577bd..a95668cdfa32 100644
--- a/include/jvmaccess/virtualmachine.hxx
+++ b/include/jvmaccess/virtualmachine.hxx
@@ -26,8 +26,8 @@
#include <jni.h>
-namespace jvmaccess {
-
+namespace jvmaccess
+{
/** An encapsulating wrapper around a Java virtual machine.
*/
class JVMACCESS_DLLPUBLIC VirtualMachine final : public
salhelper::SimpleReferenceObject
@@ -53,11 +53,11 @@ public:
public:
CreationException();
- CreationException(CreationException const &);
+ CreationException(CreationException const&);
~CreationException();
- CreationException & operator =(CreationException const &);
+ CreationException& operator=(CreationException const&);
};
/** Attach the current thread to a virtual machine.
@@ -68,7 +68,7 @@ public:
@exception CreationException
Thrown in case attaching fails (due to a JNI problem).
*/
- explicit AttachGuard(rtl::Reference< VirtualMachine > const &
rMachine);
+ explicit AttachGuard(rtl::Reference<VirtualMachine> const& rMachine);
/** Detach the current thread from the virtual machine again.
*/
@@ -79,14 +79,14 @@ public:
@return
A valid JNI environment pointer. Will never be null.
*/
- JNIEnv * getEnvironment() const { return m_pEnvironment; }
+ JNIEnv* getEnvironment() const { return m_pEnvironment; }
private:
- AttachGuard(AttachGuard const &) = delete;
- AttachGuard& operator =(AttachGuard const &) = delete;
+ AttachGuard(AttachGuard const&) = delete;
+ AttachGuard& operator=(AttachGuard const&) = delete;
- rtl::Reference< VirtualMachine > m_xMachine;
- JNIEnv * m_pEnvironment;
+ rtl::Reference<VirtualMachine> m_xMachine;
+ JNIEnv* m_pEnvironment;
bool m_bDetach;
};
@@ -124,26 +124,24 @@ public:
anyway). This parameter is currently unused (but may be used again in
the future).
*/
- VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy,
- JNIEnv const * pMainThreadEnv);
+ VirtualMachine(JavaVM* pVm, int nVersion, bool bDestroy, JNIEnv const*
pMainThreadEnv);
private:
- VirtualMachine(VirtualMachine const &) = delete;
- VirtualMachine& operator =(VirtualMachine const & ) = delete;
+ VirtualMachine(VirtualMachine const&) = delete;
+ VirtualMachine& operator=(VirtualMachine const&) = delete;
virtual ~VirtualMachine() override;
- JNIEnv * attachThread(bool * pAttached) const;
+ JNIEnv* attachThread(bool* pAttached) const;
void detachThread() const;
- JavaVM * m_pVm;
+ JavaVM* m_pVm;
jint m_nVersion;
bool m_bDestroy;
friend class AttachGuard; // to access attachThread, detachThread
};
-
}
#endif // INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 08baf8f23d67..8b2e36e935fc 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -164,7 +164,7 @@
<p>Therefore, when a Java is selected in OO then the office must be
restarted, so that the changes can take effect.</p>
*/
-#define JFW_REQUIRE_NEEDRESTART 0x1l
+#define JFW_REQUIRE_NEEDRESTART 0x1l
/** error codes which are returned by functions of this API.
*/
@@ -251,8 +251,7 @@ struct JavaInfo
true - both object represent the same JRE.</br>
false - the objects represent different JREs
*/
-JVMFWK_DLLPUBLIC bool jfw_areEqualJavaInfo(
- JavaInfo const * pInfoA,JavaInfo const * pInfoB);
+JVMFWK_DLLPUBLIC bool jfw_areEqualJavaInfo(JavaInfo const* pInfoA, JavaInfo
const* pInfoB);
/** determines if a Java Virtual Machine is already running.
@@ -314,7 +313,7 @@ JVMFWK_DLLPUBLIC bool jfw_isVMRunning();
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError
jfw_findAndSelectJRE(std::unique_ptr<JavaInfo> *pInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError
jfw_findAndSelectJRE(std::unique_ptr<JavaInfo>* pInfo);
/** provides information about all available JRE installations.
@@ -336,8 +335,8 @@ JVMFWK_DLLPUBLIC javaFrameworkError
jfw_findAndSelectJRE(std::unique_ptr<JavaInf
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAllJREs(
- std::vector<std::unique_ptr<JavaInfo>> *parInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError
+jfw_findAllJREs(std::vector<std::unique_ptr<JavaInfo>>* parInfo);
/** determines if a path points to a Java installation.
@@ -367,9 +366,8 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAllJREs(
JFW_E_FAILED_VERSION a JRE was detected but if failed the version
requirements as determined by the javavendors.xml
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
- OUString const & pPath, std::unique_ptr<JavaInfo> *ppInfo);
-
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(OUString const&
pPath,
+
std::unique_ptr<JavaInfo>* ppInfo);
/** starts a Java Virtual Machine (JVM).
@@ -431,9 +429,9 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
JFW_E_FAILED_VERSION the "Default Mode" is active. The JRE
determined by
<code>JAVA_HOME</code>does not meet the version requirements.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM(
- JavaInfo const * pInfo, std::vector<OUString> const & arOptions,
- JavaVM ** ppVM, JNIEnv ** ppEnv);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM(JavaInfo const* pInfo,
+ std::vector<OUString> const&
arOptions,
+ JavaVM** ppVM, JNIEnv** ppEnv);
/** determines the JRE that is to be used.
@@ -461,8 +459,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_setSelectedJRE(JavaInfo const *pInfo);
-
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_setSelectedJRE(JavaInfo const* pInfo);
/** provides information about the JRE that is to be used.
@@ -489,8 +486,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError
jfw_setSelectedJRE(JavaInfo const *pInfo);
JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no
JRE has been selected afterwards. <br/>
*/
-JVMFWK_DLLPUBLIC javaFrameworkError
jfw_getSelectedJRE(std::unique_ptr<JavaInfo> *ppInfo);
-
+JVMFWK_DLLPUBLIC javaFrameworkError
jfw_getSelectedJRE(std::unique_ptr<JavaInfo>* ppInfo);
/** determines if Java can be used.
@@ -522,7 +518,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setEnabled(bool
bEnabled);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool *pbEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool* pbEnabled);
/** determines parameters which are passed to VM during its creation.
@@ -543,8 +539,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool
*pbEnabled);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters(
- std::vector<OUString> const & arArgs);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters(std::vector<OUString>
const& arArgs);
/** obtains the currently used start parameters.
@@ -558,8 +553,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters(
- std::vector<OUString> * parParameters);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters(std::vector<OUString>*
parParameters);
/** sets the user class path.
@@ -578,7 +572,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_setUserClassPath(OUString const &
pCP);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_setUserClassPath(OUString const& pCP);
/** provides the value of the current user class path.
<p>The function returns an empty string if no user class path is set.
@@ -594,7 +588,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError
jfw_setUserClassPath(OUString const & pCP);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_getUserClassPath(OUString * ppCP);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_getUserClassPath(OUString* ppCP);
/** saves the location of a JRE.
@@ -621,8 +615,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError
jfw_getUserClassPath(OUString * ppCP);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation(
- OUString const & sLocation);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation(OUString const&
sLocation);
/** checks if the installation of the jre still exists.
@@ -640,8 +633,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation(
JFW_E_NONE the function ran successfully.</br>
JFW_E_ERROR an error occurred during execution.</br>
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool
*exist);
-
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo* pInfo, bool*
exist);
/** locks this API so that it cannot be used by other threads.
diff --git a/include/jvmfwk/jvmfwkdllapi.hxx b/include/jvmfwk/jvmfwkdllapi.hxx
index 67be38afb6f8..bd59abb74d81 100644
--- a/include/jvmfwk/jvmfwkdllapi.hxx
+++ b/include/jvmfwk/jvmfwkdllapi.hxx
@@ -13,9 +13,9 @@
#include <sal/types.h>
#if defined JVMFWK_DLLIMPLEMENTATION
-# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#endif
diff --git a/include/linguistic/lngdllapi.h b/include/linguistic/lngdllapi.h
index b03f294a20f6..3944d47cfe22 100644
--- a/include/linguistic/lngdllapi.h
+++ b/include/linguistic/lngdllapi.h
@@ -24,9 +24,9 @@
#include <sal/types.h>
#if defined(LNG_DLLIMPLEMENTATION)
-#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define LNG_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/linguistic/lngprops.hxx b/include/linguistic/lngprops.hxx
index 94278fd16947..9861a384b3bd 100644
--- a/include/linguistic/lngprops.hxx
+++ b/include/linguistic/lngprops.hxx
@@ -22,7 +22,7 @@
// maximal number of suggestions to be returned in spelling context-menu
// (may not include results added by looking up user dictionaries)
-#define UPN_MAX_NUMBER_OF_SUGGESTIONS "MaxNumberOfSuggestions"
+#define UPN_MAX_NUMBER_OF_SUGGESTIONS "MaxNumberOfSuggestions"
#endif
diff --git a/include/o3tl/deleter.hxx b/include/o3tl/deleter.hxx
index a886acb03d3c..7cb9145eb2a1 100644
--- a/include/o3tl/deleter.hxx
+++ b/include/o3tl/deleter.hxx
@@ -17,15 +17,15 @@
#include <com/sun/star/uno/Exception.hpp>
#include <sal/log.hxx>
-namespace o3tl {
-
+namespace o3tl
+{
/** To markup std::unique_ptr that coverity warns might throw exceptions
which won't throw in practice, or where std::terminate is
an acceptable response if they do
*/
-template<typename T> struct default_delete
+template <typename T> struct default_delete
{
- void operator() (T* p) noexcept
+ void operator()(T* p) noexcept
{
#if defined(__COVERITY__)
try
@@ -53,7 +53,7 @@ struct free_delete
void operator()(void* p) { std::free(p); }
};
-template<typename uniqueptr> void reset_preserve_ptr_during(uniqueptr& ptr)
+template <typename uniqueptr> void reset_preserve_ptr_during(uniqueptr& ptr)
{
// HACK: for the case where the dtor of the obj held by ptr will trigger
// functions which expect ptr to still be set during the dtor.
@@ -62,7 +62,6 @@ template<typename uniqueptr> void
reset_preserve_ptr_during(uniqueptr& ptr)
delete ptr.get();
(void)ptr.release();
}
-
}
#endif
diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index e822fde0294c..c7132fd079c4 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -17,7 +17,6 @@
namespace o3tl
{
-
/** LRU map
*
* Similar to unordered_map (it actually uses it) with additionally
functionality
@@ -31,7 +30,8 @@ namespace o3tl
* for most of the operations with a combination unordered map and linked list.
*
**/
-template<typename Key, typename Value, class KeyHash = std::hash<Key>, class
KeyEqual = std::equal_to<Key>>
+template <typename Key, typename Value, class KeyHash = std::hash<Key>,
+ class KeyEqual = std::equal_to<Key>>
class lru_map final
{
public:
@@ -68,7 +68,8 @@ public:
// a size of 0 effectively disables the LRU cleanup code
lru_map(size_t nMaxSize)
: mMaxSize(nMaxSize ? nMaxSize : std::min(mLruMap.max_size(),
mLruList.max_size()))
- {}
+ {
+ }
~lru_map()
{
// Some code .e.g. SalBitmap likes to remove itself from a cache
during it's destructor, which means we
@@ -139,8 +140,7 @@ public:
}
// reverse-iterates the list removing all items matching the predicate
- template<class UnaryPredicate>
- void remove_if(UnaryPredicate pred)
+ template <class UnaryPredicate> void remove_if(UnaryPredicate pred)
{
auto it = mLruList.rbegin();
while (it != mLruList.rend())
@@ -155,15 +155,9 @@ public:
}
}
- list_const_iterator_t begin() const
- {
- return mLruList.cbegin();
- }
+ list_const_iterator_t begin() const { return mLruList.cbegin(); }
- list_const_iterator_t end() const
- {
- return mLruList.cend();
- }
+ list_const_iterator_t end() const { return mLruList.cend(); }
size_t size() const
{
@@ -177,7 +171,6 @@ public:
mLruList.clear();
}
};
-
}
#endif /* INCLUDED_O3TL_LRU_MAP_HXX */
diff --git a/include/o3tl/make_shared.hxx b/include/o3tl/make_shared.hxx
index 9d7998fd5a36..5d4d98e42b3a 100644
--- a/include/o3tl/make_shared.hxx
+++ b/include/o3tl/make_shared.hxx
@@ -14,14 +14,13 @@
#include <memory>
#include <type_traits>
-namespace o3tl {
-
+namespace o3tl
+{
/** Allocate an array stored in a shared_ptr, calling operator delete[].
Note that this is only allowed for arithmetic types because shared_ptr
implicitly converts to sub-types.
*/
-template<typename T>
-std::shared_ptr<T> make_shared_array(size_t const size)
+template <typename T> std::shared_ptr<T> make_shared_array(size_t const size)
{
static_assert(std::is_arithmetic<T>::value, "only arrays of arithmetic
types allowed");
return std::shared_ptr<T>(new T[size], std::default_delete<T[]>());
@@ -31,8 +30,7 @@ std::shared_ptr<T> make_shared_array(size_t const size)
which won't throw in practice, or where std::terminate is
an acceptable response if they do
*/
-template<class T, class... Args>
-std::shared_ptr<T> make_shared(Args&&... args)
+template <class T, class... Args> std::shared_ptr<T> make_shared(Args&&...
args)
{
#if defined(__COVERITY__)
return std::shared_ptr<T>(new T(std::forward<Args>(args)...),
o3tl::default_delete<T>());
diff --git a/include/o3tl/runtimetooustring.hxx
b/include/o3tl/runtimetooustring.hxx
index 7f2015805722..6d6f27ac186e 100644
--- a/include/o3tl/runtimetooustring.hxx
+++ b/include/o3tl/runtimetooustring.hxx
@@ -20,8 +20,8 @@
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
-namespace o3tl {
-
+namespace o3tl
+{
/** Convert an NTBS from the C++ runtime to an OUString.
This is used to convert an NTBS as provided by std::exception::what or
@@ -29,18 +29,17 @@ namespace o3tl {
is done using RTL_TEXTENCODING_ISO_8859_1, so each char in the input maps
to one Unicode character in the output.
*/
-inline OUString runtimeToOUString(char const * runtimeString) {
+inline OUString runtimeToOUString(char const* runtimeString)
+{
OUString s;
bool ok = rtl_convertStringToUString(
- &s.pData, runtimeString, std::strlen(runtimeString),
- RTL_TEXTENCODING_ISO_8859_1,
- (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
- | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ &s.pData, runtimeString, std::strlen(runtimeString),
RTL_TEXTENCODING_ISO_8859_1,
+ (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
| RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR));
- assert(ok); (void) ok;
+ assert(ok);
+ (void)ok;
return s;
}
-
}
#endif
diff --git a/include/onlineupdate/mozilla/Likely.h
b/include/onlineupdate/mozilla/Likely.h
index 4f2160929544..5625bb226e40 100644
--- a/include/onlineupdate/mozilla/Likely.h
+++ b/include/onlineupdate/mozilla/Likely.h
@@ -13,11 +13,11 @@
#define mozilla_Likely_h
#if defined(__clang__) || defined(__GNUC__)
-# define MOZ_LIKELY(x) (__builtin_expect(!!(x), 1))
-# define MOZ_UNLIKELY(x) (__builtin_expect(!!(x), 0))
+#define MOZ_LIKELY(x) (__builtin_expect(!!(x), 1))
+#define MOZ_UNLIKELY(x) (__builtin_expect(!!(x), 0))
#else
-# define MOZ_LIKELY(x) (!!(x))
-# define MOZ_UNLIKELY(x) (!!(x))
+#define MOZ_LIKELY(x) (!!(x))
+#define MOZ_UNLIKELY(x) (!!(x))
#endif
#endif /* mozilla_Likely_h */
diff --git a/include/oox/mathml/importutils.hxx
b/include/oox/mathml/importutils.hxx
index 07144c4575a0..851b2564a100 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -18,13 +18,16 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com::sun::star {
- namespace xml::sax { class XFastAttributeList; }
+namespace com::sun::star
+{
+namespace xml::sax
+{
+class XFastAttributeList;
+}
}
namespace oox::formulaimport
{
-
// used to differentiate between tags that opening or closing
const int TAG_OPENING = 1 << 29;
const int TAG_CLOSING = 1 << 30;
@@ -32,8 +35,8 @@ const int TAG_CLOSING = 1 << 30;
// you probably want to #define these to something shorter in the .cxx file,
// but they must be done as macros, otherwise they wouldn't be usable for case
values,
// and macros cannot be namespaced
-#define XML_STREAM_OPENING( token ) ( TAG_OPENING | token )
-#define XML_STREAM_CLOSING( token ) ( TAG_CLOSING | token )
+#define XML_STREAM_OPENING(token) (TAG_OPENING | token)
+#define XML_STREAM_CLOSING(token) (TAG_CLOSING | token)
/**
Class for storing a stream of xml tokens.
@@ -116,23 +119,23 @@ public:
// which means using oox::AttributeList would make them all point to the
one instance.
struct OOX_DLLPUBLIC AttributeList
{
- OUString& operator[] (int token);
- OUString attribute( int token, const OUString& def) const;
- bool attribute( int token, bool def ) const;
- sal_Unicode attribute( int token, sal_Unicode def ) const;
+ OUString& operator[](int token);
+ OUString attribute(int token, const OUString& def) const;
+ bool attribute(int token, bool def) const;
+ sal_Unicode attribute(int token, sal_Unicode def) const;
// when adding more attribute() overloads, add also to XmlStream itself
protected:
- std::map< int, OUString > attrs;
+ std::map<int, OUString> attrs;
};
/**
Structure representing a tag, including its attributes and content text
immediately following it.
*/
struct OOX_DLLPUBLIC Tag
{
- Tag( int token = XML_TOKEN_INVALID,
- const css::uno::Reference< css::xml::sax::XFastAttributeList >&
attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >());
- Tag( int token,
- const AttributeList& attribs);
+ Tag(int token = XML_TOKEN_INVALID,
+ const css::uno::Reference<css::xml::sax::XFastAttributeList>&
attributes
+ = css::uno::Reference<css::xml::sax::XFastAttributeList>());
+ Tag(int token, const AttributeList& attribs);
int token; ///< tag type, or XML_TOKEN_INVALID
AttributeList attributes;
OUString text;
@@ -140,15 +143,15 @@ public:
This function returns value of the given attribute, or the passed
default value if not found.
The type of the default value selects the return type (OUString here).
*/
- OUString attribute( int token, const OUString& def = OUString()) const;
+ OUString attribute(int token, const OUString& def = OUString()) const;
/**
@overload
*/
- bool attribute( int token, bool def ) const;
+ bool attribute(int token, bool def) const;
/**
@overload
*/
- sal_Unicode attribute( int token, sal_Unicode def ) const;
+ sal_Unicode attribute(int token, sal_Unicode def) const;
// when adding more attribute() overloads, add also to
XmlStream::AttributeList and inline below
/**
Converts to true if the tag has a valid token, false otherwise.
Allows simple
@@ -178,34 +181,35 @@ public:
If found, the position in the stream is afterwards moved to the next tag.
@return the matching found opening tag, or empty tag if not found
*/
- Tag ensureOpeningTag( int token );
+ Tag ensureOpeningTag(int token);
/**
Tries to find an opening tag with the given token. Works similarly like
ensureOpeningTag(),
but if a matching tag is not found, the position in the stream is not
altered. The primary
use of this function is to check for optional elements.
@return the matching found opening tag, or empty tag if not found
*/
- Tag checkOpeningTag( int token );
+ Tag checkOpeningTag(int token);
/**
Ensures that a closing tag with the given token is read. Like
ensureOpeningTag(),
if not, writes out a warning and tries to recover by skipping tags until
found (or until the current element would end).
If found, the position in the stream is afterwards moved to the next tag.
*/
- void ensureClosingTag( int token );
+ void ensureClosingTag(int token);
/**
Tries to find the given token, until either found (returns true) or end
of current element.
Position in the stream is set to make the tag current (i.e. it will be
the next one read).
*/
- bool findTag( int token );
+ bool findTag(int token);
/**
Handle the current (unexpected) tag.
*/
void handleUnexpectedTag();
+
protected:
- Tag checkTag( int token, bool optional );
- bool findTagInternal( int token, bool silent );
- void skipElementInternal( int token, bool silent );
- std::vector< Tag > tags;
+ Tag checkTag(int token, bool optional);
+ bool findTagInternal(int token, bool silent);
+ void skipElementInternal(int token, bool silent);
+ std::vector<Tag> tags;
unsigned int pos;
};
@@ -216,35 +220,31 @@ protected:
@since 3.5.0
*/
-class OOX_DLLPUBLIC XmlStreamBuilder
-: public XmlStream
+class OOX_DLLPUBLIC XmlStreamBuilder : public XmlStream
{
public:
- void appendOpeningTag( int token,
- const css::uno::Reference< css::xml::sax::XFastAttributeList >&
attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >());
- void appendOpeningTag( int token,
- const AttributeList& attribs );
- void appendClosingTag( int token );
+ void appendOpeningTag(int token,
+ const
css::uno::Reference<css::xml::sax::XFastAttributeList>& attributes
+ =
css::uno::Reference<css::xml::sax::XFastAttributeList>());
+ void appendOpeningTag(int token, const AttributeList& attribs);
+ void appendClosingTag(int token);
// appends the characters after the last appended token
- void appendCharacters( const OUString& characters );
+ void appendCharacters(const OUString& characters);
};
-inline
-OUString XmlStream::Tag::attribute( int t, const OUString& def ) const
+inline OUString XmlStream::Tag::attribute(int t, const OUString& def) const
{
- return attributes.attribute( t, def );
+ return attributes.attribute(t, def);
}
-inline
-bool XmlStream::Tag::attribute( int t, bool def ) const
+inline bool XmlStream::Tag::attribute(int t, bool def) const
{
- return attributes.attribute( t, def );
+ return attributes.attribute(t, def);
}
-inline
-sal_Unicode XmlStream::Tag::attribute( int t, sal_Unicode def ) const
+inline sal_Unicode XmlStream::Tag::attribute(int t, sal_Unicode def) const
{
- return attributes.attribute( t, def );
+ return attributes.attribute(t, def);
}
} // namespace
diff --git a/include/oox/token/namespacemap.hxx
b/include/oox/token/namespacemap.hxx
index b8068bb0bd8c..26e4fdce95f7 100644
--- a/include/oox/token/namespacemap.hxx
+++ b/include/oox/token/namespacemap.hxx
@@ -26,24 +26,24 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace oox {
-
-
+namespace oox
+{
/** A map that contains all XML namespace URLs used in the filters. */
struct NamespaceMap
{
- std::map< sal_Int32, OUString > maTransitionalNamespaceMap;
- std::map< sal_Int32, OUString > maStrictNamespaceMap;
+ std::map<sal_Int32, OUString> maTransitionalNamespaceMap;
+ std::map<sal_Int32, OUString> maStrictNamespaceMap;
NamespaceMap();
- typedef std::map< sal_Int32, OUString >::iterator iterator;
- typedef std::map< sal_Int32, OUString >::const_iterator const_iterator;
+ typedef std::map<sal_Int32, OUString>::iterator iterator;
+ typedef std::map<sal_Int32, OUString>::const_iterator const_iterator;
};
/** Thread-save singleton of a map of all supported XML namespace URLs. */
-struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap,
StaticNamespaceMap > {};
-
+struct StaticNamespaceMap : public ::rtl::Static<NamespaceMap,
StaticNamespaceMap>
+{
+};
} // namespace oox
diff --git a/include/oox/token/propertynames.hxx
b/include/oox/token/propertynames.hxx
index 1f5f3341dd53..84077359e1fe 100644
--- a/include/oox/token/propertynames.hxx
+++ b/include/oox/token/propertynames.hxx
@@ -25,15 +25,18 @@
#include <rtl/instance.hxx>
#include <rtl/ustring.hxx>
-namespace oox {
-
-
+namespace oox
+{
/** A vector that contains all predefined property names used in the filters.
*/
-struct PropertyNameVector : public ::std::vector< OUString > {
PropertyNameVector(); };
+struct PropertyNameVector : public ::std::vector<OUString>
+{
+ PropertyNameVector();
+};
/** Thread-save singleton of a vector of all supported property names. */
-struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector,
StaticPropertyNameVector > {};
-
+struct StaticPropertyNameVector : public ::rtl::Static<PropertyNameVector,
StaticPropertyNameVector>
+{
+};
} // namespace oox
diff --git a/include/oox/token/relationship.hxx
b/include/oox/token/relationship.hxx
index adc25f4a73b6..adffd4b6617e 100644
--- a/include/oox/token/relationship.hxx
+++ b/include/oox/token/relationship.hxx
@@ -14,8 +14,8 @@
#include <rtl/ustring.hxx>
-namespace oox {
-
+namespace oox
+{
enum class Relationship
{
ACTIVEXCONTROLBINARY,
@@ -66,7 +66,6 @@ enum class Relationship
};
OUString OOX_DLLPUBLIC getRelationship(Relationship eRelationship);
-
}
#endif // INCLUDED_OOX_TOKEN_RELATIONSHIP_HXX
diff --git a/include/opencl/OpenCLZone.hxx b/include/opencl/OpenCLZone.hxx
index 1bbf3a46161c..8247e667d0c8 100644
--- a/include/opencl/OpenCLZone.hxx
+++ b/include/opencl/OpenCLZone.hxx
@@ -16,14 +16,14 @@
#include <comphelper/crashzone.hxx>
-class OPENCL_DLLPUBLIC OpenCLZone : public CrashZone< OpenCLZone >
+class OPENCL_DLLPUBLIC OpenCLZone : public CrashZone<OpenCLZone>
{
public:
static void hardDisable();
};
// Used during initial testing of OpenCL.
-class OPENCL_DLLPUBLIC OpenCLInitialZone : public CrashZone< OpenCLInitialZone
>
+class OPENCL_DLLPUBLIC OpenCLInitialZone : public CrashZone<OpenCLInitialZone>
{
};
diff --git a/include/opencl/opencldllapi.h b/include/opencl/opencldllapi.h
index f62b94cb77fc..99bfd6cb9e79 100644
--- a/include/opencl/opencldllapi.h
+++ b/include/opencl/opencldllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(OPENCL_DLLIMPLEMENTATION)
-#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define OPENCL_DLLPRIVATE SAL_DLLPRIVATE
diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index 23c41efbe77c..acc308b8f9ef 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -21,9 +21,9 @@
/* More flags needed for semantics that match the open() call that
used to be in SvFileStream::Open(), and for temp files:
*/
-#define osl_File_OpenFlag_Trunc 0x00000010L
-#define osl_File_OpenFlag_NoExcl 0x00000020L
-#define osl_File_OpenFlag_Private 0x00000040L
+#define osl_File_OpenFlag_Trunc 0x00000010L
+#define osl_File_OpenFlag_NoExcl 0x00000020L
+#define osl_File_OpenFlag_Private 0x00000040L
/** @endcond */
diff --git a/include/osl/getglobalmutex.hxx b/include/osl/getglobalmutex.hxx
index 4fbd32a3e4b5..628fe97c98f8 100644
--- a/include/osl/getglobalmutex.hxx
+++ b/include/osl/getglobalmutex.hxx
@@ -22,8 +22,8 @@
#include "osl/mutex.hxx"
-namespace osl {
-
+namespace osl
+{
/** A helper functor for the rtl_Instance template.
See the rtl_Instance template for examples of how this class is used.
@@ -31,12 +31,8 @@ namespace osl {
class GetGlobalMutex
{
public:
- ::osl::Mutex * operator()()
- {
- return ::osl::Mutex::getGlobalMutex();
- }
+ ::osl::Mutex* operator()() { return ::osl::Mutex::getGlobalMutex(); }
};
-
}
#endif // INCLUDED_OSL_GETGLOBALMUTEX_HXX
diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx
index 57f2c76b1c7c..7f35e1155b48 100644
--- a/include/osl/pipe_decl.hxx
+++ b/include/osl/pipe_decl.hxx
@@ -20,11 +20,11 @@
#define INCLUDED_OSL_PIPE_DECL_HXX
#include "osl/pipe.h"
-# include "osl/security.hxx"
+#include "osl/security.hxx"
#include "rtl/ustring.hxx"
-namespace osl {
-
+namespace osl
+{
class StreamPipe;
/** Represents a pipe.
@@ -35,7 +35,6 @@ protected:
oslPipe m_handle;
public:
-
/** Does not create a pipe. Use assignment operator to
make this a usable pipe.
*/
@@ -52,19 +51,19 @@ public:
@param Options
@param rSecurity
*/
- inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options,const
Security & rSecurity);
+ inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options, const
Security& rSecurity);
/** Copy constructor.
*/
inline Pipe(const Pipe& pipe);
#if defined LIBO_INTERNAL_ONLY
- inline Pipe(Pipe && other) noexcept;
+ inline Pipe(Pipe&& other) noexcept;
#endif
/** Constructs a Pipe reference without acquiring the handle
*/
- inline Pipe( oslPipe pipe, __sal_NoAcquire noacquire );
+ inline Pipe(oslPipe pipe, __sal_NoAcquire noacquire);
/** Creates pipe as wrapper around the underlying oslPipe.
@param Pipe
@@ -85,8 +84,8 @@ public:
@param rSec
@return True if socket was successfully created.
*/
- inline bool create( const ::rtl::OUString & strName,
- oslPipeOptions Options, const Security &rSec );
+ inline bool create(const ::rtl::OUString& strName, oslPipeOptions Options,
+ const Security& rSec);
/** Creates a secure that access rights depend on the umask settings
with the given attributes.
@@ -96,7 +95,7 @@ public:
@param Options
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
