[Libreoffice-commits] core.git: compilerplugins/clang writerfilter/inc writerfilter/source
Noel Grandin
noel at peralex.com
Tue Jul 21 00:59:24 PDT 2015
compilerplugins/clang/unusedmethods.py | 35 +++++++
writerfilter/inc/dmapper/resourcemodel.hxx | 10 --
writerfilter/inc/ooxml/OOXMLDocument.hxx | 8 -
writerfilter/source/dmapper/CellMarginHandler.hxx | 2
writerfilter/source/dmapper/DomainMapper.hxx | 1
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 1
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 6 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 5 -
writerfilter/source/dmapper/FormControlHelper.hxx | 2
writerfilter/source/dmapper/NumberingManager.hxx | 10 --
writerfilter/source/dmapper/OLEHandler.hxx | 1
writerfilter/source/dmapper/PropertyMap.cxx | 31 -------
writerfilter/source/dmapper/PropertyMap.hxx | 66 ---------------
writerfilter/source/dmapper/TableData.hxx | 31 -------
writerfilter/source/dmapper/TableManager.hxx | 21 ----
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 8 -
writerfilter/source/dmapper/WrapPolygonHandler.cxx | 10 --
writerfilter/source/dmapper/WrapPolygonHandler.hxx | 2
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 15 ---
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 3
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 2
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 20 ----
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 2
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 6 -
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 1
writerfilter/source/rtftok/rtfsprm.cxx | 10 --
writerfilter/source/rtftok/rtfsprm.hxx | 2
27 files changed, 34 insertions(+), 277 deletions(-)
New commits:
commit 6ea66657ebca5b3ec63f93b496b812888e0d53c9
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 20 16:03:50 2015 +0200
loplugin:unusedmethods writerfilter
Change-Id: I52441115e14da6c1bcd7ba4926a0f3cc0620366e
Reviewed-on: https://gerrit.libreoffice.org/17236
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index 4535a98..cf9ce79 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -60,8 +60,39 @@ 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"
+ # debugging methods
+ "void oox::drawingml::TextParagraphProperties::dump() const",
+ "class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > writerfilter::ooxml::OOXMLPropertySet::toString()",
+ # called from the writerfilter generated code in $WORKDIR, not sure why it is not being picked up
+ "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultIntegerValue()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::positivePercentage(const class rtl::OUString &)",
+ "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleOLE()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::positionOffset(const class rtl::OUString &)",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::alignH(const class rtl::OUString &)",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::alignV(const class rtl::OUString &)",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultStringValue()",
+ "_Bool writerfilter::ooxml::OOXMLFactory_ns::getElementId(unsigned int,unsigned int,enum writerfilter::ooxml::ResourceType_t &,unsigned int &)",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::clearProps()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::sendPropertiesWithId(const unsigned int &)",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::cr()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::softHyphen()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::noBreakHyphen()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultBooleanValue()",
+ "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handlePicture()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::endField()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::propagateCharacterPropertiesAsSet(const unsigned int &)",
+ "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleHdrFtr()",
+ "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleBreak()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::tab()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::ftnednref()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::ftnednsep()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::ftnedncont()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::pgNum()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::sendRowProperties()",
+ "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleComment()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::setLastSectionGroup()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::endTxbxContent()",
+ "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultHexValue()",
])
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index 9a1fc0a..9e5be7f 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -371,16 +371,6 @@ public:
virtual Value::Pointer_t getValue() = 0;
/**
- Returns reference to binary object contained in the SPRM.
- */
- virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() = 0;
-
- /**
- Returns reference to stream associated with the SPRM.
- */
- virtual writerfilter::Reference<Stream>::Pointer_t getStream() = 0;
-
- /**
Returns reference to properties contained in the SPRM.
*/
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index d9b76e2..a17e517 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -81,11 +81,6 @@ public:
virtual ~OOXMLStream() {}
/**
- Returns parser for this stream.
- */
- virtual css::uno::Reference<css::xml::sax::XParser> getParser() = 0;
-
- /**
Returns fast parser for this stream.
*/
virtual css::uno::Reference<css::xml::sax::XFastParser> getFastParser() = 0;
@@ -221,18 +216,15 @@ public:
virtual css::uno::Reference<css::frame::XModel> getModel() = 0;
virtual void setDrawPage(css::uno::Reference<css::drawing::XDrawPage> xDrawPage) = 0;
virtual css::uno::Reference<css::drawing::XDrawPage> getDrawPage() = 0;
- virtual css::uno::Reference<css::io::XInputStream> getInputStream() = 0;
virtual css::uno::Reference<css::io::XInputStream> getStorageStream() = 0;
virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) = 0;
virtual void setXNoteId(const sal_Int32 nId) = 0;
virtual sal_Int32 getXNoteId() const = 0;
virtual void setXNoteType(const Id & nId) = 0;
- virtual const Id & getXNoteType() const = 0;
virtual const OUString & getTarget() const = 0;
virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler> getShapeContext( ) = 0;
virtual void setShapeContext( css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) = 0;
virtual css::uno::Reference<css::xml::dom::XDocument> getThemeDom( ) = 0;
- virtual void setThemeDom( css::uno::Reference<css::xml::dom::XDocument> xThemeDom ) = 0;
virtual css::uno::Reference<css::xml::dom::XDocument> getGlossaryDocDom( ) = 0;
virtual css::uno::Sequence<css::uno::Sequence< css::uno::Any> > getGlossaryDomList() = 0;
virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomList( ) = 0;
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index cb0395d..de97ac8 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -58,8 +58,6 @@ public:
CellMarginHandler( );
virtual ~CellMarginHandler();
- ::std::shared_ptr<TablePropertyMap> getProperties();
-
void enableInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag();
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 37a7d9e..0e30f22 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -103,7 +103,6 @@ public:
bool IsOOXMLImport() const;
bool IsRTFImport() const;
css::uno::Reference<css::lang::XMultiServiceFactory> GetTextFactory() const;
- void AddListIDToLFOTable( sal_Int32 nAbstractNumId );
css::uno::Reference<css::text::XTextRange> GetCurrentTextRange();
OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties );
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 6fe306e..b5a34b8 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -126,7 +126,6 @@ public:
*/
void endCell(const css::uno::Reference< css::text::XTextRange > & end);
- css::uno::Reference< css::text::XTextRange >& getTable() { return m_xTableRange; };
void setHadFootOrEndnote(bool bHadFootOrEndnote);
};
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 79338b0..0bd2f42 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -99,7 +99,6 @@ public:
IntVectorPtr getCurrentSpans( );
IntVectorPtr getCurrentCellWidths( );
- const OUString& getTableStyleName() const { return m_sTableStyleName; }
/// Turn the attributes collected so far in m_aTableLook into a property and clear the container.
void finishTableLook();
const css::uno::Sequence<css::beans::PropertyValue> getCurrentTablePosition();
@@ -147,11 +146,6 @@ public:
return m_bHasBtlrCell;
}
- bool IsTableSizeTypeInserted() const
- {
- return m_bTableSizeTypeInserted;
- }
-
void SetLayoutType(sal_uInt32 nLayoutType)
{
m_nLayoutType = nLayoutType;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 05a0cc7..101445a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -468,10 +468,6 @@ public:
{
return m_xTextFactory;
}
- css::uno::Reference<css::uno::XComponentContext> GetComponentContext() const
- {
- return m_xComponentContext;
- }
css::uno::Reference<css::text::XTextDocument> GetTextDocument() const
{
return m_xTextDocument;
@@ -580,7 +576,6 @@ public:
void InitTabStopFromStyle(const css::uno::Sequence<css::style::TabStop>& rInitTabStops);
void IncorporateTabStop( const DeletableTabStop &aTabStop );
css::uno::Sequence<css::style::TabStop> GetCurrentTabStopAndClear();
- void NextTabStop() {++m_nCurrentTabStopIndex;}
void SetCurrentParaStyleId(const OUString& sStringValue) {m_sCurrentParaStyleId = sStringValue;}
OUString GetCurrentParaStyleId() const {return m_sCurrentParaStyleId;}
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx
index 71b92a4..ab70695 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/writerfilter/source/dmapper/FormControlHelper.hxx
@@ -48,8 +48,6 @@ private:
bool createCheckbox(css::uno::Reference<css::text::XTextRange> const& xTextRange,
const OUString & rControlName);
- bool createDropdown(css::uno::Reference<css::text::XTextRange> const& xTextRange,
- const OUString & rControlName);
};
}
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index bbc9ba9..38d7613 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -83,7 +83,6 @@ public:
void SetGraphicBitmap(css::uno::Reference<css::graphic::XGraphic> const& sValue)
{ m_sGraphicBitmap = sValue; }
void SetParaStyle( std::shared_ptr< StyleSheetEntry > pStyle );
- void AddRGBXchNums( const OUString& sValue ) { m_sRGBXchNums += sValue; };
// Getters
OUString GetBulletChar( ) { return m_sBulletChar; };
@@ -152,7 +151,6 @@ public:
// Setters using during the import
void SetId( sal_Int32 nId ) { m_nId = nId; };
void SetValue( sal_uInt32 nSprmId, sal_Int32 nValue );
- void AddRGISTD( const OUString& sValue ) { m_sRGISTD += sValue; };
// Accessors
sal_Int32 GetId( ) { return m_nId; };
@@ -237,14 +235,6 @@ public:
typedef std::shared_ptr< ListsManager > Pointer;
- // Config methods
- void SetLFOImport( bool bLFOImport ) { m_bIsLFOImport = bLFOImport; };
-
- // Numberings accessors
- AbstractListDef::Pointer GetCurrentDef( ) { return m_pCurrentDefinition; };
-
- sal_uInt32 Size() const
- { return sal_uInt32( m_aLists.size( ) ); };
ListDef::Pointer GetList( sal_Int32 nId );
// Mapping methods
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 3e61a95..9b714da 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -100,7 +100,6 @@ public:
OUString copyOLEOStream(css::uno::Reference<css::text::XTextDocument> const& xTextDocument);
css::awt::Size getSize() const { return m_aShapeSize; }
- css::awt::Point getPosition() const { return m_aShapePosition; }
css::uno::Reference<css::graphic::XGraphic> getReplacement() const { return m_xReplacement; }
};
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 67899d0..25bd9c1 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -421,7 +421,6 @@ SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) :
,m_nHeaderBottom( 1270 )//720 twip
,m_nDzaGutter( 0 )
,m_bGutterRTL( false )
- ,m_bSFBiDi( false )
,m_nGridType(0)
,m_nGridLinePitch( 1 )
,m_nDxtCharSpace( 0 )
@@ -1373,45 +1372,15 @@ void SectionPropertyMap::_ApplyProperties(
}
}
-sal_Int32 lcl_AlignPaperBin( sal_Int32 nSet )
-{
- //default tray numbers are above 0xff
- if( nSet > 0xff )
- nSet = nSet >> 8;
- //there are some special numbers which can't be handled easily
- //1, 4, 15, manual tray, upper tray, auto select? see ww8atr.cxx
- //todo: find out appropriate conversion
- return nSet;
-}
-
-
-void SectionPropertyMap::SetPaperBin( sal_Int32 nSet )
-{
- m_nPaperBin = lcl_AlignPaperBin( nSet );
-}
-
-
-void SectionPropertyMap::SetFirstPaperBin( sal_Int32 nSet )
-{
- m_nFirstPaperBin = lcl_AlignPaperBin( nSet );
-}
-
-
sal_Int32 SectionPropertyMap::GetPageWidth()
{
return getProperty(PROP_WIDTH)->second.get<sal_Int32>();
}
StyleSheetPropertyMap::StyleSheetPropertyMap() :
- mnCT_Spacing_line( 0 ),
- mnCT_Spacing_lineRule( 0 ),
- mbCT_TrPrBase_tblHeader( false ),
mnCT_TrPrBase_jc( 0 ),
mnCT_TblWidth_w( 0 ),
mnCT_TblWidth_type( 0 ),
- mbCT_Spacing_lineSet( false ),
- mbCT_Spacing_lineRuleSet( false ),
- mbCT_TrPrBase_tblHeaderSet( false ),
mbCT_TrPrBase_jcSet( false ),
mbCT_TblWidth_wSet( false ),
mbCT_TblWidth_typeSet( false ),
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 79b1f64..ffb0b1c 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -98,7 +98,7 @@ public:
PropValue() : m_aValue(), m_GrabBagType(NO_GRAB_BAG) {}
const css::uno::Any& getValue() const { return m_aValue; }
- bool hasGrabBag() const { return m_GrabBagType != NO_GRAB_BAG; }
+
GrabBagType getGrabBagType() const { return m_GrabBagType; }
};
@@ -136,11 +136,9 @@ public:
css::uno::Sequence<css::beans::PropertyValue> GetPropertyValues(bool bCharGrabBag = true);
//Sequence: Grab Bags: The CHAR_GRAB_BAG has Name "CharInteropGrabBag" and the PARA_GRAB_BAG has Name "ParaInteropGrabBag"
// the contained properties are their Value.
- bool hasEmptyPropertyValues() const {return m_aValues.empty();}
//Add property, optionally overwriting existing attributes
void Insert(PropertyIds eId, const css::uno::Any& rAny, bool bOverwrite = true, GrabBagType i_GrabBagType = NO_GRAB_BAG);
- void Insert( PropertyIds eId, const PropValue& rValue, bool bOverwrite = true );
//Remove a named property from *this, does nothing if the property id has not been set
void Erase( PropertyIds eId);
@@ -157,13 +155,10 @@ public:
void SetFootnote(css::uno::Reference<css::text::XFootnote> const& xF) { m_xFootnote = xF; }
sal_Unicode GetFootnoteSymbol() const { return m_cFootnoteSymbol;}
- void SetFootnoteSymbol(sal_Unicode cSet) { m_cFootnoteSymbol = cSet;}
sal_Int32 GetFootnoteFontId() const { return m_nFootnoteFontId;}
- void SetFootnoteFontId(sal_Int32 nSet) { m_nFootnoteFontId = nSet;}
const OUString& GetFootnoteFontName() const { return m_sFootnoteFontName;}
- void SetFootnoteFontName( const OUString& rSet ) { m_sFootnoteFontName = rSet;}
virtual void insertTableProperties( const PropertyMap* );
@@ -225,7 +220,6 @@ class SectionPropertyMap : public PropertyMap
sal_Int32 m_nDzaGutter;
bool m_bGutterRTL;
- bool m_bSFBiDi;
sal_Int32 m_nGridType;
sal_Int32 m_nGridLinePitch;
@@ -290,12 +284,9 @@ public:
void SetSeparatorLine( bool bSet ) { m_bSeparatorLineIsOn = bSet; }
void SetEvenlySpaced( bool bSet ) { m_bEvenlySpaced = bSet; }
void SetLandscape( bool bSet ) { m_bIsLandscape = bSet; }
- void SetPageNoRestart( bool bSet ) { m_bPageNoRestart = bSet; }
void SetPageNumber( sal_Int32 nSet ) { m_nPageNumber = nSet; }
void SetBreakType( sal_Int32 nSet ) { m_nBreakType = nSet; }
sal_Int32 GetBreakType( ) { return m_nBreakType; }
- void SetPaperBin( sal_Int32 nSet );
- void SetFirstPaperBin( sal_Int32 nSet );
void SetLeftMargin( sal_Int32 nSet ) { m_nLeftMargin = nSet; }
sal_Int32 GetLeftMargin() { return m_nLeftMargin; }
@@ -307,10 +298,6 @@ public:
void SetHeaderBottom( sal_Int32 nSet ) { m_nHeaderBottom = nSet; }
sal_Int32 GetPageWidth();
- void SetGutterRTL( bool bSet ) { m_bGutterRTL = bSet;}
- void SetDzaGutter( sal_Int32 nSet ) {m_nDzaGutter = nSet; }
- void SetSFBiDi( bool bSet ) { m_bSFBiDi = bSet;}
-
void SetGridType(sal_Int32 nSet) { m_nGridType = nSet; }
void SetGridLinePitch( sal_Int32 nSet ) { m_nGridLinePitch = nSet; }
void SetGridSnapToChars( bool bSet) { m_bGridSnapToChars = bSet; }
@@ -415,8 +402,6 @@ public:
void SetyAlign( sal_Int32 nSet ) { m_yAlign = nSet; }
sal_Int32 GetyAlign()const { return m_yAlign; }
- void SetAnchorLock( bool bSet ) {m_bAnchorLock = bSet; }
-
sal_Int8 GetDropCapLength() const { return m_nDropCapLength;}
void SetDropCapLength(sal_Int8 nSet) { m_nDropCapLength = nSet;}
@@ -442,21 +427,13 @@ typedef std::shared_ptr<ParagraphProperties> ParagraphPropertiesPtr;
class StyleSheetPropertyMap : public PropertyMap, public ParagraphProperties
{
- //special table style properties
- sal_Int32 mnCT_Spacing_line;
- sal_Int32 mnCT_Spacing_lineRule;
OUString msCT_Fonts_ascii;
- bool mbCT_TrPrBase_tblHeader;
sal_Int32 mnCT_TrPrBase_jc;
sal_Int32 mnCT_TblWidth_w;
sal_Int32 mnCT_TblWidth_type;
- bool mbCT_Spacing_lineSet;
- bool mbCT_Spacing_lineRuleSet;
-
- bool mbCT_TrPrBase_tblHeaderSet;
bool mbCT_TrPrBase_jcSet;
bool mbCT_TblWidth_wSet;
@@ -472,54 +449,13 @@ public:
explicit StyleSheetPropertyMap();
virtual ~StyleSheetPropertyMap();
- void SetCT_Spacing_line( sal_Int32 nSet )
- {mnCT_Spacing_line = nSet; mbCT_Spacing_lineSet = true; }
- void SetCT_Spacing_lineRule( sal_Int32 nSet )
- {mnCT_Spacing_lineRule = nSet; mbCT_Spacing_lineRuleSet = true; }
-
- void SetCT_Fonts_ascii( const OUString& rSet )
- {msCT_Fonts_ascii = rSet; }
- void SetCT_TrPrBase_tblHeader( bool bSet )
- {mbCT_TrPrBase_tblHeader = bSet; mbCT_TrPrBase_tblHeaderSet = true; }
void SetCT_TrPrBase_jc( sal_Int32 nSet )
{mnCT_TrPrBase_jc = nSet; mbCT_TrPrBase_jcSet = true; }
-
void SetCT_TblWidth_w( sal_Int32 nSet )
{ mnCT_TblWidth_w = nSet; mbCT_TblWidth_wSet = true; }
void SetCT_TblWidth_type( sal_Int32 nSet )
{mnCT_TblWidth_type = nSet; mbCT_TblWidth_typeSet = true; }
- bool GetCT_Spacing_line( sal_Int32& rToFill) const
- {
- if( mbCT_Spacing_lineSet )
- rToFill = mnCT_Spacing_line;
- return mbCT_Spacing_lineSet;
- }
- bool GetCT_Spacing_lineRule(sal_Int32& rToFill) const
- {
- if( mbCT_Spacing_lineRuleSet )
- rToFill = mnCT_Spacing_lineRule;
- return mbCT_Spacing_lineRuleSet;
- }
-
- bool GetCT_Fonts_ascii(OUString& rToFill) const
- {
- if( msCT_Fonts_ascii.getLength() > 0 )
- rToFill = msCT_Fonts_ascii;
- return msCT_Fonts_ascii.getLength() > 0;
- }
- bool GetCT_TrPrBase_tblHeader(bool& rToFill) const
- {
- if( mbCT_TrPrBase_tblHeaderSet )
- rToFill = mbCT_TrPrBase_tblHeader;
- return mbCT_TrPrBase_tblHeaderSet;
- }
- bool GetCT_TrPrBase_jc( sal_Int32& rToFill)const
- {
- if( mbCT_TrPrBase_jcSet )
- rToFill = mnCT_TrPrBase_jc;
- return mbCT_TrPrBase_jcSet;
- }
sal_Int32 GetListId() const { return mnListId; }
void SetListId(sal_Int32 nId) { mnListId = nId; }
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index a334df2..b1b5c18 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -63,13 +63,6 @@ public:
virtual ~CellData() {}
/**
- Set the start handle of the cell.
-
- @param start the start handle of the cell
- */
- void setStart(css::uno::Reference<css::text::XTextRange> start) { mStart = start; }
-
- /**
Set the end handle of a cell.
@param end the end handle of the cell
@@ -77,13 +70,6 @@ public:
void setEnd(css::uno::Reference<css::text::XTextRange> end) { mEnd = end; mbOpen = false; }
/**
- Set the properties of the cell.
-
- @param pProps the properties of the cell
- */
- void setProperties(TablePropertyMapPtr pProps) { mpProps = pProps; }
-
- /**
Adds properties to the cell.
@param pProps the properties to add
@@ -248,15 +234,6 @@ public:
{
return mpProperties;
}
-
- /**
- Clear the row data.
- */
- void clear()
- {
- mCells.clear();
- mpProperties.reset();
- }
};
/**
@@ -365,14 +342,6 @@ public:
}
/**
- Return the table properties.
- */
- TablePropertyMapPtr getTableProperties()
- {
- return mpTableProps;
- }
-
- /**
Return number of rows in the table.
*/
unsigned int getRowCount()
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 0f203a1..e3760d0 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -226,21 +226,6 @@ class TableManager
TableManagerState mState;
protected:
- TablePropertyMapPtr getProps()
- {
- return mState.getProps();
- }
-
- void setProps(TablePropertyMapPtr pProps)
- {
- mState.setProps(pProps);
- }
-
- void resetProps()
- {
- mState.resetProps();
- }
-
TablePropertyMapPtr getCellProps()
{
return mState.getCellProps();
@@ -397,12 +382,6 @@ private:
void ensureOpenCell(TablePropertyMapPtr pProps);
protected:
-
- /**
- Return current table depth.
- */
- sal_uInt32 getTableDepthNew() { return mnTableDepthNew; }
-
/**
Return the current table difference, i.e. 1 if we are in the first cell of a new table, etc.
*/
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index 305c757..cc1d72c 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -70,14 +70,6 @@ private:
m_pCurrentProperties->InsertProps(pProps);
};
- inline void cellPropsByCell( unsigned int i, TablePropertyMapPtr pProps )
- {
- if ( m_pTableManager )
- m_pTableManager->cellPropsByCell( i, pProps );
- else
- m_pCurrentProperties->InsertProps(pProps);
- };
-
inline void insertRowProps( TablePropertyMapPtr pProps )
{
if ( m_pTableManager )
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index da66696..8a66e82 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -45,16 +45,6 @@ void WrapPolygon::addPoint(const awt::Point & rPoint)
mPoints.push_back(rPoint);
}
-WrapPolygon::Points_t::const_iterator WrapPolygon::begin() const
-{
- return mPoints.begin();
-}
-
-WrapPolygon::Points_t::const_iterator WrapPolygon::end() const
-{
- return mPoints.end();
-}
-
WrapPolygon::Points_t::iterator WrapPolygon::begin()
{
return mPoints.begin();
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 55be54e..67e74b5 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -44,8 +44,6 @@ public:
void addPoint(const css::awt::Point & rPoint);
- Points_t::const_iterator begin() const;
- Points_t::const_iterator end() const;
Points_t::iterator begin();
Points_t::iterator end();
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index ca94b05..7dd90ef 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -251,11 +251,6 @@ void OOXMLDocumentImpl::setXNoteType(const Id & nId)
mXNoteType = nId;
}
-const Id & OOXMLDocumentImpl::getXNoteType() const
-{
- return mXNoteType;
-}
-
const OUString & OOXMLDocumentImpl::getTarget() const
{
return mpStream->getTarget();
@@ -890,11 +885,6 @@ uno::Reference<drawing::XDrawPage> OOXMLDocumentImpl::getDrawPage()
return mxDrawPage;
}
-uno::Reference<io::XInputStream> OOXMLDocumentImpl::getInputStream()
-{
- return mpStream->getDocumentStream();
-}
-
uno::Reference<io::XInputStream> OOXMLDocumentImpl::getStorageStream()
{
return mpStream->getStorageStream();
@@ -910,11 +900,6 @@ uno::Reference<xml::sax::XFastShapeContextHandler> OOXMLDocumentImpl::getShapeCo
return mxShapeContext;
}
-void OOXMLDocumentImpl::setThemeDom( uno::Reference<xml::dom::XDocument> xThemeDom )
-{
- mxThemeDom = xThemeDom;
-}
-
uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::getThemeDom( )
{
return mxThemeDom;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 9049b78..340802b 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -120,17 +120,14 @@ public:
virtual css::uno::Reference<css::frame::XModel> getModel() SAL_OVERRIDE;
virtual void setDrawPage(css::uno::Reference<css::drawing::XDrawPage> xDrawPage) SAL_OVERRIDE;
virtual css::uno::Reference<css::drawing::XDrawPage> getDrawPage() SAL_OVERRIDE;
- virtual css::uno::Reference<css::io::XInputStream> getInputStream() SAL_OVERRIDE;
virtual css::uno::Reference<css::io::XInputStream> getStorageStream() SAL_OVERRIDE;
virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) SAL_OVERRIDE;
virtual void setXNoteId(const sal_Int32 nId) SAL_OVERRIDE;
virtual sal_Int32 getXNoteId() const SAL_OVERRIDE;
virtual void setXNoteType(const Id & rId) SAL_OVERRIDE;
- virtual const Id & getXNoteType() const SAL_OVERRIDE;
virtual const OUString & getTarget() const SAL_OVERRIDE;
virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler> getShapeContext( ) SAL_OVERRIDE;
virtual void setShapeContext( css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) SAL_OVERRIDE;
- virtual void setThemeDom(css::uno::Reference<css::xml::dom::XDocument> xThemeDom) SAL_OVERRIDE;
virtual css::uno::Reference<css::xml::dom::XDocument> getThemeDom() SAL_OVERRIDE;
virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomList() SAL_OVERRIDE;
virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomPropsList() SAL_OVERRIDE;
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 5ed7045..85efac8 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -34,8 +34,6 @@ public:
virtual sal_uInt32 getId() const SAL_OVERRIDE = 0;
virtual Value::Pointer_t getValue() SAL_OVERRIDE = 0;
- virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE = 0;
- virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE = 0;
virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE = 0;
#ifdef DEBUG_WRITERFILTER
virtual std::string getName() const SAL_OVERRIDE = 0;
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 64a7285..8e58d4e 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -74,26 +74,6 @@ Value::Pointer_t OOXMLPropertyImpl::getValue()
return pResult;
}
-writerfilter::Reference<BinaryObj>::Pointer_t OOXMLPropertyImpl::getBinary()
-{
- writerfilter::Reference<BinaryObj>::Pointer_t pResult;
-
- if (mpValue.get() != nullptr)
- pResult = mpValue->getBinary();
-
- return pResult;
-}
-
-writerfilter::Reference<Stream>::Pointer_t OOXMLPropertyImpl::getStream()
-{
- writerfilter::Reference<Stream>::Pointer_t pResult;
-
- if (mpValue.get() != nullptr)
- pResult = mpValue->getStream();
-
- return pResult;
-}
-
writerfilter::Reference<Properties>::Pointer_t OOXMLPropertyImpl::getProps()
{
writerfilter::Reference<Properties>::Pointer_t pResult;
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index 35ed5e5..5c419b4 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -73,8 +73,6 @@ public:
virtual sal_uInt32 getId() const SAL_OVERRIDE;
virtual Value::Pointer_t getValue() SAL_OVERRIDE;
- virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
- virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE;
#ifdef DEBUG_WRITERFILTER
virtual std::string getName() const SAL_OVERRIDE;
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 735019f..5b0d341 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -396,12 +396,6 @@ uno::Reference<io::XInputStream> OOXMLStreamImpl::getStorageStream()
return mxStorageStream;
}
-uno::Reference<xml::sax::XParser> OOXMLStreamImpl::getParser()
-{
- uno::Reference<xml::sax::XParser> xParser = xml::sax::Parser::create(mxContext);
- return xParser;
-}
-
uno::Reference<uno::XComponentContext> OOXMLStreamImpl::getContext()
{
return mxContext;
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 0bbca73..bf900ba 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -72,7 +72,6 @@ public:
virtual ~OOXMLStreamImpl();
- virtual css::uno::Reference<css::xml::sax::XParser> getParser() SAL_OVERRIDE;
virtual css::uno::Reference<css::xml::sax::XFastParser> getFastParser() SAL_OVERRIDE;
virtual css::uno::Reference<css::io::XInputStream> getDocumentStream() SAL_OVERRIDE;
virtual css::uno::Reference<css::io::XInputStream> getStorageStream() SAL_OVERRIDE;
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 20b7f2e..3af3000 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -36,16 +36,6 @@ Value::Pointer_t RTFSprm::getValue()
return Value::Pointer_t(m_pValue->Clone());
}
-writerfilter::Reference<BinaryObj>::Pointer_t RTFSprm::getBinary()
-{
- return m_pValue->getBinary();
-}
-
-writerfilter::Reference<Stream>::Pointer_t RTFSprm::getStream()
-{
- return m_pValue->getStream();
-}
-
writerfilter::Reference<Properties>::Pointer_t RTFSprm::getProps()
{
return m_pValue->getProperties();
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 26aa791..995feec 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -107,8 +107,6 @@ public:
virtual ~RTFSprm() {}
virtual sal_uInt32 getId() const SAL_OVERRIDE;
virtual Value::Pointer_t getValue() SAL_OVERRIDE;
- virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
- virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE;
#ifdef DEBUG_WRITERFILTER
virtual std::string getName() const SAL_OVERRIDE;
More information about the Libreoffice-commits
mailing list