diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-05 15:16:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-06 09:21:58 +0000 |
| commit | 0c82dff153d92150729815b919854a9a350aa031 (patch) | |
| tree | 9bda3cba13d9534460b2fe7919b00009e8ffd425 /oox | |
| parent | 9458ce11084579b020650fecb1165052c16ee556 (diff) | |
loplugin:singlevalfields
Change-Id: Ia681765aa1da5c80a3dbe91b7376af841a9c9ec1
Reviewed-on: https://gerrit.libreoffice.org/36145
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/drawingml/table/tableproperties.hxx | 30 | ||||
| -rw-r--r-- | oox/source/drawingml/table/tablecontext.cxx | 13 | ||||
| -rw-r--r-- | oox/source/drawingml/table/tableproperties.cxx | 3 |
3 files changed, 24 insertions, 22 deletions
diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx index cf4d0cd2afcf..578230daa876 100644 --- a/oox/inc/drawingml/table/tableproperties.hxx +++ b/oox/inc/drawingml/table/tableproperties.hxx @@ -38,18 +38,23 @@ public: TableProperties(); ~TableProperties(); - std::vector< sal_Int32 >& getTableGrid() { return mvTableGrid; }; - std::vector< TableRow >& getTableRows() { return mvTableRows; }; - - OUString& getStyleId(){ return maStyleId; }; - std::shared_ptr< TableStyle >& getTableStyle(){ return mpTableStyle; }; - bool& isRtl(){ return mbRtl; }; - bool& isFirstRow(){ return mbFirstRow; }; - bool& isFirstCol(){ return mbFirstCol; }; - bool& isLastRow(){ return mbLastRow; }; - bool& isLastCol(){ return mbLastCol; }; - bool& isBandRow(){ return mbBandRow; }; - bool& isBandCol(){ return mbBandCol; }; + std::vector< sal_Int32 >& getTableGrid() { return mvTableGrid; }; + std::vector< TableRow >& getTableRows() { return mvTableRows; }; + + OUString& getStyleId() { return maStyleId; }; + std::shared_ptr< TableStyle >& getTableStyle() { return mpTableStyle; }; + bool isFirstRow() const { return mbFirstRow; }; + void setFirstRow(bool b) { mbFirstRow = b; }; + bool isFirstCol() const { return mbFirstCol; }; + void setFirstCol(bool b) { mbFirstCol = b; }; + bool isLastRow() const { return mbLastRow; }; + void setLastRow(bool b) { mbLastRow = b; }; + bool isLastCol() const { return mbLastCol; }; + void setLastCol(bool b) { mbLastCol = b; }; + bool isBandRow() const { return mbBandRow; }; + void setBandRow(bool b) { mbBandRow = b; }; + bool isBandCol() const { return mbBandCol; }; + void setBandCol(bool b) { mbBandCol = b; }; void pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase, const css::uno::Reference < css::beans::XPropertySet > & xPropSet, @@ -64,7 +69,6 @@ private: std::vector< sal_Int32 > mvTableGrid; std::vector< TableRow > mvTableRows; - bool mbRtl; bool mbFirstRow; bool mbFirstCol; bool mbLastRow; diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index 9e4cd315e62f..c3c5f48b18a9 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -50,13 +50,12 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList& r { case A_TOKEN( tblPr ): // CT_TableProperties { - mrTableProperties.isRtl() = rAttribs.getBool( XML_rtl, false ); - mrTableProperties.isFirstRow() = rAttribs.getBool( XML_firstRow, false ); - mrTableProperties.isFirstCol() = rAttribs.getBool( XML_firstCol, false ); - mrTableProperties.isLastRow() = rAttribs.getBool( XML_lastRow, false ); - mrTableProperties.isLastCol() = rAttribs.getBool( XML_lastCol, false ); - mrTableProperties.isBandRow() = rAttribs.getBool( XML_bandRow, false ); - mrTableProperties.isBandCol() = rAttribs.getBool( XML_bandCol, false ); + mrTableProperties.setFirstRow( rAttribs.getBool( XML_firstRow, false ) ); + mrTableProperties.setFirstCol( rAttribs.getBool( XML_firstCol, false ) ); + mrTableProperties.setLastRow( rAttribs.getBool( XML_lastRow, false ) ); + mrTableProperties.setLastCol( rAttribs.getBool( XML_lastCol, false ) ); + mrTableProperties.setBandRow( rAttribs.getBool( XML_bandRow, false ) ); + mrTableProperties.setBandCol( rAttribs.getBool( XML_bandCol, false ) ); } break; case A_TOKEN( tableStyle ): // CT_TableStyle diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index 053572a7bc08..d4c5bdc56d39 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -40,8 +40,7 @@ using namespace ::com::sun::star::table; namespace oox { namespace drawingml { namespace table { TableProperties::TableProperties() -: mbRtl( false ) -, mbFirstRow( false ) +: mbFirstRow( false ) , mbFirstCol( false ) , mbLastRow( false ) , mbLastCol( false ) |