diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 12:25:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 12:27:32 +0100 |
| commit | 33740b7d5abb8aca34692fbdaa787b26a60652a9 (patch) | |
| tree | ad2574a7850e2aa8ac18eaff89f4a85567896692 /xmloff/source/forms | |
| parent | 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4 (diff) | |
Replace exisiting TriState, AutoState with more generic TriState
Change-Id: Ida05478aae5a379775c671e0c2f2851d820d78be
Diffstat (limited to 'xmloff/source/forms')
| -rw-r--r-- | xmloff/source/forms/elementexport.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/forms/formenums.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/forms/layerimport.cxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index d92f037fdbad..75c9c9bf2697 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/awt/ImagePosition.hpp> #include <sax/tools/converter.hxx> -#include <tools/wintypes.hxx> +#include <tools/gen.hxx> #include <xmloff/txtprmap.hxx> #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> @@ -1077,7 +1077,7 @@ namespace xmloff OAttributeMetaData::getSpecialAttributeName(SCA_STATE), PROPERTY_DEFAULT_STATE, OEnumMapper::getEnumMap(OEnumMapper::epCheckState), - STATE_NOCHECK); + TRISTATE_FALSE); #if OSL_DEBUG_LEVEL > 0 // reset the bit for later checking m_nIncludeSpecial = m_nIncludeSpecial & ~SCA_STATE; @@ -1091,7 +1091,7 @@ namespace xmloff OAttributeMetaData::getSpecialAttributeName(SCA_CURRENT_STATE), PROPERTY_STATE, OEnumMapper::getEnumMap(OEnumMapper::epCheckState), - STATE_NOCHECK); + TRISTATE_FALSE); #if OSL_DEBUG_LEVEL > 0 // reset the bit for later checking m_nIncludeSpecial = m_nIncludeSpecial & ~SCA_CURRENT_STATE; diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index 4969efe07ce7..ecaba1cfd3dd 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/awt/ScrollBarOrientation.hpp> #include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/awt/ImageScaleMode.hpp> -#include <tools/wintypes.hxx> +#include <tools/gen.hxx> #include <xmloff/xmltoken.hxx> namespace xmloff @@ -173,9 +173,9 @@ namespace xmloff { static const SvXMLEnumMapEntry aCheckStateMap[] = { - { XML_UNCHECKED, STATE_NOCHECK }, - { XML_CHECKED, STATE_CHECK }, - { XML_UNKNOWN, STATE_DONTKNOW }, + { XML_UNCHECKED, TRISTATE_FALSE }, + { XML_CHECKED, TRISTATE_TRUE }, + { XML_UNKNOWN, TRISTATE_INDET }, { XML_TOKEN_INVALID, 0 } }; rReturn = aCheckStateMap; diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 4779b4e18ce6..b640b2a0f8b1 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/awt/ScrollBarOrientation.hpp> #include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/form/ListSourceType.hpp> -#include <tools/wintypes.hxx> +#include <tools/gen.hxx> #include <com/sun/star/lang/Locale.hpp> #include <xmloff/controlpropertyhdl.hxx> #include "controlpropertymap.hxx" @@ -196,11 +196,11 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) ListSourceType_VALUELIST, OEnumMapper::getEnumMap(OEnumMapper::epListSourceType), &::getCppuType( static_cast<ListSourceType*>(NULL) )); m_aAttributeMetaData.addEnumProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_STATE), PROPERTY_DEFAULT_STATE, STATE_NOCHECK, + OAttributeMetaData::getSpecialAttributeName(SCA_STATE), PROPERTY_DEFAULT_STATE, TRISTATE_FALSE, OEnumMapper::getEnumMap(OEnumMapper::epCheckState), &::getCppuType( static_cast< sal_Int16* >(NULL))); m_aAttributeMetaData.addEnumProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_CURRENT_STATE), PROPERTY_STATE, STATE_NOCHECK, + OAttributeMetaData::getSpecialAttributeName(SCA_CURRENT_STATE), PROPERTY_STATE, TRISTATE_FALSE, OEnumMapper::getEnumMap(OEnumMapper::epCheckState), &::getCppuType( static_cast< sal_Int16* >(NULL))); m_aAttributeMetaData.addEnumProperty( |