summaryrefslogtreecommitdiff
path: root/xmloff/source/style/PageMasterPropHdl.cxx
diff options
context:
space:
mode:
authorMichael Brauer <mib@openoffice.org>2001-03-19 08:41:43 +0000
committerMichael Brauer <mib@openoffice.org>2001-03-19 08:41:43 +0000
commit5cf764b8e670a7a4b1532a547a9e4d0b41704c77 (patch)
treec871a6871f3e9f565e0447dee17f6a41793bd1c8 /xmloff/source/style/PageMasterPropHdl.cxx
parent2f663725d595f6f24482cf80baddb0e7b4194d13 (diff)
new numbering types
Diffstat (limited to 'xmloff/source/style/PageMasterPropHdl.cxx')
-rw-r--r--xmloff/source/style/PageMasterPropHdl.cxx35
1 files changed, 17 insertions, 18 deletions
diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index b6eb7bf79e3d..d9107a2804a5 100644
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: PageMasterPropHdl.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: sab $ $Date: 2001-03-16 14:37:07 $
+ * last change: $Author: mib $ $Date: 2001-03-19 09:40:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -187,8 +187,9 @@ sal_Bool XMLPMPropHdl_NumFormat::importXML(
const SvXMLUnitConverter& rUnitConverter ) const
{
sal_Int16 nSync;
- sal_Int16 nNumType = SvxXMLListStyleContext::GetNumType(
- rStrImpValue, OUString(), NumberingType::NUMBER_NONE, sal_True );
+ sal_Int16 nNumType = NumberingType::NUMBER_NONE;
+ rUnitConverter.convertNumFormat( nNumType, rStrImpValue, OUString(),
+ sal_True );
if( !(rValue >>= nSync) )
nSync = NumberingType::NUMBER_NONE;
@@ -223,12 +224,10 @@ sal_Bool XMLPMPropHdl_NumFormat::exportXML(
if( rValue >>= nNumType )
{
- const char* pAsciiNumType = SvxXMLNumRuleExport::GetNumFormatValue( nNumType );
- if( pAsciiNumType )
- {
- rStrExpValue = OUString::createFromAscii( pAsciiNumType );
- bRet = sal_True;
- }
+ OUStringBuffer aBuffer( 10 );
+ rUnitConverter.convertNumFormat( aBuffer, nNumType );
+ rStrExpValue = aBuffer.makeStringAndClear();
+ bRet = rStrExpValue.getLength() > 0;
}
return bRet;
}
@@ -247,8 +246,10 @@ sal_Bool XMLPMPropHdl_NumLetterSync::importXML(
const SvXMLUnitConverter& rUnitConverter ) const
{
sal_Int16 nNumType;
- sal_Int16 nSync = SvxXMLListStyleContext::GetNumType(
- OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_a ) ), rStrImpValue );
+ sal_Int16 nSync = NumberingType::NUMBER_NONE;
+ rUnitConverter.convertNumFormat( nSync, rStrImpValue,
+ OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_a ) ),
+ sal_True );
if( !(rValue >>= nNumType) )
nNumType = NumberingType::NUMBER_NONE;
@@ -280,12 +281,10 @@ sal_Bool XMLPMPropHdl_NumLetterSync::exportXML(
if( rValue >>= nNumType )
{
- const char* pAsciiNumType = SvxXMLNumRuleExport::GetNumLetterSync( nNumType );
- if( pAsciiNumType )
- {
- rStrExpValue = OUString::createFromAscii( pAsciiNumType );
- bRet = sal_True;
- }
+ OUStringBuffer aBuffer( 5 );
+ rUnitConverter.convertNumLetterSync( aBuffer, nNumType );
+ rStrExpValue = aBuffer.makeStringAndClear();
+ bRet = rStrExpValue.getLength() > 0;
}
return bRet;
}