diff options
Diffstat (limited to 'writerfilter')
24 files changed, 29 insertions, 145 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index efa6be2bddd2..7e03c3d59fc5 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -188,10 +188,6 @@ table::BorderLine2 BorderHandler::getBorderLine() return aBorderLine; } -bool BorderHandler::getShadow() -{ - return m_bShadow; -} void BorderHandler::enableInteropGrabBag(const OUString& aName) { diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index b0160395432b..0368a934f3c2 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -71,7 +71,7 @@ public: ::boost::shared_ptr<PropertyMap> getProperties(); ::com::sun::star::table::BorderLine2 getBorderLine(); sal_Int32 getLineDistance() const { return m_nLineDistance;} - bool getShadow(); + bool getShadow() { return m_bShadow;} void enableInteropGrabBag(const OUString& aName); css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString()); }; diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 772043ed4483..8d09c69c4b4f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -386,30 +386,18 @@ void DomainMapper_Impl::SetSymbolData( sal_Int32 nSymbolData ) m_nSymboldata = nSymbolData; } -sal_Int32 DomainMapper_Impl::GetSymbolData() -{ - return m_nSymboldata; -} void DomainMapper_Impl::SetIsLastParagraphInSection( bool bIsLast ) { m_bIsLastParaInSection = bIsLast; } -bool DomainMapper_Impl::GetIsLastParagraphInSection() -{ - return m_bIsLastParaInSection; -} void DomainMapper_Impl::SetIsFirstParagraphInSection( bool bIsFirst ) { m_bIsFirstParaInSection = bIsFirst; } -bool DomainMapper_Impl::GetIsFirstParagraphInSection() -{ - return m_bIsFirstParaInSection; -} void DomainMapper_Impl::SetIsDummyParaAddedForTableInSection( bool bIsAdded ) @@ -417,55 +405,31 @@ void DomainMapper_Impl::SetIsDummyParaAddedForTableInSection( bool bIsAdded ) m_bDummyParaAddedForTableInSection = bIsAdded; } -bool DomainMapper_Impl::GetIsDummyParaAddedForTableInSection() -{ - return m_bDummyParaAddedForTableInSection; -} void DomainMapper_Impl::SetIsTextFrameInserted( bool bIsInserted ) { m_bTextFrameInserted = bIsInserted; } -bool DomainMapper_Impl::GetIsTextFrameInserted() -{ - return m_bTextFrameInserted; -} void DomainMapper_Impl::SetParaSectpr(bool bParaSectpr) { m_bParaSectpr = bParaSectpr; } -bool DomainMapper_Impl::GetParaSectpr() -{ - return m_bParaSectpr; -} void DomainMapper_Impl::SetSdt(bool bSdt) { m_bSdt = bSdt; } -bool DomainMapper_Impl::GetSdt() -{ - return m_bSdt; -} void DomainMapper_Impl::SetIsTableHasDirectFormatting(bool bIsTableHasDirectFormatting) { m_bIsTableHasDirectFormatting = bIsTableHasDirectFormatting; } -bool DomainMapper_Impl::GetIsTableHasDirectFormatting() -{ - return m_bIsTableHasDirectFormatting; -} -bool DomainMapper_Impl::GetParaChanged() -{ - return m_bParaChanged; -} void DomainMapper_Impl::PushProperties(ContextType eId) { @@ -4757,10 +4721,6 @@ sal_Int32 DomainMapper_Impl::getCurrentNumberingProperty(const OUString& aProp) return nRet; } -bool DomainMapper_Impl::IsNewDoc() -{ - return m_bIsNewDoc; -} void DomainMapper_Impl::enableInteropGrabBag(const OUString& aName) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 74ff7845abf3..f73b72ba2de9 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -457,27 +457,27 @@ public: void AddDummyParaForTableInSection(); void RemoveLastParagraph( ); void SetIsLastParagraphInSection( bool bIsLast ); - bool GetIsLastParagraphInSection(); + bool GetIsLastParagraphInSection() { return m_bIsLastParaInSection;} void SetIsFirstParagraphInSection( bool bIsFirst ); - bool GetIsFirstParagraphInSection(); + bool GetIsFirstParagraphInSection() { return m_bIsFirstParaInSection;} void SetIsDummyParaAddedForTableInSection( bool bIsAdded ); - bool GetIsDummyParaAddedForTableInSection(); + bool GetIsDummyParaAddedForTableInSection() { return m_bDummyParaAddedForTableInSection;} void SetIsTextFrameInserted( bool bIsInserted ); - bool GetIsTextFrameInserted(); + bool GetIsTextFrameInserted() { return m_bTextFrameInserted;} void SetParaSectpr(bool bParaSectpr); - bool GetParaSectpr(); + bool GetParaSectpr() { return m_bParaSectpr;} void SetSymbolData( sal_Int32 nSymbolData ); - sal_Int32 GetSymbolData(); + sal_Int32 GetSymbolData() { return m_nSymboldata;} /// Setter method for m_bSdt. void SetSdt(bool bSdt); /// Getter method for m_bSdt. - bool GetSdt(); + bool GetSdt() { return m_bSdt;} /// Getter method for m_bIsTableHasDirectFormatting - bool GetIsTableHasDirectFormatting(); + bool GetIsTableHasDirectFormatting() { return m_bIsTableHasDirectFormatting;} /// Setter method for m_bIsTableHasDirectFormatting void SetIsTableHasDirectFormatting(bool bIsTableHasDirectFormatting); - bool GetParaChanged(); + bool GetParaChanged() { return m_bParaChanged;} void deferBreak( BreakType deferredBreakType ); bool isBreakDeferred( BreakType deferredBreakType ); @@ -736,7 +736,7 @@ public: sal_Int32 getCurrentNumberingProperty(const OUString& aProp); /// If we're importing into a new document, or just pasting to an existing one. - bool IsNewDoc(); + bool IsNewDoc() { return m_bIsNewDoc;} /// If we're inside <w:rPr>, inside <w:style w:type="table"> bool m_bInTableStyleRunProps; diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index 799416d24fef..3f8bc073be9e 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -57,15 +57,7 @@ const OUString & FFDataHandler::getStatusText() const return m_sStatusText; } -sal_uInt32 FFDataHandler::getCheckboxHeight() const -{ - return m_nCheckboxHeight; -} -bool FFDataHandler::getCheckboxAutoHeight() const -{ - return m_bCheckboxAutoHeight; -} bool FFDataHandler::getCheckboxChecked() const { diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index 3b53cb95d53d..9692ac2186d3 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -45,10 +45,10 @@ public: const OUString & getStatusText() const; // member: checkboxHeight - sal_uInt32 getCheckboxHeight() const; + sal_uInt32 getCheckboxHeight() const { return m_nCheckboxHeight;} // member: checkboxAutoHeight - bool getCheckboxAutoHeight() const; + bool getCheckboxAutoHeight() const { return m_bCheckboxAutoHeight;} // member: checkboxChecked or checkboxDefault (if the previous is not set) bool getCheckboxChecked() const; diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index da93450c69d9..79ca0d06cc83 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.cxx +++ b/writerfilter/source/dmapper/GraphicHelpers.cxx @@ -147,15 +147,7 @@ sal_Int16 PositionHandler::orientation() const return m_nOrient; } -sal_Int16 PositionHandler::relation() const -{ - return m_nRelation; -} -sal_Int32 PositionHandler::position() const -{ - return m_nPosition; -} void PositionHandler::setPositionOffset(const OUString & sText, bool vertical) { diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx index 6a41abfb53b4..e8c4aa5851ef 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.hxx +++ b/writerfilter/source/dmapper/GraphicHelpers.hxx @@ -40,8 +40,8 @@ public: static void setAlignH(const OUString & sText); static void setAlignV(const OUString & sText); sal_Int16 orientation() const; - sal_Int16 relation() const; - sal_Int32 position() const; + sal_Int16 relation() const { return m_nRelation;} + sal_Int32 position() const { return m_nPosition;} private: virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE; virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 547c7b062d0b..65f6a669b321 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -426,10 +426,6 @@ void NumPicBullet::SetShape(uno::Reference<drawing::XShape> xShape) m_xShape = xShape; } -sal_Int32 NumPicBullet::GetId() -{ - return m_nId; -} uno::Reference<drawing::XShape> NumPicBullet::GetShape() { diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 71a6e66511a4..4f310f11e73a 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -118,7 +118,7 @@ public: virtual ~NumPicBullet(); void SetId(sal_Int32 nId); - sal_Int32 GetId(); + 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(); private: diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 5abccdc86f01..10f6abf5b2dc 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -183,10 +183,6 @@ OUStringBuffer& SdtHelper::getLocale() return m_sLocale; } -bool SdtHelper::hasElements() -{ - return m_bHasElements; -} void SdtHelper::appendToInteropGrabBag(com::sun::star::beans::PropertyValue rValue) { diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index 11b776de83e1..9472c714d845 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -75,7 +75,7 @@ public: OUStringBuffer& getDateFormat(); OUStringBuffer& getLocale(); /// If createControlShape() was ever called. - bool hasElements(); + bool hasElements() { return m_bHasElements;} /// Create drop-down control from w:sdt's w:dropDownList. void createDropDownControl(); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 73c76b33791d..cd71adbb9443 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -517,10 +517,6 @@ void OOXMLFastContextHandler::setDefine(Id nDefine) mnDefine = nDefine; } -Id OOXMLFastContextHandler::getDefine() const -{ - return mnDefine; -} OOXMLParserState::Pointer_t OOXMLFastContextHandler::getParserState() const { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index bb9d378459e3..afc685bb321e 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -174,7 +174,7 @@ public: virtual Id getId() const; void setDefine(Id nDefine); - Id getDefine() const; + Id getDefine() const { return mnDefine;} OOXMLParserState::Pointer_t getParserState() const; diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index aa08c79cd4db..e74a81c508a9 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -54,35 +54,19 @@ void OOXMLParserState::setLastParagraphInSection(bool bLastParagraphInSection) mbLastParagraphInSection = bLastParagraphInSection; } -bool OOXMLParserState::isLastParagraphInSection() const -{ - return mbLastParagraphInSection; -} -bool OOXMLParserState::isInSectionGroup() const -{ - return mbInSectionGroup; -} void OOXMLParserState::setInSectionGroup(bool bInSectionGroup) { mbInSectionGroup = bInSectionGroup; } -bool OOXMLParserState::isInParagraphGroup() const -{ - return mbInParagraphGroup; -} void OOXMLParserState::setInParagraphGroup(bool bInParagraphGroup) { mbInParagraphGroup = bInParagraphGroup; } -bool OOXMLParserState::isInCharacterGroup() const -{ - return mbInCharacterGroup; -} void OOXMLParserState::setInCharacterGroup(bool bInCharacterGroup) { @@ -94,10 +78,6 @@ void OOXMLParserState::setForwardEvents(bool bForwardEvents) mbForwardEvents = bForwardEvents; } -bool OOXMLParserState::isForwardEvents() const -{ - return mbForwardEvents; -} const std::string OOXMLParserState::getHandle() const { @@ -118,10 +98,6 @@ void OOXMLParserState::setDocument(OOXMLDocumentImpl* pDocument) mpDocument = pDocument; } -OOXMLDocumentImpl* OOXMLParserState::getDocument() const -{ - return mpDocument; -} void OOXMLParserState::setXNoteId(const sal_Int32 nId) { diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx index d7f6005cedd0..9472945ca45a 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.hxx +++ b/writerfilter/source/ooxml/OOXMLParserState.hxx @@ -62,26 +62,26 @@ public: OOXMLParserState(); virtual ~OOXMLParserState(); - bool isInSectionGroup() const; + bool isInSectionGroup() const { return mbInSectionGroup;} void setInSectionGroup(bool bInSectionGroup); void setLastParagraphInSection(bool bLastParagraphInSection); - bool isLastParagraphInSection() const; + bool isLastParagraphInSection() const { return mbLastParagraphInSection;} - bool isInParagraphGroup() const; + bool isInParagraphGroup() const { return mbInParagraphGroup;} void setInParagraphGroup(bool bInParagraphGroup); - bool isInCharacterGroup() const; + bool isInCharacterGroup() const { return mbInCharacterGroup;} void setInCharacterGroup(bool bInCharacterGroup); void setForwardEvents(bool bForwardEvents); - bool isForwardEvents() const; + bool isForwardEvents() const { return mbForwardEvents;} const std::string getHandle() const; void setHandle(); void setDocument(OOXMLDocumentImpl* pDocument); - OOXMLDocumentImpl* getDocument() const; + OOXMLDocumentImpl* getDocument() const { return mpDocument;} void setXNoteId(const sal_Int32 rId); sal_Int32 getXNoteId() const; diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index dfae1d1a9e04..76fa69b81952 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -839,10 +839,6 @@ void OOXMLPropertySetEntryToInteger::attribute(Id nId, Value & rValue) mnValue = rValue.getInt(); } -int OOXMLPropertySetEntryToInteger::getValue() const -{ - return mnValue; -} }} diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 1e0b6400ad2a..78c578f0dce5 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -296,7 +296,7 @@ public: virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; - int getValue() const; + int getValue() const { return mnValue;} }; Sprm::Kind SprmKind(sal_uInt32 nSprmCode); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 0f9c09ce8d7f..0608cb230db5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -413,10 +413,6 @@ void RTFDocumentImpl::checkFirstRun() } } -bool RTFDocumentImpl::getFirstRun() -{ - return m_bFirstRun; -} void RTFDocumentImpl::setNeedPar(bool bNeedPar) { diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index f5c43a7d9109..2f73a8fa288d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -361,7 +361,7 @@ public: /// If this is the first run of the document, starts the initial paragraph. void checkFirstRun(); /// If the initial paragraph is started. - bool getFirstRun(); + bool getFirstRun() { return m_bFirstRun;} /// If we need to add a dummy paragraph before a section break. void setNeedPar(bool bNeedPar); /// Return the dmapper index of an RTF index for fonts. diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx index bab41e635c2d..91f8d6e0b2de 100644 --- a/writerfilter/source/rtftok/rtflookahead.cxx +++ b/writerfilter/source/rtftok/rtflookahead.cxx @@ -121,10 +121,6 @@ bool RTFLookahead::isSubstream() const return false; } -bool RTFLookahead::hasTable() -{ - return m_bHasTable; -} } // namespace rtftok } // namespace writerfilter diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx index f2103de1b177..682878cba506 100644 --- a/writerfilter/source/rtftok/rtflookahead.hxx +++ b/writerfilter/source/rtftok/rtflookahead.hxx @@ -44,7 +44,7 @@ public: virtual void setSkipUnknown(bool bSkipUnknown) SAL_OVERRIDE; virtual void finishSubstream() SAL_OVERRIDE; virtual bool isSubstream() const SAL_OVERRIDE; - bool hasTable(); + bool hasTable() { return m_bHasTable;} private: boost::shared_ptr<RTFTokenizer> m_pTokenizer; SvStream& m_rStream; diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index a8587e7c21af..9c55f975514f 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -197,10 +197,6 @@ int RTFTokenizer::asHex(char ch) return ret; } -int RTFTokenizer::getGroup() const -{ - return m_nGroup; -} void RTFTokenizer::pushGroup() { @@ -360,10 +356,6 @@ OUString RTFTokenizer::getPosition() return aRet.makeStringAndClear(); } -sal_Size RTFTokenizer::getGroupStart() -{ - return m_nGroupStart; -} } // namespace rtftok } // namespace writerfilter diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index 371ec6d1936d..36be2b526854 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -29,13 +29,13 @@ public: int resolveParse(); int asHex(char ch); /// Number of states on the stack. - int getGroup() const; + int getGroup() const { return m_nGroup;} /// To be invoked by the pushState() callback to signal when the importer enters a group. void pushGroup(); /// To be invoked by the popState() callback to single when the importer leaves a group. void popGroup(); OUString getPosition(); - sal_Size getGroupStart(); + sal_Size getGroupStart() { return m_nGroupStart;} /// To look up additional properties of a math symbol. static bool lookupMathKeyword(RTFMathSymbol& rSymbol); private: |