summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-15 19:13:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-17 09:05:38 +0200
commit206b5b2661be37efdff3c6aedb6f248c4636be79 (patch)
treeaf385e5b4725dcfea23988d9113cced8e9ccaf3c /svtools
parenta85d3ba1c0de313b60324b9ecfa488bb99d69d06 (diff)
New loplugin:external
...warning about (for now only) functions and variables with external linkage that likely don't need it. The problems with moving entities into unnamed namespacs and breaking ADL (as alluded to in comments in compilerplugins/clang/external.cxx) are illustrated by the fact that while struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { struct S2: S1 { int f() { return 1; } }; int f(S2 s) { return s.f(); } } int main() { return f(N::S2()); } returns 1, both moving just the struct S2 into an nunnamed namespace, struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { namespace { struct S2: S1 { int f() { return 1; } }; } int f(S2 s) { return s.f(); } } int main() { return f(N::S2()); } as well as moving just the function f overload into an unnamed namespace, struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { struct S2: S1 { int f() { return 1; } }; namespace { int f(S2 s) { return s.f(); } } } int main() { return f(N::S2()); } would each change the program to return 0 instead. Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c Reviewed-on: https://gerrit.libreoffice.org/60539 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox3.cxx2
-rw-r--r--svtools/source/config/extcolorcfg.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx4
-rw-r--r--svtools/source/misc/bindablecontrolhelper.cxx2
-rw-r--r--svtools/source/misc/templatefoldercache.cxx4
-rw-r--r--svtools/source/misc/unitconv.cxx60
7 files changed, 38 insertions, 38 deletions
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index f4db7a2b29f6..24149788c11f 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -39,7 +39,7 @@ namespace svt
using namespace ::com::sun::star::lang;
using namespace utl;
- Reference< XAccessible > getHeaderCell( BrowseBoxImpl::THeaderCellMap& _raHeaderCells,
+ static Reference< XAccessible > getHeaderCell( BrowseBoxImpl::THeaderCellMap& _raHeaderCells,
sal_Int32 _nPos,
AccessibleBrowseBoxObjType _eType,
const Reference< XAccessible >& _rParent,
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 867525cf8f77..42b8370cfa08 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -218,7 +218,7 @@ void ExtendedColorConfig_Impl::EnableBroadcast()
ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled = true;
}
-void lcl_addString(uno::Sequence < OUString >& _rSeq,const OUString& _sAdd)
+static void lcl_addString(uno::Sequence < OUString >& _rSeq,const OUString& _sAdd)
{
for(OUString & i : _rSeq)
i += _sAdd;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index f129b25c12ca..188605a84b0d 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1927,7 +1927,7 @@ static const CollatorWrapper* pCollatorWrapper = nullptr;
/* this function returns true, if aOne is less then aTwo
*/
-bool CompareSortingData_Impl( std::unique_ptr<SortingData_Impl> const & aOne, std::unique_ptr<SortingData_Impl> const & aTwo )
+static bool CompareSortingData_Impl( std::unique_ptr<SortingData_Impl> const & aOne, std::unique_ptr<SortingData_Impl> const & aTwo )
{
DBG_ASSERT( pCollatorWrapper, "*CompareSortingData_Impl(): Can't work this way!" );
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 33355147da99..530a9a6b95f4 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -275,7 +275,7 @@ SvxBorderLineStyle LineListBox::GetSelectEntryStyle() const
}
-void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, SvxBorderLineStyle nDashing )
+static void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, SvxBorderLineStyle nDashing )
{
AntialiasingFlags nOldAA = rDev.GetAntialiasing();
rDev.SetAntialiasing( nOldAA & ~AntialiasingFlags::EnableB2dDraw );
@@ -316,7 +316,7 @@ namespace svtools {
/**
* Dashing array must start with a line width and end with a blank width.
*/
-std::vector<double> GetDashing( SvxBorderLineStyle nDashing )
+static std::vector<double> GetDashing( SvxBorderLineStyle nDashing )
{
std::vector<double> aPattern;
switch (nDashing)
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx
index 18cb421e3caf..7a47ea262e3e 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -38,7 +38,7 @@ namespace svt
using namespace ::com::sun::star;
-bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XModel >& xModel, css::table::CellRangeAddress& aAddress )
+static bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XModel >& xModel, css::table::CellRangeAddress& aAddress )
{
bool bRes = false;
uno::Reference< sheet::XCellRangeReferrer > xReferrer;
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index f812640956d6..28b547b329c2 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -60,7 +60,7 @@ namespace svt
//= helpers
- SvStream& WriteDateTime( SvStream& _rStorage, const util::DateTime& _rDate )
+ static SvStream& WriteDateTime( SvStream& _rStorage, const util::DateTime& _rDate )
{
sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / tools::Time::nanoPerCenti );
_rStorage.WriteUInt16( hundredthSeconds );
@@ -76,7 +76,7 @@ namespace svt
}
- SvStream& operator >> ( SvStream& _rStorage, util::DateTime& _rDate )
+ static SvStream& operator >> ( SvStream& _rStorage, util::DateTime& _rDate )
{
sal_uInt16 hundredthSeconds;
_rStorage.ReadUInt16( hundredthSeconds );
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 64d1acb75330..6372671718d2 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -383,7 +383,7 @@ long CalcToPoint( long nIn, MapUnit eUnit, sal_uInt16 nFactor )
}
-long CMToTwips( long nIn )
+static long CMToTwips( long nIn )
{
long nRet = 0;
@@ -393,7 +393,7 @@ long CMToTwips( long nIn )
}
-long MMToTwips( long nIn )
+static long MMToTwips( long nIn )
{
long nRet = 0;
@@ -403,7 +403,7 @@ long MMToTwips( long nIn )
}
-long InchToTwips( long nIn )
+static long InchToTwips( long nIn )
{
long nRet = 0;
@@ -423,7 +423,7 @@ long PointToTwips( long nIn )
}
-long PicaToTwips( long nIn )
+static long PicaToTwips( long nIn )
{
long nRet = 0;
@@ -433,14 +433,14 @@ long PicaToTwips( long nIn )
}
-long TwipsToCM( long nIn )
+static long TwipsToCM( long nIn )
{
long nRet = nIn / 567;
return nRet;
}
-long InchToCM( long nIn )
+static long InchToCM( long nIn )
{
long nRet = 0;
@@ -450,14 +450,14 @@ long InchToCM( long nIn )
}
-long MMToCM( long nIn )
+static long MMToCM( long nIn )
{
long nRet = nIn / 10;
return nRet;
}
-long PointToCM( long nIn )
+static long PointToCM( long nIn )
{
long nRet = 0;
@@ -467,7 +467,7 @@ long PointToCM( long nIn )
}
-long PicaToCM( long nIn)
+static long PicaToCM( long nIn)
{
long nRet = 0;
@@ -477,7 +477,7 @@ long PicaToCM( long nIn)
}
-long TwipsToMM( long nIn )
+static long TwipsToMM( long nIn )
{
long nRet = 0;
@@ -487,7 +487,7 @@ long TwipsToMM( long nIn )
}
-long CMToMM( long nIn )
+static long CMToMM( long nIn )
{
long nRet = 0;
@@ -497,7 +497,7 @@ long CMToMM( long nIn )
}
-long InchToMM( long nIn )
+static long InchToMM( long nIn )
{
long nRet = 0;
@@ -507,7 +507,7 @@ long InchToMM( long nIn )
}
-long PointToMM( long nIn )
+static long PointToMM( long nIn )
{
long nRet = 0;
@@ -517,7 +517,7 @@ long PointToMM( long nIn )
}
-long PicaToMM( long nIn )
+static long PicaToMM( long nIn )
{
long nRet = 0;
@@ -527,14 +527,14 @@ long PicaToMM( long nIn )
}
-long TwipsToInch( long nIn )
+static long TwipsToInch( long nIn )
{
long nRet = nIn / 1440;
return nRet;
}
-long CMToInch( long nIn )
+static long CMToInch( long nIn )
{
long nRet = 0;
@@ -544,7 +544,7 @@ long CMToInch( long nIn )
}
-long MMToInch( long nIn )
+static long MMToInch( long nIn )
{
long nRet = 0;
@@ -554,28 +554,28 @@ long MMToInch( long nIn )
}
-long PointToInch( long nIn )
+static long PointToInch( long nIn )
{
long nRet = nIn / 72;
return nRet;
}
-long PicaToInch( long nIn )
+static long PicaToInch( long nIn )
{
long nRet = nIn / 6;
return nRet;
}
-long TwipsToPoint( long nIn )
+static long TwipsToPoint( long nIn )
{
long nRet = nIn / 20;
return nRet;
}
-long InchToPoint( long nIn )
+static long InchToPoint( long nIn )
{
long nRet = 0;
@@ -585,7 +585,7 @@ long InchToPoint( long nIn )
}
-long CMToPoint( long nIn )
+static long CMToPoint( long nIn )
{
long nRet = 0;
@@ -595,7 +595,7 @@ long CMToPoint( long nIn )
}
-long MMToPoint( long nIn )
+static long MMToPoint( long nIn )
{
long nRet = 0;
@@ -605,21 +605,21 @@ long MMToPoint( long nIn )
}
-long PicaToPoint( long nIn )
+static long PicaToPoint( long nIn )
{
long nRet = nIn / 12;
return nRet;
}
-long TwipsToPica( long nIn )
+static long TwipsToPica( long nIn )
{
long nRet = nIn / 240;
return nRet;
}
-long InchToPica( long nIn )
+static long InchToPica( long nIn )
{
long nRet = 0;
@@ -629,7 +629,7 @@ long InchToPica( long nIn )
}
-long PointToPica( long nIn )
+static long PointToPica( long nIn )
{
long nRet = 0;
@@ -639,7 +639,7 @@ long PointToPica( long nIn )
}
-long CMToPica( long nIn )
+static long CMToPica( long nIn )
{
long nRet = 0;
@@ -649,7 +649,7 @@ long CMToPica( long nIn )
}
-long MMToPica( long nIn )
+static long MMToPica( long nIn )
{
long nRet = 0;
@@ -659,7 +659,7 @@ long MMToPica( long nIn )
}
-long Nothing( long nIn )
+static long Nothing( long nIn )
{
long nRet = nIn;
return nRet;