diff options
Diffstat (limited to 'writerfilter')
26 files changed, 27 insertions, 133 deletions
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index 3f8bc073be9e..6717caaf9757 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -42,20 +42,8 @@ FFDataHandler::~FFDataHandler() { } -const OUString & FFDataHandler::getName() const -{ - return m_sName; -} -const OUString & FFDataHandler::getHelpText() const -{ - return m_sHelpText; -} -const OUString & FFDataHandler::getStatusText() const -{ - return m_sStatusText; -} @@ -69,20 +57,8 @@ bool FFDataHandler::getCheckboxChecked() const return false; } -const OUString & FFDataHandler::getDropDownResult() const -{ - return m_sDropDownResult; -} -const FFDataHandler::DropDownEntries_t & FFDataHandler::getDropDownEntries() const -{ - return m_DropDownEntries; -} -const OUString & FFDataHandler::getTextDefault() const -{ - return m_sTextDefault; -} void FFDataHandler::lcl_sprm(Sprm & r_Sprm) { diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index 9692ac2186d3..d01cab59ff52 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -36,13 +36,13 @@ public: virtual ~FFDataHandler(); // member: name - const OUString & getName() const; + const OUString & getName() const { return m_sName;} // member: helpText - const OUString & getHelpText() const; + const OUString & getHelpText() const { return m_sHelpText;} // member: statusText - const OUString & getStatusText() const; + const OUString & getStatusText() const { return m_sStatusText;} // member: checkboxHeight sal_uInt32 getCheckboxHeight() const { return m_nCheckboxHeight;} @@ -54,13 +54,13 @@ public: bool getCheckboxChecked() const; // member: dropDownResult - const OUString & getDropDownResult() const; + const OUString & getDropDownResult() const { return m_sDropDownResult;} // member: dropDownEntries - const DropDownEntries_t & getDropDownEntries() const; + const DropDownEntries_t & getDropDownEntries() const { return m_DropDownEntries;} // member: textDefault - const OUString & getTextDefault() const; + const OUString & getTextDefault() const { return m_sTextDefault;} // sprm void resolveSprm(Sprm & r_sprm); diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 8ede56051d3b..2487408faad6 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -880,9 +880,6 @@ uno::Reference<text::XTextContent> GraphicImport::GetGraphicObject() return xResult; } -uno::Reference<drawing::XShape> GraphicImport::GetXShapeObject(){ - return m_xShape; -} void GraphicImport::ProcessShapeOptions(Value& rValue) { diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 21612c060de3..aa2e519dd3c9 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -92,7 +92,7 @@ public: virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; css::uno::Reference<css::text::XTextContent> GetGraphicObject(); - css::uno::Reference<css::drawing::XShape> GetXShapeObject(); + css::uno::Reference<css::drawing::XShape> GetXShapeObject() { return m_xShape;} bool IsGraphic() const; private: diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 66e9d65b4bc6..000eb72f753d 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -427,10 +427,6 @@ void NumPicBullet::SetShape(uno::Reference<drawing::XShape> xShape) } -uno::Reference<drawing::XShape> NumPicBullet::GetShape() -{ - return m_xShape; -} //--------------------------------------- AbstractListDef implementation diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 4f310f11e73a..3845d408b348 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -120,7 +120,7 @@ public: void SetId(sal_Int32 nId); sal_Int32 GetId() { return m_nId;} void SetShape(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape); - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> GetShape(); + com::sun::star::uno::Reference<com::sun::star::drawing::XShape> GetShape() { return m_xShape;} private: sal_Int32 m_nId; com::sun::star::uno::Reference<com::sun::star::drawing::XShape> m_xShape; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 6a60e4115c43..8e2b4786acfd 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -290,10 +290,6 @@ void PropertyMap::InsertProps(const PropertyMapPtr pMap) } } -const uno::Reference< text::XFootnote>& PropertyMap::GetFootnote() const -{ - return m_xFootnote; -} void PropertyMap::insertTableProperties( const PropertyMap* ) diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 6977fff8a0e1..5fd0094b0462 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -119,7 +119,7 @@ public: void Insert( PropertyIds eId, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true, GrabBagType rGrabBagType = NO_GRAB_BAG ); void Insert( PropertyIds eId, const PropValue& rValue, bool bOverwrite = true ); void InsertProps(const boost::shared_ptr<PropertyMap> pMap); - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const; + const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const { return m_xFootnote;} void SetFootnote( ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> xF ) { m_xFootnote = xF; } sal_Unicode GetFootnoteSymbol() const { return m_cFootnoteSymbol;} diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 10f6abf5b2dc..84f6090b7866 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -158,30 +158,10 @@ void SdtHelper::createControlShape(awt::Size aSize, uno::Reference<awt::XControl m_bHasElements = true; } -std::vector<OUString>& SdtHelper::getDropDownItems() -{ - return m_aDropDownItems; -} -OUStringBuffer& SdtHelper::getSdtTexts() -{ - return m_aSdtTexts; -} -OUStringBuffer& SdtHelper::getDate() -{ - return m_sDate; -} -OUStringBuffer& SdtHelper::getDateFormat() -{ - return m_sDateFormat; -} -OUStringBuffer& SdtHelper::getLocale() -{ - return m_sLocale; -} void SdtHelper::appendToInteropGrabBag(com::sun::star::beans::PropertyValue rValue) diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index b9d9cdf2462a..b6341093a0bc 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -69,11 +69,11 @@ public: SdtHelper(DomainMapper_Impl& rDM_Impl); virtual ~SdtHelper(); - std::vector<OUString>& getDropDownItems(); - OUStringBuffer& getSdtTexts(); - OUStringBuffer& getDate(); - OUStringBuffer& getDateFormat(); - OUStringBuffer& getLocale(); + std::vector<OUString>& getDropDownItems() { return m_aDropDownItems;} + OUStringBuffer& getSdtTexts() { return m_aSdtTexts;} + OUStringBuffer& getDate() { return m_sDate;} + OUStringBuffer& getDateFormat() { return m_sDateFormat;} + OUStringBuffer& getLocale() { return m_sLocale;} /// If createControlShape() was ever called. bool hasElements() { diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index fa19d0d2dd1f..28e813b4f05f 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -494,10 +494,6 @@ TextEffectsHandler::~TextEffectsHandler() { } -boost::optional<PropertyIds> TextEffectsHandler::getGrabBagPropertyId() -{ - return maPropertyId; -} void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) { diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index 9994ec4158ed..c1f0a377d4e2 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -46,7 +46,7 @@ public: TextEffectsHandler(sal_uInt32 aElementId); virtual ~TextEffectsHandler(); - boost::optional<PropertyIds> getGrabBagPropertyId(); + boost::optional<PropertyIds> getGrabBagPropertyId() { return maPropertyId;} css::beans::PropertyValue getInteropGrabBag(); diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx index 0b25ca2eec3c..039bf7fe4529 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx @@ -200,10 +200,6 @@ void WrapPolygonHandler::lcl_sprm(Sprm & _sprm) } } -WrapPolygon::Pointer_t WrapPolygonHandler::getPolygon() -{ - return mpPolygon; -} }} diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx index 371e310bc567..9aa42937cb2c 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx @@ -62,7 +62,7 @@ public: WrapPolygonHandler(); virtual ~WrapPolygonHandler(); - WrapPolygon::Pointer_t getPolygon(); + WrapPolygon::Pointer_t getPolygon() { return mpPolygon;} private: WrapPolygon::Pointer_t mpPolygon; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index b75247167d3a..49db4fb464fa 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -424,10 +424,6 @@ void OOXMLFastContextHandler::setDefine(Id nDefine) } -OOXMLParserState::Pointer_t OOXMLFastContextHandler::getParserState() const -{ - return mpParserState; -} void OOXMLFastContextHandler::setToken(Token_t nToken) { @@ -996,11 +992,6 @@ void OOXMLFastContextHandler::sendPropertiesToParent() } } -uno::Reference< uno::XComponentContext > -OOXMLFastContextHandler::getComponentContext() -{ - return m_xContext; -} /* class OOXMLFastContextHandlerStream @@ -1039,11 +1030,6 @@ void OOXMLFastContextHandlerStream::sendProperty(Id nId) sText.getLength()); } -OOXMLPropertySet::Pointer_t -OOXMLFastContextHandlerStream::getPropertySetAttrs() const -{ - return mpPropertySetAttrs; -} void OOXMLFastContextHandlerStream::resolvePropertySetAttrs() { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 0590638b8128..053985dbb700 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -176,7 +176,7 @@ public: void setDefine(Id nDefine); Id getDefine() const { return mnDefine;} - OOXMLParserState::Pointer_t getParserState() const; + OOXMLParserState::Pointer_t getParserState() const { return mpParserState;} void sendTableDepth() const; void setHandle(); @@ -276,7 +276,7 @@ protected: (const OUString & rId); virtual void resolvePropertySetAttrs(); - uno::Reference< uno::XComponentContext > getComponentContext(); + uno::Reference< uno::XComponentContext > getComponentContext() { return m_xContext;} sal_uInt32 mnInstanceNumber; @@ -304,7 +304,7 @@ public: virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } - OOXMLPropertySet::Pointer_t getPropertySetAttrs() const; + OOXMLPropertySet::Pointer_t getPropertySetAttrs() const { return mpPropertySetAttrs;} virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; virtual void sendProperty(Id nId); diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index 7fd89342f74e..a7c8883fb977 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -789,10 +789,6 @@ void OOXMLPropertySetEntryToString::attribute(Id nId, Value & rValue) mStr = rValue.getString(); } -const OUString & OOXMLPropertySetEntryToString::getString() const -{ - return mStr; -} OOXMLPropertySetEntryToInteger::OOXMLPropertySetEntryToInteger(Id nId) : mnId(nId), mnValue(0) diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 78c578f0dce5..9f185618a873 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -282,7 +282,7 @@ public: virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; - const OUString & getString() const; + const OUString & getString() const { return mStr;} }; class OOXMLPropertySetEntryToInteger : public Properties diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 9aa896b59dac..52b10289b368 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -393,12 +393,6 @@ uno::Reference<io::XInputStream> OOXMLStreamImpl::getDocumentStream() return xResult; } -// Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document. -uno::Reference<io::XStream> OOXMLStreamImpl::accessDocumentStream() -{ - return mxDocumentStream; -} - uno::Reference<io::XInputStream> OOXMLStreamImpl::getStorageStream() { return mxStorageStream; diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index ea1686db3f11..5c83bfd44db9 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -84,7 +84,8 @@ public: getFastTokenHandler(css::uno::Reference<css::uno::XComponentContext> rContext) SAL_OVERRIDE; void setInputStream(css::uno::Reference<css::io::XInputStream> rxInputStream); - css::uno::Reference<css::io::XStream> accessDocumentStream(); + // Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document. + css::uno::Reference<css::io::XStream> accessDocumentStream() { return mxDocumentStream;} }; }} #endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLSTREAMIMPL_HXX diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d8ccd492ed82..0f29107a786f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -318,10 +318,6 @@ SvStream& RTFDocumentImpl::Strm() return *m_pInStream; } -Stream& RTFDocumentImpl::Mapper() -{ - return *m_pMapperStream; -} void RTFDocumentImpl::setSuperstream(RTFDocumentImpl* pSuperstream) { @@ -5666,10 +5662,6 @@ int RTFDocumentImpl::popState() return "RTFDocumentImpl"; } -uno::Reference<lang::XMultiServiceFactory> RTFDocumentImpl::getModelFactory() -{ - return m_xModelFactory; -} bool RTFDocumentImpl::isInBackground() { diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index d4007421c621..476362b8a802 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -344,7 +344,7 @@ public: virtual void finishSubstream() SAL_OVERRIDE; virtual bool isSubstream() const SAL_OVERRIDE; - Stream& Mapper(); + Stream& Mapper() { return *m_pMapperStream;} void setSubstream(bool bIsSubtream); void setSuperstream(RTFDocumentImpl* pSuperstream); void setStreamType(Id nId); @@ -352,7 +352,7 @@ public: void setAuthorInitials(OUString& rAuthorInitials); void setIgnoreFirst(OUString& rIgnoreFirst); void seek(sal_Size nPos); - css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory(); + css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory() { return m_xModelFactory;} bool isInBackground(); void setDestinationText(OUString& rString); /// Resolve a picture: If not inline, then anchored. diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx index c731986e5cfb..793305ef2621 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx @@ -46,15 +46,7 @@ std::string RTFReferenceProperties::getType() const return "RTFReferenceProperties"; } -RTFSprms& RTFReferenceProperties::getAttributes() -{ - return m_aAttributes; -} -RTFSprms& RTFReferenceProperties::getSprms() -{ - return m_aSprms; -} } // namespace rtftok } // namespace writerfilter diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx index 527ad01d7734..263ac728a8f8 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx @@ -26,8 +26,8 @@ public: virtual ~RTFReferenceProperties(); virtual void resolve(Properties& rHandler) SAL_OVERRIDE; virtual std::string getType() const SAL_OVERRIDE; - RTFSprms& getAttributes(); - RTFSprms& getSprms(); + RTFSprms& getAttributes() { return m_aAttributes;} + RTFSprms& getSprms() { return m_aSprms;} private: RTFSprms m_aAttributes; RTFSprms m_aSprms; diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 9c55f975514f..25735d9d0580 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -57,10 +57,6 @@ RTFTokenizer::~RTFTokenizer() { } -SvStream& RTFTokenizer::Strm() -{ - return *m_pInStream; -} int RTFTokenizer::resolveParse() { diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index b2ce73b77646..ad9e4ac0fec1 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -45,7 +45,7 @@ public: /// To look up additional properties of a math symbol. static bool lookupMathKeyword(RTFMathSymbol& rSymbol); private: - SvStream& Strm(); + SvStream& Strm() { return *m_pInStream;} int resolveKeyword(); int dispatchKeyword(OString& rKeyword, bool bParam, int nParam); |