diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2011-03-21 17:31:01 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2011-03-21 17:31:01 +0100 |
| commit | 46dcdf96d24a6e6f99a0845e3e8ab38621a9c7ba (patch) | |
| tree | d7a4b736db32ff9d1490e235fc16536f239e69ca | |
| parent | a24842b43a687808376f69d4bdbb45fcddde73c4 (diff) | |
| parent | 0beb3b7f484c96194ca24a013e8e0c856e8cdb6b (diff) | |
CWS-TOOLING: integrate CWS dr78
| -rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 4 | ||||
| -rw-r--r-- | offapi/com/sun/star/sheet/DataPilotDescriptor.idl | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index bb91337fc40a..5829fe43cce3 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -171,10 +171,10 @@ OUString OTextInputStream::readLine( ) return implReadString( aDummySeq, sal_True, sal_True ); } -OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool ) +OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) throw(IOException, RuntimeException) { - return implReadString( Delimiters, sal_True, sal_False ); + return implReadString( Delimiters, bRemoveDelimiter, sal_False ); } sal_Bool OTextInputStream::isEOF() diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl index 939ff469b674..c01f450676dc 100644 --- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl +++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl @@ -107,25 +107,26 @@ published service DataPilotDescriptor //------------------------------------------------------------------------- - /** specifies the orientation of the field. + /** specifies if empty rows in the source data are ignored. */ [optional, property] boolean IgnoreEmptyRows; //------------------------------------------------------------------------- - /** specifies the orientation of the field. + /** specifies if empty category cells in the source data should be treated + as repetition of the content from the previous row. */ [optional, property] boolean RepeatIfEmpty; //------------------------------------------------------------------------- - /** specifies the orientation of the field. + /** specifies if columns for grand total results are created. */ [optional, property] boolean ColumnGrand; //------------------------------------------------------------------------- - /** specifies the orientation of the field. + /** specifies if rows for grand total results are created. */ [optional, property] boolean RowGrand; @@ -142,6 +143,14 @@ published service DataPilotDescriptor [optional, property] boolean DrillDownOnDoubleClick; //------------------------------------------------------------------------- + + /** specifies a label for grand total results. + + @since OOo 3.4 + */ + [optional, property] string GrandTotalName; + + //------------------------------------------------------------------------- }; //============================================================================= |