diff options
-rw-r--r-- | connectivity/source/drivers/evoab2/NConnection.hxx | 1 | ||||
-rw-r--r-- | sw/inc/edimp.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/edit/ednumber.cxx | 5 | ||||
-rw-r--r-- | vcl/inc/vclstatuslistener.hxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 37 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter_internal.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/impastpl.hxx | 1 |
7 files changed, 0 insertions, 49 deletions
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 4d6604f0975c..8dd8714bc2fe 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -60,7 +60,6 @@ namespace connectivity::evoab { /// @throws css::sdbc::SQLException void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ); - OString const & getPassword() const { return m_aPassword; } void setPassword( OString const & aStr ) { m_aPassword = aStr; } // own methods const OEvoabDriver& getDriver() const { return m_rDriver; } diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index 5c208677eb78..50888ce339c3 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -44,7 +44,6 @@ class SwPamRanges public: SwPamRanges( const SwPaM& rRing ); - void Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ); void Insert( const SwNode& rIdx1, const SwNode& rIdx2 ); SwPaM& SetPam( size_t nArrPos, SwPaM& rPam ); diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 6ff940036dca..c272aa5f8eec 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -34,11 +34,6 @@ SwPamRanges::SwPamRanges( const SwPaM& rRing ) Insert( rTmp.GetMark()->GetNode(), rTmp.GetPoint()->GetNode() ); } -void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ) -{ - Insert(rIdx1.GetNode(), rIdx2.GetNode()); -} - void SwPamRanges::Insert( const SwNode& rIdx1, const SwNode& rIdx2 ) { SwPamRange aRg( rIdx1.GetIndex(), rIdx2.GetIndex() ); diff --git a/vcl/inc/vclstatuslistener.hxx b/vcl/inc/vclstatuslistener.hxx index 82834af84399..2335a66e7343 100644 --- a/vcl/inc/vclstatuslistener.hxx +++ b/vcl/inc/vclstatuslistener.hxx @@ -39,8 +39,6 @@ public: void SAL_CALL disposing(const css::lang::EventObject& /*Source*/) override; - const css::uno::Reference<css::frame::XFrame>& getFrame() { return mxFrame; } - void startListening(); void dispose(); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index e616c09853f4..83ce6d4bed15 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -166,43 +166,6 @@ static OUString ImpGetExtension( std::u16string_view rPath ) return aExt; } -bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen) -{ - sal_uInt8 sBuf[3]; - // store number format - SvStreamEndian oldNumberFormat = rStream.GetEndian(); - sal_uInt32 nOffset; // in MS documents the pict format is used without the first 512 bytes - for ( nOffset = 0; ( nOffset <= 512 ) && ( ( nStreamPos + nOffset + 14 ) <= nStreamLen ); nOffset += 512 ) - { - short y1,x1,y2,x2; - bool bdBoxOk = true; - - rStream.Seek( nStreamPos + nOffset); - // size of the pict in version 1 pict ( 2bytes) : ignored - rStream.SeekRel(2); - // bounding box (bytes 2 -> 9) - rStream.SetEndian(SvStreamEndian::BIG); - rStream.ReadInt16( y1 ).ReadInt16( x1 ).ReadInt16( y2 ).ReadInt16( x2 ); - rStream.SetEndian(oldNumberFormat); // reset format - - if (x1 > x2 || y1 > y2 || // bad bdbox - (x1 == x2 && y1 == y2) || // 1 pixel picture - x2-x1 > 2048 || y2-y1 > 2048 ) // picture abnormally big - bdBoxOk = false; - - // read version op - rStream.ReadBytes(sBuf, 3); - // see http://developer.apple.com/legacy/mac/library/documentation/mac/pdf/Imaging_With_QuickDraw/Appendix_A.pdf - // normal version 2 - page A23 and A24 - if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x02) - return true; - // normal version 1 - page A25 - else if (sBuf[ 0 ] == 0x11 && sBuf[ 1 ] == 0x01 && bdBoxOk) - return true; - } - return false; -} - ErrCode GraphicFilter::ImpTestOrFindFormat( std::u16string_view rPath, SvStream& rStream, sal_uInt16& rFormat ) { // determine or check the filter/format by reading into it diff --git a/vcl/source/filter/graphicfilter_internal.hxx b/vcl/source/filter/graphicfilter_internal.hxx index 87f328fceabd..7e71d8c6d16e 100644 --- a/vcl/source/filter/graphicfilter_internal.hxx +++ b/vcl/source/filter/graphicfilter_internal.hxx @@ -25,8 +25,6 @@ sal_uInt8* ImplSearchEntry(sal_uInt8*, sal_uInt8 const*, sal_uLong, sal_uLong); -extern bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen); - #endif // INCLUDED_VCL_SOURCE_FILTER_GRAPHICFILTER_INTERNAL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index b8740f137df2..7cbb89817132 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -86,7 +86,6 @@ public: const OUString& GetParent() const { return msParent; } - PropertiesListType& GetPropertiesList() { return m_PropertiesList; } const PropertiesListType& GetPropertiesList() const { return m_PropertiesList; } bool operator< (const XMLAutoStylePoolParent& rOther) const; |