diff options
-rw-r--r-- | writerfilter/source/dmapper/FFDataHandler.cxx | 17 | ||||
-rw-r--r-- | writerfilter/source/dmapper/FFDataHandler.hxx | 5 |
2 files changed, 17 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index 4dac6f4996ea..2a9d97b95851 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -41,7 +41,8 @@ FFDataHandler::FFDataHandler() : LoggedProperties(dmapper_logger, "FFDataHandler"), m_nCheckboxHeight(0), m_bCheckboxAutoHeight(false), -m_bCheckboxChecked(false) +m_nCheckboxChecked(-1), +m_nCheckboxDefault(-1) { } @@ -77,7 +78,12 @@ bool FFDataHandler::getCheckboxAutoHeight() const bool FFDataHandler::getCheckboxChecked() const { - return m_bCheckboxChecked; + if (m_nCheckboxChecked != -1) + return m_nCheckboxChecked; + else if (m_nCheckboxDefault != -1) + return m_nCheckboxDefault; + else + return false; } const rtl::OUString & FFDataHandler::getDropDownResult() const @@ -126,7 +132,12 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm) break; case NS_ooxml::LN_CT_FFCheckBox_checked: { - m_bCheckboxChecked = r_Sprm.getValue()->getInt(); + m_nCheckboxChecked = r_Sprm.getValue()->getInt(); + } + break; + case NS_ooxml::LN_CT_FFCheckBox_default: + { + m_nCheckboxDefault = r_Sprm.getValue()->getInt(); } break; case NS_ooxml::LN_CT_FFData_checkBox: diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index 5a192ab9fae5..b9d538cb92c5 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -58,7 +58,7 @@ public: // member: checkboxAutoHeight bool getCheckboxAutoHeight() const; - // member: checkboxChecked + // member: checkboxChecked or checkboxDefault (if the previous is not set) bool getCheckboxChecked() const; // member: dropDownResult @@ -79,7 +79,8 @@ private: rtl::OUString m_sStatusText; sal_uInt32 m_nCheckboxHeight; bool m_bCheckboxAutoHeight; - bool m_bCheckboxChecked; + int m_nCheckboxChecked; + int m_nCheckboxDefault; rtl::OUString m_sDropDownResult; DropDownEntries_t m_DropDownEntries; rtl::OUString m_sTextDefault; |