diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-09 08:52:44 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-19 10:45:02 +0200 |
commit | cfeeceab9ea03b5507cdb7ddb90fcc1b8b1a4e85 (patch) | |
tree | 49a8da3198093cd37134911db1ecd828b19e621e /filter/source/msfilter | |
parent | loplugin:constantfunction: editeng (diff) | |
download | core-cfeeceab9ea03b5507cdb7ddb90fcc1b8b1a4e85.tar.gz core-cfeeceab9ea03b5507cdb7ddb90fcc1b8b1a4e85.zip |
loplugin:constantfunction: filter
Change-Id: I11e616ec1e3249573797bd2a4bb2b52f11c115ee
Diffstat (limited to 'filter/source/msfilter')
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 12 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.hxx | 1 | ||||
-rw-r--r-- | filter/source/msfilter/mscodec.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 12 |
4 files changed, 1 insertions, 26 deletions
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 2e9227042eb7..063a2f084a50 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -168,13 +168,6 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty rObj.GetShapeId() ) ); \ } -//Map from twips to export units, generally twips as well, only excel and word -//export is happening here, so native units are export units, leave as -//placeholder if required in future -void ImplEESdrWriter::MapRect(ImplEESdrObject& /* rObj */ ) -{ -} - sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, EscherSolverContainer& rSolverContainer, ImplEESdrPageType ePageType, const bool bOOxmlExport ) @@ -472,7 +465,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, { ::com::sun::star::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_LINE, false, aNewRect, NULL ); - MapRect(rObj); //i27942: Poly/Lines/Bezier do not support text. mpEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -498,7 +490,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt ::com::sun::star::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, false, aNewRect, NULL ); - MapRect(rObj); aPropOpt.CreateFillProperties( rObj.mXPropSet, true ); rObj.SetAngle( 0 ); } @@ -510,7 +501,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt ::com::sun::star::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, false, aNewRect, NULL ); - MapRect(rObj); aPropOpt.CreateLineProperties( rObj.mXPropSet, false ); rObj.SetAngle( 0 ); } @@ -522,7 +512,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt ::com::sun::star::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, true, aNewRect, NULL ); - MapRect(rObj); aPropOpt.CreateLineProperties( rObj.mXPropSet, false ); rObj.SetAngle( 0 ); } @@ -537,7 +526,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt ::com::sun::star::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, true, aNewRect, NULL ); - MapRect(rObj); aPropOpt.CreateFillProperties( rObj.mXPropSet, true ); rObj.SetAngle( 0 ); } diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 7ef49a2d5fc1..e655ce95b7db 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -169,7 +169,6 @@ public: Point ImplMapPoint( const Point& rPoint ); Size ImplMapSize( const Size& rSize ); EscherExHostAppData* ImplGetHostData() { return mpHostAppData; } - void MapRect(ImplEESdrObject& rObj); }; diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 7a00f1666a9a..77c572ee07fd 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -280,7 +280,7 @@ static void lcl_PrintDigest(const sal_uInt8* pDigest, const char* msg) printf("\n"); } #else -static void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/) +static inline void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/) { } #endif diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 6f0fb8645966..9947068fc43d 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3099,13 +3099,6 @@ void SdrEscherImport::ImportHeaderFooterContainer( DffRecordHeader& rHd, HeaderF } } -// no longer needed -sal_Unicode SdrPowerPointImport::PPTSubstitute( sal_uInt16 /*nFont*/, sal_Unicode /*nChar*/, - sal_uInt32& /*nMappedFontId*/, vcl::Font& /*rFont*/, char /*nDefault*/) const -{ - return 0; -} - PPTBuGraEntry::PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInst ) : nInstance ( nInst ), aBuGra ( rGraphic ) {} @@ -5748,7 +5741,6 @@ PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader& rPropReader, PPTParagraphObj::~PPTParagraphObj() { - ImplClear(); } void PPTParagraphObj::AppendPortion( PPTPortionObj& rPPTPortion ) @@ -6280,10 +6272,6 @@ PPTPortionObj* PPTParagraphObj::Next() return &m_PortionList[i]; } -void PPTParagraphObj::ImplClear() -{ -} - PPTFieldEntry::~PPTFieldEntry() { delete pField1; |