summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-25 10:21:18 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-25 10:27:53 +0000
commit46e7066e0edac4a2d077a7164f819998baa6b204 (patch)
treef5167ba3a60cdb702d3b44a2b08c9b4e79ae819d
parent90d4b17a07f3c5fdd5ab5161bf11193e9f016985 (diff)
WaE: gcc 4.6.0 various warnings
-rw-r--r--connectivity/source/commontools/ConnectionWrapper.cxx12
-rw-r--r--editeng/source/editeng/editundo.cxx2
-rw-r--r--editeng/source/editeng/edtspell.cxx1
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx40
-rw-r--r--editeng/source/misc/svxacorr.cxx3
-rw-r--r--editeng/source/outliner/outlvw.cxx1
-rw-r--r--linguistic/source/convdic.cxx8
-rw-r--r--xmloff/source/style/PagePropertySetContext.cxx2
-rw-r--r--xmloff/source/xforms/xformsapi.cxx1
10 files changed, 16 insertions, 56 deletions
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 74ca78a4e4..591429eebb 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -215,11 +215,11 @@ void OConnectionWrapper::createUniqueId( const ::rtl::OUString& _rURL
{
// first we create the digest we want to have
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
- rtlDigestError aError = rtl_digest_update(aDigest,_rURL.getStr(),_rURL.getLength()*sizeof(sal_Unicode));
+ rtl_digest_update(aDigest,_rURL.getStr(),_rURL.getLength()*sizeof(sal_Unicode));
if ( _rUserName.getLength() )
- aError = rtl_digest_update(aDigest,_rUserName.getStr(),_rUserName.getLength()*sizeof(sal_Unicode));
+ rtl_digest_update(aDigest,_rUserName.getStr(),_rUserName.getLength()*sizeof(sal_Unicode));
if ( _rPassword.getLength() )
- aError = rtl_digest_update(aDigest,_rPassword.getStr(),_rPassword.getLength()*sizeof(sal_Unicode));
+ rtl_digest_update(aDigest,_rPassword.getStr(),_rPassword.getLength()*sizeof(sal_Unicode));
// now we need to sort the properties
PropertyValue* pBegin = _rInfo.getArray();
PropertyValue* pEnd = pBegin + _rInfo.getLength();
@@ -246,18 +246,18 @@ void OConnectionWrapper::createUniqueId( const ::rtl::OUString& _rURL
const ::rtl::OUString* pSBegin = aSeq.getConstArray();
const ::rtl::OUString* pSEnd = pSBegin + aSeq.getLength();
for(;pSBegin != pSEnd;++pSBegin)
- aError = rtl_digest_update(aDigest,pSBegin->getStr(),pSBegin->getLength()*sizeof(sal_Unicode));
+ rtl_digest_update(aDigest,pSBegin->getStr(),pSBegin->getLength()*sizeof(sal_Unicode));
}
}
}
if ( sValue.getLength() > 0 )
{
// we don't have to convert this into UTF8 because we don't store on a file system
- aError = rtl_digest_update(aDigest,sValue.getStr(),sValue.getLength()*sizeof(sal_Unicode));
+ rtl_digest_update(aDigest,sValue.getStr(),sValue.getLength()*sizeof(sal_Unicode));
}
}
- aError = rtl_digest_get(aDigest,_pBuffer,RTL_DIGEST_LENGTH_SHA1);
+ rtl_digest_get(aDigest,_pBuffer,RTL_DIGEST_LENGTH_SHA1);
// we have to destroy the digest
rtl_digest_destroy(aDigest);
}
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 8e16a6ef81..e92812638a 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -437,7 +437,7 @@ void EditUndoInsertFeature::Undo()
EditSelection aSel( aPaM, aPaM );
// Attribute werden dort implizit vom Dokument korrigiert...
aSel.Max().GetIndex()++;
- EditPaM aNewPaM = GetImpEditEngine()->ImpDeleteSelection( aSel );
+ GetImpEditEngine()->ImpDeleteSelection( aSel );
aSel.Max().GetIndex()--; // Fuer Selektion
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
}
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index a582b90d80..5a6fccd020 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -293,6 +293,7 @@ void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16 nNew, sal_Bool bPosIsS
}
DBG_ASSERT( !bRefIsValid || ( rWrong.nStart < rWrong.nEnd ),
"TextInserted, WrongRange: Start >= End?!" );
+ (void)bRefIsValid;
}
DBG_ASSERT( !DbgIsBuggy(), "InsertWrong: WrongList kaputt!" );
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index cbe3de94c2..6b770b9a2c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -934,6 +934,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
}
DBG_ASSERT( pPortion->GetKind() != PORTIONKIND_HYPHENATOR, "CreateLines: Hyphenator-Portion!" );
DBG_ASSERT( pPortion->GetLen() || bProcessingEmptyLine, "Leere Portion in CreateLines ?!" );
+ (void)bProcessingEmptyLine;
if ( pNextFeature && ( pNextFeature->GetStart() == nTmpPos ) )
{
sal_uInt16 nWhich = pNextFeature->GetItem()->Which();
@@ -1054,6 +1055,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
else
{
DBG_ASSERT( pPortion->GetLen() || bProcessingEmptyLine, "Empty Portion - Extra Space?!" );
+ (void)bProcessingEmptyLine;
SeekCursor( pNode, nTmpPos+1, aTmpFont );
aTmpFont.SetPhysFont( GetRefDevice() );
ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 092878f8a2..8faf443de2 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1851,7 +1851,6 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
sal_uInt16 nDist = 0;
sal_Bool bDistMember = sal_False;
nMemberId &= ~CONVERT_TWIPS;
- sal_Bool bSerialize = sal_False;
switch(nMemberId)
{
case 0:
@@ -1871,22 +1870,18 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
case MID_LEFT_BORDER:
- bSerialize = sal_True; // intentionally no break!
case LEFT_BORDER:
aRetLine = SvxBoxItem::SvxLineToLine(GetLeft(), bConvert);
break;
case MID_RIGHT_BORDER:
- bSerialize = sal_True; // intentionally no break!
case RIGHT_BORDER:
aRetLine = SvxBoxItem::SvxLineToLine(GetRight(), bConvert);
break;
case MID_BOTTOM_BORDER:
- bSerialize = sal_True; // intentionally no break!
case BOTTOM_BORDER:
aRetLine = SvxBoxItem::SvxLineToLine(GetBottom(), bConvert);
break;
case MID_TOP_BORDER:
- bSerialize = sal_True; // intentionally no break!
case TOP_BORDER:
aRetLine = SvxBoxItem::SvxLineToLine(GetTop(), bConvert);
break;
@@ -1915,21 +1910,7 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
if( bDistMember )
rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED(nDist) : nDist);
else
- {
-/*
- if ( bSerialize )
- {
- ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Any > aSeq(4);
- aSeq[0] <<= aRetLine.Color;
- aSeq[1] <<= aRetLine.InnerLineWidth;
- aSeq[2] <<= aRetLine.OuterLineWidth;
- aSeq[3] <<= aRetLine.LineDistance;
- rVal <<= aSeq;
- }
- else
-*/
- rVal <<= aRetLine;
- }
+ rVal <<= aRetLine;
return true;
}
@@ -2837,7 +2818,6 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
sal_Int16 nVal=0;
sal_Bool bIntMember = sal_False;
nMemberId &= ~CONVERT_TWIPS;
- sal_Bool bSerialize = sal_False;
switch(nMemberId)
{
case 0:
@@ -2861,11 +2841,9 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
case MID_HORIZONTAL:
- bSerialize = sal_True;
aRetLine = SvxBoxItem::SvxLineToLine( pHori, bConvert);
break;
case MID_VERTICAL:
- bSerialize = sal_True;
aRetLine = SvxBoxItem::SvxLineToLine( pVert, bConvert);
break;
case MID_FLAGS:
@@ -2891,21 +2869,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
if( !bIntMember )
- {
-/*
- if ( bSerialize )
- {
- ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Any > aSeq(4);
- aSeq[0] <<= aRetLine.Color;
- aSeq[1] <<= aRetLine.InnerLineWidth;
- aSeq[2] <<= aRetLine.OuterLineWidth;
- aSeq[3] <<= aRetLine.LineDistance;
- rVal <<= aSeq;
- }
- else
- */
- rVal <<= aRetLine;
- }
+ rVal <<= aRetLine;
return true;
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 1d2be63453..0ccc1b756c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -804,7 +804,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
*pWordStt = 0,
*pDelim = 0;
- BOOL bAtStart = FALSE, bPrevPara = FALSE;
+ BOOL bAtStart = FALSE;
do {
--pStr;
if( rCC.isLetter(
@@ -879,7 +879,6 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
}
aText = *pPrevPara;
- bPrevPara = TRUE;
bAtStart = FALSE;
pStart = aText.GetBuffer();
pStr = pStart + aText.Len();
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index b4fd849785..7c00f2434d 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -434,7 +434,6 @@ void OutlinerView::ImpPaintDDCursor()
Point aStartPointWin, aEndPointWin;
Rectangle aOutputArWin = pEditView->GetOutputArea();
- Rectangle aVisAreaRef = pEditView->GetVisArea();
if( bDDChangingDepth )
{
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 716c76a209..83349dba97 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -111,8 +111,6 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xIn ) );
- ULONG nError = sal::static_int_cast< ULONG >(-1);
-
// prepare ParserInputSource
xml::sax::InputSource aParserInput;
aParserInput.aInputStream = xIn;
@@ -145,18 +143,12 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
try
{
xParser->parseStream( aParserInput ); // implicitly calls ConvDicXMLImport::CreateContext
- if (rImport.GetSuccess())
- nError = 0;
}
catch( xml::sax::SAXParseException& )
{
-// if( bEncrypted )
-// nError = ERRCODE_SFX_WRONGPASSWORD;
}
catch( xml::sax::SAXException& )
{
-// if( bEncrypted )
-// nError = ERRCODE_SFX_WRONGPASSWORD;
}
catch( io::IOException& )
{
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 7221254b04..12893df589 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -99,6 +99,8 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext(
nFil == mxMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-1 ),
"invalid property map!");
+ (void)nPos;
+ (void)nFil;
pContext =
new XMLBackgroundImageContext( GetImport(), nPrefix,
rLocalName, xAttrList,
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 753d735ddc..d03e89ddbb 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -117,6 +117,7 @@ void lcl_addXFormsModel(
// TODO: implement proper error handling
DBG_ASSERT( bSuccess, "can't import model" );
+ (void)bSuccess;
}
Reference<XPropertySet> lcl_findXFormsBindingOrSubmission(