[Libreoffice-commits] .: 7 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_xmloff filter/source hwpfilter/source unoxml/source writerperfect/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 24 06:47:44 PST 2011
binfilter/bf_basic/source/classes/sbunoobj.cxx | 2
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 2
binfilter/bf_sch/source/core/sch_chtmod2a.cxx | 44 ----------
binfilter/bf_sch/source/core/sch_chtmod3d.cxx | 8 -
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 5 -
binfilter/bf_sch/source/core/sch_chtmode4.cxx | 4
binfilter/bf_sd/source/core/sd_sdpage.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx | 14 ---
binfilter/bf_starmath/source/starmath_cfgitem.cxx | 1
binfilter/bf_starmath/source/starmath_parse.cxx | 34 +++----
binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvmain.cxx | 3
binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvspln.cxx | 9 --
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx | 5 -
binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx | 3
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 10 --
binfilter/bf_svx/source/xoutdev/svx_xline.cxx | 4
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx | 2
filter/source/graphicfilter/ipict/ipict.cxx | 4
hwpfilter/source/drawing.h | 3
hwpfilter/source/hwpreader.cxx | 14 +--
hwpfilter/source/list.hxx | 1
unoxml/source/dom/documentbuilder.cxx | 10 --
writerperfect/source/filter/Style.hxx | 2
23 files changed, 44 insertions(+), 142 deletions(-)
New commits:
commit 3c2cf47e5660c900fa7c1de08d0f7daf9834565f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 14:47:29 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 9e052c3..9ffeec1 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -360,17 +360,9 @@ namespace DOM
return Reference< XDocument >(static_cast< CDocument* >(CNode::get((xmlNodePtr)pDoc)));
}
- Reference< XDocument > SAL_CALL CDocumentBuilder::parseSource(const InputSource& is)
+ Reference< XDocument > SAL_CALL CDocumentBuilder::parseSource(const InputSource& /*is*/)
throw (RuntimeException, SAXParseException, IOException)
{
- // if there is an encoding specified in the input source, use it
- xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
- if (is.sEncoding.getLength() > 0) {
- OString oEncstr = OUStringToOString(is.sEncoding, RTL_TEXTENCODING_UTF8);
- char *encstr = (char*) oEncstr.getStr();
- enc = xmlParseCharEncoding(encstr);
- }
-
// set up parser context
xmlParserCtxtPtr ctxt = xmlNewParserCtxt();
// register error functions to prevent errors being printed
commit 8eb87c6199d2be6aa36ad42358c84883a460e2a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 11:04:05 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index ffd0a9d..60cc5ab 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -386,19 +386,19 @@ void HwpReader::makeMeta()
rchars((hconv(hwpinfo->summary.keyword[1], gstr)));
rendEl(ascii("meta:keyword"));
}
- if (hwpinfo->summary.keyword[2][0])
+ if (hwpinfo->summary.etc[0][0])
{
rstartEl(ascii("meta:keyword"), rList);
rchars((hconv(hwpinfo->summary.etc[0], gstr)));
rendEl(ascii("meta:keyword"));
}
- if (hwpinfo->summary.etc[0][0])
+ if (hwpinfo->summary.etc[1][0])
{
rstartEl(ascii("meta:keyword"), rList);
rchars((hconv(hwpinfo->summary.etc[1], gstr)));
rendEl(ascii("meta:keyword"));
}
- if (hwpinfo->summary.etc[1][0])
+ if (hwpinfo->summary.etc[2][0])
{
rstartEl(ascii("meta:keyword"), rList);
rchars((hconv(hwpinfo->summary.etc[2], gstr)));
@@ -570,7 +570,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
{
char filename[128];
char dirname[128];
- int fd, res;
+ int fd;
#ifdef _WIN32
GetTempPath(sizeof(dirname), dirname);
sprintf(filename, "%s%s",dirname, emp->name);
@@ -581,7 +581,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
if( (fd = open( filename , O_CREAT | O_WRONLY , 0666)) >= 0 )
#endif
{
- res = write( fd, emp->data, emp->size );
+ write( fd, emp->data, emp->size );
close(fd);
}
#ifdef _WIN32
@@ -3354,18 +3354,14 @@ void HwpReader::makeDateFormat(DateCode * hbox)
rstartEl(ascii("number:date-style"), rList);
pList->clear();
- bool is_pm;
bool add_zero = false;
int zero_check = 0/*, i=0*/;
hbox->format[DATE_SIZE -1] = 0;
hchar *fmt = hbox->format[0] ? hbox->format : defaultform;
-//hstr2ksstr(fmt, buf);
for( ; *fmt ; fmt++ )
{
- is_pm = (hbox->date[DateCode::HOUR] >= 12 );
-
if( zero_check == 1 )
{
zero_check = 0;
commit 6f7a84b5f0855a7c3d40eac88577819bdbad1525
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:41:10 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/writerperfect/source/filter/Style.hxx b/writerperfect/source/filter/Style.hxx
index 2820415..d54f0c8 100644
--- a/writerperfect/source/filter/Style.hxx
+++ b/writerperfect/source/filter/Style.hxx
@@ -34,7 +34,7 @@
class TopLevelElementStyle
{
public:
- TopLevelElementStyle() : mpsMasterPageName(NULL) { }
+ TopLevelElementStyle() : mpsMasterPageName(0) { }
virtual ~TopLevelElementStyle() { if (mpsMasterPageName) delete mpsMasterPageName; }
void setMasterPageName(WPXString &sMasterPageName) { mpsMasterPageName = new WPXString(sMasterPageName); }
const WPXString * getMasterPageName() const { return mpsMasterPageName; }
commit 237dff0e35a0b7ef0ded9c64d170f27260610808
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:41:00 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 9a9e797..d8925bc 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -187,7 +187,7 @@ static bool SkipUnusedField(void)
static bool LoadCommonHeader(HWPDrawingObject * hdo, WORD * link_info)
{
- uint size, property_size, common_size;
+ uint size, common_size;
if( !hmem )
return FALSE;
@@ -202,7 +202,6 @@ static bool LoadCommonHeader(HWPDrawingObject * hdo, WORD * link_info)
}
common_size = HDOFILE_COMMON_SIZE;
- property_size = 44;
hdo->type = hmem->read2b();
*link_info = sal::static_int_cast<WORD>(hmem->read2b());
hdo->offset.x = hmem->read4b();
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index 043a214..02f6e00 100644
--- a/hwpfilter/source/list.hxx
+++ b/hwpfilter/source/list.hxx
@@ -41,6 +41,7 @@
* re-implements the same functionality, based on the STL.
*/
+#include <cstddef>
#include <vector>
template<class T>
commit c49d8ff441976a5aa04f61cb70089c6b7b6aa55f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:40:56 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 8756854..562e5e0 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -814,14 +814,12 @@ ULONG PictReader::ReadPixMapEtc( Bitmap &rBitmap, BOOL bBaseAddr, BOOL bColorTab
else if ( nPixelSize == 16 )
{
BYTE nByteCountAsByte, nFlagCounterByte;
- USHORT nByteCount, nCount, nDestBPL,nD;
+ USHORT nByteCount, nCount, nD;
ULONG nSrcBitsPos;
if ( nRowBytes < 2 * nWidth )
BITMAPERROR;
- nDestBPL = ( ( 3 * nWidth ) + 0x0003 ) & 0xfffc;
-
for ( ny = 0; ny < nHeight; ny++ )
{
nx = 0;
commit 54678e0f666eb778dda2c68269d13121a483035e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:40:02 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
index 79a3949..af160ee 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
@@ -1210,7 +1210,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
case W_META_SETPIXEL:
{
- const Color aColor = ReadColor();
+ ReadColor();
GetWinExtMax( ReadYX(), rPlaceableBound, nMapMode );
}
break;
@@ -1231,12 +1231,11 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
case W_META_EXTTEXTOUT:
{
sal_uInt16 nLen, nOptions;
- sal_Int32 nRecordPos, nRecordSize;
+ sal_Int32 nRecordSize;
Point aPosition;
Rectangle aRect;
pStm->SeekRel(-6);
- nRecordPos = pStm->Tell();
*pStm >> nRecordSize;
pStm->SeekRel(2);
aPosition = ReadYX();
diff --git a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
index 4df9e5a..6f8ace2 100644
--- a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
@@ -194,9 +194,8 @@ namespace binfilter {
/*N*/
/*N*/ // Texturen erzeugen?
/*N*/ double fTextureDepth=1.0;
-/*N*/ double fTextureStart=0.0;
/*N*/ if(!GetCreateTexture())
-/*N*/ fTextureStart = fTextureDepth = 0.0;
+/*N*/ fTextureDepth = 0.0;
/*N*/
/*N*/ // aPrev bis aBack ausfuellen als Startvorbereitung
/*N*/ aRotMat.RotateY(-(fAng / (double)GetHorizontalSegments()));
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index 1d0bd5e..ecece77 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -1074,9 +1074,7 @@ namespace binfilter {
/*N*/ void E3dObject::WriteData(SvStream& rOut) const
/*N*/ {
/*N*/ #ifndef SVX_LIGHT
-/*N*/ long position = rOut.Tell();
/*N*/ SdrAttrObj::WriteData(rOut);
-/*N*/ position = rOut.Tell();
/*N*/
/*N*/ // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
@@ -1084,9 +1082,7 @@ namespace binfilter {
/*N*/ aCompat.SetID("E3dObject");
/*N*/ #endif
/*N*/
-/*N*/ position = rOut.Tell();
/*N*/ pSub->Save(rOut);
-/*N*/ position = rOut.Tell();
/*N*/
/*N*/ if (rOut.GetVersion() < 3560)
/*N*/ {
@@ -1105,7 +1101,6 @@ namespace binfilter {
/*N*/ {
/*N*/ WriteOnlyOwnMembers(rOut);
/*N*/ }
-/*N*/ position = rOut.Tell();
/*N*/ #endif
/*N*/ }
@@ -1117,12 +1112,9 @@ namespace binfilter {
/*N*/ void E3dObject::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
-/*N*/ long position = rIn.Tell();
/*N*/ if (ImpCheckSubRecords (rHead, rIn))
/*N*/ {
-/*N*/ position = rIn.Tell();
/*N*/ SdrAttrObj::ReadData(rHead, rIn);
-/*N*/ position = rIn.Tell();
/*N*/ // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
/*N*/ SdrDownCompat aCompat(rIn, STREAM_READ);
/*N*/ #ifdef DBG_UTIL
@@ -1130,7 +1122,6 @@ namespace binfilter {
/*N*/ #endif
/*N*/ pSub->Load(rIn, *pPage);
/*N*/
-/*N*/ position = rIn.Tell();
/*N*/ if ((rIn.GetVersion() < 3560) || (rHead.GetVersion() <= 12))
/*N*/ {
/*N*/ UINT16 nTmp16;
@@ -1150,7 +1141,6 @@ namespace binfilter {
/*N*/ {
/*N*/ ReadOnlyOwnMembers(rHead, rIn);
/*N*/ }
-/*N*/ position = rIn.Tell();
/*N*/
/*N*/ // Wie ein veraendertes Objekt behandeln
/*N*/ SetTransformChanged();
commit 3994d87599ffededd2af2485b0eb3790b767466b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 23 21:07:38 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/binfilter/bf_basic/source/classes/sbunoobj.cxx b/binfilter/bf_basic/source/classes/sbunoobj.cxx
index c31f836..e1e1f23 100644
--- a/binfilter/bf_basic/source/classes/sbunoobj.cxx
+++ b/binfilter/bf_basic/source/classes/sbunoobj.cxx
@@ -376,7 +376,6 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
Type aType = aValue.getValueType();
TypeClass eTypeClass = aType.getTypeClass();
- sal_Int32 indicesIndex = indices.getLength() -1;
sal_Int32 dimCopy = dimension;
if ( eTypeClass == TypeClass_SEQUENCE )
@@ -396,7 +395,6 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
sizes.realloc( sizes.getLength() + 1 );
sizes[ sizes.getLength() - 1 ] = nLen;
indices.realloc( indices.getLength() + 1 );
- indicesIndex = indices.getLength() - 1;
}
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index 7d7ceee..b31395b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -574,7 +574,6 @@ namespace binfilter {
/*N*/ const sal_Unicode* pSrc = pStart + nSrcPos;
/*N*/ BOOL bi18n = FALSE;
/*N*/ sal_Unicode c = *pSrc;
-/*N*/ sal_Unicode cLast = 0;
/*N*/ BOOL bQuote = FALSE;
/*N*/ ScanState eState = ssGetChar;
/*N*/ xub_StrLen nSpaces = 0;
@@ -689,7 +688,6 @@ namespace binfilter {
/*N*/ default:
/*N*/ break;
/*N*/ }
-/*N*/ cLast = c;
/*N*/ c = *pSrc;
/*N*/ }
/*N*/ if ( bi18n )
diff --git a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
index 7223876..d2ed296 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
@@ -209,19 +209,12 @@ namespace binfilter {
/*?*/ Point aCircPos = aCircRect.TopLeft();
/*?*/
/*?*/ long nAngleDiff;
-/*?*/ long nAngleHook;
/*?*/
/*?*/ // determine the bisector angle
/*?*/ if (nStartAng > nEndAng)
-/*?*/ {
/*?*/ nAngleDiff = (nEndAng + 36000 - nStartAng) / 2;
-/*?*/ nAngleHook = (nStartAng + nAngleDiff) % 36000;
-/*?*/ }
/*?*/ else
-/*?*/ {
/*?*/ nAngleDiff = (nEndAng - nStartAng) / 2;
-/*?*/ nAngleHook = nStartAng + nAngleDiff;
-/*?*/ }
/*?*/
/*?*/ // set the text position according to the position of the pie
/*?*/ if (nStartAng < 9000)
@@ -1142,29 +1135,6 @@ namespace binfilter {
/*N*/
/*N*/ fOldData [nCol] = fData;
/*N*/
-/*N*/ ChartAdjust eAdjust;
-/*N*/
-/*N*/ if (fAngle > 0 && fAngle < F_PI / 4)
-/*N*/ {
-/*?*/ eAdjust = CHADJUST_CENTER_LEFT;
-/*N*/ }
-/*N*/ else if (fAngle >= F_PI / 4 && fAngle <= 3 * F_PI / 4)
-/*N*/ {
-/*N*/ eAdjust = CHADJUST_BOTTOM_CENTER;
-/*N*/ }
-/*N*/ else if (fAngle > 3 * F_PI / 4 && fAngle <= 5 * F_PI / 4)
-/*N*/ {
-/*N*/ eAdjust = CHADJUST_CENTER_RIGHT;
-/*N*/ }
-/*N*/ else if (fAngle > 5 * F_PI / 4 && fAngle <= 7 * F_PI / 4)
-/*N*/ {
-/*N*/ eAdjust = CHADJUST_TOP_CENTER;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ eAdjust = CHADJUST_CENTER_LEFT;
-/*N*/ }
-/*N*/
/*N*/ if (pDescription)
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP");
@@ -1265,11 +1235,9 @@ namespace binfilter {
/*?*/ {
/*?*/ double fTotal = 0.0;
/*?*/ double fMax = 0.0;
-/*?*/ long nDirty = 0;
long nRows = 0;
/*?*/
-/*?*/ // Calculate the total of all segements with percentage value and
-/*?*/ // remember the largest segment's index in nDirty and its value in fMax.
+/*?*/ // Calculate the total of all segements with percentage value
/*?*/ for (nRows = nStart;nRows < nRowCnt;nRows ++)
/*?*/ if (pDescrLists [nRows])
/*?*/ {
@@ -1283,10 +1251,7 @@ namespace binfilter {
/*?*/ {
/*?*/ fTotal += fTemp;
/*?*/ if (fMax < fTemp)
-/*?*/ {
/*?*/ fMax = fTemp;
-/*?*/ nDirty = nIndex;
-/*?*/ }
/*?*/ }
/*?*/ }
/*?*/ }
@@ -1321,11 +1286,9 @@ namespace binfilter {
/*?*/
/*?*/ double fTotal = 0.0;
/*?*/ double fMax = 0.0;
-/*?*/ long nDirty = 0;
long nCols = 0;
/*?*/
-/*?*/ // Calculate the total of all segements with a percentage value and
-/*?*/ // remember the largest segment's index in nDirty and its value in fMax.
+/*?*/ // Calculate the total of all segements with a percentage value
/*?*/ for (nCols = 0;nCols < nColCnt;nCols ++)
/*?*/ {
/*?*/ long nIndex = nCols + nRows * nColCnt;
@@ -1338,10 +1301,7 @@ namespace binfilter {
/*?*/ {
/*?*/ fTotal += fTemp;
/*?*/ if (fMax < fTemp)
-/*?*/ {
/*?*/ fMax = fTemp;
-/*?*/ nDirty = nIndex;
-/*?*/ }
/*?*/ }
/*?*/ }
/*?*/ }
diff --git a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
index 472f7a8..fdad4e7 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
@@ -208,11 +208,11 @@ namespace binfilter {
/*N*/ SvxChartTextOrient eDescrOrient = ((const SvxChartTextOrientItem&)pXAxisAttr->Get(SCHATTR_TEXT_ORIENT)).GetValue();
/*N*/ SvxChartTextOrient eValueOrient = ((const SvxChartTextOrientItem&)pYAxisAttr->Get(SCHATTR_TEXT_ORIENT)).GetValue();
/*N*/
-/*N*/ Size aMaxValueSizeY = pChartYAxis->CalcMaxTextSize(eValueOrient);
-/*N*/ Size aMaxValueSizeX = pChartXAxis->CalcMaxTextSize(eDescrOrient);
+/*N*/ pChartYAxis->CalcMaxTextSize(eValueOrient);
+/*N*/ pChartXAxis->CalcMaxTextSize(eDescrOrient);
/*N*/
-/*N*/ Size aMaxDescrSizeY = CalcMaxDescrSize( TRUE, eValueOrient, bPercent, CHAXIS_AXIS_Y );
-/*N*/ Size aMaxDescrSizeX = CalcMaxDescrSize( FALSE, eDescrOrient, bPercent, CHAXIS_AXIS_X );
+/*N*/ CalcMaxDescrSize( TRUE, eValueOrient, bPercent, CHAXIS_AXIS_Y );
+/*N*/ CalcMaxDescrSize( FALSE, eDescrOrient, bPercent, CHAXIS_AXIS_X );
/*N*/
/*N*/ short nV, i;
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index c2805f0..b01f291 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -335,11 +335,9 @@ enum ChartStyleV0
/*N*/
/*N*/ if (i < nCnt)
/*N*/ {
-/*N*/ BOOL bIsSymbol = FALSE;
/*N*/ BOOL bIsLine = FALSE;
/*N*/ if(HasSymbols(nIndex))
/*N*/ {
-/*N*/ bIsSymbol = TRUE;
/*N*/ pObj = CreateSymbol (Point (aTextPos.X () + nLegendHeight / 2,
/*N*/ aTextPos.Y () + nLegendHeight / 2 + nLittleSpace / 3),
/*N*/ nIndex, 0, (SfxItemSet &) GetDataRowAttr(nIndex), nLegendHeight, FALSE);
@@ -1423,9 +1421,8 @@ enum ChartStyleV0
/*N*/ for (i = 0; i < ROW_COLOR_COUNT; i++)
/*N*/ rIn >> aDummyColor;
/*N*/
-/*N*/ long nOverlap;
/*N*/ rIn >> nInt32; //nGapWidth = (long)nInt32;
-/*N*/ rIn >> nInt32; nOverlap = (long)nInt32;
+/*N*/ rIn >> nInt32; //nOverlap = (long)nInt32;
/*N*/ rIn >> nInt32;
/*N*/ DBG_ASSERT( nInt32 == 100, "LoadAttributes: nMarkLen's value differs from 100 in this stream" );
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode4.cxx b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
index 1095fb1..9448765 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode4.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
@@ -1019,8 +1019,8 @@ namespace binfilter {
/*N*/ pGroupObject = GetObjWithId(CHOBJID_DIAGRAM_TITLE_Y_AXIS, *pPage);
/*N*/ if (pGroupObject != NULL)
/*N*/ {
-/*N*/ Rectangle Test1 = pGroupObject->GetBoundRect();
-/*N*/ Rectangle Test2 = pGroupObject->GetSnapRect();
+/*N*/ pGroupObject->GetBoundRect();
+/*N*/ pGroupObject->GetSnapRect();
/*N*/ aTitleYAxisPosition = SetPointOfRectangle(pGroupObject->GetBoundRect(), eAdjustYAxesTitle);
/*N*/ DeleteObject(pGroupObject);
/*N*/ }
diff --git a/binfilter/bf_sd/source/core/sd_sdpage.cxx b/binfilter/bf_sd/source/core/sd_sdpage.cxx
index 1efd601..91d63f4 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage.cxx
@@ -748,11 +748,9 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
Rectangle aTitleRect;
Rectangle aLayoutRect;
- BOOL bFound = FALSE;
for (nMasterIndex = 0; nMasterIndex < nMasterCount; nMasterIndex++)
{
- bFound = FALSE;
pMasterObj = (SdrObject*) pList->GetObject(nMasterIndex);
if (pMasterObj && pMasterObj->GetObjInventor() == SdrInventor)
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
index a3ebbaa..840ae7f 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
@@ -124,8 +124,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
const SfxItemPropertyMap* pMap = maPropSet.getPropertyMapEntry(aPropertyName);
- sal_Bool bValuesChanged = sal_False;
-
switch( pMap ? pMap->nWID : -1 )
{
case ATTR_PRESENT_ALL:
@@ -138,7 +136,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if( pDoc->GetPresAll() != bVal )
{
pDoc->SetPresAll( bVal );
- bValuesChanged = sal_True;
if( bVal )
pDoc->SetCustomShow( false );
}
@@ -153,7 +150,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if ( bVal == pDoc->GetPresLockedPages() )
{
- bValuesChanged = sal_True;
pDoc->SetPresLockedPages( !bVal );
}
break;
@@ -168,7 +164,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->IsAnimationAllowed() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetAnimationAllowed(bVal);
}
break;
@@ -192,7 +187,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
pDoc->SetCustomShow( true );
- bValuesChanged = sal_True;
}
break;
}
@@ -205,7 +199,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->GetPresEndless() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetPresEndless(bVal);
}
break;
@@ -219,7 +212,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->GetPresFullScreen() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetPresFullScreen(bVal);
}
break;
@@ -233,7 +225,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
pDoc->SetCustomShow(false);
pDoc->SetPresAll(false);
- bValuesChanged = sal_True;
break;
}
case ATTR_PRESENT_MANUEL:
@@ -245,7 +236,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->GetPresManual() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetPresManual(bVal);
}
break;
@@ -259,7 +249,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->GetPresMouseVisible() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetPresMouseVisible(bVal);
}
break;
@@ -273,7 +262,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->GetPresAlwaysOnTop() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetPresAlwaysOnTop(bVal);
}
break;
@@ -287,7 +275,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->GetStartPresWithNavigator() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetStartPresWithNavigator(bVal);
}
break;
@@ -301,7 +288,6 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
if(pDoc->GetPresMouseAsPen() != bVal)
{
- bValuesChanged = sal_True;
pDoc->SetPresMouseAsPen(bVal);
}
break;
diff --git a/binfilter/bf_starmath/source/starmath_cfgitem.cxx b/binfilter/bf_starmath/source/starmath_cfgitem.cxx
index a2be986..1ed57ed 100644
--- a/binfilter/bf_starmath/source/starmath_cfgitem.cxx
+++ b/binfilter/bf_starmath/source/starmath_cfgitem.cxx
@@ -584,6 +584,7 @@ static const char* aRootName = "Office.Math";
/*N*/ ++pValue;
/*N*/
/*N*/ DBG_ASSERT( bOK, "read FontFormat failed" );
+/*N*/ (void)bOK;
/*N*/ }
/*N*/
/*N*/ return aRes;
diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx b/binfilter/bf_starmath/source/starmath_parse.cxx
index 6a5180d..ac7a9aa 100644
--- a/binfilter/bf_starmath/source/starmath_parse.cxx
+++ b/binfilter/bf_starmath/source/starmath_parse.cxx
@@ -1485,28 +1485,28 @@ const sal_Int32 coNumContFlags =
/*N*/ {
/*N*/ NextToken();
/*N*/
-/*N*/ sal_Unicode cChar;
/*N*/ switch (CurToken.eType)
-/*N*/ { case TLPARENT : cChar = MS_LPARENT; break;
-/*N*/ case TRPARENT : cChar = MS_RPARENT; break;
-/*N*/ case TLBRACKET : cChar = MS_LBRACKET; break;
-/*N*/ case TRBRACKET : cChar = MS_RBRACKET; break;
-/*N*/ case TLDBRACKET : cChar = MS_LDBRACKET; break;
-/*N*/ case TRDBRACKET : cChar = MS_RDBRACKET; break;
+/*N*/ { case TLPARENT :
+/*N*/ case TRPARENT :
+/*N*/ case TLBRACKET :
+/*N*/ case TRBRACKET :
+/*N*/ case TLDBRACKET :
+/*N*/ case TRDBRACKET :
/*N*/ case TLBRACE :
-/*N*/ case TLGROUP : cChar = MS_LBRACE; break;
+/*N*/ case TLGROUP :
/*N*/ case TRBRACE :
-/*N*/ case TRGROUP : cChar = MS_RBRACE; break;
-/*N*/ case TLANGLE : cChar = MS_LANGLE; break;
-/*N*/ case TRANGLE : cChar = MS_RANGLE; break;
-/*N*/ case TLCEIL : cChar = MS_LCEIL; break;
-/*N*/ case TRCEIL : cChar = MS_RCEIL; break;
-/*N*/ case TLFLOOR : cChar = MS_LFLOOR; break;
-/*N*/ case TRFLOOR : cChar = MS_RFLOOR; break;
+/*N*/ case TRGROUP :
+/*N*/ case TLANGLE :
+/*N*/ case TRANGLE :
+/*N*/ case TLCEIL :
+/*N*/ case TRCEIL :
+/*N*/ case TLFLOOR :
+/*N*/ case TRFLOOR :
/*N*/ case TLLINE :
-/*N*/ case TRLINE : cChar = MS_LINE; break;
+/*N*/ case TRLINE :
/*N*/ case TLDLINE :
-/*N*/ case TRDLINE : cChar = MS_DLINE; break;
+/*N*/ case TRDLINE :
+/*N*/ break;
/*N*/ default:
/*N*/ Error(PE_UNEXPECTED_TOKEN);
/*N*/ }
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvmain.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvmain.cxx
index 40f4625..d58980b 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvmain.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvmain.cxx
@@ -793,8 +793,7 @@ void BmapType::Draw(OutputDevice& rOut)
case SGF_BITIMAGE: {
GraphicFilter aFlt;
Graphic aGrf;
- USHORT nRet;
- nRet=aFlt.ImportGraphic(aGrf,aFNam);
+ aFlt.ImportGraphic(aGrf,aFNam);
aGrf.Draw(&rOut,Point(Pos1.x,Pos1.y),Size(Pos2.x-Pos1.x,Pos2.y-Pos1.y));
} break;
case SGF_SIMPVECT: {
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvspln.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvspln.cxx
index b25fd77..842652e 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvspln.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvspln.cxx
@@ -655,7 +655,7 @@ USHORT ParaSpline(USHORT n, double* x, double* y, BYTE MargCond,
double* bx, double* cx, double* dx,
double* by, double* cy, double* dy)
{
- USHORT Error,Marg;
+ USHORT Error;
USHORT i;
double deltX,deltY,delt,
alphX = 0,alphY = 0,
@@ -673,9 +673,8 @@ USHORT ParaSpline(USHORT n, double* x, double* y, BYTE MargCond,
}
}
switch (MargCond) {
- case 0: Marg=0; break;
+ case 0: break;
case 1: case 2: {
- Marg=MargCond;
alphX=Marg01; betX=MargN1;
alphY=Marg02; betY=MargN2;
} break;
@@ -684,7 +683,6 @@ USHORT ParaSpline(USHORT n, double* x, double* y, BYTE MargCond,
if (y[n]!=y[0]) return 4;
} break;
case 4: {
- Marg=1;
if (abs(Marg01)>=MAXROOT) {
alphX=0.0;
alphY=sign(1.0,y[1]-y[0]);
@@ -739,7 +737,7 @@ BOOL CalcSpline(Polygon& rPoly, BOOL Periodic, USHORT& n,
double*& cx, double*& cy, double*& dx, double*& dy, double*& T)
{
BYTE Marg;
- double Marg01,Marg02;
+ double Marg01;
double MargN1,MargN2;
USHORT i;
Point P0(-32768,-32768);
@@ -778,7 +776,6 @@ BOOL CalcSpline(Polygon& rPoly, BOOL Periodic, USHORT& n,
T =new double[n+1];
Marg01=0.0;
- Marg02=0.0;
MargN1=0.0;
MargN2=0.0;
if (n>0) n--; // n Korregieren (Anzahl der Teilpolynome)
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
index 73a0d1c..83932b4 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
@@ -567,7 +567,6 @@ namespace binfilter {
/*N*/ void XOutputDevice::ImpDrawLinePolygon(const Polygon& rPoly, BOOL bClosePoly)
/*N*/ {
/*N*/ Polygon aPoly( rPoly );
-/*N*/ const Point* pNextPoint;
/*N*/ Point aLineStartPos, aLineEndPos;
/*N*/ XLineParam aLParam, aStartParam, aEndParam;
/*N*/ USHORT nPntMax = aPoly.GetSize() - 1;
@@ -702,9 +701,6 @@ namespace binfilter {
/*?*/ break;
/*?*/ nPos++;
/*?*/ }
-/*?*/ if ( nPos+1 <= nPntMax ) pNextPoint = &aPoly[nPos+1];
-/*?*/ else if ( bClosePoly ) pNextPoint = &aPoly[0];
-/*?*/ else pNextPoint = NULL;
/*?*/
/*?*/ if ( nLineWidth > 0 )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
index 044fc63..dbf2fe8 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
@@ -1701,7 +1701,6 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer,
sal_Int16 nType ) const
{
enum XMLTokenEnum eFormat = XML_TOKEN_INVALID;
- sal_Bool bExt = sal_False;
switch( nType )
{
case NumberingType::CHARS_UPPER_LETTER: eFormat = XML_A_UPCASE; break;
@@ -1719,7 +1718,6 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer,
DBG_ASSERT( eFormat != XML_TOKEN_INVALID, "invalid number format" );
break;
default:
- bExt = sal_True;
break;
}
More information about the Libreoffice-commits
mailing list