INTEGRATION: CWS calc16 (1.7.20); FILE MERGED

2003/08/04 12:09:13 dr 1.7.20.2: RESYNC: (1.7-1.8); FILE MERGED
2003/07/17 15:19:51 dr 1.7.20.1: #110656# import of cond. formats reworked

1 files changed, 6 insertions, 4 deletions

diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx
index b9b2537897da..f29b875c77e7 100644
--- a/sc/source/filter/inc/xltools.hxx
+++ b/sc/source/filter/inc/xltools.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xltools.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: vg $ $Date: 2003-07-24 11:57:04 $
+ *  last change: $Author: rt $ $Date: 2003-09-16 08:20:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -256,9 +256,11 @@ public:
 // conditional formatting style names -----------------------------------------
 
     /** Returns the style name for a single condition of a conditional formatting.
+        @param nScTab  The current Calc sheet index.
         @param nFormat  The zero-based index of the conditional formatting.
-        @param nCondition  The zero-based index of the condition. */
-    static String               GetCondFormatStyleName( sal_Int32 nFormat, sal_uInt16 nCondition );
+        @param nCondition  The zero-based index of the condition.
+        @return  A style sheet name in the form "Excel_CondFormat_<sheet>_<format>_<condition>". */
+    static String               GetCondFormatStyleName( sal_uInt16 nScTab, sal_Int32 nFormat, sal_uInt16 nCondition );
     /** Returns true, if the passed string is a name of a conditional format style created by Excel import.
         @param pnNextChar  If not 0, the index of the char after the evaluated substring will be returned here. */
     static bool                 IsCondFormatStyleName( const String& rStyleName, xub_StrLen* pnNextChar = NULL );