[Libreoffice-commits] core.git: filter/source include/filter sc/source sw/source
Noel Grandin
noel at peralex.com
Thu Jul 16 23:51:27 PDT 2015
filter/source/config/cache/cacheitem.hxx | 17 --------------
filter/source/flash/swfexporter.hxx | 3 --
filter/source/flash/swfwriter.hxx | 3 --
filter/source/graphicfilter/icgm/actimpr.cxx | 8 ------
filter/source/graphicfilter/icgm/bundles.hxx | 7 ++---
filter/source/graphicfilter/icgm/outact.hxx | 2 -
filter/source/msfilter/escherex.cxx | 5 ----
filter/source/msfilter/eschesdo.hxx | 11 +++------
filter/source/msfilter/msdffimp.cxx | 5 ----
filter/source/msfilter/mstoolbar.cxx | 12 ----------
filter/source/msfilter/svdfppt.cxx | 25 ---------------------
filter/source/msfilter/viscache.hxx | 3 --
filter/source/svg/svgwriter.hxx | 14 -----------
filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 3 --
include/filter/msfilter/escherex.hxx | 7 -----
include/filter/msfilter/mscodec.hxx | 6 -----
include/filter/msfilter/msdffimp.hxx | 20 ----------------
include/filter/msfilter/msoleexp.hxx | 2 -
include/filter/msfilter/mstoolbar.hxx | 3 --
include/filter/msfilter/svdfppt.hxx | 10 --------
sc/source/filter/excel/xiescher.cxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 2 -
22 files changed, 10 insertions(+), 160 deletions(-)
New commits:
commit a90c6eb99c8c2167c4b1ec75a21a30a344bfea43
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jul 16 16:52:26 2015 +0200
loplugin:unusedmethods filter
Change-Id: Ie33a5ebda9337cf123b39ae18a8d7b4ef12b6991
Reviewed-on: https://gerrit.libreoffice.org/17131
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 788036a..56a5052 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -121,23 +121,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
- /** @short check, if the given properties dont exists
- at this item.
-
- @descr All properties are compared in its minimum.
- E.g: string lists => only the specified items
- are checked. Additional existing items are ignored.
-
- @param lProps
- contains all properties, which should be checked.
-
- @return sal_True if all given properties dont exists
- at this item; sal_False otherwise.
- */
- bool excludeProps(const CacheItem& lProps) const;
-
-
-
/** @short because we know two UIName properties
(a list with all locales and the value
for the current locale only), we must be sure
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 2e78abd..5c05b62 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -188,9 +188,6 @@ private:
sal_uInt32 ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape);
sal_uInt32 ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes);
- void animateShape( ShapeAnimationInfo& rAnimInfo );
- void animatePage( PageInfo* pPageInfo );
-
bool getMetaFile( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground = false, bool bExportAsJPEG = false );
Writer* mpWriter;
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index be08fb2..76d25d8 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -210,9 +210,6 @@ public:
~Sprite();
void write( SvStream& out );
-
- sal_uInt16 getId() const { return mnId; }
-
void addTag( Tag* pNewTag );
private:
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 206a546..d643c0a 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -913,14 +913,6 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla
}
-// nCount != 0 -> Append Text
-sal_uInt32 CGMImpressOutAct::DrawText( TextEntry* /*pTextEntry*/, NodeFrameSet& /*rNodeFrameSet*/, sal_uInt32 /*nObjCount*/ )
-{
-return 0;
-}
-
-
-
void CGMImpressOutAct::DrawChart()
{
}
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index 5e5ed00..d04cb36 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -152,14 +152,13 @@ public:
class FontEntry
{
public:
- sal_Int8* pFontName;
+ sal_Int8* pFontName;
CharSetType eCharSetType;
- sal_Int8* pCharSetValue;
- sal_uInt32 nFontType; // bit 0 = 1 -> Italic,
+ sal_Int8* pCharSetValue;
+ sal_uInt32 nFontType; // bit 0 = 1 -> Italic,
// bit 1 = 1 -> Bold
FontEntry();
- FontEntry* Clone() { return new FontEntry( *this ); } ;
~FontEntry();
};
diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx
index 20b8298..66fc506 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -88,7 +88,6 @@ public:
virtual void DrawPolyPolygon( tools::PolyPolygon& ) {} ;
virtual void DrawText( ::com::sun::star::awt::Point&, ::com::sun::star::awt::Size&, char*, sal_uInt32, FinalFlag ) {} ;
virtual void AppendText( char*, sal_uInt32, FinalFlag ) {} ;
- virtual sal_uInt32 DrawText( TextEntry*, NodeFrameSet&, sal_uInt32 ) { return 0; } ;
virtual void DrawChart(){} ;
};
@@ -129,7 +128,6 @@ public:
virtual void DrawPolyPolygon( tools::PolyPolygon& ) SAL_OVERRIDE ;
virtual void DrawText( ::com::sun::star::awt::Point& TextRectPos, ::com::sun::star::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ;
virtual void AppendText( char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ;
- virtual sal_uInt32 DrawText( TextEntry*, NodeFrameSet&, sal_uInt32 ) SAL_OVERRIDE ;
virtual void DrawChart() SAL_OVERRIDE;
};
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index df4b6b5..e9636bf 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3829,11 +3829,6 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
return eShapeType;
}
-MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags )
-{
- OUString aShapeType;
- return GetCustomShapeType( rXShape, nMirrorFlags, aShapeType );
-}
// Implement for form control export
bool EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape)
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index fcb93e4..072424a 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -71,20 +71,18 @@ public:
void SetRect( const Rectangle& rRect )
{ maRect = rRect; }
- sal_Int32 GetAngle() const { return mnAngle; }
+ sal_Int32 GetAngle() const { return mnAngle; }
void SetAngle( sal_Int32 nVal ) { mnAngle = nVal; }
- sal_uInt32 GetTextSize() const { return mnTextSize; }
-
bool IsValid() const { return mbValid; }
- bool IsPresObj() const { return mbPresObj; }
+
bool IsEmptyPresObj() const { return mbEmptyPresObj; }
- sal_uInt32 GetShapeId() const { return mnShapeId; }
+ sal_uInt32 GetShapeId() const { return mnShapeId; }
void SetShapeId( sal_uInt32 nVal ) { mnShapeId = nVal; }
const SdrObject* GetSdrObject() const;
- sal_uInt32 ImplGetText();
+ sal_uInt32 ImplGetText();
bool ImplHasText() const;
bool GetOOXML() const { return mbOOXML;}
void SetOOXML(bool bOOXML);
@@ -156,7 +154,6 @@ protected:
ImplEESdrPageType ePageType, const bool bOOxmlExport = false ); // returns ShapeID
static void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt );
- bool ImplGetText( ImplEESdrObject& rObj );
void ImplWriteAdditionalText(
ImplEESdrObject& rObj,
const Point& rTextRefPoint );
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 7f57508..74b337a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5524,7 +5524,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
SdrModel* pSdrModel_,// see SetModel() below
long nApplicationScale,
ColorData mnDefaultColor_,
- sal_uLong nDefaultFontHeight_,
SvStream* pStData2_,
bool bSkipImages )
:DffPropertyReader( *this ),
@@ -5532,10 +5531,8 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
pBLIPInfos( new SvxMSDffBLIPInfos ),
m_xShapeInfosByTxBxComp( new SvxMSDffShapeInfos_ByTxBxComp ),
pShapeOrders( new SvxMSDffShapeOrders ),
- nDefaultFontHeight( nDefaultFontHeight_),
nOffsDgg( nOffsDgg_ ),
nBLIPCount( USHRT_MAX ), // initialize with error, since we fist check if the
- nShapeCount( USHRT_MAX ), // control stream has correct data
nGroupShapeFlags(0), // ensure initialization here, as some corrupted
// files may yield to this being unitialized
maBaseURL( rBaseURL ),
@@ -5583,10 +5580,8 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL )
pBLIPInfos( new SvxMSDffBLIPInfos ),
m_xShapeInfosByTxBxComp( new SvxMSDffShapeInfos_ByTxBxComp ),
pShapeOrders( new SvxMSDffShapeOrders ),
- nDefaultFontHeight( 24 ),
nOffsDgg( 0 ),
nBLIPCount( USHRT_MAX ), // initialize with error, since we first have to check
- nShapeCount( USHRT_MAX ), // whether the control stream contains the correct data
nGroupShapeFlags(0),
maBaseURL( rBaseURL ),
mnCurMaxShapeId(0),
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index b856b0a..6baa8cc 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -161,19 +161,7 @@ CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Referen
return bRes;
}
-void
-TBBase::indent_printf( FILE* fp, const char* format, ... )
-{
- va_list ap;
- va_start ( ap, format );
- // indent nIndent spaces
- for ( int i=0; i<nIndent; ++i)
- fprintf(fp," ");
- // append the rest of the message
- vfprintf( fp, format, ap );
- va_end( ap );
-}
TBCHeader::TBCHeader()
: bSignature(0x3)
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 330cf43..615a366 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3022,18 +3022,7 @@ HeaderFooterEntry::~HeaderFooterEntry()
{
}
-sal_uInt32 HeaderFooterEntry::GetMaskForInstance( sal_uInt32 nInstance )
-{
- sal_uInt32 nRet = 0;
- switch ( nInstance )
- {
- case 0 : nRet = 0x07ffff; break;
- case 1 : nRet = 0x100000; break;
- case 2 : nRet = 0x200000; break;
- case 3 : nRet = 0x080000; break;
- }
- return nRet;
-}
+
sal_uInt32 HeaderFooterEntry::IsToDisplay( sal_uInt32 nInstance )
{
@@ -4617,19 +4606,7 @@ PPTTextCharacterStyleAtomInterpreter::PPTTextCharacterStyleAtomInterpreter()
{
}
-bool PPTTextCharacterStyleAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd )
-{
- rRecHd.SeekToContent( rIn );
-
- rIn.ReadUInt16( nFlags1 )
- .ReadUInt16( nFlags2 )
- .ReadUInt16( nFlags3 )
- .ReadInt32( n1 )
- .ReadUInt16( nFontHeight )
- .ReadInt32( nFontColor );
- return true;
-}
PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter()
{
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index 84e7c97..e409e05 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -57,11 +57,8 @@ public:
delete pMtf;
pMtf = new GDIMetaFile( rMtf );
}
- Bitmap *GetBitmap() const { return pBmp; }
- GDIMetaFile *GetMetaFile() const { return pMtf; }
SotClipboardFormatId GetFormat() const { return nFormat; }
void SetAspect( sal_uInt16 nAsp ) { nAspect = nAsp; }
- sal_uLong GetAdviseFlags() const { return nAdvFlags; }
void SetAdviseFlags( sal_uLong nAdv ) { nAdvFlags = nAdv; }
void SetSize( const Size & rSize ) { aSize = rSize; }
void Write( SvStream & rStm );
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 8eb9cec..8bc7491 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -258,17 +258,6 @@ class SVGTextWriter
mpTextEmbeddedBitmapMtf = pTextEmbeddedBitmapMtf;
}
- const Reference<XText>& getTextShape() const
- {
- return mrTextShape;
- }
-
-
- void setPlaceholderShapeFlag( bool bState )
- {
- mbIsPlaceholderShape = bState;
- }
-
private:
void implMap( const Size& rSz, Size& rDstSz ) const;
void implMap( const Point& rPt, Point& rDstPt ) const;
@@ -357,9 +346,6 @@ private:
void ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz,
bool bApplyMapping = true );
- void ImplCheckFontAttributes();
- void ImplCheckPaintAttributes();
-
void ImplWriteActions( const GDIMetaFile& rMtf,
sal_uInt32 nWriteFlags,
const OUString* pElementId,
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index ac3876c..439ad6f 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -39,9 +39,6 @@ public:
bool FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
- static OUString decodeComment( const OUString& rComment );
- static OUString encodeComment( const OUString& rComment );
-
VclPtr<Edit> m_pEDFilterName;
VclPtr<ComboBox> m_pCBApplication;
VclPtr<Edit> m_pEDInterfaceName;
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index a9f0fc8..8e0e6d3 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -950,10 +950,6 @@ public:
static tools::PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource );
static MSO_SPT GetCustomShapeType(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
- sal_uInt32& nMirrorFlags
- );
- static MSO_SPT GetCustomShapeType(
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
sal_uInt32& nMirrorFlags,
OUString& rShapeType,
bool bOOXML = false
@@ -991,7 +987,6 @@ public:
sal_uInt32 PtGetOffsetByID( sal_uInt32 nID );
sal_uInt32 PtReplace( sal_uInt32 nID, sal_uInt32 nOfs );
sal_uInt32 PtReplaceOrInsert( sal_uInt32 nID, sal_uInt32 nOfs );
- sal_uInt32 PtGetCount() const { return maPersistTable.size(); };
EscherPersistTable();
virtual ~EscherPersistTable();
@@ -1073,8 +1068,6 @@ public:
{ return pInteractionInfo; }
EscherExClientAnchor_Base* GetClientAnchor() const
{ return pClientAnchor; }
- EscherExClientRecord_Base* GetClientData() const
- { return pClientData; }
EscherExClientRecord_Base* GetClientTextbox() const
{ return pClientTextbox; }
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index 65ead10..3f83399 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -346,12 +346,6 @@ public:
void GetDigestFromSalt( const sal_uInt8 pSaltData[16], sal_uInt8 pDigest[16] );
private:
- void InitKeyImpl(
- const sal_uInt8 pKeyData[64],
- const sal_uInt8 pDocId[16] );
-
-
-private:
MSCodec_Std97( const MSCodec_Std97& ) SAL_DELETED_FUNCTION;
MSCodec_Std97& operator=( const MSCodec_Std97& ) SAL_DELETED_FUNCTION;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index a3572ca..68024ca 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -78,7 +78,6 @@ class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet
void ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const;
void CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItemSet& rSet, DffObjData& rObjData ) const;
- void ApplyCustomShapeAdjustmentAttributes( SfxItemSet& rSet ) const;
void ApplyCustomShapeGeometryAttributes( SvStream& rIn,
SfxItemSet& rSet,
const DffObjData& rObjData ) const;
@@ -288,10 +287,6 @@ struct SvxMSDffImportData
SvxMSDffImportData()
{}
explicit SvxMSDffImportData( const Rectangle& rParentRect ) : aParentRect( rParentRect ) {}
- void SetNewRect(sal_Int32 left, sal_Int32 top, sal_Int32 right, sal_Int32 bottom )
- { aNewRect = Rectangle(left, top, right, bottom); }
- bool HasParRect() const { return aParentRect.IsEmpty(); }
- bool HasNewRect() const { return aNewRect.IsEmpty() ; }
bool empty() const { return aRecords.empty(); }
size_t size() const { return aRecords.size(); }
MSDffImportRecords::const_iterator begin() const { return aRecords.begin(); }
@@ -405,10 +400,8 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader
std::unique_ptr<SvxMSDffShapeInfos_ByTxBxComp> m_xShapeInfosByTxBxComp;
std::unique_ptr<SvxMSDffShapeInfos_ById> m_xShapeInfosById;
SvxMSDffShapeOrders* pShapeOrders;
- sal_uLong nDefaultFontHeight;
sal_uInt32 nOffsDgg;
sal_uInt16 nBLIPCount;
- sal_uInt16 nShapeCount;
sal_uInt32 nGroupShapeFlags;
void CheckTxBxStoryChain();
@@ -467,7 +460,6 @@ protected :
sal_uLong nPosGroup,
const unsigned long nDrawingContainerId );
- bool ReadGraphic( SvStream& rSt, sal_uLong nIndex, Graphic& rGraphic ) const;
SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& );
// #i32596# - pass <nCalledByGroup> to method
// Needed in Writer's Microsoft Word import to avoid import of OLE objects
@@ -587,7 +579,6 @@ public:
SdrModel* pSdrModel_ = 0,
long nApplicationScale = 0,
ColorData mnDefaultColor_ = COL_DEFAULT,
- sal_uLong nDefaultFontHeight_ = 24,
SvStream* pStData2_ = 0,
bool bSkipImages = false );
@@ -646,15 +637,6 @@ public:
bool GetShape(sal_uLong nId, SdrObject*& rpData, SvxMSDffImportData& rData);
- /** Get count of managed BLIPs
-
- @return Number of BLIPs in pStData (or rStCtrl), thus number of FBSEs in
- the drawing group container. If 0 is returned this means that
- the structure is ok but there are no BLIPs; if USHRT_MAX is
- returned than there was an error: no correct Drawing File Format
- */
- sal_uInt16 GetBLIPCount() const{ return nBLIPCount; }
-
SdrObject* ImportObj( SvStream& rSt,
void* pData,
Rectangle& rClientRect,
@@ -705,8 +687,6 @@ public:
void RemoveFromShapeOrder( SdrObject* pObject ) const;
- sal_uInt32 GetConvertFlags() const { return nSvxMSDffOLEConvFlags; }
-
static SdrOle2Obj* CreateSdrOLEFromStorage( const OUString& rStorageName,
tools::SvRef<SotStorage>& rSrcStorage,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg,
diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx
index 1fcfe51..99b9b6b 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
@@ -38,8 +38,6 @@ class MSFILTER_DLLPUBLIC SvxMSExportOLEObjects
sal_uInt32 nConvertFlags;
public:
SvxMSExportOLEObjects( sal_uInt32 nCnvrtFlgs ) : nConvertFlags(nCnvrtFlgs) {}
-
- void SetFlags( sal_uInt32 n ) { nConvertFlags = n; }
sal_uInt32 GetFlags() const { return nConvertFlags; }
void ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg );
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 14ddff3..028e9a5 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -71,7 +71,6 @@ class MSFILTER_DLLPUBLIC TBBase
friend class Indent;
static int nIndent; // num spaces to indent before printing
protected:
- static void indent_printf(FILE* fp, const char* format, ... );
sal_uInt32 nOffSet; // usually for debug we can store the offset in the stream to this record
public:
TBBase() : nOffSet( 0 ) {}
@@ -149,8 +148,6 @@ public:
#endif
bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
OUString CustomText() { return customText.getString(); }
- OUString DescriptionText() { return descriptionText.getString(); }
- OUString Tooltip() { return tooltip.getString(); }
};
class MSFILTER_DLLPUBLIC TBCBitMap : public TBBase
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 82f3a0a..884b485 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -496,7 +496,6 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
OUString pPlaceholder[ 4 ];
sal_uInt32 nAtom;
- static sal_uInt32 GetMaskForInstance( sal_uInt32 nInstance );
sal_uInt32 IsToDisplay( sal_uInt32 nInstance );
sal_uInt32 NeedToImportInstance(
const sal_uInt32 nInstance,
@@ -587,8 +586,6 @@ protected:
SvMemoryStream* ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const;
SdrPage* MakeBlancPage(bool bMaster) const;
bool ReadFontCollection();
- bool ForceFontCollection() const
- { return pFonts != nullptr || const_cast<SdrPowerPointImport*>(this)->ReadFontCollection(); }
PptSlidePersistList* GetPageList(PptPageKind ePageKind) const;
sal_uInt32 GetAktPageId();
sal_uInt32 GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const;
@@ -604,8 +601,6 @@ public:
virtual ~SdrPowerPointImport();
sal_uInt16 GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const;
void SetPageNum( sal_uInt16 nPageNum, PptPageKind = PPT_SLIDEPAGE );
- sal_uInt16 GetPageNum() const { return nAktPageNum; }
- PptPageKind GetPageKind() const { return eAktPageKind; }
Size GetPageSize() const;
SdrObject* ImportPageBackgroundObject(
const SdrPage& rPage,
@@ -625,7 +620,6 @@ public:
void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL );
virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const SAL_OVERRIDE;
virtual bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE;
- const PptDocumentAtom& GetDocumentAtom() const { return aDocAtom; }
virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const SAL_OVERRIDE;
SdrObject* CreateTable(
SdrObject* pGroupObject,
@@ -646,10 +640,6 @@ struct PPTTextCharacterStyleAtomInterpreter
PPTTextCharacterStyleAtomInterpreter();
~PPTTextCharacterStyleAtomInterpreter();
-
- bool Read( SvStream& rIn, const DffRecordHeader& rRecHd );
-
- sal_uInt32 GetColor( sal_uInt32 nDefault );
};
struct PPTTextParagraphStyleAtomInterpreter
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 78baf30..c898f95 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3226,7 +3226,7 @@ void XclImpSolverContainer::UpdateConnection( sal_uInt32 nDffShapeId, SdrObject*
}
XclImpSimpleDffConverter::XclImpSimpleDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) :
- SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, 0, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, 24, 0 ),
+ SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, 0, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, 0 ),
XclImpRoot( rRoot )
{
SetSvxMSDffSettings( SVXMSDFF_SETTINGS_CROP_BITMAPS | SVXMSDFF_SETTINGS_IMPORT_EXCEL );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e59e0ec..4d82b50 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -527,7 +527,7 @@ Sttb::getStringAtIndex( sal_uInt32 index )
SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr, bool bSkipImages )
: SvxMSDffManager(*rRdr.m_pTableStream, rRdr.GetBaseURL(), rRdr.m_pWwFib->fcDggInfo,
- rRdr.m_pDataStream, 0, 0, COL_WHITE, 12, rRdr.m_pStrm, bSkipImages),
+ rRdr.m_pDataStream, 0, 0, COL_WHITE, rRdr.m_pStrm, bSkipImages),
rReader(rRdr), pFallbackStream(0)
{
SetSvxMSDffSettings( GetSvxMSDffSettings() );
More information about the Libreoffice-commits
mailing list