summaryrefslogtreecommitdiff
path: root/xmloff/source/text/XMLTextNumRuleInfo.hxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-12-11 09:52:14 +0000
committerRüdiger Timm <rt@openoffice.org>2008-12-11 09:52:14 +0000
commit9ae05952b0d5ecbbdcd7159274d90ae81cf51dfc (patch)
treee05a022c79e4f5c8f175cdbc346ede1501910154 /xmloff/source/text/XMLTextNumRuleInfo.hxx
parent7da67e089573a89d3bddb196b658c2df391c070a (diff)
CWS-TOOLING: integrate CWS sw301bf04_DEV300
Diffstat (limited to 'xmloff/source/text/XMLTextNumRuleInfo.hxx')
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.hxx36
1 files changed, 30 insertions, 6 deletions
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index caf40d608e1f..2f90aad14a07 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -7,11 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: XMLTextNumRuleInfo.hxx,v $
-<<<<<<< XMLTextNumRuleInfo.hxx
* $Revision: 1.10.64.1 $
-=======
- * $Revision: 1.10.64.1 $
->>>>>>> 1.6.266.4
*
* This file is part of OpenOffice.org.
*
@@ -61,6 +57,10 @@ class XMLTextNumRuleInfo
const ::rtl::OUString msNumberingIsOutline;
const ::rtl::OUString msPropNameListId;
const ::rtl::OUString msPropNameStartWith;
+ // --> OD 2008-11-26 #158694#
+ const ::rtl::OUString msContinueingPreviousSubTree;
+ const ::rtl::OUString msListLabelStringProp;
+ // <--
// numbering rules instance and its name
::com::sun::star::uno::Reference <
@@ -83,17 +83,22 @@ class XMLTextNumRuleInfo
sal_Bool mbOutlineStyleAsNormalListStyle;
// <--
+ // --> OD 2008-11-26 #158694#
+ sal_Bool mbContinueingPreviousSubTree;
+ ::rtl::OUString msListLabelString;
+ // <--
public:
XMLTextNumRuleInfo();
inline XMLTextNumRuleInfo& operator=( const XMLTextNumRuleInfo& rInfo );
- // --> OD 2006-09-27 #i69627#
+ // --> OD 2008-11-26 #158694#
void Set( const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContnt,
const sal_Bool bOutlineStyleAsNormalListStyle,
- const XMLTextListAutoStylePool& rListAutoPool );
+ const XMLTextListAutoStylePool& rListAutoPool,
+ const sal_Bool bExportTextNumberElement );
// <--
inline void Reset();
@@ -145,6 +150,17 @@ public:
{
return rCmp.msNumRulesName == msNumRulesName;
}
+
+ // --> OD 2008-11-26 #158694#
+ inline sal_Bool IsContinueingPreviousSubTree() const
+ {
+ return mbContinueingPreviousSubTree;
+ }
+ inline const ::rtl::OUString& ListLabelString() const
+ {
+ return msListLabelString;
+ }
+ // <--
};
inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=(
@@ -160,6 +176,10 @@ inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=(
// --> OD 2006-09-27 #i69627#
mbOutlineStyleAsNormalListStyle = rInfo.mbOutlineStyleAsNormalListStyle;
// <--
+ // --> OD 2008-11-26 #158694#
+ mbContinueingPreviousSubTree = rInfo.mbContinueingPreviousSubTree;
+ msListLabelString = rInfo.msListLabelString;
+ // <--
return *this;
}
@@ -175,5 +195,9 @@ inline void XMLTextNumRuleInfo::Reset()
mbIsNumbered = mbIsRestart =
mbOutlineStyleAsNormalListStyle = sal_False;
// <--
+ // --> OD 2008-11-26 #158694#
+ mbContinueingPreviousSubTree = sal_False;
+ msListLabelString = ::rtl::OUString();
+ // <--
}
#endif // _XMLOFF_XMLTEXTNUMRULEINFO_HXX