summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/BitmapFilterStackBlur.hxx4
-rw-r--r--include/vcl/bmpacc.hxx1
-rw-r--r--include/vcl/cvtgrf.hxx3
-rw-r--r--include/vcl/graphicfilter.hxx13
-rw-r--r--include/vcl/threadex.hxx50
5 files changed, 3 insertions, 68 deletions
diff --git a/include/vcl/BitmapFilterStackBlur.hxx b/include/vcl/BitmapFilterStackBlur.hxx
index 68fa107957e4..5b2b002db534 100644
--- a/include/vcl/BitmapFilterStackBlur.hxx
+++ b/include/vcl/BitmapFilterStackBlur.hxx
@@ -24,9 +24,7 @@ public:
BitmapFilterStackBlur(sal_Int32 nRadius, bool bExtend = true);
virtual ~BitmapFilterStackBlur();
- virtual bool filter(Bitmap& rBitmap) override;
-
- bool filter(BitmapEx& rBitmap);
+ bool filter(Bitmap& rBitmap) override;
};
#endif // INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx
index e832528c9f2b..b877c227ea2a 100644
--- a/include/vcl/bmpacc.hxx
+++ b/include/vcl/bmpacc.hxx
@@ -138,7 +138,6 @@ protected:
public:
- SAL_DLLPRIVATE void ImplZeroInitUnusedBits();
SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const
{
return mpBuffer;
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index b869a61c181a..f9f427684f8b 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -36,7 +36,6 @@ class VCL_DLLPUBLIC GraphicConverter
private:
Link<ConvertData&,bool> maFilterHdl;
- ConvertData* mpConvertData;
public:
@@ -46,8 +45,6 @@ public:
static sal_uLong Import( SvStream& rIStm, Graphic& rGraphic, ConvertDataFormat nFormat = ConvertDataFormat::Unknown );
static sal_uLong Export( SvStream& rOStm, const Graphic& rGraphic, ConvertDataFormat nFormat );
- ConvertData* GetConvertData() { return mpConvertData; }
-
void SetFilterHdl( const Link<ConvertData&,bool>& rLink ) { maFilterHdl = rLink; }
const Link<ConvertData&,bool>& GetFilterHdl() const { return maFilterHdl; }
};
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index fe4e0e0edefe..df5bd78051bf 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -212,9 +212,6 @@ public:
/** @return bits/pixel or 0 **/
sal_uInt16 GetBitsPerPixel() const { return nBitsPerPixel; }
- /** return number of planes or 0 */
- sal_uInt16 GetPlanes() const { return nPlanes; }
-
/** @return filter number that is needed by the GraphFilter to read this format */
static OUString GetImportFormatShortName( GraphicFileFormat nFormat );
};
@@ -253,18 +250,16 @@ public:
GraphicFilter( bool bUseConfig = true );
~GraphicFilter();
- void SetFilterPath( const OUString& rFilterPath ) { aFilterPath = rFilterPath; };
-
sal_uInt16 GetImportFormatCount();
sal_uInt16 GetImportFormatNumber( const OUString& rFormatName );
- sal_uInt16 GetImportFormatNumberForMediaType( const OUString& rMediaType );
sal_uInt16 GetImportFormatNumberForShortName( const OUString& rShortName );
sal_uInt16 GetImportFormatNumberForTypeName( const OUString& rType );
OUString GetImportFormatName( sal_uInt16 nFormat );
OUString GetImportFormatTypeName( sal_uInt16 nFormat );
+#ifdef WNT
OUString GetImportFormatMediaType( sal_uInt16 nFormat );
+#endif
OUString GetImportFormatShortName( sal_uInt16 nFormat );
- static OUString GetImportOSFileType( sal_uInt16 nFormat );
OUString GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
sal_uInt16 GetExportFormatCount();
@@ -274,10 +269,8 @@ public:
OUString GetExportInternalFilterName( sal_uInt16 nFormat );
sal_uInt16 GetExportFormatNumberForTypeName( const OUString& rType );
OUString GetExportFormatName( sal_uInt16 nFormat );
- OUString GetExportFormatTypeName( sal_uInt16 nFormat );
OUString GetExportFormatMediaType( sal_uInt16 nFormat );
OUString GetExportFormatShortName( sal_uInt16 nFormat );
- static OUString GetExportOSFileType( sal_uInt16 nFormat );
OUString GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
bool IsExportPixelFormat( sal_uInt16 nFormat );
@@ -313,8 +306,6 @@ public:
css::uno::Sequence< css::beans::PropertyValue >* pFilterData,
WMF_EXTERNALHEADER *pExtHeader = NULL );
- void Abort() { bAbort = true; }
-
const FilterErrorEx& GetLastError() const { return *pErrorEx;}
void ResetLastError();
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 2ea99d4462e1..c2aee506758a 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -46,11 +46,6 @@ namespace vcl
virtual long doIt() = 0;
long execute() { return impl_execute( NULL ); }
- // caution: timeout for getting the solar mutex, not for ending
- // the operation of doIt(). If doIt actually gets called within
- // the specified timeout, execute will only return after
- // doIt() completed
- long execute( const TimeValue& _rTimeout ) { return impl_execute( &_rTimeout ); }
private:
long impl_execute( const TimeValue* _pTimeout );
@@ -101,16 +96,6 @@ private:
template <typename FuncT>
class GenericSolarThreadExecutor<FuncT, void> : public SolarThreadExecutor
{
-public:
- static void exec( FuncT const& func )
- {
- typedef GenericSolarThreadExecutor<FuncT, void> ExecutorT;
- ::std::unique_ptr<ExecutorT> const pExecutor( new ExecutorT(func) );
- pExecutor->execute();
- if (pExecutor->m_exc.hasValue())
- ::cppu::throwException( pExecutor->m_exc );
- }
-
private:
explicit GenericSolarThreadExecutor( FuncT const& func )
: m_exc(), m_func(func) {}
@@ -163,35 +148,6 @@ private:
} // namespace detail
-/** Makes a copy back reference wrapper to be used for inout parameters.
- Only use for syncExecute(), the returned wrapper relies on its
- implementation, i.e. the function object is stored in free store.
- Type T needs to be copy constructable assignable.
-
- @see syncExecute()
- @param r reference to a stack variable
- @return reference wrapper
-*/
-template <typename T>
-inline detail::copy_back_wrapper<T> inout_by_ref( T & r )
-{
- return detail::copy_back_wrapper<T>(&r);
-}
-
-/** Makes a copy back ptr wrapper to be used for inout parameters.
- Only use for syncExecute(), the returned wrapper relies on its
- implementation, i.e. the function object is stored in free store.
- Type T needs to be copy constructable assignable.
-
- @see syncExecute()
- @param p pointer to a stack variable
- @return ptr wrapper
-*/
-template <typename T>
-inline detail::copy_back_wrapper<T> inout_by_ptr( T * p )
-{
- return detail::copy_back_wrapper<T>(p);
-}
/** This function will execute the passed functor synchronously in the
solar thread, thus the calling thread will (eventually) be blocked until
@@ -230,12 +186,6 @@ inline detail::copy_back_wrapper<T> inout_by_ptr( T * p )
@param func functor object to be executed in solar thread
@return return value of functor
*/
-template <typename ResultT, typename FuncT>
-inline ResultT syncExecute( FuncT const& func )
-{
- return detail::GenericSolarThreadExecutor<FuncT, ResultT>::exec(func);
-}
-
template <typename FuncT>
inline typename FuncT::result_type syncExecute( FuncT const& func )
{
generated by cgit (git 2.34.1) at 2024-07-15 09:50:25 +0000