INTEGRATION: CWS sw30bf06 (1.36.88); FILE MERGED

2008/06/19 10:55:15 od 1.36.88.4: RESYNC: (1.36-1.37); FILE MERGED
2008/06/16 13:38:29 od 1.36.88.3: #i90078# classes <SWEditShell> and <SwNumRule>
refactoring: adjust method names and synopsis
2008/06/09 07:20:05 od 1.36.88.2: #i89178# new function <numfunc::GetDefaultPositionAndSpaceMode()>
2008/06/06 08:47:01 od 1.36.88.1: #i63395# new default bullet characters and new default bullet font

1 files changed, 31 insertions, 4 deletions

diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 5c0b87ba2ea8..35650b736e81 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: numrule.hxx,v $
- * $Revision: 1.37 $
+ * $Revision: 1.38 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -300,9 +300,20 @@ public:
     SvxNumRule  MakeSvxNumRule() const;
 
     // #i23726#, #i23725#
-    void        Indent(short aAmount, int nLevel = -1,
-                       int nReferenceLevel = -1, BOOL bRelative = TRUE,
-                       BOOL bFirstLine = TRUE, BOOL bCheckGtZero = TRUE);
+    // --> OD 2008-06-09 #i90078#
+    // refactoring: provide certain method for certain purpose
+//    void        Indent(short aAmount, int nLevel = -1,
+//                       int nReferenceLevel = -1, BOOL bRelative = TRUE,
+//                       BOOL bFirstLine = TRUE, BOOL bCheckGtZero = TRUE);
+    // change indent of all list levels by given difference
+    void ChangeIndent( const short nDiff );
+    // set indent of certain list level to given value
+    void SetIndent( const short nNewIndent,
+                    const USHORT nListLevel );
+    // set indent of first list level to given value and change other list level's
+    // indents accordingly
+    void SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent );
+    // <--
 
     void Validate();
 };
@@ -317,6 +328,15 @@ namespace numfunc
     */
     const String& GetDefBulletFontname();
 
+    /** determine if default bullet font is user defined
+
+        OD 2008-06-06 #i63395#
+        The default bullet font is user defined, if it is given in the user configuration
+
+        @author OD
+    */
+    const bool IsDefBulletFontUserDefined();
+
     /** retrieve font used for the default bullet list characters
 
         @author OD
@@ -339,6 +359,13 @@ namespace numfunc
         @author OD
     */
     const sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem();
+
+    /**
+        OD 2008-06-06 #i89178#
+
+        @author OD
+    */
+    const SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode();
 }
 
 #endif  // _NUMRULE_HXX