[Libreoffice-commits] core.git: compilerplugins/clang include/oox oox/inc oox/source
Noel Grandin
noel at peralex.com
Mon Jul 20 23:51:26 PDT 2015
compilerplugins/clang/unusedmethods.py | 2 +
include/oox/core/binarycodec.hxx | 4 --
include/oox/core/contexthandler.hxx | 2 -
include/oox/core/fragmenthandler.hxx | 2 -
include/oox/core/relations.hxx | 2 -
include/oox/core/xmlfilterbase.hxx | 2 -
include/oox/crypto/CryptoEngine.hxx | 5 --
include/oox/drawingml/shape.hxx | 5 --
include/oox/drawingml/theme.hxx | 3 -
include/oox/dump/dumperbase.hxx | 21 ----------
include/oox/dump/xlsbdumper.hxx | 39 --------------------
include/oox/helper/binaryinputstream.hxx | 2 -
include/oox/helper/binaryoutputstream.hxx | 9 ----
include/oox/helper/binarystreambase.hxx | 4 --
include/oox/helper/containerhelper.hxx | 3 -
include/oox/helper/propertymap.hxx | 3 -
include/oox/mathml/importutils.hxx | 1
include/oox/ole/axbinaryreader.hxx | 6 ---
include/oox/ppt/comments.hxx | 25 ------------
include/oox/ppt/pptshape.hxx | 2 -
include/oox/ppt/slidepersist.hxx | 2 -
include/oox/ppt/slidetransition.hxx | 2 -
include/oox/ppt/timenode.hxx | 4 --
oox/inc/drawingml/chart/plotareaconverter.hxx | 2 -
oox/inc/drawingml/chart/seriesconverter.hxx | 8 ----
oox/inc/drawingml/graphicproperties.hxx | 3 -
oox/inc/drawingml/shape3dproperties.hxx | 3 -
oox/inc/drawingml/table/tablecell.hxx | 2 -
oox/inc/drawingml/textparagraphproperties.hxx | 1
oox/source/core/contexthandler.cxx | 8 ----
oox/source/core/fragmenthandler.cxx | 8 ----
oox/source/drawingml/diagram/diagram.hxx | 7 ---
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 5 --
oox/source/helper/propertymap.cxx | 9 ----
oox/source/ppt/pptfilterhelpers.hxx | 1
35 files changed, 3 insertions(+), 204 deletions(-)
New commits:
commit c714b43b0137ad253f51e1c65417c9874b8509e5
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 20 13:12:31 2015 +0200
loplugin:unusedmethods oox
Change-Id: I5381e0da0efc1f951e248cfcfb35fc680ace94e4
Reviewed-on: https://gerrit.libreoffice.org/17225
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index f76fcb7..4535a98 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -60,6 +60,8 @@ exclusionSet = set([
"const class rtl::OUString writerperfect::DocumentHandlerFor::name()",
# only used by OSX build
"void StyleSettings::SetHideDisabledMenuItems(_Bool)",
+ # debugging method
+ "void oox::drawingml::TextParagraphProperties::dump() const"
])
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index b2be50f..ad0153f 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -291,10 +291,6 @@ public:
bool skip( sal_Int32 nBytes );
private:
- void InitKeyImpl(
- const sal_uInt8 pKeyData[64],
- const sal_uInt8 pUnique[16] );
-
rtlCipher mhCipher;
rtlDigest mhDigest;
sal_uInt8 mpnDigestValue[ RTL_DIGEST_LENGTH_MD5 ];
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 3df0de5..85f1552 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -80,8 +80,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
// record context interface -----------------------------------------------
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 2570b34..99ad120 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -101,8 +101,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XML stream handling ----------------------------------------------------
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index 96391a4..6f9fd44 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -95,8 +95,6 @@ public:
const Relation* getRelationFromRelId( const OUString& rId ) const;
/** Returns the first relation with the passed type. */
const Relation* getRelationFromFirstType( const OUString& rType ) const;
- /** Returns the first relation with the passed type. */
- const Relation* getRelationFromFirstTypeFromOfficeDoc( const OUString& rType ) const;
/** Finds all relations associated with the passed type. */
RelationsRef getRelationsFromTypeFromOfficeDoc( const OUString& rType ) const;
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 9a8203e..45414e1 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -213,8 +213,6 @@ public:
@return newly created ID.
*/
sal_Int32 GetUniqueId() { return mnMaxDocId++; }
- OString GetUniqueIdOString() { return OString::number( mnMaxDocId++ ); }
- OUString GetUniqueIdOUString() { return OUString::number( mnMaxDocId++ ); }
/** Write the document properties into into the current OPC package.
diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx
index ed7cd69..ea07a3e 100644
--- a/include/oox/crypto/CryptoEngine.hxx
+++ b/include/oox/crypto/CryptoEngine.hxx
@@ -31,11 +31,6 @@ public:
virtual ~CryptoEngine()
{}
- std::vector<sal_uInt8>& getKey()
- {
- return mKey;
- }
-
virtual bool writeEncryptionInfo(
const OUString& rPassword,
BinaryXOutputStream& rStream) = 0;
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 7d95188..ba5e89b 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -118,11 +118,10 @@ public:
std::vector< ShapePtr >& getChildren() { return maChildren; }
void setName( const OUString& rName ) { msName = rName; }
- OUString getName( ) { return msName; }
+ OUString getName( ) { return msName; }
void setId( const OUString& rId ) { msId = rId; }
OUString getId() { return msId; }
void setHidden( bool bHidden ) { mbHidden = bHidden; }
- bool getHidden() const { return mbHidden; };
void setHiddenMasterShape( bool bHiddenMasterShape ) { mbHiddenMasterShape = bHiddenMasterShape; }
void setSubType( sal_Int32 nSubType ) { mnSubType = nSubType; }
sal_Int32 getSubType() const { return mnSubType; }
@@ -156,8 +155,6 @@ public:
const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
ShapeIdMap* pShapeMap = 0 );
- void dropChildren() { maChildren.clear(); }
-
void addChildren(
::oox::core::XmlFilterBase& rFilterBase,
const Theme* pTheme,
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index 965124c..f97a821 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -49,7 +49,6 @@ public:
~Theme();
void setStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; }
- const OUString& getStyleName() const { return maStyleName; }
ClrScheme& getClrScheme() { return maClrScheme; }
const ClrScheme& getClrScheme() const { return maClrScheme; }
@@ -88,8 +87,6 @@ public:
void setFragment( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::dom::XDocument>& getFragment() const { return mxFragment; }
private:
OUString maStyleName;
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index d637ddf..d053055 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -691,9 +691,6 @@ protected:
virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE;
private:
- void insertNames( sal_Int64 nStartKey, const OUString& rData );
-
-private:
bool mbIgnoreEmpty;
};
@@ -1018,7 +1015,6 @@ public:
void newLine();
void emptyLine( size_t nCount = 1 );
- OUStringBuffer& getLine() { return maLine; }
void incIndent();
void decIndent();
@@ -1035,13 +1031,10 @@ public:
void startItem( const String& rItemName );
void contItem();
void endItem();
- const OUString& getLastItemValue() const { return maLastItem; }
void startMultiItems();
void endMultiItems();
-
-
void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 );
void writeAscii( const sal_Char* pcStr );
void writeString( const OUString& rStr );
@@ -1124,7 +1117,6 @@ public:
const sal_Int32* pnColWidths ) :
mrOut( *rxOut ) { mrOut.startTable( nColCount, pnColWidths ); }
~TableGuard() { mrOut.endTable(); }
- void tab() { mrOut.tab(); }
void tab( size_t nCol ) { mrOut.tab( nCol ); }
private:
TableGuard( const TableGuard& ) SAL_DELETED_FUNCTION;
@@ -1480,13 +1472,6 @@ protected:
virtual bool implIsValid() const SAL_OVERRIDE;
-
-
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- getXInputStream() const;
-
-
-
void skipBlock( sal_Int64 nBytes, bool bShowSize = true );
void dumpRawBinary( sal_Int64 nBytes, bool bShowOffset = true, bool bStream = false );
@@ -1765,14 +1750,10 @@ protected:
const String& rRecNames,
const String& rSimpleRecs = EMPTY_STRING );
- sal_Int64 getRecPos() const { return mnRecPos; }
sal_Int64 getRecId() const { return mnRecId; }
sal_Int64 getRecSize() const { return mnRecSize; }
NameListRef getRecNames() const { return maRecNames.getNameList( cfg() ); }
- void setBinaryOnlyMode( bool bBinaryOnly ) { mbBinaryOnly = bBinaryOnly; }
- bool isBinaryOnlyMode() const { return mbBinaryOnly; }
-
virtual bool implIsValid() const SAL_OVERRIDE;
virtual void implDump() SAL_OVERRIDE;
@@ -1806,8 +1787,6 @@ class SequenceRecordObjectBase : public RecordObjectBase
protected:
SequenceRecordObjectBase() : mxRecData( new StreamDataSequence ) {}
- StreamDataSequence& getRecordDataSequence() { return *mxRecData; }
-
using RecordObjectBase::construct;
void construct(
const ObjectBase& rParent,
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 3a9e7b0..8d01018 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -44,48 +44,9 @@ protected:
virtual ~RecordObjectBase();
using SequenceRecordObjectBase::construct;
- void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName );
- void construct( const RecordObjectBase& rParent );
virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE;
- OUString getErrorName( sal_uInt8 nErrCode ) const;
-
-
-
- void readAddress( Address& orAddress );
- void readRange( Range& orRange );
- void readRangeList( RangeList& orRanges );
-
-
-
- void writeBooleanItem( const String& rName, sal_uInt8 nBool );
- void writeErrorCodeItem( const String& rName, sal_uInt8 nErrCode );
-
- void writeFontPortions( const ::oox::xls::FontPortionModelList& rPortions );
- void writePhoneticPortions( const ::oox::xls::PhoneticPortionModelList& rPhonetics );
-
-
-
- sal_uInt8 dumpBoolean( const String& rName = EMPTY_STRING );
- sal_uInt8 dumpErrorCode( const String& rName = EMPTY_STRING );
- OUString dumpString( const String& rName = EMPTY_STRING, bool bRich = false, bool b32BitLen = true );
- void dumpColor( const String& rName = EMPTY_STRING );
- ::com::sun::star::util::DateTime dumpPivotDateTime( const String& rName = EMPTY_STRING );
-
- sal_Int32 dumpColIndex( const String& rName = EMPTY_STRING );
- sal_Int32 dumpRowIndex( const String& rName = EMPTY_STRING );
- sal_Int32 dumpColRange( const String& rName = EMPTY_STRING );
- sal_Int32 dumpRowRange( const String& rName = EMPTY_STRING );
-
- Address dumpAddress( const String& rName = EMPTY_STRING );
- Range dumpRange( const String& rName = EMPTY_STRING );
- void dumpRangeList( const String& rName = EMPTY_STRING );
-
-
-private:
- bool readCompressedInt( BinaryInputStream& rStrm, sal_Int32& ornValue );
-
private:
typedef std::shared_ptr< SequenceInputStream > SequenceInputStreamRef;
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 38f5857..cb7fb90 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -96,8 +96,6 @@ public:
SAL_WARN_UNUSED_RESULT
sal_Int64 readInt64() { return readValue<sal_Int64>(); }
SAL_WARN_UNUSED_RESULT
- sal_uInt64 readuInt64() { return readValue<sal_uInt64>(); }
- SAL_WARN_UNUSED_RESULT
float readFloat() { return readValue<float>(); }
SAL_WARN_UNUSED_RESULT
double readDouble() { return readValue<double>(); }
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 1729586..52160da 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -70,16 +70,11 @@ public:
template< typename Type >
void writeValue( Type nValue );
- BinaryOutputStream& WriteInt8(sal_Int8 x) { writeValue(x); return *this; }
- BinaryOutputStream& WriteUInt8(sal_uInt8 x) { writeValue(x); return *this; }
BinaryOutputStream& WriteInt16(sal_Int16 x) { writeValue(x); return *this; }
BinaryOutputStream& WriteUInt16(sal_uInt16 x) { writeValue(x); return *this; }
BinaryOutputStream& WriteInt32(sal_Int32 x) { writeValue(x); return *this; }
BinaryOutputStream& WriteUInt32(sal_uInt32 x) { writeValue(x); return *this; }
BinaryOutputStream& WriteInt64(sal_Int64 x) { writeValue(x); return *this; }
- BinaryOutputStream& WriteUInt64(sal_uInt64 x) { writeValue(x); return *this; }
- BinaryOutputStream& WriteFloat(float x) { writeValue(x); return *this; }
- BinaryOutputStream& WriteDouble(double x) { writeValue(x); return *this; }
void writeCompressedUnicodeArray( const OUString& rString, bool bCompressed, bool bAllowNulChars = false );
@@ -154,10 +149,6 @@ public:
/** Write nBytes bytes from the (preallocated!) buffer pMem. */
virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
- /** Returns the XOutputStream interface of the wrapped output stream. */
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- getXOutputStream() const { return mxOutStrm; }
-
private:
StreamDataSequence maBuffer; ///< Data buffer used in writeMemory() function.
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 03ec5ff..9f669a9 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -92,10 +92,6 @@ public:
*/
void seekToStart() { seek( 0 ); }
- /** Seeks the stream to the end, if stream is seekable.
- */
- void seekToEnd() { seek( size() ); }
-
/** Seeks the stream forward to a position that is a multiple of the passed
block size, if stream is seekable.
diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index 989c7e2..e0a0989 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -50,7 +50,6 @@ struct ValueRange
bool operator==( const ValueRange& rRange ) const { return (mnFirst == rRange.mnFirst) && (mnLast == rRange.mnLast); }
bool operator!=( const ValueRange& rRange ) const { return !(*this == rRange); }
- bool contains( sal_Int32 nValue ) const { return (mnFirst <= nValue) && (nValue <= mnLast); }
bool contains( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnFirst) && (rRange.mnLast <= mnLast); }
bool intersects( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnLast) && (rRange.mnFirst <= mnLast); }
};
@@ -69,8 +68,6 @@ class OOX_DLLPUBLIC ValueRangeSet
public:
ValueRangeSet() {}
- /** Inserts the passed value into the range list. */
- void insert( sal_Int32 nValue ) { insert( ValueRange( nValue ) ); }
/** Inserts the passed value range into the range list. */
void insert( const ValueRange& rRange );
diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index 5cd606b..4e38627 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -81,7 +81,6 @@ public:
void erase( sal_Int32 nPropId );
bool empty() const;
- size_t size() const;
/** Inserts all properties contained in the passed property map. */
void assignUsed( const PropertyMap& rPropMap );
@@ -109,9 +108,7 @@ public:
static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
#endif
static void dumpCode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
- void dumpCode();
static void dumpData(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> rXPropSet);
- void dumpData();
#endif
private:
const PropertyNameVector* mpPropNames;
diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx
index 013484f..86751a6 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -113,7 +113,6 @@ public:
// which means using oox::AttributeList would make them all point to the one instance.
struct OOX_DLLPUBLIC AttributeList
{
- bool hasAttribute( int token ) const;
OUString& operator[] (int token);
OUString attribute( int token, const OUString& def = OUString()) const;
bool attribute( int token, bool def ) const;
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index d10d8ab..382055f 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -133,9 +133,6 @@ public:
/** Skips the next boolean property value in the stream, if the respective
flag in the property mask is set. */
void skipBoolProperty() { (void)startNextProperty(); }
- /** Skips the next pair property in the stream, if the respective flag in
- the property mask is set. */
- void skipPairProperty() { readPairProperty( maDummyPairData ); }
/** Skips the next string property in the stream, if the respective flag in
the property mask is set. */
void skipStringProperty() { readStringProperty( maDummyString ); }
@@ -145,9 +142,6 @@ public:
/** Skips the next GUID property in the stream, if the respective flag in
the property mask is set. */
void skipGuidProperty() { readGuidProperty( maDummyString ); }
- /** Skips the next font property in the stream, if the respective flag in
- the property mask is set. */
- void skipFontProperty() { readFontProperty( maDummyFontData ); }
/** Skips the next picture property in the stream, if the respective flag
in the property mask is set. */
void skipPictureProperty() { readPictureProperty( maDummyPicData ); }
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index a44b7da..cf3846b 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -33,11 +33,6 @@ class CommentAuthorList
public:
void setValues(const CommentAuthorList& list);
- const std::vector<CommentAuthor>& getCmAuthorLst() const
- {
- return cmAuthorLst;
- }
-
void addAuthor(const CommentAuthor& _author)
{
cmAuthorLst.push_back(_author);
@@ -82,26 +77,6 @@ class Comment
{
text = _text;
}
- OUString getAuthorId()
- {
- return authorId;
- }
- OUString getdt()
- {
- return dt;
- }
- OUString getidx()
- {
- return idx;
- }
- OUString get_X()
- {
- return x;
- }
- OUString get_Y()
- {
- return y;
- }
OUString get_text()
{
return text;
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 18126d3..30f4a13 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -51,9 +51,7 @@ public:
virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) SAL_OVERRIDE;
- void setShapeLocation( const oox::ppt::ShapeLocation eShapeLocation ) { meShapeLocation = eShapeLocation; };
ShapeLocation getShapeLocation() const { return meShapeLocation; };
- bool isReferenced() const { return mbReferenced; };
void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; };
void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; }
void setModelId( const OUString& rId ) { msModelId = rId; }
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 91cd49b..a97ede8 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -77,14 +77,12 @@ public:
void setTheme( const oox::drawingml::ThemePtr& rThemePtr ){ mpThemePtr = rThemePtr; }
oox::drawingml::ThemePtr getTheme() const { return mpThemePtr; }
- void setClrScheme( const oox::drawingml::ClrSchemePtr& rClrSchemePtr ){ mpClrSchemePtr = rClrSchemePtr; }
oox::drawingml::ClrSchemePtr getClrScheme() const { return mpClrSchemePtr; }
void setClrMap( const oox::drawingml::ClrMapPtr pClrMapPtr ){ mpClrMapPtr = pClrMapPtr; }
oox::drawingml::ClrMapPtr getClrMap() const { return mpClrMapPtr; }
void setBackgroundProperties( const oox::drawingml::FillPropertiesPtr& rFillPropertiesPtr ){ mpBackgroundPropertiesPtr = rFillPropertiesPtr; }
- oox::drawingml::FillPropertiesPtr getBackgroundProperties() const { return mpBackgroundPropertiesPtr; }
oox::drawingml::Color& getBackgroundColor() { return maBackgroundColor; }
bool isMasterPage() const { return mbMaster; }
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index c45bd28..9e48dde 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -39,8 +39,6 @@ namespace oox { namespace ppt {
void setTransitionFilterProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > & xFilter );
void setOoxTransitionSpeed( sal_Int32 nToken );
- void setFadeColor( sal_Int32 nColor )
- { mnFadeColor = nColor; }
void setMode( bool bMode )
{ mbMode = bMode; }
void setOoxAdvanceTime( sal_Int32 nAdvanceTime )
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 1aa5b5a..9e671c8 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -51,14 +51,10 @@ namespace oox { namespace ppt {
NodePropertyMap & getNodeProperties() { return maNodeProperties; }
UserDataMap & getUserData() { return maUserData; }
- void addChild( const TimeNodePtr & pChildPtr )
- { maChildren.push_back( pChildPtr ); }
-
TimeNodePtrList & getChildren()
{ return maChildren; }
void setId( sal_Int32 nId );
- const OUString & getId() const { return msId; }
void addNode(
const ::oox::core::XmlFilterBase& rFilter,
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx
index 24653d1..fd95cde 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -95,8 +95,6 @@ public:
/** Returns the automatic chart title if the chart contains only one series. */
const OUString& getAutomaticTitle() const { return maAutoTitle; }
- /** Returns true, if the chart is three-dimensional. */
- bool is3dChart() const { return mb3dChart; }
/** Returns true, if chart type supports wall and floor format in 3D mode. */
bool isWall3dChart() const { return mbWall3dChart; }
diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx
index d36468c..9971a55 100644
--- a/oox/inc/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/drawingml/chart/seriesconverter.hxx
@@ -49,14 +49,6 @@ public:
void convertFromModel(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries,
const TypeGroupConverter& rTypeGroup );
-
- /** Conversion helper for data series and data points. */
- static void convertLabelFormatting(
- PropertySet& rPropSet,
- ObjectFormatter& rFormatter,
- const DataLabelModelBase& rDataLabel,
- const TypeGroupConverter& rTypeGroup,
- bool bDataSeriesLabel );
};
diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx
index b89d3b9..a834681 100644
--- a/oox/inc/drawingml/graphicproperties.hxx
+++ b/oox/inc/drawingml/graphicproperties.hxx
@@ -41,9 +41,6 @@ struct GraphicProperties
OUString m_sMediaPackageURL; ///< Audio/Video URL.
css::uno::Reference<css::io::XInputStream> m_xMediaStream; ///< Audio/Video input stream.
- /** Overwrites all members that are explicitly set in rSourceProps. */
- void assignUsed( const GraphicProperties& rSourceProps );
-
/** Writes the properties to the passed property map. */
void pushToPropMap(
PropertyMap& rPropMap,
diff --git a/oox/inc/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx
index d3e491b..8896c11 100644
--- a/oox/inc/drawingml/shape3dproperties.hxx
+++ b/oox/inc/drawingml/shape3dproperties.hxx
@@ -70,9 +70,6 @@ struct Shape3DProperties
OptValue< BevelProperties > maTopBevelProperties;
OptValue< BevelProperties > maBottomBevelProperties;
- /** Overwrites all members that are explicitly set in rSourceProps. */
- void assignUsed( const Shape3DProperties& rSourceProps );
-
static OUString getCameraPrstName( sal_Int32 nElement );
static OUString getLightRigName( sal_Int32 nElement );
static OUString getLightRigDirName( sal_Int32 nElement );
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index e650210..f5916c4 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -68,9 +68,7 @@ public:
void setVertToken( sal_Int32 nToken ){ mnVertToken = nToken; };
sal_Int32 getAnchorToken() const { return mnAnchorToken; };
void setAnchorToken( sal_Int32 nToken ){ mnAnchorToken = nToken; };
- bool getAnchorCtr() const { return mbAnchorCtr; };
void setAnchorCtr( bool bAnchorCtr ){ mbAnchorCtr = bAnchorCtr; };
- sal_Int32 getHorzOverflowToken() const { return mnHorzOverflowToken; };
void setHorzOverflowToken( sal_Int32 nToken ){ mnHorzOverflowToken = nToken; };
void setTextBody( const oox::drawingml::TextBodyPtr& pTextBody ){ mpTextBody = pTextBody; };
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index c81fa29..b7309ba 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -101,7 +101,6 @@ public:
void pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase,
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
PropertyMap& rioBulletList, const BulletList* pMasterBuList, bool bApplyBulletList, float fFontSize, bool bPushDefaultValues = false ) const;
- void pushToPropSet( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet) const;
/** Returns the largest character size of this paragraph. If possible the
masterstyle should have been applied before, otherwise the character
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx
index 8098631..e60506b 100644
--- a/oox/source/core/contexthandler.cxx
+++ b/oox/source/core/contexthandler.cxx
@@ -114,14 +114,6 @@ void ContextHandler::characters( const OUString& ) throw( SAXException, RuntimeE
{
}
-void ContextHandler::ignorableWhitespace( const OUString& ) throw( SAXException, RuntimeException )
-{
-}
-
-void ContextHandler::processingInstruction( const OUString&, const OUString& ) throw( SAXException, RuntimeException )
-{
-}
-
// record context interface ---------------------------------------------------
ContextHandlerRef ContextHandler::createRecordContext( sal_Int32, SequenceInputStream& )
diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx
index 641e0cb..ca4a38c 100644
--- a/oox/source/core/fragmenthandler.cxx
+++ b/oox/source/core/fragmenthandler.cxx
@@ -96,14 +96,6 @@ void FragmentHandler::characters( const OUString& ) throw( SAXException, Runtime
{
}
-void FragmentHandler::ignorableWhitespace( const OUString& ) throw( SAXException, RuntimeException )
-{
-}
-
-void FragmentHandler::processingInstruction( const OUString&, const OUString& ) throw( SAXException, RuntimeException )
-{
-}
-
// XML stream handling --------------------------------------------------------
Reference< XInputStream > FragmentHandler::openFragmentStream() const
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 9ef9215..259ca3c 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -205,13 +205,10 @@ public:
{ msMinVer = sMinVer; }
void setUniqueId( const OUString & sUniqueId )
{ msUniqueId = sUniqueId; }
- const OUString & getUniqueId()
- { return msUniqueId; }
void setTitle( const OUString & sTitle )
{ msTitle = sTitle; }
void setDesc( const OUString & sDesc )
{ msDesc = sDesc; }
-
LayoutNodePtr & getNode()
{ return mpNode; }
const LayoutNodePtr & getNode() const
@@ -273,10 +270,6 @@ public:
return mpData;
}
void setLayout( const DiagramLayoutPtr & );
- DiagramLayoutPtr getLayout() const
- {
- return mpLayout;
- }
DiagramQStyleMap& getStyles() { return maStyles; }
const DiagramQStyleMap& getStyles() const { return maStyles; }
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 6d57510..873d634 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -200,12 +200,7 @@ public:
explicit ConditionAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes);
virtual ~ConditionAtom()
{ }
- bool test();
virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE;
- IteratorAttr & iterator()
- { return maIter; }
- ConditionAttr & cond()
- { return maCond; }
void readElseBranch()
{ mbElse=true; }
virtual void addChild( const LayoutAtomPtr & pNode ) SAL_OVERRIDE;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 6c7fb0b..efa47df 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -942,15 +942,6 @@ void PropertyMap::dumpData(Reference<XPropertySet> xPropertySet)
}
}
-void PropertyMap::dumpCode()
-{
- dumpCode( Reference< XPropertySet >( makePropertySet(), UNO_QUERY ) );
-}
-
-void PropertyMap::dumpData()
-{
- dumpData( Reference< XPropertySet >( makePropertySet(), UNO_QUERY ) );
-}
#endif
} // namespace oox
diff --git a/oox/source/ppt/pptfilterhelpers.hxx b/oox/source/ppt/pptfilterhelpers.hxx
index 7cbedd3..49327d6 100644
--- a/oox/source/ppt/pptfilterhelpers.hxx
+++ b/oox/source/ppt/pptfilterhelpers.hxx
@@ -77,7 +77,6 @@ namespace oox { namespace ppt {
bool mbDirection; // true: default geometric direction
static const transition* find( const OUString& rName );
- static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const bool bDirection );
};
// END CUT&PASTE
More information about the Libreoffice-commits
mailing list