[Libreoffice-commits] core.git: 39 commits - chart2/source editeng/source extensions/source filter/source forms/source fpicker/source framework/inc framework/source include/editeng include/toolkit include/vcl linguistic/source starmath/source svtools/source svx/source sw/inc sw/source toolkit/source ucb/source vbahelper/source vcl/source xmloff/source
Caolán McNamara
caolanm at redhat.com
Thu Feb 13 15:56:53 CET 2014
chart2/source/controller/main/ChartController.cxx | 4
chart2/source/controller/main/ChartController.hxx | 6
editeng/source/editeng/impedit.cxx | 16 -
editeng/source/editeng/impedit.hxx | 16 -
editeng/source/uno/unoedprx.cxx | 232 +++++++++---------
extensions/source/bibliography/framectr.cxx | 7
extensions/source/bibliography/framectr.hxx | 8
filter/source/pdf/pdfexport.cxx | 104 ++++----
forms/source/component/imgprod.cxx | 4
forms/source/component/imgprod.hxx | 4
forms/source/richtext/richtextcontrol.cxx | 4
forms/source/richtext/richtextcontrol.hxx | 4
forms/source/richtext/specialdispatchers.cxx | 4
forms/source/richtext/specialdispatchers.hxx | 4
fpicker/source/office/OfficeFilePicker.cxx | 4
fpicker/source/office/OfficeFilePicker.hxx | 4
framework/inc/xml/imagesdocumenthandler.hxx | 10
framework/source/uiconfiguration/imagemanagerimpl.cxx | 4
framework/source/uiconfiguration/imagemanagerimpl.hxx | 5
framework/source/xml/imagesdocumenthandler.cxx | 8
include/editeng/unoedprx.hxx | 6
include/toolkit/awt/vclxwindow.hxx | 4
include/vcl/dndhelp.hxx | 44 ++-
linguistic/source/lngsvcmgr.cxx | 3
linguistic/source/lngsvcmgr.hxx | 4
starmath/source/accessibility.cxx | 7
svtools/source/misc/itemdel.cxx | 18 -
svx/source/dialog/_contdlg.cxx | 7
sw/inc/unotbl.hxx | 58 +++-
sw/source/core/undo/untbl.cxx | 2
sw/source/core/unocore/unotbl.cxx | 57 +++-
sw/source/filter/ww8/rtfexportfilter.cxx | 10
sw/source/filter/ww8/rtfexportfilter.hxx | 1
sw/source/filter/ww8/ww8par.hxx | 10
sw/source/filter/ww8/ww8par5.cxx | 2
toolkit/source/awt/vclxwindow.cxx | 4
toolkit/source/awt/vclxwindow1.cxx | 2
ucb/source/ucp/ftp/ftpurl.cxx | 4
ucb/source/ucp/ftp/ftpurl.hxx | 5
vbahelper/source/msforms/vbacontrols.cxx | 3
vcl/source/app/dndhelp.cxx | 44 ++-
xmloff/source/draw/xexptran.cxx | 13 -
42 files changed, 468 insertions(+), 292 deletions(-)
New commits:
commit f8ebc65a51a61c1d9b3172467b0770202281db32
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 14:22:13 2014 +0000
coverity#735922 Dereference after null check
Change-Id: Iff9f084d85af4b319c7f175c9b7834fd7ba4603a
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index a631b21..bf79c6f 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -1652,7 +1652,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
// then pBox received nodes from elsewhere.
// If bNodesMoved is set for pBox the undo must move the
// boxes back, otherwise it must delete them.
- sal_Bool bNodesMoved =
+ sal_Bool bNodesMoved = pSourceBox &&
( nNodes != ( pSourceBox->GetSttNd()->EndOfSectionIndex() -
pSourceBox->GetSttIdx() ) )
&& ( nNodes - 1 > nLineDiff );
commit 70bf48667272b2d4ab5f3148dc9f66bf5c3f179c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 14:10:20 2014 +0000
coverity#705539 Unintentional integer overflow
Change-Id: I3d170feeabcdd5f1ac3e64e1018edfb30b2b3c4c
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 57877bc..61fe885 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1243,11 +1243,11 @@ private:
OUString sBaseURL;
// Ini-Flags:
- sal_uLong nIniFlags; // Flags aus der writer.ini
- sal_uLong nIniFlags1; // dito ( zusaetzliche Flags )
- sal_uLong nFieldFlags; // dito fuer Feldern
- sal_uLong nFieldTagAlways[3]; // dito fuers Taggen von Feldern
- sal_uLong nFieldTagBad[3]; // dito fuers Taggen von nicht importierbaren F.
+ sal_uInt32 nIniFlags; // Flags aus der writer.ini
+ sal_uInt32 nIniFlags1; // dito ( zusaetzliche Flags )
+ sal_uInt32 nFieldFlags; // dito fuer Feldern
+ sal_uInt32 nFieldTagAlways[3]; // dito fuers Taggen von Feldern
+ sal_uInt32 nFieldTagBad[3]; // dito fuers Taggen von nicht importierbaren F.
bool m_bRegardHindiDigits; // import digits in CTL scripts as Hindi numbers
WW8_CP nDrawCpO; // Anfang der Txbx-SubDocs
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 93dc8b3..974ff4d 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -836,7 +836,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
sal_uInt16 n = (aF.nId <= eMax) ? aF.nId : static_cast<sal_uInt16>(eMax);
sal_uInt16 nI = n / 32; // # des sal_uInt32
- sal_uLong nMask = 1 << ( n % 32 ); // Maske fuer Bits
+ sal_uInt32 nMask = 1 << ( n % 32 ); // Maske fuer Bits
if ((sizeof(nFieldTagAlways)/sizeof(nFieldTagAlways[0])) <= nI)
{ // if indexes larger than 95 are needed, then a new configuration
commit 1c71cef7f80c342b01d66435b0902ecc8f1890a2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 14:06:22 2014 +0000
coverity#707769 Uninitialized pointer field
Change-Id: I449173ea1c4418cc2cc978862fe465e33e7b4338
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 3ebcbe6..1210018 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -430,7 +430,7 @@ sal_Bool SvxEditSourceAdapter::IsValid() const
//--------------------------------------------------------------------------------------
-SvxAccessibleTextAdapter::SvxAccessibleTextAdapter() : mrTextForwarder( NULL )
+SvxAccessibleTextAdapter::SvxAccessibleTextAdapter() : mpTextForwarder( NULL )
{
}
@@ -440,24 +440,24 @@ SvxAccessibleTextAdapter::~SvxAccessibleTextAdapter()
sal_Int32 SvxAccessibleTextAdapter::GetParagraphCount() const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetParagraphCount();
+ return mpTextForwarder->GetParagraphCount();
}
sal_Int32 SvxAccessibleTextAdapter::GetTextLen( sal_Int32 nParagraph ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aIndex;
- aIndex.SetEEIndex( nParagraph, mrTextForwarder->GetTextLen( nParagraph ), *this );
+ aIndex.SetEEIndex( nParagraph, mpTextForwarder->GetTextLen( nParagraph ), *this );
return aIndex.GetIndex();
}
OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -472,7 +472,7 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
::std::swap( aStartIndex, aEndIndex );
}
- OUString sStr = mrTextForwarder->GetText( MakeEESelection(aStartIndex, aEndIndex) );
+ OUString sStr = mpTextForwarder->GetText( MakeEESelection(aStartIndex, aEndIndex) );
// trim field text, if necessary
if( aStartIndex.InField() )
@@ -526,7 +526,7 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -534,39 +534,39 @@ SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Boo
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- return mrTextForwarder->GetAttribs( MakeEESelection(aStartIndex, aEndIndex),
+ return mpTextForwarder->GetAttribs( MakeEESelection(aStartIndex, aEndIndex),
bOnlyHardAttrib );
}
SfxItemSet SvxAccessibleTextAdapter::GetParaAttribs( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetParaAttribs( nPara );
+ return mpTextForwarder->GetParaAttribs( nPara );
}
void SvxAccessibleTextAdapter::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- mrTextForwarder->SetParaAttribs( nPara, rSet );
+ mpTextForwarder->SetParaAttribs( nPara, rSet );
}
void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_Bool , sal_uInt16 )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
}
void SvxAccessibleTextAdapter::GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- mrTextForwarder->GetPortions( nPara, rList );
+ mpTextForwarder->GetPortions( nPara, rList );
}
sal_uInt16 SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -574,20 +574,20 @@ sal_uInt16 SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, sal_u
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- return mrTextForwarder->GetItemState( MakeEESelection(aStartIndex, aEndIndex),
+ return mpTextForwarder->GetItemState( MakeEESelection(aStartIndex, aEndIndex),
nWhich );
}
sal_uInt16 SvxAccessibleTextAdapter::GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetItemState( nPara, nWhich );
+ return mpTextForwarder->GetItemState( nPara, nWhich );
}
void SvxAccessibleTextAdapter::QuickInsertText( const OUString& rText, const ESelection& rSel )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -595,13 +595,13 @@ void SvxAccessibleTextAdapter::QuickInsertText( const OUString& rText, const ESe
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- mrTextForwarder->QuickInsertText( rText,
+ mpTextForwarder->QuickInsertText( rText,
MakeEESelection(aStartIndex, aEndIndex) );
}
void SvxAccessibleTextAdapter::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -609,13 +609,13 @@ void SvxAccessibleTextAdapter::QuickInsertField( const SvxFieldItem& rFld, const
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- mrTextForwarder->QuickInsertField( rFld,
+ mpTextForwarder->QuickInsertField( rFld,
MakeEESelection(aStartIndex, aEndIndex) );
}
void SvxAccessibleTextAdapter::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -623,13 +623,13 @@ void SvxAccessibleTextAdapter::QuickSetAttribs( const SfxItemSet& rSet, const ES
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- mrTextForwarder->QuickSetAttribs( rSet,
+ mpTextForwarder->QuickSetAttribs( rSet,
MakeEESelection(aStartIndex, aEndIndex) );
}
void SvxAccessibleTextAdapter::QuickInsertLineBreak( const ESelection& rSel )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -637,36 +637,36 @@ void SvxAccessibleTextAdapter::QuickInsertLineBreak( const ESelection& rSel )
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- mrTextForwarder->QuickInsertLineBreak( MakeEESelection(aStartIndex, aEndIndex) );
+ mpTextForwarder->QuickInsertLineBreak( MakeEESelection(aStartIndex, aEndIndex) );
}
SfxItemPool* SvxAccessibleTextAdapter::GetPool() const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetPool();
+ return mpTextForwarder->GetPool();
}
OUString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
+ return mpTextForwarder->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
}
void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- mrTextForwarder->FieldClicked( rField, nPara, nPos );
+ mpTextForwarder->FieldClicked( rField, nPara, nPos );
}
sal_uInt16 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aIndex;
- aIndex.SetIndex(nPara, nLogicalIndex, *mrTextForwarder);
+ aIndex.SetIndex(nPara, nLogicalIndex, *mpTextForwarder);
return aIndex.GetEEIndex();
}
@@ -674,66 +674,66 @@ sal_uInt16 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_Int32 nPara, sal_I
sal_Bool SvxAccessibleTextAdapter::IsValid() const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- if( mrTextForwarder )
- return mrTextForwarder->IsValid();
+ if( mpTextForwarder )
+ return mpTextForwarder->IsValid();
else
return sal_False;
}
LanguageType SvxAccessibleTextAdapter::GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aIndex;
aIndex.SetIndex( nPara, nPos, *this );
- return mrTextForwarder->GetLanguage( nPara, aIndex.GetEEIndex() );
+ return mpTextForwarder->GetLanguage( nPara, aIndex.GetEEIndex() );
}
sal_Int32 SvxAccessibleTextAdapter::GetFieldCount( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetFieldCount( nPara );
+ return mpTextForwarder->GetFieldCount( nPara );
}
EFieldInfo SvxAccessibleTextAdapter::GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetFieldInfo( nPara, nField );
+ return mpTextForwarder->GetFieldInfo( nPara, nField );
}
EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetBulletInfo( nPara );
+ return mpTextForwarder->GetBulletInfo( nPara );
}
void SvxAccessibleTextAdapter::SetUpdateModeForAcc(sal_Bool bUp)
{
- return mrTextForwarder->SetUpdateModeForAcc(bUp);
+ return mpTextForwarder->SetUpdateModeForAcc(bUp);
}
sal_Bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
{
- return mrTextForwarder->GetUpdateModeForAcc();
+ return mpTextForwarder->GetUpdateModeForAcc();
}
Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aIndex;
aIndex.SetIndex( nPara, nIndex, *this );
// preset if anything goes wrong below
// n-th char in GetParagraphIndex's paragraph
- Rectangle aRect = mrTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
+ Rectangle aRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
if( aIndex.InBullet() )
{
@@ -766,12 +766,12 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
{
ESelection aSel = MakeEESelection( aIndex );
- SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mrTextForwarder->GetAttribs( aSel ) );
+ SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mpTextForwarder->GetAttribs( aSel ) );
AccessibleStringWrap aStringWrap( *pOutDev,
aFont,
- mrTextForwarder->GetText( aSel ) );
+ mpTextForwarder->GetText( aSel ) );
- Rectangle aStartRect = mrTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
+ Rectangle aStartRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
if( !aStringWrap.GetCharacterBounds( aIndex.GetFieldOffset(), aRect ) )
aRect = aStartRect;
@@ -786,7 +786,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
EBulletInfo aBulletInfo = GetBulletInfo( nPara );
@@ -795,35 +795,35 @@ Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_Int32 nPara ) const
aBulletInfo.nType != SVX_NUM_BITMAP )
{
// include bullet in para bounding box
- Rectangle aRect( mrTextForwarder->GetParaBounds( nPara ) );
+ Rectangle aRect( mpTextForwarder->GetParaBounds( nPara ) );
aRect.Union( aBulletInfo.aBounds );
return aRect;
}
- return mrTextForwarder->GetParaBounds( nPara );
+ return mpTextForwarder->GetParaBounds( nPara );
}
MapMode SvxAccessibleTextAdapter::GetMapMode() const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetMapMode();
+ return mpTextForwarder->GetMapMode();
}
OutputDevice* SvxAccessibleTextAdapter::GetRefDevice() const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetRefDevice();
+ return mpTextForwarder->GetRefDevice();
}
sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32& nPara, sal_Int32& nIndex ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- if( !mrTextForwarder->GetIndexAtPoint( rPoint, nPara, nIndex ) )
+ if( !mpTextForwarder->GetIndexAtPoint( rPoint, nPara, nIndex ) )
return sal_False;
SvxAccessibleTextIndex aIndex;
@@ -874,12 +874,12 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
return sal_False;
ESelection aSelection = MakeEESelection( aIndex );
- SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mrTextForwarder->GetAttribs( aSelection ) );
+ SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mpTextForwarder->GetAttribs( aSelection ) );
AccessibleStringWrap aStringWrap( *pOutDev,
aFont,
- mrTextForwarder->GetText( aSelection ) );
+ mpTextForwarder->GetText( aSelection ) );
- Rectangle aRect = mrTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
+ Rectangle aRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
Point aPoint = rPoint;
aPoint.Move( -aRect.Left(), -aRect.Top() );
@@ -896,7 +896,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aIndex;
aIndex.SetIndex(nPara, nIndex, *this);
@@ -931,7 +931,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
return sal_True;
}
- if( !mrTextForwarder->GetWordIndices( nPara, nIndex, nStart, nEnd ) )
+ if( !mpTextForwarder->GetWordIndices( nPara, nIndex, nStart, nEnd ) )
return sal_False;
aIndex.SetEEIndex( nPara, nStart, *this );
@@ -951,7 +951,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool /* bInCell */ ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aIndex;
aIndex.SetIndex(nPara, nIndex, *this);
@@ -983,7 +983,7 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_
return sal_True;
}
- if( !mrTextForwarder->GetAttributeRun( nStartIndex, nEndIndex, nPara, nIndex ) )
+ if( !mpTextForwarder->GetAttributeRun( nStartIndex, nEndIndex, nPara, nIndex ) )
return sal_False;
aIndex.SetEEIndex( nPara, nStartIndex, *this );
@@ -1003,14 +1003,14 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_
sal_Int32 SvxAccessibleTextAdapter::GetLineCount( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetLineCount( nPara );
+ return mpTextForwarder->GetLineCount( nPara );
}
sal_Int32 SvxAccessibleTextAdapter::GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -1020,7 +1020,7 @@ sal_Int32 SvxAccessibleTextAdapter::GetLineLen( sal_Int32 nPara, sal_Int32 nLine
{
nLastIndex = nCurrIndex;
nCurrIndex =
- nCurrIndex + mrTextForwarder->GetLineLen( nPara, nCurrLine );
+ nCurrIndex + mpTextForwarder->GetLineLen( nPara, nCurrLine );
}
aEndIndex.SetEEIndex( nPara, nCurrIndex, *this );
@@ -1036,17 +1036,17 @@ sal_Int32 SvxAccessibleTextAdapter::GetLineLen( sal_Int32 nPara, sal_Int32 nLine
void SvxAccessibleTextAdapter::GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const
{
- mrTextForwarder->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
+ mpTextForwarder->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
}
sal_Int32 SvxAccessibleTextAdapter::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const
{
- return mrTextForwarder->GetLineNumberAtIndex( nPara, nIndex );
+ return mpTextForwarder->GetLineNumberAtIndex( nPara, nIndex );
}
sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -1054,12 +1054,12 @@ sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- return mrTextForwarder->Delete( MakeEESelection(aStartIndex, aEndIndex ) );
+ return mpTextForwarder->Delete( MakeEESelection(aStartIndex, aEndIndex ) );
}
sal_Bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESelection& rSel )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -1067,38 +1067,38 @@ sal_Bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESele
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- return mrTextForwarder->InsertText( rStr, MakeEESelection(aStartIndex, aEndIndex) );
+ return mpTextForwarder->InsertText( rStr, MakeEESelection(aStartIndex, aEndIndex) );
}
sal_Bool SvxAccessibleTextAdapter::QuickFormatDoc( sal_Bool bFull )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->QuickFormatDoc( bFull );
+ return mpTextForwarder->QuickFormatDoc( bFull );
}
sal_Int16 SvxAccessibleTextAdapter::GetDepth( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->GetDepth( nPara );
+ return mpTextForwarder->GetDepth( nPara );
}
sal_Bool SvxAccessibleTextAdapter::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
- return mrTextForwarder->SetDepth( nPara, nNewDepth );
+ return mpTextForwarder->SetDepth( nPara, nNewDepth );
}
void SvxAccessibleTextAdapter::SetForwarder( SvxTextForwarder& rForwarder )
{
- mrTextForwarder = &rForwarder;
+ mpTextForwarder = &rForwarder;
}
sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
EBulletInfo aBulletInfo = GetBulletInfo( nPara );
@@ -1116,7 +1116,7 @@ sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( sal_Int32 nPara ) const
sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( sal_Int32 nPara ) const
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
EBulletInfo aBulletInfo = GetBulletInfo( nPara );
@@ -1134,7 +1134,7 @@ sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( sal_Int32 nPara ) const
sal_Bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel )
{
- DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
+ DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -1178,6 +1178,8 @@ void SvxAccessibleTextAdapter::CopyText(const SvxTextForwarder&)
//---------------------------------------------------------------------------------------
SvxAccessibleTextEditViewAdapter::SvxAccessibleTextEditViewAdapter()
+ : mpViewForwarder(NULL)
+ , mpTextForwarder(NULL)
{
}
@@ -1187,49 +1189,49 @@ SvxAccessibleTextEditViewAdapter::~SvxAccessibleTextEditViewAdapter()
sal_Bool SvxAccessibleTextEditViewAdapter::IsValid() const
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
- if( mrViewForwarder )
- return mrViewForwarder->IsValid();
+ if( mpViewForwarder )
+ return mpViewForwarder->IsValid();
else
return sal_False;
}
Rectangle SvxAccessibleTextEditViewAdapter::GetVisArea() const
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
- return mrViewForwarder->GetVisArea();
+ return mpViewForwarder->GetVisArea();
}
Point SvxAccessibleTextEditViewAdapter::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
- return mrViewForwarder->LogicToPixel(rPoint, rMapMode);
+ return mpViewForwarder->LogicToPixel(rPoint, rMapMode);
}
Point SvxAccessibleTextEditViewAdapter::PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
- return mrViewForwarder->PixelToLogic(rPoint, rMapMode);
+ return mpViewForwarder->PixelToLogic(rPoint, rMapMode);
}
sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
ESelection aSelection;
- if( !mrViewForwarder->GetSelection( aSelection ) )
+ if( !mpViewForwarder->GetSelection( aSelection ) )
return sal_False;
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
- aStartIndex.SetEEIndex( aSelection.nStartPara, aSelection.nStartPos, *mrTextForwarder );
- aEndIndex.SetEEIndex( aSelection.nEndPara, aSelection.nEndPos, *mrTextForwarder );
+ aStartIndex.SetEEIndex( aSelection.nStartPara, aSelection.nStartPos, *mpTextForwarder );
+ aEndIndex.SetEEIndex( aSelection.nEndPara, aSelection.nEndPos, *mpTextForwarder );
DBG_ASSERT(aStartIndex.GetIndex() >= 0 && aStartIndex.GetIndex() <= USHRT_MAX &&
aEndIndex.GetIndex() >= 0 && aEndIndex.GetIndex() <= USHRT_MAX,
@@ -1243,43 +1245,43 @@ sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) cons
sal_Bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel )
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
- aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *mrTextForwarder );
- aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *mrTextForwarder );
+ aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *mpTextForwarder );
+ aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *mpTextForwarder );
- return mrViewForwarder->SetSelection( MakeEESelection(aStartIndex, aEndIndex) );
+ return mpViewForwarder->SetSelection( MakeEESelection(aStartIndex, aEndIndex) );
}
sal_Bool SvxAccessibleTextEditViewAdapter::Copy()
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
- return mrViewForwarder->Copy();
+ return mpViewForwarder->Copy();
}
sal_Bool SvxAccessibleTextEditViewAdapter::Cut()
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
- return mrViewForwarder->Cut();
+ return mpViewForwarder->Cut();
}
sal_Bool SvxAccessibleTextEditViewAdapter::Paste()
{
- DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
+ DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
- return mrViewForwarder->Paste();
+ return mpViewForwarder->Paste();
}
void SvxAccessibleTextEditViewAdapter::SetForwarder( SvxEditViewForwarder& rForwarder,
SvxAccessibleTextAdapter& rTextForwarder )
{
- mrViewForwarder = &rForwarder;
- mrTextForwarder = &rTextForwarder;
+ mpViewForwarder = &rForwarder;
+ mpTextForwarder = &rTextForwarder;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index 94a4375..a6255e5 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -106,7 +106,7 @@ public:
sal_Bool IsEditable( const ESelection& rSelection );
private:
- SvxTextForwarder* mrTextForwarder;
+ SvxTextForwarder* mpTextForwarder;
};
class SvxAccessibleTextEditViewAdapter : public SvxEditViewForwarder
@@ -132,8 +132,8 @@ public:
void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& );
private:
- SvxEditViewForwarder* mrViewForwarder;
- SvxAccessibleTextAdapter* mrTextForwarder;
+ SvxEditViewForwarder* mpViewForwarder;
+ SvxAccessibleTextAdapter* mpTextForwarder;
};
class EDITENG_DLLPUBLIC SvxEditSourceAdapter : public SvxEditSource
commit dbaffd88112feec175726390907f6c2462ee605e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 14:03:35 2014 +0000
coverity#708230 Uninitialized pointer field
Change-Id: Ie7507bb869006bc44ba4bec8ca85b1695164521a
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 283d471..ebf35b9 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1631,9 +1631,10 @@ SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) :
}
-SmEditAccessible::SmEditAccessible( const SmEditAccessible &rSmAcc ) :
- SmEditAccessibleBaseClass(),
- aAccName (SM_RESSTR(STR_CMDBOXWINDOW))
+SmEditAccessible::SmEditAccessible( const SmEditAccessible &rSmAcc )
+ : SmEditAccessibleBaseClass()
+ , aAccName(SM_RESSTR(STR_CMDBOXWINDOW))
+ , pTextHelper(NULL)
{
pWin = rSmAcc.pWin;
OSL_ENSURE( pWin, "SmEditAccessible: window missing" );
commit 60cb17c28a639f15fc351f444da37a37ab503ab5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 14:02:08 2014 +0000
coverity#708342 Uninitialized pointer field
Change-Id: I76803ae267c18350d5da6c9e425339cefd0817d7
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 34d3042..47f9e3d 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -87,10 +87,9 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16
}
SvxContourDlg::SvxContourDlg( SfxBindings* _pBindings, SfxChildWindow* pCW,
- Window* _pParent, const ResId& rResId ) :
-
- SfxFloatingWindow ( _pBindings, pCW, _pParent, rResId )
-
+ Window* _pParent, const ResId& rResId )
+ : SfxFloatingWindow(_pBindings, pCW, _pParent, rResId)
+ , pSuperClass(NULL)
{
}
commit 67e1559fbe48e3af5eec04d413b8a2f3b487640d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 14:01:03 2014 +0000
coverity#708498 Uninitialized pointer field
Change-Id: I9da49c0dba434ea59eb30162fdd5ce4a649dd4d9
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index d7d86f9..7ce6d97 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -29,8 +29,8 @@
using namespace ::com::sun::star;
-RtfExportFilter::RtfExportFilter( const uno::Reference< uno::XComponentContext >& xCtx) :
- m_xCtx( xCtx )
+RtfExportFilter::RtfExportFilter( const uno::Reference< uno::XComponentContext >& xCtx)
+ : m_xCtx(xCtx)
{
}
@@ -46,8 +46,8 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& a
utl::MediaDescriptor aMediaDesc = aDescriptor;
::uno::Reference< io::XStream > xStream =
aMediaDesc.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_STREAMFOROUTPUT(), uno::Reference< io::XStream >() );
- m_pStream = utl::UcbStreamHelper::CreateStream( xStream, sal_True );
- m_aWriter.SetStream(m_pStream);
+ SvStream* pStream = utl::UcbStreamHelper::CreateStream( xStream, sal_True );
+ m_aWriter.SetStream(pStream);
// get SwDoc*
uno::Reference< uno::XInterface > xIfc( m_xSrcDoc, uno::UNO_QUERY );
@@ -89,7 +89,7 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& a
delete pCurPam->GetNext();
delete pCurPam;
}
- delete m_pStream;
+ delete pStream;
return sal_True;
}
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index 33552c2..245596f 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -43,7 +43,6 @@ class RtfExportFilter : public cppu::WeakImplHelper2
protected:
::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xCtx;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSrcDoc;
- SvStream* m_pStream;
public:
RtfExportFilter( const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xCtx );
virtual ~RtfExportFilter();
commit 4c51f320baf38e07453e8fc991bf47ad6444cff0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:55:12 2014 +0000
coverity#738262 Uncaught exception
Change-Id: I366f41afdad4f1ef38506d5d20f4293c3dde2d68
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 576e421..ecea107 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -364,11 +364,20 @@ public:
virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw( ::com::sun::star::uno::RuntimeException );
//XAutoFormattable
- virtual void SAL_CALL autoFormat(const OUString& aName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL autoFormat(const OUString& aName)
+ throw (::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+ throw(::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 57346fc..99132e4 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1361,9 +1361,13 @@ uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo(v
return xRef;
}
-void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName,
- const uno::Any& aValue)
- throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException )
+void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
+ throw (beans::UnknownPropertyException,
+ beans::PropertyVetoException,
+ lang::IllegalArgumentException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
@@ -3023,7 +3027,9 @@ void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor
}
}
-void SwXTextTable::autoFormat(const OUString& aName) throw( lang::IllegalArgumentException, uno::RuntimeException )
+void SwXTextTable::autoFormat(const OUString& aName)
+ throw (lang::IllegalArgumentException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
@@ -3317,7 +3323,8 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
uno::Any aRet;
@@ -3813,7 +3820,7 @@ uno::Reference< table::XCell > SwXCellRange::getCellByPosition(sal_Int32 nColum
uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition(
sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom)
- throw (uno::RuntimeException, lang::IndexOutOfBoundsException
+ throw (uno::RuntimeException, lang::IndexOutOfBoundsException,
std::exception)
{
SolarMutexGuard aGuard;
commit bb9a8524d6bd77d6d3e7d99d14efd344552381c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:54:03 2014 +0000
coverity#738260 Uncaught exception
Change-Id: Iffe842fad73eadf69c67f03cfd1d99aadf70a167
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index e888720..576e421 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -545,7 +545,9 @@ public:
virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XServiceInfo
virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 107be3c..57346fc 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -4852,7 +4852,8 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
}
}
-void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno::RuntimeException )
+void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (nCount == 0)
commit b1ed6e54de396de0840e6deec37c30e492ffe6eb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:53:13 2014 +0000
coverity#738258 Uncaught exception
Change-Id: I3a38f7db881469a5a08fa48f77609355ff6dae4c
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 26125a6..e888720 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -542,7 +542,9 @@ public:
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
//XTableRows
- virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( ::com::sun::star::uno::RuntimeException );
//XServiceInfo
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 08897f3..107be3c 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -4797,7 +4797,8 @@ sal_Bool SwXTableRows::hasElements(void) throw( uno::RuntimeException )
return sal_True;
}
-void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno::RuntimeException )
+void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (nCount == 0)
commit 580475038043b21ac3d5618399e2634dc91395dc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:52:12 2014 +0000
coverity#738256 Uncaught exception
Change-Id: I41cedc756bbaa6f1382aaf40395f18176170402a
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 079f0fa..26125a6 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -485,7 +485,9 @@ public:
//XSortable
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XCellRangeData
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 4218f89..08897f3 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -4644,7 +4644,8 @@ uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor(void) t
}
void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
- throw( uno::RuntimeException )
+ throw (uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
SwSortOptions aSortOpt;
commit c7675570469de801552da6f5ba50152d14ffa6ab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:51:13 2014 +0000
coverity#738254 Uncaught exception
Change-Id: Ib31e77d3dfe4cf2397ae41b45997c109d5b6125b
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index c0b540a..079f0fa 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -444,7 +444,10 @@ public:
//XCellRange
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException);
//XPropertySet
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index aff5f59..4218f89 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3813,7 +3813,8 @@ uno::Reference< table::XCell > SwXCellRange::getCellByPosition(sal_Int32 nColum
uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition(
sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom)
- throw( uno::RuntimeException, lang::IndexOutOfBoundsException )
+ throw (uno::RuntimeException, lang::IndexOutOfBoundsException
+ std::exception)
{
SolarMutexGuard aGuard;
uno::Reference< table::XCellRange > aRet;
commit 5a1218aa91f49b06f55c85fbaddc3e8123f92ee8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:49:47 2014 +0000
coverity#738252 Uncaught exception
Change-Id: I9529a1d48c9c708ded67f83eb4d7777086618cb6
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 90877af..c0b540a 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -449,7 +449,13 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue)
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 096dd49..aff5f59 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3890,10 +3890,13 @@ uno::Reference< beans::XPropertySetInfo > SwXCellRange::getPropertySetInfo(void
return xRef;
}
-void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
- const uno::Any& aValue) throw( beans::UnknownPropertyException,
- beans::PropertyVetoException, lang::IllegalArgumentException,
- lang::WrappedTargetException, uno::RuntimeException )
+void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
+ throw (beans::UnknownPropertyException,
+ beans::PropertyVetoException,
+ lang::IllegalArgumentException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
commit b1c709911679e915504e87fe33ecd7b9fbac12fb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:48:22 2014 +0000
coverity#738250 Uncaught exception
Change-Id: I1fd936e71dfd392f53d77924b3044ff763620595
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index bc81507..90877af 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -450,7 +450,11 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName)
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 0e9c47d..096dd49 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -4007,7 +4007,11 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
}
}
-uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
+uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
+ throw (beans::UnknownPropertyException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
uno::Any aRet;
commit 7501c432d902735b83c2b57de3ff1cc18dca87ab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:46:53 2014 +0000
coverity#738268 Uncaught exception
Change-Id: Ia4ee1370c1b68d93e5e74b452c6fd332df22e545
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 8ad00fd..bc81507 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -369,7 +369,11 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index c4efb51..0e9c47d 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3314,7 +3314,10 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
throw uno::RuntimeException();
}
-uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
+uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
+ throw (beans::UnknownPropertyException,
+ lang::WrappedTargetException,
+ uno::RuntimeException)
{
SolarMutexGuard aGuard;
uno::Any aRet;
commit 81a2478b8e117d982f39f9d4a339a593471a9570
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:22:30 2014 +0000
coverity#738270 Uncaught exception
Change-Id: Iec6f0cbd3b2368959327f807a5dd91451ed6abb2
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index a888a00..8ad00fd 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -183,7 +183,13 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+ throw(::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index da659fd..c4efb51 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3062,10 +3062,10 @@ uno::Reference< beans::XPropertySetInfo > SwXTextTable::getPropertySetInfo(void
return xRef;
}
-void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
- const uno::Any& aValue)
- throw( beans::UnknownPropertyException, beans::PropertyVetoException,
- lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException )
+void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
+ throw(beans::UnknownPropertyException, beans::PropertyVetoException,
+ lang::IllegalArgumentException, lang::WrappedTargetException,
+ uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
commit b5b3dcc2d78fa9d189977727f0e090fc92e5f9df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:19:44 2014 +0000
coverity#737241 Uncaught exception
Change-Id: If7c4bdc095c0c235f6f24107c05e7fcde0d5a023
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 5e93101..10bde8e 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1541,7 +1541,8 @@ uno::Sequence< OUString > SAL_CALL
LngSvcMgr::getAvailableServices(
const OUString& rServiceName,
const lang::Locale& rLocale )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException,
+ std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index cc926b6..14e7b97 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -150,7 +150,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL addLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL removeLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException);
commit 31ed7bc8c248a26c8578538495fdd53aacc0f8da
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:18:24 2014 +0000
coverity#737240 Uncaught exception
Change-Id: I9cff764c2ca451752f2343cedd26530bd9a0e9a7
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index f0db6ec..6565be5 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -81,8 +81,9 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right
virtual void SAL_CALL startElement(
const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
- throw( ::com::sun::star::xml::sax::SAXException,
- ::com::sun::star::uno::RuntimeException );
+ throw (::com::sun::star::xml::sax::SAXException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL endElement(const OUString& aName)
throw (::com::sun::star::xml::sax::SAXException,
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 4db5553..aab1e81 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -165,7 +165,9 @@ throw( SAXException, RuntimeException )
void SAL_CALL OReadImagesDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw( SAXException, RuntimeException )
+ throw(SAXException,
+ RuntimeException,
+ std::exception)
{
ResetableGuard aGuard( m_aLock );
commit 9a34c555293d27a392581acc34c06df4559930fc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:17:06 2014 +0000
coverity#737239 Uncaught exception
Change-Id: Ic9635e77e5fd4e356b30aac314c7438060b82a58
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 9476fe8..f0db6ec 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -85,8 +85,9 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right
::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL endElement(const OUString& aName)
- throw( ::com::sun::star::xml::sax::SAXException,
- ::com::sun::star::uno::RuntimeException );
+ throw (::com::sun::star::xml::sax::SAXException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL characters(const OUString& aChars)
throw( ::com::sun::star::xml::sax::SAXException,
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index ec14d8f..4db5553 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -497,7 +497,9 @@ throw( SAXException, RuntimeException )
}
void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
-throw( SAXException, RuntimeException )
+ throw(SAXException,
+ RuntimeException,
+ std::exception)
{
ResetableGuard aGuard( m_aLock );
commit 24949f84ae3ea323676039f4fd4ca204c074468b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:15:27 2014 +0000
coverity#737202 Uncaught exception
Change-Id: I2ac23ed9f308b92ff9457938b265677f008aaca7
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index a912bb8..7cf71e8 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -1290,7 +1290,9 @@ throw ( ::com::sun::star::uno::Exception,
}
void ImageManagerImpl::store()
-throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::Exception,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
ResetableGuard aGuard( m_aLock );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 0fa8e87..2040dbe 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -131,7 +131,10 @@ namespace framework
// XUIConfigurationPersistence
void reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- void store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ void store()
+ throw (::com::sun::star::uno::Exception,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
void storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException,
commit 8bda341061950be7663eb9ed3ce6b1dc7a5e1f53
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:13:31 2014 +0000
coverity#737162 Uncaught exception
Change-Id: I4ddc477a76f8807586b2dd700ac5559f052ccaa5
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 241377b..5243309 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -519,7 +519,9 @@ void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (Ru
}
//------------------------------------------------------------------------------------
-void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException)
+void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener )
+ throw (RuntimeException,
+ std::exception)
{
m_xDlgClosedListener = xListener;
prepareDialog();
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 4feadbe..88ea346 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -106,7 +106,9 @@ public:
// XAsynchronousExecutableDialog functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//------------------------------------------------------------------------------------
// XFilePicker functions
commit 7426c9d86974ac7c0d64a669819f555b0e74ba55
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:10:40 2014 +0000
coverity#737157 Uncaught exception
Change-Id: I062dbdf7c29489111f7ba6dc37a191d835fa7824
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index f39ecc8..0fa4212 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -54,7 +54,9 @@ namespace frm
}
//--------------------------------------------------------------------
- void SAL_CALL OSelectAllDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException)
+ void SAL_CALL OSelectAllDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ )
+ throw (RuntimeException,
+ std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OSelectAllDispatcher::dispatch: invalid URL!" );
diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx
index ee7ab25..37c823a 100644
--- a/forms/source/richtext/specialdispatchers.hxx
+++ b/forms/source/richtext/specialdispatchers.hxx
@@ -39,7 +39,9 @@ namespace frm
~OSelectAllDispatcher();
// XDispatch
- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// ORichTextFeatureDispatcher
virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const;
commit 2d72cfb5027bdab62ca4b509dd4aa1397bf56bf0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:09:44 2014 +0000
coverity#737151 Uncaught exception
Change-Id: I133012cf88020e38eb0fc0932979347b996943fe
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index aa89f89..80cae8b 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -392,7 +392,9 @@ namespace frm
}
//--------------------------------------------------------------------
- void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException)
+ void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue )
+ throw (RuntimeException,
+ std::exception)
{
if ( !GetWindow() )
{
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 5888def..fb1a1f6 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -119,7 +119,9 @@ namespace frm
void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException);
// XVclWindowPeer
- virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XTypeProvider
DECLARE_XTYPEPROVIDER( )
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 21cf842..c28bfbb 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -183,7 +183,9 @@ public:
void SAL_CALL setForeground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL setControlFont( const ::com::sun::star::awt::FontDescriptor& aFont ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value )
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::awt::XLayoutConstrains
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 5b4d51e..a994d7f 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1406,7 +1406,9 @@ namespace
}
}
-void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException)
+void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value )
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
commit beb0a165ec7577c0012b6d183f1046cd7cfb3026
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:08:37 2014 +0000
coverity#737149 Uncaught exception
Change-Id: I34b31a3574e5a21a506c49b4f69f3b8c8fbdcdbd
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index f2d7273..fe82b06 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -207,7 +207,9 @@ ImageProducer::~ImageProducer()
// ------------------------------------------------------------
-void ImageProducer::addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException)
+void ImageProducer::addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer )
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception)
{
DBG_ASSERT( rxConsumer.is(), "::AddConsumer(...): No consumer referenced!" );
if( rxConsumer.is() )
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 4c2f163..8e88ccb3 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -87,7 +87,9 @@ public:
void setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef );
// ::com::sun::star::awt::XImageProducer
- void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer )
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL startProduction( ) throw(::com::sun::star::uno::RuntimeException);
commit 3d96b1e0ff935cd5805cea648cd071dd36364310
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:07:22 2014 +0000
coverity#737139 Uncaught exception
Change-Id: I75fc43e365afa44b54c27aeb8887f9e37954f03b
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 82ba889..e709c9c 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -305,65 +305,71 @@ static OUString getMimetypeForDocument( const Reference< XComponentContext >& xC
const Reference< XComponent >& xDoc ) throw()
{
OUString aDocMimetype;
- // get document service name
- Reference< com::sun::star::frame::XStorable > xStore( xDoc, UNO_QUERY );
- Reference< frame::XModuleManager2 > xModuleManager = frame::ModuleManager::create(xContext);
- if( xStore.is() )
+ try
{
- OUString aDocServiceName = xModuleManager->identify( Reference< XInterface >( xStore, uno::UNO_QUERY ) );
- if ( !aDocServiceName.isEmpty() )
+ // get document service name
+ Reference< com::sun::star::frame::XStorable > xStore( xDoc, UNO_QUERY );
+ Reference< frame::XModuleManager2 > xModuleManager = frame::ModuleManager::create(xContext);
+ if( xStore.is() )
{
- // get the actual filter name
- OUString aFilterName;
- Reference< lang::XMultiServiceFactory > xConfigProvider =
- configuration::theDefaultProvider::get( xContext );
- uno::Sequence< uno::Any > aArgs( 1 );
- beans::NamedValue aPathProp;
- aPathProp.Name = "nodepath";
- aPathProp.Value <<= OUString( "/org.openoffice.Setup/Office/Factories/" );
- aArgs[0] <<= aPathProp;
-
- Reference< container::XNameAccess > xSOFConfig(
- xConfigProvider->createInstanceWithArguments(
- "com.sun.star.configuration.ConfigurationAccess", aArgs ),
- uno::UNO_QUERY );
-
- Reference< container::XNameAccess > xApplConfig;
- xSOFConfig->getByName( aDocServiceName ) >>= xApplConfig;
- if ( xApplConfig.is() )
+ OUString aDocServiceName = xModuleManager->identify( Reference< XInterface >( xStore, uno::UNO_QUERY ) );
+ if ( !aDocServiceName.isEmpty() )
{
- xApplConfig->getByName( "ooSetupFactoryActualFilter" ) >>= aFilterName;
- if( !aFilterName.isEmpty() )
+ // get the actual filter name
+ OUString aFilterName;
+ Reference< lang::XMultiServiceFactory > xConfigProvider =
+ configuration::theDefaultProvider::get( xContext );
+ uno::Sequence< uno::Any > aArgs( 1 );
+ beans::NamedValue aPathProp;
+ aPathProp.Name = "nodepath";
+ aPathProp.Value <<= OUString( "/org.openoffice.Setup/Office/Factories/" );
+ aArgs[0] <<= aPathProp;
+
+ Reference< container::XNameAccess > xSOFConfig(
+ xConfigProvider->createInstanceWithArguments(
+ "com.sun.star.configuration.ConfigurationAccess", aArgs ),
+ uno::UNO_QUERY );
+
+ Reference< container::XNameAccess > xApplConfig;
+ xSOFConfig->getByName( aDocServiceName ) >>= xApplConfig;
+ if ( xApplConfig.is() )
{
- // find the related type name
- OUString aTypeName;
- Reference< container::XNameAccess > xFilterFactory(
- xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.FilterFactory", xContext),
- uno::UNO_QUERY );
-
- Sequence< beans::PropertyValue > aFilterData;
- xFilterFactory->getByName( aFilterName ) >>= aFilterData;
- for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
- if ( aFilterData[nInd].Name == "Type" )
- aFilterData[nInd].Value >>= aTypeName;
-
- if ( !aTypeName.isEmpty() )
+ xApplConfig->getByName( "ooSetupFactoryActualFilter" ) >>= aFilterName;
+ if( !aFilterName.isEmpty() )
{
- // find the mediatype
- Reference< container::XNameAccess > xTypeDetection(
- xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext),
- UNO_QUERY );
-
- Sequence< beans::PropertyValue > aTypeData;
- xTypeDetection->getByName( aTypeName ) >>= aTypeData;
- for ( sal_Int32 nInd = 0; nInd < aTypeData.getLength(); nInd++ )
- if ( aTypeData[nInd].Name == "MediaType" )
- aTypeData[nInd].Value >>= aDocMimetype;
+ // find the related type name
+ OUString aTypeName;
+ Reference< container::XNameAccess > xFilterFactory(
+ xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.FilterFactory", xContext),
+ uno::UNO_QUERY );
+
+ Sequence< beans::PropertyValue > aFilterData;
+ xFilterFactory->getByName( aFilterName ) >>= aFilterData;
+ for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
+ if ( aFilterData[nInd].Name == "Type" )
+ aFilterData[nInd].Value >>= aTypeName;
+
+ if ( !aTypeName.isEmpty() )
+ {
+ // find the mediatype
+ Reference< container::XNameAccess > xTypeDetection(
+ xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext),
+ UNO_QUERY );
+
+ Sequence< beans::PropertyValue > aTypeData;
+ xTypeDetection->getByName( aTypeName ) >>= aTypeData;
+ for ( sal_Int32 nInd = 0; nInd < aTypeData.getLength(); nInd++ )
+ if ( aTypeData[nInd].Name == "MediaType" )
+ aTypeData[nInd].Value >>= aDocMimetype;
+ }
}
}
}
}
}
+ catch (...)
+ {
+ }
return aDocMimetype;
}
commit 5adc8214e5ac1d1fde138a4e5183c0fcbaf9120c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:05:58 2014 +0000
coverity#737107 Uncaught exception
Change-Id: Ia0906af52b217506e63138565cc0eb08842aaef1
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 9b98bce..f0cfc96 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -414,7 +414,9 @@ static Window* lcl_GetFocusChild( Window* pParent )
}
//class XDispatch
-void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequence< beans::PropertyValue >& aArgs) throw (::com::sun::star::uno::RuntimeException)
+void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequence< beans::PropertyValue >& aArgs)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
if ( !bDisposing )
{
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 940095a..853f960 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -108,7 +108,9 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw (::com::sun::star::uno::RuntimeException);
//class ::com::sun::star::frame::XDispatch
- virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL)
throw (::com::sun::star::uno::RuntimeException,
std::exception);
commit 65e5ce2c31803065551744ef1fa7b9572529aa45
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 13:04:59 2014 +0000
coverity#737105 Uncaught exception
Change-Id: I44acb57da7539a63562d9723ee5d6f83f1dcbbb6
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 37f1943..9b98bce 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -647,7 +647,8 @@ IMPL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void*, EMPTYARG )
void BibFrameController_Impl::addStatusListener(
const uno::Reference< frame::XStatusListener > & aListener,
const util::URL& aURL)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
BibConfig* pConfig = BibModul::GetConfig();
// create a new Reference and insert into listener array
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 775ad18..940095a 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -109,7 +109,9 @@ public:
//class ::com::sun::star::frame::XDispatch
virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException);
// ::com::sun::star::frame::XDispatchInformationProvider
commit 7842d207b5512c272989c162fdeb9b36e525e83d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 12:57:54 2014 +0000
coverity#737095 Uncaught exception
Change-Id: I65ca622983ced4645d97c3d7e0bcde94a46618c3
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 1b0ef3f..1503ba6 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1822,7 +1822,9 @@ void ImpEditView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTarge
}
}
-void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException)
+void ImpEditView::dragOver(const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aVclGuard;
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 2fdc578..46516bd 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -256,7 +256,9 @@ protected:
std::exception);
void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException);
void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException);
- void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException);
+ void dragOver(const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
void ShowDDCursor( const Rectangle& rRect );
void HideDDCursor();
commit e87cd3edfc4b09fa06bea6b79a64a2c1529f6cb4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 12:56:58 2014 +0000
coverity#737093 Uncaught exception
Change-Id: I48bbdc7fe2c6ac60ba9630565c1844a2a24b7ad0
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index ffeea45..1b0ef3f 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1706,7 +1706,9 @@ void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSo
}
}
-void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException)
+void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aVclGuard;
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 0e217b9..2fdc578 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -251,7 +251,9 @@ protected:
void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException);
+ void drop(const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException);
void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException);
void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException);
commit f1e4bd297ed6ff6846e2a2605f4f19353ab9c7ec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 12:56:06 2014 +0000
coverity#737091 Uncaught exception
Change-Id: I2d3df586f9579abcf42bd5a915d1e2e12017345d
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index e01b222..ffeea45 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1526,7 +1526,9 @@ void ImpEditView::ShowDDCursor( const Rectangle& rRect )
}
}
-void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException)
+void ImpEditView::dragGestureRecognized(const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
DBG_ASSERT( !pDragAndDropInfo, "dragGestureRecognized - DragAndDropInfo exist!" );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index d56be07..0e217b9 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -245,7 +245,9 @@ private:
protected:
// DragAndDropClient
- void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException);
+ void dragGestureRecognized(const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
commit 2eae2188a2df3882b173195b51fe3e2eef2558cc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 12:54:17 2014 +0000
coverity#737088 Uncaught exception
Change-Id: I88faa8bb4401e026ce28f8bf08fcc0514c04bdcf
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index b91f9b1..e01b222 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1609,7 +1609,9 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
}
}
-void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException)
+void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aVclGuard;
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 08a2e78..d56be07 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -246,7 +246,9 @@ protected:
// DragAndDropClient
void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException);
- void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException);
+ void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException);
void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException);
void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException);
commit 0309070fb261476fa7c2e3cfa441ae4b168f920b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 13 12:52:42 2014 +0000
coverity#737027 Uncaught exception
Change-Id: I96b07d58233cf19708bbda68bcb19f5d7f6404df
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 6cf34f4..b8ceebf 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1030,7 +1030,7 @@ uno::Sequence<uno::Reference<frame::XDispatch > >
void SAL_CALL ChartController::dispatch(
const util::URL& rURL,
const uno::Sequence< beans::PropertyValue >& rArgs )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
//@todo avoid OString
OString aCommand( OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list