Skip to content

C
core
Kaydet (Commit) 10ea2b7c authored tarafından Oliver Bolte's avatar Oliver Bolte
Dosyalara gözat
Seçenekler

INTEGRATION: CWS sb59 (1.6.24); FILE MERGED 

2006/08/09 12:53:55 sb 1.6.24.1: #i67487# Made code warning-free (wntmsci10).
üst b5113ffd
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 59 deletions
xmloff/source/style/backhdl.cxx
Dosyayı görüntüle @ 10ea2b7c
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: backhdl.cxx,v $ * $RCSfile: backhdl.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 10:52:01 $ * last change: $Author: obo $ $Date: 2006-10-12 14:47:24 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -92,7 +92,7 @@ XMLBackGraphicPositionPropHdl::~XMLBackGraphicPositionPropHdl() ...@@ -92,7 +92,7 @@ XMLBackGraphicPositionPropHdl::~XMLBackGraphicPositionPropHdl()
// Nothing to do // Nothing to do
} }
sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& )
{ {
sal_Bool bRet = sal_True; sal_Bool bRet = sal_True;
style::GraphicLocation ePos = style::GraphicLocation_NONE, eTmp; style::GraphicLocation ePos = style::GraphicLocation_NONE, eTmp;
...@@ -110,7 +110,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, ...@@ -110,7 +110,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue,
else if( -1 != aToken.indexOf( sal_Unicode('%') ) ) else if( -1 != aToken.indexOf( sal_Unicode('%') ) )
{ {
sal_Int32 nPrc = 50; sal_Int32 nPrc = 50;
if( rUnitConverter.convertPercent( nPrc, aToken ) ) if( SvXMLUnitConverter::convertPercent( nPrc, aToken ) )
{ {
if( !bHori ) if( !bHori )
{ {
...@@ -143,7 +143,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, ...@@ -143,7 +143,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue,
else else
ePos = style::GraphicLocation_MIDDLE_MIDDLE; ePos = style::GraphicLocation_MIDDLE_MIDDLE;
} }
else if( rUnitConverter.convertEnum( nTmp, aToken, pXML_BrushHorizontalPos ) ) else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, pXML_BrushHorizontalPos ) )
{ {
if( bVert ) if( bVert )
MergeXMLHoriPos( ePos, (style::GraphicLocation)nTmp ); MergeXMLHoriPos( ePos, (style::GraphicLocation)nTmp );
...@@ -154,7 +154,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, ...@@ -154,7 +154,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue,
bHori = sal_True; bHori = sal_True;
} }
else if( rUnitConverter.convertEnum( nTmp, aToken, pXML_BrushVerticalPos ) ) else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, pXML_BrushVerticalPos ) )
{ {
if( bHori ) if( bHori )
MergeXMLVertPos( ePos, (style::GraphicLocation)nTmp ); MergeXMLVertPos( ePos, (style::GraphicLocation)nTmp );
......
xmloff/source/style/breakhdl.cxx
Dosyayı görüntüle @ 10ea2b7c
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: breakhdl.cxx,v $ * $RCSfile: breakhdl.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 10:52:28 $ * last change: $Author: obo $ $Date: 2006-10-12 14:47:51 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -88,24 +88,32 @@ XMLFmtBreakBeforePropHdl::~XMLFmtBreakBeforePropHdl() ...@@ -88,24 +88,32 @@ XMLFmtBreakBeforePropHdl::~XMLFmtBreakBeforePropHdl()
// Nothing to do // Nothing to do
} }
sal_Bool XMLFmtBreakBeforePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLFmtBreakBeforePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False;
style::BreakType eBreak = style::BreakType_NONE;
sal_uInt16 nEnum; sal_uInt16 nEnum;
sal_Bool bRet = SvXMLUnitConverter::convertEnum( nEnum, rStrImpValue, pXML_BreakTypes );
if( ( bRet = rUnitConverter.convertEnum( nEnum, rStrImpValue, pXML_BreakTypes ) ) ) if( bRet )
{ {
if( nEnum != 0 ) style::BreakType eBreak;
eBreak = ( nEnum == 1 ) ? style::BreakType_COLUMN_BEFORE : style::BreakType_PAGE_BEFORE; switch ( nEnum )
{
case 0:
eBreak = style::BreakType_NONE;
break;
case 1:
eBreak = style::BreakType_COLUMN_BEFORE;
break;
default:
eBreak = style::BreakType_PAGE_BEFORE;
break;
}
rValue <<= eBreak; rValue <<= eBreak;
} }
return bRet; return bRet;
} }
sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
style::BreakType eBreak; style::BreakType eBreak;
...@@ -135,7 +143,7 @@ sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno: ...@@ -135,7 +143,7 @@ sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno:
} }
OUStringBuffer aOut; OUStringBuffer aOut;
/* sal_Bool bOk = */ rUnitConverter.convertEnum( aOut, nEnum, pXML_BreakTypes ); /* sal_Bool bOk = */ SvXMLUnitConverter::convertEnum( aOut, nEnum, pXML_BreakTypes );
rStrExpValue = aOut.makeStringAndClear(); rStrExpValue = aOut.makeStringAndClear();
return sal_True; return sal_True;
...@@ -151,24 +159,32 @@ XMLFmtBreakAfterPropHdl::~XMLFmtBreakAfterPropHdl() ...@@ -151,24 +159,32 @@ XMLFmtBreakAfterPropHdl::~XMLFmtBreakAfterPropHdl()
// Nothing to do // Nothing to do
} }
sal_Bool XMLFmtBreakAfterPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLFmtBreakAfterPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False;
style::BreakType eBreak = style::BreakType_NONE;
sal_uInt16 nEnum; sal_uInt16 nEnum;
sal_Bool bRet = SvXMLUnitConverter::convertEnum( nEnum, rStrImpValue, pXML_BreakTypes );
if( ( bRet = rUnitConverter.convertEnum( nEnum, rStrImpValue, pXML_BreakTypes ) ) ) if( bRet )
{ {
if( nEnum != 0 ) style::BreakType eBreak;
eBreak = ( nEnum == 1 ) ? style::BreakType_COLUMN_AFTER : style::BreakType_PAGE_AFTER; switch ( nEnum )
{
case 0:
eBreak = style::BreakType_NONE;
break;
case 1:
eBreak = style::BreakType_COLUMN_AFTER;
break;
default:
eBreak = style::BreakType_PAGE_AFTER;
break;
}
rValue <<= eBreak; rValue <<= eBreak;
} }
return bRet; return bRet;
} }
sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
style::BreakType eBreak; style::BreakType eBreak;
...@@ -198,7 +214,7 @@ sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno:: ...@@ -198,7 +214,7 @@ sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno::
} }
OUStringBuffer aOut; OUStringBuffer aOut;
/* sal_Bool bOk = */ rUnitConverter.convertEnum( aOut, nEnum, pXML_BreakTypes ); /* sal_Bool bOk = */ SvXMLUnitConverter::convertEnum( aOut, nEnum, pXML_BreakTypes );
rStrExpValue = aOut.makeStringAndClear(); rStrExpValue = aOut.makeStringAndClear();
return sal_True; return sal_True;
......
xmloff/source/style/cdouthdl.cxx
Dosyayı görüntüle @ 10ea2b7c
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: cdouthdl.cxx,v $ * $RCSfile: cdouthdl.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 10:52:42 $ * last change: $Author: obo $ $Date: 2006-10-12 14:48:07 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -121,13 +121,12 @@ XMLCrossedOutTypePropHdl::~XMLCrossedOutTypePropHdl() ...@@ -121,13 +121,12 @@ XMLCrossedOutTypePropHdl::~XMLCrossedOutTypePropHdl()
// nothing to do // nothing to do
} }
sal_Bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False;
sal_uInt16 eNewStrikeout; sal_uInt16 eNewStrikeout;
sal_Bool bRet = SvXMLUnitConverter::convertEnum(
if( ( bRet = rUnitConverter.convertEnum( eNewStrikeout, rStrImpValue, eNewStrikeout, rStrImpValue, pXML_CrossedoutType_Enum );
pXML_CrossedoutType_Enum ) ) ) if( bRet )
{ {
// multi property: style and width might be set already. // multi property: style and width might be set already.
// If the old value is NONE, the new is used unchanged. // If the old value is NONE, the new is used unchanged.
...@@ -173,7 +172,7 @@ sal_Bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno: ...@@ -173,7 +172,7 @@ sal_Bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno:
return bRet; return bRet;
} }
sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
sal_Int16 nValue = sal_Int16(); sal_Int16 nValue = sal_Int16();
...@@ -181,7 +180,9 @@ sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno: ...@@ -181,7 +180,9 @@ sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno:
if( (rValue >>= nValue) && FontStrikeout::DOUBLE==nValue ) if( (rValue >>= nValue) && FontStrikeout::DOUBLE==nValue )
{ {
if( ( bRet = rUnitConverter.convertEnum( aOut, (sal_uInt16)nValue, pXML_CrossedoutType_Enum ) ) ) bRet = SvXMLUnitConverter::convertEnum(
aOut, (sal_uInt16)nValue, pXML_CrossedoutType_Enum );
if( bRet )
rStrExpValue = aOut.makeStringAndClear(); rStrExpValue = aOut.makeStringAndClear();
} }
...@@ -198,13 +199,12 @@ XMLCrossedOutStylePropHdl::~XMLCrossedOutStylePropHdl() ...@@ -198,13 +199,12 @@ XMLCrossedOutStylePropHdl::~XMLCrossedOutStylePropHdl()
// nothing to do // nothing to do
} }
sal_Bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False;
sal_uInt16 eNewStrikeout; sal_uInt16 eNewStrikeout;
sal_Bool bRet = SvXMLUnitConverter::convertEnum(
if( ( bRet = rUnitConverter.convertEnum( eNewStrikeout, rStrImpValue, eNewStrikeout, rStrImpValue, pXML_CrossedoutStyle_Enum );
pXML_CrossedoutStyle_Enum ) ) ) if( bRet )
{ {
// multi property: style and width might be set already. // multi property: style and width might be set already.
// If the old value is NONE, the new is used unchanged. // If the old value is NONE, the new is used unchanged.
...@@ -223,7 +223,7 @@ sal_Bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno ...@@ -223,7 +223,7 @@ sal_Bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno
return bRet; return bRet;
} }
sal_Bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
sal_Int16 nValue = sal_Int16(); sal_Int16 nValue = sal_Int16();
...@@ -231,8 +231,9 @@ sal_Bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno ...@@ -231,8 +231,9 @@ sal_Bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno
if( rValue >>= nValue ) if( rValue >>= nValue )
{ {
if( ( bRet = rUnitConverter.convertEnum( aOut, (sal_uInt16)nValue, bRet = SvXMLUnitConverter::convertEnum(
pXML_CrossedoutStyle_Enum ) ) ) aOut, (sal_uInt16)nValue, pXML_CrossedoutStyle_Enum );
if( bRet )
rStrExpValue = aOut.makeStringAndClear(); rStrExpValue = aOut.makeStringAndClear();
} }
...@@ -249,13 +250,12 @@ XMLCrossedOutWidthPropHdl::~XMLCrossedOutWidthPropHdl() ...@@ -249,13 +250,12 @@ XMLCrossedOutWidthPropHdl::~XMLCrossedOutWidthPropHdl()
// nothing to do // nothing to do
} }
sal_Bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False;
sal_uInt16 eNewStrikeout; sal_uInt16 eNewStrikeout;
sal_Bool bRet = SvXMLUnitConverter::convertEnum(
if( ( bRet = rUnitConverter.convertEnum( eNewStrikeout, rStrImpValue, eNewStrikeout, rStrImpValue, pXML_CrossedoutWidth_Enum );
pXML_CrossedoutWidth_Enum ) ) ) if( bRet )
{ {
// multi property: style and width might be set already. // multi property: style and width might be set already.
// If the old value is NONE, the new is used unchanged. // If the old value is NONE, the new is used unchanged.
...@@ -295,7 +295,7 @@ sal_Bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno ...@@ -295,7 +295,7 @@ sal_Bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno
return bRet; return bRet;
} }
sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
sal_Int16 nValue = sal_Int16(); sal_Int16 nValue = sal_Int16();
...@@ -303,8 +303,9 @@ sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno ...@@ -303,8 +303,9 @@ sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno
if( (rValue >>= nValue) && (FontStrikeout::BOLD == nValue) ) if( (rValue >>= nValue) && (FontStrikeout::BOLD == nValue) )
{ {
if( ( bRet = rUnitConverter.convertEnum( aOut, (sal_uInt16)nValue, bRet = SvXMLUnitConverter::convertEnum(
pXML_CrossedoutWidth_Enum ) ) ) aOut, (sal_uInt16)nValue, pXML_CrossedoutWidth_Enum );
if( bRet )
rStrExpValue = aOut.makeStringAndClear(); rStrExpValue = aOut.makeStringAndClear();
} }
......
xmloff/source/style/chrhghdl.cxx
Dosyayı görüntüle @ 10ea2b7c
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: chrhghdl.cxx,v $ * $RCSfile: chrhghdl.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 10:52:54 $ * last change: $Author: obo $ $Date: 2006-10-12 14:48:21 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -122,13 +122,13 @@ XMLCharHeightPropHdl::~XMLCharHeightPropHdl() ...@@ -122,13 +122,13 @@ XMLCharHeightPropHdl::~XMLCharHeightPropHdl()
// nothing to do // nothing to do
} }
sal_Bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Int32 nPrc = 100; sal_Int32 nPrc = 100;
if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 ) if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 )
{ {
if( rUnitConverter.convertPercent( nPrc, rStrImpValue ) ) if( SvXMLUnitConverter::convertPercent( nPrc, rStrImpValue ) )
{ {
rValue <<= (sal_Int16)nPrc; rValue <<= (sal_Int16)nPrc;
return sal_True; return sal_True;
...@@ -138,14 +138,14 @@ sal_Bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any ...@@ -138,14 +138,14 @@ sal_Bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any
return sal_False; return sal_False;
} }
sal_Bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const sal_Bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
OUStringBuffer aOut( rStrExpValue ); OUStringBuffer aOut( rStrExpValue );
sal_Int16 nValue = sal_Int16(); sal_Int16 nValue = sal_Int16();
if( rValue >>= nValue ) if( rValue >>= nValue )
{ {
rUnitConverter.convertPercent( aOut, nValue ); SvXMLUnitConverter::convertPercent( aOut, nValue );
} }
rStrExpValue = aOut.makeStringAndClear(); rStrExpValue = aOut.makeStringAndClear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment