summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx6
-rw-r--r--sw/source/filter/xml/swxml.cxx28
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlexp.hxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx30
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx8
-rw-r--r--sw/source/filter/xml/xmlitem.cxx6
-rw-r--r--sw/source/filter/xml/xmlitem.hxx6
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx4
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx4
-rw-r--r--sw/source/filter/xml/xmltble.cxx4
-rw-r--r--sw/source/filter/xml/xmltbli.cxx8
-rw-r--r--sw/source/filter/xml/xmltbli.hxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx6
17 files changed, 68 insertions, 68 deletions
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 2b9e95d10c26..21c9a3b93c75 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -667,8 +667,8 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
// create redline (using pRedlineData which gets copied in SwRedline())
SwRedlineData* pRedlineData = ConvertRedline(pRedlineInfo, pDoc);
SwRedline* pRedline =
- new SwRedline( pRedlineData, *aPaM.GetPoint(), TRUE,
- !pRedlineInfo->bMergeLastParagraph, FALSE );
+ new SwRedline( pRedlineData, *aPaM.GetPoint(), sal_True,
+ !pRedlineInfo->bMergeLastParagraph, sal_False );
// set mark
if( aPaM.HasMark() )
@@ -680,7 +680,7 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
// set content node (if necessary)
if (NULL != pRedlineInfo->pContentIndex)
{
- ULONG nPoint = aPaM.GetPoint()->nNode.GetIndex();
+ sal_uLong nPoint = aPaM.GetPoint()->nNode.GetIndex();
if( nPoint < pRedlineInfo->pContentIndex->GetIndex() ||
nPoint > pRedlineInfo->pContentIndex->GetNode().EndOfSectionIndex() )
pRedline->SetContentIdx(pRedlineInfo->pContentIndex);
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 92b0c08e3b8d..98ae19039002 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -121,8 +121,8 @@ void lcl_EnsureValidPam( SwPaM& rPam )
// else: point was already valid
// if mark is invalid, we delete it
- if( ( rPam.GetCntntNode( FALSE ) == NULL ) ||
- ( rPam.GetCntntNode( FALSE ) != rPam.GetMark()->nContent.GetIdxReg() ) )
+ if( ( rPam.GetCntntNode( sal_False ) == NULL ) ||
+ ( rPam.GetCntntNode( sal_False ) != rPam.GetMark()->nContent.GetIdxReg() ) )
{
rPam.DeleteMark();
}
@@ -416,7 +416,7 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
String aDefOutlStyleNames[ MAXLEVEL ];
{
String sStyleName;
- for ( BYTE i = 0; i < MAXLEVEL; ++i )
+ for ( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
{
sStyleName =
SwStyleNameMapper::GetProgName( static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i),
@@ -431,7 +431,7 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
SwTxtFmtColl* aCreatedDefaultOutlineStyles[ MAXLEVEL ];
{
- for ( BYTE i = 0; i < MAXLEVEL; ++i )
+ for ( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
{
aOutlineLevelAssigned[ i ] = false;
aCreatedDefaultOutlineStyles[ i ] = 0L;
@@ -441,7 +441,7 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
// determine, which outline level has already a style assigned and
// which of the default outline styles is created.
const SwTxtFmtColls& rColls = *(_rDoc.GetTxtFmtColls());
- for ( USHORT n = 1; n < rColls.Count(); ++n )
+ for ( sal_uInt16 n = 1; n < rColls.Count(); ++n )
{
SwTxtFmtColl* pColl = rColls[ n ];
//if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei
@@ -451,7 +451,7 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;//<-end,zhaojianwei
}
- for ( BYTE i = 0; i < MAXLEVEL; ++i )
+ for ( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
{
if ( aCreatedDefaultOutlineStyles[ i ] == 0L &&
pColl->GetName() == aDefOutlStyleNames[i] )
@@ -465,7 +465,7 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
// assign already created default outline style to outline level, which
// doesn't have a style assigned to it.
const SwNumRule* pOutlineRule = _rDoc.GetOutlineNumRule();
- for ( BYTE i = 0; i < MAXLEVEL; ++i )
+ for ( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
{
// --> OD 2007-01-11 #i73361#
// Do not change assignment of already created default outline style
@@ -482,7 +482,7 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
// apply outline numbering rule, if none is set.
const SfxPoolItem& rItem =
- aCreatedDefaultOutlineStyles[ i ]->GetFmtAttr( RES_PARATR_NUMRULE, FALSE );
+ aCreatedDefaultOutlineStyles[ i ]->GetFmtAttr( RES_PARATR_NUMRULE, sal_False );
if ( static_cast<const SwNumRuleItem&>(rItem).GetValue().Len() == 0 )
{
SwNumRuleItem aItem( pOutlineRule->GetName() );
@@ -535,7 +535,7 @@ void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc )
// <--
-ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const String & rName )
+sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const String & rName )
{
// Get service factory
uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
@@ -665,7 +665,7 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S
// Note: Text documents read via the binary filter are also finally
// read using the OpenOffice.org file format. Thus, e.g. for text
// documents in StarOffice 5.2 binary file format this property
- // will be TRUE.
+ // will be sal_True.
{ "TextDocInOOoFileFormat", sizeof("TextDocInOOoFileFormat")-1, 0,
&::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
@@ -976,9 +976,9 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S
// Notify math objects
if( bInsertMode )
- rDoc.PrtOLENotify( FALSE );
+ rDoc.PrtOLENotify( sal_False );
else if ( rDoc.IsOLEPrtNotifyPending() )
- rDoc.PrtOLENotify( TRUE );
+ rDoc.PrtOLENotify( sal_True );
nRet = nRet ? nRet : (nWarn ? nWarn : (nWarn2 ? nWarn2 : nWarnRDF ) );
@@ -1036,7 +1036,7 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S
// <--
// Fix #i58251#: Unfortunately is the static default different to SO7 behaviour,
// so we have to set a dynamic default after importing SO7
- rDoc.SetDefault( SfxBoolItem( RES_ROW_SPLIT, FALSE ) );
+ rDoc.SetDefault( SfxBoolItem( RES_ROW_SPLIT, sal_False ) );
}
// <--
@@ -1081,7 +1081,7 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S
// read the sections of the document, which is equal to the medium.
// returns the count of it
-USHORT XMLReader::GetSectionList( SfxMedium& rMedium,
+sal_uInt16 XMLReader::GetSectionList( SfxMedium& rMedium,
SvStrings& rStrings ) const
{
uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 4107657e8554..1f64db9fdae8 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -539,17 +539,17 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
return 0;
}
-ULONG SwXMLWriter::WriteStorage()
+sal_uLong SwXMLWriter::WriteStorage()
{
return _Write();
}
-ULONG SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium )
+sal_uLong SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium )
{
return _Write( &aTargetMedium );
}
-ULONG SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
+sal_uLong SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
const String* pFileName )
{
return IsStgWriter()
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index b5dbe191776b..97e073a02f91 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -52,15 +52,15 @@ class SwXMLWriter : public StgWriter
using StgWriter::Write;
protected:
- virtual ULONG WriteStorage();
- virtual ULONG WriteMedium( SfxMedium& aTargetMedium );
+ virtual sal_uLong WriteStorage();
+ virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium );
public:
SwXMLWriter( const String& rBaseURL );
virtual ~SwXMLWriter();
- virtual ULONG Write( SwPaM&, SfxMedium&, const String* = 0 );
+ virtual sal_uLong Write( SwPaM&, SfxMedium&, const String* = 0 );
private:
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 5568995c5ca3..12a272e62bda 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -100,7 +100,7 @@ class SwXMLExport : public SvXMLExport
SwXMLTableInfo_Impl& rTblInfo );
void ExportTableLines( const SwTableLines& rLines,
SwXMLTableInfo_Impl& rTblInfo,
- USHORT nHeaderRows = 0 );
+ sal_uInt16 nHeaderRows = 0 );
virtual void _ExportMeta();
virtual void _ExportFontDecls();
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index a883f8dbae2a..279df96eb7cb 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -881,7 +881,7 @@ void SwXMLImport::endDocument( void )
if( !pPos->nContent.GetIndex() )
{
SwTxtNode* pCurrNd;
- ULONG nNodeIdx = pPos->nNode.GetIndex();
+ sal_uLong nNodeIdx = pPos->nNode.GetIndex();
pDoc = pPaM->GetDoc();
DBG_ASSERT( pPos->nNode.GetNode().IsCntntNode(),
@@ -961,9 +961,9 @@ void SwXMLImport::endDocument( void )
// Notify math objects. If we are in the package filter this will
// be done by the filter object itself
if( IsInsertMode() )
- pDoc->PrtOLENotify( FALSE );
+ pDoc->PrtOLENotify( sal_False );
else if ( pDoc->IsOLEPrtNotifyPending() )
- pDoc->PrtOLENotify( TRUE );
+ pDoc->PrtOLENotify( sal_True );
}
// SJ: #i49801# -> now permitting repaints
@@ -1216,7 +1216,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
const PropertyValue* pValues = aConfigProps.getConstArray();
SvtSaveOptions aSaveOpt;
- BOOL bIsUserSetting = aSaveOpt.IsLoadUserSettings(),
+ sal_Bool bIsUserSetting = aSaveOpt.IsLoadUserSettings(),
bSet = bIsUserSetting;
// for some properties we don't want to use the application
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index adbaf90e11df..c7e50f9fe8b1 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -68,7 +68,7 @@ using uno::Any;
SvXMLImportItemMapper::SvXMLImportItemMapper(
SvXMLItemMapEntriesRef rMapEntries,
- USHORT nUnknWhich ) :
+ sal_uInt16 nUnknWhich ) :
mrMapEntries( rMapEntries ),
nUnknownWhich( nUnknWhich )
{
@@ -84,14 +84,14 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap ) const
{
- INT16 nAttr = xAttrList->getLength();
+ sal_Int16 nAttr = xAttrList->getLength();
SvXMLAttrContainerItem *pUnknownItem = 0;
- for( INT16 i=0; i < nAttr; i++ )
+ for( sal_Int16 i=0; i < nAttr; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
OUString aLocalName, aPrefix, aNamespace;
- USHORT nPrefix =
+ sal_uInt16 nPrefix =
rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix, &aLocalName,
&aNamespace );
if( XML_NAMESPACE_XMLNS == nPrefix )
@@ -110,7 +110,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
{
// first get item from itemset
const SfxPoolItem* pItem = 0;
- SfxItemState eState = rSet.GetItemState( pEntry->nWhichId, TRUE,
+ SfxItemState eState = rSet.GetItemState( pEntry->nWhichId, sal_True,
&pItem );
// if its not set, try the pool
@@ -121,7 +121,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
if(eState >= SFX_ITEM_DEFAULT && pItem)
{
SfxPoolItem *pNewItem = pItem->Clone();
- BOOL bPut = FALSE;
+ sal_Bool bPut = sal_False;
if( 0 == (pEntry->nMemberId&MID_SW_FLAG_SPECIAL_ITEM_IMPORT) )
{
@@ -161,7 +161,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
if( !pUnknownItem )
{
const SfxPoolItem* pItem = 0;
- if( SFX_ITEM_SET == rSet.GetItemState( nUnknownWhich, TRUE,
+ if( SFX_ITEM_SET == rSet.GetItemState( nUnknownWhich, sal_True,
&pItem ) )
{
SfxPoolItem *pNew = pItem->Clone();
@@ -198,7 +198,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
/** this method is called for every item that has the
MID_SW_FLAG_SPECIAL_ITEM_IMPORT flag set */
-BOOL
+sal_Bool
SvXMLImportItemMapper::handleSpecialItem( const SvXMLItemMapEntry& /*rEntry*/,
SfxPoolItem& /*rItem*/,
SfxItemSet& /*rSet*/,
@@ -207,19 +207,19 @@ SvXMLImportItemMapper::handleSpecialItem( const SvXMLItemMapEntry& /*rEntry*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const
{
DBG_ERROR( "unsuported special item in xml import" );
- return FALSE;
+ return sal_False;
}
/** this method is called for every item that has the
MID_SW_FLAG_NO_ITEM_IMPORT flag set */
-BOOL SvXMLImportItemMapper::handleNoItem( const SvXMLItemMapEntry& /*rEntry*/,
+sal_Bool SvXMLImportItemMapper::handleNoItem( const SvXMLItemMapEntry& /*rEntry*/,
SfxItemSet& /*rSet*/,
const OUString& /*rValue*/,
const SvXMLUnitConverter& /*rUnitConverter*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const
{
DBG_ERROR( "unsuported no item in xml import" );
- return FALSE;
+ return sal_False;
}
void SvXMLImportItemMapper::finished( SfxItemSet& ) const
@@ -393,7 +393,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
if( nX < 0 ) nX *= -1;
if( nY < 0 ) nY *= -1;
- pShadow->SetWidth( static_cast< USHORT >( (nX + nY) >> 1 ) );
+ pShadow->SetWidth( static_cast< sal_uInt16 >( (nX + nY) >> 1 ) );
}
}
}
@@ -598,12 +598,12 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
switch( nMemberId )
{
case MID_BREAK_BEFORE:
- pFmtBreak->SetValue( static_cast< USHORT >((eEnum == 1) ?
+ pFmtBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ?
SVX_BREAK_COLUMN_BEFORE :
SVX_BREAK_PAGE_BEFORE) );
break;
case MID_BREAK_AFTER:
- pFmtBreak->SetValue( static_cast< USHORT >((eEnum == 1) ?
+ pFmtBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ?
SVX_BREAK_COLUMN_AFTER :
SVX_BREAK_PAGE_AFTER) );
break;
@@ -785,7 +785,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
sal_Int32 nVal;
bOk = rUnitConverter.convertNumber( nVal, rValue, 0, USHRT_MAX );
if( bOk )
- pPageDesc->SetNumOffset( (USHORT)nVal );
+ pPageDesc->SetNumOffset( (sal_uInt16)nVal );
}
}
break;
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index f9f9e746e126..703c0372392a 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -47,11 +47,11 @@ class SvXMLImportItemMapper
{
protected:
SvXMLItemMapEntriesRef mrMapEntries;
- USHORT nUnknownWhich;
+ sal_uInt16 nUnknownWhich;
public:
SvXMLImportItemMapper( SvXMLItemMapEntriesRef rMapEntries ,
- USHORT nUnknWhich=USHRT_MAX );
+ sal_uInt16 nUnknWhich=USHRT_MAX );
virtual ~SvXMLImportItemMapper();
/** fills the given itemset with the attributes in the given list */
@@ -62,7 +62,7 @@ public:
/** this method is called for every item that has the
MID_SW_FLAG_SPECIAL_ITEM_IMPORT flag set */
- virtual BOOL handleSpecialItem( const SvXMLItemMapEntry& rEntry,
+ virtual sal_Bool handleSpecialItem( const SvXMLItemMapEntry& rEntry,
SfxPoolItem& rItem,
SfxItemSet& rSet,
const ::rtl::OUString& rValue,
@@ -71,7 +71,7 @@ public:
/** this method is called for every item that has the
MID_SW_FLAG_NO_ITEM_IMPORT flag set */
- virtual BOOL handleNoItem( const SvXMLItemMapEntry& rEntry,
+ virtual sal_Bool handleNoItem( const SvXMLItemMapEntry& rEntry,
SfxItemSet& rSet,
const ::rtl::OUString& rValue,
const SvXMLUnitConverter& rUnitConverter,
diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index 76baffc198c1..bc040877cee6 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -35,7 +35,7 @@
using ::rtl::OUString;
using namespace ::com::sun::star;
-SvXMLItemSetContext::SvXMLItemSetContext( SvXMLImport& rImp, USHORT nPrfx,
+SvXMLItemSetContext::SvXMLItemSetContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
SfxItemSet& rISet,
@@ -55,7 +55,7 @@ SvXMLItemSetContext::~SvXMLItemSetContext()
{
}
-SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -77,7 +77,7 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
CreateChildContext if the element matches an entry in the
SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT
*/
-SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/,
SfxItemSet& /*rItemSet*/,
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 013afdb804b5..2d3e06bec48e 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -49,7 +49,7 @@ protected:
public:
- SvXMLItemSetContext( SvXMLImport& rImport, USHORT nPrfx,
+ SvXMLItemSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
SfxItemSet& rItemSet,
@@ -58,14 +58,14 @@ public:
virtual ~SvXMLItemSetContext();
- virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
// This method is called from this instance implementation of
// CreateChildContext if the element matches an entry in the
// SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT_ITEM_IMPORT
- virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
SfxItemSet& rItemSet,
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index fa674798eef3..1a421e6ca5ba 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -146,7 +146,7 @@ public:
const SvXMLUnitConverter& rUnitConv );
virtual ~SwXMLItemSetContext_Impl();
- virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const ::rtl::OUString& rLocalName,
const ::uno::Reference< xml::sax::XAttributeList > & xAttrList,
SfxItemSet& rItemSet,
diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx
index 6a92fa50efd5..0f9f05b1ab16 100644
--- a/sw/source/filter/xml/xmlitmpr.cxx
+++ b/sw/source/filter/xml/xmlitmpr.cxx
@@ -79,12 +79,12 @@ SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace,
return (pMap->eLocalName != XML_TOKEN_INVALID) ? pMap : NULL;
}
-SvXMLItemMapEntry* SvXMLItemMapEntries::getByIndex( UINT16 nIndex ) const
+SvXMLItemMapEntry* SvXMLItemMapEntries::getByIndex( sal_uInt16 nIndex ) const
{
return &mpImpl->mpEntries[nIndex];
}
-UINT16 SvXMLItemMapEntries::getCount() const
+sal_uInt16 SvXMLItemMapEntries::getCount() const
{
return mpImpl->mnCount;
}
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 0d3adfd46c77..c337e231017a 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -113,8 +113,8 @@ static __FAR_DATA SvXMLTokenMapEntry aMetaStatAttrTokenMap[] =
struct statistic {
SvXMLTokenMapAttrs token;
const char* name;
- USHORT SwDocStat::* target16;
- ULONG SwDocStat::* target32; /* or 64, on LP64 platforms */
+ sal_uInt16 SwDocStat::* target16;
+ sal_uLong SwDocStat::* target32; /* or 64, on LP64 platforms */
};
static const struct statistic s_stats [] = {
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 3b55e6f81697..9180f910b09b 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -637,7 +637,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
pColumn->SetWidthOpt( nColAbsWidth, sal_False );
}
- ULONG nExpPos = 0;
+ sal_uLong nExpPos = 0;
if( rExpCols.Seek_Entry( pColumn, &nExpPos ) )
{
pColumn->SetStyleName(
@@ -1025,7 +1025,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
void SwXMLExport::ExportTableLines( const SwTableLines& rLines,
SwXMLTableInfo_Impl& rTblInfo,
- USHORT nHeaderRows )
+ sal_uInt16 nHeaderRows )
{
ASSERT( pTableLines && pTableLines->Count(),
"SwXMLExport::ExportTableLines: table columns infos missing" );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index b83d5fcca0c0..397ac1bda534 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2111,7 +2111,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
{
// default num format?
const SfxPoolItem* pItem = NULL;
- if( pBoxFmt2->GetItemState( RES_BOXATR_FORMAT, FALSE, &pItem )
+ if( pBoxFmt2->GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem )
== SFX_ITEM_SET )
{
const SwTblBoxNumFormat* pNumFormat =
@@ -2166,7 +2166,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
// Solution: the number format will be removed,
// the cell gets the default text format.
const SfxPoolItem* pItem = NULL;
- if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, FALSE, &pItem )
+ if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem )
== SFX_ITEM_SET )
{
const SwDoc* pDoc = pBoxFmt->GetDoc();
@@ -2842,10 +2842,10 @@ void SwXMLTableContext::MakeTable()
// 3) create new DDE table, and
SwDDETable* pDDETable = new SwDDETable( pTableNode->GetTable(),
- pFldType, FALSE );
+ pFldType, sal_False );
// 4) set new (DDE)table at node.
- pTableNode->SetNewTable(pDDETable, FALSE);
+ pTableNode->SetNewTable(pDDETable, sal_False);
}
// ??? this is always false: root frame is only created in ViewShell::Init
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 89c3996bc566..3df8a8b8e41b 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -99,7 +99,7 @@ class SwXMLTableContext : public XMLTextTableContext
sal_Bool bRelWidth : 1;
sal_Bool bHasSubTables : 1;
- USHORT nHeaderRows;
+ sal_uInt16 nHeaderRows;
sal_uInt32 nCurRow;
sal_uInt32 nCurCol;
sal_Int32 nWidth;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 2e22743fd1ee..775f23b6aa40 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -602,7 +602,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
while ( i > 0 )
{
beans::PropertyValue& aProp = aProps[--i];
- USHORT nType2 = SwApplet_Impl::GetOptionType( aProp.Name, TRUE );
+ sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True );
if ( nType2 == SWHTML_OPTTYPE_TAG)
{
::rtl::OUString aStr2;
@@ -698,7 +698,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
while ( i > 0 )
{
beans::PropertyValue& aProp = aProps[--i];
- USHORT nType2 = SwApplet_Impl::GetOptionType( aProp.Name, TRUE );
+ sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True );
if (SWHTML_OPTTYPE_PARAM == nType2 || SWHTML_OPTTYPE_SIZE == nType2 )
{
::rtl::OUString aStr;
@@ -724,7 +724,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
while ( i > 0 )
{
beans::PropertyValue& aProp = aProps[--i];
- USHORT nType2 = SwApplet_Impl::GetOptionType( aProp.Name, FALSE );
+ sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_False );
if ( nType2 == SWHTML_OPTTYPE_TAG)
{
::rtl::OUString aStr;
generated by cgit (git 2.34.1) at 2024-07-18 17:25:13 +0000