diff options
36 files changed, 2 insertions, 372 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index a3f0575b3f32..32bc20761917 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -283,9 +283,6 @@ protected: // internal helper methods - /** @return The osl::Mutex member provided by the class BaseMutex. */ - inline ::osl::Mutex& getOslMutex(); - /** Changes the name of the object (flat assignment, no notify). @attention This method requires a locked mutex. */ inline void implSetName( const OUString& rName ); diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index eddf56e43d49..712009d8a2b4 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -76,7 +76,6 @@ public: }; ThreadPool::ThreadPool( sal_Int32 nWorkers ) : - mnThreadsWorking( 0 ), mbTerminate( false ) { std::unique_lock< std::mutex > aGuard( maMutex ); @@ -200,19 +199,6 @@ ThreadTask *ThreadPool::popWorkLocked( std::unique_lock< std::mutex > & rGuard, return nullptr; } -void ThreadPool::startWorkLocked() -{ - mnThreadsWorking++; -} - -void ThreadPool::stopWorkLocked() -{ - assert( mnThreadsWorking > 0 ); - if ( --mnThreadsWorking == 0 ) - maTasksChanged.notify_all(); -} - - void ThreadPool::waitUntilDone(const std::shared_ptr<ThreadTaskTag>& rTag) { #if defined DBG_UTIL && defined LINUX diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index 11edb80505de..437adfc4469c 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -30,23 +30,14 @@ class SvStringHashEntry { OString aName; sal_uLong nValue; - bool bHasId; public: - SvStringHashEntry() - : nValue(0) - , bHasId(false) - { - } - SvStringHashEntry( const OString& rName ) : aName(rName) , nValue(0) - , bHasId(true) { } const OString& GetName() const { return aName; } - bool HasId() const { return bHasId; } void SetValue( sal_uLong n ) { nValue = n; } sal_uLong GetValue() const { return nValue; } diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx index 9f7692252fbf..32fcb64198d7 100644 --- a/include/comphelper/threadpool.hxx +++ b/include/comphelper/threadpool.hxx @@ -85,13 +85,10 @@ private: @return a new task to perform, or NULL if list empty or terminated */ ThreadTask *popWorkLocked( std::unique_lock< std::mutex > & rGuard, bool bWait ); - void startWorkLocked(); - void stopWorkLocked(); /// signalled when all in-progress tasks are complete std::mutex maMutex; std::condition_variable maTasksChanged; - sal_Int32 mnThreadsWorking; bool mbTerminate; std::vector< ThreadTask * > maTasks; std::vector< rtl::Reference< ThreadWorker > > maWorkers; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 78cf013a2358..061816e84bb9 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -348,7 +348,6 @@ public: return GetItemPos( mnSelItemId ); } void SaveValue() { mnSavedItemId = GetSelectItemId(); } - sal_Int32 GetSavedValue() const { return mnSavedItemId; } bool IsItemSelected( sal_uInt16 nItemId ) const { return !mbNoSelection && (nItemId == mnSelItemId); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 751fa9a08ad6..9ff398482987 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -589,19 +589,6 @@ public: sal_uLong nColorCount, sal_uLong* pTols = nullptr ); - /** Convert the bitmap to a PolyPolygon - - This works by putting continuous areas of the same color into - a polygon, by tracing its bounding line. - - @param rPolyPoly - The resulting PolyPolygon - - @return true, if the operation was completed successfully. - */ - bool Vectorize( - tools::PolyPolygon& rPolyPoly ); - /** Convert the bitmap to a meta file This works by putting continuous areas of the same color into diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx index cbefea363676..fc5889531417 100644 --- a/include/vcl/helper.hxx +++ b/include/vcl/helper.hxx @@ -42,8 +42,6 @@ void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const c // seems to be a bug in gcc, now we return an object instead of a reference VCL_DLLPUBLIC OUString const & getFontPath(); -bool VCL_DLLPUBLIC convertPfbToPfa( osl::File& rInFile, osl::File& rOutFile ); - // normalized path (equivalent to realpath) void VCL_DLLPUBLIC normPath( OString& rPath ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 3edb3b8022bd..7fe0b7a41f7e 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -328,9 +328,6 @@ public: void CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId ); void Clear(); - const ImageList& GetImageList() const { return maImageList; } - void SetImageList( const ImageList& rImageList ); - void SetButtonType( ButtonType eNewType = ButtonType::SYMBOLONLY ); ButtonType GetButtonType() const { return meButtonType; } diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 70feb5a37a22..695c9c3eff32 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -83,7 +83,6 @@ class RscTypCont void SETCONST( RscConst *, Atom, sal_uInt32 ); inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } - inline void SETCONST( RscConst *p1, const char * p2, MapUnit p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); } RscEnum * InitFieldUnitsType(); RscEnum * InitKey(); RscTupel * InitStringLongTupel(); diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index a1a75f2a9a3a..efba2fcad8d4 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -623,7 +623,6 @@ public: inline bool operator!=( const ScRange& rRange ) const; inline bool operator<( const ScRange& rRange ) const; inline bool operator<=( const ScRange& rRange ) const; - inline bool lessThanByRow( const ScRange& rRange ) const; /// Hash 2D area ignoring table number. inline size_t hashArea() const; @@ -671,12 +670,6 @@ inline bool ScRange::operator<=( const ScRange& rRange ) const return operator<( rRange ) || operator==( rRange ); } -/// Sort on upper left corner tab,row,col, if equal then use lower right too. -inline bool ScRange::lessThanByRow( const ScRange& r ) const -{ - return aStart.lessThanByRow( r.aStart) || (aStart == r.aStart && aEnd.lessThanByRow( r.aEnd)) ; -} - inline bool ScRange::In( const ScAddress& rAddress ) const { return diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx index aee327dc6516..8c8f3d55c949 100644 --- a/sc/inc/convuno.hxx +++ b/sc/inc/convuno.hxx @@ -50,10 +50,6 @@ public: static inline void FillApiRange( css::table::CellRangeAddress& rApiRange, const ScRange& rScRange ); - // CellRangeAddress-Start -> CellAddress - static inline void FillApiStartAddress( - css::table::CellAddress& rApiAddress, - const css::table::CellRangeAddress& rApiRange ); /** Returns true, if the passed ranges have at least one common cell. */ static inline bool Intersects( @@ -100,15 +96,6 @@ inline void ScUnoConversion::FillApiRange( rApiRange.EndRow = rScRange.aEnd.Row(); } -inline void ScUnoConversion::FillApiStartAddress( - css::table::CellAddress& rApiAddress, - const css::table::CellRangeAddress& rApiRange ) -{ - rApiAddress.Column = rApiRange.StartColumn; - rApiAddress.Row = rApiRange.StartRow; - rApiAddress.Sheet = rApiRange.Sheet; -} - inline bool ScUnoConversion::Intersects( const css::table::CellRangeAddress& rApiRange1, const css::table::CellRangeAddress& rApiRange2 ) diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 414c9f13df61..4d420d6f117d 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -154,13 +154,6 @@ public: sal_Unicode cSeparator = ' '); /// String to Range API - static bool GetAddressFromString( - css::table::CellAddress& rAddress, - const OUString& rAddressStr, - const ScDocument* pDocument, - formula::FormulaGrammar::AddressConvention eConv, - sal_Int32& nOffset, - sal_Unicode cSeparator = ' '); static bool GetRangeFromString( css::table::CellRangeAddress& rRange, const OUString& rRangeStr, diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 2ea7a8642b9b..8a2e14a6783b 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -579,24 +579,6 @@ bool ScRangeStringConverter::GetAreaFromString( return bResult; } -bool ScRangeStringConverter::GetAddressFromString( - table::CellAddress& rAddress, - const OUString& rAddressStr, - const ScDocument* pDocument, - FormulaGrammar::AddressConvention eConv, - sal_Int32& nOffset, - sal_Unicode cSeparator ) -{ - ScAddress aScAddress; - bool bResult(false); - if( GetAddressFromString( aScAddress, rAddressStr, pDocument, eConv, nOffset, cSeparator ) && (nOffset >= 0) ) - { - ScUnoConversion::FillApiAddress( rAddress, aScAddress ); - bResult = true; - } - return bResult; -} - bool ScRangeStringConverter::GetRangeFromString( table::CellRangeAddress& rRange, const OUString& rRangeStr, diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index bd468432ce21..959fed5d8a32 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -44,13 +44,6 @@ public: /** Returns true, if the decoder has been initialized correctly. */ inline bool isValid() const { return mbValid; } - /** Decodes nBytes bytes and writes encrypted data into the buffer pnDestData. */ - void decode( - sal_uInt8* pnDestData, - const sal_uInt8* pnSrcData, - sal_Int64 nStreamPos, - sal_uInt16 nBytes ); - private: /** Derived classes implement password verification and initialization of the decoder. */ diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 4ff96f0e9e17..262aebacc5fa 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -377,8 +377,6 @@ public: /** Returns the relation identifier of the pivot cache records fragment. */ inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; } - /** Returns the number of pivot cache fields. */ - sal_Int32 getCacheFieldCount() const; /** Returns the cache field with the specified index. */ PivotCacheField* getCacheField( sal_Int32 nFieldIdx ); const PivotCacheField* getCacheField( sal_Int32 nFieldIdx ) const; diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 855fa272f8a7..0508b87e0c39 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -249,7 +249,6 @@ public: /** Extends the used area of this sheet by the passed cell position. */ void extendUsedArea( const ScAddress& rAddress ); /** Extends the used area of this sheet by the passed cell range. */ - void extendUsedArea( const ScRange& rRange ); void extendUsedArea( const css::table::CellRangeAddress& rRange ); /** Extends the shape bounding box by the position and size of the passed rectangle (in 1/100 mm). */ void extendShapeBoundingBox( const css::awt::Rectangle& rShapeRect ); diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index 89feebcd8444..705db2764982 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -52,17 +52,6 @@ BiffDecoderBase::~BiffDecoderBase() return mbValid ? ::comphelper::DocPasswordVerifierResult::OK : ::comphelper::DocPasswordVerifierResult::WrongPassword; } -void BiffDecoderBase::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, sal_uInt16 nBytes ) -{ - if( pnDestData && pnSrcData && (nBytes > 0) ) - { - if( mbValid ) - implDecode( pnDestData, pnSrcData, nStreamPos, nBytes ); - else - memcpy( pnDestData, pnSrcData, nBytes ); - } -} - BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ), diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index b6e8226dad76..fbdcfdda11a0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -1013,11 +1013,6 @@ void PivotCache::finalizeImport() } } -sal_Int32 PivotCache::getCacheFieldCount() const -{ - return static_cast< sal_Int32 >( maFields.size() ); -} - PivotCacheField* PivotCache::getCacheField( sal_Int32 nFieldIdx ) { return maFields.get( nFieldIdx ).get(); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 900f00d91434..b24536e830a6 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -263,7 +263,6 @@ namespace sw struct SW_DLLPUBLIC ContactChangedHint final: SfxHint { SdrObject** m_ppObject; - ContactChangedHint() : m_ppObject(nullptr) {}; ContactChangedHint(SdrObject** ppObject) : m_ppObject(ppObject) {}; virtual ~ContactChangedHint() override; }; diff --git a/vcl/backendtest/outputdevice/bitmap.cxx b/vcl/backendtest/outputdevice/bitmap.cxx index 351dfa2eb802..c86589ae9171 100644 --- a/vcl/backendtest/outputdevice/bitmap.cxx +++ b/vcl/backendtest/outputdevice/bitmap.cxx @@ -111,16 +111,6 @@ Bitmap OutputDeviceTestBitmap::setupDrawMask() return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -TestResult OutputDeviceTestBitmap::checkBitmap(Bitmap& rBitmap) -{ - std::vector<Color> aExpected - { - constBackgroundColor, constBackgroundColor, - COL_YELLOW, constFillColor, COL_YELLOW, constFillColor, constFillColor - }; - return checkRectangles(rBitmap, aExpected); -} - TestResult OutputDeviceTestBitmap::checkTransformedBitmap(Bitmap& rBitmap) { std::vector<Color> aExpected diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index 31a0557f341e..40ff182d64ae 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -50,10 +50,6 @@ public: int GetSlant() { return mnSlant; } long GetMinKashida() { return mnMinKashida; } - void SetAscent(long nAscent) { mnAscent=nAscent; } - void SetDescent(long nDescent) { mnDescent=nDescent; } - void SetInternalLeading(long nIntLeading) { mnIntLeading = nIntLeading; } - void SetExternalLeading(long nExtLeading) { mnExtLeading = nExtLeading; } void SetSlant(int nSlant) { mnSlant=nSlant; } void SetMinKashida( long nMinKashida ) { mnMinKashida=nMinKashida; } diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 447cc390a6b4..542eebf88348 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -105,8 +105,6 @@ public: bool GetNextPos( int* nCharPos, bool* bRTL ) { return maRuns.GetNextPos( nCharPos, bRTL ); } bool GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ); - void NeedFallback( int nCharPos, bool bRTL ) - { maFallbackRuns.AddPos( nCharPos, bRTL ); } void NeedFallback( int nMinRunPos, int nEndRunPos, bool bRTL ) { maFallbackRuns.AddRun( nMinRunPos, nEndRunPos, bRTL ); } // methods used by BiDi and glyph fallback @@ -200,7 +198,6 @@ protected: virtual ~SalLayout(); // used by layout layers - void SetUnitsPerPixel( int n ) { mnUnitsPerPixel = n; } void SetOrientation( int nOrientation ) // in 0-3600 system { mnOrientation = nOrientation; } diff --git a/vcl/inc/test/outputdevice.hxx b/vcl/inc/test/outputdevice.hxx index cc90b000b10d..0192bf9a4d5a 100644 --- a/vcl/inc/test/outputdevice.hxx +++ b/vcl/inc/test/outputdevice.hxx @@ -78,7 +78,6 @@ public: Bitmap setupDrawBitmapExWithAlpha(); Bitmap setupDrawMask(); - static TestResult checkBitmap(Bitmap& rBitmap); static TestResult checkTransformedBitmap(Bitmap& rBitmap); static TestResult checkBitmapExWithAlpha(Bitmap& rBitmap); static TestResult checkMask(Bitmap& rBitmap); diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 36155d72a485..c86dbac36a6b 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -143,7 +143,6 @@ public: bool TestFont() const { return mbFaceOk;} FT_Face GetFtFace() const; int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); } - void SetFontOptions(const std::shared_ptr<FontConfigFontOptions>&); const std::shared_ptr<FontConfigFontOptions>& GetFontOptions() const; bool NeedsArtificialBold() const { return mbArtBold; } bool NeedsArtificialItalic() const { return mbArtItalic; } @@ -152,8 +151,6 @@ public: void GetFontMetric(ImplFontMetricDataRef&) const; const unsigned char* GetTable( const char* pName, sal_uLong* pLength ); - int GetEmUnits() const { return maFaceFT->units_per_EM;} - double GetStretch() { return mfStretch; } const FontCharMapRef GetFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities &) const; diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx index cb9a6c8f355a..bf477933f37d 100644 --- a/vcl/inc/unx/printergfx.hxx +++ b/vcl/inc/unx/printergfx.hxx @@ -250,7 +250,6 @@ public: void PSPointOp (const Point& rPoint, const sal_Char* pOperator); void PSHexString (const unsigned char* pString, sal_Int16 nLen); void PSShowGlyph (const unsigned char nGlyphId); - void PSComment (const sal_Char* pComment ); void OnEndJob (); void writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts ); @@ -321,8 +320,6 @@ public: bool bArtItalic, bool bArtBold ); - sal_Int32 GetFontAngle () const - { return mnTextAngle; } sal_Int32 GetFontID () const { return mnFontID; } bool GetFontVertical() const diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index f78674be39d5..8a355da97b02 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -31,7 +31,6 @@ public: explicit ConverterCache(); ~ConverterCache(); sal_uInt16 convertOne( int nSelect, sal_Unicode ); - void convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount ); protected: void ensureConverter( int nSelect ); private: @@ -109,34 +108,6 @@ sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar ) return aCode; } -void ConverterCache::convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount ) -{ - ensureConverter( nSelect ); - - for( int n = 0; n < nCount; ++n ) - { - sal_Unicode aUCS2Char = pSrc[n]; - - sal_Char aTempArray[8]; - sal_Size nTempSize; - sal_uInt32 nCvtInfo; - - // assume that non-unicode-fonts do not support codepoints >U+FFFF - // TODO: use direct unicode->mbcs converter should there ever be one - int nCodeLen = rtl_convertUnicodeToText( - maConverterCache[ nSelect ], maContexts[ nSelect ], - &aUCS2Char, 1, aTempArray, sizeof(aTempArray), - RTL_UNICODETOTEXT_FLAGS_UNDEFINED_0 - | RTL_UNICODETOTEXT_FLAGS_INVALID_0, - &nCvtInfo, &nTempSize ); - - sal_uInt16 aCode = aTempArray[0]; - for( int i = 1; i < nCodeLen; ++i ) - aCode = (aCode << 8) + (aTempArray[i] & 0xFF); - pDst[n] = aCode; - } -} - } // anonymous namespace namespace vcl @@ -169,30 +140,6 @@ sal_uInt16 TranslateChar16(sal_uInt16 src) return aCC.convertOne( 6, src); } -void TranslateString12(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n) -{ - aCC.convertStr( 2, reinterpret_cast<sal_Unicode *>(src), dst, n); -} - -void TranslateString13(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n) -{ - aCC.convertStr( 3, reinterpret_cast<sal_Unicode *>(src), dst, n); -} - -void TranslateString14(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n) -{ - aCC.convertStr( 4, reinterpret_cast<sal_Unicode *>(src), dst, n); -} - -void TranslateString15(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n) -{ - aCC.convertStr( 5, reinterpret_cast<sal_Unicode *>(src), dst, n); -} - -void TranslateString16(sal_uInt16 *src, sal_uInt16 *dst, sal_uInt32 n) -{ - aCC.convertStr( 6, reinterpret_cast<sal_Unicode *>(src), dst, n); -} } // namespace vcl diff --git a/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx index 62317c0d925b..ce79887b4b95 100644 --- a/vcl/source/fontsubset/xlat.hxx +++ b/vcl/source/fontsubset/xlat.hxx @@ -33,12 +33,6 @@ namespace vcl sal_uInt16 TranslateChar14(sal_uInt16); sal_uInt16 TranslateChar15(sal_uInt16); sal_uInt16 TranslateChar16(sal_uInt16); - - void TranslateString12(sal_uInt16 *, sal_uInt16 *, sal_uInt32); - void TranslateString13(sal_uInt16 *, sal_uInt16 *, sal_uInt32); - void TranslateString14(sal_uInt16 *, sal_uInt16 *, sal_uInt32); - void TranslateString15(sal_uInt16 *, sal_uInt16 *, sal_uInt32); - void TranslateString16(sal_uInt16 *, sal_uInt16 *, sal_uInt32); } #endif // INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 3fd517379d05..93c4ad94312b 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2103,11 +2103,6 @@ void Bitmap::ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, } } -bool Bitmap::Vectorize( tools::PolyPolygon& rPolyPoly ) -{ - return ImplVectorizer::ImplVectorize( *this, rPolyPoly ); -} - bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, const Link<long,void>* pProgress ) { return ImplVectorizer::ImplVectorize( *this, rMtf, cReduce, pProgress ); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 73af1121e980..037d228e1e60 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -970,21 +970,6 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) } } -void ToolBox::SetImageList( const ImageList& rImageList ) -{ - maImageList = rImageList; - - sal_uInt16 nCount = (sal_uInt16)mpData->m_aItems.size(); - for( sal_uInt16 i = 0; i < nCount; i++ ) - { - Image aImage; - if ( mpData->m_aItems[i].mnId ) - aImage = maImageList.GetImage( mpData->m_aItems[i].mnId ); - if( !!aImage ) - SetItemImage( mpData->m_aItems[i].mnId, aImage ); - } -} - static Image ImplRotImage( const Image& rImage, long nAngle10 ) { Image aRet; diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index cc5683c93a60..ca84009d81d1 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -454,59 +454,6 @@ FreetypeFont::FreetypeFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI mnLoadFlags |= FT_LOAD_NO_BITMAP; } -void FreetypeFont::SetFontOptions(const std::shared_ptr<FontConfigFontOptions>& xFontOptions) -{ - mxFontOptions = xFontOptions; - - if (!mxFontOptions) - return; - - FontAutoHint eHint = mxFontOptions->GetUseAutoHint(); - if( eHint == FontAutoHint::DontKnow ) - eHint = mbUseGamma ? FontAutoHint::Yes : FontAutoHint::No; - - if( eHint == FontAutoHint::Yes ) - mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT; - - if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only - mnLoadFlags |= FT_LOAD_NO_HINTING; - mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; - - if (mxFontOptions->DontUseAntiAlias()) - mnPrioAntiAlias = 0; - if (mxFontOptions->DontUseEmbeddedBitmaps()) - mnPrioEmbedded = 0; - if (mxFontOptions->DontUseHinting()) - mnPrioAutoHint = 0; - - if( mnPrioAutoHint <= 0 ) - mnLoadFlags |= FT_LOAD_NO_HINTING; - -#if defined(FT_LOAD_TARGET_LIGHT) && defined(FT_LOAD_TARGET_NORMAL) - if( !(mnLoadFlags & FT_LOAD_NO_HINTING) ) - { - mnLoadFlags |= FT_LOAD_TARGET_NORMAL; - switch (mxFontOptions->GetHintStyle()) - { - case FontHintStyle::NONE: - mnLoadFlags |= FT_LOAD_NO_HINTING; - break; - case FontHintStyle::Slight: - mnLoadFlags |= FT_LOAD_TARGET_LIGHT; - break; - case FontHintStyle::Medium: - break; - case FontHintStyle::Full: - default: - break; - } - } -#endif - - if( mnPrioEmbedded <= 0 ) - mnLoadFlags |= FT_LOAD_NO_BITMAP; -} - namespace { FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize) diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index d8b199b708b4..d6e0508f451e 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -1052,25 +1052,6 @@ PrinterGfx::PSShowGlyph (const unsigned char nGlyphId) PSGRestore (); } -void -PrinterGfx::PSComment( const sal_Char* pComment ) -{ - const sal_Char* pLast = pComment; - while( pComment && *pComment ) - { - while( *pComment && *pComment != '\n' && *pComment != '\r' ) - pComment++; - if( pComment - pLast > 1 ) - { - WritePS( mpPageBody, "% ", 2 ); - WritePS( mpPageBody, pLast, pComment - pLast ); - WritePS( mpPageBody, "\n", 1 ); - } - if( *pComment ) - pLast = ++pComment; - } -} - bool PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize ) { diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx index 01ae3488c8d0..c7b023cc2610 100644 --- a/vcl/unx/generic/print/glyphset.hxx +++ b/vcl/unx/generic/print/glyphset.hxx @@ -70,9 +70,7 @@ public: static OString GetReencodedFontName (rtl_TextEncoding nEnc, const OString &rFontName); - static OString - GetGlyphSetEncodingName (rtl_TextEncoding nEnc, - const OString &rFontName); + bool IsVertical () { return mbVertical;} void DrawGlyph (PrinterGfx& rGfx, diff --git a/vcl/unx/generic/print/psputil.cxx b/vcl/unx/generic/print/psputil.cxx index 53b94c465e99..5c68bf687781 100644 --- a/vcl/unx/generic/print/psputil.cxx +++ b/vcl/unx/generic/print/psputil.cxx @@ -208,29 +208,6 @@ ConverterFactory::Get (rtl_TextEncoding nEncoding) return nullptr; } -// wrapper for rtl_convertUnicodeToText that handles the usual cases for -// textconversion in drawtext -std::size_t -ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen, - unsigned char *pBuffer, std::size_t nBufferSize, rtl_TextEncoding nEncoding) -{ - const sal_uInt32 nCvtFlags = RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK - | RTL_UNICODETOTEXT_FLAGS_INVALID_QUESTIONMARK ; - sal_uInt32 nCvtInfo; - sal_Size nCvtChars; - - rtl_UnicodeToTextConverter aConverter = Get (nEncoding); - rtl_UnicodeToTextContext aContext = rtl_createUnicodeToTextContext (aConverter); - - sal_Size nSize = rtl_convertUnicodeToText (aConverter, aContext, - pText, nTextLen, reinterpret_cast<char*>(pBuffer), nBufferSize, - nCvtFlags, &nCvtInfo, &nCvtChars); - - rtl_destroyUnicodeToTextContext (aConverter, aContext); - - return nSize; -} - namespace { class theConverterFactory @@ -239,11 +216,6 @@ namespace }; } -ConverterFactory& GetConverterFactory() -{ - return theConverterFactory::get(); -} - } /* namespace psp */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/print/psputil.hxx b/vcl/unx/generic/print/psputil.hxx index b035de16aafe..8cdd337eff21 100644 --- a/vcl/unx/generic/print/psputil.hxx +++ b/vcl/unx/generic/print/psputil.hxx @@ -53,16 +53,12 @@ public: ConverterFactory(); ~ConverterFactory(); rtl_UnicodeToTextConverter Get (rtl_TextEncoding nEncoding); - std::size_t Convert (const sal_Unicode *pText, int nTextLen, - unsigned char *pBuffer, std::size_t nBufferSize, - rtl_TextEncoding nEncoding); + private: std::map< rtl_TextEncoding, rtl_UnicodeToTextConverter > m_aConverters; }; -ConverterFactory& GetConverterFactory (); - } /* namespace psp */ #endif // INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx index 8c28fa01d5ae..255b73200069 100644 --- a/xmlsecurity/source/framework/elementcollector.cxx +++ b/xmlsecurity/source/framework/elementcollector.cxx @@ -138,41 +138,4 @@ void ElementCollector::doNotify() } } -ElementCollector* ElementCollector::clone( - sal_Int32 nBufferId, - cssxc::sax::ElementMarkPriority nPriority ) const -/****** ElementCollector/clone ************************************************ - * - * NAME - * clone -- duplicates this ElementCollector object - * - * SYNOPSIS - * cloned = clone(nBufferId, nPriority); - * - * FUNCTION - * duplicates this ElementCollector object with new buffer Id, priority. - * - * INPUTS - * nBufferId - the buffer node's Id - * nPriority - the priority - ******************************************************************************/ -{ - ElementCollector* pClonedOne - = new ElementCollector(m_nSecurityId, - nBufferId, nPriority, m_bToModify, - m_xReferenceResolvedListener); - - if (m_bAbleToNotify) - { - pClonedOne->notifyListener(); - } - - if (m_pBufferNode != nullptr) - { - m_pBufferNode->addElementCollector(pClonedOne); - } - - return pClonedOne; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx index 286d93aea15a..21ed0af8a072 100644 --- a/xmlsecurity/source/framework/elementcollector.hxx +++ b/xmlsecurity/source/framework/elementcollector.hxx @@ -76,9 +76,6 @@ public: void setReferenceResolvedListener( const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& referenceResolvedListener); void doNotify(); - ElementCollector* clone( - sal_Int32 nId, - css::xml::crypto::sax::ElementMarkPriority nPriority ) const; }; #endif |