summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-11 13:13:24 +0200
committerAndras Timar <andras.timar@collabora.com>2016-06-12 12:27:38 +0200
commit57ce435525e6b1fd7a82713f7844565fe3b22157 (patch)
tree76360f223771967e4d6c91c30bec6a6086776f62 /filter
parent8dc6db220d7ad1a65b8c45ebd020eb7461b5bb1b (diff)
loplugin:unusedmethods unused return value in filter
Change-Id: I42b24bed84ab9b745041166610732d9a074b5f72
Diffstat (limited to 'filter')
-rw-r--r--filter/source/svg/svgexport.cxx46
-rw-r--r--filter/source/svg/svgfilter.hxx14
-rw-r--r--filter/source/svg/svgwriter.cxx4
-rw-r--r--filter/source/svg/svgwriter.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hxx2
8 files changed, 25 insertions, 56 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 1adec14435dd..2fd65b335f35 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -957,9 +957,8 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
-bool SVGFilter::implGenerateMetaData()
+void SVGFilter::implGenerateMetaData()
{
- bool bRet = false;
sal_Int32 nCount = mSelectedPages.getLength();
if( nCount != 0 )
{
@@ -1184,18 +1183,13 @@ bool SVGFilter::implGenerateMetaData()
}
}
}
- bRet = true;
}
-
- return bRet;
}
-bool SVGFilter::implExportAnimations()
+void SVGFilter::implExportAnimations()
{
- bool bRet = false;
-
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", "presentation-animations" );
SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true );
@@ -1251,9 +1245,6 @@ bool SVGFilter::implExportAnimations()
}
}
}
-
- bRet = true;
- return bRet;
}
@@ -1336,7 +1327,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat
* We export bitmaps embedded into text shapes, such as those used by list
* items with image style, only once in a specific <defs> element.
*/
-bool SVGFilter::implExportTextEmbeddedBitmaps()
+void SVGFilter::implExportTextEmbeddedBitmaps()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "TextEmbeddedBitmaps" );
SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true );
@@ -1382,23 +1373,21 @@ bool SVGFilter::implExportTextEmbeddedBitmaps()
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: no shape bounding box." );
- return false;
+ return;
}
}
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: metafile should have MetaBmpExScaleAction only." );
- return false;
+ return;
}
}
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: metafile should have a single action." );
- return false;
+ return;
}
-
}
- return true;
}
@@ -1406,7 +1395,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps()
#define SVGFILTER_EXPORT_SVGSCRIPT( z, n, aFragment ) \
xExtDocHandler->unknown( aFragment ## n );
-bool SVGFilter::implGenerateScript()
+void SVGFilter::implGenerateScript()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "type", "text/ecmascript" );
@@ -1419,8 +1408,6 @@ bool SVGFilter::implGenerateScript()
BOOST_PP_REPEAT( N_SVGSCRIPT_FRAGMENTS, SVGFILTER_EXPORT_SVGSCRIPT, aSVGScript )
}
}
-
- return true;
}
@@ -1446,10 +1433,8 @@ Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName,
* This method is used when exporting a single page
* as implGenerateMetaData is not invoked.
*/
-bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
+void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
{
- bool bRet = false;
-
mVisiblePagePropSet.bIsBackgroundVisible = true;
mVisiblePagePropSet.bAreBackgroundObjectsVisible = true;
mVisiblePagePropSet.bIsPageNumberFieldVisible = false;;
@@ -1493,12 +1478,8 @@ bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
mVisiblePagePropSet.nPageNumberingType = pSdrModel->GetPageNumType();
}
}
-
- bRet = true;
}
}
-
- return bRet;
}
@@ -1558,7 +1539,7 @@ bool SVGFilter::implExportMasterPages( const std::vector< Reference< XDrawPage >
-bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPages,
+void SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage )
{
DBG_ASSERT( nFirstPage <= nLastPage,
@@ -1590,7 +1571,6 @@ bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPage
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "SlideGroup" );
SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
- bool bRet = false;
for( sal_Int32 i = nFirstPage; i <= nLastPage; ++i )
{
Reference< XShapes > xShapes;
@@ -1642,13 +1622,11 @@ bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPage
SvXMLElementExport aSlideElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
- bRet = implExportPage( sPageId, rxPages[i], xShapes, false /* is not a master page */ ) || bRet;
+ implExportPage( sPageId, rxPages[i], xShapes, false /* is not a master page */ );
}
} // append the </g> closing tag related to inserted elements
} // append the </g> closing tag related to the svg element handling the slide visibility
}
-
- return bRet;
}
@@ -2151,7 +2129,7 @@ bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPag
-bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage )
+void SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage )
{
Reference< XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( mxContext );
@@ -2173,8 +2151,6 @@ bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& r
aMtf.Read( *aFile.GetStream( StreamMode::READ ) );
(*mpObjects)[ rxDrawPage ] = ObjectRepresentation( rxDrawPage, aMtf );
-
- return true;
}
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 1e64c8bdedeb..89544adb79ae 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -252,20 +252,20 @@ private:
bool implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
static Reference< XWriter > implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
- bool implGetPagePropSet( const Reference< XDrawPage > & rxPage );
- bool implGenerateMetaData();
+ void implGetPagePropSet( const Reference< XDrawPage > & rxPage );
+ void implGenerateMetaData();
void implExportTextShapeIndex();
void implEmbedBulletGlyphs();
void implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData );
- bool implExportTextEmbeddedBitmaps();
- bool implGenerateScript();
+ void implExportTextEmbeddedBitmaps();
+ void implGenerateScript();
bool implExportDocument();
- bool implExportAnimations();
+ void implExportAnimations();
bool implExportMasterPages( const std::vector< Reference< XDrawPage > >& rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage );
- bool implExportDrawPages( const XDrawPageSequence& rxPages,
+ void implExportDrawPages( const XDrawPageSequence& rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage );
bool implExportPage( const OUString & sPageId,
const Reference< XDrawPage > & rxPage,
@@ -280,7 +280,7 @@ private:
bool implCreateObjects();
bool implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes );
bool implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape );
- bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage );
+ void implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage );
static OUString implGetClassFromShape( const Reference< XShape >& rxShape );
void implRegisterInterface( const Reference< XInterface >& rxIf );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ceb2dec4b87e..8613369d3432 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -858,7 +858,7 @@ void SVGTextWriter::implSetFontFamily()
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily );
}
-bool SVGTextWriter::createParagraphEnumeration()
+void SVGTextWriter::createParagraphEnumeration()
{
if( mrTextShape.is() )
{
@@ -869,7 +869,6 @@ bool SVGTextWriter::createParagraphEnumeration()
if( xEnumeration.is() )
{
mrParagraphEnumeration.set( xEnumeration );
- return true;
}
else
{
@@ -880,7 +879,6 @@ bool SVGTextWriter::createParagraphEnumeration()
{
OSL_FAIL( "SVGTextWriter::createParagraphEnumeration: no valid XText interface found." );
}
- return false;
}
bool SVGTextWriter::nextParagraph()
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 7afb41b51bb8..29a8fcfd5847 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -213,7 +213,7 @@ class SVGTextWriter
void setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction );
void addFontAttributes( bool bIsTextContainer );
- bool createParagraphEnumeration();
+ void createParagraphEnumeration();
bool nextParagraph();
bool nextTextPortion();
@@ -295,11 +295,10 @@ private:
bool mbIsPlaceholderShape;
- SVGAttributeWriter* ImplAcquireContext()
+ void ImplAcquireContext()
{
maContextStack.push( mpContext = new SVGAttributeWriter( mrExport, mrFontExport ) );
maTextWriter.setContext( mpContext );
- return mpContext;
}
void ImplReleaseContext()
{
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index 3f4d285a71a3..873982405dab 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -83,7 +83,7 @@ static OUString checkExtensions( const OUString& rExtensions )
return aRet;
}
-bool XMLFilterTabPageBasic::FillInfo( filter_info_impl* pInfo )
+void XMLFilterTabPageBasic::FillInfo( filter_info_impl* pInfo )
{
if( pInfo )
{
@@ -118,8 +118,6 @@ bool XMLFilterTabPageBasic::FillInfo( filter_info_impl* pInfo )
}
}
}
-
- return true;
}
void XMLFilterTabPageBasic::SetInfo(const filter_info_impl* pInfo)
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index cc90664cc457..e5809faf5cd6 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -36,7 +36,7 @@ public:
virtual ~XMLFilterTabPageBasic();
virtual void dispose() override;
- bool FillInfo( filter_info_impl* pInfo );
+ void FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
VclPtr<Edit> m_pEDFilterName;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 8f844c8f1e38..47e24a96a2a2 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -74,7 +74,7 @@ void XMLFilterTabPageXSLT::dispose()
TabPage::dispose();
}
-bool XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo )
+void XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo )
{
if( pInfo )
{
@@ -84,8 +84,6 @@ bool XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo )
pInfo->maImportTemplate = GetURL( m_pEDImportTemplate );
pInfo->mbNeedsXSLT2 = m_pCBNeedsXSLT2->IsChecked();
}
-
- return true;
}
void XMLFilterTabPageXSLT::SetInfo(const filter_info_impl* pInfo)
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 054f3e1b0f2c..7b0309c4c51d 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -37,7 +37,7 @@ public:
virtual ~XMLFilterTabPageXSLT();
virtual void dispose() override;
- bool FillInfo( filter_info_impl* pInfo );
+ void FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
DECL_LINK_TYPED( ClickBrowseHdl_Impl, Button *, void );