diff options
Diffstat (limited to 'include')
31 files changed, 26 insertions, 700 deletions
diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx index 4ac2624833ac..2085915b6803 100644 --- a/include/canvas/canvastools.hxx +++ b/include/canvas/canvastools.hxx @@ -112,24 +112,6 @@ namespace canvas 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)); } - template<typename T> - inline unsigned int bitcount( T c ) { - unsigned int nByteIndex = 0; - unsigned int nNumBytes = sizeof(T)<<2; - do { - c=count(c,nByteIndex++); - nNumBytes >>= 1; - } while(nNumBytes); - return c; - } - inline sal_uInt32 bitcount32( sal_uInt32 c ) { - c=count(c,0); - c=count(c,1); - c=count(c,2); - c=count(c,3); - c=count(c,4); - return c; - } /** Round given floating point value down to next integer */ diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx index 7ed2e2b4190d..5b3684767215 100644 --- a/include/comphelper/numbers.hxx +++ b/include/comphelper/numbers.hxx @@ -38,13 +38,6 @@ namespace comphelper /// returns the decimals of the given numeric number formatunder the given formats COMPHELPER_DLLPUBLIC css::uno::Any getNumberFormatDecimals(const css::uno::Reference<css::util::XNumberFormats>& xFormats, sal_Int32 nKey); - /** returns the standard format for the given type and the given _rLocale - */ - sal_Int32 getStandardFormat( - const css::uno::Reference<css::util::XNumberFormatter>& xFormatter, - sal_Int16 nType, - const css::lang::Locale& _rLocale); - /** retrieves a the value of a given property for a given format key, relating to a given formatter */ COMPHELPER_DLLPUBLIC css::uno::Any getNumberFormatProperty( diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx index fc825f6ff35c..90b1e3e4384e 100644 --- a/include/comphelper/string.hxx +++ b/include/comphelper/string.hxx @@ -222,12 +222,6 @@ namespace detail @return rBuf; */ -inline OStringBuffer& truncateToLength( - OStringBuffer& rBuffer, sal_Int32 nLength) -{ - return detail::truncateToLength(rBuffer, nLength); -} - inline OUStringBuffer& truncateToLength( OUStringBuffer& rBuffer, sal_Int32 nLength) { diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index b76c0527109c..9fab6e60220a 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -73,8 +73,6 @@ namespace connectivity }; typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const css::uno::Reference< css::beans::XPropertySet >& xColProp); - typedef std::map<OUString, sdbcx::TKeyProperties> TKeyMap; struct OTableHelperImpl; diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx index 1fe31064be29..678e431d0846 100644 --- a/include/cppcanvas/color.hxx +++ b/include/cppcanvas/color.hxx @@ -69,11 +69,6 @@ namespace cppcanvas return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha); } - inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue) - { - return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue); - } - inline sal_Int32 makeColorARGB( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue) { return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue); diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx index 342006459145..a8fa5a6e85c2 100644 --- a/include/editeng/overflowingtxt.hxx +++ b/include/editeng/overflowingtxt.hxx @@ -71,7 +71,6 @@ class OverflowingText public: OutlinerParaObject *JuxtaposeParaObject(Outliner *, OutlinerParaObject *); OutlinerParaObject *DeeplyMergeParaObject(Outliner *, OutlinerParaObject *); - static ESelection GetInsertionPointSel(); private: friend class Outliner; diff --git a/include/jvmaccess/classpath.hxx b/include/jvmaccess/classpath.hxx index 9265cd68a9b3..d5db39d941d7 100644 --- a/include/jvmaccess/classpath.hxx +++ b/include/jvmaccess/classpath.hxx @@ -69,36 +69,6 @@ JVMACCESS_DLLPUBLIC jobjectArray translateToUrls( css::uno::Reference<css::uno::XComponentContext> const & context, JNIEnv * environment, OUString const & classPath); -/** - loads a class via a java.net.URLClassLoader. - - @param context - a component context; must not be null. - - @param environment - a JNI environment; must not be null. - - @param classPath - a list of zero or more internal (see the - com.sun.star.uri.ExternalUriReferenceTranslator service) URI references, - where any space characters (U+0020) are ignored (and, in particular, separate - adjacent URI references). Any vnd.sun.star.expand URL references in the list - are expanded using the com.sun.star.util.theMacroExpander singleton of the - given context. - - @param name - the Java binary name of the class to load. - - @returns - a local reference to a java.lang.Class instance. If null, a (still pending) - JNI exception occurred. - - @throws com::sun::star::uno::RuntimeException - */ -JVMACCESS_DLLPUBLIC jclass loadClass( - css::uno::Reference<css::uno::XComponentContext> const & context, - JNIEnv * environment, OUString const & classPath, OUString const & name); - } } diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h index 16c8d0c7311c..acd2cb1ab383 100644 --- a/include/jvmfwk/framework.h +++ b/include/jvmfwk/framework.h @@ -726,30 +726,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** */ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation); -/** obtains an array containing paths to JRE installations. - - <p> - It is not guaranteed that the returned paths represent - a valid JRE. One can use <code>jfw_getJavaInfoByPath</code> to check this. - </p> - - @param parLocations - [out] on return it contains the array of paths. - @param pSize - [out] on return it contains the size of the array <code>parLocations</code>. - - @return - JFW_E_NONE function ran successfully.<br/> - JFW_E_INVALIDARG parLocation is NULL or pSize is NULL.<br/> - JFW_E_ERROR An error occurred.<br/> - JFW_E_CONFIGURATION mode was not properly set or their prerequisites - were not met.<br/> - JFW_E_DIRECT_MODE the function cannot be used in this mode. - */ -JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJRELocations( - rtl_uString *** parLocations, sal_Int32 * pSize); - - /** checks if the installation of the jre still exists. This function checks if the JRE described by pInfo still diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 9894c0040d18..2016d3dee55a 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -240,36 +240,18 @@ public: static const typename VectorType::value_type& getVectorElement( const VectorType& rVector, sal_Int32 nIndex, const typename VectorType::value_type& rDefault ); - /** Returns the reference to an existing element of the passed vector, or - the passed default value, if the passed index is out of bounds. */ - template< typename VectorType > - static typename VectorType::value_type& - getVectorElementAccess( VectorType& rVector, sal_Int32 nIndex, typename VectorType::value_type& rDefault ); - /** Returns the pointer to an existing element of the passed map, or a null pointer, if an element with the passed key does not exist. */ template< typename MapType > static const typename MapType::mapped_type* getMapElement( const MapType& rMap, const typename MapType::key_type& rKey ); - /** Returns the pointer to an existing element of the passed map, or a null - pointer, if an element with the passed key does not exist. */ - template< typename MapType > - static typename MapType::mapped_type* - getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey ); - /** Returns the reference to an existing element of the passed map, or the passed default value, if an element with the passed key does not exist. */ template< typename MapType > static const typename MapType::mapped_type& getMapElement( const MapType& rMap, const typename MapType::key_type& rKey, const typename MapType::mapped_type& rDefault ); - /** Returns the reference to an existing element of the passed map, or the - passed default value, if an element with the passed key does not exist. */ - template< typename MapType > - static typename MapType::mapped_type& - getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey, typename MapType::mapped_type& rDefault ); - // vector/map/matrix to UNO sequence -------------------------------------- /** Creates a UNO sequence from a std::vector with copies of all elements. @@ -316,12 +298,6 @@ template< typename VectorType > return ((0 <= nIndex) && (static_cast< size_t >( nIndex ) < rVector.size())) ? rVector[ static_cast< size_t >( nIndex ) ] : rDefault; } -template< typename VectorType > -/*static*/ typename VectorType::value_type& ContainerHelper::getVectorElementAccess( VectorType& rVector, sal_Int32 nIndex, typename VectorType::value_type& rDefault ) -{ - return ((0 <= nIndex) && (static_cast< size_t >( nIndex ) < rVector.size())) ? rVector[ static_cast< size_t >( nIndex ) ] : rDefault; -} - template< typename MapType > /*static*/ const typename MapType::mapped_type* ContainerHelper::getMapElement( const MapType& rMap, const typename MapType::key_type& rKey ) { @@ -330,26 +306,12 @@ template< typename MapType > } template< typename MapType > -/*static*/ typename MapType::mapped_type* ContainerHelper::getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey ) -{ - typename MapType::iterator aIt = rMap.find( rKey ); - return (aIt == rMap.end()) ? 0 : &aIt->second; -} - -template< typename MapType > /*static*/ const typename MapType::mapped_type& ContainerHelper::getMapElement( const MapType& rMap, const typename MapType::key_type& rKey, const typename MapType::mapped_type& rDefault ) { typename MapType::const_iterator aIt = rMap.find( rKey ); return (aIt == rMap.end()) ? rDefault : aIt->second; } -template< typename MapType > -/*static*/ typename MapType::mapped_type& ContainerHelper::getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey, typename MapType::mapped_type& rDefault ) -{ - typename MapType::iterator aIt = rMap.find( rKey ); - return (aIt == rMap.end()) ? rDefault : aIt->second; -} - template< typename VectorType > /*static*/ css::uno::Sequence< typename VectorType::value_type > ContainerHelper::vectorToSequence( const VectorType& rVector ) { diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index f36e6325ebd9..516c7a2567b4 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -166,19 +166,6 @@ inline void setFlag( Type& ornBitField, Type nMask, bool bSet = true ) if( bSet ) ornBitField |= nMask; else ornBitField &= ~nMask; } -/** Inserts a value into a bitfield. - - Inserts the lower nBitCount bits of nValue into ornBitField, starting - there at bit nStartBit. Other contents of ornBitField keep unchanged. - */ -template< typename Type, typename InsertType > -void insertValue( Type& ornBitField, InsertType nValue, sal_uInt8 nStartBit, sal_uInt8 nBitCount ) -{ - sal_uInt64 nMask = 1; nMask <<= nBitCount; --nMask; - Type nNewValue = static_cast< Type >( nValue & nMask ); - (ornBitField &= ~(nMask << nStartBit)) |= (nNewValue << nStartBit); -} - /** Optional value, similar to ::boost::optional<>, with convenience accessors. @@ -198,7 +185,6 @@ public: const Type& get() const { return maValue; } const Type& get( const Type& rDefValue ) const { return mbHasValue ? maValue : rDefValue; } - void reset() { mbHasValue = false; } void set( const Type& rValue ) { maValue = rValue; mbHasValue = true; } Type& use() { mbHasValue = true; return maValue; } @@ -256,13 +242,6 @@ public: #endif - /** Reads a value from memory, assuming memory buffer in little-endian. - @param ornValue (out-parameter) Contains the value read from memory. - @param pSrcBuffer The memory buffer to read the value from. - */ - template< typename Type > - inline static void readLittleEndian( Type& ornValue, const void* pSrcBuffer ); - /** Writes a value to memory, while converting it to little-endian. @param pDstBuffer The memory buffer to write the value to. @param nValue The value to be written to memory in little-endian. @@ -281,13 +260,6 @@ private: template< typename Type > -inline void ByteOrderConverter::readLittleEndian( Type& ornValue, const void* pSrcBuffer ) -{ - memcpy( &ornValue, pSrcBuffer, sizeof( Type ) ); - convertLittleEndian( ornValue ); -} - -template< typename Type > inline void ByteOrderConverter::writeLittleEndian( void* pDstBuffer, Type nValue ) { convertLittleEndian( nValue ); diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index e3efbfa4f961..1a40634fa117 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -82,14 +82,6 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ - template< typename FuncType, typename ParamType > - void forEachMem( FuncType pFunc, ParamType aParam ) const - { - forEach( ::boost::bind( pFunc, _1, aParam ) ); - } - - /** Calls the passed member function of ObjType on every contained object, - automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType1, typename ParamType2 > void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const { @@ -104,14 +96,6 @@ public: forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) ); } - /** Calls the passed member function of ObjType on every contained object, - automatically skips all elements that are empty references. */ - template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 > - void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const - { - forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) ); - } - /** Calls the passed functor for every contained object. Passes the key as first argument and the object reference as second argument to rFunctor. */ @@ -129,29 +113,6 @@ public: forEachWithKey( ::boost::bind( pFunc, _2, _1 ) ); } - /** Calls the passed member function of ObjType on every contained object. - Passes the object key as first argument to the member function. */ - template< typename FuncType, typename ParamType > - void forEachMemWithKey( FuncType pFunc, ParamType aParam ) const - { - forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam ) ); - } - - /** Calls the passed member function of ObjType on every contained object. - Passes the object key as first argument to the member function. */ - template< typename FuncType, typename ParamType1, typename ParamType2 > - void forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const - { - forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) ); - } - - /** Calls the passed member function of ObjType on every contained object. - Passes the object key as first argument to the member function. */ - template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 > - void forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const - { - forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) ); - } private: template< typename FunctorType > diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index b98d961e203f..eff649b718b0 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -54,10 +54,6 @@ public: return value_type(); } - /** Returns the index of the last element, or -1, if the vector is empty. - Does *not* check whether the last element is an empty reference. */ - sal_Int32 getLastIndex() const { return static_cast< sal_Int32 >( this->size() ) - 1; } - /** Calls the passed functor for every contained object, automatically skips all elements that are empty references. */ template< typename FunctorType > @@ -107,22 +103,6 @@ public: } /** Calls the passed member function of ObjType on every contained object. - Passes the vector index to the member function. */ - template< typename FuncType > - void forEachMemWithIndex( FuncType pFunc ) const - { - forEachWithIndex( ::boost::bind( pFunc, _2, _1 ) ); - } - - /** Calls the passed member function of ObjType on every contained object. - Passes the vector index as first argument to the member function. */ - template< typename FuncType, typename ParamType > - void forEachMemWithIndex( FuncType pFunc, ParamType aParam ) const - { - forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam ) ); - } - - /** Calls the passed member function of ObjType on every contained object. Passes the vector index as first argument to the member function. */ template< typename FuncType, typename ParamType1, typename ParamType2 > void forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const @@ -130,14 +110,6 @@ public: forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) ); } - /** Calls the passed member function of ObjType on every contained object. - Passes the vector index as first argument to the member function. */ - template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 > - void forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const - { - forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) ); - } - /** Searches for an element by using the passed functor that takes a constant reference of the object type (const ObjType&). */ template< typename FunctorType > diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index 3efd418dea64..ae3cdc124a45 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -59,9 +59,6 @@ public: /** Aligns the stream according to the passed type and reads a value. */ template< typename Type > void writeAligned( Type nVal ) { align( sizeof( Type ) ); writeValue( nVal ); } - /** Aligns the stream according to the passed type and skips the size of the type. */ - template< typename Type > - void padAligned() { align( sizeof( Type ) ); pad( sizeof( Type ) ); } private: BinaryOutputStream* mpOutStrm; ///< The wrapped input stream. diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index 6b2c3c67940f..cea21146d36c 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -75,10 +75,6 @@ public: @param bDeep True = searches in all group shapes too. */ const ShapeBase* getShapeById( const OUString& rShapeId, bool bDeep ) const; - /** Searches for a shape type by using the passed functor that takes a - constant reference of a ShapeType object. */ - template< typename Functor > - const ShapeType* findShapeType( const Functor& rFunctor ) const; /** Searches for a shape by using the passed functor that takes a constant reference of a ShapeBase object. */ template< typename Functor > @@ -132,12 +128,6 @@ ShapeT& ShapeContainer::createShape() } template< typename Functor > -const ShapeType* ShapeContainer::findShapeType( const Functor& rFunctor ) const -{ - return maTypes.findIf( rFunctor ).get(); -} - -template< typename Functor > const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const { return maShapes.findIf( rFunctor ).get(); diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index d99035758a06..b9865f8a541d 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -279,11 +279,11 @@ public: inline explicit NumericFieldWrapper( NumericField& rField ) : SingleControlWrapper< NumericField, ValueT >( rField ) {} - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual ValueT GetControlValue() const; - virtual void SetControlValue( ValueT nValue ); + virtual ValueT GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; }; @@ -309,11 +309,11 @@ public: inline explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit = FUNIT_NONE ) : SingleControlWrapper< MetricField, ValueT >( rField ), meUnit( eUnit ) {} - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual ValueT GetControlValue() const; - virtual void SetControlValue( ValueT nValue ); + virtual ValueT GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; private: FieldUnit meUnit; @@ -353,13 +353,13 @@ public: inline explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap = 0 ) : SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {} - virtual bool IsControlDontKnow() const + virtual bool IsControlDontKnow() const SAL_OVERRIDE { return this->GetControl().GetSelectEntryCount() == 0; } - virtual void SetControlDontKnow( bool bSet ) + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE { if( bSet ) this->GetControl().SetNoSelection(); } - virtual ValueT GetControlValue() const; - virtual void SetControlValue( ValueT nValue ); + virtual ValueT GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; }; @@ -395,13 +395,13 @@ public: inline explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap = 0 ) : SingleControlWrapper< ValueSet, ValueT >( rValueSet ), MapperType( WRAPPER_VALUESET_ITEM_NOTFOUND, pMap ) {} - virtual bool IsControlDontKnow() const + virtual bool IsControlDontKnow() const SAL_OVERRIDE { return this->GetControl().IsNoSelection(); } - virtual void SetControlDontKnow( bool bSet ) + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE { if( bSet ) this->GetControl().SetNoSelection(); } - virtual ValueT GetControlValue() const; - virtual void SetControlValue( ValueT nValue ); + virtual ValueT GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; }; diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 594bcd4440ca..ed22fae42532 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -139,9 +139,9 @@ public: virtual ~ValueItemWrapper() {} - virtual ValueT GetItemValue( const ItemT& rItem ) const + virtual ValueT GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE { return static_cast< ValueT >( rItem.GetValue() ); } - virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const + virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const SAL_OVERRIDE { rItem.SetValue( static_cast< InternalValueT >( aValue ) ); } }; @@ -164,9 +164,9 @@ public: virtual ~IdentItemWrapper() {} - virtual const ItemT& GetItemValue( const ItemT& rItem ) const + virtual const ItemT& GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE { return rItem; } - virtual void SetItemValue( ItemT& rItem, const ItemT& rValue ) const + virtual void SetItemValue( ItemT& rItem, const ItemT& rValue ) const SAL_OVERRIDE { rItem = rValue; } }; diff --git a/include/store/store.h b/include/store/store.h index 6b00241d0979..61dc1e177d9e 100644 --- a/include/store/store.h +++ b/include/store/store.h @@ -110,42 +110,6 @@ STORE_DLLPUBLIC storeError SAL_CALL store_flushFile ( ) SAL_THROW_EXTERN_C(); -/** Get the number of referers to a file. - @param hFile [in] the File Handle. - @param pnRefCount [out] number of open directories and streams. - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount ( - storeFileHandle hFile, - sal_uInt32 *pnRefCount -) SAL_THROW_EXTERN_C(); - - -/** Get the size of a file. - @param hFile [in] the File Handle. - @param pnSize [out] the file size in bytes. - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize ( - storeFileHandle hFile, - sal_uInt32 *pnSize -) SAL_THROW_EXTERN_C(); - - -/** Recover and Compact a file into another file. - @see store_openFile() - - @param pSrcFilename [in] opened with store_AccessReadOnly. - @param pDstFilename [in] created with store_AccessCreate. - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile ( - rtl_uString *pSrcFilename, - rtl_uString *pDstFilename -) SAL_THROW_EXTERN_C(); - - - /** Directory Handle opaque type. */ typedef void* storeDirectoryHandle; @@ -170,16 +134,6 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory ( ) SAL_THROW_EXTERN_C(); -/** Close a directory. - @param hDirectory [in] the Directory Handle. - @return store_E_None upon success, - store_E_InvalidHandle otherwise. - */ -STORE_DLLPUBLIC storeError SAL_CALL store_closeDirectory ( - storeDirectoryHandle hDirectory -) SAL_THROW_EXTERN_C(); - - /** Find first directory entry. @param hDirectory [in] the Directory Handle. @param pFindData [out] the Find Data structure. @@ -229,16 +183,6 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openStream ( ) SAL_THROW_EXTERN_C(); -/** Close a stream. - @param hStrm [in] the Stream Handle. - @return store_E_None upon success, - store_E_InvalidHandle otherwise. - */ -STORE_DLLPUBLIC storeError SAL_CALL store_closeStream ( - storeStreamHandle hStrm -) SAL_THROW_EXTERN_C(); - - /** Read from a stream. @param hStrm [in] the Stream Handle. @param nOffset [in] the offset of the first byte to read. @@ -273,109 +217,6 @@ STORE_DLLPUBLIC storeError SAL_CALL store_writeStream ( ) SAL_THROW_EXTERN_C(); -/** Flush a stream. - @param hStrm [in] the Stream Handle. - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_flushStream ( - storeStreamHandle hStrm -) SAL_THROW_EXTERN_C(); - - -/** Get the size of a stream. - @param hStrm [in] the Stream Handle. - @param pnSize [out] the stream size in bytes. - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_getStreamSize ( - storeStreamHandle hStrm, - sal_uInt32 *pnSize -) SAL_THROW_EXTERN_C(); - - -/** Set the size of a stream. - @param hStrm [in] the Stream Handle. - @param nSize [in] the new stream size in bytes. - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_setStreamSize ( - storeStreamHandle hStrm, - sal_uInt32 nSize -) SAL_THROW_EXTERN_C(); - - - -/** Set attributes of a file entry. - @param hFile [in] the File Handle. - @param pPath [in] the entry path. - @param pName [in] the entry name. - @param nMask1 [in] the attributes to be cleared. - @param nMask2 [in] the attributes to be set. - @param pnAttrib [out] the resulting attributes, may be NULL. - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_attrib ( - storeFileHandle hFile, - rtl_uString *pPath, - rtl_uString *pName, - sal_uInt32 nMask1, - sal_uInt32 nMask2, - sal_uInt32 *pnAttrib -) SAL_THROW_EXTERN_C(); - - -/** Insert a file entry as 'hard link' to another file entry. - @pre Source must not exist, Destination must exist. - @post Source has attribute STORE_ATTRIB_ISLINK. - @see store_attrib() - - @param hFile [in] the File Handle - @param pSrcPath [in] the Source path - @param pSrcName [in] the Source name - @param pDstPath [in] the Destination path - @param pDstName [in] the Destination name - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_link ( - storeFileHandle hFile, - rtl_uString *pSrcPath, rtl_uString *pSrcName, - rtl_uString *pDstPath, rtl_uString *pDstName -) SAL_THROW_EXTERN_C(); - - -/** Insert a file entry as 'symbolic link' to another file entry. - @pre Source must not exist - @post Source has attribute STORE_ATTRIB_ISLINK. - @see store_attrib() - - @param hFile [in] the File Handle - @param pSrcPath [in] the Source path - @param pSrcName [in] the Source name - @param pDstPath [in] the Destination path - @param pDstName [in] the Destination name - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_symlink ( - storeFileHandle hFile, - rtl_uString *pSrcPath, rtl_uString *pSrcName, - rtl_uString *pDstPath, rtl_uString *pDstName -) SAL_THROW_EXTERN_C(); - - -/** Rename a file entry. - @param hFile [in] the File Handle - @param pSrcPath [in] the Source path - @param pSrcName [in] the Source name - @param pDstPath [in] the Destination path - @param pDstName [in] the Destination name - @return store_E_None upon success - */ -STORE_DLLPUBLIC storeError SAL_CALL store_rename ( - storeFileHandle hFile, - rtl_uString *pSrcPath, rtl_uString *pSrcName, - rtl_uString *pDstPath, rtl_uString *pDstName -) SAL_THROW_EXTERN_C(); - /** Remove a file entry. @param hFile [in] the File Handle diff --git a/include/store/store.hxx b/include/store/store.hxx index 1c148a292a2d..2de8b5b0b98b 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -105,18 +105,6 @@ public: return store_openStream (hFile, rPath.pData, rName.pData, eMode, &m_hImpl); } - /** Close the stream. - @see store_closeStream() - */ - inline void close() - { - if (m_hImpl) - { - (void) store_closeStream (m_hImpl); - m_hImpl = 0; - } - } - /** Read from the stream. @see store_readStream() */ @@ -147,39 +135,6 @@ public: return store_writeStream (m_hImpl, nOffset, pBuffer, nBytes, &rnDone); } - /** Flush the stream. - @see store_flushStream() - */ - inline storeError flush() const - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_flushStream (m_hImpl); - } - - /** Get the stream size. - @see store_getStreamSize() - */ - inline storeError getSize (sal_uInt32 & rnSize) const - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_getStreamSize (m_hImpl, &rnSize); - } - - /** Set the stream size. - @see store_setStreamSize() - */ - inline storeError setSize (sal_uInt32 nSize) - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_setStreamSize (m_hImpl, nSize); - } - private: /** Representation. */ @@ -262,18 +217,6 @@ public: return store_openDirectory (hFile, rPath.pData, rName.pData, eMode, &m_hImpl); } - /** Close the directory. - @see store_closeDirectory() - */ - inline void close() - { - if (m_hImpl) - { - (void) store_closeDirectory (m_hImpl); - m_hImpl = 0; - } - } - /** Directory iterator type. @see first() @see next() @@ -428,99 +371,6 @@ public: return store_flushFile (m_hImpl); } - /** Get the number of referers to the file. - @see store_getFileRefererCount() - */ - inline storeError getRefererCount (sal_uInt32 & rnRefCount) const - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_getFileRefererCount (m_hImpl, &rnRefCount); - } - - /** Get the file size. - @see store_getFileSize() - */ - inline storeError getSize (sal_uInt32 & rnSize) const - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_getFileSize (m_hImpl, &rnSize); - } - - /** Set attributes of a file entry. - @see store_attrib() - */ - inline storeError attrib ( - rtl::OUString const & rPath, - rtl::OUString const & rName, - sal_uInt32 nMask1, - sal_uInt32 nMask2, - sal_uInt32 & rnAttrib) - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_attrib (m_hImpl, rPath.pData, rName.pData, nMask1, nMask2, &rnAttrib); - } - - /** Set attributes of a file entry. - @see store_attrib() - */ - inline storeError attrib ( - rtl::OUString const & rPath, - rtl::OUString const & rName, - sal_uInt32 nMask1, - sal_uInt32 nMask2) - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_attrib (m_hImpl, rPath.pData, rName.pData, nMask1, nMask2, NULL); - } - - /** Insert a file entry as 'hard link' to another file entry. - @see store_link() - */ - inline storeError link ( - rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName, - rtl::OUString const & rDstPath, rtl::OUString const & rDstName) - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_link ( - m_hImpl, rSrcPath.pData, rSrcName.pData, rDstPath.pData, rDstName.pData); - } - - /** Insert a file entry as 'symbolic link' to another file entry. - @see store_symlink() - */ - inline storeError symlink ( - rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName, - rtl::OUString const & rDstPath, rtl::OUString const & rDstName) - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_symlink (m_hImpl, rSrcPath.pData, rSrcName.pData, rDstPath.pData, rDstName.pData); - } - - /** Rename a file entry. - @see store_rename() - */ - inline storeError rename ( - rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName, - rtl::OUString const & rDstPath, rtl::OUString const & rDstName) - { - if (!m_hImpl) - return store_E_InvalidHandle; - - return store_rename (m_hImpl, rSrcPath.pData, rSrcName.pData, rDstPath.pData, rDstName.pData); - } - /** Remove a file entry. @see store_remove() */ diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index ccb489e0ce64..55399e340a6f 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -162,9 +162,6 @@ public: return( mnLumPercent != 0 || mnContPercent != 0 || mnRPercent != 0 || mnGPercent != 0 || mnBPercent != 0 || mfGamma != 1.0 || mbInvert ); } - - friend SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr ); - friend SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ); }; class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream diff --git a/include/tools/errcode.hxx b/include/tools/errcode.hxx index 0df5e305b265..5a8f57af462b 100644 --- a/include/tools/errcode.hxx +++ b/include/tools/errcode.hxx @@ -81,7 +81,6 @@ Warning || || | #ifdef __RSC -#define ERRCODE_TOERRID(x) (x & ~ERRCODE_DYNAMIC_MASK) #define ERRCODE_TOERROR(x) \ ((x & ERRCODE_WARNING_MASK) ? 0 : (x & ERRCODE_ERROR_MASK)) @@ -89,11 +88,6 @@ Warning || || | typedef sal_uInt32 ErrCode; -inline sal_uInt32 ERRCODE_TOERRID( ErrCode x ) -{ - return x & ~ERRCODE_DYNAMIC_MASK; -} - inline sal_uInt32 ERRCODE_TOERROR( ErrCode x ) { return ((x & ERRCODE_WARNING_MASK) ? 0 : (x & ERRCODE_ERROR_MASK)); diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 56aa05645a6b..402a0c9e0635 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -159,7 +159,6 @@ public: virtual ~SvPersistStream(); void SetStream( SvStream * pStream ); - SvStream * GetStream() const { return pStm; } SvPersistBase * GetObject( sal_uIntPtr nIdx ) const; sal_uIntPtr GetIndex( SvPersistBase * ) const; @@ -175,9 +174,6 @@ public: SvPersistStream& ReadPointer( SvPersistBase * & rpObj ); TOOLS_DLLPUBLIC friend SvPersistStream& WriteSvPersistBase(SvPersistStream &, SvPersistBase *); TOOLS_DLLPUBLIC friend SvPersistStream& operator >> (SvPersistStream &, SvPersistBase * &); - - // Objects maintain their IDs while storing and loading to/from stream - friend SvStream& operator >> ( SvStream &, SvPersistStream & ); }; #endif diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index b98fd79dd211..93b0c564c594 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -130,14 +130,6 @@ public: p->AddFirstRef(); } - inline void insert(const SvRefMemberList& rOther) - { - for( typename base_t::const_iterator it = rOther.begin(); it != rOther.end(); ++it ) - { - push_back(*it); - } - } - inline T pop_back() { T p = base_t::back(); diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 46296bb069c1..2ac01dbbfe41 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -153,8 +153,6 @@ public: virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, sal_Size * pWritten) = 0; - - virtual void Terminate() = 0; }; @@ -178,8 +176,6 @@ public: virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, sal_Size * pWritten) override; - - virtual void Terminate() override { m_bTerminated = true; } }; diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx index 27de75f26515..66a65f59d8c1 100644 --- a/include/tools/unqidx.hxx +++ b/include/tools/unqidx.hxx @@ -42,7 +42,6 @@ public: sal_uIntPtr Insert( void* p ); // insert value with key, replacing existing entry if necessary - void Insert( sal_uIntPtr aIndex, void* p ); void* Remove( sal_uIntPtr aIndex ); void* Get( sal_uIntPtr aIndex ) const; @@ -59,10 +58,8 @@ public: UniqueIndex<T>( sal_uIntPtr _nStartIndex = 0 ) : UniqueIndexImpl(_nStartIndex) {} sal_uIntPtr Insert(T* p) { return UniqueIndexImpl::Insert(p); } - void Insert(sal_uIntPtr aIdx, T* p) { return UniqueIndexImpl::Insert(aIdx, p); } T* Get(sal_uIntPtr idx) const { return static_cast<T*>( UniqueIndexImpl::Get(idx) ); } T* Remove(sal_uIntPtr idx) { return static_cast<T*>( UniqueIndexImpl::Remove(idx) ); } - sal_uIntPtr Count() const { return UniqueIndexImpl::size(); } sal_uIntPtr GetIndexOf(T* p) const { return UniqueIndexImpl::GetIndexOf(p); } using UniqueIndexImpl::FirstIndex; diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index 9a293dee9759..0d7921b75a1f 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -194,11 +194,8 @@ namespace utl inline bool set( const css::uno::BaseReference& _rRef, css::uno::UnoReference_Query _query ); - inline void set( const css::uno::XInterface* _pInterface, css::uno::UnoReference_QueryThrow _queryThrow ); inline void set( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ); - inline void set( const css::uno::Any& _rAny, css::uno::UnoReference_QueryThrow _queryThrow ); - inline void set( const INTERFACE* _pInterface, css::uno::UnoReference_SetThrow _setThrow ); inline void set( const css::uno::Reference< INTERFACE >& _rRef, css::uno::UnoReference_SetThrow _setThrow ); inline void set( const SharedUNOComponent& _rComp, css::uno::UnoReference_SetThrow _setThrow ); @@ -241,11 +238,6 @@ namespace utl } // comparison operators - template < class INTERFACE, class COMPONENT > - bool operator==( const css::uno::Reference< INTERFACE >& _rLHS, const SharedUNOComponent< INTERFACE, COMPONENT >& _rRHS ) - { - return _rLHS == _rRHS.getTyped(); - } template < class INTERFACE, class COMPONENT > bool operator==( const SharedUNOComponent< INTERFACE, COMPONENT >& _rLHS, const css::uno::Reference< INTERFACE >& _rRHS ) @@ -253,13 +245,6 @@ namespace utl return _rLHS.getTyped() == _rRHS; } - // conversion to Any - template < class INTERFACE, class COMPONENT > - inline void SAL_CALL operator <<= ( css::uno::Any & rAny, const SharedUNOComponent< INTERFACE, COMPONENT >& value ) - { - rAny <<= value.getTyped(); - } - template < class INTERFACE, class COMPONENT > inline css::uno::Any SAL_CALL makeAny( const SharedUNOComponent< INTERFACE, COMPONENT >& value ) { @@ -267,30 +252,12 @@ namespace utl } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::XInterface* _pInterface, css::uno::UnoReference_QueryThrow _queryThrow ) - { - reset( css::uno::Reference< INTERFACE >( _pInterface, _queryThrow ), TakeOwnership ); - } - - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ) { reset( css::uno::Reference< INTERFACE >( _rRef, _queryThrow ), TakeOwnership ); } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::Any& _rAny, css::uno::UnoReference_QueryThrow _queryThrow ) - { - reset( css::uno::Reference< INTERFACE >( _rAny, _queryThrow ), TakeOwnership ); - } - - template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const INTERFACE* _pInterface, css::uno::UnoReference_SetThrow _setThrow ) - { - reset( css::uno::Reference< INTERFACE >( _pInterface, _setThrow ), TakeOwnership ); - } - - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::Reference< INTERFACE >& _rRef, css::uno::UnoReference_SetThrow _setThrow ) { reset( css::uno::Reference< INTERFACE >( _rRef, _setThrow ), TakeOwnership ); diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index 151ca5547d8a..cc759c32742b 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.hxx @@ -39,9 +39,9 @@ namespace ooo T1 mnValue; public: DefaultReturnHelper( const T1& nValue ) : mnValue( nValue ) {} - virtual void SAL_CALL setValue( T1 nValue ) throw (css::uno::RuntimeException) { mnValue = nValue; } - virtual T1 SAL_CALL getValue() throw (css::uno::RuntimeException) { return mnValue; } - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + virtual void SAL_CALL setValue( T1 nValue ) throw (css::uno::RuntimeException) SAL_OVERRIDE { mnValue = nValue; } + virtual T1 SAL_CALL getValue() throw (css::uno::RuntimeException) SAL_OVERRIDE { return mnValue; } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return OUString("Value"); } }; typedef DefaultReturnHelper< sal_Int32, ov::msforms::XReturnInteger > ReturnInteger_BASE; 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 ) { |