diff options
84 files changed, 326 insertions, 245 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index b51bb319862e..4a381cb920c2 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -127,7 +127,6 @@ private: { UINT8 nDelim, nDummy, nLen, nData; UINT16 nOpcode; - int nCount = 0; OUStringBuffer sBuf( MAXCHARS ); sal_Int32 nChars = 0; @@ -233,7 +232,6 @@ sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::s pValue[i].Value >>= xInputStream; else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) pValue[i].Value >>= sURL; - rtl_TextEncoding encoding = RTL_TEXTENCODING_INFO_ASCII; } if ( !xInputStream.is() ) { @@ -244,9 +242,9 @@ sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::s OString sFileName; sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII); - SvFileStream inputStream( sURL, STREAM_READ ); - if ( inputStream.IsEof() || ( inputStream.GetError() != SVSTREAM_OK ) ) - return sal_False; + SvFileStream inputStream( sURL, STREAM_READ ); + if ( inputStream.IsEof() || ( inputStream.GetError() != SVSTREAM_OK ) ) + return sal_False; // An XML import service: what we push sax messages to.. OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLImporter" ) ); @@ -300,33 +298,31 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc pValue[i].Value >>= xInputStream; else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) pValue[i].Value >>= sURL; - - rtl_TextEncoding encoding = RTL_TEXTENCODING_INFO_ASCII; } - uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv; - if (!xInputStream.is()) - { - try - { - ::ucbhelper::Content aContent(sURL, xEnv); - xInputStream = aContent.openStream(); - } - catch ( Exception& ) - { - return ::rtl::OUString(); - } + uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv; + if (!xInputStream.is()) + { + try + { + ::ucbhelper::Content aContent(sURL, xEnv); + xInputStream = aContent.openStream(); + } + catch ( Exception& ) + { + return ::rtl::OUString(); + } - if (!xInputStream.is()) - return ::rtl::OUString(); - } + if (!xInputStream.is()) + return ::rtl::OUString(); + } - Sequence< ::sal_Int8 > aData; - sal_Int32 nLen = sizeof( header ) / sizeof( header[0] ); - if ( ( nLen == xInputStream->readBytes( aData, nLen ) ) ) - if ( memcmp( ( void* )header, (void*) aData.getConstArray(), nLen ) == 0 ) - sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_LotusWordPro_Document" ) ); - return sTypeName; + Sequence< ::sal_Int8 > aData; + sal_Int32 nLen = sizeof( header ) / sizeof( header[0] ); + if ( ( nLen == xInputStream->readBytes( aData, nLen ) ) ) + if ( memcmp( ( void* )header, (void*) aData.getConstArray(), nLen ) == 0 ) + sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_LotusWordPro_Document" ) ); + return sTypeName; } diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index 4e9616fd1c17..e834b79f31e0 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -394,7 +394,7 @@ BenError LtcBenContainer::CreateGraphicStreams(std::vector<SvStream *> * pStream CBenObject * pObj= NULL; char *pName; std::vector<std::string> aGrPropertyVector ; - while(pObj = GetNextObject(pObj) ) + while( (pObj = GetNextObject(pObj)) ) { if(pObj->IsNamedObject()) { diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx index d6bf2a2a2d28..ee6d62b21e56 100644 --- a/lotuswordpro/source/filter/benval.cxx +++ b/lotuswordpro/source/filter/benval.cxx @@ -146,8 +146,8 @@ CBenValue::ReadValueDataKnownSize(BenDataPtr pBuffer, unsigned long Offset, } BenError -CBenValue::WriteValueData(BenConstDataPtr pWriteBuffer, unsigned long Offset, - unsigned long Amt, unsigned long * pAmtWritten) +CBenValue::WriteValueData(BenConstDataPtr /*pWriteBuffer*/, unsigned long /*Offset*/, + unsigned long /*Amt*/, unsigned long * /*pAmtWritten*/) { #if 0// Deleted by 2004-06-16 unsigned long AmtWritten; diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx index ff31fd60b92a..c171411fbc67 100644 --- a/lotuswordpro/source/filter/explode.cxx +++ b/lotuswordpro/source/filter/explode.cxx @@ -142,9 +142,14 @@ "00000000", }; -Decompression::Decompression(SvStream * pInStream, SvStream * pOutStream): - m_pInStream(pInStream), m_pOutStream(pOutStream), m_pBuffer(m_Buffer), m_nOutputBufferPos(0), - m_nBitsLeft(0), m_nBytesLeft(0), m_nCurrent4Byte(0) +Decompression::Decompression(SvStream * pInStream, SvStream * pOutStream) + : m_pInStream(pInStream) + , m_pOutStream(pOutStream) + , m_nCurrent4Byte(0) + , m_nBitsLeft(0) + , m_pBuffer(m_Buffer) + , m_nBytesLeft(0) + , m_nOutputBufferPos(0) { if (!m_pInStream || !m_pOutStream ) { diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx index 9499f226c203..d6285353a56d 100644 --- a/lotuswordpro/source/filter/genericfilter.cxx +++ b/lotuswordpro/source/filter/genericfilter.cxx @@ -21,13 +21,13 @@ extern "C" { //================================================================================================== void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) + const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) + void * /*pServiceManager*/, void * pRegistryKey ) { if (pRegistryKey) { @@ -54,7 +54,7 @@ sal_Bool SAL_CALL component_writeInfo( } //================================================================================================== void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/lotuswordpro/source/filter/lwpbasetype.hxx b/lotuswordpro/source/filter/lwpbasetype.hxx index aedace5af1a9..a0e5890ac71e 100644 --- a/lotuswordpro/source/filter/lwpbasetype.hxx +++ b/lotuswordpro/source/filter/lwpbasetype.hxx @@ -100,8 +100,8 @@ public: LwpPoint(); void Read(LwpObjectStream *pStrm); void Reset(); - inline const sal_Int32 GetX(); - inline const sal_Int32 GetY(); + inline sal_Int32 GetX() const; + inline sal_Int32 GetY() const; inline void SetX(sal_Int32 nX); inline void SetY(sal_Int32 nY); protected: @@ -109,8 +109,8 @@ protected: sal_Int32 m_nY; }; -const sal_Int32 LwpPoint::GetX(){return m_nX;} -const sal_Int32 LwpPoint::GetY(){return m_nY;} +sal_Int32 LwpPoint::GetX() const {return m_nX;} +sal_Int32 LwpPoint::GetY() const {return m_nY;} void LwpPoint::SetX(sal_Int32 nX){m_nX = nX;} void LwpPoint::SetY(sal_Int32 nY){m_nY = nY;} diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index 49ffd6215a47..77d464ea4b9c 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -864,7 +864,7 @@ XFCell* LwpConnectedCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRo * @param pOutputStream - output stream * @return */ - void LwpConnectedCellLayout::Parse(IXFStream* pOutputStream) + void LwpConnectedCellLayout::Parse(IXFStream* /*pOutputStream*/) { } @@ -938,7 +938,7 @@ XFCell* LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, * @param pOutputStream - output stream * @return */ - void LwpHiddenCellLayout::Parse(IXFStream* pOutputStream) + void LwpHiddenCellLayout::Parse(IXFStream* /*pOutputStream*/) { } diff --git a/lotuswordpro/source/filter/lwpcontent.cxx b/lotuswordpro/source/filter/lwpcontent.cxx index 1ff48050bd4d..339ab786001b 100644 --- a/lotuswordpro/source/filter/lwpcontent.cxx +++ b/lotuswordpro/source/filter/lwpcontent.cxx @@ -134,7 +134,7 @@ LwpVirtualLayout* LwpContent::GetLayout(LwpVirtualLayout* pStartLayout) sal_Bool LwpContent::HasNonEmbeddedLayouts() { LwpVirtualLayout* pLayout = NULL; - while(pLayout = GetLayout(pLayout)) + while( (pLayout = GetLayout(pLayout)) ) { if(!pLayout->NoContentReference()) return sal_True; @@ -145,7 +145,7 @@ sal_Bool LwpContent::HasNonEmbeddedLayouts() sal_Bool LwpContent::IsStyleContent() { LwpVirtualLayout* pLayout = NULL; - while(pLayout = GetLayout(pLayout)) + while( (pLayout = GetLayout(pLayout)) ) { if(pLayout->IsStyleLayout()) return sal_True; diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx index d14efa4dcc6e..7db05cc4c45f 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.hxx +++ b/lotuswordpro/source/filter/lwpdrawobj.hxx @@ -156,8 +156,8 @@ public: protected: virtual void Read() {} virtual rtl::OUString RegisterStyle() { return rtl::OUString::createFromAscii(""); } - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName) { return NULL; } - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName) { return NULL; } + virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; } + virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; } }; @@ -350,8 +350,8 @@ public: protected: virtual void Read(); virtual rtl::OUString RegisterStyle() {return rtl::OUString::createFromAscii("");} - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName){return NULL;} - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName){return NULL;} + virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;} + virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;} }; /** diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index f04043e2736d..83b848db9451 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -406,7 +406,7 @@ using namespace OpenStormBento; LwpSvStream * pLwpStream = new LwpSvStream(pCompressed); LtcBenContainer* pBentoContainer; - ULONG ulRet = BenOpenContainer(pLwpStream, &pBentoContainer); + /*ULONG ulRet = */ BenOpenContainer(pLwpStream, &pBentoContainer); LtcUtBenValueStream * pWordProData = (LtcUtBenValueStream *)pBentoContainer->FindValueStreamWithPropertyName("WordProData"); // decompressing @@ -517,7 +517,7 @@ int ReadWordproFile(SvStream* pStream, uno::Reference<XDocumentHandler>& xHandle return 1; } -void ErrorMsg(int iErrCode) +void ErrorMsg(int /*iErrCode*/) { } @@ -540,7 +540,7 @@ sal_Bool IsWordProStr(const sal_Int8 *pBuf) 0, 0, 0, 0 #endif }; - for(int i=0; i<sizeof(pLotusLwp); i++) + for(size_t i=0; i<sizeof(pLotusLwp); ++i) { if( pBuf[i] != pLotusLwp[i] ) { @@ -560,11 +560,10 @@ sal_Bool IsWordproFile(rtl::OUString file) { sal_Int8 buf[16]; bRet = sal_True; - sal_Int32 nRead = -1; pStm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); pStm->Seek(STREAM_SEEK_TO_BEGIN); - nRead = pStm->Read(buf, sizeof(buf)); + sal_Size nRead = pStm->Read(buf, sizeof(buf)); if( nRead< sizeof(buf) ) bRet = sal_False; else @@ -577,10 +576,9 @@ sal_Bool IsWordproFile(rtl::OUString file) sal_Bool IsWordproFile( uno::Reference<XInputStream>& rInputStream) { Sequence<sal_Int8> aData; - sal_Int32 nRead = -1; sal_Bool bRet = sal_False; - nRead = rInputStream->readBytes(aData,16); + sal_Int32 nRead = rInputStream->readBytes(aData, 16); if( nRead != 16 ) { bRet = sal_False; diff --git a/lotuswordpro/source/filter/lwpfnlayout.cxx b/lotuswordpro/source/filter/lwpfnlayout.cxx index 6da85261e598..beb389d95610 100644 --- a/lotuswordpro/source/filter/lwpfnlayout.cxx +++ b/lotuswordpro/source/filter/lwpfnlayout.cxx @@ -91,7 +91,7 @@ void LwpFootnoteLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpFootnoteLayout::XFConvert(XFContentContainer * pCont) +void LwpFootnoteLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -133,7 +133,7 @@ void LwpFnRowLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpFnRowLayout::XFConvert(XFContentContainer * pCont) +void LwpFnRowLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -171,7 +171,7 @@ void LwpFnCellLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpFnCellLayout::XFConvert(XFContentContainer * pCont) +void LwpFnCellLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -213,7 +213,7 @@ void LwpEndnoteLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpEndnoteLayout::XFConvert(XFContentContainer * pCont) +void LwpEndnoteLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -248,7 +248,7 @@ void LwpEnSuperTableLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpEnSuperTableLayout::XFConvert(XFContentContainer * pCont) +void LwpEnSuperTableLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -304,7 +304,7 @@ void LwpFnSuperTableLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpFnSuperTableLayout::XFConvert(XFContentContainer * pCont) +void LwpFnSuperTableLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -360,7 +360,7 @@ void LwpContFromLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpContFromLayout::XFConvert(XFContentContainer * pCont) +void LwpContFromLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -391,7 +391,7 @@ void LwpContOnLayout::RegisterStyle() /** * @descr Do nothing */ -void LwpContOnLayout::XFConvert(XFContentContainer * pCont) +void LwpContOnLayout::XFConvert(XFContentContainer * /*pCont*/) { } diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx index c5ece787def1..6273871a31e1 100644 --- a/lotuswordpro/source/filter/lwpfont.cxx +++ b/lotuswordpro/source/filter/lwpfont.cxx @@ -542,7 +542,7 @@ Called by VO_PARA to get style name based on the Para Style ID return OUString(); }*/ -void LwpFontManager::SetDfltFont(XFFont* pFont) +void LwpFontManager::SetDfltFont(XFFont* /*pFont*/) { // TODO: Set default XFFont values in lwp filter //color:black, background color: transparent, Orientation: left to right, top to bottom, others: 0 diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx index 886e091b15a7..650ce8ee63e2 100644 --- a/lotuswordpro/source/filter/lwpfootnote.cxx +++ b/lotuswordpro/source/filter/lwpfootnote.cxx @@ -81,7 +81,7 @@ LwpFribFootnote::LwpFribFootnote(LwpPara* pPara ):LwpFrib(pPara) /** * @descr read footnote frib information */ -void LwpFribFootnote::Read(LwpObjectStream *pObjStrm, sal_uInt16 len) +void LwpFribFootnote::Read(LwpObjectStream * pObjStrm, sal_uInt16 /*len*/) { m_Footnote.ReadIndexed(pObjStrm); } diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx index 7a56dfe80e43..a0d7ba7413c9 100644 --- a/lotuswordpro/source/filter/lwpfoundry.cxx +++ b/lotuswordpro/source/filter/lwpfoundry.cxx @@ -251,7 +251,7 @@ sal_Bool LwpFoundry::FindBookMarkByName(OUString sName) if (pObjID) pBookMark = static_cast<LwpBookMark*>(pObjID->obj()); else - return NULL; + return sal_False; while (pBookMark) { diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx index 5c52934ccd09..c90663abb2dd 100644 --- a/lotuswordpro/source/filter/lwpframelayout.cxx +++ b/lotuswordpro/source/filter/lwpframelayout.cxx @@ -148,7 +148,7 @@ void LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle) pXFFrame->SetHeight( fHeight ); //Get content obj; - LwpObject* pObj = m_pLayout->GetContent()->obj(); + /*LwpObject* pObj =*/ m_pLayout->GetContent()->obj(); if(m_pLayout->IsGroupHead()&&(m_pLayout->IsMinimumHeight())) { //process grouplayout height. there is problems now @@ -1132,7 +1132,7 @@ void LwpGroupFrame::Read() void LwpGroupFrame::RegisterStyle() { } -void LwpGroupFrame::XFConvert(XFContentContainer* pCont) +void LwpGroupFrame::XFConvert(XFContentContainer* /*pCont*/) { } diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx index 537a6873ec5b..aea054faa023 100644 --- a/lotuswordpro/source/filter/lwpfribbreaks.cxx +++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx @@ -106,7 +106,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara) } LwpFribPageBreak::LwpFribPageBreak( LwpPara* pPara ) - : LwpFrib(pPara), m_pMasterPage(NULL),m_bLastFrib(sal_False) + : LwpFrib(pPara), m_bLastFrib(sal_False), m_pMasterPage(NULL) { } @@ -119,7 +119,7 @@ LwpFribPageBreak::~LwpFribPageBreak() } } -void LwpFribPageBreak::Read(LwpObjectStream * pObjStrm, sal_uInt16 len) +void LwpFribPageBreak::Read(LwpObjectStream * pObjStrm, sal_uInt16 /*len*/) { m_Layout.ReadIndexed(pObjStrm); } diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx b/lotuswordpro/source/filter/lwpfribframe.cxx index 1ed8ee419ed5..abf884bc4fbe 100644 --- a/lotuswordpro/source/filter/lwpfribframe.cxx +++ b/lotuswordpro/source/filter/lwpfribframe.cxx @@ -71,7 +71,7 @@ * @param: */ -void LwpFribFrame::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribFrame::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_objLayout.ReadIndexed(pObjStrm); } @@ -200,7 +200,7 @@ void LwpFribFrame::XFConvert(XFContentContainer* pCont) * @descr: Read Ruby frame * */ -void LwpFribRubyFrame::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribRubyFrame::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_objLayout.ReadIndexed(pObjStrm); } @@ -221,7 +221,7 @@ void LwpFribRubyFrame::RegisterStyle(LwpFoundry* pFoundry) * @descr: convert Ruby frame * */ -void LwpFribRubyFrame::XFConvert(XFContentContainer* pCont) +void LwpFribRubyFrame::XFConvert(XFContentContainer* /*pCont*/) { LwpRubyLayout* pLayout = GetLayout(); if (pLayout) diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx index 90cf3e3f2004..a8f61b2783dc 100644 --- a/lotuswordpro/source/filter/lwpfribmark.cxx +++ b/lotuswordpro/source/filter/lwpfribmark.cxx @@ -86,7 +86,7 @@ * @param: * @param: */ -void LwpFribCHBlock::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribCHBlock::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_objMarker.ReadIndexed(pObjStrm); m_nType = pObjStrm->QuickReaduInt8(); @@ -182,7 +182,7 @@ LwpFribBookMark::LwpFribBookMark(LwpPara* pPara ) : LwpFrib(pPara),m_pStart(NULL * @param: * @param: */ -void LwpFribBookMark::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribBookMark::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_objMarker.ReadIndexed(pObjStrm); m_nType = pObjStrm->QuickReaduInt8(); @@ -222,7 +222,7 @@ LwpFribField::LwpFribField( LwpPara* pPara ) : LwpFrib(pPara) m_nDateTimeType = 0; } -void LwpFribField::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribField::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_objMarker.ReadIndexed(pObjStrm); m_nType = pObjStrm->QuickReaduInt8(); @@ -324,7 +324,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara) { sal_uInt8 nDatetype; OUString sFormula; - sal_Bool bIsDateTime = pFieldMark->IsDateTimeField(nDatetype,sFormula); + /*sal_Bool bIsDateTime =*/ pFieldMark->IsDateTimeField(nDatetype,sFormula); if (m_nSubType == SUBFIELD_DATETIME)//date time { @@ -1424,7 +1424,7 @@ LwpRubyMarker* LwpFribRubyMarker::GetMarker() return static_cast<LwpRubyMarker*>(m_objMarker.obj(VO_RUBYMARKER)); } -void LwpFribRubyMarker::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribRubyMarker::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_objMarker.ReadIndexed(pObjStrm); m_nType = pObjStrm->QuickReaduInt8(); @@ -1456,7 +1456,7 @@ void LwpFribRubyMarker::XFConvert(XFContentContainer* pXFPara) } } -void LwpFribRubyMarker::RegisterStyle(LwpFoundry* pFoundry) +void LwpFribRubyMarker::RegisterStyle(LwpFoundry* /*pFoundry*/) { } diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index b2fa312ee106..f18685da13ec 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -89,7 +89,7 @@ LwpFribPtr::LwpFribPtr() - : m_pFribs(NULL),m_pPara(NULL),m_pXFPara(NULL) + : m_pFribs(NULL),m_pXFPara(NULL),m_pPara(NULL) {} LwpFribPtr::~LwpFribPtr() diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx index 4680a8fc6f1c..244823ec56e1 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -91,7 +91,7 @@ LwpFribSection::~LwpFribSection() * @descr: Read section frib information * */ -void LwpFribSection::Read(LwpObjectStream *pObjStrm, sal_uInt16 len) +void LwpFribSection::Read(LwpObjectStream *pObjStrm, sal_uInt16 /*len*/) { m_Section.ReadIndexed(pObjStrm); } @@ -169,12 +169,12 @@ void LwpFribSection::ParseSection() LwpStory* pStory = static_cast<LwpStory*> ( m_pPara->GetStoryID()->obj() ); if (m_Section.obj()->GetTag() == VO_INDEXSECTION) { - sal_Bool bRunin = sal_False; - sal_Bool bSeparator = sal_False; //create a new section and add it to container XFIndex* pIndex = new XFIndex; pIndex->SetIndexType(enumXFIndexAlphabetical); /* + sal_Bool bRunin = sal_False; + sal_Bool bSeparator = sal_False; LwpIndexSection* pIndexSection = static_cast<LwpIndexSection*>(m_Section.obj()); if (pIndexSection->IsFormatRunin()) bRunin = sal_True; @@ -248,7 +248,7 @@ void LwpFribSection::SetDefaultAlphaIndex(XFIndex * pXFIndex) LwpMasterPage::LwpMasterPage(LwpPara* pPara, LwpPageLayout* pLayout) - :m_pPara(pPara),m_pLayout(pLayout),m_bNewSection(sal_False) + :m_bNewSection(sal_False),m_pPara(pPara),m_pLayout(pLayout) { } @@ -318,7 +318,7 @@ sal_Bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) { XFSectionStyle* pSectStyle= new XFSectionStyle(); //set margin - LwpStory* pStory = static_cast<LwpStory*>(m_pPara->GetStoryID()->obj()); + pStory = static_cast<LwpStory*>(m_pPara->GetStoryID()->obj()); if(pStory) { LwpPageLayout* pCurrentLayout = pStory->GetCurrentLayout(); diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx index 25d44f17776b..92b8e88a9024 100644 --- a/lotuswordpro/source/filter/lwpfribtable.cxx +++ b/lotuswordpro/source/filter/lwpfribtable.cxx @@ -66,7 +66,7 @@ * @param: */ -void LwpFribTable::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribTable::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_objTable.ReadIndexed(pObjStrm); } diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx index 35a6b27becbc..8c0b1bfa439f 100644 --- a/lotuswordpro/source/filter/lwpfribtext.cxx +++ b/lotuswordpro/source/filter/lwpfribtext.cxx @@ -120,7 +120,7 @@ void LwpFribText::XFConvert(XFContentContainer* pXFPara,LwpStory* pStory) * @param: pObjStrm wordpro object stream. * @param: len length of the frib */ -void LwpFribParaNumber::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribParaNumber::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { pObjStrm->QuickRead(&m_nStyleID, sizeof(m_nStyleID)); pObjStrm->QuickRead(&m_nNumberChar, sizeof(m_nNumberChar)); @@ -151,7 +151,7 @@ LwpFribDocVar::~LwpFribDocVar() * @param: pObjStrm wordpro object stream. * @param: len length of the frib */ -void LwpFribDocVar::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribDocVar::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { pObjStrm->QuickRead(&m_nType, sizeof(m_nType)); m_pName->Read(pObjStrm); @@ -438,7 +438,7 @@ void LwpFribUnicode::XFConvert(XFContentContainer* pXFPara,LwpStory* pStory) * @param: * @param: */ -void LwpFribPageNumber::Read(LwpObjectStream* pObjStrm, sal_uInt16 len) +void LwpFribPageNumber::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) { m_nNumStyle = pObjStrm->QuickReaduInt16(); m_aBefText.Read(pObjStrm); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 4097378b1e51..b229896c8cfe 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -90,7 +90,10 @@ #define EF_NOS 0x0003 LwpGraphicObject::LwpGraphicObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm) -:LwpGraphicOleObject(objHdr, pStrm),m_bCompressed(0),m_bIsLinked(0),m_nCachedBaseLine(0) + : LwpGraphicOleObject(objHdr, pStrm) + , m_nCachedBaseLine(0) + , m_bIsLinked(0) + , m_bCompressed(0) { } LwpGraphicObject::~LwpGraphicObject() @@ -263,7 +266,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) } if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h') { - LwpSvStream* pDocStream = m_pStrm; + //LwpSvStream* pDocStream = m_pStrm; //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(), // GetRectIn100thMM(), GetRectInCM(), pOutputStream); //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(), @@ -421,7 +424,7 @@ void LwpGraphicObject::CreateDrawObjects() LwpSvStream* pStream = m_pStrm->GetCompressedStream() ? m_pStrm->GetCompressedStream(): m_pStrm; OpenStormBento::LtcBenContainer* pBentoContainer; - ULONG ulRet = OpenStormBento::BenOpenContainer(pStream, &pBentoContainer); + /*ULONG ulRet =*/ OpenStormBento::BenOpenContainer(pStream, &pBentoContainer); SvStream* pDrawObjStream = NULL; // get graphic object's bento objet name @@ -447,10 +450,10 @@ void LwpGraphicObject::CreateDrawObjects() void LwpGraphicObject::GetBentoNamebyID(LwpObjectID* pMyID, std::string& rName) { sal_uInt16 nHigh = pMyID->GetHigh(); - sal_uInt32 nLow = pMyID->GetLow(); + sal_uInt16 nLow = pMyID->GetLow(); char pTempStr[32]; rName = std::string("Gr"); - sprintf(pTempStr, "%X,%lX", nHigh, nLow); + sprintf(pTempStr, "%X,%X", nHigh, nLow); rName.append(pTempStr); } @@ -466,7 +469,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData) LwpSvStream* pStream = m_pStrm->GetCompressedStream() ? m_pStrm->GetCompressedStream(): m_pStrm; OpenStormBento::LtcBenContainer* pBentoContainer; - ULONG ulRet = OpenStormBento::BenOpenContainer(pStream, &pBentoContainer); + /*ULONG ulRet =*/ OpenStormBento::BenOpenContainer(pStream, &pBentoContainer); SvStream* pGrafStream = NULL; // get graphic object's bento objet name @@ -506,7 +509,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData) LwpSvStream* pStream = m_pStrm->GetCompressedStream() ? m_pStrm->GetCompressedStream(): m_pStrm; OpenStormBento::LtcBenContainer* pBentoContainer; - ULONG ulRet = OpenStormBento::BenOpenContainer(pStream, &pBentoContainer); + /*ULONG ulRet =*/ OpenStormBento::BenOpenContainer(pStream, &pBentoContainer); SvStream* pGrafStream = NULL; diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx b/lotuswordpro/source/filter/lwpidxmgr.cxx index 4924b3f521ce..1223bfa973c3 100644 --- a/lotuswordpro/source/filter/lwpidxmgr.cxx +++ b/lotuswordpro/source/filter/lwpidxmgr.cxx @@ -53,6 +53,7 @@ * * ************************************************************************/ + /********************************************************************************************************************** * @file * index manager implementation @@ -62,11 +63,10 @@ * VO_ROOTOBJINDEX includes k (object id, offset) and timetable which is used to map index to actual low id * 2. VO_ROOTLEAFOBJINDEX is used when the file is so small that the number of objects is less than 256(?) * VO_ROOTLEAFOBJINDEX contains directly the (object id, offset) map and time table. -/**********************************************************************************************************************/ -/********************************************************************************************************************** + * Change History Jan 2005 Created -/**********************************************************************************************************************/ +**********************************************************************************************************************/ #include "lwpidxmgr.hxx" diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 2cb716992545..1c0c9b7a8c19 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -111,7 +111,7 @@ sal_Bool LwpVirtualLayout::MarginsSameAsParent() * @descr: Get column width * */ -double LwpVirtualLayout::GetColWidth(sal_uInt16 nIndex) +double LwpVirtualLayout::GetColWidth(sal_uInt16 /*nIndex*/) { //return GetContentWidth(); //not support now //return LwpTools::ConvertToMetric(5); //test @@ -122,7 +122,7 @@ double LwpVirtualLayout::GetColWidth(sal_uInt16 nIndex) * @descr: Get the gap between columns * */ -double LwpVirtualLayout::GetColGap(sal_uInt16 nIndex) +double LwpVirtualLayout::GetColGap(sal_uInt16 /*nIndex*/) { //return DEFAULTGAPSIZE; //return LwpTools::ConvertToMetric(0.17);//DEFAULTGAPSIZE=0.17 @@ -527,18 +527,16 @@ LwpVirtualLayout* LwpHeadLayout::FindEnSuperTableLayout() return NULL; } -LwpLayoutStyle::LwpLayoutStyle() : -m_nStyleDefinition(0), m_nKey(0), -m_pDescription(new LwpAtomHolder) +LwpLayoutStyle::LwpLayoutStyle() + : m_nStyleDefinition(0) + , m_pDescription(new LwpAtomHolder) + , m_nKey(0) { } LwpLayoutStyle::~LwpLayoutStyle() { - if (m_pDescription) - { - delete m_pDescription; - } + delete m_pDescription; } void LwpLayoutStyle::Read(LwpObjectStream* pStrm) @@ -1748,7 +1746,7 @@ sal_uInt16 LwpLayout::GetUsePage() if(pUseWhen) return pUseWhen->GetUsePage(); else - return NULL; + return 0; } else if( !m_BasedOnStyle.IsNull() ) { @@ -1788,7 +1786,7 @@ sal_Bool LwpLayout::IsUseOnAllPages() if(pUseWhen) return pUseWhen->IsUseOnAllPages(); else - return NULL; + return sal_False; } else if( !m_BasedOnStyle.IsNull() ) { @@ -1810,7 +1808,7 @@ sal_Bool LwpLayout::IsUseOnAllEvenPages() if(pUseWhen) return pUseWhen->IsUseOnAllEvenPages(); else - return NULL; + return sal_False; } else if( !m_BasedOnStyle.IsNull() ) { @@ -1832,7 +1830,7 @@ sal_Bool LwpLayout::IsUseOnAllOddPages() if(pUseWhen) return pUseWhen->IsUseOnAllOddPages(); else - return NULL; + return sal_False; } else if( !m_BasedOnStyle.IsNull() ) { @@ -1854,7 +1852,7 @@ sal_Bool LwpLayout::IsUseOnPage() if(pUseWhen) return pUseWhen->IsUseOnPage(); else - return NULL; + return sal_False; } else if( !m_BasedOnStyle.IsNull() ) { diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 58eb7205e55c..f843ca7a5231 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -101,8 +101,8 @@ public: inline virtual sal_uInt16 GetNumCols(){return 1;} virtual double GetColWidth(sal_uInt16 nIndex); virtual double GetColGap(sal_uInt16 nIndex); - virtual double GetMarginsValue(const sal_uInt8& nWhichSide){return 0;} - virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide){return 0;} + virtual double GetMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;} + virtual double GetExtMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;} virtual sal_Bool IsAutoGrow(){ return sal_False;} virtual sal_Bool IsAutoGrowUp(){ return sal_False;} virtual sal_Bool IsAutoGrowDown(){ return sal_False;} @@ -135,7 +135,7 @@ public: virtual sal_Bool IsUseOnAllEvenPages(){ return sal_False;} virtual sal_Bool IsUseOnAllOddPages(){ return sal_False;} virtual sal_Bool IsUseOnPage(){ return sal_False;} - virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber = 0){ return -1;} + virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/ = 0){ return -1;} virtual sal_Bool IsMinimumHeight(); virtual sal_Bool IsForWaterMark(){ return sal_False;} virtual LwpPara* GetLastParaOfPreviousStory() { return NULL; } @@ -427,7 +427,7 @@ public: virtual sal_Bool IsAnchorPage(); virtual sal_Bool IsAnchorFrame(); virtual sal_Bool IsAnchorCell(); - virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False){} + virtual void XFConvertFrame(XFContentContainer* /*pCont*/, sal_Int32 /*nStart*/ = 0, sal_Int32 /*nEnd*/ = 0, sal_Bool /*bAll*/ = sal_False) {} XFFont* GetFont(); void SetFont(XFFont* pFont); enum WrapType diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx b/lotuswordpro/source/filter/lwplaypiece.cxx index 9e72e8e6708f..b8853dd6d449 100644 --- a/lotuswordpro/source/filter/lwplaypiece.cxx +++ b/lotuswordpro/source/filter/lwplaypiece.cxx @@ -98,7 +98,7 @@ void LwpLayoutGeometry::Read() m_pObjStrm->SkipExtra(); } } -void LwpLayoutGeometry::Parse(IXFStream* pOutputStream) +void LwpLayoutGeometry::Parse(IXFStream* /*pOutputStream*/) {} LwpLayoutScale::LwpLayoutScale(LwpObjectHeader& objHdr, LwpSvStream* pStrm) @@ -126,7 +126,7 @@ void LwpLayoutScale::Read() } } -void LwpLayoutScale::Parse(IXFStream* pOutputStream) +void LwpLayoutScale::Parse(IXFStream* /*pOutputStream*/) {} LwpLayoutMargins::LwpLayoutMargins(LwpObjectHeader& objHdr, LwpSvStream* pStrm) @@ -149,7 +149,7 @@ void LwpLayoutMargins::Read() } } -void LwpLayoutMargins::Parse(IXFStream* pOutputStream) +void LwpLayoutMargins::Parse(IXFStream* /*pOutputStream*/) {} LwpLayoutBorder::LwpLayoutBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm) @@ -170,7 +170,7 @@ void LwpLayoutBorder::Read() } } -void LwpLayoutBorder::Parse(IXFStream* pOutputStream) +void LwpLayoutBorder::Parse(IXFStream* /*pOutputStream*/) {} LwpLayoutBackground::LwpLayoutBackground(LwpObjectHeader& objHdr, LwpSvStream* pStrm) @@ -191,7 +191,7 @@ void LwpLayoutBackground::Read() } } -void LwpLayoutBackground::Parse(IXFStream* pOutputStream) +void LwpLayoutBackground::Parse(IXFStream* /*pOutputStream*/) {} LwpExternalBorder::LwpExternalBorder() @@ -236,7 +236,7 @@ void LwpLayoutExternalBorder::Read() } } -void LwpLayoutExternalBorder::Parse(IXFStream* pOutputStream) +void LwpLayoutExternalBorder::Parse(IXFStream* /*pOutputStream*/) {} LwpColumnInfo::LwpColumnInfo() @@ -299,7 +299,7 @@ double LwpLayoutColumns::GetColGap(sal_uInt16 nIndex) return m_pColumns[nIndex].GetGap(); } -void LwpLayoutColumns::Parse(IXFStream* pOutputStream) +void LwpLayoutColumns::Parse(IXFStream* /*pOutputStream*/) {} LwpLayoutGutters::LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm) @@ -321,7 +321,7 @@ void LwpLayoutGutters::Read() } -void LwpLayoutGutters::Parse(IXFStream* pOutputStream) +void LwpLayoutGutters::Parse(IXFStream* /*pOutputStream*/) {} LwpJoinStuff::LwpJoinStuff() @@ -369,7 +369,7 @@ void LwpLayoutJoins::Read() } } -void LwpLayoutJoins::Parse(IXFStream* pOutputStream) +void LwpLayoutJoins::Parse(IXFStream* /*pOutputStream*/) {} LwpLayoutShadow::LwpLayoutShadow(LwpObjectHeader& objHdr, LwpSvStream* pStrm) @@ -390,7 +390,7 @@ void LwpLayoutShadow::Read() } } -void LwpLayoutShadow::Parse(IXFStream* pOutputStream) +void LwpLayoutShadow::Parse(IXFStream* /*pOutputStream*/) {} /************************************************************************** * @descr: Constructor @@ -460,7 +460,7 @@ void LwpLayoutRelativity::Read() } } -void LwpLayoutRelativity::Parse(IXFStream *pOutputStream) +void LwpLayoutRelativity::Parse(IXFStream * /*pOutputStream*/) { } diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx index e6fb953e9d01..48fbfabb7a9b 100644 --- a/lotuswordpro/source/filter/lwpmarker.cxx +++ b/lotuswordpro/source/filter/lwpmarker.cxx @@ -378,8 +378,12 @@ sal_Bool LwpBookMark::IsRightName(OUString sName) return sName.equals(GetName()); } -LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm):LwpStoryMarker(objHdr,pStrm), - m_bHasStyle(sal_False),m_bHasStart(sal_False),m_bRevisionFlag(sal_False),m_pFrib(NULL) +LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm) + : LwpStoryMarker(objHdr,pStrm) + , m_bHasStyle(sal_False) + , m_bHasStart(sal_False) + , m_pFrib(NULL) + , m_bRevisionFlag(sal_False) { } diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx index 02894a9c9653..faba60737902 100644 --- a/lotuswordpro/source/filter/lwpnotes.cxx +++ b/lotuswordpro/source/filter/lwpnotes.cxx @@ -75,7 +75,7 @@ /** * @descr read frib information */ -void LwpFribNote::Read(LwpObjectStream *pObjStrm, sal_uInt16 len) +void LwpFribNote::Read(LwpObjectStream *pObjStrm, sal_uInt16 /*len*/) { m_Layout.ReadIndexed(pObjStrm); } @@ -253,7 +253,7 @@ void LwpNoteHeaderLayout::RegisterStyle() { } -void LwpNoteHeaderLayout::XFConvert(XFContentContainer * pCont) +void LwpNoteHeaderLayout::XFConvert(XFContentContainer * /*pCont*/) { } @@ -322,7 +322,7 @@ void LwpViewportLayout::RegisterStyle() { } -void LwpViewportLayout::XFConvert(XFContentContainer * pCont) +void LwpViewportLayout::XFConvert(XFContentContainer * /*pCont*/) { } diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index caa1c28764db..df7a5a5c4fa2 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -176,7 +176,9 @@ LwpNumericFormatSubset::~LwpNumericFormatSubset() } /////////////////////////////////////////////////////////////////////////////////// -LwpNumericFormat::LwpNumericFormat(LwpObjectStream * pStrm):cDecimalPlaces(0),cFormat(FMT_DEFAULT) +LwpNumericFormat::LwpNumericFormat(LwpObjectStream * pStrm) + : cFormat(FMT_DEFAULT) + , cDecimalPlaces(0) { assert(pStrm); m_pObjStrm = pStrm; @@ -481,7 +483,7 @@ OUString LwpNumericFormat::reencode(OUString sCode) if (bFound) { pBuff[i] = 0xffe1; - for (sal_uInt32 j=i+1; j < sCode.getLength() - 1; j++) + for (sal_Int32 j=i+1; j < sCode.getLength() - 1; ++j) { pBuff[j] = pString[j+1]; } diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 79be18ebf329..a89bc6b72bcd 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -113,11 +113,11 @@ struct LwpCurrencyInfo bPost = sal_False; bShowSpace = sal_False; } - LwpCurrencyInfo(String sSym,sal_Bool bPost, sal_Bool bShowSpace) + LwpCurrencyInfo(String sSym,sal_Bool bPost_, sal_Bool bShowSpace_) { - this->sSymbol = sSym; - this->bPost = bPost; - this->bShowSpace = bShowSpace; + sSymbol = sSym; + bPost = bPost_; + bShowSpace = bShowSpace_; } }; diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx index 82991e2c1a4c..b434f655e085 100644 --- a/lotuswordpro/source/filter/lwpobj.cxx +++ b/lotuswordpro/source/filter/lwpobj.cxx @@ -70,7 +70,7 @@ LwpObject::LwpObject() * @descr construct lwpobject from stream */ LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm) - : m_ObjHdr(objHdr), m_pStrm(pStrm), m_pObjStrm(NULL), m_pFoundry(NULL) + : m_ObjHdr(objHdr), m_pObjStrm(NULL), m_pFoundry(NULL), m_pStrm(pStrm) { m_pObjStrm = new LwpObjectStream(pStrm, m_ObjHdr.IsCompressed(), static_cast<sal_uInt16>(m_ObjHdr.GetSize()) ); @@ -105,7 +105,7 @@ void LwpObject::Read() /** * @descr default parse function */ -void LwpObject::Parse(IXFStream* pOutputStream) +void LwpObject::Parse(IXFStream* /*pOutputStream*/) {} /** * @descr default register style function @@ -117,7 +117,7 @@ void LwpObject::RegisterStyle() * @descr default XFConvert function * pCont is the XFContentContainer for the object conversion */ -void LwpObject::XFConvert(XFContentContainer* pCont) +void LwpObject::XFConvert(XFContentContainer* /*pCont*/) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx index 73debbb2084a..3c2555749a85 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.cxx +++ b/lotuswordpro/source/filter/lwpobjfactory.cxx @@ -108,7 +108,7 @@ //LwpObjectFactory* LwpObjectFactory::m_pMgr = NULL; LwpObjectFactory::LwpObjectFactory(LwpSvStream* pSvStream) - : m_pSvStream(pSvStream), m_nNumObjs(0) + : m_nNumObjs(0), m_pSvStream(pSvStream) { m_ObjList.clear(); } diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx index 438c7783c854..88754f660cfb 100644 --- a/lotuswordpro/source/filter/lwpobjid.cxx +++ b/lotuswordpro/source/filter/lwpobjid.cxx @@ -72,7 +72,7 @@ #include "lwpglobalmgr.hxx" LwpObjectID::LwpObjectID(sal_uInt32 low, sal_uInt16 high) - :m_nLow(low), m_nHigh(high), m_bIsCompressed(sal_False), m_nIndex(0) + :m_nLow(low), m_nHigh(high), m_nIndex(0), m_bIsCompressed(sal_False) { } /** diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index abb95a7e0295..ac662f76758d 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -191,7 +191,7 @@ void LwpObjectStream::SeekRel(sal_uInt16 pos) */ BOOL LwpObjectStream::Seek( sal_uInt16 pos) { - if(pos>=0 && pos<m_nBufSize) + if (pos < m_nBufSize) { m_nReadPos = pos; return TRUE; diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx index 586ab95263f2..09f670859d0c 100644 --- a/lotuswordpro/source/filter/lwpoleobject.cxx +++ b/lotuswordpro/source/filter/lwpoleobject.cxx @@ -215,7 +215,6 @@ void LwpOleObject::Read() cPersistentFlags = m_pObjStrm->QuickReaduInt16(); sal_uInt16 nNonVersionedPersistentFlags = 0; - sal_uInt32 nFormat = 0; sal_uInt16 nNumberOfPages = 0; // qCMarker read LwpObjectID ID; @@ -266,7 +265,7 @@ void LwpOleObject::GetChildStorageName(char *pObjName) char sName[MAX_STREAMORSTORAGENAME]; //LwpObjectID ID(nLowID, GetObjectID()->GetHigh()); - sprintf( sName, "%s%lX,%lX", "Ole", + sprintf( sName, "%s%X,%X", "Ole", GetObjectID()->GetHigh(), GetObjectID()->GetLow()); strcpy( pObjName, sName); @@ -279,7 +278,7 @@ void LwpOleObject::GetChildStorageName(char *pObjName) * @return: None * @date: 2/22/2005 */ -void LwpOleObject::Parse(IXFStream* pOutputStream) +void LwpOleObject::Parse(IXFStream* /*pOutputStream*/) { #if 0 #ifdef WIN32 @@ -404,7 +403,7 @@ void LwpOleObject::Parse(IXFStream* pOutputStream) #endif } -void LwpOleObject::XFConvert(XFContentContainer * pCont) +void LwpOleObject::XFConvert(XFContentContainer * /*pCont*/) { #if 0 //Add by 10/24/2005 @@ -590,7 +589,7 @@ Rectangle LwpOleObject::GetOLEObjectSize( SotStorage * pStor ) const /** * @descr: Read OLE object picture information */ -BOOL LwpOlePres::Read( SvStream & rStm ) +BOOL LwpOlePres::Read( SvStream & /*rStm*/ ) { #if 0 ULONG nBeginPos = rStm.Tell(); diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx index b0817d409a67..a082bc602126 100644 --- a/lotuswordpro/source/filter/lwpoleobject.hxx +++ b/lotuswordpro/source/filter/lwpoleobject.hxx @@ -153,20 +153,20 @@ class LwpOlePres UINT32 nAdvFlags; INT32 nJobLen; - void * pJob; + BYTE * pJob; Size aSize; // Groesse in 100TH_MM public: LwpOlePres( ULONG nF ) : nFormat( nF ) + , pBmp( NULL ) + , pMtf( NULL ) , nAdvFlags( 0x2 ) // in Dokument gefunden , nJobLen( 0 ) , pJob( NULL ) - , pBmp( NULL ) - , pMtf( NULL ) {} ~LwpOlePres() { - delete pJob; + delete [] pJob; delete pBmp; delete pMtf; } diff --git a/lotuswordpro/source/filter/lwppagehint.cxx b/lotuswordpro/source/filter/lwppagehint.cxx index 984f1e0837a3..ef61671024c4 100644 --- a/lotuswordpro/source/filter/lwppagehint.cxx +++ b/lotuswordpro/source/filter/lwppagehint.cxx @@ -113,7 +113,7 @@ void LwpPageHint::Read() m_pObjStrm->SkipExtra(); } -void LwpPageHint::Parse(IXFStream *pOutputStream) +void LwpPageHint::Parse(IXFStream * /*pOutputStream*/) { } diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx index 236b0d608e05..76b2bb982a9f 100644 --- a/lotuswordpro/source/filter/lwppagelayout.cxx +++ b/lotuswordpro/source/filter/lwppagelayout.cxx @@ -717,7 +717,7 @@ LwpPara* LwpPageLayout::GetPagePosition() LwpFoundry* pFoundry = GetFoundry(); if(pFoundry) { - while(pSection = pFoundry->EnumSections(pSection)) + while( (pSection = pFoundry->EnumSections(pSection)) ) { if(pSection->GetPageLayout() == this) return static_cast<LwpPara*>(pSection->GetPosition()->obj()); diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index d3d1a7254bec..3d2a5cd95548 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -99,10 +99,14 @@ #include "lwpdropcapmgr.hxx" #include "lwptable.hxx" + LwpPara::LwpPara(LwpObjectHeader& objHdr, LwpSvStream* pStrm) - : LwpDLVList(objHdr, pStrm), m_pBreaks(NULL), m_pIndentOverride(NULL), m_bHasBullet(sal_False), m_bBullContinue(sal_False), - /*m_pParaNumbering(NULL),*/ m_pSilverBullet(NULL), m_pBullOver(NULL),m_bHasDropcap(sal_False),m_nLines(0),m_nChars(0), - m_BelowSpacing(0),m_pDropcapLayout(NULL), m_pXFContainer(NULL) + : LwpDLVList(objHdr, pStrm), m_pBreaks(NULL), m_pIndentOverride(NULL) + , m_bHasBullet(sal_False), m_pSilverBullet(NULL) + , /*m_pParaNumbering(NULL),*/ m_pBullOver(NULL) + , m_bBullContinue(sal_False) + , m_bHasDropcap(sal_False), m_nLines(0), m_nChars(0) + , m_pDropcapLayout(NULL), m_BelowSpacing(0), m_pXFContainer(NULL) { m_pProps = NULL; m_SectionStyleName = A2OUSTR(""); @@ -580,12 +584,12 @@ void LwpPara::RegisterStyle() LwpNumberingOverride* pNumbering = this->GetParaNumbering(); sal_uInt16 nPosition = pNumbering->GetPosition(); sal_Bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition); - sal_Bool bResetSection = m_pSilverBullet->IsNewSection(nPosition); + /*sal_Bool bResetSection =*/ m_pSilverBullet->IsNewSection(nPosition); sal_Bool bHeading; LwpPara* pPara = this; LwpPara* pPrePara = NULL; LwpSilverBullet* pParaSilverBullet = NULL; - sal_uInt16 nNum = 0, nOffset = 0, nLevel = 0, nFoundLevel = 0xffff, nFoundBound = 0; + sal_uInt16 nNum = 0, nLevel = 0, nFoundLevel = 0xffff, nFoundBound = 0; nFoundBound = nLevel = pNumbering->GetLevel(); if (nPosition == pNumbering->GetPosition()) @@ -942,7 +946,7 @@ LwpBulletStyleMgr* LwpPara::GetBulletStyleMgr() XFContentContainer* LwpPara::AddBulletList(XFContentContainer* pCont) { - LwpBulletStyleMgr* pBulletStyleMgr = this->GetBulletStyleMgr(); + LwpBulletStyleMgr* pBulletStyleMgr = GetBulletStyleMgr(); if (!pBulletStyleMgr) { assert(false); @@ -951,7 +955,7 @@ XFContentContainer* LwpPara::AddBulletList(XFContentContainer* pCont) sal_uInt16 nLevel = m_nLevel; sal_Bool bOrdered = sal_False; - LwpStory* pMyStory = this->GetStory(); + /*LwpStory* pMyStory =*/ GetStory(); pBulletStyleMgr->SetContinueFlag(m_bBullContinue); #if 0 diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index d41633694d99..6cf899e74082 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -220,7 +220,7 @@ void LwpPara::GetParaNumber(sal_uInt16 nPosition, ParaNumbering* pParaNumbering) pParaNumbering->nNumLevel = nHideLevels; //get suffix text frib - if (pFrib = pFrib->GetNext()) + if ( (pFrib = pFrib->GetNext()) ) { // if((pFrib->GetType() == FRIB_TAG_TEXT) && // (pFrib->GetModifiers()->aTxtAttrOverride.GetHideLevels() == nHideLevels)) @@ -254,7 +254,7 @@ void LwpPara::GetParaNumber(sal_uInt16 nPosition, ParaNumbering* pParaNumbering) pParaNumbering->pParaNumber = static_cast<LwpFribParaNumber*>(pFrib); //get suffix text frib - if (pFrib = pFrib->GetNext()) + if ( (pFrib = pFrib->GetNext()) ) { if (pFrib->GetType() == FRIB_TAG_TEXT) { diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 282b33924224..2dbb6248f899 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -262,6 +262,8 @@ void LwpParaStyle::ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff:: case LwpBorderStuff::BOTTOM: eXFBorderSide = enumXFBorderBottom; break; + default: + break; } LwpColor aColor = pBorderStuff->GetSideColor(eType); @@ -428,6 +430,8 @@ void LwpParaStyle::ApplyAlignment(XFParaStyle* pParaStyle, LwpAlignmentOverride* pParaStyle->SetNumberRight(sal_True);//to identify its align attribute alignType = enumXFAlignEnd; break; + default: + break; } pParaStyle->SetAlignType(alignType); } @@ -507,7 +511,6 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden void LwpParaStyle::ApplySpacing(LwpPara* pPara, XFParaStyle* pParaStyle, LwpSpacingOverride* pSpacing) { LwpSpacingCommonOverride* spacing = pSpacing->GetSpacing(); - LwpSpacingCommonOverride* aboveline = pSpacing->GetAboveLineSpacing(); LwpSpacingCommonOverride* abovepara = pSpacing->GetAboveSpacing(); LwpSpacingCommonOverride* belowpara = pSpacing->GetBelowSpacing(); @@ -603,9 +606,9 @@ void LwpParaStyle::ApplySpacing(LwpPara* pPara, XFParaStyle* pParaStyle, LwpSpac * @param: * @return: **************************************************************************/ -void LwpParaStyle::ApplyTab(XFParaStyle *pParaStyle, LwpTabOverride *pTab) +void LwpParaStyle::ApplyTab(XFParaStyle *pParaStyle, LwpTabOverride *pTabOverRide) { - LwpObjectID* pTabRackID = pTab->GetTabRackID(); + LwpObjectID* pTabRackID = pTabOverRide->GetTabRackID(); if(pTabRackID->IsNull()) { //assert(false); @@ -631,7 +634,7 @@ void LwpParaStyle::ApplyTab(XFParaStyle *pParaStyle, LwpTabOverride *pTab) if(!pTab) return; - enumXFTab eType; + enumXFTab eType = enumXFTabNone; LwpTab::TabType type = pTab->GetTabType(); switch(type) { diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 0de33f77e985..8ca0be2a6e0b 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -198,9 +198,6 @@ void LwpRowLayout::ConvertRow(XFTable* pXFTable,sal_uInt8 nStartCol,sal_uInt8 nE sal_uInt16 nRowMark = crowid + GetCurMaxSpannedRows(nStartCol,nEndCol); RegisterCurRowStyle(pXFRow,nRowMark); - sal_Bool bIsRight = sal_False; - sal_Bool bIsTop = sal_False; - //if there is connected cell for (sal_uInt8 i=nStartCol; i<nEndCol; ) { @@ -373,8 +370,6 @@ void LwpRowLayout::ConvertCommonRow(XFTable* pXFTable,sal_uInt8 nStartCol,sal_uI XFCell * pCell; LwpTableLayout* pTableLayout = GetParentTableLayout(); LwpTable* pTable = pTableLayout->GetTable(); - sal_Bool bIsRight = sal_False; - sal_Bool bIsTop = sal_False; sal_uInt8 nCellStartCol,nCellEndCol; for (sal_uInt8 i = nStartCol; i < nEndCol ; i++) diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx index 76dc4632d9c7..35465a78d899 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx @@ -65,7 +65,9 @@ LwpSdwFileLoader::LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj, IXFStream* pOutputStream) -:m_pStream(pStream), m_pGraphicObj(pGraphicObj), m_pOutputStream(pOutputStream) + : m_pStream(pStream) + , m_pOutputStream(pOutputStream) + , m_pGraphicObj(pGraphicObj) { pStream->Seek(0); } diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx index 373c63a217a0..8514f9b71c53 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx @@ -82,7 +82,9 @@ LwpSdwGroupLoaderV0102::LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj, IXFStream* pOutputStream) -:m_pStream(pStream), m_pGraphicObj(pGraphicObj), m_pOutputStream(pOutputStream) + : m_pStream(pStream) + , m_pOutputStream(pOutputStream) + , m_pGraphicObj(pGraphicObj) { } LwpSdwGroupLoaderV0102::~LwpSdwGroupLoaderV0102(void) diff --git a/lotuswordpro/source/filter/lwpsection.cxx b/lotuswordpro/source/filter/lwpsection.cxx index f413162e2d54..52812b9a079c 100644 --- a/lotuswordpro/source/filter/lwpsection.cxx +++ b/lotuswordpro/source/filter/lwpsection.cxx @@ -114,7 +114,7 @@ void LwpSection::Read() * @descr: do nothing * */ -void LwpSection::Parse(IXFStream *pOutputStream) +void LwpSection::Parse(IXFStream * /*pOutputStream*/) { } diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx index d83f62671baa..424124cc1a0f 100644 --- a/lotuswordpro/source/filter/lwpstory.cxx +++ b/lotuswordpro/source/filter/lwpstory.cxx @@ -541,7 +541,7 @@ sal_Bool LwpStory::IsBullStyleUsedBefore(const rtl::OUString& rStyleName, const { rtl::OUString aName = (*rIter).first; sal_uInt8 nPosition = (*rIter).second; - if ((*rIter).first == rStyleName && (*rIter).second == nPos) + if (aName == rStyleName && nPosition == nPos) { return sal_True; } diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx index 5c6f4c328da8..0584769c8e97 100644 --- a/lotuswordpro/source/filter/lwptable.cxx +++ b/lotuswordpro/source/filter/lwptable.cxx @@ -76,13 +76,16 @@ void LwpSuperTable::Read() m_pObjStrm->SkipExtra(); } - void LwpSuperTable::Parse(IXFStream* pOutputStream) + +void LwpSuperTable::Parse(IXFStream* /*pOutputStream*/) { } //Added by for XFConvert refactor, 03/31/2005 -void LwpSuperTable::XFConvert(XFContentContainer* pCont) -{} +void LwpSuperTable::XFConvert(XFContentContainer* /*pCont*/) +{ +} + //End of Add /*****************************************************************************/ LwpTable::LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpContent(objHdr, pStrm) @@ -126,7 +129,7 @@ sal_Bool LwpTable::IsNumberDown() return sal_False; } - void LwpTable::Parse(IXFStream* pOutputStream) +void LwpTable::Parse(IXFStream* /*pOutputStream*/) { } @@ -150,7 +153,8 @@ void LwpTableHeading::Read() { m_pObjStrm->SkipExtra(); } - void LwpTableHeading::Parse(IXFStream* pOutputStream) + +void LwpTableHeading::Parse(IXFStream* /*pOutputStream*/) { } @@ -197,7 +201,8 @@ void LwpTableHint::Read() m_pObjStrm->SkipExtra(); } - void LwpTableHint::Parse(IXFStream* pOutputStream) + +void LwpTableHint::Parse(IXFStream* /*pOutputStream*/) { } diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index d943fda92873..cf427574abc1 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -429,7 +429,7 @@ void LwpSuperTableLayout::RegisterFrameStyle() } LwpTableLayout::LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) - : LwpLayout(objHdr, pStrm),m_pXFTable(NULL), m_nRows(0), m_nCols(0) + : LwpLayout(objHdr, pStrm), m_nRows(0), m_nCols(0), m_pXFTable(NULL) { m_CellsMap.clear(); m_pColumns = NULL; @@ -466,11 +466,10 @@ LwpCellLayout * LwpTableLayout::GetCellByRowCol(sal_uInt16 nRow, sal_uInt16 nCol */ void LwpTableLayout::TraverseTable() { - sal_uInt32 iLoop, jLoop; sal_uInt32 nCount = m_nRows*m_nCols; // new cell map nRow*nCOl and initialize - for(iLoop = 0;iLoop<nCount; iLoop++) + for (sal_uInt32 iLoop = 0; iLoop < nCount; ++iLoop) { m_WordProCellsMap.push_back(GetDefaultCellLayout()); } @@ -1346,8 +1345,6 @@ void LwpTableLayout::ConvertDefaultRow(XFTable* pXFTable,sal_uInt8 nStartCol, // current row doesn't exist in the file XFRow * pRow = new XFRow(); pRow->SetStyleName(m_DefaultRowStyleName); - sal_Bool bIsTop = sal_False; - sal_Bool bIsRight = sal_False; for (sal_uInt16 j =0;j < nEndCol-nStartCol; j++) { diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx index 7c02744e05cb..7d7aabaa97a3 100644 --- a/lotuswordpro/source/filter/lwptblcell.cxx +++ b/lotuswordpro/source/filter/lwptblcell.cxx @@ -98,10 +98,12 @@ void LwpCellList::Read() m_pObjStrm->SkipExtra(); } - void LwpCellList::Parse(IXFStream* pOutputStream) + +void LwpCellList::Parse(IXFStream* /*pOutputStream*/) { } -void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* pCellsMap) + +void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* /*pCellsMap*/) { LwpObjectID aValueID = GetValueID(); LwpNumericValue* pValue = (LwpNumericValue*)aValueID.obj(); @@ -124,7 +126,7 @@ void LwpNumericValue::Read() m_pObjStrm->SkipExtra(); } - void LwpNumericValue::Parse(IXFStream* pOutputStream) + void LwpNumericValue::Parse(IXFStream* /*pOutputStream*/) { } ////////////////////////////////////////////////////////////////// @@ -149,7 +151,7 @@ void LwpRowList::Read() m_pObjStrm->SkipExtra(); } - void LwpRowList::Parse(IXFStream* pOutputStream) + void LwpRowList::Parse(IXFStream* /*pOutputStream*/) { } @@ -169,9 +171,11 @@ void LwpTableRange::Read() cpCellRange.ReadIndexed(m_pObjStrm); m_pObjStrm->SkipExtra(); } - void LwpTableRange::Parse(IXFStream* pOutputStream) + +void LwpTableRange::Parse(IXFStream* /*pOutputStream*/) { } + ////////////////////////////////////////////////////////////////// LwpCellRange::LwpCellRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpObject(objHdr, pStrm) {} @@ -184,9 +188,11 @@ void LwpCellRange::Read() cpFolder.ReadIndexed(m_pObjStrm); m_pObjStrm->SkipExtra(); } - void LwpCellRange::Parse(IXFStream* pOutputStream) + +void LwpCellRange::Parse(IXFStream* /*pOutputStream*/) { } + ////////////////////////////////////////////////////////////////// LwpFolder::LwpFolder(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm) @@ -209,12 +215,14 @@ void LwpFolder::Read() cqTable.ReadIndexed(m_pObjStrm); m_pObjStrm->SkipExtra(); } - void LwpFolder::Parse(IXFStream* pOutputStream) + +void LwpFolder::Parse(IXFStream* /*pOutputStream*/) { } + ////////////////////////////////////////////////////////////////// - LwpDependent::LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm) +LwpDependent::LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm) {} LwpDependent::~LwpDependent() @@ -230,7 +238,8 @@ void LwpDependent::Read() m_pObjStrm->SkipExtra(); } - void LwpDependent::Parse(IXFStream* pOutputStream) + +void LwpDependent::Parse(IXFStream* /*pOutputStream*/) { } ////////////////////////////////////////////////////////////////// diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index 3b58bbcdd368..3463c5f4e850 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -71,7 +71,9 @@ ////////////////////////////////////////////////////////////////// LwpFormulaInfo::LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm) -:LwpCellList(objHdr, pStrm),m_nFormulaRow(0),m_bSupported(sal_True) + : LwpCellList(objHdr, pStrm) + , m_bSupported(sal_True) + , m_nFormulaRow(0) {} LwpFormulaInfo::~LwpFormulaInfo() @@ -447,7 +449,7 @@ LwpFormulaConst::LwpFormulaConst(double dVal) * @param * @return sal_Bool. */ -String LwpFormulaConst::ToString(LwpTableLayout* pCellsMap) +String LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/) { return String::CreateFromDouble(m_dVal); } diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx index 272c0d6ac969..ba3e319a98be 100644 --- a/lotuswordpro/source/filter/lwptblformula.hxx +++ b/lotuswordpro/source/filter/lwptblformula.hxx @@ -132,7 +132,7 @@ class LwpFormulaText:public LwpFormulaArg { public: LwpFormulaText( String aText); - virtual String ToString(LwpTableLayout* pCellsMap){return m_aText;} + virtual String ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;} private: String m_aText; }; diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx index e4fa79b99f1b..9f3f53b2d836 100644 --- a/lotuswordpro/source/filter/lwptoc.cxx +++ b/lotuswordpro/source/filter/lwptoc.cxx @@ -438,7 +438,7 @@ void LwpTocLevelData::RegisterStyle() * @param pCont - container * @return none */ -void LwpTocLevelData::XFConvert(XFContentContainer* pCont) +void LwpTocLevelData::XFConvert(XFContentContainer* /*pCont*/) { } /** diff --git a/lotuswordpro/source/filter/lwpvpointer.cxx b/lotuswordpro/source/filter/lwpvpointer.cxx index 2cb6e3b187f9..2b90efb4822e 100644 --- a/lotuswordpro/source/filter/lwpvpointer.cxx +++ b/lotuswordpro/source/filter/lwpvpointer.cxx @@ -66,8 +66,10 @@ void LwpVersionedPointer::Read() if( LwpFileHeader::m_nFileRevision < 0x0006 ) m_pObjStrm->SkipExtra(); } -void LwpVersionedPointer::Parse(IXFStream* pOutputStream) -{} + +void LwpVersionedPointer::Parse(IXFStream* /*pOutputStream*/) +{ +} void LwpVersionedPointer::RegisterStyle() { diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index 6cd1fb2ece07..6eb740020583 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -99,7 +99,10 @@ CBenTOCReader::ReadLabel(unsigned long * pTOCOffset, unsigned long * pTOCSize) BenByte * pCurrLabel = Label + BEN_MAGIC_BYTES_SIZE; - BenWord Flags = UtGetIntelWord(pCurrLabel); pCurrLabel += 2; // Flags +#ifndef NDEBUG + BenWord Flags = +#endif + UtGetIntelWord(pCurrLabel); pCurrLabel += 2; // Flags // Newer files are 0x0101--indicates if big or little endian. Older // files are 0x0 for flags assert(Flags == 0x0101 || Flags == 0x0); diff --git a/lotuswordpro/source/filter/utbenvs.cxx b/lotuswordpro/source/filter/utbenvs.cxx index 728f7fad5ff7..50ae0acfcd56 100644 --- a/lotuswordpro/source/filter/utbenvs.cxx +++ b/lotuswordpro/source/filter/utbenvs.cxx @@ -85,7 +85,7 @@ ULONG LtcUtBenValueStream::GetData( void* pData, ULONG nSize ) //GetAmountLeft(&AmtLeft); //unsigned long AmtShouldRead = UtMin(nSize, AmtLeft); - BenError Err = cpValue->ReadValueData(pData, cCurrentPosition, nSize, + /*BenError Err = */cpValue->ReadValueData(pData, cCurrentPosition, nSize, &AmtRead); cCurrentPosition += AmtRead; @@ -98,7 +98,7 @@ ULONG LtcUtBenValueStream::GetData( void* pData, ULONG nSize ) * @param size of buffer to be written * @return number of bytes written into value stream */ -ULONG LtcUtBenValueStream::PutData( const void* pData, ULONG nSize ) +ULONG LtcUtBenValueStream::PutData( const void* /*pData*/, ULONG nSize ) { /* Because we only support IMPORT filter, PutData implementation is ignored It won't bring negative influence to read-only stream object */ @@ -125,9 +125,9 @@ ULONG LtcUtBenValueStream::PutData( const void* pData, ULONG nSize ) * @param size of buffer * @return */ - void LtcUtBenValueStream::SetSize( ULONG nSize ) + void LtcUtBenValueStream::SetSize( ULONG /*nSize*/ ) { - pLtcBenContainer pContainer = cpValue->GetContainer(); + //pLtcBenContainer pContainer = cpValue->GetContainer(); //pContainer->GetStream()->SetStreamSize(nSize); return; diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx index 04af342cceb3..492102f2bbc1 100644 --- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx @@ -80,7 +80,7 @@ void XFBGImage::SetImageData(sal_uInt8 *buf, int len) m_bUserFileLink = sal_False; } -sal_Bool XFBGImage::Equal(IXFStyle *pStyle) +sal_Bool XFBGImage::Equal(IXFStyle * /* pStyle */) { return sal_False; } diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx index 86833d69fa6a..279a4933b819 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.cxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx @@ -209,6 +209,8 @@ void XFBorders::SetColor(enumXFBorder side, XFColor& color) case enumXFBorderBottom: m_aBorderBottom.SetColor(color); break; + default: + break; } } @@ -228,6 +230,8 @@ void XFBorders::SetWidth(enumXFBorder side, double width) case enumXFBorderBottom: m_aBorderBottom.SetWidth(width); break; + default: + break; } } @@ -247,6 +251,8 @@ void XFBorders::SetDoubleLine(enumXFBorder side, sal_Bool dual,sal_Bool bSame case enumXFBorderBottom: m_aBorderBottom.SetDoubleLine(dual,bSameWidth); break; + default: + break; } } @@ -266,6 +272,8 @@ void XFBorders::SetWidthInner(enumXFBorder side, double inner) case enumXFBorderBottom: m_aBorderBottom.SetWidthInner(inner); break; + default: + break; } } @@ -285,6 +293,8 @@ void XFBorders::SetWidthSpace(enumXFBorder side, double space) case enumXFBorderBottom: m_aBorderBottom.SetWidthSpace(space); break; + default: + break; } } @@ -304,6 +314,8 @@ void XFBorders::SetWidthOutter(enumXFBorder side, double outer) case enumXFBorderBottom: m_aBorderBottom.SetWidthOutter(outer); break; + default: + break; } } diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index 3d7b405647c9..e6e5fe306f9d 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -76,7 +76,7 @@ XFCell::XFCell() m_bProtect = sal_False; } -XFCell::XFCell(const XFCell& other) +XFCell::XFCell(const XFCell& other) : XFContentContainer(other) { if( other.m_pSubTable ) m_pSubTable = new XFTable(*other.m_pSubTable); diff --git a/lotuswordpro/source/filter/xfilter/xfchange.cxx b/lotuswordpro/source/filter/xfilter/xfchange.cxx index ffe151f08b3c..53ba78add7b3 100644 --- a/lotuswordpro/source/filter/xfilter/xfchange.cxx +++ b/lotuswordpro/source/filter/xfilter/xfchange.cxx @@ -77,7 +77,7 @@ void XFChangeList::ToXml(IXFStream *pStrm) pStrm->EndElement(A2OUSTR("text:tracked-changes")); } -void XFChangeRegion::ToXml(IXFStream *pStrm) +void XFChangeRegion::ToXml(IXFStream * /*pStrm*/) { } diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx index e070773c1e49..e558ad62f789 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx @@ -147,7 +147,7 @@ void XFColumnSep::ToXml(IXFStream *pStrm) pStrm->EndElement( A2OUSTR("style:column-sep") ); } -void XFColumns::SetSeperator(sal_Int32 height, double width, XFColor color,enumXFAlignType align) +void XFColumns::SetSeperator(sal_Int32 height, double /*width*/, XFColor color,enumXFAlignType align) { m_aSeperator.SetRelHeight(height); m_aSeperator.SetWidth(0.1); diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx index 52ca417d6e99..36974f41fa88 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx @@ -136,8 +136,8 @@ private: inline IXFContent* XFContentContainer::GetContent(sal_uInt32 index) const { - if( index<0 || index>m_aContents.size()-1 ) + if (index > m_aContents.size()-1) return NULL; return m_aContents[index]; } -#endif
\ No newline at end of file +#endif diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx index 19bdb680df81..54596207b8cc 100644 --- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx @@ -250,7 +250,7 @@ inline void XFDateStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddAmPm(sal_Bool bAmPm) +inline void XFDateStyle::AddAmPm(sal_Bool /*bAmPm*/) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateAmPm); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx index ac51035d1d8c..76848ebd2cf0 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx @@ -95,6 +95,8 @@ void XFDrawLine::ToXml(IXFStream *pStrm) case enumXFAnchorFrame: pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("frame") ); break; + default: + break; } pAttrList->AddAttribute( A2OUSTR("draw:z-index"), Int32ToOUString(m_nZIndex) ); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx index 58becedda290..5400506f73b9 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx @@ -108,6 +108,8 @@ void XFDrawObject::ToXml(IXFStream *pStrm) case enumXFAnchorFrame: pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("frame") ); break; + default: + break; } pAttrList->AddAttribute( A2OUSTR("draw:z-index"), Int32ToOUString(m_nZIndex) ); diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx index 971779b4c370..b81a8232a820 100644 --- a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx @@ -78,7 +78,7 @@ class XFFontFactory public: XFFontFactory(); ~XFFontFactory(); - XFFontFactory(const XFFontFactory& other){} + XFFontFactory(const XFFontFactory&){} public: /** diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx index 682be26d05d2..597a366d3cb1 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx @@ -109,7 +109,7 @@ void XFFrame::Add(IXFContent *pContent) } -void XFFrame::SetZIndex(sal_Int32 zIndex) +void XFFrame::SetZIndex(sal_uInt32 zIndex) { if( zIndex == m_nZIndex ) return; @@ -165,6 +165,8 @@ void XFFrame::StartFrame(IXFStream *pStrm) case enumXFAnchorFrame: pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("frame") ); break; + default: + break; } pAttrList->AddAttribute( A2OUSTR("svg:x"), DoubleToOUString(m_aRect.GetX()) + A2OUSTR("cm") ); pAttrList->AddAttribute( A2OUSTR("svg:y"), DoubleToOUString(m_aRect.GetY()) + A2OUSTR("cm") ); diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx index 329889bac27c..736a6bca9648 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx @@ -111,7 +111,7 @@ public: /** * @descr Set z-index of the frame. */ - void SetZIndex(sal_Int32 zIndex); + void SetZIndex(sal_uInt32 zIndex); /** * @descr Set frame position X. */ diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx index 55c409c6a999..55261e3b2d8e 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx @@ -180,7 +180,7 @@ protected: enumXFFrameYRel m_eYRel; }; -inline void XFFrameStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs) +inline void XFFrameStyle::SetWrapType(enumXFWrap wrap, sal_Int32 /*nParagraphs*/) { m_eWrap = wrap; } diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx index fc640941066c..037816fef0c3 100644 --- a/lotuswordpro/source/filter/xfilter/xfimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx @@ -119,6 +119,8 @@ void XFImage::ToXml(IXFStream *pStrm) case enumXFAnchorFrame: pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("frame") ); break; + default: + break; } pAttrList->AddAttribute( A2OUSTR("svg:x"), DoubleToOUString(m_aRect.GetX()) + A2OUSTR("cm") ); pAttrList->AddAttribute( A2OUSTR("svg:y"), DoubleToOUString(m_aRect.GetY()) + A2OUSTR("cm") ); diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx index bbbec2efe93a..50755add592c 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.cxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx @@ -111,7 +111,7 @@ void XFIndex::SetTitle(rtl::OUString title, rtl::OUString strParaStyle) } void XFIndex::AddTemplate(sal_uInt32 level, - rtl::OUString style, + rtl::OUString /*style*/, enumXFIndexTemplate type1, enumXFIndexTemplate type2, enumXFIndexTemplate type3, @@ -184,7 +184,7 @@ void XFIndex::AddTocSource(sal_uInt16 nLevel, const rtl::OUString sStyleName) m_aTOCSource[nLevel].push_back(sStyleName); } -void XFIndex::SetDefaultAlphaIndex(rtl::OUString strDivision,sal_Bool bRunin, sal_Bool bSeparator) +void XFIndex::SetDefaultAlphaIndex(rtl::OUString /*strDivision*/,sal_Bool bRunin, sal_Bool bSeparator) { XFIndexTemplate * pTemplateSep = new XFIndexTemplate(); if (bSeparator) @@ -320,11 +320,11 @@ void XFIndex::ToXml(IXFStream *pStrm) pAttrList->AddAttribute( A2OUSTR("text:outline-level"), Int32ToOUString(i)); pStrm->StartElement( A2OUSTR("text:index-source-styles") ); - std::vector<rtl::OUString>::iterator it; - for (it = m_aTOCSource[i].begin(); it != m_aTOCSource[i].end(); it++) + std::vector<rtl::OUString>::iterator it_str; + for (it_str = m_aTOCSource[i].begin(); it_str != m_aTOCSource[i].end(); it++) { pAttrList->Clear(); - pAttrList->AddAttribute( A2OUSTR("text:style-name"), *it); + pAttrList->AddAttribute( A2OUSTR("text:style-name"), *it_str); pStrm->StartElement( A2OUSTR("text:index-source-style") ); pStrm->EndElement( A2OUSTR("text:index-source-style") ); } @@ -406,6 +406,8 @@ void XFIndexTemplate::ToXml(IXFStream *pStrm) case enumXFTabChar: pAttrList->AddAttribute( A2OUSTR("style:type"), A2OUSTR("char") ); break; + default: + break; } //delimiter: if( m_eTabType == enumXFTabChar ) @@ -443,6 +445,8 @@ void XFIndexTemplate::ToXml(IXFStream *pStrm) pStrm->StartElement( A2OUSTR("text:index-entry-bibliography") ); pStrm->EndElement( A2OUSTR("text:index-entry-bibliography") ); break; + default: + break; } } diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx index 85372248d2cc..a4899bb15e19 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx @@ -75,7 +75,7 @@ XFListLevel::XFListLevel() m_eListType = enumXFListLevelNumber; } -void XFListLevel::ToXml(IXFStream *pStrm) +void XFListLevel::ToXml(IXFStream * /*pStrm*/) { } @@ -259,7 +259,7 @@ void XFListStyle::SetListPosition(sal_Int32 level, XFListLevel *pLevel = m_pListLevels[level-1]; if( !pLevel ) { - XFListLevelBullet * pLevel = new XFListLevelBullet(); + pLevel = new XFListLevelBullet(); pLevel->SetListlevelType(enumXFListLevelNumber); pLevel->SetLevel(level+1); pLevel->SetIndent(indent); diff --git a/lotuswordpro/source/filter/xfilter/xfoleobj.cxx b/lotuswordpro/source/filter/xfilter/xfoleobj.cxx index 6d458532a91a..58810a7f6393 100644 --- a/lotuswordpro/source/filter/xfilter/xfoleobj.cxx +++ b/lotuswordpro/source/filter/xfilter/xfoleobj.cxx @@ -98,6 +98,8 @@ void XFOleObject::ToXml(IXFStream *pStrm) case enumXFAnchorFrame: pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("frame") ); break; + default: + break; } pAttrList->AddAttribute( A2OUSTR("svg:x"), DoubleToOUString(m_aRect.GetX()) + A2OUSTR("cm") ); pAttrList->AddAttribute( A2OUSTR("svg:y"), DoubleToOUString(m_aRect.GetY()) + A2OUSTR("cm") ); diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx index 901b05d626ac..2e6db728d556 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx @@ -122,7 +122,7 @@ XFParaStyle::XFParaStyle(XFParaStyle& other) m_aPadding = other.m_aPadding; m_aBreaks = other.m_aBreaks; // m_aTabs = other.m_aTabs; - for( int i=0; i<other.m_aTabs.GetCount(); i++ ) + for (size_t i=0; i<other.m_aTabs.GetCount(); ++i) { IXFStyle *pStyle = other.m_aTabs.Item(i); if( pStyle ) @@ -169,7 +169,7 @@ XFParaStyle& XFParaStyle::operator=(XFParaStyle& other) m_aPadding = other.m_aPadding; m_aBreaks = other.m_aBreaks; // m_aTabs = other.m_aTabs; - for( int i=0; i<other.m_aTabs.GetCount(); i++ ) + for (size_t i=0; i<other.m_aTabs.GetCount(); ++i) { IXFStyle *pStyle = other.m_aTabs.Item(i); if( pStyle ) @@ -282,6 +282,8 @@ void XFParaStyle::SetLineHeight(enumLHType type, double value) case enumLHSpace: m_aLineHeight.SetSpace(value*0.5666); //don't known why,just suspect. break; + default: + break; } } diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx index f70b01f89747..3301aef76815 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx @@ -93,6 +93,8 @@ rtl::OUString XFShadow::ToString() case enumXFShadowLeftTop: buf += A2OUSTR(" -") + strOff + A2OUSTR("cm") + A2OUSTR(" -") + strOff + A2OUSTR("cm"); break; + default: + break; } return buf; diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx index 7287dc720c24..f923e52c20db 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx @@ -102,7 +102,7 @@ void XFStyle::SetStyleFamily(enumXFStyle family) m_enumFamily = family; } -sal_Bool XFStyle::Equal(IXFStyle *pStyle) +sal_Bool XFStyle::Equal(IXFStyle * /*pStyle*/) { return sal_False; } diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx index 07031be674d8..618ad284233b 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx @@ -188,10 +188,10 @@ IXFStyle* XFStyleContainer::FindStyle(rtl::OUString name) return NULL; } -IXFStyle* XFStyleContainer::Item(int index) +IXFStyle* XFStyleContainer::Item(size_t index) { - assert(index>=0&&index<m_aStyles.size()); - if( index >=0 && index < m_aStyles.size() ) + assert(index<m_aStyles.size()); + if (index < m_aStyles.size()) { return m_aStyles[index]; } @@ -273,7 +273,7 @@ bool operator==(XFStyleContainer& b1, XFStyleContainer& b2) return false; if( b1.m_aStyles.size() != b2.m_aStyles.size() ) return false; - for( int i=0; i<b1.m_aStyles.size(); i++ ) + for( size_t i=0; i<b1.m_aStyles.size(); ++i ) { IXFStyle *pS1 = b1.m_aStyles[i]; IXFStyle *pS2 = b2.m_aStyles[i]; diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx index e6612e44c78f..744498de7259 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx @@ -110,12 +110,12 @@ public: /** * @descr get count of styles in the container. */ - sal_Int32 GetCount(); + size_t GetCount(); /** * @descr get style by index. */ - IXFStyle* Item(int index); + IXFStyle* Item(size_t index); /** * @descr Output all style. @@ -131,7 +131,7 @@ private: rtl::OUString m_strStyleNamePrefix; }; -inline sal_Int32 XFStyleContainer::GetCount() +inline size_t XFStyleContainer::GetCount() { return m_aStyles.size(); } diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx index 7909f0e24916..b812d5813835 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx @@ -64,8 +64,8 @@ #include "xfstylemanager.hxx" #include "ixfstyle.hxx" -XFStyleManager::XFStyleManager() : s_aStdArrowStyles( A2OUSTR("arrow") ),s_aListStyles( A2OUSTR("L") ), - s_aTextStyles( A2OUSTR("T") ),s_aParaStyles( A2OUSTR("P") ),s_aSectionStyles( A2OUSTR("Sect") ), +XFStyleManager::XFStyleManager() : s_aStdArrowStyles( A2OUSTR("arrow") ), s_aTextStyles( A2OUSTR("T") ), + s_aParaStyles( A2OUSTR("P") ),s_aListStyles( A2OUSTR("L") ),s_aSectionStyles( A2OUSTR("Sect") ), s_aPageMasters( A2OUSTR("PM") ),s_aMasterpages( A2OUSTR("MP") ),s_aDateStyles( A2OUSTR("N") ), s_aGraphicsStyles( A2OUSTR("fr") ),s_aTableStyles( A2OUSTR("table") ),s_aTableCellStyles( A2OUSTR("cell") ), s_aTableRowStyles( A2OUSTR("row") ),s_aTableColStyles( A2OUSTR("col") ),s_pOutlineStyle(NULL) diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx index dbcf73683fe2..33ec9ffd9fb6 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx @@ -89,7 +89,7 @@ class XFStyleManager// : public IXFObject public: XFStyleManager(); ~XFStyleManager(); - XFStyleManager(XFStyleManager& other){} + XFStyleManager(XFStyleManager&){} public: /** diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx index 9d7dde531297..06b7766b31b6 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.cxx +++ b/lotuswordpro/source/filter/xfilter/xftable.cxx @@ -288,7 +288,7 @@ void XFTable::ToXml(IXFStream *pStrm) //output rows: { int lastRow = 0; - IXFAttrList *pAttrList = pStrm->GetAttrList(); + pAttrList = pStrm->GetAttrList(); std::map<sal_Int32,XFRow* >::iterator it = m_aRows.begin(); for( ; it!=m_aRows.end(); it++ ) diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx index bdddd05aff2c..7ea6cb1d94b5 100644 --- a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx @@ -90,6 +90,8 @@ void XFTabStyle::ToXml(IXFStream *pStrm) case enumXFTabChar: pAttrList->AddAttribute( A2OUSTR("style:type"), A2OUSTR("char") ); break; + default: + break; } //delimiter: if( m_eType == enumXFTabChar ) diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx index dd7bb73c8c96..95039ac1ab75 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx @@ -105,6 +105,8 @@ void XFTimePart::ToXml(IXFStream *pStrm) pStrm->Characters( m_strText ); pStrm->EndElement( A2OUSTR("number:text") ); break; + default: + break; } } diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx index 3e9fe6886b61..2991f98a97c0 100644 --- a/lotuswordpro/source/filter/xfilter/xfutil.cxx +++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx @@ -90,7 +90,7 @@ rtl::OUString Int16ToOUString(sal_Int16 num) return rtl::OUString::valueOf(nNum); } -rtl::OUString FloatToOUString(float num, sal_Int32 precision) +rtl::OUString FloatToOUString(float num, sal_Int32 /*precision*/) { /*std::stringstream sstrm; std::string strRet; @@ -102,7 +102,7 @@ rtl::OUString FloatToOUString(float num, sal_Int32 precision) return rtl::OUString::valueOf(num); } -rtl::OUString DoubleToOUString(double num, sal_Int32 precision) +rtl::OUString DoubleToOUString(double num, sal_Int32 /*precision*/) { /*std::stringstream sstrm; std::string strRet; @@ -114,7 +114,7 @@ rtl::OUString DoubleToOUString(double num, sal_Int32 precision) return rtl::OUString::valueOf(num); } -rtl::OUString OEMToOUString(const std::string& str) +rtl::OUString OEMToOUString(const std::string& /*str*/) { return rtl::OUString(); } @@ -265,6 +265,8 @@ rtl::OUString GetReliefName(enumXFRelief type) case enumXFReliefEmbossed: return A2OUSTR("embossed"); break; + default: + break; } return A2OUSTR(""); } @@ -288,6 +290,8 @@ rtl::OUString GetCrossoutName(enumXFCrossout type) case enumXFCrossoutX: return A2OUSTR("X"); break; + default: + break; } return A2OUSTR(""); } @@ -307,6 +311,8 @@ rtl::OUString GetTransformName(enumXFTransform type) case enumXFTransformSmallCaps: return A2OUSTR("small-caps"); break; + default: + break; } return A2OUSTR(""); } @@ -326,6 +332,8 @@ rtl::OUString GetEmphasizeName(enumXFEmphasize type) case enumXFEmphasizeAccent: return A2OUSTR("accent"); break; + default: + break; } return A2OUSTR(""); } @@ -358,6 +366,8 @@ rtl::OUString GetTextDirName(enumXFTextDir dir) case enumXFTextDirTB_RL: return A2OUSTR("tb-rl"); break; + default: + break; } return A2OUSTR(""); } @@ -378,6 +388,8 @@ rtl::OUString GetFrameXPos(enumXFFrameXPos pos) case enumXFFrameXPosFromLeft: return A2OUSTR("from-left"); break; + default: + break; } return A2OUSTR(""); } @@ -425,6 +437,8 @@ rtl::OUString GetFrameXRel(enumXFFrameXRel rel) case enumXFFrameXRelFrameStartMargin: return A2OUSTR("frame-start-margin"); break; + default: + break; } return A2OUSTR(""); } @@ -521,6 +535,8 @@ rtl::OUString GetPageUsageName(enumXFPageUsage usage) return A2OUSTR("right"); case enumXFPageUsageMirror: return A2OUSTR("mirrored"); + default: + return A2OUSTR("mirrored"); } return A2OUSTR(""); } @@ -543,6 +559,8 @@ rtl::OUString GetValueType(enumXFValueType type) return A2OUSTR("string"); case enumXFValueTypeTime: return A2OUSTR("time"); + default: + return A2OUSTR("mirrored"); } return A2OUSTR(""); } |