diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-17 15:27:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-17 15:27:47 +0000 |
| commit | 01f5c5534bbce8de7042ed3a176dc92f072cebf4 (patch) | |
| tree | 819241a21d008724071c2097be3e21a53088ae39 /xmloff | |
| parent | cc0e3d0d3e4c4887ab194fac8a017f8ebd7824d1 (diff) | |
INTEGRATION: CWS hbqea101 (1.4.310); FILE MERGED
2004/05/05 12:45:21 hbrinkm 1.4.310.2: #i27615#
2004/05/05 09:41:34 hbrinkm 1.4.310.1: #i21237# new property for index tab stop entry: with-tab
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLIndexTabStopEntryContext.cxx | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index b9b536370b97..c7b30d8f5222 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexTabStopEntryContext.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dvo $ $Date: 2001-07-02 10:18:42 $ + * last change: $Author: rt $ $Date: 2004-05-17 16:27:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,7 +104,6 @@ #include <tools/debug.hxx> #endif - using namespace ::xmloff::token; using ::rtl::OUString; @@ -128,7 +127,8 @@ XMLIndexTabStopEntryContext::XMLIndexTabStopEntryContext( nTabPosition(0), bTabPositionOK(sal_False), bTabRightAligned(sal_False), - bLeaderCharOK(sal_False) + bLeaderCharOK(sal_False), + bWithTab(sal_True) // #i21237# { } @@ -173,13 +173,20 @@ void XMLIndexTabStopEntryContext::StartElement( // valid only, if we have a char! bLeaderCharOK = (sAttr.getLength() > 0); } + // #i21237# + else if ( IsXMLToken( sLocalName, XML_WITH_TAB ) ) + { + sal_Bool bTmp; + if (SvXMLUnitConverter::convertBool(bTmp, sAttr)) + bWithTab = bTmp; + } // else: unknown style: attribute -> ignore } // else: no style attribute -> ignore } - // how many entries? - nValues += 1 + (bTabPositionOK ? 1 : 0) + (bLeaderCharOK ? 1 : 0); + // how many entries? #i21237# + nValues += 2 + (bTabPositionOK ? 1 : 0) + (bLeaderCharOK ? 1 : 0); // now try parent class (for character style) XMLIndexSimpleEntryContext::StartElement( xAttrList ); @@ -217,6 +224,13 @@ void XMLIndexTabStopEntryContext::FillPropertyValues( nNextEntry++; } + // tab character #i21237# + pValues[nNextEntry].Name = + OUString( RTL_CONSTASCII_USTRINGPARAM("WithTab") ); + pValues[nNextEntry].Value.setValue( &bWithTab, + ::getBooleanCppuType()); + nNextEntry++; + // check whether we really filled all elements of the sequence DBG_ASSERT( nNextEntry == rValues.getLength(), "length incorrectly precumputed!" ); |