[Libreoffice-commits] core.git: accessibility/source basegfx/source basegfx/test basic/source bridges/source canvas/source chart2/source comphelper/qa comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cppu/source cpputools/source cui/source dbaccess/source desktop/source desktop/unx editeng/source extensions/source filter/source forms/source formula/source hwpfilter/source i18nlangtag/source i18npool/source i18nutil/source idl/source javaunohelper/source libreofficekit/source lingucomponent/source linguistic/source lotuswordpro/source oox/source registry/source sal/osl sal/qa sal/rtl sax/source scaddins/source sc/qa scripting/source sc/source sdext/source sd/qa sd/source sfx2/source shell/source slideshow/source solenv/bin starmath/source stoc/source store/source svl/qa svl/source svx/source sw/source testtools/source tools/source ucb/source unotools/source vcl/headless vcl/opengl vcl/source vcl/unx xmlhelp/source xmloff/source xmlscript/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 9 12:47:49 UTC 2018
accessibility/source/helper/acc_factory.cxx | 2
basegfx/source/color/bcolortools.cxx | 2
basegfx/source/curve/b2dcubicbezier.cxx | 2
basegfx/source/polygon/b2dpolygontools.cxx | 2
basegfx/source/polygon/b3dpolypolygontools.cxx | 2
basegfx/source/range/b2drangeclipper.cxx | 14 -
basegfx/source/tools/tools.cxx | 2
basegfx/test/boxclipper.cxx | 2
basic/source/runtime/methods.cxx | 4
basic/source/runtime/methods1.cxx | 6
basic/source/runtime/runtime.cxx | 2
bridges/source/jni_uno/jni_data.cxx | 2
canvas/source/simplecanvas/simplecanvasimpl.cxx | 4
chart2/source/view/main/ChartView.cxx | 4
chart2/source/view/main/VLegend.cxx | 4
comphelper/qa/unit/variadictemplates.cxx | 6
comphelper/source/misc/anytostring.cxx | 2
compilerplugins/clang/redundantinline.cxx | 108 +++++++---
compilerplugins/clang/test/redundantinline.cxx | 10
compilerplugins/clang/test/redundantinline.hxx | 20 +
connectivity/source/commontools/CommonTools.cxx | 2
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2
connectivity/source/drivers/postgresql/pq_tools.cxx | 6
cppu/source/threadpool/threadident.cxx | 2
cppu/source/typelib/static_types.cxx | 6
cppu/source/typelib/typelib.cxx | 14 -
cppu/source/uno/lbenv.cxx | 32 +-
cppu/source/uno/lbmap.cxx | 10
cppu/source/uno/sequence.cxx | 8
cppuhelper/source/access_control.cxx | 4
cppuhelper/source/component_context.cxx | 4
cppuhelper/source/exc_thrower.cxx | 4
cppuhelper/source/implbase_ex.cxx | 14 -
cppuhelper/source/macro_expander.cxx | 4
cppuhelper/source/propshlp.cxx | 6
cppuhelper/source/tdmgr.cxx | 12 -
cppuhelper/source/typeprovider.cxx | 2
cppuhelper/source/weak.cxx | 2
cpputools/source/unoexe/unoexe.cxx | 4
cui/source/options/optlingu.cxx | 2
cui/source/options/treeopt.cxx | 4
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/grfpage.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 2
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 2
desktop/source/deployment/misc/dp_misc.cxx | 2
desktop/source/deployment/registry/dp_registry.cxx | 4
desktop/source/deployment/registry/package/dp_package.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2
desktop/unx/source/splashx.c | 4
editeng/source/editeng/impedit.cxx | 2
editeng/source/items/frmitems.cxx | 4
editeng/source/items/paperinf.cxx | 2
editeng/source/misc/svxacorr.cxx | 8
editeng/source/rtf/rtfitem.cxx | 2
editeng/source/uno/unofield.cxx | 4
extensions/source/logging/csvformatter.cxx | 4
extensions/source/scanner/sane.cxx | 4
filter/source/graphicfilter/idxf/dxfreprd.cxx | 4
filter/source/msfilter/countryid.cxx | 4
filter/source/msfilter/mscodec.cxx | 6
forms/source/xforms/xmlhelper.cxx | 2
formula/source/core/api/FormulaCompiler.cxx | 2
formula/source/core/api/token.cxx | 2
formula/source/ui/dlg/FormulaHelper.cxx | 2
hwpfilter/source/mzstring.cxx | 2
i18nlangtag/source/isolang/isolang.cxx | 2
i18nlangtag/source/languagetag/languagetag.cxx | 4
i18npool/source/breakiterator/breakiteratorImpl.cxx | 2
i18npool/source/breakiterator/breakiterator_cjk.cxx | 2
i18npool/source/breakiterator/gendict.cxx | 16 -
i18nutil/source/utility/casefolding.cxx | 2
idl/source/prj/globals.cxx | 2
idl/source/prj/svidl.cxx | 2
javaunohelper/source/bootstrap.cxx | 2
libreofficekit/source/gtk/lokdocview.cxx | 2
lingucomponent/source/languageguessing/guess.cxx | 2
linguistic/source/misc.cxx | 2
lotuswordpro/source/filter/xfilter/xfbase64.cxx | 2
oox/source/core/filterbase.cxx | 2
oox/source/core/recordparser.cxx | 2
oox/source/drawingml/chart/axisconverter.cxx | 2
oox/source/drawingml/color.cxx | 10
oox/source/drawingml/shape.cxx | 8
oox/source/export/vmlexport.cxx | 4
oox/source/helper/graphichelper.cxx | 2
oox/source/ole/olehelper.cxx | 4
oox/source/vml/vmlinputstream.cxx | 6
registry/source/reflwrit.cxx | 2
sal/osl/all/debugbase.cxx | 2
sal/osl/unx/file_path_helper.cxx | 6
sal/osl/unx/file_stat.cxx | 22 +-
sal/osl/unx/uunxapi.cxx | 2
sal/qa/osl/file/osl_File.cxx | 40 +--
sal/qa/osl/module/osl_Module.cxx | 2
sal/qa/osl/pipe/osl_Pipe.cxx | 2
sal/qa/osl/process/osl_process.cxx | 2
sal/qa/osl/security/osl_Security.cxx | 2
sal/qa/rtl/process/rtl_Process.cxx | 4
sal/rtl/alloc_arena.cxx | 10
sal/rtl/bootstrap.cxx | 2
sal/rtl/math.cxx | 6
sal/rtl/strtmpl.cxx | 6
sal/rtl/uri.cxx | 10
sax/source/expatwrap/saxwriter.cxx | 72 +++---
sc/qa/extras/new_cond_format.cxx | 2
sc/source/core/data/bcaslot.cxx | 2
sc/source/core/data/column.cxx | 2
sc/source/core/data/column2.cxx | 2
sc/source/core/data/dociter.cxx | 2
sc/source/core/data/documen8.cxx | 2
sc/source/core/data/dpdimsave.cxx | 2
sc/source/core/data/drwlayer.cxx | 8
sc/source/core/data/patattr.cxx | 6
sc/source/core/tool/addincol.cxx | 2
sc/source/core/tool/address.cxx | 26 +-
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/detfunc.cxx | 4
sc/source/core/tool/formularesult.cxx | 4
sc/source/core/tool/interpr1.cxx | 6
sc/source/core/tool/interpr2.cxx | 2
sc/source/core/tool/interpr3.cxx | 2
sc/source/core/tool/interpr5.cxx | 2
sc/source/core/tool/prnsave.cxx | 2
sc/source/core/tool/reffind.cxx | 4
sc/source/core/tool/scmatrix.cxx | 2
sc/source/filter/excel/xechart.cxx | 4
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xeformula.cxx | 38 +--
sc/source/filter/excel/xehelper.cxx | 2
sc/source/filter/excel/xelink.cxx | 2
sc/source/filter/excel/xestring.cxx | 2
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/excel/xihelper.cxx | 2
sc/source/filter/excel/xilink.cxx | 2
sc/source/filter/excel/xlformula.cxx | 2
sc/source/filter/html/htmlpars.cxx | 2
sc/source/filter/oox/drawingbase.cxx | 4
sc/source/filter/oox/formulabase.cxx | 4
sc/source/filter/oox/richstring.cxx | 2
sc/source/filter/oox/stylesbuffer.cxx | 4
sc/source/filter/oox/unitconverter.cxx | 2
sc/source/filter/oox/worksheethelper.cxx | 2
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 4
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 8
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/app/scmod.cxx | 2
sc/source/ui/docshell/autostyl.cxx | 2
sc/source/ui/docshell/datastream.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 2
sc/source/ui/docshell/docsh8.cxx | 4
sc/source/ui/docshell/impex.cxx | 6
sc/source/ui/drawfunc/fusel2.cxx | 2
sc/source/ui/miscdlgs/autofmt.cxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 2
sc/source/ui/vba/vbarange.cxx | 4
sc/source/ui/vba/vbasheetobjects.cxx | 4
sc/source/ui/view/gridwin4.cxx | 1
sc/source/ui/view/output2.cxx | 8
sc/source/ui/view/printfun.cxx | 6
sc/source/ui/view/tabview.cxx | 4
scaddins/source/analysis/analysishelper.cxx | 12 -
scaddins/source/pricing/black_scholes.cxx | 6
scripting/source/stringresource/stringresource.cxx | 8
sd/qa/unit/export-tests-ooxml2.cxx | 4
sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 6
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/view/lokcharthelper.cxx | 4
shell/source/all/xml_parser.cxx | 2
shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2
shell/source/tools/lngconvex/lngconvex.cxx | 4
shell/source/unix/sysshell/recently_used_file.cxx | 2
slideshow/source/engine/opengl/Operation.cxx | 2
slideshow/source/engine/opengl/TransitionImpl.cxx | 4
slideshow/source/engine/slide/layermanager.cxx | 2
solenv/bin/concat-deps.c | 18 -
starmath/source/mathmlexport.cxx | 2
stoc/source/invocation/invocation.cxx | 2
stoc/source/invocation_adapterfactory/iafactory.cxx | 6
stoc/source/proxy_factory/proxyfac.cxx | 8
stoc/source/security/access_controller.cxx | 26 +-
stoc/source/security/permissions.cxx | 6
stoc/source/servicemanager/servicemanager.cxx | 8
stoc/source/typeconv/convert.cxx | 4
store/source/stordir.cxx | 2
svl/qa/unit/svl.cxx | 2
svl/source/misc/adrparse.cxx | 12 -
svl/source/misc/sharedstringpool.cxx | 2
svl/source/misc/urihelper.cxx | 2
svx/source/accessibility/AccessibleControlShape.cxx | 2
svx/source/dialog/frmdirlbox.cxx | 4
svx/source/dialog/frmsel.cxx | 2
svx/source/items/pageitem.cxx | 2
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdopath.cxx | 4
svx/source/svdraw/svdpdf.cxx | 6
sw/source/core/access/accmap.cxx | 4
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/bastyp/swregion.cxx | 2
sw/source/core/crsr/pam.cxx | 2
sw/source/core/crsr/trvlfnfl.cxx | 4
sw/source/core/doc/CntntIdxStore.cxx | 26 +-
sw/source/core/doc/DocumentRedlineManager.cxx | 2
sw/source/core/doc/docbm.cxx | 6
sw/source/core/doc/doccomp.cxx | 2
sw/source/core/doc/doccorr.cxx | 6
sw/source/core/doc/docfld.cxx | 2
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/gctable.cxx | 4
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl1.cxx | 6
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/nodes.cxx | 2
sw/source/core/edit/edattr.cxx | 4
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/layout/flycnt.cxx | 2
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/ftnfrm.cxx | 2
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/layout/trvlfrm.cxx | 4
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/itrform2.cxx | 2
sw/source/core/text/widorp.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 2
sw/source/core/unocore/unoframe.cxx | 4
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unosett.cxx | 2
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 6
sw/source/filter/ww8/ww8par2.cxx | 4
sw/source/filter/ww8/ww8par6.cxx | 6
sw/source/filter/ww8/ww8scan.cxx | 10
sw/source/ui/frmdlg/column.cxx | 5
sw/source/ui/table/autoformatpreview.cxx | 4
sw/source/uibase/config/fontcfg.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/envelp/labelcfg.cxx | 4
sw/source/uibase/fldui/fldmgr.cxx | 2
sw/source/uibase/lingu/olmenu.cxx | 2
sw/source/uibase/misc/glosdoc.cxx | 2
sw/source/uibase/uiview/viewport.cxx | 2
sw/source/uibase/wrtsh/delete.cxx | 4
testtools/source/bridgetest/bridgetest.cxx | 4
testtools/source/bridgetest/cppobj.cxx | 2
tools/source/datetime/tdate.cxx | 6
tools/source/fsys/urlobj.cxx | 2
tools/source/generic/poly.cxx | 2
tools/source/inet/inetmime.cxx | 12 -
tools/source/stream/stream.cxx | 16 -
ucb/source/ucp/expand/ucpexpand.cxx | 4
ucb/source/ucp/ftp/ftpdirp.cxx | 2
unotools/source/config/bootstrap.cxx | 4
unotools/source/config/configitem.cxx | 3
unotools/source/config/configpaths.cxx | 3
unotools/source/config/lingucfg.cxx | 2
unotools/source/i18n/localedatawrapper.cxx | 8
unotools/source/misc/datetime.cxx | 4
vcl/headless/svpprn.cxx | 2
vcl/opengl/RenderList.cxx | 2
vcl/opengl/salbmp.cxx | 4
vcl/source/app/i18nhelp.cxx | 2
vcl/source/app/scheduler.cxx | 12 -
vcl/source/app/svapp.cxx | 2
vcl/source/bitmap/BitmapDuoToneFilter.cxx | 3
vcl/source/control/field.cxx | 2
vcl/source/control/longcurr.cxx | 2
vcl/source/edit/texteng.cxx | 2
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/filter/ipdf/pdfread.cxx | 2
vcl/source/fontsubset/cff.cxx | 2
vcl/source/gdi/bmpfast.cxx | 18 -
vcl/source/gdi/dibtools.cxx | 4
vcl/source/gdi/metaact.cxx | 8
vcl/source/gdi/pdfwriter_impl.cxx | 6
vcl/source/gdi/pdfwriter_impl2.cxx | 2
vcl/source/gdi/region.cxx | 2
vcl/source/gdi/sallayout.cxx | 2
vcl/source/gdi/scrptrun.cxx | 2
vcl/source/helper/canvasbitmap.cxx | 2
vcl/source/helper/canvastools.cxx | 2
vcl/source/helper/strhelper.cxx | 8
vcl/source/outdev/bitmap.cxx | 4
vcl/source/outdev/gradient.cxx | 2
vcl/source/outdev/map.cxx | 2
vcl/source/window/status.cxx | 2
vcl/source/window/window2.cxx | 2
vcl/source/window/winproc.cxx | 8
vcl/unx/generic/app/saldisp.cxx | 16 -
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 2
vcl/unx/generic/dtrans/bmp.cxx | 14 -
vcl/unx/generic/fontmanager/fontmanager.cxx | 2
vcl/unx/generic/glyphs/glyphcache.cxx | 2
vcl/unx/generic/print/genprnpsp.cxx | 4
vcl/unx/generic/window/salframe.cxx | 2
vcl/unx/gtk/a11y/atkaction.cxx | 2
vcl/unx/gtk/a11y/atktable.cxx | 2
vcl/unx/gtk/a11y/atktextattributes.cxx | 3
vcl/unx/gtk/a11y/atkwrapper.cxx | 2
vcl/unx/gtk/gtksalframe.cxx | 2
vcl/unx/gtk/salnativewidgets-gtk.cxx | 4
vcl/unx/gtk3/gtk3gtkframe.cxx | 2
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/source/core/RDFaImportHelper.cxx | 2
xmloff/source/style/PageMasterExportPropMapper.cxx | 4
xmloff/source/text/txtflde.cxx | 36 +--
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 4
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 2
316 files changed, 823 insertions(+), 771 deletions(-)
New commits:
commit 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Oct 9 10:28:48 2018 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Oct 9 14:47:17 2018 +0200
Extend loplugin:redundantinline to catch inline functions w/o external linkage
...where "inline" (in its meaning of "this function can be defined in multiple
translation units") thus doesn't make much sense. (As discussed in
compilerplugins/clang/redundantinline.cxx, exempt such "static inline" functions
in include files for now.)
All the rewriting has been done automatically by the plugin, except for one
instance in sw/source/ui/frmdlg/column.cxx that used to involve an #if), plus
some subsequent solenv/clang-format/reformat-formatted-files.
Change-Id: Ib8b996b651aeafc03bbdc8890faa05ed50517224
Reviewed-on: https://gerrit.libreoffice.org/61573
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index cbc9669b18c8..3c4dbd064b25 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -70,7 +70,7 @@ using namespace ::svt::table;
namespace {
-inline bool hasFloatingChild(vcl::Window *pWindow)
+bool hasFloatingChild(vcl::Window *pWindow)
{
vcl::Window * pChild = pWindow->GetAccessibleChildWindow(0);
return pChild && pChild->GetType() == WindowType::FLOATINGWINDOW;
diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
index 7b5bf9cae140..42e326af11a4 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -59,7 +59,7 @@ namespace basegfx { namespace utils
return BColor(h,s,l);
}
- static inline double hsl2rgbHelper( double nValue1, double nValue2, double nHue )
+ static double hsl2rgbHelper( double nValue1, double nValue2, double nHue )
{
// clamp hue to [0,360]
nHue = fmod( nHue, 360.0 );
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index c0adc5a09b37..9584eeded3c0 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -907,7 +907,7 @@ namespace basegfx
namespace
{
- inline void impCheckExtremumResult(double fCandidate, std::vector< double >& rResult)
+ void impCheckExtremumResult(double fCandidate, std::vector< double >& rResult)
{
// check for range ]0.0 .. 1.0[ with excluding 1.0 and 0.0 clearly
// by using the equalZero test, NOT ::more or ::less which will use the
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 27bfa56d8ced..20b193d099bc 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -2161,7 +2161,7 @@ namespace basegfx
namespace
{
/// return 0 for input of 0, -1 for negative and 1 for positive input
- inline int lcl_sgn( const double n )
+ int lcl_sgn( const double n )
{
return n == 0.0 ? 0 : 1 - 2*int(rtl::math::isSignBitSet(n));
}
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index f3975a7a51c0..3b9b15b93890 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -223,7 +223,7 @@ namespace basegfx
// helper for getting the 3D Point from given cartesian coordinates. fHor is defined from
// [F_PI2 .. -F_PI2], fVer from [0.0 .. F_2PI]
- static inline B3DPoint getPointFromCartesian(double fHor, double fVer)
+ static B3DPoint getPointFromCartesian(double fHor, double fVer)
{
const double fCosVer(cos(fVer));
return B3DPoint(fCosVer * cos(fHor), sin(fVer), fCosVer * -sin(fHor));
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
index f98b6bdc6830..bc25fa474682 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -680,7 +680,7 @@ namespace basegfx
aNewEdges );
}
- inline bool isSameRect(ActiveEdge const & rEdge,
+ bool isSameRect(ActiveEdge const & rEdge,
basegfx::B2DRange const & rRect)
{
return &rEdge.getRect() == &rRect;
@@ -689,12 +689,12 @@ namespace basegfx
// wow what a hack. necessary because stl's list::erase does
// not eat reverse_iterator
template<typename Cont, typename Iter> Iter eraseFromList(Cont&, const Iter&);
- template<> inline ListOfEdges::iterator eraseFromList(
+ template<> ListOfEdges::iterator eraseFromList(
ListOfEdges& rList, const ListOfEdges::iterator& aIter)
{
return rList.erase(aIter);
}
- template<> inline ListOfEdges::reverse_iterator eraseFromList(
+ template<> ListOfEdges::reverse_iterator eraseFromList(
ListOfEdges& rList, const ListOfEdges::reverse_iterator& aIter)
{
return ListOfEdges::reverse_iterator(
@@ -702,7 +702,7 @@ namespace basegfx
}
template<int bPerformErase,
- typename Iterator> inline void processActiveEdges(
+ typename Iterator> void processActiveEdges(
Iterator first,
Iterator last,
ListOfEdges& rActiveEdgeList,
@@ -761,7 +761,7 @@ namespace basegfx
}
}
- template<int bPerformErase> inline void processActiveEdgesTopDown(
+ template<int bPerformErase> void processActiveEdgesTopDown(
SweepLineEvent& rCurrEvent,
ListOfEdges& rActiveEdgeList,
VectorOfPolygons& rPolygonPool,
@@ -776,7 +776,7 @@ namespace basegfx
rRes);
}
- template<int bPerformErase> inline void processActiveEdgesBottomUp(
+ template<int bPerformErase> void processActiveEdgesBottomUp(
SweepLineEvent& rCurrEvent,
ListOfEdges& rActiveEdgeList,
VectorOfPolygons& rPolygonPool,
@@ -824,7 +824,7 @@ namespace basegfx
rCurrEvent, rActiveEdgeList, rPolygonPool, rRes);
}
- inline void handleSweepLineEvent( SweepLineEvent& rCurrEvent,
+ void handleSweepLineEvent( SweepLineEvent& rCurrEvent,
ListOfEdges& rActiveEdgeList,
VectorOfPolygons& rPolygonPool,
B2DPolyPolygon& rRes)
diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx
index 16feb0c7ef16..74e1ad785612 100644
--- a/basegfx/source/tools/tools.cxx
+++ b/basegfx/source/tools/tools.cxx
@@ -28,7 +28,7 @@ namespace basegfx
{
namespace
{
- inline double distance( const double& nX,
+ double distance( const double& nX,
const double& nY,
const ::basegfx::B2DVector& rNormal,
const double& nC )
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 49015b66deef..abf966b1f8b4 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -49,7 +49,7 @@ double getRandomOrdinal( const std::size_t n )
return comphelper::rng::uniform_size_distribution(0, n-1);
}
-static inline bool compare(const B2DPoint& left, const B2DPoint& right)
+static bool compare(const B2DPoint& left, const B2DPoint& right)
{
return left.getX()<right.getX()
|| (rtl::math::approxEqual(left.getX(),right.getX()) && left.getY()<right.getY());
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 629e3728980c..1a17454e6a76 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -140,7 +140,7 @@ static const CharClass& GetCharClass()
return aCharClass;
}
-static inline bool isFolder( FileStatus::Type aType )
+static bool isFolder( FileStatus::Type aType )
{
return ( aType == FileStatus::Directory || aType == FileStatus::Volume );
}
@@ -2587,7 +2587,7 @@ static OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLD
return aPathStr;
}
-static inline bool implCheckWildcard( const OUString& rName, SbiRTLData const * pRTLData )
+static bool implCheckWildcard( const OUString& rName, SbiRTLData const * pRTLData )
{
bool bMatch = true;
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 514c8e1e85b0..92cd189ca587 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1828,7 +1828,7 @@ static IntervalInfo const * getIntervalInfo( const OUString& rStringCode )
return nullptr;
}
-static inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
+static void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
{
rnDay = implGetDateDay( dDate );
rnMonth = implGetDateMonth( dDate );
@@ -1840,7 +1840,7 @@ static inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, s
@return the year number, truncated if necessary and in that case also
rMonth and rDay adjusted.
*/
-static inline sal_Int16 limitDate( sal_Int32 n32Year, sal_Int16& rMonth, sal_Int16& rDay )
+static sal_Int16 limitDate( sal_Int32 n32Year, sal_Int16& rMonth, sal_Int16& rDay )
{
if( n32Year > SAL_MAX_INT16 )
{
@@ -1957,7 +1957,7 @@ void SbRtl_DateAdd(StarBASIC *, SbxArray & rPar, bool)
rPar.Get(0)->PutDate( dNewDate );
}
-static inline double RoundImpl( double d )
+static double RoundImpl( double d )
{
return ( d >= 0 ) ? floor( d + 0.5 ) : -floor( -d + 0.5 );
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index b8d16c79578e..e2c1e2ef7920 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1568,7 +1568,7 @@ void SbiRuntime::StepGET()
}
// #67607 copy Uno-Structs
-static inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVariableRef const & refVar )
+static bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVariableRef const & refVar )
{
SbxDataType eVarType = refVar->GetType();
SbxDataType eValType = refVal->GetType();
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index ebe2ce48cc1d..bb26749cadaf 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -31,7 +31,7 @@ namespace jni_uno
{
-static inline std::unique_ptr<rtl_mem> seq_allocate(
+static std::unique_ptr<rtl_mem> seq_allocate(
sal_Int32 nElements, sal_Int32 nSize )
{
std::unique_ptr< rtl_mem > seq(
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 1915b746cf55..fe558b0a8886 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -45,7 +45,7 @@ using namespace canvas;
namespace
{
- inline uno::Sequence< double > color2Sequence( sal_Int32 nColor )
+ uno::Sequence< double > color2Sequence( sal_Int32 nColor )
{
// TODO(F3): Color management
uno::Sequence< double > aRes( 4 );
@@ -58,7 +58,7 @@ namespace
return aRes;
}
- inline uno::Reference< rendering::XPolyPolygon2D > rect2Poly( uno::Reference<rendering::XGraphicDevice> const& xDevice,
+ uno::Reference< rendering::XPolyPolygon2D > rect2Poly( uno::Reference<rendering::XGraphicDevice> const& xDevice,
geometry::RealRectangle2D const& rRect )
{
uno::Sequence< geometry::RealPoint2D > rectSequence( 4 );
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 50a619dce5f4..4d560ca4531d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1860,7 +1860,7 @@ std::shared_ptr< DrawModelWrapper > ChartView::getDrawModelWrapper()
namespace
{
-inline sal_Int32 lcl_getDiagramTitleSpace()
+sal_Int32 lcl_getDiagramTitleSpace()
{
return 200; //=0,2 cm spacing
}
@@ -2049,7 +2049,7 @@ awt::Rectangle ExplicitValueProvider::AddSubtractAxisTitleSizes(
namespace {
-inline double lcl_getPageLayoutDistancePercentage()
+double lcl_getPageLayoutDistancePercentage()
{
return 0.02;
}
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 7b5565a4cb3b..0e6e32be4988 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -609,13 +609,13 @@ awt::Size lcl_placeLegendEntries(
}
// #i109336# Improve auto positioning in chart
-inline sal_Int32 lcl_getLegendLeftRightMargin()
+sal_Int32 lcl_getLegendLeftRightMargin()
{
return 210; // 1/100 mm
}
// #i109336# Improve auto positioning in chart
-inline sal_Int32 lcl_getLegendTopBottomMargin()
+sal_Int32 lcl_getLegendTopBottomMargin()
{
return 185; // 1/100 mm
}
diff --git a/comphelper/qa/unit/variadictemplates.cxx b/comphelper/qa/unit/variadictemplates.cxx
index 1549177d78f4..20d47f89758a 100644
--- a/comphelper/qa/unit/variadictemplates.cxx
+++ b/comphelper/qa/unit/variadictemplates.cxx
@@ -32,7 +32,7 @@ namespace {
namespace detail {
template <typename T>
-inline void extract(
+void extract(
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> const& seq,
sal_Int32 nArg, T & v,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
@@ -54,7 +54,7 @@ inline void extract(
}
template <typename T>
-inline void extract(
+void extract(
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> const& seq,
sal_Int32 nArg, ::boost::optional<T> & v,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
@@ -70,7 +70,7 @@ inline void extract(
} // namespace detail
template < typename T0, typename T1, typename T2, typename T3, typename T4 >
-inline void unwrapArgsBaseline(
+void unwrapArgsBaseline(
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const& seq,
T0& v0, T1& v1, T2& v2, T3& v3, T4& v4,
::com::sun::star::uno::Reference<
diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index 51257fe3c414..37242356e12b 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.cxx
@@ -36,7 +36,7 @@ void appendTypeError(
buf.append( '>' );
}
-inline void appendChar( OUStringBuffer & buf, sal_Unicode c )
+void appendChar( OUStringBuffer & buf, sal_Unicode c )
{
if (c < ' ' || c > '~') {
buf.append( "\\X" );
diff --git a/compilerplugins/clang/redundantinline.cxx b/compilerplugins/clang/redundantinline.cxx
index 223f37ac98cb..30f970caf9d2 100644
--- a/compilerplugins/clang/redundantinline.cxx
+++ b/compilerplugins/clang/redundantinline.cxx
@@ -20,27 +20,24 @@ public:
explicit RedundantInline(loplugin::InstantiationData const & data):
FilteringRewritePlugin(data) {}
- void run() override {
- if (compiler.getLangOpts().CPlusPlus) {
- TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
- }
- }
+ void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
bool VisitFunctionDecl(FunctionDecl const * decl) {
- if (ignoreLocation(decl) || !decl->isInlineSpecified()
- || !(decl->doesThisDeclarationHaveABody()
- || decl->isExplicitlyDefaulted())
- || !(decl->getLexicalDeclContext()->isRecord()
- || decl->isConstexpr()))
- {
+ if (ignoreLocation(decl)) {
return true;
}
- auto l1 = unwindToQObject(compat::getBeginLoc(decl));
- if (l1.isValid() && l1 == unwindToQObject(compat::getEndLoc(decl))) {
+ if (!decl->isInlineSpecified()) {
return true;
}
- SourceLocation inlineLoc;
- unsigned n;
+ handleImplicitInline(decl) || handleNonExternalLinkage(decl);
+ return true;
+ }
+
+private:
+ bool removeInline(FunctionDecl const * decl, SourceLocation * inlineLoc) {
+ assert(inlineLoc != nullptr);
+ assert(inlineLoc->isInvalid());
+ unsigned n = {}; // avoid -Werror=maybe-uninitialized
auto end = Lexer::getLocForEndOfToken(
compiler.getSourceManager().getExpansionLoc(compat::getEndLoc(decl)), 0,
compiler.getSourceManager(), compiler.getLangOpts());
@@ -58,7 +55,7 @@ public:
}
if (s == "inline") {
if (!compiler.getSourceManager().isMacroArgExpansion(loc)) {
- inlineLoc = loc;
+ *inlineLoc = loc;
}
break;
} else if (s == "#") {
@@ -75,8 +72,8 @@ public:
break;
}
}
- if (rewriter != nullptr && inlineLoc.isValid()) {
- for (auto loc = inlineLoc.getLocWithOffset(
+ if (rewriter != nullptr && inlineLoc->isValid()) {
+ for (auto loc = inlineLoc->getLocWithOffset(
std::max<unsigned>(n, 1));;)
{
assert(loc != end);
@@ -95,20 +92,14 @@ public:
n += n2;
loc = loc.getLocWithOffset(n2);
}
- if (removeText(inlineLoc, n, RewriteOptions(RemoveLineIfEmpty))) {
+ if (removeText(*inlineLoc, n, RewriteOptions(RemoveLineIfEmpty))) {
return true;
}
}
- report(
- DiagnosticsEngine::Warning,
- "function definition redundantly declared 'inline'",
- inlineLoc.isValid() ? inlineLoc : compat::getBeginLoc(decl))
- << decl->getSourceRange();
- return true;
+ return false;
}
-private:
- SourceLocation unwindToQObject(SourceLocation const & loc) {
+ SourceLocation unwindTo(SourceLocation const & loc, StringRef name) {
if (!loc.isMacroID()) {
return SourceLocation();
}
@@ -116,8 +107,67 @@ private:
return
(Lexer::getImmediateMacroName(
loc, compiler.getSourceManager(), compiler.getLangOpts())
- == "Q_OBJECT")
- ? l : unwindToQObject(l);
+ == name)
+ ? l : unwindTo(l, name);
+ }
+
+ bool isInMacroExpansion(FunctionDecl const * decl, StringRef name) {
+ auto loc = unwindTo(compat::getBeginLoc(decl), name);
+ return loc.isValid() && loc == unwindTo(compat::getEndLoc(decl), name);
+ }
+
+ bool handleImplicitInline(FunctionDecl const * decl) {
+ if (!(decl->doesThisDeclarationHaveABody() || decl->isExplicitlyDefaulted())
+ || !(decl->getLexicalDeclContext()->isRecord() || decl->isConstexpr()))
+ {
+ return false;
+ }
+ if (isInMacroExpansion(decl, "Q_OBJECT")) {
+ return true;
+ }
+ SourceLocation inlineLoc;
+ if (!removeInline(decl, &inlineLoc)) {
+ report(
+ DiagnosticsEngine::Warning,
+ "function definition redundantly declared 'inline'",
+ inlineLoc.isValid() ? inlineLoc : compat::getBeginLoc(decl))
+ << decl->getSourceRange();
+ }
+ return true;
+ }
+
+ bool handleNonExternalLinkage(FunctionDecl const * decl) {
+ if (decl->getLinkageInternal() >=
+#if CLANG_VERSION >= 40000
+ ModuleLinkage
+#else
+ ExternalLinkage
+#endif
+ )
+ {
+ return false;
+ }
+ if (!compiler.getSourceManager().isInMainFile(decl->getLocation())) {
+ // There *may* be benefit to "static inline" in include files (esp. in C code, where an
+ // inline function with external linkage still requires an external definition), so
+ // just ignore those for now:
+ return true;
+ }
+ if (isInMacroExpansion(decl, "G_DEFINE_TYPE")
+ || isInMacroExpansion(decl, "G_DEFINE_TYPE_WITH_CODE")
+ || isInMacroExpansion(decl, "G_DEFINE_TYPE_WITH_PRIVATE"))
+ {
+ return true;
+ }
+ SourceLocation inlineLoc;
+ if (!removeInline(decl, &inlineLoc)) {
+ report(
+ DiagnosticsEngine::Warning,
+ "function has no external linkage but is explicitly declared 'inline'",
+ inlineLoc.isValid() ? inlineLoc : compat::getBeginLoc(decl))
+ << decl->getSourceRange();
+ }
+ return true;
}
};
diff --git a/compilerplugins/clang/test/redundantinline.cxx b/compilerplugins/clang/test/redundantinline.cxx
index 038a1497d98e..f69e0a3b80cf 100644
--- a/compilerplugins/clang/test/redundantinline.cxx
+++ b/compilerplugins/clang/test/redundantinline.cxx
@@ -11,4 +11,14 @@
S1::~S1() = default;
+static inline int f8() { return 0; } // expected-error {{function has no external linkage but is explicitly declared 'inline' [loplugin:redundantinline]}}
+
+namespace {
+
+static inline int f9() { return 0; } // expected-error {{function has no external linkage but is explicitly declared 'inline' [loplugin:redundantinline]}}
+
+}
+
+int main() { return f8() + f9(); }
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/redundantinline.hxx b/compilerplugins/clang/test/redundantinline.hxx
index e4efc5663e42..8e87ae05fcf7 100644
--- a/compilerplugins/clang/test/redundantinline.hxx
+++ b/compilerplugins/clang/test/redundantinline.hxx
@@ -52,27 +52,29 @@ void f3() {}
S3::operator int() { return 0; }
struct S4 {
- inline S4() {} // expected-error {{[loplugin:redundantinline]}}
- inline ~S4() { f1(); } // expected-error {{[loplugin:redundantinline]}}
+ inline S4() {} // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
+ inline ~S4() { f1(); } // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
- inline void f1() { (void)this; } // expected-error {{[loplugin:redundantinline]}}
+ inline void f1() { (void)this; } // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
- static inline void f2() {} // expected-error {{[loplugin:redundantinline]}}
+ static inline void f2() {} // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
- inline void operator +() {} // expected-error {{[loplugin:redundantinline]}}
+ inline void operator +() {} // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
- inline operator int() { return 0; } // expected-error {{[loplugin:redundantinline]}}
+ inline operator int() { return 0; } // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
- friend inline void f4() {} // expected-error {{[loplugin:redundantinline]}}
+ friend inline void f4() {} // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
static constexpr int f5() { return 0; }
- static constexpr inline int f6() { return 0; } // expected-error {{[loplugin:redundantinline]}}
+ static constexpr inline int f6() { return 0; } // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
};
constexpr int f5() { return 0; }
-constexpr inline int f6() { return 0; } // expected-error {{[loplugin:redundantinline]}}
+constexpr inline int f6() { return 0; } // expected-error {{function definition redundantly declared 'inline' [loplugin:redundantinline]}}
+
+static inline int f7() { return 0; }
#endif
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 61e14b44aee3..f4562c2d38ed 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -36,7 +36,7 @@
#include <rtl/process.h>
using namespace ::comphelper;
-static inline sal_Unicode rtl_ascii_toUpperCase( sal_Unicode ch )
+static sal_Unicode rtl_ascii_toUpperCase( sal_Unicode ch )
{
return ch >= 0x0061 && ch <= 0x007a ? ch + 0x20 : ch;
}
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index b69a1139c610..0dcde0e3e168 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1338,7 +1338,7 @@ sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype
}
namespace {
- inline bool isSystemColumn( sal_Int16 attnum )
+ bool isSystemColumn( sal_Int16 attnum )
{
return attnum <= 0;
}
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index fc602926e0ef..c88583f95a3b 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -95,7 +95,7 @@ OUString concatQualified( const OUString & a, const OUString &b)
return buf.makeStringAndClear();
}
-static inline OString iOUStringToOString( const OUString& str, ConnectionSettings const *settings) {
+static OString iOUStringToOString( const OUString& str, ConnectionSettings const *settings) {
OSL_ENSURE(settings, "pgsql-sdbc: OUStringToOString got NULL settings");
return OUStringToOString( str, ConnectionSettings::encoding );
}
@@ -131,7 +131,7 @@ void bufferEscapeConstant( OUStringBuffer & buf, const OUString & value, Connect
buf.append( OStringToOUString( strbuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) );
}
-static inline void ibufferQuoteConstant( OUStringBuffer & buf, const OUString & value, ConnectionSettings *settings )
+static void ibufferQuoteConstant( OUStringBuffer & buf, const OUString & value, ConnectionSettings *settings )
{
buf.append( "'" );
bufferEscapeConstant( buf, value, settings );
@@ -155,7 +155,7 @@ void bufferQuoteAnyConstant( OUStringBuffer & buf, const Any &val, ConnectionSet
buf.append( "NULL" );
}
-static inline void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString &toQuote, ConnectionSettings *settings )
+static void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString &toQuote, ConnectionSettings *settings )
{
OSL_ENSURE(settings, "pgsql-sdbc: bufferQuoteIdentifier got NULL settings");
diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx
index ef880c7aa7bc..4b9ef7c25b57 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -35,7 +35,7 @@ using namespace ::osl;
using namespace ::cppu;
-static inline void createLocalId( sal_Sequence **ppThreadId )
+static void createLocalId( sal_Sequence **ppThreadId )
{
rtl_byte_sequence_constructNoDefault( ppThreadId , 4 + 16 );
sal_uInt32 id = osl::Thread::getCurrentIdentifier();
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 2a3a5432b07f..fe16b365b7f3 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -72,7 +72,7 @@ struct AlignSize_Impl
// the value of the maximal alignment
static sal_Int32 nMaxAlignment = static_cast<sal_Int32>( reinterpret_cast<sal_Size>(&reinterpret_cast<AlignSize_Impl *>(16)->dDouble) - 16);
-static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
+static sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
{
if( nRequestedAlignment > nMaxAlignment )
nRequestedAlignment = nMaxAlignment;
@@ -82,7 +82,7 @@ static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
/**
* Calculate the new size of the struktur.
*/
-static inline sal_Int32 newAlignedSize(
+static sal_Int32 newAlignedSize(
sal_Int32 OldSize, sal_Int32 ElementSize, sal_Int32 NeededAlignment )
{
NeededAlignment = adjustAlignment( NeededAlignment );
@@ -96,7 +96,7 @@ namespace
}
// !for NOT REALLY WEAK TYPES only!
-static inline typelib_TypeDescriptionReference * igetTypeByName( rtl_uString const * pTypeName )
+static typelib_TypeDescriptionReference * igetTypeByName( rtl_uString const * pTypeName )
{
typelib_TypeDescriptionReference * pRef = nullptr;
::typelib_typedescriptionreference_getByName( &pRef, pTypeName );
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 3afc22e9cead..1c8f17761cb8 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -78,7 +78,7 @@ struct AlignSize_Impl
// the value of the maximal alignment
static sal_Int32 nMaxAlignment = static_cast<sal_Int32>( reinterpret_cast<sal_Size>(&reinterpret_cast<AlignSize_Impl *>(16)->dDouble) - 16);
-static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
+static sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
{
if( nRequestedAlignment > nMaxAlignment )
nRequestedAlignment = nMaxAlignment;
@@ -88,19 +88,19 @@ static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
/**
* Calculate the new size of the structure.
*/
-static inline sal_Int32 newAlignedSize(
+static sal_Int32 newAlignedSize(
sal_Int32 OldSize, sal_Int32 ElementSize, sal_Int32 NeededAlignment )
{
NeededAlignment = adjustAlignment( NeededAlignment );
return (OldSize + NeededAlignment -1) / NeededAlignment * NeededAlignment + ElementSize;
}
-static inline bool reallyWeak( typelib_TypeClass eTypeClass )
+static bool reallyWeak( typelib_TypeClass eTypeClass )
{
return TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass );
}
-static inline sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass )
+static sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass )
{
OSL_ASSERT( typelib_TypeClass_TYPEDEF != eTypeClass );
@@ -358,7 +358,7 @@ extern "C" void SAL_CALL typelib_typedescription_revokeCallback(
}
}
-static inline void typelib_typedescription_initTables(
+static void typelib_typedescription_initTables(
typelib_TypeDescription * pTD )
{
typelib_InterfaceTypeDescription * pITD = reinterpret_cast<typelib_InterfaceTypeDescription *>(pTD);
@@ -1275,7 +1275,7 @@ void deleteExceptions(
}
// frees anything except typelib_TypeDescription base!
-static inline void typelib_typedescription_destructExtendedMembers(
+static void typelib_typedescription_destructExtendedMembers(
typelib_TypeDescription * pTD )
{
OSL_ASSERT( typelib_TypeClass_TYPEDEF != pTD->eTypeClass );
@@ -1585,7 +1585,7 @@ extern "C" void SAL_CALL typelib_typedescription_register(
}
-static inline bool type_equals(
+static bool type_equals(
typelib_TypeDescriptionReference const * p1, typelib_TypeDescriptionReference const * p2 )
{
return (p1 == p2 ||
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index fa22dc661ecf..d442ca0bc7d7 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -51,7 +51,7 @@ namespace
{
-inline bool td_equals( typelib_InterfaceTypeDescription const * pTD1,
+bool td_equals( typelib_InterfaceTypeDescription const * pTD1,
typelib_InterfaceTypeDescription const * pTD2 )
{
return (pTD1 == pTD2 ||
@@ -80,15 +80,15 @@ struct ObjectEntry
std::vector< InterfaceEntry > aInterfaces;
bool mixedObject;
- explicit inline ObjectEntry( const OUString & rOId_ );
+ explicit ObjectEntry( const OUString & rOId_ );
- inline void append(
+ void append(
uno_DefaultEnvironment * pEnv,
void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
uno_freeProxyFunc fpFreeProxy );
- inline InterfaceEntry * find(
+ InterfaceEntry * find(
typelib_InterfaceTypeDescription * pTypeDescr );
- inline sal_Int32 find( void const * iface_ptr, std::size_t pos ) const;
+ sal_Int32 find( void const * iface_ptr, std::size_t pos ) const;
};
@@ -118,10 +118,10 @@ struct EnvironmentsData
EnvironmentsData() : isDisposing(false) {}
~EnvironmentsData();
- inline void getEnvironment(
+ void getEnvironment(
uno_Environment ** ppEnv, const OUString & rEnvDcp, void * pContext );
- inline void registerEnvironment( uno_Environment ** ppEnv );
- inline void getRegisteredEnvironments(
+ void registerEnvironment( uno_Environment ** ppEnv );
+ void getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen,
uno_memAlloc memAlloc, const OUString & rEnvDcp );
@@ -145,7 +145,7 @@ struct uno_DefaultEnvironment : public uno_ExtEnvironment
};
-inline ObjectEntry::ObjectEntry( OUString const & rOId_ )
+ObjectEntry::ObjectEntry( OUString const & rOId_ )
: oid( rOId_ ),
nRef( 0 ),
mixedObject( false )
@@ -154,7 +154,7 @@ inline ObjectEntry::ObjectEntry( OUString const & rOId_ )
}
-inline void ObjectEntry::append(
+void ObjectEntry::append(
uno_DefaultEnvironment * pEnv,
void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
uno_freeProxyFunc fpFreeProxy )
@@ -179,7 +179,7 @@ inline void ObjectEntry::append(
}
-inline InterfaceEntry * ObjectEntry::find(
+InterfaceEntry * ObjectEntry::find(
typelib_InterfaceTypeDescription * pTypeDescr_ )
{
OSL_ASSERT( ! aInterfaces.empty() );
@@ -210,7 +210,7 @@ inline InterfaceEntry * ObjectEntry::find(
}
-inline sal_Int32 ObjectEntry::find(
+sal_Int32 ObjectEntry::find(
void const * iface_ptr, std::size_t pos ) const
{
std::size_t size = aInterfaces.size();
@@ -826,7 +826,7 @@ namespace
class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {};
-inline const OUString & unoenv_getStaticOIdPart()
+const OUString & unoenv_getStaticOIdPart()
{
return theStaticOIdPart::get().getOIdPart();
}
@@ -912,7 +912,7 @@ EnvironmentsData::~EnvironmentsData()
}
-inline void EnvironmentsData::getEnvironment(
+void EnvironmentsData::getEnvironment(
uno_Environment ** ppEnv, const OUString & rEnvDcp, void * pContext )
{
if (*ppEnv)
@@ -934,7 +934,7 @@ inline void EnvironmentsData::getEnvironment(
}
-inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
+void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
{
OSL_ENSURE( ppEnv, "### null ptr!" );
uno_Environment * pEnv = *ppEnv;
@@ -973,7 +973,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
}
-inline void EnvironmentsData::getRegisteredEnvironments(
+void EnvironmentsData::getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
const OUString & rEnvDcp )
{
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index c5ce6709991f..c203523efa2c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -268,7 +268,7 @@ uno_Mediate_Mapping::uno_Mediate_Mapping(
}
-static inline OUString getMappingName(
+static OUString getMappingName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
{
OUStringBuffer aKey( 64 );
@@ -285,7 +285,7 @@ static inline OUString getMappingName(
return aKey.makeStringAndClear();
}
-static inline OUString getBridgeName(
+static OUString getBridgeName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
{
OUStringBuffer aBridgeName( 16 );
@@ -302,7 +302,7 @@ static inline OUString getBridgeName(
#ifndef DISABLE_DYNLOADING
-static inline void setNegativeBridge( const OUString & rBridgeName )
+static void setNegativeBridge( const OUString & rBridgeName )
{
MappingsData & rData = getMappingsData();
MutexGuard aGuard( rData.aNegativeLibsMutex );
@@ -337,7 +337,7 @@ static uno_ext_getMappingFunc selectMapFunc( const OUString & rBridgeName )
#else
-static inline bool loadModule(osl::Module & rModule, const OUString & rBridgeName)
+static bool loadModule(osl::Module & rModule, const OUString & rBridgeName)
{
bool bNeg;
{
@@ -472,7 +472,7 @@ static Mapping getDirectMapping(
}
-static inline Mapping createMediateMapping(
+static Mapping createMediateMapping(
const Environment & rFrom, const Environment & rTo,
const Mapping & rFrom2Uno, const Mapping & rUno2To,
const OUString & rAddPurpose )
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 848aaa39f428..97412ba70d08 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -41,7 +41,7 @@ namespace cppu
{
-static inline uno_Sequence * reallocSeq(
+static uno_Sequence * reallocSeq(
uno_Sequence * pReallocate, std::size_t nElementSize, sal_Int32 nElements )
{
OSL_ASSERT( nElements >= 0 );
@@ -68,7 +68,7 @@ static inline uno_Sequence * reallocSeq(
}
-static inline bool idefaultConstructElements(
+static bool idefaultConstructElements(
uno_Sequence ** ppSeq,
typelib_TypeDescriptionReference * pElementType,
sal_Int32 nStartIndex, sal_Int32 nStopIndex,
@@ -310,7 +310,7 @@ static inline bool idefaultConstructElements(
}
-static inline bool icopyConstructFromElements(
+static bool icopyConstructFromElements(
uno_Sequence ** ppSeq, void * pSourceElements,
typelib_TypeDescriptionReference * pElementType,
sal_Int32 nStopIndex,
@@ -570,7 +570,7 @@ static inline bool icopyConstructFromElements(
}
-static inline bool ireallocSequence(
+static bool ireallocSequence(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pElementType,
sal_Int32 nSize,
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index a63dcdacf3b1..164db03314eb 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -34,7 +34,7 @@ using rtl::OUString;
namespace
{
- inline OUString str_ac_singleton()
+ OUString str_ac_singleton()
{
return OUString("/singletons/com.sun.star.security.theAccessController");
}
@@ -85,7 +85,7 @@ namespace {
#pragma pack(pop)
#endif
-inline void checkPermission(
+void checkPermission(
Reference< security::XAccessController > const & xController,
Type const & type, rtl_uString * str1, rtl_uString * str2 )
{
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index f6b7aa0cf0da..62839c64d491 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -59,7 +59,7 @@ using rtl::OUStringBuffer;
namespace cppu
{
-static inline void try_dispose( Reference< XInterface > const & xInstance )
+static void try_dispose( Reference< XInterface > const & xInstance )
{
Reference< lang::XComponent > xComp( xInstance, UNO_QUERY );
if (xComp.is())
@@ -68,7 +68,7 @@ static inline void try_dispose( Reference< XInterface > const & xInstance )
}
}
-static inline void try_dispose( Reference< lang::XComponent > const & xComp )
+static void try_dispose( Reference< lang::XComponent > const & xComp )
{
if (xComp.is())
{
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 647184a40802..5770bf50aa21 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -46,7 +46,7 @@ using cppuhelper::detail::XExceptionThrower;
struct ExceptionThrower : public uno_Interface, XExceptionThrower
{
- inline ExceptionThrower();
+ ExceptionThrower();
virtual ~ExceptionThrower() {}
@@ -164,7 +164,7 @@ void ExceptionThrower::rethrowException()
}
-inline ExceptionThrower::ExceptionThrower()
+ExceptionThrower::ExceptionThrower()
{
uno_Interface::acquire = ExceptionThrower_acquire_release_nop;
uno_Interface::release = ExceptionThrower_acquire_release_nop;
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index 2abad8783bcf..c0f5477d2029 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -54,7 +54,7 @@ static ::osl::Mutex & getImplHelperInitMutex()
}
-static inline void checkInterface( Type const & rType )
+static void checkInterface( Type const & rType )
{
if (TypeClass_INTERFACE != rType.getTypeClass())
{
@@ -64,17 +64,17 @@ static inline void checkInterface( Type const & rType )
}
}
-static inline bool isXInterface( rtl_uString * pStr )
+static bool isXInterface( rtl_uString * pStr )
{
return OUString::unacquired(&pStr) == "com.sun.star.uno.XInterface";
}
-static inline void * makeInterface( sal_IntPtr nOffset, void * that )
+static void * makeInterface( sal_IntPtr nOffset, void * that )
{
return (static_cast<char *>(that) + nOffset);
}
-static inline bool td_equals(
+static bool td_equals(
typelib_TypeDescriptionReference const * pTDR1,
typelib_TypeDescriptionReference const * pTDR2 )
{
@@ -82,7 +82,7 @@ static inline bool td_equals(
OUString::unacquired(&pTDR1->pTypeName) == OUString::unacquired(&pTDR2->pTypeName));
}
-static inline type_entry * getTypeEntries( class_data * cd )
+static type_entry * getTypeEntries( class_data * cd )
{
type_entry * pEntries = cd->m_typeEntries;
if (! cd->m_storedTypeRefs) // not inited?
@@ -117,7 +117,7 @@ static inline type_entry * getTypeEntries( class_data * cd )
return pEntries;
}
-static inline void fillTypes( Type * types, class_data * cd )
+static void fillTypes( Type * types, class_data * cd )
{
type_entry * pEntries = getTypeEntries( cd );
for ( sal_Int32 n = cd->m_nTypes; n--; )
@@ -168,7 +168,7 @@ bool recursivelyFindType(
}
-static inline void * queryDeepNoXInterface(
+static void * queryDeepNoXInterface(
typelib_TypeDescriptionReference const * pDemandedTDR, class_data * cd, void * that )
{
type_entry * pEntries = getTypeEntries( cd );
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index cfaebecfcc86..2b8d5407ce81 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -103,12 +103,12 @@ public:
class theImplNames : public rtl::Static<ImplNames, theImplNames> {};
-inline OUString s_impl_name()
+OUString s_impl_name()
{
return OUString(IMPL_NAME);
}
-inline Sequence< OUString > const & s_get_service_names()
+Sequence< OUString > const & s_get_service_names()
{
return theImplNames::get().getNames();
}
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index a8053aac6b61..83e7726f0a35 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -43,15 +43,15 @@ IPropertyArrayHelper::~IPropertyArrayHelper()
{
}
-static inline const css::uno::Type & getPropertyTypeIdentifier( )
+static const css::uno::Type & getPropertyTypeIdentifier( )
{
return cppu::UnoType<XPropertyChangeListener>::get();
}
-static inline const css::uno::Type & getPropertiesTypeIdentifier()
+static const css::uno::Type & getPropertiesTypeIdentifier()
{
return cppu::UnoType<XPropertiesChangeListener>::get();
}
-static inline const css::uno::Type & getVetoableTypeIdentifier()
+static const css::uno::Type & getVetoableTypeIdentifier()
{
return cppu::UnoType<XVetoableChangeListener>::get();
}
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 1627e2277526..b4aec385c956 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -66,7 +66,7 @@ static typelib_TypeDescription * createCTD(
const Reference< XTypeDescription > & xType );
-inline static typelib_TypeDescription * createCTD(
+static typelib_TypeDescription * createCTD(
const Reference< XCompoundTypeDescription > & xType )
{
typelib_TypeDescription * pRet = nullptr;
@@ -123,7 +123,7 @@ inline static typelib_TypeDescription * createCTD(
return pRet;
}
-inline static typelib_TypeDescription * createCTD(
+static typelib_TypeDescription * createCTD(
Reference< container::XHierarchicalNameAccess > const & access,
const Reference< XStructTypeDescription > & xType )
{
@@ -199,7 +199,7 @@ inline static typelib_TypeDescription * createCTD(
return pRet;
}
-inline static typelib_TypeDescription * createCTD(
+static typelib_TypeDescription * createCTD(
const Reference< XInterfaceAttributeTypeDescription2 > & xAttribute )
{
typelib_TypeDescription * pRet = nullptr;
@@ -308,7 +308,7 @@ static typelib_TypeDescription * createCTD(
return pRet;
}
-inline static typelib_TypeDescription * createCTD(
+static typelib_TypeDescription * createCTD(
Reference< container::XHierarchicalNameAccess > const & access,
const Reference< XInterfaceTypeDescription2 > & xType )
{
@@ -374,7 +374,7 @@ inline static typelib_TypeDescription * createCTD(
return pRet;
}
-inline static typelib_TypeDescription * createCTD( const Reference< XEnumTypeDescription > & xType )
+static typelib_TypeDescription * createCTD( const Reference< XEnumTypeDescription > & xType )
{
typelib_TypeDescription * pRet = nullptr;
if (xType.is())
@@ -393,7 +393,7 @@ inline static typelib_TypeDescription * createCTD( const Reference< XEnumTypeDes
return pRet;
}
-inline static typelib_TypeDescription * createCTD(
+static typelib_TypeDescription * createCTD(
Reference< container::XHierarchicalNameAccess > const & access,
const Reference< XIndirectTypeDescription > & xType )
{
diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx
index 125ceda30ca8..c4258ef61cc8 100644
--- a/cppuhelper/source/typeprovider.cxx
+++ b/cppuhelper/source/typeprovider.cxx
@@ -50,7 +50,7 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const
}
-static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, sal_Int32 nOffset )
+static void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, sal_Int32 nOffset )
{
Type * pDest = rDest.getArray();
const Type * pSource = rSource.getConstArray();
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index fc53cc56d440..cd3fa5e48dfc 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -38,7 +38,7 @@ namespace cppu
// due to static Reflection destruction from usr, there must be a mutex leak (#73272#)
// this is used to lock all instances of OWeakConnectionPoint and OWeakRefListener as well as OWeakObject::m_pWeakConnectionPoint
-inline static Mutex & getWeakMutex()
+static Mutex & getWeakMutex()
{
static Mutex * s_pMutex = nullptr;
if (! s_pMutex)
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 06e6b685ea63..9ed418c2149b 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -62,13 +62,13 @@ namespace unoexe
static bool s_quiet = false;
-static inline void out( const sal_Char * pText )
+static void out( const sal_Char * pText )
{
if (! s_quiet)
fprintf( stderr, "%s", pText );
}
-static inline void out( const OUString & rText )
+static void out( const OUString & rText )
{
if (! s_quiet)
{
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 88dd159a9823..c0da0647978c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -287,7 +287,7 @@ static const char * aEidToPropName[] =
UPN_IS_HYPH_SPECIAL // EID_HYPH_SPECIAL
};
-static inline OUString lcl_GetPropertyName( EID_OPTIONS eEntryId )
+static OUString lcl_GetPropertyName( EID_OPTIONS eEntryId )
{
DBG_ASSERT( static_cast<unsigned int>(eEntryId) < SAL_N_ELEMENTS(aEidToPropName), "index out of range" );
return OUString::createFromAscii( aEidToPropName[ static_cast<int>(eEntryId) ] );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 34f3a53aee09..7002296cf0da 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -126,12 +126,12 @@ LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = nullptr;
// some stuff for easier changes for SvtViewOptions
static char const VIEWOPT_DATANAME[] = "page data";
-static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData )
+static void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData )
{
rOpt.SetUserItem( VIEWOPT_DATANAME, Any( rData ) );
}
-static inline OUString GetViewOptUserItem( const SvtViewOptions& rOpt )
+static OUString GetViewOptUserItem( const SvtViewOptions& rOpt )
{
Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) );
OUString aUserData;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 68e25cdbbaa9..1ba7f1690448 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -138,7 +138,7 @@ const sal_uInt16 SvxCharTwoLinesPage::pTwoLinesRanges[] =
// C-Function ------------------------------------------------------------
-static inline bool StateToAttr( TriState aState )
+static bool StateToAttr( TriState aState )
{
return ( TRISTATE_TRUE == aState );
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 49cd1da7b7c8..22fb67eff376 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -40,7 +40,7 @@
#define TWIP_TO_INCH 1440
-static inline int lcl_GetValue(const weld::MetricSpinButton& rMetric, FieldUnit eUnit)
+static int lcl_GetValue(const weld::MetricSpinButton& rMetric, FieldUnit eUnit)
{
return rMetric.denormalize(rMetric.get_value(eUnit));
}
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 1cd92ab7835a..5b4f64891c76 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -86,7 +86,7 @@ namespace
}
}
- template < typename T > inline void tryDispose( Reference<T> &r )
+ template < typename T > void tryDispose( Reference<T> &r )
{
try
{
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index f9aaceaabdfe..27840ac35d7c 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -38,7 +38,7 @@ namespace
@param _rBase the base point
@param _aVector the vector which will be added
*/
- inline tools::Rectangle calcRect(const Point& _rBase,const Point& _aVector)
+ tools::Rectangle calcRect(const Point& _rBase,const Point& _aVector)
{
return tools::Rectangle( _rBase - _aVector, _rBase + _aVector );
}
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 50cc7cb72890..b3d2abd1d932 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -239,7 +239,7 @@ bool needToSyncRepository(OUString const & name)
namespace {
-inline OUString encodeForRcFile( OUString const & str )
+OUString encodeForRcFile( OUString const & str )
{
// escape $\{} (=> rtl bootstrap files)
OUStringBuffer buf;
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 3514a0815d2d..2bd542379a59 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -95,7 +95,7 @@ class PackageRegistryImpl : private MutexHolder, public t_helper
Reference<deployment::XPackageRegistry> const & xBackend );
protected:
- inline void check();
+ void check();
virtual void SAL_CALL disposing() override;
virtual ~PackageRegistryImpl() override;
@@ -122,7 +122,7 @@ public:
};
-inline void PackageRegistryImpl::check()
+void PackageRegistryImpl::check()
{
::osl::MutexGuard guard( getMutex() );
if (rBHelper.bInDispose || rBHelper.bDisposed) {
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index cbf91bca647d..c2ca9b0ca4c1 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1277,7 +1277,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle(
return *pBundle;
}
-inline bool isBundle_( OUString const & mediaType )
+bool isBundle_( OUString const & mediaType )
{
// xxx todo: additional parsing?
return !mediaType.isEmpty() &&
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 4adc21b683d8..7f1cbffb3488 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -223,7 +223,7 @@ OUString makeAbsoluteFileUrl(
namespace {
-inline void printf_space( sal_Int32 space )
+void printf_space( sal_Int32 space )
{
while (space--)
dp_misc::writeConsole(" ");
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 71858367f92f..e03fc094abcb 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -193,7 +193,7 @@ static void splash_setup( struct splash* splash, int const barc[3], int const fr
#define SHIFT( x, bits ) ( ( (bits) >= 0 )? ( (x) << (bits) ): ( (x) >> -(bits) ) )
// Position of the highest bit (more or less integer log2)
-static inline int HIGHEST_BIT( unsigned long x )
+static int HIGHEST_BIT( unsigned long x )
{
int i = 0;
for ( ; x; ++i )
@@ -203,7 +203,7 @@ static inline int HIGHEST_BIT( unsigned long x )
}
// Number of bits set to 1
-static inline int BITS( unsigned long x )
+static int BITS( unsigned long x )
{
int i = 0;
for ( ; x; x >>= 1 )
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 3c033198344d..053b485cc46f 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::linguistic2;
#define SCRLRANGE 20 // Scroll 1/20 of the width/height, when in QueryDrop
-static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice const * pOutDev, short nDiffX, short nDiffY )
+static void lcl_AllignToPixel( Point& rPoint, OutputDevice const * pOutDev, short nDiffX, short nDiffY )
{
rPoint = pOutDev->LogicToPixel( rPoint );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index ba9791f31a52..44b6ffaab159 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1388,7 +1388,7 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox )
}
-static inline bool CmpBrdLn( const std::unique_ptr<SvxBorderLine> & pBrd1, const SvxBorderLine* pBrd2 )
+static bool CmpBrdLn( const std::unique_ptr<SvxBorderLine> & pBrd1, const SvxBorderLine* pBrd2 )
{
if( pBrd1.get() == pBrd2 )
return true;
@@ -3272,7 +3272,7 @@ sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
}
-static inline sal_Int8 lcl_PercentToTransparency(long nPercent)
+static sal_Int8 lcl_PercentToTransparency(long nPercent)
{
// 0xff must not be returned!
return sal_Int8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0);
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index b528acb693d3..546c1e9c1d68 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -25,7 +25,7 @@
Description: Is the printer valid
--------------------------------------------------------------------*/
-static inline bool IsValidPrinter( const Printer* pPtr )
+static bool IsValidPrinter( const Printer* pPtr )
{
return !pPtr->GetName().isEmpty();
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 91b558c756ce..f8514bb53a08 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -106,25 +106,25 @@ static const sal_Char
static OUString EncryptBlockName_Imp(const OUString& rName);
-static inline bool NonFieldWordDelim( const sal_Unicode c )
+static bool NonFieldWordDelim( const sal_Unicode c )
{
return ' ' == c || '\t' == c || 0x0a == c ||
cNonBreakingSpace == c || 0x2011 == c;
}
-static inline bool IsWordDelim( const sal_Unicode c )
+static bool IsWordDelim( const sal_Unicode c )
{
return c == 0x1 || NonFieldWordDelim(c);
}
-static inline bool IsLowerLetter( sal_Int32 nCharType )
+static bool IsLowerLetter( sal_Int32 nCharType )
{
return CharClass::isLetterType( nCharType ) &&
( css::i18n::KCharacterType::LOWER & nCharType);
}
-static inline bool IsUpperLetter( sal_Int32 nCharType )
+static bool IsUpperLetter( sal_Int32 nCharType )
{
return CharClass::isLetterType( nCharType ) &&
( css::i18n::KCharacterType::UPPER & nCharType);
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 9579b8e9eaa2..bf1f40585bf3 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1548,7 +1548,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
SkipToken();
}
-static inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading )
+static sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading )
{
nColor = (nColor * nShading) / 100;
nFillColor = (nFillColor * ( 100 - nShading )) / 100;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 0ff93ac2ef83..b703f6333bc0 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -203,7 +203,7 @@ static util::DateTime getDate( sal_Int32 nDate )
return aDate;
}
-static inline Date setDate( util::DateTime const & rDate )
+static Date setDate( util::DateTime const & rDate )
{
return Date( rDate.Day, rDate.Month, rDate.Year );
}
@@ -222,7 +222,7 @@ static util::DateTime getTime(sal_Int64 const nTime)
return aTime;
}
-static inline tools::Time setTime( util::DateTime const & rDate )
+static tools::Time setTime( util::DateTime const & rDate )
{
return tools::Time( rDate );
}
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 2e98243864a0..12ebce788433 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -89,7 +89,7 @@ namespace
const sal_Unicode comma_char = ',';
const OUString dos_newline = "\r\n";
- inline bool needsQuoting(const OUString& str)
+ bool needsQuoting(const OUString& str)
{
static const OUString quote_trigger_chars = "\",\n\r";
sal_Int32 len = str.getLength();
@@ -99,7 +99,7 @@ namespace
return false;
};
- inline void appendEncodedString(OUStringBuffer& buf, const OUString& str)
+ void appendEncodedString(OUStringBuffer& buf, const OUString& str)
{
if(needsQuoting(str))
{
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 1231037d712d..824c0cdf6fc1 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -40,7 +40,7 @@
#else
#define dump_state( a, b, c, d ) ;
#endif
-static inline void dbg_msg( const char* pString, ... )
+static void dbg_msg( const char* pString, ... )
{
#if (OSL_DEBUG_LEVEL > 0) || defined DBG_UTIL
va_list ap;
@@ -472,7 +472,7 @@ enum FrameStyleType {
#define BYTE_BUFFER_SIZE 32768
-static inline sal_uInt8 ReadValue( FILE* fp, int depth )
+static sal_uInt8 ReadValue( FILE* fp, int depth )
{
if( depth == 16 )
{
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 636d9197153c..d9254f5a1c9e 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -442,11 +442,11 @@ void DXFRepresentation::CalcBoundingBox(const DXFEntities & rEntities,
}
namespace {
- inline bool lcl_isDec(sal_Unicode ch)
+ bool lcl_isDec(sal_Unicode ch)
{
return ch >= L'0' && ch <= L'9';
}
- inline bool lcl_isHex(sal_Unicode ch)
+ bool lcl_isHex(sal_Unicode ch)
{
return lcl_isDec(ch) || (ch >= L'A' && ch <= L'F') || (ch >= L'a' && ch <= L'f');
}
diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx
index 2f63c4631f53..1ffe69ae94a8 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -268,10 +268,10 @@ struct CountryEntryPred_Language
explicit CountryEntryPred_Language( LanguageType eLanguage ) :
meLanguage( eLanguage ) {}
- inline bool operator()( const CountryEntry& rCmp ) const;
+ bool operator()( const CountryEntry& rCmp ) const;
};
-inline bool CountryEntryPred_Language::operator()( const CountryEntry& rCmp ) const
+bool CountryEntryPred_Language::operator()( const CountryEntry& rCmp ) const
{
// rCmp.mbUseSubLang==true -> compare full language type
// rCmp.mbUseSubLang==false -> compare primary language only
diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index 9200cce2ca8d..b99e6cc4d63c 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -44,7 +44,7 @@ namespace {
/** Rotates rnValue left by nBits bits. */
template< typename Type >
-inline void lclRotateLeft( Type& rnValue, int nBits )
+void lclRotateLeft( Type& rnValue, int nBits )
{
OSL_ASSERT(
nBits >= 0 &&
@@ -54,7 +54,7 @@ inline void lclRotateLeft( Type& rnValue, int nBits )
/** Rotates the lower nWidth bits of rnValue left by nBits bits. */
template< typename Type >
-inline void lclRotateLeft( Type& rnValue, sal_uInt8 nBits, sal_uInt8 nWidth )
+void lclRotateLeft( Type& rnValue, sal_uInt8 nBits, sal_uInt8 nWidth )
{
OSL_ASSERT( (nBits < nWidth) && (nWidth < sizeof( Type ) * 8) );
Type nMask = static_cast< Type >( (1UL << nWidth) - 1 );
@@ -289,7 +289,7 @@ static void lcl_PrintDigest(const sal_uInt8* pDigest, const char* msg)
printf("\n");
}
#else
-static inline void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/)
+static void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/)
{
}
#endif
diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx
index 5245123a55df..adb0e6f27918 100644
--- a/forms/source/xforms/xmlhelper.cxx
+++ b/forms/source/xforms/xmlhelper.cxx
@@ -40,7 +40,7 @@ using com::sun::star::xml::dom::XDocumentBuilder;
// 2: NameChar
// 4: NCNameStartChar
// 8: NCNameChar
-static inline sal_uInt8 lcl_getCharClass( sal_Unicode c )
+static sal_uInt8 lcl_getCharClass( sal_Unicode c )
{
sal_uInt8 nClass = 0;
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 59b36b2d3914..6859e744ca15 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -119,7 +119,7 @@ SvNumFormatType lcl_GetRetFormat( OpCode eOpCode )
}
}
-inline void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec,
+void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec,
const OUString* pTable, sal_uInt16 nOpCode )
{
sheet::FormulaOpCodeMapEntry aEntry;
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 84a8e4bc6834..58fa8b77ece9 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -43,7 +43,7 @@ namespace formula
// --- helpers --------------------------------------------------------------
-static inline bool lcl_IsReference( OpCode eOp, StackVar eType )
+static bool lcl_IsReference( OpCode eOp, StackVar eType )
{
return
(eOp == ocPush && (eType == svSingleRef || eType == svDoubleRef))
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index ed7d28b0612f..b3c0b4a204bc 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -179,7 +179,7 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
}
-static inline bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos )
+static bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos )
{
if( _pCharClass->isLetterNumeric( rStr, nPos ) )
return true;
diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx
index 4327a3315f4d..96250aa45774 100644
--- a/hwpfilter/source/mzstring.cxx
+++ b/hwpfilter/source/mzstring.cxx
@@ -39,7 +39,7 @@
const int AllocSize = 8;
-static inline int get_alloc_size(int len)
+static int get_alloc_size(int len)
{
return (len + AllocSize - 1) / AllocSize * AllocSize;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 6ddafafe2c1c..215a82c64665 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -32,7 +32,7 @@ constexpr LanguageType k0(0);
constexpr LanguageType kSAME(0xffff);
namespace {
-inline LanguageType getOverrideLang( LanguageType nLang, LanguageType nOverride )
+LanguageType getOverrideLang( LanguageType nLang, LanguageType nOverride )
{
return nOverride ? ((nOverride == kSAME) ? nLang : nOverride) : nLang;
}
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index ed768a907303..ba3d82cce475 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1733,12 +1733,12 @@ void LanguageTag::getIsoLanguageScriptCountry( OUString& rLanguage, OUString& rS
namespace
{
-inline bool isLowerAscii( sal_Unicode c )
+bool isLowerAscii( sal_Unicode c )
{
return 'a' <= c && c <= 'z';
}
-inline bool isUpperAscii( sal_Unicode c )
+bool isUpperAscii( sal_Unicode c )
{
return 'A' <= c && c <= 'Z';
}
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index e923fbd99eaa..531fc8e6ccab 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -118,7 +118,7 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n
return result;
}
-static inline bool isCJK( const Locale& rLocale ) {
+static bool isCJK( const Locale& rLocale ) {
return rLocale.Language == "zh" || rLocale.Language == "ja" || rLocale.Language == "ko";
}
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 5367b975e10c..356782b119f0 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -87,7 +87,7 @@ BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
}
namespace {
-inline bool isHangul( sal_Unicode cCh )
+bool isHangul( sal_Unicode cCh )
{
return (cCh >= 0xAC00 && cCh <= 0xD7AF) || (cCh >= 0x1100 && cCh <= 0x11FF);
}
diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx
index 3d373229da17..f36262a34cfe 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.cxx
@@ -68,12 +68,12 @@ static sal_Int64 existMarkOffset = 0;
static sal_uInt8 exists[0x2000];
static sal_uInt32 charArray[0x10000];
-static inline void set_exists(sal_uInt32 index)
+static void set_exists(sal_uInt32 index)
{
exists[index>>3] |= 1 << (index & 0x07);
}
-static inline void printIncludes(FILE* source_fp)
+static void printIncludes(FILE* source_fp)
{
#ifndef DICT_JA_ZH_IN_DATAFILE
fputs("/* !!!The file is generated automatically. DO NOT edit the file manually!!! */\n\n", source_fp);
@@ -83,7 +83,7 @@ static inline void printIncludes(FILE* source_fp)
#endif
}
-static inline void printFunctions(FILE* source_fp, const char *lang)
+static void printFunctions(FILE* source_fp, const char *lang)
{
#ifndef DICT_JA_ZH_IN_DATAFILE
fputs ("#ifndef DISABLE_DYNLOADING\n", source_fp);
@@ -105,7 +105,7 @@ static inline void printFunctions(FILE* source_fp, const char *lang)
#endif
}
-static inline void printDataArea(FILE *dictionary_fp, FILE *source_fp, vector<sal_uInt32>& lenArray)
+static void printDataArea(FILE *dictionary_fp, FILE *source_fp, vector<sal_uInt32>& lenArray)
{
// generate main dict. data array
#ifndef DICT_JA_ZH_IN_DATAFILE
@@ -158,7 +158,7 @@ static inline void printDataArea(FILE *dictionary_fp, FILE *source_fp, vector<sa
#endif
}
-static inline void printLenArray(FILE* source_fp, const vector<sal_uInt32>& lenArray)
+static void printLenArray(FILE* source_fp, const vector<sal_uInt32>& lenArray)
{
#ifndef DICT_JA_ZH_IN_DATAFILE
fprintf(source_fp, "static const sal_Int32 lenArray[] = {\n\t");
@@ -188,7 +188,7 @@ static inline void printLenArray(FILE* source_fp, const vector<sal_uInt32>& lenA
/* FIXME?: what happens if in every range i there is at least one charArray != 0
=> this will make index1[] = {0x00, 0x01, 0x02,... 0xfe, 0xff }
=> then in index2, the last range will be ignored incorrectly */
-static inline void printIndex1(FILE *source_fp, sal_Int16 *set)
+static void printIndex1(FILE *source_fp, sal_Int16 *set)
{
#ifndef DICT_JA_ZH_IN_DATAFILE
fprintf (source_fp, "static const sal_Int16 index1[] = {\n\t");
@@ -217,7 +217,7 @@ static inline void printIndex1(FILE *source_fp, sal_Int16 *set)
#endif
}
-static inline void printIndex2(FILE *source_fp, sal_Int16 const *set)
+static void printIndex2(FILE *source_fp, sal_Int16 const *set)
{
#ifndef DICT_JA_ZH_IN_DATAFILE
fputs ("static const sal_Int32 index2[] = {\n\t", source_fp);
@@ -255,7 +255,7 @@ static inline void printIndex2(FILE *source_fp, sal_Int16 const *set)
/* Generates a bitmask for the existence of sal_Unicode values in dictionary;
it packs 8 sal_Bool values in 1 sal_uInt8 */
-static inline void printExistsMask(FILE *source_fp)
+static void printExistsMask(FILE *source_fp)
{
#ifndef DICT_JA_ZH_IN_DATAFILE
fprintf (source_fp, "static const sal_uInt8 existMark[] = {\n\t");
diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx
index 421272851f42..77620fd4a9c3 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.cxx
@@ -120,7 +120,7 @@ Mapping casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 l
return dummy;
}
-static inline bool
+static bool
is_ja_voice_sound_mark(sal_Unicode& current, sal_Unicode next)
{
sal_Unicode c = 0;
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 89bc2e4d0fc0..27abf60928e1 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -40,7 +40,7 @@ IdlDll::~IdlDll()
{
}
-static inline SvStringHashEntry * INS( const OString& rName )
+static SvStringHashEntry * INS( const OString& rName )
{
sal_uInt32 nIdx;
GetIdlApp().pHashTable->Insert( rName, &nIdx );
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 97910e3b7f7c..3926e47c2d43 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -81,7 +81,7 @@ static bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, boo
//This function gets a system path to a file [fname], creates a temp file in
//the same folder as [fname] and returns the system path of the temp file.
-static inline OUString tempFileHelper(OUString const & fname)
+static OUString tempFileHelper(OUString const & fname)
{
OUString aTmpFile;
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index d84e1c56e6c4..cb927de74e9f 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::uno;
namespace javaunohelper
{
-static inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
+static OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
{
OSL_ASSERT( sizeof (sal_Unicode) == sizeof (jchar) );
jsize len = jni_env->GetStringLength( jstr );
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 4589a46ffa6b..a1bf0d7d70d8 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -3438,7 +3438,7 @@ namespace {
// cater for representable integer cases and we don't want to link against
// libuno_sal, we'll have to have an own implementation. The special large
// integer cases seems not be needed here.
-inline bool lok_approxEqual(double a, double b)
+bool lok_approxEqual(double a, double b)
{
static const double e48 = 1.0 / (16777216.0 * 16777216.0);
if (a == b)
diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index 680aa4fd75ad..545912dbb032 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -39,7 +39,7 @@
using namespace std;
-static inline bool isSeparator(const char c){
+static bool isSeparator(const char c){
return c == GUESS_SEPARATOR_OPEN || c == GUESS_SEPARATOR_SEP || c == GUESS_SEPARATOR_CLOSE || c == '\0';
}
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index b49e4f555418..0374d38f0729 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -112,7 +112,7 @@ bool LinguIsUnspecified( const OUString & rBcp47 )
return rBcp47 == "zxx" || rBcp47 == "und" || rBcp47 == "mul";
}
-static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 )
+static sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 )
{
return std::min(std::min(n1, n2), n3);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
index 226541bf2659..3a1c82778f48 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
@@ -72,7 +72,7 @@ const sal_Char aBase64EncodeTable[] =
* @descr Encode 3 byte to 4 byte.
* Please refer to RFC to get the base64 algorithm.
*/
-static inline void Encode_(const sal_uInt8 *src, sal_Char* dest)
+static void Encode_(const sal_uInt8 *src, sal_Char* dest)
{
sal_Int32 nBinaer = (src[ 0] << 16) +
(src[1] << 8) +
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index c24c61c2fa15..57226a5a3e5b 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -263,7 +263,7 @@ const OUString& FilterBase::getFileUrl() const
namespace {
-inline bool lclIsDosDrive( const OUString& rUrl, sal_Int32 nPos = 0 )
+bool lclIsDosDrive( const OUString& rUrl, sal_Int32 nPos = 0 )
{
return
(rUrl.getLength() >= nPos + 3) &&
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index f5de48c30133..02d070a71a9d 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -157,7 +157,7 @@ void ContextStack::popContext()
namespace {
/** Reads a byte from the passed stream, returns true on success. */
-inline bool lclReadByte( sal_uInt8& ornByte, BinaryInputStream& rStrm )
+bool lclReadByte( sal_uInt8& ornByte, BinaryInputStream& rStrm )
{
return rStrm.readMemory( &ornByte, 1 ) == 1;
}
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 5aead418e983..7bcba408ffbb 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno;
namespace {
-inline void lclSetValueOrClearAny( Any& orAny, const OptValue< double >& rofValue )
+void lclSetValueOrClearAny( Any& orAny, const OptValue< double >& rofValue )
{
if( rofValue.has() ) orAny <<= rofValue.get(); else orAny.clear();
}
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 625adf5fca78..44662584da84 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -146,29 +146,29 @@ struct StaticPresetColorsPool : public ::rtl::Static< PresetColorsPool, StaticPr
const double DEC_GAMMA = 2.3;
const double INC_GAMMA = 1.0 / DEC_GAMMA;
-inline void lclRgbToRgbComponents( sal_Int32& ornR, sal_Int32& ornG, sal_Int32& ornB, ::Color nRgb )
+void lclRgbToRgbComponents( sal_Int32& ornR, sal_Int32& ornG, sal_Int32& ornB, ::Color nRgb )
{
ornR = nRgb.GetRed();
ornG = nRgb.GetGreen();
ornB = nRgb.GetBlue();
}
-inline sal_Int32 lclRgbComponentsToRgb( sal_Int32 nR, sal_Int32 nG, sal_Int32 nB )
+sal_Int32 lclRgbComponentsToRgb( sal_Int32 nR, sal_Int32 nG, sal_Int32 nB )
{
return static_cast< sal_Int32 >( (nR << 16) | (nG << 8) | nB );
}
-inline sal_Int32 lclRgbCompToCrgbComp( sal_Int32 nRgbComp )
+sal_Int32 lclRgbCompToCrgbComp( sal_Int32 nRgbComp )
{
return static_cast< sal_Int32 >( nRgbComp * MAX_PERCENT / 255 );
}
-inline sal_Int32 lclCrgbCompToRgbComp( sal_Int32 nCrgbComp )
+sal_Int32 lclCrgbCompToRgbComp( sal_Int32 nCrgbComp )
{
return static_cast< sal_Int32 >( nCrgbComp * 255 / MAX_PERCENT );
}
-inline sal_Int32 lclGamma( sal_Int32 nComp, double fGamma )
+sal_Int32 lclGamma( sal_Int32 nComp, double fGamma )
{
return static_cast< sal_Int32 >( pow( static_cast< double >( nComp ) / MAX_PERCENT, fGamma ) * MAX_PERCENT + 0.5 );
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 0f5437dc9519..2676d43060fb 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -400,7 +400,7 @@ void Shape::addChildren(
}
}
-static inline void lcl_resetPropertyValue( std::vector<beans::PropertyValue>& rPropVec, const OUString& rName )
+static void lcl_resetPropertyValue( std::vector<beans::PropertyValue>& rPropVec, const OUString& rName )
{
auto aIterator = std::find_if( rPropVec.begin(), rPropVec.end(),
[rName]( const beans::PropertyValue& rValue ) { return rValue.Name == rName; } );
@@ -409,7 +409,7 @@ static inline void lcl_resetPropertyValue( std::vector<beans::PropertyValue>& rP
rPropVec.erase( aIterator );
}
-static inline void lcl_setPropertyValue( std::vector<beans::PropertyValue>& rPropVec,
+static void lcl_setPropertyValue( std::vector<beans::PropertyValue>& rPropVec,
const OUString& rName,
const beans::PropertyValue& rPropertyValue )
{
@@ -418,7 +418,7 @@ static inline void lcl_setPropertyValue( std::vector<beans::PropertyValue>& rPro
rPropVec.push_back( rPropertyValue );
}
-static inline SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust )
+static SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust )
{
if (eAdjust == ParagraphAdjust_LEFT)
return SDRTEXTHORZADJUST_LEFT;
@@ -429,7 +429,7 @@ static inline SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust )
return SDRTEXTHORZADJUST_LEFT;
}
-static inline void lcl_createPresetShape(uno::Reference<drawing::XShape>& xShape,
+static void lcl_createPresetShape(uno::Reference<drawing::XShape>& xShape,
const OUString& rClass, const OUString& rPresetType,
const CustomShapePropertiesPtr& pCustomShapePropertiesPtr,
const TextBodyPtr& pTextBody,
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index ef30786b6f3d..ed7b6fb11d3a 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -335,14 +335,14 @@ static void impl_AddInt( sax_fastparser::FastAttributeList *pAttrList, sal_Int32
pAttrList->add( nElement, OString::number( nValue ).getStr() );
}
-static inline sal_uInt16 impl_GetUInt16( const sal_uInt8* &pVal )
+static sal_uInt16 impl_GetUInt16( const sal_uInt8* &pVal )
{
sal_uInt16 nRet = *pVal++;
nRet += ( *pVal++ ) << 8;
return nRet;
}
-static inline sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPointSize )
+static sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPointSize )
{
sal_Int32 nRet = 0;
if ( ( nPointSize == 0xfff0 ) || ( nPointSize == 4 ) )
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 63f0ec24f8e9..bb8d0d9a1929 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -56,7 +56,7 @@ using namespace ::com::sun::star::uno;
namespace {
-inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm )
+sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm )
{
return static_cast< sal_Int32 >( (fPixelPerHmm > 0.0) ? (fPixel / fPixelPerHmm + 0.5) : 0.0 );
}
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index a8cc9a02ba77..badce2a89fc4 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -75,13 +75,13 @@ const sal_uInt32 OLE_PALETTECOLOR_MASK = 0x0000FFFF;
const sal_uInt32 OLE_SYSTEMCOLOR_MASK = 0x0000FFFF;
/** Swaps the red and blue component of the passed color. */
-inline sal_uInt32 lclSwapRedBlue( sal_uInt32 nColor )
+sal_uInt32 lclSwapRedBlue( sal_uInt32 nColor )
{
return static_cast< sal_uInt32 >( (nColor & 0xFF00FF00) | ((nColor & 0x0000FF) << 16) | ((nColor & 0xFF0000) >> 16) );
}
/** Returns the UNO RGB color from the passed encoded OLE BGR color. */
-inline ::Color lclDecodeBgrColor( sal_uInt32 nOleColor )
+::Color lclDecodeBgrColor( sal_uInt32 nOleColor )
{
return ::Color( lclSwapRedBlue( nOleColor ) & 0xFFFFFF );
}
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index e33c66a87f21..2442fa9bc489 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -35,13 +35,13 @@ using namespace ::com::sun::star::uno;
namespace {
-inline const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar )
+const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar )
{
sal_Int32 nIndex = rtl_str_indexOfChar_WithLength( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ), cChar );
return (nIndex < 0) ? pcEnd : (pcBeg + nIndex);
}
-inline bool lclIsWhiteSpace( sal_Char cChar )
+bool lclIsWhiteSpace( sal_Char cChar )
{
return cChar <= 32;
}
@@ -69,7 +69,7 @@ const sal_Char* lclTrimWhiteSpaceFromEnd( const sal_Char* pcBeg, const sal_Char*
return pcEnd;
}
-inline void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
+void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
{
rBuffer.append( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ) );
}
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index c85113293308..53476430287f 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -37,7 +37,7 @@
namespace {
-inline OString toByteString(rtl_uString const * str) {
+OString toByteString(rtl_uString const * str) {
return OString(
str->buffer, str->length, RTL_TEXTENCODING_UTF8,
OUSTRING_TO_OSTRING_CVTFLAGS);
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 91486be50ecf..fe5affc9d069 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -51,7 +51,7 @@ struct StaticDebugBaseAddressFilter
}
};
-inline bool isSubStr( char const* pStr, rtl::OString const& subStr )
+bool isSubStr( char const* pStr, rtl::OString const& subStr )
{
return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0;
}
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index cff84e395561..89969c1c40af 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -28,13 +28,13 @@ const sal_Unicode FPH_CHAR_PATH_SEPARATOR = '/';
const sal_Unicode FPH_CHAR_DOT = '.';
const sal_Unicode FPH_CHAR_COLON = ':';
-static inline const rtl::OUString FPH_PATH_SEPARATOR()
+static const rtl::OUString FPH_PATH_SEPARATOR()
{ return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
-static inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
+static const rtl::OUString FPH_LOCAL_DIR_ENTRY()
{ return rtl::OUString(FPH_CHAR_DOT); }
-static inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
+static const rtl::OUString FPH_PARENT_DIR_ENTRY()
{ return rtl::OUString(".."); }
void osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 2b960d017fea..7ba3d90a7037 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -36,7 +36,7 @@
namespace
{
- inline void set_file_type(const struct stat& file_stat, oslFileStatus* pStat)
+ void set_file_type(const struct stat& file_stat, oslFileStatus* pStat)
{
/* links to directories state also to be a directory */
if (S_ISLNK(file_stat.st_mode))
@@ -57,7 +57,7 @@ namespace
pStat->uValidFields |= osl_FileStatus_Mask_Type;
}
- inline void set_file_access_mask(const struct stat& file_stat, oslFileStatus* pStat)
+ void set_file_access_mask(const struct stat& file_stat, oslFileStatus* pStat)
{
// user permissions
if (S_IRUSR & file_stat.st_mode)
@@ -99,7 +99,7 @@ namespace
required on network file systems not using unix semantics (AFS, see
fdo#43095).
*/
- inline void set_file_access_rights(const rtl::OUString& file_path, oslFileStatus* pStat)
+ void set_file_access_rights(const rtl::OUString& file_path, oslFileStatus* pStat)
{
pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
@@ -110,7 +110,7 @@ namespace
pStat->uAttributes |= osl_File_Attribute_Executable;
}
- inline void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat)
+ void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat)
{
pStat->uAttributes = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0;
pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
@@ -118,7 +118,7 @@ namespace
/* the set_file_access_rights must be called after set_file_hidden_status(...) and
set_file_access_mask(...) because of the hack in set_file_access_rights(...) */
- inline void set_file_attributes(
+ void set_file_attributes(
const rtl::OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
{
set_file_hidden_status(file_path, pStat);
@@ -130,21 +130,21 @@ namespace
set_file_access_rights(file_path, pStat);
}
- inline void set_file_access_time(const struct stat& file_stat, oslFileStatus* pStat)
+ void set_file_access_time(const struct stat& file_stat, oslFileStatus* pStat)
{
pStat->aAccessTime.Seconds = file_stat.st_atime;
pStat->aAccessTime.Nanosec = 0;
pStat->uValidFields |= osl_FileStatus_Mask_AccessTime;
}
- inline void set_file_modify_time(const struct stat& file_stat, oslFileStatus* pStat)
+ void set_file_modify_time(const struct stat& file_stat, oslFileStatus* pStat)
{
pStat->aModifyTime.Seconds = file_stat.st_mtime;
pStat->aModifyTime.Nanosec = 0;
pStat->uValidFields |= osl_FileStatus_Mask_ModifyTime;
}
- inline void set_file_size(const struct stat& file_stat, oslFileStatus* pStat)
+ void set_file_size(const struct stat& file_stat, oslFileStatus* pStat)
{
if (S_ISREG(file_stat.st_mode))
{
@@ -155,7 +155,7 @@ namespace
/* we only need to call stat or lstat if one of the
following flags is set */
- inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslFileType file_type)
+ bool is_stat_call_necessary(sal_uInt32 field_mask, oslFileType file_type)
{
return (
((field_mask & osl_FileStatus_Mask_Type) && (file_type == osl_File_Type_Unknown)) ||
@@ -168,7 +168,7 @@ namespace
(field_mask & osl_FileStatus_Mask_Validate));
}
- inline oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat)
+ oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat)
{
rtl::OUString link_target;
if (!osl::realpath(file_path, link_target))
@@ -182,7 +182,7 @@ namespace
return osl_File_E_None;
}
- inline oslFileError setup_osl_getFileStatus(
+ oslFileError setup_osl_getFileStatus(
DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path)
{
if ((pImpl == nullptr) || (pStat == nullptr))
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a6b80daa9e2a..a6dd0954bf41 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -29,7 +29,7 @@
#include <osl/detail/android-bootstrap.h>
#endif
-static inline rtl::OString OUStringToOString(const rtl_uString* s)
+static rtl::OString OUStringToOString(const rtl_uString* s)
{
return rtl::OUStringToOString(rtl::OUString(const_cast<rtl_uString*>(s)),
osl_getThreadTextEncoding());
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index bd3729513f7d..fcc8c41cf4ab 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -43,7 +43,7 @@ using namespace osl;
/** detailed wrong message.
*/
-static inline OString errorToString(const osl::FileBase::RC _nError)
+static OString errorToString(const osl::FileBase::RC _nError)
{
OString sResult;
switch (_nError) {
@@ -103,7 +103,7 @@ static OString errorToStr(osl::FileBase::RC const& nError)
# define delta 1800 // time precision, 1.8s
#endif
-static inline bool t_compareTime(TimeValue *m_aEndTime, TimeValue *m_aStartTime, sal_Int32 nDelta)
+static bool t_compareTime(TimeValue *m_aEndTime, TimeValue *m_aStartTime, sal_Int32 nDelta)
{
sal_Int32 nDeltaSeconds = m_aEndTime->Seconds - m_aStartTime->Seconds;
sal_Int32 nDeltaNanoSec = sal_Int32(m_aEndTime->Nanosec) - sal_Int32(m_aStartTime->Nanosec);
@@ -119,7 +119,7 @@ static inline bool t_compareTime(TimeValue *m_aEndTime, TimeValue *m_aStartTime
/** compare two OUString file name.
*/
-static inline bool compareFileName(const OUString & ustr1, const OUString & ustr2)
+static bool compareFileName(const OUString & ustr1, const OUString & ustr2)
{
bool bOk;
// on Windows, the separator is '\', so here change to '/', then compare
@@ -145,14 +145,14 @@ static inline bool compareFileName(const OUString & ustr1, const OUString & ustr
/** simple version to judge if a file name or directory name is a URL or a system path, just to see if it
is start with "file:///";.
*/
-static inline bool isURL(const OUString& pathname)
+static bool isURL(const OUString& pathname)
{
return pathname.startsWith(aPreURL);
}
/** concat two part to form a URL or system path, add PATH_SEPARATOR between them if necessary, add "file:///" to beginning if necessary.
*/
-static inline void concatURL(OUString & pathname1, const OUString & pathname2)
+static void concatURL(OUString & pathname1, const OUString & pathname2)
{
// check if pathname1 is full qualified URL;
if (!isURL(pathname1))
@@ -170,7 +170,7 @@ static inline void concatURL(OUString & pathname1, const OUString & pathname2)
/** create a temp test file using OUString name of full qualified URL or system path.
*/
-static inline void createTestFile(const OUString& filename)
+static void createTestFile(const OUString& filename)
{
OUString aPathURL = filename.copy(0);
osl::FileBase::RC nError;
@@ -189,7 +189,7 @@ static inline void createTestFile(const OUString& filename)
/** create a temp test file using OUString name of full qualified URL or system path in a base directory.
*/
-static inline void createTestFile(const OUString& basename, const OUString& filename)
+static void createTestFile(const OUString& basename, const OUString& filename)
{
OUString aBaseURL = basename.copy(0);
@@ -199,7 +199,7 @@ static inline void createTestFile(const OUString& basename, const OUString& file
/** delete a temp test file using OUString name.
*/
-static inline void deleteTestFile(const OUString& filename)
+static void deleteTestFile(const OUString& filename)
{
OUString aPathURL = filename.copy(0);
osl::FileBase::RC nError;
@@ -216,7 +216,7 @@ static inline void deleteTestFile(const OUString& filename)
/** delete a temp test file using OUString name of full qualified URL or system path in a base directory.
*/
-static inline void deleteTestFile(const OUString& basename, const OUString& filename)
+static void deleteTestFile(const OUString& basename, const OUString& filename)
{
OUString aBaseURL = basename.copy(0);
@@ -226,7 +226,7 @@ static inline void deleteTestFile(const OUString& basename, const OUString& file
/** create a temp test directory using OUString name of full qualified URL or system path.
*/
-static inline void createTestDirectory(const OUString& dirname)
+static void createTestDirectory(const OUString& dirname)
{
OUString aPathURL = dirname.copy(0);
osl::FileBase::RC nError;
@@ -240,7 +240,7 @@ static inline void createTestDirectory(const OUString& dirname)
/** create a temp test directory using OUString name of full qualified URL or system path in a base directory.
*/
-static inline void createTestDirectory(const OUString& basename, const OUString& dirname)
+static void createTestDirectory(const OUString& basename, const OUString& dirname)
{
OUString aBaseURL = basename.copy(0);
@@ -250,7 +250,7 @@ static inline void createTestDirectory(const OUString& basename, const OUString&
/** delete a temp test directory using OUString name of full qualified URL or system path.
*/
-static inline void deleteTestDirectory(const OUString& dirname)
+static void deleteTestDirectory(const OUString& dirname)
{
OUString aPathURL = dirname.copy(0);
osl::FileBase::RC nError;
@@ -270,7 +270,7 @@ static inline void deleteTestDirectory(const OUString& dirname)
/** delete a temp test directory using OUString name of full qualified URL or system path in a base directory.
*/
-static inline void deleteTestDirectory(const OUString& basename, const OUString& dirname)
+static void deleteTestDirectory(const OUString& basename, const OUString& dirname)
{
OUString aBaseURL = basename.copy(0);
@@ -288,7 +288,7 @@ enum class oslCheckMode {
/** check if the file exist
*/
-static inline bool ifFileExist(const OUString & str)
+static bool ifFileExist(const OUString & str)
{
File testFile(str);
return (testFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None);
@@ -296,7 +296,7 @@ static inline bool ifFileExist(const OUString & str)
/** check if the file can be written
*/
-static inline bool ifFileCanWrite(const OUString & str)
+static bool ifFileCanWrite(const OUString & str)
{
// on Windows, the file has no write right, but can be written
#ifdef _WIN32
@@ -317,7 +317,7 @@ static inline bool ifFileCanWrite(const OUString & str)
return bCheckResult;
}
-static inline bool checkDirectory(const OUString& str, oslCheckMode nCheckMode)
+static bool checkDirectory(const OUString& str, oslCheckMode nCheckMode)
{
OUString aUString;
DirectoryItem rItem;
@@ -366,7 +366,7 @@ static inline bool checkDirectory(const OUString& str, oslCheckMode nCheckMode)
/** construct error message
*/
-static inline OString outputError(const OString & returnVal, const OString & rightVal, const sal_Char * msg = "")
+static OString outputError(const OString & returnVal, const OString & rightVal, const sal_Char * msg = "")
{
OString aString;
if (returnVal == rightVal)
@@ -384,7 +384,7 @@ static inline OString outputError(const OString & returnVal, const OString & rig
/** Change file mode, two version in UNIX and Windows;.
*/
#if (defined UNX) /* chmod() method is different in Windows */
-static inline void changeFileMode(OUString & filepath, sal_Int32 mode)
+static void changeFileMode(OUString & filepath, sal_Int32 mode)
{
OString aString;
OUString aUStr = filepath.copy(0);
@@ -405,7 +405,7 @@ inline void changeFileMode(OUString & filepath, sal_Int32 mode)
}
#endif
-static inline OUString getCurrentPID();
+static OUString getCurrentPID();
// Beginning of the test cases for osl::FileBase class
@@ -5133,7 +5133,7 @@ namespace osl_Directory
/** get Current PID.
*/
-inline OUString getCurrentPID()
+OUString getCurrentPID()
{
//~ Get current PID and turn it into OUString;
int nPID = 0;
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 04af99487f85..9910925e3c5a 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -27,7 +27,7 @@ using ::rtl::OUString;
/** get dll file URL.
*/
-static inline ::rtl::OUString getDllURL()
+static ::rtl::OUString getDllURL()
{
#if defined(_WIN32) // lib in Unix and lib in Windows are not same in file name.
::rtl::OUString libPath( "test_Module_DLL.dll" );
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 74f45b2faa21..683cbf83f2ce 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -44,7 +44,7 @@ using ::rtl::OString;
/** print last error of pipe system.
*/
-static inline void printPipeError( ::osl::Pipe const & aPipe )
+static void printPipeError( ::osl::Pipe const & aPipe )
{
oslPipeError nError = aPipe.getError( );
printf("#printPipeError# " );
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 8b99d7089b99..47d0eeba4d0c 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -71,7 +71,7 @@ using ::rtl::OString;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list