[Libreoffice-commits] core.git: include/tools include/unotools tools/source unotools/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Oct 21 06:17:59 UTC 2016
include/tools/b3dtrans.hxx | 2 --
include/tools/multisel.hxx | 1 -
include/tools/urlobj.hxx | 4 ----
include/unotools/configitem.hxx | 2 --
include/unotools/pathoptions.hxx | 1 -
tools/source/fsys/urlobj.cxx | 8 +-------
tools/source/generic/b3dtrans.cxx | 4 ++--
tools/source/memtools/multisel.cxx | 2 +-
unotools/source/config/configitem.cxx | 2 +-
unotools/source/config/pathoptions.cxx | 7 +------
10 files changed, 6 insertions(+), 27 deletions(-)
New commits:
commit ece0ff48fafce28691321e17420ebc64b3175594
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Oct 20 13:22:23 2016 +0200
loplugin:expandablemethodds in include/tools..unotools
Change-Id: I5607d4a2a81de1a3ae329acd1e90280a21522f06
Reviewed-on: https://gerrit.libreoffice.org/30097
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 331c407..9787cb7 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -91,8 +91,6 @@ public:
const basegfx::B3DPoint& rVRP = basegfx::B3DPoint(0.0,0.0,1.0),
const basegfx::B3DVector& rVPN = basegfx::B3DVector(0.0,0.0,1.0),
const basegfx::B3DVector& rVUP = basegfx::B3DVector(0.0,1.0,0.0));
- const basegfx::B3DHomMatrix& GetOrientation() { return maOrientation; }
- const basegfx::B3DHomMatrix& GetInvOrientation() { return maInvOrientation; }
// Projection
void SetProjection(const basegfx::B3DHomMatrix& mProject);
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 6159145..42ae85d 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -132,7 +132,6 @@ public:
Iterator begin( const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const;
Iterator end( const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const;
- bool isValidInput() const { return mbValidInput; }
bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const;
/**
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index f5ee051..e364466 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -790,10 +790,6 @@ public:
// Data URLs:
std::unique_ptr<SvMemoryStream> getData();
- // POP3 and URLs:
-
- static OUString GetMsgId(rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
-
// Coding:
enum Part
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 95fd308..54a57d8 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -177,8 +177,6 @@ namespace utl
void Commit();
- bool IsInValueChange() const { return m_nInValueChange > 0;}
-
ConfigItemMode GetMode() const { return m_nMode;}
};
}//namespace utl
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index 125f487..3f559b4 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -93,7 +93,6 @@ public:
const OUString& GetTemplatePath() const;
const OUString& GetUserConfigPath() const;
const OUString& GetWorkPath() const;
- const OUString& GetUIConfigPath() const;
const OUString& GetFingerprintPath() const;
const OUString& GetClassificationPath() const;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 9061bf1..d8dd46e 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3651,8 +3651,7 @@ bool INetURLObject::operator ==(INetURLObject const & rObject) const
rObject.GetHost(NO_DECODE))
|| GetPort() != rObject.GetPort()
|| HasParam() != rObject.HasParam()
- || GetParam() != rObject.GetParam()
- || GetMsgId() != INetURLObject::GetMsgId(NO_DECODE))
+ || GetParam() != rObject.GetParam())
return false;
OUString aPath1(GetURLPath(NO_DECODE));
OUString aPath2(rObject.GetURLPath(NO_DECODE));
@@ -4521,11 +4520,6 @@ OUString INetURLObject::getFSysPath(FSysStyle eStyle,
}
}
-OUString INetURLObject::GetMsgId(rtl_TextEncoding)
-{
- return OUString();
-}
-
// static
void INetURLObject::appendUCS4Escape(OUStringBuffer & rTheText,
sal_uInt32 nUCS4)
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 2b89294..d123301 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -334,14 +334,14 @@ void B3dTransformationSet::SetViewportRectangle(Rectangle const & rRect, Rectang
const basegfx::B3DPoint B3dTransformationSet::WorldToEyeCoor(const basegfx::B3DPoint& rVec)
{
basegfx::B3DPoint aVec(rVec);
- aVec *= GetOrientation();
+ aVec *= maOrientation;
return aVec;
}
const basegfx::B3DPoint B3dTransformationSet::EyeToWorldCoor(const basegfx::B3DPoint& rVec)
{
basegfx::B3DPoint aVec(rVec);
- aVec *= GetInvOrientation();
+ aVec *= maInvOrientation;
return aVec;
}
diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx
index 47a78d3..bcb2336 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -785,7 +785,7 @@ bool StringRangeEnumerator::getRangesFromString( const OUString& i_rPageRange,
o_rPageVector.push_back( *it );
}
- return aEnum.isValidInput();
+ return aEnum.mbValidInput;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 348cfc8..f6957e4 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -182,7 +182,7 @@ void ConfigItem::CallNotify( const css::uno::Sequence<OUString>& rPropertyNames
// the call is forwarded to the virtual Notify() method
// it is pure virtual, so all classes deriving from ConfigItem have to decide how they
// want to notify listeners
- if(!IsInValueChange() || m_bEnableInternalNotification)
+ if(m_nInValueChange <= 0 || m_bEnableInternalNotification)
Notify(rPropertyNames);
}
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 944eb36..7b64c91 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -564,11 +564,6 @@ const OUString& SvtPathOptions::GetUserConfigPath() const
return pImpl->GetUserConfigPath();
}
-const OUString& SvtPathOptions::GetUIConfigPath() const
-{
- return pImpl->GetUIConfigPath();
-}
-
const OUString& SvtPathOptions::GetWorkPath() const
{
return pImpl->GetWorkPath();
@@ -771,7 +766,7 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
case PATH_TEMP: aPath = GetTempPath(); break;
case PATH_TEMPLATE: aPath = GetTemplatePath(); break;
case PATH_WORK: aPath = GetWorkPath(); break;
- case PATH_UICONFIG: aPath = GetUIConfigPath(); break;
+ case PATH_UICONFIG: aPath = pImpl->GetUIConfigPath(); break;
case PATH_FINGERPRINT: aPath = GetFingerprintPath(); break;
case PATH_CLASSIFICATION: aPath = GetClassificationPath(); break;
// coverity[dead_error_begin] - following conditions exist to avoid compiler warning
More information about the Libreoffice-commits
mailing list