summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-05 08:47:31 +0200
committerNoel Grandin <noel@peralex.com>2015-01-05 12:57:18 +0200
commit8130714148d58dd2bf1ef12dcc6dd6d5838be0d1 (patch)
treebf8cf91d9837b9d03e1e3e336be7eb35667d4de9 /sw
parent54942f0d093e42b06c7a6c10e93d632bfe0c6519 (diff)
fdo#84938: replace NUMBERFORMAT_INT_ constants with 'enum class'
Change-Id: I9c67de31f5571b282adc132d973b79bccb35fdc9
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/edit/edglss.cxx4
-rw-r--r--sw/source/core/unocore/unoobj.cxx4
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx3
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx6
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx6
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx6
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx4
9 files changed, 24 insertions, 23 deletions
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 9df9e667f016..f67c3dfd16ce 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -290,9 +290,9 @@ bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
{
SvMemoryStream aStream;
#ifdef OSL_BIGENDIAN
- aStream.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
+ aStream.SetEndian( SvStreamEndian::BIG );
#else
- aStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ aStream.SetEndian( SvStreamEndian::LITTLE );
#endif
WriterRef xWrt;
SwReaderWriter::GetWriter( OUString(FILTER_TEXT), OUString(), xWrt );
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index da3d5eadf10a..fdaf53d41f6d 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -167,9 +167,9 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
}
SvMemoryStream aStream;
#ifdef OSL_BIGENDIAN
- aStream.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
+ aStream.SetEndian( SvStreamEndian::BIG );
#else
- aStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ aStream.SetEndian( SvStreamEndian::LITTLE );
#endif
WriterRef xWrt;
// TODO/MBA: looks like a BaseURL doesn't make sense here
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index e8cae7477a7a..66a671622c04 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -157,10 +157,11 @@ sal_uLong SwASCWriter::WriteStream()
Strm().WriteUChar( 0xEF ).WriteUChar( 0xBB ).WriteUChar( 0xBF );
break;
case RTL_TEXTENCODING_UCS2:
- Strm().SetEndianSwap(false);
#ifdef OSL_LITENDIAN
+ Strm().SetEndian(SvStreamEndian::LITTLE);
Strm().WriteUChar( 0xFF ).WriteUChar( 0xFE );
#else
+ Strm().SetEndian(SvStreamEndian::BIG);
Strm().WriteUChar( 0xFE ).WriteUChar( 0xFF );
#endif
break;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 3f2707fe4cf9..e79dd9d8f54e 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1447,7 +1447,7 @@ void WW8Export::CreateEscher()
{
OSL_ENSURE( !pEscher, "wer hat den Pointer nicht geloescht?" );
SvMemoryStream* pEscherStrm = new SvMemoryStream;
- pEscherStrm->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ pEscherStrm->SetEndian(SvStreamEndian::LITTLE);
pEscher = new SwEscherEx(pEscherStrm, *this);
}
}
@@ -1495,7 +1495,7 @@ SvStream* SwEscherExGlobal::ImplQueryPictureStream()
{
// this function will be called exactly once
mxPicStrm.reset( new SvMemoryStream );
- mxPicStrm->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ mxPicStrm->SetEndian(SvStreamEndian::LITTLE);
return mxPicStrm.get();
}
@@ -2113,7 +2113,7 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType
{
Polygon aPoly = CorrectWordWrapPolygonForExport(*pPolyPoly, pNd);
SvMemoryStream aPolyDump;
- aPolyDump.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ aPolyDump.SetEndian(SvStreamEndian::LITTLE);
sal_uInt16 nLen = aPoly.GetSize();
aPolyDump.WriteUInt16( nLen );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 134b4aebbfc6..c45b7e97c924 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3151,15 +3151,15 @@ void WW8Export::ExportDocument_Impl()
xDataStrm->SetBufferSize( 32768 ); // for graphics
xTableStrm->SetBufferSize( 16384 ); // for the Font-/Style-Table, etc.
- xTableStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
- xDataStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ xTableStrm->SetEndian( SvStreamEndian::LITTLE );
+ xDataStrm->SetEndian( SvStreamEndian::LITTLE );
}
GetWriter().SetStream( & *xWwStrm );
pTableStrm = &xTableStrm;
pDataStrm = &xDataStrm;
- Strm().SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ Strm().SetEndian( SvStreamEndian::LITTLE );
utl::TempFile aTempMain;
aTempMain.EnableKillingFile();
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index cb60ebf19b13..680d26251f92 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -37,7 +37,7 @@ WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion,
SvStorage *pStg)
: pGlossary(0), rStrm(refStrm), xStg(pStg), nStrings(0)
{
- refStrm->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ refStrm->SetEndian(SvStreamEndian::LITTLE);
WW8Fib aWwFib(*refStrm, nVersion);
if (aWwFib.nFibBack >= 0x6A) //Word97
@@ -47,7 +47,7 @@ WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion,
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
{
- xTableStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ xTableStream->SetEndian(SvStreamEndian::LITTLE);
pGlossary =
new WW8GlossaryFib(*refStrm, nVersion, *xTableStream, aWwFib);
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f94ecbddfec9..1d7dcad7481b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4237,7 +4237,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
, maCurrAttrCP(-1)
, mbOnLoadingMain(false)
{
- pStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ pStrm->SetEndian( SvStreamEndian::LITTLE );
maApos.push_back(false);
}
@@ -4842,13 +4842,13 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() );
// Read toolbars & menus
SvStorageStreamRef refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" ));
- refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ refMainStream->SetEndian(SvStreamEndian::LITTLE);
WW8Fib aWwFib( *refMainStream, 8 );
SvStorageStreamRef xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
{
- xTableStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ xTableStream->SetEndian(SvStreamEndian::LITTLE);
WW8Customizations aGblCustomisations( xTableStream, aWwFib );
aGblCustomisations.Import( mpDocShell );
}
@@ -5368,7 +5368,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
STREAM_STD_READ);
pTableStream = &rTableStream;
- pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ pTableStream->SetEndian( SvStreamEndian::LITTLE );
rDataStream = pStg->OpenSotStream(OUString(SL::aData),
STREAM_STD_READ | STREAM_NOCREATE );
@@ -5376,7 +5376,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
{
pDataStream = &rDataStream;
- pDataStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+ pDataStream->SetEndian(SvStreamEndian::LITTLE);
}
else
pDataStream = pStrm;
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index bc48b2932b41..afa58466ef4d 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -85,7 +85,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( OUString("\3PIC"),
STREAM_STD_READ | STREAM_NOCREATE);
SvStorageStream* pS = xSrc3;
- pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ pS->SetEndian( SvStreamEndian::LITTLE );
pS->Seek( STREAM_SEEK_TO_END );
OSL_ENSURE( pS->Tell() >= 76, "+OLE-PIC-Stream is shorter than 76 Byte" );
@@ -130,7 +130,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"),
STREAM_STD_READ | STREAM_NOCREATE);
SvStorageStream* pSt = xSrc2;
- pSt->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ pSt->SetEndian( SvStreamEndian::LITTLE );
sal_uLong nRead = pSt->Read( pMfp, sizeof(*pMfp ) );
// Mini-Placable-Header lesen
if (nRead != sizeof(*pMfp))
@@ -184,7 +184,7 @@ static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
// 03-META-Stream nicht da. Vielleicht ein 03-PICT ?
SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT"));
SvStorageStream* pStp = xSrc4;
- pStp->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ pStp->SetEndian( SvStreamEndian::LITTLE );
sal_uInt8 aTestA[10]; // Ist der 01Ole-Stream ueberhaupt vorhanden
sal_uLong nReadTst = pStp->Read( aTestA, sizeof( aTestA ) );
if (nReadTst != sizeof(aTestA))
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 41603a2ba010..3ff1a1e54b44 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1645,9 +1645,9 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
sData.getLength() * sizeof( sal_Unicode ),
STREAM_READ );
#ifdef OSL_BIGENDIAN
- pStream->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
+ pStream->SetEndian( SvStreamEndian::BIG );
#else
- pStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+ pStream->SetEndian( SvStreamEndian::LITTLE );
#endif
SwAsciiOptions aAOpt;