diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 10:51:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 10:51:06 +0000 |
| commit | ce2befc29e527a8c8d17b400468643f48bf1873b (patch) | |
| tree | 874e796428ae4afd337d13fb6126264e8b071920 /xmloff | |
| parent | 3a291d77a92c9d203ddee9dca9d4c14d77edc49a (diff) | |
INTEGRATION: CWS impressodf12 (1.7.20); FILE MERGED
2008/05/15 13:24:29 cl 1.7.20.1: #i35937# reworked bullets in outliner
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextNumRuleInfo.hxx | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index 191858823748..d26403547df4 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLTextNumRuleInfo.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -39,6 +39,8 @@ namespace com { namespace sun { namespace star { } } } #include <sal/types.h> +class SvXMLExport; + class XMLTextNumRuleInfo { const ::rtl::OUString sNumberingRules; @@ -50,6 +52,7 @@ class XMLTextNumRuleInfo const ::rtl::OUString sNumberingIsNumber; const ::rtl::OUString sNumberingIsOutline; + ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > xNumRules; @@ -57,13 +60,13 @@ class XMLTextNumRuleInfo sal_Int16 nStartValue; sal_Int16 nLevel; - sal_Bool bIsNumbered : 1; - sal_Bool bIsOrdered : 1; - sal_Bool bIsRestart : 1; - sal_Bool bIsNamed : 1; + sal_Bool bIsNumbered; + sal_Bool bIsOrdered; + sal_Bool bIsRestart; + sal_Bool bIsNamed; // --> OD 2006-09-27 #i69627# - sal_Bool mbOutlineStyleAsNormalListStyle : 1; + sal_Bool mbOutlineStyleAsNormalListStyle; // <-- public: @@ -93,7 +96,7 @@ public: sal_Bool IsRestart() const { return bIsRestart; } sal_Bool IsNamed() const { return bIsNamed; } - inline sal_Bool HasSameNumRules( const XMLTextNumRuleInfo& rCmp ) const; + sal_Bool HasSameNumRules( const XMLTextNumRuleInfo& rCmp ) const; }; inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=( @@ -127,11 +130,4 @@ inline void XMLTextNumRuleInfo::Reset() // <-- } -inline sal_Bool XMLTextNumRuleInfo::HasSameNumRules( - const XMLTextNumRuleInfo& rCmp ) const -{ - return (bIsNamed && rCmp.bIsNamed) ? (rCmp.sName == sName) - : (rCmp.xNumRules == xNumRules); -} - #endif // _XMLOFF_XMLTEXTNUMRULEINFO_HXX |