diff options
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/flash/swfwriter.cxx | 7 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.hxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/mstoolbar.cxx | 12 | ||||
-rw-r--r-- | filter/source/placeware/tempfile.cxx | 4 | ||||
-rw-r--r-- | filter/source/placeware/tempfile.hxx | 2 | ||||
-rw-r--r-- | filter/source/svg/b2dellipse.cxx | 8 | ||||
-rw-r--r-- | filter/source/svg/b2dellipse.hxx | 4 | ||||
-rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.cxx | 10 | ||||
-rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.hxx | 4 |
9 files changed, 6 insertions, 47 deletions
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 9ce5f7867d72..e1858f2a5ba5 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -288,13 +288,6 @@ void Writer::endTag() -sal_uInt16 Writer::createID() -{ - return mnNextId++; -} - - - void Writer::showFrame() { startTag( TAG_SHOWFRAME ); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 2d0a4aa4fabe..f54dd2904d85 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -332,7 +332,7 @@ private: void startTag( sal_uInt8 nTagId ); void endTag(); - sal_uInt16 createID(); + sal_uInt16 createID() { return mnNextId++; } void Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 height, sal_uInt8 *pCompressed, sal_uInt32 compressed_size ); void Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, const Rectangle& rClipRect, bool bMap ); diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 589b7d98eb44..069e50642f13 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -92,11 +92,6 @@ CustomToolBarImportHelper::getCfgManager() return m_xCfgSupp->getUIConfigurationManager(); } -uno::Reference< ui::XUIConfigurationManager > -CustomToolBarImportHelper::getAppCfgManager() -{ - return m_xAppCfgMgr; -} uno::Any CustomToolBarImportHelper::createCommandFromMacro( const OUString& sCmd ) @@ -720,13 +715,6 @@ TBCBitMap::~TBCBitMap() { } -// #FIXME Const-ness -Bitmap& -TBCBitMap::getBitMap() -{ - return mBitMap; -} - bool TBCBitMap::Read( SvStream& rS) { OSL_TRACE("TBCBitMap::Read() stream pos 0x%x", rS.Tell() ); diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx index 961eaeda9470..3f0aeba52f95 100644 --- a/filter/source/placeware/tempfile.cxx +++ b/filter/source/placeware/tempfile.cxx @@ -159,9 +159,5 @@ OUString PlaceWareTempFile::createTempFileURL() return aTempFileURL; } -OUString PlaceWareTempFile::getFileURL() -{ - return maURL; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/placeware/tempfile.hxx b/filter/source/placeware/tempfile.hxx index ceefca9a3ff6..38b03f0f566e 100644 --- a/filter/source/placeware/tempfile.hxx +++ b/filter/source/placeware/tempfile.hxx @@ -30,7 +30,7 @@ public: ~PlaceWareTempFile(); static OUString createTempFileURL(); - OUString getFileURL(); + OUString getFileURL() { return maURL;} private: OUString maURL; diff --git a/filter/source/svg/b2dellipse.cxx b/filter/source/svg/b2dellipse.cxx index 4e6196f0e025..07799b583eba 100644 --- a/filter/source/svg/b2dellipse.cxx +++ b/filter/source/svg/b2dellipse.cxx @@ -32,15 +32,7 @@ namespace basegfx return !(*this == rEllipse); } - basegfx::B2DPoint B2DEllipse::getB2DEllipseCenter() const - { - return maCenter; - } - basegfx::B2DTuple B2DEllipse::getB2DEllipseRadius() const - { - return maRadius; - } } // end of namespace basegfx /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx index 21c1937da982..30e19d9a8570 100644 --- a/filter/source/svg/b2dellipse.hxx +++ b/filter/source/svg/b2dellipse.hxx @@ -45,8 +45,8 @@ namespace basegfx bool operator!=(const B2DEllipse& rEllipse) const; // Coordinate interface - basegfx::B2DPoint getB2DEllipseCenter() const; - basegfx::B2DTuple getB2DEllipseRadius() const; + basegfx::B2DPoint getB2DEllipseCenter() const { return maCenter; } + basegfx::B2DTuple getB2DEllipseRadius() const { return maRadius; } }; } // end of namespace basegfx diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 882501fa3eb6..de259dda5cc7 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -536,17 +536,7 @@ namespace XSLT } } - const OString - LibXSLTTransformer::getStyleSheetURL() - { - return m_styleSheetURL; - } - ::std::map<const char*, OString> - LibXSLTTransformer::getParameters() - { - return m_parameters; - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index 1233ad603afa..45c5490a14e2 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -139,10 +139,10 @@ namespace XSLT error(const OUString& msg); const OString SAL_CALL - getStyleSheetURL(); + getStyleSheetURL() { return m_styleSheetURL; } ::std::map<const char*, OString> SAL_CALL - getParameters(); + getParameters() { return m_parameters; } com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> SAL_CALL getComponentContext() { |