sd/source/filter/eppt/pptx-text.cxx | 8 ++--- sw/source/filter/ww8/rtfattributeoutput.cxx | 2 - sw/source/filter/ww8/rtfexport.cxx | 2 - sw/source/filter/ww8/writerhelper.cxx | 42 ++++++++++++++-------------- sw/source/filter/ww8/wrtww8gr.cxx | 5 +-- sw/source/filter/ww8/ww8par.cxx | 4 +- sw/source/filter/ww8/ww8par.hxx | 4 +- sw/source/filter/ww8/ww8par3.cxx | 4 +- 8 files changed, 35 insertions(+), 36 deletions(-)
New commits: commit c388bdf4d29e282f3ba8152c581a9c8670d7b33d Author: Caolán McNamara <caol...@redhat.com> Date: Wed Mar 13 13:06:13 2013 +0000 WaE: various warngs, e.g. unused argument, variables, ordering Change-Id: I551ccf9b098d7f916bd889dbc82d22c0dc5c63f3 (cherry picked from commit ed740489ed39e0fc3ec43e3f3a1e6e9e366a2c5e) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 9673396..36dc481 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1326,7 +1326,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel, sal_Int16 nFirstLineIndex, sal_Int16 /*nListTabPos*/, const String &rNumberingString, - const SvxBrushItem* pBrush) + const SvxBrushItem* /*pBrush*/) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 687ae55..97f9b73 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -168,7 +168,7 @@ void RtfExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ ) } //For i120928,to export graphic of bullet for RTF filter -void RtfExport::ExportGrfBullet(const SwTxtNode& rNd) +void RtfExport::ExportGrfBullet(const SwTxtNode&) { SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC); } diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index ddd9e5a..b540868 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -151,16 +151,16 @@ namespace namespace sw { //For i120928,size conversion before exporting graphic of bullet - Frame::Frame(const Graphic&rGrf, const SwPosition &rPos) - :mpFlyFrm(NULL), - maPos(rPos), - maSize(), - maLayoutSize(), - mpStartFrameContent(0), - mbIsInline(true), - meWriterType(eBulletGrf), - maGrf(rGrf), - mbForBullet(true) + Frame::Frame(const Graphic &rGrf, const SwPosition &rPos) + : mpFlyFrm(NULL) + , maPos(rPos) + , maSize() + , maLayoutSize() + , meWriterType(eBulletGrf) + , mpStartFrameContent(0) + , mbIsInline(true) + , mbForBullet(true) + , maGrf(rGrf) { const MapMode aMap100mm( MAP_100TH_MM ); Size aSize( rGrf.GetPrefSize() ); @@ -177,17 +177,17 @@ namespace sw } Frame::Frame(const SwFrmFmt &rFmt, const SwPosition &rPos) - : mpFlyFrm(&rFmt), - maPos(rPos), - maSize(), - maLayoutSize(), // #i43447# - meWriterType(eTxtBox), - mpStartFrameContent(0), - // #i43447# - move to initialization list - mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) - // #i120928# - handle graphic of bullet within existing implementation - ,maGrf() - ,mbForBullet(false) + : mpFlyFrm(&rFmt) + , maPos(rPos) + , maSize() + , maLayoutSize() // #i43447# + , meWriterType(eTxtBox) + , mpStartFrameContent(0) + // #i43447# - move to initialization list + , mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) + // #i120928# - handle graphic of bullet within existing implementation + , mbForBullet(false) + , maGrf() { switch (rFmt.Which()) { diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 69fa966..e3facdf 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -809,7 +809,8 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, rStrm.Write( aArr, nHdrLen ); } -void SwWW8WrGrf::WriteGrfForBullet(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight) + +void SwWW8WrGrf::WriteGrfForBullet(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight) { if (rWrt.bWrtWW8) { @@ -820,8 +821,6 @@ void SwWW8WrGrf::WriteGrfForBullet(SvStream& rStrm, const Graphic &rGrf, sal_uI } else { - bool bSwapped = rGrf.IsSwapOut() ? true : false; - GDIMetaFile aMeta; switch (rGrf.GetType()) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 35220f6..26cfd3e 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4808,8 +4808,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) } } // update graphic bullet information - int nCount = pLstManager->GetWW8LSTInfoNum(); - for (int i = 0; i < nCount; ++i) + size_t nCount = pLstManager->GetWW8LSTInfoNum(); + for (size_t i = 0; i < nCount; ++i) { SwNumRule* pRule = pLstManager->GetNumRule(i); for (int j = 0; j < MAXLEVEL; ++j) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 88f693d..485177f 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -159,8 +159,8 @@ public: std::vector<sal_uInt8> &rParaSprms, SwTxtNode *pNode=0); SwNumRule* CreateNextRule(bool bSimple); ~WW8ListManager(); - SwNumRule* GetNumRule(int i); - int GetWW8LSTInfoNum() const{return maLSTInfos.size();} + SwNumRule* GetNumRule(size_t i); + size_t GetWW8LSTInfoNum() const{return maLSTInfos.size();} private: wwSprmParser maSprmParser; SwWW8ImplReader& rReader; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 8597f74..d8bb2f6 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1087,9 +1087,9 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple) return pMyNumRule; } -SwNumRule* WW8ListManager::GetNumRule(int i) +SwNumRule* WW8ListManager::GetNumRule(size_t i) { - if ( i >= 0 && i < maLSTInfos.size() ) + if (i < maLSTInfos.size()) return maLSTInfos[i]->pNumRule; else return 0; commit 9063dd06d15633f6c323c0146896b9e589bf1151 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 13 12:32:56 2013 +0200 Revert "Revert "WaE: enumeration value not handled in switch"" Nah. Apparently there can be even more different values for this field in documents which we should not handle, so using default: is wrong. This reverts commit 7bd108e7586bab6f1ae50b0a2ce9715d8df0fd49. (cherry picked from commit f4d4bb797b66908e9e45add4c94565576d8b6cf7) Signed-off-by: Michael Stahl <mst...@redhat.com> Conflicts: sd/source/filter/eppt/pptx-text.cxx Change-Id: I5e811d0471581b02e8138b59fbac6530d7267d9f diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 9e4876d..04578a2 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -878,7 +878,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 PortionObj* pPortion = front(); CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 ); - switch( (SvxExtNumType)nNumberingType ) + switch( nNumberingType ) { case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break; @@ -896,14 +896,14 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nParaFlags |= 0x90; // wir geben den Font und den Charset vor } } - case SVX_NUM_CHARS_UPPER_LETTER : // zaehlt von a-z, aa - az, ba - bz, ... + case SVX_NUM_CHARS_UPPER_LETTER : // count from a-z, aa - az, ba - bz, ... case SVX_NUM_CHARS_LOWER_LETTER : case SVX_NUM_ROMAN_UPPER : case SVX_NUM_ROMAN_LOWER : case SVX_NUM_ARABIC : - case SVX_NUM_PAGEDESC : // Numerierung aus der Seitenvorlage + case SVX_NUM_PAGEDESC : // numbering from the page template case SVX_NUM_BITMAP : - case SVX_NUM_CHARS_UPPER_LETTER_N : // zaehlt von a-z, aa-zz, aaa-zzz + case SVX_NUM_CHARS_UPPER_LETTER_N : // count from a-z, aa-zz, aaa-zzz case SVX_NUM_CHARS_LOWER_LETTER_N : case SVX_NUM_NUMBER_UPPER_ZH: case SVX_NUM_CIRCLE_NUMBER:
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits