summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/canvas/canvastools.hxx7
-rw-r--r--include/canvas/verifyinput.hxx12
-rw-r--r--include/comphelper/newarray.hxx9
-rw-r--r--include/comphelper/optional.hxx9
-rw-r--r--include/comphelper/unique_disposing_ptr.hxx2
-rw-r--r--include/connectivity/dbcharset.hxx2
-rw-r--r--include/connectivity/sqliterator.hxx1
-rw-r--r--include/oox/helper/containerhelper.hxx12
-rw-r--r--include/sfx2/sfxuno.hxx5
-rw-r--r--include/tools/rtti.hxx10
10 files changed, 1 insertions, 68 deletions
diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index 2085915b6803..831d3b97d5c8 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -62,12 +62,6 @@ namespace com { namespace sun { namespace star { namespace rendering
struct Texture;
class XIntegerBitmapColorSpace;
class XPolyPolygon2D;
-
- bool operator==( const RenderState& rLHS,
- const RenderState& rRHS );
-
- bool operator==( const ViewState& rLHS,
- const ViewState& rRHS );
} } } }
namespace com { namespace sun { namespace star { namespace awt
@@ -111,7 +105,6 @@ namespace canvas
// mickey's math tricks...
inline unsigned int pow2( unsigned int c ) { return 0x1 << c; }
inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (pow2(pow2(c)) + 1); }
- inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (pow2(c))) & mask(c)); }
/** Round given floating point value down to next integer
*/
diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx
index 8ea52acd0842..615f5295cf25 100644
--- a/include/canvas/verifyinput.hxx
+++ b/include/canvas/verifyinput.hxx
@@ -558,18 +558,6 @@ namespace canvas
/** Range checker, which throws css::lang::IndexOutOfBounds exception, when
index range is violated
- */
- template< typename NumType > inline void verifyIndexRange( NumType arg, NumType lowerBound, NumType upperBound )
- {
- if( arg < lowerBound ||
- arg > upperBound )
- {
- throw css::lang::IndexOutOfBoundsException();
- }
- }
-
- /** Range checker, which throws css::lang::IndexOutOfBounds exception, when
- index range is violated
@param rect
Rect to verify
diff --git a/include/comphelper/newarray.hxx b/include/comphelper/newarray.hxx
index b34dc13332b5..a28bff7477cb 100644
--- a/include/comphelper/newarray.hxx
+++ b/include/comphelper/newarray.hxx
@@ -35,15 +35,6 @@ newArray_null(size_t const n) throw()
return new (::std::nothrow) T[n];
}
-template<typename T> T *
-newArray_ex(size_t const n)
-{
- if (((::std::numeric_limits<size_t>::max)() / sizeof(T)) <= n) {
- throw ::std::bad_alloc();
- }
- return new T[n];
-}
-
} // namespace comphelper
#endif // INCLUDED_COMPHELPER_NEWARRAY_HXX
diff --git a/include/comphelper/optional.hxx b/include/comphelper/optional.hxx
index 920eeba83ee0..42505e0b8661 100644
--- a/include/comphelper/optional.hxx
+++ b/include/comphelper/optional.hxx
@@ -32,15 +32,6 @@ inline ::boost::optional<T> make_optional( T const& v )
return ::boost::optional<T>(v);
}
-template <typename T>
-inline ::boost::optional<T> make_optional( css::beans::Optional<T> const& o )
-{
- if (o.IsPresent)
- return ::boost::optional<T>(o.Value);
- else
- return ::boost::optional<T>();
-}
-
} // namespace comphelper
#endif // ! defined(INCLUDED_COMPHELPER_OPTIONAL_HXX)
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 330740ce366a..1ed7c1b6eeb5 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -146,7 +146,7 @@ public:
{
}
- virtual void reset(T * p = 0)
+ virtual void reset(T * p = 0) override
{
SolarMutexGuard aGuard;
unique_disposing_ptr<T>::reset(p);
diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index 9046686ce0a6..66044f76d0ff 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -79,8 +79,6 @@ namespace dbtools
*/
CharsetIterator find(const OUString& _rIanaName, const IANA&) const;
- std::size_t size() const { ensureConstructed( ); return m_aEncodings.size(); }
-
/// get access to the first element of the charset collection
CharsetIterator begin() const;
/// get access to the (last + 1st) element of the charset collection
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index a703da07cf15..dddd2dd9df0c 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -215,7 +215,6 @@ namespace connectivity
::rtl::Reference<OSQLColumns> getGroupColumns() const { return m_aGroupColumns;}
::rtl::Reference<OSQLColumns> getOrderColumns() const { return m_aOrderColumns;}
::rtl::Reference<OSQLColumns> getParameters() const { return m_aParameters; }
- ::rtl::Reference<OSQLColumns> getCreateColumns() const { return m_aCreateColumns;}
/** return the columname and the table range
@param _pColumnRef
diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index 2016d3dee55a..1c73eb7ec98d 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -102,14 +102,11 @@ public:
explicit Matrix( size_type nWidth, size_type nHeight ) { this->resize( nWidth, nHeight ); }
explicit Matrix( size_type nWidth, size_type nHeight, const_reference rData ) { this->resize( nWidth, nHeight, rData ); }
- size_type capacity() const { return maData.capacity(); }
bool empty() const { return maData.empty(); }
size_type size() const { return maData.size(); }
size_type width() const { return mnWidth; }
size_type height() const { return this->empty() ? 0 : (this->size() / this->width()); }
- bool has( size_type nX, size_type nY ) const { return (nX < this->width()) && (nY < this->height()); }
- void reserve( size_type nWidth, size_type nHeight ) { maData.reserve( nWidth * nHeight ); }
void clear() { this->resize( 0, 0 ); }
void resize( size_type nWidth, size_type nHeight ) { mnWidth = nWidth; maData.resize( nWidth * nHeight ); }
void resize( size_type nWidth, size_type nHeight, const_reference rData ) { mnWidth = nWidth; maData.resize( nWidth * nHeight, rData ); }
@@ -125,11 +122,6 @@ public:
iterator end() { return maData.end(); }
const_iterator end() const { return maData.end(); }
- reference front() { return maData.front(); }
- const_reference front() const { return maData.front(); }
- reference back() { return maData.back(); }
- const_reference back() const { return maData.back(); }
-
iterator row_begin( size_type nY ) { return this->at( 0, nY ); }
const_iterator row_begin( size_type nY ) const { return this->at( 0, nY ); }
iterator row_end( size_type nY ) { return this->at( mnWidth, nY ); }
@@ -137,10 +129,6 @@ public:
reference row_front( size_type nY ) { return (*this)( 0, nY ); }
const_reference row_front( size_type nY ) const { return (*this)( 0, nY ); }
- reference row_back( size_type nY ) { return (*this)( mnWidth - 1, nY ); }
- const_reference row_back( size_type nY ) const { return (*this)( mnWidth - 1, nY ); }
-
- void swap( Matrix& rMatrix ) { maData.swap( rMatrix.maData ); }
private:
container_type maData;
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 7a0a213d57f1..6d2e4937d18b 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -42,11 +42,6 @@
#include <rtl/ustring.hxx>
-inline bool operator==( const css::util::URL& aURL1, const css::util::URL& aURL2 )
-{
- return aURL1.Complete == aURL2.Complete;
-}
-
class SfxAllItemSet ;
class SfxItemSet ;
class SfxSlot ;
diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx
index ad13cef32ee6..57163611db6a 100644
--- a/include/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
@@ -117,16 +117,6 @@ typedef void* (*TypeId)();
*/
#define PTR_CAST( T, pObj ) rttiCast<T>(pObj, TYPE(T))
-template<class T1, class T2>
-inline T1* rttiCast(T2* pObj, const TypeId& rTypeId) {
- return (pObj && pObj->IsA( rTypeId )) ? static_cast<T1*>(pObj) : 0;
-};
-
-template<class T1, class T2>
-inline const T1* rttiCast(const T2* pObj, const TypeId& rTypeId) {
- return (pObj && pObj->IsA( rTypeId )) ? static_cast<const T1*>(pObj) : 0;
-};
-
/** Check whether object pObj has a Base Class T
(or if pObj is an instance of T) */
#define HAS_BASE( T, pObj ) \
generated by cgit (git 2.34.1) at 2025-01-16 09:08:29 +0000