[Libreoffice-commits] .: 2 commits - binfilter/bf_svx filter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jan 14 07:39:47 PST 2011
binfilter/bf_svx/source/xoutdev/makefile.mk | 2
binfilter/bf_svx/source/xoutdev/svx__xfont.cxx | 4 -
binfilter/bf_svx/source/xoutdev/svx__ximp.cxx | 2
binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx | 8 --
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 41 ++++++-------
binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx | 70 +++++++++++------------
binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx | 17 ++---
binfilter/bf_svx/source/xoutdev/svx_xline.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xpool.cxx | 18 ++---
binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx | 30 ++++-----
binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx | 32 ++++------
binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx | 22 +++----
binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx | 28 ++++-----
binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx | 20 +++---
binfilter/bf_svx/source/xoutdev/svx_xtable.cxx | 16 ++---
binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx | 28 ++++-----
filter/source/config/cache/typedetection.cxx | 22 ++++---
17 files changed, 178 insertions(+), 184 deletions(-)
New commits:
commit f74fcd2618ad5355f53bb89cadd850bf890d1172
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 14 10:51:47 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_svx/source/xoutdev/makefile.mk b/binfilter/bf_svx/source/xoutdev/makefile.mk
index 8618682..ca161a0 100644
--- a/binfilter/bf_svx/source/xoutdev/makefile.mk
+++ b/binfilter/bf_svx/source/xoutdev/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
index a5a50f1..17f3063 100644
--- a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
@@ -472,7 +472,7 @@ using namespace ::com::sun::star::i18n;
/*N*/ // #101145# Do create outline polygons more efficient
/*N*/ // #102382# new interface supporting PolyPolyVector
/*N*/ PolyPolyVector aPolyPolyVector;
-/*N*/ sal_Bool bOkay(ImpXOutGetTextOutlines(aPolyPolyVector, pOut, pInfo, nChar, nCnt));
+/*N*/ ImpXOutGetTextOutlines(aPolyPolyVector, pOut, pInfo, nChar, nCnt);
/*N*/
/*N*/ // #102382# iterate over single PolyPolygons
/*N*/ for(sal_uInt32 a(0); a < aPolyPolyVector.size(); a++)
@@ -571,7 +571,7 @@ using namespace ::com::sun::star::i18n;
/*?*/ // #108756#
/*?*/ // Here the wrong index was called for the ImpXOutGetTextOutlines(...)
/*?*/ // call. nChar needs to be added here to index the different characters.
-/*?*/ sal_Bool bOkay(ImpXOutGetTextOutlines(aPolyPolyVector, pOut, pInfo, nChar + i, nNextGlyphLen));
+/*?*/ ImpXOutGetTextOutlines(aPolyPolyVector, pOut, pInfo, nChar + i, nNextGlyphLen);
/*?*/
/*?*/ // #102382# iterate over single PolyPolygons
/*?*/ for(sal_uInt32 a(0); a < aPolyPolyVector.size(); a++)
diff --git a/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx b/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx
index 4143835..9a68a8e 100644
--- a/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx
@@ -147,7 +147,7 @@ namespace binfilter {
/*?*/ }
/*?*/ else if( eFillStyle == XFILL_GRADIENT )
/*?*/ {
-/*?*/ GDIMetaFile* pMtf = pOut->GetConnectMetaFile();
+/*?*/ /*GDIMetaFile* pMtf =*/ pOut->GetConnectMetaFile();
/*?*/ Gradient aVCLGradient;
/*?*/
/*?*/
diff --git a/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx b/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
index 718afec..b78e03e 100644
--- a/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
@@ -53,13 +53,13 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT nResize )
+/*N*/ ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT nInResize )
/*N*/ {
/*N*/ pPointAry = NULL;
/*N*/ pFlagAry = NULL;
/*N*/ bDeleteOldPoints = FALSE;
/*N*/ nSize = 0;
-/*N*/ ImpXPolygon::nResize = nResize;
+/*N*/ nResize = nInResize;
/*N*/ nPoints = 0;
/*N*/ nRefCount = 1;
/*N*/
@@ -84,7 +84,7 @@ namespace binfilter {
/*N*/ pFlagAry = NULL;
/*N*/ bDeleteOldPoints = FALSE;
/*N*/ nSize = 0;
-/*N*/ ImpXPolygon::nResize = rImpXPoly.nResize;
+/*N*/ nResize = rImpXPoly.nResize;
/*N*/ nPoints = 0;
/*N*/ nRefCount = 1;
/*N*/
@@ -211,8 +211,6 @@ namespace binfilter {
/*N*/ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
/*N*/ {
-/*N*/ USHORT nOldSize = nSize;
-/*N*/
/*N*/ CheckPointDelete();
/*N*/
/*N*/ if ( nPos > nPoints )
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 8c82c15..758eb56 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -431,7 +431,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/ SetValue( nValue );
/*N*/
@@ -756,7 +756,6 @@ XubString aNameOrIndexEmptyString;
/*N*/ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/
/*N*/ switch ( nMemberId )
@@ -874,7 +873,7 @@ XubString aNameOrIndexEmptyString;
/*N*/
/*N*/ case MID_LINEDASH_STYLE:
/*N*/ {
-/*?*/ sal_Int16 nVal;
+/*?*/ sal_Int16 nVal(0);
/*?*/ if(!(rVal >>= nVal))
/*?*/ return false;
/*?*/
@@ -892,7 +891,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ case MID_LINEDASH_DOTS:
/*N*/ case MID_LINEDASH_DASHES:
/*N*/ {
-/*?*/ sal_Int16 nVal;
+/*?*/ sal_Int16 nVal(0);
/*?*/ if(!(rVal >>= nVal))
/*?*/ return false;
/*?*/
@@ -913,7 +912,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ case MID_LINEDASH_DASHLEN:
/*N*/ case MID_LINEDASH_DISTANCE:
/*N*/ {
-/*?*/ sal_Int32 nVal;
+/*?*/ sal_Int32 nVal(0);
/*?*/ if(!(rVal >>= nVal))
/*?*/ return false;
/*?*/
@@ -1039,7 +1038,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/
/*N*/ SetValue( nValue );
@@ -1122,7 +1121,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ if(!(rVal >>= nValue))
/*N*/ return false;
/*N*/
@@ -2112,7 +2111,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/ SetValue( nValue );
/*N*/ return true;
@@ -2196,7 +2195,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/ SetValue( nValue );
/*N*/ return true;
@@ -2564,7 +2563,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ if(!(rVal >>= nValue ))
/*N*/ return false;
/*N*/
@@ -2594,9 +2593,9 @@ XubString aNameOrIndexEmptyString;
/*N*/ USHORT nYOfs, USHORT nTheBorder,
/*N*/ USHORT nStartIntens, USHORT nEndIntens,
/*N*/ USHORT nSteps) :
+/*N*/ eStyle(eTheStyle),
/*N*/ aStartColor(rStart),
/*N*/ aEndColor(rEnd),
-/*N*/ eStyle(eTheStyle),
/*N*/ nAngle(nTheAngle),
/*N*/ nBorder(nTheBorder),
/*N*/ nOfsX(nXOfs),
@@ -2878,7 +2877,6 @@ XubString aNameOrIndexEmptyString;
// -----------------------------------------------------------------------
/*N*/ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch ( nMemberId )
/*N*/ {
@@ -2930,7 +2928,6 @@ XubString aNameOrIndexEmptyString;
// -----------------------------------------------------------------------
/*N*/ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/
/*N*/ switch ( nMemberId )
@@ -2970,7 +2967,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ case MID_GRADIENT_STARTCOLOR:
/*N*/ case MID_GRADIENT_ENDCOLOR:
/*N*/ {
-/*?*/ sal_Int32 nVal;
+/*?*/ sal_Int32 nVal(0);
/*?*/ if(!(rVal >>= nVal ))
/*?*/ return sal_False;
/*?*/
@@ -2993,7 +2990,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ case MID_GRADIENT_XOFFSET:
/*N*/ case MID_GRADIENT_YOFFSET:
/*N*/ {
-/*?*/ sal_Int16 nVal;
+/*?*/ sal_Int16 nVal(0);
/*?*/ if(!(rVal >>= nVal ))
/*?*/ return sal_False;
/*?*/
@@ -3209,8 +3206,8 @@ XubString aNameOrIndexEmptyString;
/*N*/ XHatch::XHatch(const Color& rCol, XHatchStyle eTheStyle, long nTheDistance,
/*N*/ long nTheAngle) :
-/*N*/ aColor(rCol),
/*N*/ eStyle(eTheStyle),
+/*N*/ aColor(rCol),
/*N*/ nDistance(nTheDistance),
/*N*/ nAngle(nTheAngle)
/*N*/ {
@@ -3495,7 +3492,7 @@ XubString aNameOrIndexEmptyString;
/*N*/
/*N*/ case MID_HATCH_STYLE:
/*N*/ {
-/*?*/ sal_Int16 nVal;
+/*?*/ sal_Int16 nVal(0);
/*?*/ if (!(rVal >>= nVal ))
/*?*/ return sal_False;
/*?*/ aHatch.SetHatchStyle( (XHatchStyle)nVal );
@@ -3506,7 +3503,7 @@ XubString aNameOrIndexEmptyString;
/*N*/ case MID_HATCH_DISTANCE:
/*N*/ case MID_HATCH_ANGLE:
/*N*/ {
-/*?*/ sal_Int32 nVal;
+/*?*/ sal_Int32 nVal(0);
/*?*/ if (!(rVal >>= nVal ))
/*?*/ return sal_False;
/*?*/
@@ -3654,7 +3651,7 @@ XubString aNameOrIndexEmptyString;
// #FontWork#
/*N*/ bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/ SetValue((XFormTextStyle)nValue);
/*N*/
@@ -3759,7 +3756,7 @@ XubString aNameOrIndexEmptyString;
// #FontWork#
/*N*/ bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/ SetValue((XFormTextAdjust)nValue);
/*N*/
@@ -4120,7 +4117,7 @@ XubString aNameOrIndexEmptyString;
// #FontWork#
/*N*/ bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/ SetValue((XFormTextShadow)nValue);
/*N*/
@@ -4422,7 +4419,7 @@ XubString aNameOrIndexEmptyString;
// #FontWork#
/*N*/ bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ rVal >>= nValue;
/*N*/ SetValue((XFormTextStdForm)nValue);
/*N*/
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx
index ec945df..8f133fb 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx
@@ -102,7 +102,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new XLineTransparenceItem(*this);
/*N*/ }
@@ -117,7 +117,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new XLineTransparenceItem(rIn);
/*N*/ }
@@ -147,7 +147,7 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ USHORT XLineJointItem::GetVersion( USHORT nFileFormatVersion ) const
+/*N*/ USHORT XLineJointItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
/*N*/ {
/*N*/ return 1;
/*N*/ }
@@ -166,7 +166,7 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new XLineJointItem( *this );
/*N*/ }
@@ -176,7 +176,7 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ ::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
/*N*/
@@ -206,7 +206,7 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ XLineJoint eJoint = XLINEJOINT_NONE;
/*N*/ ::com::sun::star::drawing::LineJoint eUnoJoint;
@@ -236,6 +236,8 @@ namespace binfilter {
/*N*/ case ::com::sun::star::drawing::LineJoint_ROUND:
/*N*/ eJoint = XLINEJOINT_ROUND;
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/
/*N*/ SetValue( eJoint );
@@ -296,7 +298,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new XFillTransparenceItem(*this);
/*N*/ }
@@ -311,7 +313,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new XFillTransparenceItem(rIn);
/*N*/ }
@@ -364,7 +366,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new XFormTextShadowTranspItem(*this);
/*N*/ }
@@ -379,7 +381,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new XFormTextShadowTranspItem(rIn);
/*N*/ }
@@ -430,7 +432,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XGradientStepCountItem( *this );
/*N*/ }
@@ -445,7 +447,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new XGradientStepCountItem( rIn );
/*N*/ }
@@ -501,7 +503,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpTileItem( *this );
/*N*/ }
@@ -517,7 +519,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpTileItem( rIn );
/*N*/ }
@@ -582,7 +584,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpPosItem( *this );
/*N*/ }
@@ -598,7 +600,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpPosItem( rIn );
/*N*/ }
@@ -674,7 +676,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpSizeXItem( *this );
/*N*/ }
@@ -690,7 +692,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpSizeXItem( rIn );
/*N*/ }
@@ -765,7 +767,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpSizeYItem( *this );
/*N*/ }
@@ -781,7 +783,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpSizeYItem( rIn );
/*N*/ }
@@ -856,7 +858,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpSizeLogItem( *this );
/*N*/ }
@@ -872,7 +874,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpSizeLogItem( rIn );
/*N*/ }
@@ -937,7 +939,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpTileOffsetXItem( *this );
/*N*/ }
@@ -953,7 +955,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpTileOffsetXItem( rIn );
/*N*/ }
@@ -1018,7 +1020,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpTileOffsetYItem( *this );
/*N*/ }
@@ -1034,7 +1036,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpTileOffsetYItem( rIn );
/*N*/ }
@@ -1099,7 +1101,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpStretchItem( *this );
/*N*/ }
@@ -1115,7 +1117,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpStretchItem( rIn );
/*N*/ }
@@ -1180,7 +1182,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpPosOffsetXItem( *this );
/*N*/ }
@@ -1196,7 +1198,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpPosOffsetXItem( rIn );
/*N*/ }
@@ -1261,7 +1263,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBmpPosOffsetYItem( *this );
/*N*/ }
@@ -1277,7 +1279,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT nVer ) const
+/*N*/ SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new XFillBmpPosOffsetYItem( rIn );
/*N*/ }
@@ -1339,7 +1341,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* pPool ) const
+/*N*/ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new XFillBackgroundItem( *this );
/*N*/ }
@@ -1354,7 +1356,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new XFillBackgroundItem( rIn );
/*N*/ }
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
index f9a8d4a..c8a22e1 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
@@ -380,7 +380,6 @@ namespace binfilter {
/*N*/ void XOBitmap::Array2Bitmap()
/*N*/ {
/*N*/ VirtualDevice aVD;
-/*N*/ BOOL bPixelColor = FALSE;
/*N*/ USHORT nLines = 8; // von Type abhaengig
/*N*/
/*N*/ if( !pPixelArray )
@@ -517,7 +516,7 @@ namespace binfilter {
//*************************************************************************
-/*N*/ XFillBitmapItem::XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap )
+/*N*/ XFillBitmapItem::XFillBitmapItem( SfxItemPool* /*pPool*/, const XOBitmap& rTheBitmap )
/*N*/ : NameOrIndex( XATTR_FILLBITMAP, -1 ),
/*N*/ aXOBitmap( rTheBitmap )
/*N*/ {
@@ -533,7 +532,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ SfxPoolItem* XFillBitmapItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* XFillBitmapItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new XFillBitmapItem(*this);
/*N*/ }
@@ -649,7 +648,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ USHORT XFillBitmapItem::GetVersion( USHORT nFileFormatVersion ) const
+/*N*/ USHORT XFillBitmapItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
/*N*/ {
/*N*/ // 2. Version
/*N*/ return( 1 );
@@ -662,7 +661,6 @@ namespace binfilter {
/*N*/ bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ if( nMemberId == MID_NAME )
/*N*/ {
@@ -672,15 +670,15 @@ namespace binfilter {
/*N*/ }
/*N*/ else if( nMemberId == MID_GRAFURL )
/*N*/ {
-/*N*/ XOBitmap aXOBitmap( GetValue() );
+/*N*/ XOBitmap aTmpXOBitmap( GetValue() );
/*N*/ ::rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
-/*N*/ aURL += ::rtl::OUString::createFromAscii( aXOBitmap.GetGraphicObject().GetUniqueID().GetBuffer() );
+/*N*/ aURL += ::rtl::OUString::createFromAscii( aTmpXOBitmap.GetGraphicObject().GetUniqueID().GetBuffer() );
/*N*/ rVal <<= aURL;
/*N*/ }
/*N*/ else
/*N*/ {
-/*?*/ XOBitmap aXOBitmap( GetValue() );
-/*?*/ Bitmap aBmp( aXOBitmap.GetBitmap() );
+/*?*/ XOBitmap aTmpXOBitmap( GetValue() );
+/*?*/ Bitmap aBmp( aTmpXOBitmap.GetBitmap() );
/*?*/ BitmapEx aBmpEx( aBmp );
/*?*/
/*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp(
@@ -696,7 +694,6 @@ namespace binfilter {
/*N*/ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ if( nMemberId == MID_NAME )
/*N*/ {
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
index d630af8..14a36ab 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
@@ -395,7 +395,7 @@ namespace binfilter {
/*N*/ return aPoly;
/*N*/ }
-/*N*/ Polygon XOutCreatePolygonBezier( const XPolygon& rXPoly, OutputDevice* pOut )
+/*N*/ Polygon XOutCreatePolygonBezier( const XPolygon& rXPoly, OutputDevice* )
/*N*/ {
/*N*/ sal_uInt16 i, nPtCount = rXPoly.GetPointCount();
/*N*/ Polygon aPoly( nPtCount );
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx b/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx
index 6227f42..0431950 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx
@@ -88,21 +88,21 @@ static USHORT nVersion4Map[141];
/*N*/ }
-/*N*/ XOutdevItemPool::XOutdevItemPool(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
+/*N*/ XOutdevItemPool::XOutdevItemPool(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
/*N*/ SfxItemPool(String("XOutdevItemPool", gsl_getSystemTextEncoding()), nAttrStart, nAttrEnd, NULL, NULL, bLoadRefCounts)
/*N*/ {
-/*N*/ Ctor(pMaster,nAttrStart,nAttrEnd);
+/*N*/ Ctor(pInMaster,nAttrStart,nAttrEnd);
/*N*/ }
-/*N*/ void XOutdevItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
+/*N*/ void XOutdevItemPool::Ctor(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEnd)
/*N*/ {
/*N*/ // Mich als Secondary an den MasterPool (Joe)
-/*N*/ if (pMaster==NULL) {
-/*N*/ pMaster=this;
+/*N*/ if (pInMaster==NULL) {
+/*N*/ pInMaster=this;
/*N*/ } else {
/*N*/ // Ich ganz hinten dran
-/*N*/ SfxItemPool* pParent=pMaster;
+/*N*/ SfxItemPool* pParent=pInMaster;
/*N*/ while (pParent->GetSecondaryPool()!=NULL) {
/*?*/ pParent=pParent->GetSecondaryPool();
/*N*/ }
@@ -273,11 +273,11 @@ static USHORT nVersion4Map[141];
/*N*/ ppPoolDefaults[XATTR_FTRESERVED_LAST -XATTR_START] = new SfxVoidItem(XATTR_FTRESERVED_LAST);
/*N*/
/*N*/ // SetItems erzeugen
-/*N*/ pSet=new SfxItemSet(*pMaster, XATTR_LINE_FIRST, XATTR_LINE_LAST);
+/*N*/ pSet=new SfxItemSet(*pInMaster, XATTR_LINE_FIRST, XATTR_LINE_LAST);
/*N*/ ppPoolDefaults[XATTRSET_LINE - XATTR_START] = new XLineAttrSetItem(pSet);
-/*N*/ pSet=new SfxItemSet(*pMaster, XATTR_FILL_FIRST, XATTR_FILL_LAST);
+/*N*/ pSet=new SfxItemSet(*pInMaster, XATTR_FILL_FIRST, XATTR_FILL_LAST);
/*N*/ ppPoolDefaults[XATTRSET_FILL - XATTR_START] = new XFillAttrSetItem(pSet);
-/*N*/ pSet=new SfxItemSet(*pMaster, XATTR_TEXT_FIRST, XATTR_TEXT_LAST);
+/*N*/ pSet=new SfxItemSet(*pInMaster, XATTR_TEXT_FIRST, XATTR_TEXT_LAST);
/*N*/ ppPoolDefaults[XATTRSET_TEXT - XATTR_START] = new XTextAttrSetItem(pSet);
/*N*/
/*N*/ // ItemInfos
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
index a4771e9..5e320ae 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
@@ -117,7 +117,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/************************************************************************/
-/*N*/ Bitmap* XBitmapTable::CreateBitmapForUI( long nIndex, BOOL bDelete )
+/*N*/ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
/*N*/ {
/*N*/ return( NULL );
/*N*/ }
@@ -310,7 +310,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/************************************************************************/
-/*N*/ Bitmap* XBitmapList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+/*N*/ Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
/*N*/ {
/*N*/ return( NULL );
/*N*/ }
@@ -346,7 +346,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/
/*N*/ XBitmapEntry* pEntry = NULL;
/*N*/ long nCount;
-/*N*/ String aName;
+/*N*/ String aLclName;
/*N*/
/*N*/ rIn >> nCount; // Version oder Anzahl ?
/*N*/
@@ -358,10 +358,10 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ Bitmap aBmp;
/*N*/ XOBitmap aXOBitmap;
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> aBmp;
/*N*/
/*N*/ aXOBitmap.SetBitmap( aBmp );
@@ -376,7 +376,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ else
/*N*/ aXOBitmap.SetBitmapType( XBITMAP_IMPORT );
/*N*/
-/*N*/ pEntry = new XBitmapEntry( aXOBitmap, aName );
+/*N*/ pEntry = new XBitmapEntry( aXOBitmap, aLclName );
/*N*/ Insert( pEntry, nIndex );
/*N*/ }
/*N*/ }
@@ -385,10 +385,10 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ rIn >> nCount;
/*N*/ for( long nIndex = 0; nIndex < nCount; nIndex++ )
/*N*/ {
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ XOBitmap aXOBitmap;
/*N*/ INT16 iTmp;
@@ -421,7 +421,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ delete []pArray;
/*N*/ }
/*N*/
-/*N*/ pEntry = new XBitmapEntry( aXOBitmap, aName );
+/*N*/ pEntry = new XBitmapEntry( aXOBitmap, aLclName );
/*N*/ Insert( pEntry, nIndex );
/*N*/ }
/*N*/ }
@@ -433,10 +433,10 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ // Versionsverwaltung
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ XOBitmap aXOBitmap;
/*N*/ INT16 iTmp;
@@ -474,7 +474,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ // lesen neuer Daten ...
/*N*/ }
/*N*/
-/*N*/ pEntry = new XBitmapEntry( aXOBitmap, aName );
+/*N*/ pEntry = new XBitmapEntry( aXOBitmap, aLclName );
/*N*/ Insert( pEntry, nIndex );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
index 6230b12..5faeddc 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
@@ -460,7 +460,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ Bitmap* XColorTable::CreateBitmapForUI( long nIndex, BOOL bDelete )
+/*N*/ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
/*N*/ {
/*N*/ return( NULL );
/*N*/ }
@@ -530,7 +530,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ BOOL bFound = FALSE;
/*N*/
-/*N*/ for( int i=0; i<(sizeof(aDefResId) / sizeof(USHORT)) && !bFound; i++ )
+/*N*/ for( size_t i=0; i<(sizeof(aDefResId) / sizeof(USHORT)) && !bFound; i++ )
/*N*/ {
/*N*/ XubString aStrDefName = SVX_RESSTR( aDefResId[i] );
/*N*/ if( rStrName.Search( aStrDefName ) == 0 )
@@ -561,7 +561,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ USHORT nGreen;
/*N*/ USHORT nBlue;
/*N*/ Color aColor;
-/*N*/ XubString aName;
+/*N*/ XubString aLclName;
/*N*/
/*N*/ rIn >> nType;
/*N*/
@@ -573,9 +573,9 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ rIn >> nIndex;
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
-/*N*/ aName = ConvertName( aName );
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ rIn >> nRed;
/*N*/ rIn >> nGreen;
@@ -584,7 +584,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ aColor = Color( (BYTE) ( nRed >> 8 ),
/*N*/ (BYTE) ( nGreen >> 8 ),
/*N*/ (BYTE) ( nBlue >> 8 ) );
-/*N*/ pEntry = new XColorEntry( aColor, aName);
+/*N*/ pEntry = new XColorEntry( aColor, aLclName);
/*N*/ Insert (nIndex, pEntry);
/*N*/ }
/*N*/ }
@@ -598,11 +598,11 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ rIn >> nIndex;
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
-/*N*/ aName = ConvertName( aName );
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/
-/*N*/ if( aIOC.GetVersion() >= 0 )
+/*N*/ /*if( aIOC.GetVersion() >= 0 )*/
/*N*/ {
/*N*/ rIn >> nRed;
/*N*/ rIn >> nGreen;
@@ -611,14 +611,8 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ (BYTE) ( nGreen >> 8 ),
/*N*/ (BYTE) ( nBlue >> 8 ) );
/*N*/ }
- /*
- else if( aIOC.GetVersion() >= 1 )
- {
- // lesen neuer Daten ...
- }
- */
-/*N*/
-/*N*/ pEntry = new XColorEntry( aColor, aName );
+/*N*/
+/*N*/ pEntry = new XColorEntry( aColor, aLclName );
/*N*/ Insert( nIndex, pEntry );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index 215618d..678bdd6 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -129,7 +129,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ Bitmap* XDashTable::CreateBitmapForUI( long nIndex, BOOL bDelete )
+/*N*/ Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
/*N*/ {
/*N*/ return( NULL );
/*N*/ }
@@ -407,7 +407,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ BOOL bFound = FALSE;
/*N*/
-/*N*/ for( int i=0; i<(sizeof(aDefResId) / sizeof(USHORT)) && !bFound; i++ )
+/*N*/ for( size_t i=0; i<(sizeof(aDefResId) / sizeof(USHORT)) && !bFound; i++ )
/*N*/ {
/*N*/ XubString aStrDefName = SVX_RESSTR( aDefResId[i] );
/*N*/ if( rStrName.Search( aStrDefName ) == 0 )
@@ -432,7 +432,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ XDashEntry* pEntry = NULL;
/*N*/ long nCount;
-/*N*/ XubString aName;
+/*N*/ XubString aLclName;
/*N*/
/*N*/ long nStyle;
/*N*/ long nDots;
@@ -447,10 +447,10 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ for (long nIndex = 0; nIndex < nCount; nIndex++)
/*N*/ {
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nDots;
/*N*/ rIn >> nDotLen;
@@ -459,7 +459,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ rIn >> nDistance;
/*N*/ XDash aDash((XDashStyle)nStyle, (BYTE)nDots, nDotLen,
/*N*/ (BYTE)nDashes, nDashLen, nDistance);
-/*N*/ pEntry = new XDashEntry (aDash, aName);
+/*N*/ pEntry = new XDashEntry (aDash, aLclName);
/*N*/ Insert (pEntry, nIndex);
/*N*/ }
/*N*/ }
@@ -472,10 +472,10 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ // Versionsverwaltung
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nDots;
/*N*/ rIn >> nDotLen;
@@ -490,7 +490,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ XDash aDash((XDashStyle)nStyle, (BYTE)nDots, nDotLen,
/*N*/ (BYTE)nDashes, nDashLen, nDistance);
-/*N*/ pEntry = new XDashEntry (aDash, aName);
+/*N*/ pEntry = new XDashEntry (aDash, aLclName);
/*N*/ Insert (pEntry, nIndex);
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
index efa3709..e3343ce 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
@@ -125,7 +125,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ Bitmap* XGradientTable::CreateBitmapForUI( long nIndex, BOOL bDelete )
+/*N*/ Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
/*N*/ {
/*N*/ return( NULL );
/*N*/ }
@@ -388,7 +388,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XGradientEntry* pEntry = NULL;
/*N*/ long nCheck;
/*N*/ long nCount;
-/*N*/ XubString aName;
+/*N*/ XubString aLclName;
/*N*/
/*N*/ long nStyle;
/*N*/ USHORT nRed;
@@ -412,10 +412,10 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ for (long nIndex = 0; nIndex < nCount; nIndex++)
/*N*/ {
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nRed;
/*N*/ rIn >> nGreen;
@@ -441,7 +441,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XGradient aGradient( aStart, aEnd, (XGradientStyle)nStyle, nAngle,
/*N*/ (USHORT) nXOfs, (USHORT) nYOfs, (USHORT) nBorder,
/*N*/ (USHORT) nStartIntens, (USHORT) nEndIntens );
-/*N*/ pEntry = new XGradientEntry (aGradient, aName);
+/*N*/ pEntry = new XGradientEntry (aGradient, aLclName);
/*N*/ Insert (pEntry, nIndex);
/*N*/ }
/*N*/ }
@@ -450,10 +450,10 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ rIn >> nCount;
/*N*/ for (long nIndex = 0; nIndex < nCount; nIndex++)
/*N*/ {
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nRed;
/*N*/ rIn >> nGreen;
@@ -479,7 +479,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XGradient aGradient( aStart, aEnd, (XGradientStyle)nStyle, nAngle,
/*N*/ (USHORT) nXOfs, (USHORT) nYOfs, (USHORT) nBorder,
/*N*/ (USHORT) nStartIntens, (USHORT) nEndIntens );
-/*N*/ pEntry = new XGradientEntry (aGradient, aName);
+/*N*/ pEntry = new XGradientEntry (aGradient, aLclName);
/*N*/ Insert (pEntry, nIndex);
/*N*/ }
/*N*/ }
@@ -491,10 +491,10 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ // Versionsverwaltung
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nRed;
/*N*/ rIn >> nGreen;
@@ -525,7 +525,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XGradient aGradient( aStart, aEnd, (XGradientStyle)nStyle, nAngle,
/*N*/ (USHORT) nXOfs, (USHORT) nYOfs, (USHORT) nBorder,
/*N*/ (USHORT) nStartIntens, (USHORT) nEndIntens );
-/*N*/ pEntry = new XGradientEntry (aGradient, aName);
+/*N*/ pEntry = new XGradientEntry (aGradient, aLclName);
/*N*/ Insert (pEntry, nIndex);
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index 2a9ee16..5bdfb0f 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -127,7 +127,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ Bitmap* XHatchTable::CreateBitmapForUI( long nIndex, BOOL bDelete )
+/*N*/ Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
/*N*/ {
/*N*/ return( NULL );
/*N*/ }
@@ -408,7 +408,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ XHatchEntry* pEntry = NULL;
/*N*/ long nCount;
-/*N*/ XubString aName;
+/*N*/ XubString aLclName;
/*N*/
/*N*/ long nStyle;
/*N*/ USHORT nRed;
@@ -424,10 +424,10 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ for( long nIndex = 0; nIndex < nCount; nIndex++ )
/*N*/ {
-/*N*/ // UNICODE:rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE:rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nRed;
/*N*/ rIn >> nGreen;
@@ -439,7 +439,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ (BYTE) ( nGreen >> 8 ),
/*N*/ (BYTE) ( nBlue >> 8 ) );
/*N*/ XHatch aHatch(aColor, (XHatchStyle)nStyle, nDistance, nAngle);
-/*N*/ pEntry = new XHatchEntry (aHatch, aName);
+/*N*/ pEntry = new XHatchEntry (aHatch, aLclName);
/*N*/ Insert (pEntry, nIndex);
/*N*/ }
/*N*/ }
@@ -452,10 +452,10 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ // Versionsverwaltung
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nRed;
/*N*/ rIn >> nGreen;
@@ -472,7 +472,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ (BYTE) ( nGreen >> 8 ),
/*N*/ (BYTE) ( nBlue >> 8 ) );
/*N*/ XHatch aHatch(aColor, (XHatchStyle)nStyle, nDistance, nAngle);
-/*N*/ pEntry = new XHatchEntry (aHatch, aName);
+/*N*/ pEntry = new XHatchEntry (aHatch, aLclName);
/*N*/ Insert (pEntry, nIndex);
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
index fef4f5c..86e6438 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
@@ -61,10 +61,10 @@ namespace binfilter {
/*N*/ XPropertyTable::XPropertyTable( const String& rPath,
/*N*/ XOutdevItemPool* pInPool,
/*N*/ USHORT nInitSize, USHORT nReSize ) :
-/*N*/ aTable ( nInitSize, nReSize ),
-/*N*/ aPath ( rPath ),
/*N*/ aName ( pszStandard, 8 ),
+/*N*/ aPath ( rPath ),
/*N*/ pXPool ( pInPool ),
+/*N*/ aTable ( nInitSize, nReSize ),
/*N*/ pBmpTable ( NULL ),
/*N*/ bTableDirty ( TRUE ),
/*N*/ bBitmapsDirty ( TRUE ),
@@ -132,7 +132,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT nDummy ) const
+/*N*/ XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/ ) const
/*N*/ {
/*N*/ if( bTableDirty )
/*N*/ {
@@ -212,7 +212,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT nDummy )
+/*N*/ XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/ )
/*N*/ {
/*N*/ if( pBmpTable && !bBitmapsDirty )
/*N*/ {
@@ -247,10 +247,10 @@ namespace binfilter {
/*N*/ XPropertyList::XPropertyList( const String& rPath,
/*N*/ XOutdevItemPool* pInPool,
/*N*/ USHORT nInitSize, USHORT nReSize ) :
-/*N*/ aList ( nInitSize, nReSize ),
-/*N*/ aPath ( rPath ),
/*N*/ aName ( pszStandard, 8 ),
+/*N*/ aPath ( rPath ),
/*N*/ pXPool ( pInPool ),
+/*N*/ aList ( nInitSize, nReSize ),
/*N*/ pBmpList ( NULL ),
/*N*/ bListDirty ( TRUE ),
/*N*/ bBitmapsDirty ( TRUE ),
@@ -318,7 +318,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ XPropertyEntry* XPropertyList::Get( long nIndex, USHORT nDummy ) const
+/*N*/ XPropertyEntry* XPropertyList::Get( long nIndex, USHORT /*nDummy*/ ) const
/*N*/ {
/*N*/ if( bListDirty )
/*N*/ {
@@ -398,7 +398,7 @@ namespace binfilter {
|*
*************************************************************************/
-/*N*/ XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT nDummy )
+/*N*/ XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT /*nDummy*/ )
/*N*/ {
/*N*/ if( pBmpList && !bBitmapsDirty )
/*N*/ {
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
index 550259f..8768b89 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
@@ -133,7 +133,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ Bitmap* XLineEndTable::CreateBitmapForUI( long nIndex, BOOL bDelete )
+/*N*/ Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
/*N*/ {
/*N*/ return( NULL );
/*N*/ }
@@ -434,7 +434,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XLineEndEntry* pEntry = NULL;
/*N*/ long nVersion;
/*N*/ long nCount;
-/*N*/ XubString aName;
+/*N*/ XubString aLclName;
/*N*/ long nFlags;
/*N*/
/*N*/ rIn >> nVersion;
@@ -444,10 +444,10 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ nCount = nVersion;
/*N*/ for( long nI = 0; nI < nCount; nI++ )
/*N*/ {
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
/*N*/
-/*N*/ aName = ConvertName( aName );
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/ USHORT nPoints;
/*N*/ sal_uInt32 nTemp;
/*N*/ Point aPoint;
@@ -461,7 +461,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ pXPoly->Insert(nPoint, aPoint, (XPolyFlags)nFlags);
/*N*/ }
/*N*/
-/*N*/ pEntry = new XLineEndEntry( *pXPoly, aName );
+/*N*/ pEntry = new XLineEndEntry( *pXPoly, aLclName );
/*N*/ Insert( pEntry, nI );
/*N*/ }
/*N*/ }
@@ -470,14 +470,14 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ rIn >> nCount;
/*N*/ for( long nI = 0; nI < nCount; nI++ )
/*N*/ {
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
-/*N*/ aName = ConvertName( aName );
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ XPolygon* pXPoly = new XPolygon;
/*N*/ rIn >> *pXPoly;
/*N*/
-/*N*/ pEntry = new XLineEndEntry( *pXPoly, aName );
+/*N*/ pEntry = new XLineEndEntry( *pXPoly, aLclName );
/*N*/ Insert( pEntry, nI );
/*N*/ }
/*N*/ }
@@ -489,9 +489,9 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ // Versionsverwaltung
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
-/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadByteString(aName);
-/*N*/ aName = ConvertName( aName );
+/*N*/ // UNICODE: rIn >> aLclName;
+/*N*/ rIn.ReadByteString(aLclName);
+/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ XPolygon aXPoly;
/*N*/ rIn >> aXPoly;
@@ -501,7 +501,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ // lesen neuer Daten ...
/*N*/ }
/*N*/
-/*N*/ pEntry = new XLineEndEntry( aXPoly, aName );
+/*N*/ pEntry = new XLineEndEntry( aXPoly, aLclName );
/*N*/ Insert( pEntry, nI );
/*N*/ }
/*N*/ }
commit e425df9c7703f23a8aa367f99d9bed354b67c6c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 14 09:55:47 2011 +0000
catch exceptions from missing components here as well more cleanly
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 8f4beee..9560774 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -1007,13 +1007,21 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript
aLock.clear();
// <- SAFE
- // Attention! If e.g. an office module was not installed sometimes we find a
- // registered detect service, which is referred inside the configuration ... but not realy
- // installed. On the other side we use third party components here, which can make trouble anyway.
- // So we should handle errors during creation of such services more gracefully .-)
- xDetector = css::uno::Reference< css::document::XExtendedFilterDetection >(
- xSMGR->createInstance(sDetectService),
- css::uno::UNO_QUERY);
+ try
+ {
+ // Attention! If e.g. an office module was not installed sometimes we
+ // find a registered detect service, which is referred inside the
+ // configuration ... but not realy installed. On the other side we use
+ // third party components here, which can make trouble anyway. So we
+ // should handle errors during creation of such services more
+ // gracefully .-)
+ xDetector = css::uno::Reference< css::document::XExtendedFilterDetection >(
+ xSMGR->createInstance(sDetectService),
+ css::uno::UNO_QUERY_THROW);
+ }
+ catch (...)
+ {
+ }
if ( ! xDetector.is())
return ::rtl::OUString();
More information about the Libreoffice-commits
mailing list