[Libreoffice-commits] core.git: 27 commits - sal/qa sc/inc sc/source sw/source ucb/source uui/source xmloff/source
Caolán McNamara
caolanm at redhat.com
Mon Jan 27 03:15:13 PST 2014
sal/qa/osl/file/osl_File.cxx | 2
sc/inc/cellsuno.hxx | 32 ++++---
sc/inc/chart2uno.hxx | 22 +++-
sc/inc/chartuno.hxx | 9 +-
sc/source/ui/unoobj/cellsuno.cxx | 23 ++---
sc/source/ui/unoobj/chart2uno.cxx | 19 ++--
sc/source/ui/unoobj/chartuno.cxx | 7 -
sw/source/core/access/accdoc.cxx | 80 ++++++++---------
sw/source/core/access/accmap.cxx | 165 ++++++++++++++++++-------------------
sw/source/core/text/wrong.cxx | 2
sw/source/filter/ww8/ww8par2.cxx | 6 -
ucb/source/ucp/file/bc.cxx | 5 -
uui/source/iahndl-errorhandler.cxx | 6 -
xmloff/source/draw/ximpshap.cxx | 6 -
14 files changed, 202 insertions(+), 182 deletions(-)
New commits:
commit df2ad69d5df350636c1eb1772b16a2e203a88fa7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 10:58:39 2014 +0000
Resolves: fdo#73814 wrong name for drawing::PointSequenceSequence property
examining svx/source/unodraw/unoprov.cxx "Geometry" is a
indeed a drawing::PolyPolygonBezierCoords for the BezierShapes
and a drawing::PointSequenceSequence for the PolyShapes
regression since e44335abe006d05f0f915279605a03ef084116d6 because after
223f6b631c1b087754c0f9051fb55f029f2503ce we started getting
drawing::PointSequenceSequences in maPath which is the wrong type for the
argument to property "PolyPolygonBezier" for those shapes. Which led me to
incorrectly assume that the all PolyPolygonBezier properties were named
"PolyPolygonBezier" which isn't the case.
so reverting the non maPath hunks of e44335abe006d05f0f915279605a03ef084116d6
Change-Id: I013a66778d11a472fc4567e53a9e17e73e2b91ce
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index d822812..bff4bd5 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1470,8 +1470,6 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
aPolyPolygon,
aSourcePolyPolygon);
aAny <<= aSourcePolyPolygon;
-
- xPropSet->setPropertyValue(OUString("PolyPolygonBezier"), aAny);
}
else
{
@@ -1481,9 +1479,9 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
aPolyPolygon,
aSourcePolyPolygon);
aAny <<= aSourcePolyPolygon;
-
- xPropSet->setPropertyValue(OUString("Geometry"), aAny);
}
+
+ xPropSet->setPropertyValue(OUString("Geometry"), aAny);
}
// set pos, size, shear and rotate
commit 7f0f6f3e25a950207f4cb5ce2a56f1b99c05a2b8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 10:13:30 2014 +0000
coverity#705453 Array compared against 0
Change-Id: Id8d4822b881dd75b86515af6c2507d0187581c42
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ff49237..b0bbc4a 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -658,7 +658,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV,
rNum.SetBulletFont( &aFont );
// take only the very first character
- if( rAV.cbTextBefore || rAV.cbTextAfter)
+ if (SVBT8ToByte(rAV.cbTextBefore) || SVBT8ToByte(rAV.cbTextAfter))
rNum.SetBulletChar( sTxt[ 0 ] );
else
rNum.SetBulletChar( 0x2190 );
@@ -667,12 +667,12 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV,
}
if( bInsert )
{
- if( rAV.cbTextBefore )
+ if (SVBT8ToByte(rAV.cbTextBefore))
{
OUString sP( sTxt.copy( 0, SVBT8ToByte( rAV.cbTextBefore ) ) );
rNum.SetPrefix( sP );
}
- if( SVBT8ToByte( rAV.cbTextAfter ) )
+ if (SVBT8ToByte(rAV.cbTextAfter))
{
OUString sP( rNum.GetSuffix() );
sP += sTxt.copy( SVBT8ToByte( rAV.cbTextBefore ),
commit d6868cfa1b72a2a4dd7f960880b1f5a3034c939e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 10:09:40 2014 +0000
coverity#982254 Same on both sides
Change-Id: Ibb3b8b4a3f29b46ada9824f7c7d15a0d87d60e23
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 76419a7..5502cc6 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1417,7 +1417,7 @@ namespace osl_FileBase
{
nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, 0 );
//the temp file will be removed when return from createTempFile
- bOK = ( pHandle != NULL && pHandle != 0);
+ bOK = (pHandle != NULL && nError1 == osl::FileBase::E_None);
if ( sal_True == bOK )
osl_closeFile( *pHandle );
commit b89a1e26d658e5263aac13c1a3fa080c3f9563e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 10:05:20 2014 +0000
coverity#1157751 Copy-paste error
no difference in effect, but makes both versions the same
Change-Id: I1d1829b374fea04bd6861ae59eac6f21057e8d78
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index d28bc58..7a8ef2a 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -364,7 +364,7 @@ sal_Bool SwWrongList::Fresh( sal_Int32 &rStart, sal_Int32 &rEnd, sal_Int32 nPos,
MSHORT nCnt = nIndex;
if( nCnt < Count() )
{
- nWrPos = Pos( nIndex );
+ nWrPos = Pos( nCnt );
if( nWrPos < nPos && rStart > nWrPos )
rStart = nWrPos;
}
commit 5d99890f9df292642dfe93a961c3e4d449e3eb16
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:59:14 2014 +0000
coverity#704132 Operands don't affect result
Change-Id: Ib2cf15d31231ff02645faae9d4a984112e5af795
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 136f5fb..6d65d66 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -75,9 +75,9 @@ executeErrorDialog(
break;
case task::InteractionClassification_INFO:
- if ((nButtonMask & 0x01F00000) == WB_DEF_OK)
- //TODO! missing win bit button mask define (want to ignore
- // any default button settings)...
+# define WB_DEF_BUTTONS (WB_DEF_OK | WB_DEF_CANCEL | WB_DEF_RETRY)
+ //(want to ignore any default button settings)...
+ if ((nButtonMask & WB_DEF_BUTTONS) == WB_DEF_OK)
xBox.reset(new InfoBox(pParent,
aText.makeStringAndClear()));
else
commit dbd85e0eb3476bed23a9586bd1edc5d5686fe6c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:34:02 2014 +0000
coverity#1158203 Dereference null return value
Change-Id: I8cff85b4d68c28581ddb7a8552378422be6b6a25
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 4658864..eb392fc 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1369,7 +1369,10 @@ BaseContent::cPCL( void )
ListenerMap* listener = new ListenerMap();
for( sal_Int32 i = 0; i < length; ++i )
{
- (*listener)[seqNames[i]] = m_pPropertyListener->getContainer( seqNames[i] )->getElements();
+ cppu::OInterfaceContainerHelper* pContainer = m_pPropertyListener->getContainer(seqNames[i]);
+ if (!pContainer)
+ continue;
+ (*listener)[seqNames[i]] = pContainer->getElements();
}
p = new PropertyChangeNotifier( this,
commit a4b3f834b62d4100b00a523ed278892794b5aa6a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:31:26 2014 +0000
coverity#1158247 Dereference before null check
Change-Id: I01037daf7188c4d934cee52e415b56d8df4d3252
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index f85d488..aad81fe 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1306,7 +1306,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
if( pFrm && mpFrmMap)
{
- aIter = mpFrmMap->find( pFrm );
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pFrm );
if( aIter != mpFrmMap->end() )
{
uno::Reference < XAccessible > xAcc = (*aIter).second;
@@ -1341,7 +1341,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
mpSeletedFrmMap = new SwAccessibleContextMap_Impl;
if( !mpSeletedFrmMap->empty() )
{
- aIter = mpSeletedFrmMap->begin();
+ SwAccessibleContextMap_Impl::iterator aIter = mpSeletedFrmMap->begin();
while( aIter != mpSeletedFrmMap->end() )
{
uno::Reference < XAccessible > xAcc = (*aIter).second;
@@ -1356,7 +1356,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
if( !mapTemp.empty() )
{
- aIter = mapTemp.begin();
+ SwAccessibleContextMap_Impl::iterator aIter = mapTemp.begin();
while( aIter != mapTemp.end() )
{
mpSeletedFrmMap->insert( SwAccessibleContextMap_Impl::value_type( (*aIter).first, (*aIter).second ) );
@@ -2650,78 +2650,75 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
}
else if (bShapeSelected)
{
- const SwFEShell *pFESh = pVSh ? static_cast< const SwFEShell * >( pVSh ) : NULL ;
- if(pFESh)
+ const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
+ const SdrMarkList *pMarkList = pFESh->GetMarkList();
+ if (pMarkList != NULL && pMarkList->GetMarkCount() == 1)
{
- const SdrMarkList *pMarkList = pFESh->GetMarkList();
- if (pMarkList != NULL && pMarkList->GetMarkCount() == 1)
+ SdrObject *pObj = pMarkList->GetMark( 0 )->GetMarkedSdrObj();
+ ::rtl::Reference < ::accessibility::AccessibleShape > pAccShapeImpl = GetContextImpl(pObj,NULL,sal_False);
+ if (!pAccShapeImpl.is())
{
- SdrObject *pObj = pMarkList->GetMark( 0 )->GetMarkedSdrObj();
- ::rtl::Reference < ::accessibility::AccessibleShape > pAccShapeImpl = GetContextImpl(pObj,NULL,sal_False);
- if (!pAccShapeImpl.is())
+ while (pObj && pObj->GetUpGroup())
{
- while (pObj && pObj->GetUpGroup())
- {
- pObj = pObj->GetUpGroup();
- }
- if (pObj != NULL)
+ pObj = pObj->GetUpGroup();
+ }
+ if (pObj != NULL)
+ {
+ const SwFrm *pParent = SwAccessibleFrame::GetParent( SwAccessibleChild(pObj), GetShell()->IsPreview() );
+ if( pParent )
{
- const SwFrm *pParent = SwAccessibleFrame::GetParent( SwAccessibleChild(pObj), GetShell()->IsPreview() );
- if( pParent )
+ ::rtl::Reference< SwAccessibleContext > xParentAccImpl = GetContextImpl(pParent,sal_False);
+ if (!xParentAccImpl.is())
{
- ::rtl::Reference< SwAccessibleContext > xParentAccImpl = GetContextImpl(pParent,sal_False);
- if (!xParentAccImpl.is())
+ const SwTabFrm* pTabFrm = pParent->FindTabFrm();
+ if (pTabFrm)
{
- const SwTabFrm* pTabFrm = pParent->FindTabFrm();
- if (pTabFrm)
- {
- //The Table should not add in acc.because the "pParent" is not add to acc .
- uno::Reference< XAccessible> xAccParentTab = GetContext(pTabFrm,sal_True);//Should Create.
+ //The Table should not add in acc.because the "pParent" is not add to acc .
+ uno::Reference< XAccessible> xAccParentTab = GetContext(pTabFrm,sal_True);//Should Create.
- const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pTabFrm), GetShell()->IsPreview() );
- if (pParentRoot)
- {
- ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,sal_False);
- if(xParentAccImplRoot.is())
- {
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= xAccParentTab;
- xParentAccImplRoot->FireAccessibleEvent( aEvent );
- }
- }
-
- //Get "pParent" acc again.
- xParentAccImpl = GetContextImpl(pParent,sal_False);
- }
- else
+ const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pTabFrm), GetShell()->IsPreview() );
+ if (pParentRoot)
{
- //directly create this acc para .
- xParentAccImpl = GetContextImpl(pParent,sal_True);//Should Create.
-
- const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pParent), GetShell()->IsPreview() );
-
::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,sal_False);
if(xParentAccImplRoot.is())
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= uno::Reference< XAccessible>(xParentAccImpl.get());
+ aEvent.NewValue <<= xAccParentTab;
xParentAccImplRoot->FireAccessibleEvent( aEvent );
}
}
+
+ //Get "pParent" acc again.
+ xParentAccImpl = GetContextImpl(pParent,sal_False);
}
- if (xParentAccImpl.is())
+ else
{
- uno::Reference< XAccessible> xAccShape =
- GetContext(pObj,xParentAccImpl.get(),sal_True);
+ //directly create this acc para .
+ xParentAccImpl = GetContextImpl(pParent,sal_True);//Should Create.
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= xAccShape;
- xParentAccImpl->FireAccessibleEvent( aEvent );
+ const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pParent), GetShell()->IsPreview() );
+
+ ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,sal_False);
+ if(xParentAccImplRoot.is())
+ {
+ AccessibleEventObject aEvent;
+ aEvent.EventId = AccessibleEventId::CHILD;
+ aEvent.NewValue <<= uno::Reference< XAccessible>(xParentAccImpl.get());
+ xParentAccImplRoot->FireAccessibleEvent( aEvent );
+ }
}
}
+ if (xParentAccImpl.is())
+ {
+ uno::Reference< XAccessible> xAccShape =
+ GetContext(pObj,xParentAccImpl.get(),sal_True);
+
+ AccessibleEventObject aEvent;
+ aEvent.EventId = AccessibleEventId::CHILD;
+ aEvent.NewValue <<= xAccShape;
+ xParentAccImpl->FireAccessibleEvent( aEvent );
+ }
}
}
}
commit 2018771eb6c69e8134fa49cf38b483c797bfb523
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:29:30 2014 +0000
coverity#1158248 Dereference before null check
Change-Id: I7504743b4c62c254d9d0d55bb55a9b3d6fe6ea7d
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 7deaeff..f85d488 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1222,42 +1222,45 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
}
//Checked for FlyFrm
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
- while( aIter != mpFrmMap->end() )
+ if (mpFrmMap)
{
- const SwFrm *pFrm = (*aIter).first;
- if(pFrm->IsFlyFrm())
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
+ while( aIter != mpFrmMap->end() )
{
- sal_Bool bFrmChanged = sal_False;
- uno::Reference < XAccessible > xAcc = (*aIter).second;
-
- if(xAcc.is())
+ const SwFrm *pFrm = (*aIter).first;
+ if(pFrm->IsFlyFrm())
{
- SwAccessibleFrameBase *pAccFrame = (static_cast< SwAccessibleFrameBase * >(xAcc.get()));
- bFrmChanged = pAccFrame->SetSelectedState( sal_True );
- if (bFrmChanged)
+ sal_Bool bFrmChanged = sal_False;
+ uno::Reference < XAccessible > xAcc = (*aIter).second;
+
+ if(xAcc.is())
{
- const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
- const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- if (pFrmFmt)
+ SwAccessibleFrameBase *pAccFrame = (static_cast< SwAccessibleFrameBase * >(xAcc.get()));
+ bFrmChanged = pAccFrame->SetSelectedState( sal_True );
+ if (bFrmChanged)
{
- const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
- if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
+ const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
+ const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
+ if (pFrmFmt)
{
- uno::Reference< XAccessible > xAccParent = pAccFrame->getAccessibleParent();
- if (xAccParent.is())
+ const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+ if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
{
- uno::Reference< XAccessibleContext > xAccContext = xAccParent->getAccessibleContext();
- if(xAccContext.is() && xAccContext->getAccessibleRole() == AccessibleRole::PARAGRAPH)
+ uno::Reference< XAccessible > xAccParent = pAccFrame->getAccessibleParent();
+ if (xAccParent.is())
{
- SwAccessibleParagraph* pAccPara = static_cast< SwAccessibleParagraph *>(xAccContext.get());
- if(pAccFrame->IsSeletedInDoc())
- {
- m_setParaAdd.insert(pAccPara);
- }
- else if(m_setParaAdd.count(pAccPara) == 0)
+ uno::Reference< XAccessibleContext > xAccContext = xAccParent->getAccessibleContext();
+ if(xAccContext.is() && xAccContext->getAccessibleRole() == AccessibleRole::PARAGRAPH)
{
- m_setParaRemove.insert(pAccPara);
+ SwAccessibleParagraph* pAccPara = static_cast< SwAccessibleParagraph *>(xAccContext.get());
+ if(pAccFrame->IsSeletedInDoc())
+ {
+ m_setParaAdd.insert(pAccPara);
+ }
+ else if(m_setParaAdd.count(pAccPara) == 0)
+ {
+ m_setParaRemove.insert(pAccPara);
+ }
}
}
}
@@ -1265,9 +1268,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
}
}
}
+ ++aIter;
}
- ++aIter;
}
+
typedef std::vector< SwAccessibleContext* > VEC_PARA;
VEC_PARA vecAdd;
VEC_PARA vecRemove;
commit 82a0827f329f67a9a76819d4fc6d21e69275746c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:25:27 2014 +0000
coverity#1158249 Dereference before null check
Change-Id: I884ad35de8c067671ddd5143b2dc4af784cabe0c
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index bcfe144..5c27f98 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -784,63 +784,57 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
sValue += ";";
- if(pCurrFrm!=NULL)
+ SwSectionFrm* pCurrSctFrm=((SwFrm*)pCurrFrm)->FindSctFrm();
+ if(pCurrSctFrm!=NULL && pCurrSctFrm->GetSection()!=NULL )
{
- SwSectionFrm* pCurrSctFrm=((SwFrm*)pCurrFrm)->FindSctFrm();
- if(pCurrSctFrm!=NULL && pCurrSctFrm->GetSection()!=NULL )
- {
- sAttrName = "section-name:";
+ sAttrName = "section-name:";
- sValue += sAttrName;
- OUString sectionName = pCurrSctFrm->GetSection()->GetSectionName();
+ sValue += sAttrName;
+ OUString sectionName = pCurrSctFrm->GetSection()->GetSectionName();
- sectionName = sectionName.replaceFirst( "\\" , "\\\\" );
- sectionName = sectionName.replaceFirst( "=" , "\\=" );
- sectionName = sectionName.replaceFirst( ";" , "\\;" );
- sectionName = sectionName.replaceFirst( "," , "\\," );
- sectionName = sectionName.replaceFirst( ":" , "\\:" );
+ sectionName = sectionName.replaceFirst( "\\" , "\\\\" );
+ sectionName = sectionName.replaceFirst( "=" , "\\=" );
+ sectionName = sectionName.replaceFirst( ";" , "\\;" );
+ sectionName = sectionName.replaceFirst( "," , "\\," );
+ sectionName = sectionName.replaceFirst( ":" , "\\:" );
- sValue += sectionName;
+ sValue += sectionName;
- sValue += ";";
+ sValue += ";";
- //section-columns-number
- {
- sAttrName = "section-columns-number:";
+ //section-columns-number
+ sAttrName = "section-columns-number:";
- nCurrCol = 1;
+ nCurrCol = 1;
- if(pCurrCol!=NULL)
+ if(pCurrCol!=NULL)
+ {
+ SwLayoutFrm* pParent = pCurrCol->GetUpper();
+ if(pParent!=NULL)
{
- SwLayoutFrm* pParent = pCurrCol->GetUpper();
- if(pParent!=NULL)
+ SwFrm* pCol = pParent->Lower();
+ while(pCol&&(pCol!=pCurrCol))
{
- SwFrm* pCol = pParent->Lower();
- while(pCol&&(pCol!=pCurrCol))
- {
- pCol = pCol->GetNext();
- nCurrCol +=1;
- }
+ pCol = pCol->GetNext();
+ nCurrCol +=1;
}
}
- sValue += sAttrName;
- sValue += OUString::number( nCurrCol ) ;
- sValue += ";";
- }
-
- //section-total-columns
- {
- sAttrName = "section-total-columns:";
- const SwFmtCol &rFmtSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
- sal_uInt16 nSctColCount=rFmtSctCol.GetNumCols();
- nSctColCount = nSctColCount>0?nSctColCount:1;
- sValue += sAttrName;
- sValue += OUString::number( nSctColCount ) ;
-
- sValue += ";";
- }
}
+ sValue += sAttrName;
+ sValue += OUString::number( nCurrCol ) ;
+ sValue += ";";
+
+ //section-total-columns
+ sAttrName = "section-total-columns:";
+ const SwFmtCol &rFmtSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
+ sal_uInt16 nSctColCount=rFmtSctCol.GetNumCols();
+ nSctColCount = nSctColCount>0?nSctColCount:1;
+ sValue += sAttrName;
+ sValue += OUString::number( nSctColCount ) ;
+
+ sValue += ";";
}
+
anyAtrribute <<= sValue;
}
return anyAtrribute;
commit 39fac0c7baa93ce46f871f1795c2f46c7be798f8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:22:36 2014 +0000
coverity#1158328 Uncaught exception
Change-Id: I143b5614a2fcc0d6ec9a956c619503730fb683d7
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 1426f46..ca667e2 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -169,7 +169,8 @@ public:
getRanges( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence<
::com::sun::star::table::CellRangeAddress >& aRanges )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
// XEmbeddedObjectSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 47b73e0..a6cfba0 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -732,7 +732,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un
}
void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress>& aRanges )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScRangeListRef xOldRanges = new ScRangeList;
commit 481d9840abbad3d6a56a5f1c504591a38630328f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:21:59 2014 +0000
coverity#1158329 Uncaught exception
Change-Id: I3a150c50de817f11f2bb115000b5562fba55166a
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index cc828bd..1426f46 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -163,7 +163,8 @@ public:
std::exception);
virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL
getRanges( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence<
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 51e82aa..47b73e0 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -689,7 +689,7 @@ sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException)
}
void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScRangeListRef xRanges = new ScRangeList;
commit 433c7d160cd893cdbdf1ebcef91eed8e35fdb2d4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:21:00 2014 +0000
coverity#1158330 Uncaught exception
Change-Id: I73e4142b5c0a4c705a04a3cb354d051bb9bc820a
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 3094b64..cc828bd 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -159,7 +159,8 @@ public:
// XTableChart
virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 53b8255..51e82aa 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -668,7 +668,8 @@ sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException)
}
void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
ScRangeListRef xRanges = new ScRangeList;
commit 46fdb171095e399ca27b2c680fa738c6025252ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:19:32 2014 +0000
coverity#1158331 Uncaught exception
Change-Id: I554d454c29d72abeb36139979acf96f44c8b9e74
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 54739d5..9af4f93 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -251,7 +251,9 @@ public:
// XDataSequence
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException);
+ SAL_CALL getData()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual OUString SAL_CALL getSourceRangeRepresentation()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString >
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 8f4e6ca..90ad4e0 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2993,7 +2993,7 @@ const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListene
// ----------------------------------------------------------------------------
uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
- throw ( uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( !m_pDocument)
commit cf218a8dc15d570a702d0a9a9183d23424b6d02a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:18:25 2014 +0000
coverity#1158332 Uncaught exception
Change-Id: I3692ad46afcca1be47fbd983fdcb19693a6811e9
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 248f18d..54739d5 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -270,7 +270,9 @@ public:
// XTextualDataSequence
virtual ::com::sun::star::uno::Sequence< OUString >
- SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException);
+ SAL_CALL getTextualData()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XPropertySet
virtual ::com::sun::star::uno::Reference<
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index e68f09e..8f4e6ca 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3046,7 +3046,8 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData()
// XTextualDataSequence --------------------------------------------------
-uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Sequence<OUString> aSeq;
commit 638252470800acb888450697dd3a729010d2e568
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:14:57 2014 +0000
coverity#1158333 Uncaught exception
Change-Id: Idcea256f80b3a09a84e67bdafbcb737983f1ef11
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index c42db93..248f18d 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -264,7 +264,9 @@ public:
// XNumericalDataSequence
virtual ::com::sun::star::uno::Sequence< double >
- SAL_CALL getNumericalData( ) throw (::com::sun::star::uno::RuntimeException);
+ SAL_CALL getNumericalData()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XTextualDataSequence
virtual ::com::sun::star::uno::Sequence< OUString >
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index f3e198e..e68f09e 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3023,7 +3023,7 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
// XNumericalDataSequence --------------------------------------------------
uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData()
- throw ( uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( !m_pDocument)
commit 650c66908a87c16bb0c96c06c914af18581043b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:13:57 2014 +0000
coverity#1158334 Uncaught exception
Change-Id: I7480245001236a6fa32701459087044c2ebe1131
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 5650f27..c42db93 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -286,9 +286,10 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw( ::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ 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& rPropertyName,
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 59d060c..f3e198e 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3476,10 +3476,11 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue(
}
-uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(
- const OUString& rPropertyName)
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rPropertyName)
+ throw(beans::UnknownPropertyException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
uno::Any aRet;
if ( rPropertyName == SC_UNONAME_ROLE )
commit 5c1d8983c2cb6602c45659263bc65951947f00c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:12:29 2014 +0000
coverity#1158335 Uncaught exception
Change-Id: If0d55c853924b3c11477afd802cd0db542279907
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index d15a070..5650f27 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -259,7 +259,8 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
// XNumericalDataSequence
virtual ::com::sun::star::uno::Sequence< double >
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index d533954..59d060c 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3250,8 +3250,7 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos)
}
::sal_Int32 SAL_CALL ScChart2DataSequence::getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
- throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
// index -1 means a heuristic value for the entire sequence
bool bGetSeriesFormat = (nIndex == -1);
commit c30527b80365392629d06f404db314932b8238df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:11:24 2014 +0000
coverity#1158336 Uncaught exception
Change-Id: Id798449d60021d209c47ddfd11579bec6ddc1bd5
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index e4da135..91ef892 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -416,7 +416,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryColumnDifferences(
const ::com::sun::star::table::CellAddress& aCompare )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryRowDifferences(
const ::com::sun::star::table::CellAddress& aCompare )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 16a8d00..5b05ba0 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3749,7 +3749,7 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
}
uno::Reference<sheet::XSheetCellRanges > SAL_CALL ScCellRangesBase::queryColumnDifferences(
- const table::CellAddress& aCompare ) throw(uno::RuntimeException)
+ const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return QueryDifferences_Impl( aCompare, true );
commit 00071f2be47a5af1f605530faf7925c72752b4e2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:10:26 2014 +0000
coverity#1158337 Uncaught exception
Change-Id: I951ff26682d2391e6657be169eb4e7da36078a02
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a4b5348..e4da135 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1276,7 +1276,8 @@ protected:
virtual const SfxItemPropertyMap& GetItemPropertyMap();
virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index ad06f5a..16a8d00 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -8888,9 +8888,8 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
}
}
-void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
- uno::Any& rAny )
- throw(uno::RuntimeException)
+void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny )
+ throw(uno::RuntimeException, std::exception)
{
if ( pEntry )
{
commit d72af8cba6d1125251804a7b9abe74165c706aa5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:09:20 2014 +0000
coverity#1158338 Uncaught exception
Change-Id: I212915e1f0fd3594e276e9a8dd702aab800b0b4f
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 5fb16f2..a4b5348 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -377,7 +377,9 @@ public:
// XChartDataArray
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL
- getData() throw(::com::sun::star::uno::RuntimeException);
+ getData()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Sequence< double > >& aData )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 96fcfec..ad06f5a 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3063,7 +3063,7 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const
}
uno::Sequence< uno::Sequence<double> > SAL_CALL ScCellRangesBase::getData()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScMemChart* pMemChart = CreateMemChart_Impl();
commit 667bb9c5f8c80862ced74b95517bc95d18f2adf6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:08:35 2014 +0000
coverity#1158339 Uncaught exception
Change-Id: If25f58b45ce6f312eb53cb4ef48b41bf8dcae381
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index c51e39d..5fb16f2 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -418,7 +418,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryRowDifferences(
const ::com::sun::star::table::CellAddress& aCompare )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryIntersection(
const ::com::sun::star::table::CellRangeAddress& aRange )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1f97550..96fcfec 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3756,7 +3756,7 @@ uno::Reference<sheet::XSheetCellRanges > SAL_CALL ScCellRangesBase::queryColumnD
}
uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryRowDifferences(
- const table::CellAddress& aCompare ) throw(uno::RuntimeException)
+ const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return QueryDifferences_Impl( aCompare, false );
commit a4bb234dae6ffdbcca36611a2b7b661345ece528
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:07:36 2014 +0000
coverity#1158340 Uncaught exception
Change-Id: I6d920feeebe45c2f82dd1bfe37370ac005ad9a69
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index aba3a9a..c51e39d 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -388,7 +388,8 @@ public:
OUString >& aRowDescriptions )
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence<
OUString >& aColumnDescriptions )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index fb1aa4b..1f97550 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3250,7 +3250,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
}
uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScMemChart* pMemChart = CreateMemChart_Impl();
commit 73fe65cf7ced47cb524fdd6a11baa7923c522c4e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:06:52 2014 +0000
coverity#1158341 Uncaught exception
Change-Id: If88cddfb13ea2db24a5c95ea0c367e51b87b75c4
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 0f2c6e6..aba3a9a 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -426,7 +426,8 @@ public:
// XFormulaQuery
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryDependents( sal_Bool bRecursive )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryPrecedents( sal_Bool bRecursive )
throw(::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index feb57d6..fb1aa4b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3837,7 +3837,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden
}
uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependents(
- sal_Bool bRecursive ) throw(uno::RuntimeException)
+ sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( pDocShell )
commit 7af84e5fd57cd203b9ef4df9f04c94002df326e9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:05:59 2014 +0000
coverity#1158342 Uncaught exception
Change-Id: Ia6cad30b9ad262168d86c52eb72f08efb65af790
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 8daa753..0f2c6e6 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -399,7 +399,9 @@ public:
throw(::com::sun::star::uno::RuntimeException,
std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
- queryEmptyCells() throw(::com::sun::star::uno::RuntimeException);
+ queryEmptyCells()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryContentCells( sal_Int16 nContentFlags )
throw(::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9c45f66..feb57d6 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3495,7 +3495,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC
}
uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCells()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (pDocShell)
commit 6a5c26619110fce27008a12760cf3f9694395940
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:05:16 2014 +0000
coverity#1158343 Uncaught exception
Change-Id: Idbab8cb1051c7f01b5fa53db7d9bb99fd882f680
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 903a4a4..8daa753 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -427,7 +427,8 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryPrecedents( sal_Bool bRecursive )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
// XSearchable
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a8587fa..9c45f66 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3788,7 +3788,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec
// XFormulaQuery
uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPrecedents(
- sal_Bool bRecursive ) throw(uno::RuntimeException)
+ sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( pDocShell )
commit 07152dc3f8f8d1c571852d2ecad436825347bde6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:04:18 2014 +0000
coverity#1158344 Uncaught exception
Change-Id: Ifae42003982f74f30e946edb8d19ecc02bd33a46
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a474cb4..903a4a4 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -263,7 +263,8 @@ public:
// XSheetOperation
virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction )
throw(::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL clearContents( sal_Int32 nContentFlags )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index b64d42e..a8587fa 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1818,7 +1818,7 @@ void ScCellRangesBase::PaintRanges_Impl( sal_uInt16 nPart )
// XSheetOperation
double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunction )
- throw(uno::Exception, uno::RuntimeException)
+ throw(uno::Exception, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScMarkData aMark(*GetMarkData());
commit 7a887519852ed9b4d74df0ccbede771195592c96
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 09:03:28 2014 +0000
coverity#1158345 Uncaught exception
Change-Id: I41e85755825ae90f1243597814b17d61e81adddb
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a58e281..a474cb4 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1193,7 +1193,8 @@ public:
std::exception);
virtual void SAL_CALL showLevel( sal_Int16 nLevel,
::com::sun::star::table::TableOrientation nOrientation )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
// XProtectable
virtual void SAL_CALL protect( const OUString& aPassword )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index dab76e4..b64d42e 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7949,7 +7949,7 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR
}
void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientation nOrientation )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
More information about the Libreoffice-commits
mailing list