[Libreoffice-commits] core.git: 38 commits - accessibility/inc accessibility/source basic/source chart2/source codemaker/source cppu/source cui/source idlc/source pyuno/source sal/osl sc/inc sc/source sfx2/source stoc/source svtools/source svx/source sw/source toolkit/source ucb/source unotools/source vcl/source vcl/unx
Caolán McNamara
caolanm at redhat.com
Tue Jan 28 03:29:50 PST 2014
accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx | 8 -
accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx | 8 -
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 6
accessibility/source/extended/accessiblelistboxentry.cxx | 6
basic/source/uno/namecont.cxx | 1
chart2/source/controller/main/ChartController_Window.cxx | 74 ++++------
codemaker/source/cppumaker/cppuoptions.cxx | 15 --
codemaker/source/javamaker/javaoptions.cxx | 17 --
cppu/source/uno/copy.hxx | 33 +---
cui/source/inc/cuitabarea.hxx | 47 +++---
cui/source/inc/cuitabline.hxx | 11 -
cui/source/tabpages/tabarea.cxx | 15 --
cui/source/tabpages/tabline.cxx | 9 -
cui/source/tabpages/tpbitmap.cxx | 6
cui/source/tabpages/tpcolor.cxx | 10 -
cui/source/tabpages/tpgradnt.cxx | 6
cui/source/tabpages/tphatch.cxx | 6
cui/source/tabpages/tplnedef.cxx | 4
cui/source/tabpages/tplneend.cxx | 4
idlc/source/scanner.l | 8 -
pyuno/source/module/pyuno_runtime.cxx | 9 +
sal/osl/unx/tempfile.c | 12 -
sc/inc/shapeuno.hxx | 4
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 8 -
sc/source/ui/unoobj/shapeuno.cxx | 3
sc/source/ui/vba/vbaapplication.cxx | 3
sc/source/ui/vba/vbaapplication.hxx | 3
sc/source/ui/vba/vbarange.cxx | 9 -
sc/source/ui/vba/vbarange.hxx | 9 -
sfx2/source/control/bindings.cxx | 5
sfx2/source/control/unoctitm.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
stoc/source/corereflection/crefl.cxx | 2
svtools/source/graphic/grfmgr.cxx | 2
svx/source/dialog/dlgctrl.cxx | 15 --
sw/source/core/access/accdoc.cxx | 7
sw/source/core/access/accdoc.hxx | 7
sw/source/core/access/accpara.cxx | 19 +-
sw/source/core/access/accpara.hxx | 20 ++
sw/source/ui/inc/content.hxx | 12 +
toolkit/source/awt/vclxmenu.cxx | 5
ucb/source/ucp/hierarchy/hierarchydata.cxx | 11 -
unotools/source/i18n/localedatawrapper.cxx | 23 ---
vcl/source/filter/sgvmain.cxx | 6
vcl/unx/generic/window/salframe.cxx | 6
45 files changed, 240 insertions(+), 258 deletions(-)
New commits:
commit 7be0997a0235b05fed9d448e642e0575a4e6e017
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 11:27:19 2014 +0000
Related: fdo#54024 decrazy the Dialog Type for a start anyway
once set in the dialog ctors the dialog type never changes
so we don't need to pass it by pointer
Change-Id: I9d4baf2d93ca4c09e413a8fd3cd3e3367873e833
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 47d6bb4..51535a2 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -63,10 +63,9 @@ private:
ChangeType mnGradientListState;
ChangeType mnHatchingListState;
- sal_uInt16 mnPageType;
- sal_uInt16 mnDlgType;
- sal_uInt16 mnPos;
- sal_Bool mbAreaTP;
+ sal_uInt16 mnPageType;
+ sal_uInt16 mnPos;
+ sal_Bool mbAreaTP;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
@@ -396,10 +395,10 @@ private:
ChangeType* pnGradientListState;
ChangeType* pnColorListState;
- sal_uInt16* pPageType;
- sal_uInt16* pDlgType;
- sal_uInt16* pPos;
- sal_Bool* pbAreaTP;
+ sal_uInt16* pPageType;
+ sal_uInt16 nDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
@@ -435,7 +434,7 @@ public:
{ pGradientList = pGrdLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
- void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
@@ -471,10 +470,10 @@ private:
ChangeType* pnHatchingListState;
ChangeType* pnColorListState;
- sal_uInt16* pPageType;
- sal_uInt16* pDlgType;
- sal_uInt16* pPos;
- sal_Bool* pbAreaTP;
+ sal_uInt16* pPageType;
+ sal_uInt16 nDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
@@ -513,7 +512,7 @@ public:
{ pHatchingList = pHtchLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
- void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
@@ -554,10 +553,10 @@ private:
ChangeType* pnBitmapListState;
ChangeType* pnColorListState;
- sal_uInt16* pPageType;
- sal_uInt16* pDlgType;
- sal_uInt16* pPos;
- sal_Bool* pbAreaTP;
+ sal_uInt16* pPageType;
+ sal_uInt16 nDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
sal_Bool bBmpChanged;
@@ -598,7 +597,7 @@ public:
void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
- void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
@@ -677,10 +676,10 @@ private:
XColorListRef pColorList;
ChangeType* pnColorListState;
- sal_uInt16* pPageType;
- sal_uInt16* pDlgType;
- sal_uInt16* pPos;
- sal_Bool* pbAreaTP;
+ sal_uInt16* pPageType;
+ sal_uInt16 nDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
XFillStyleItem aXFStyleItem;
XFillColorItem aXFillColorItem;
@@ -736,7 +735,7 @@ public:
void SetupForViewFrame( SfxViewFrame *pViewFrame );
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
- void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index ed136e2..4726974 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -49,7 +49,6 @@ private:
ChangeType mnColorListState;
sal_uInt16 nPageType;
- sal_uInt16 nDlgType;
sal_uInt16 nPosDashLb;
sal_uInt16 nPosLineEndLb;
sal_Bool mbAreaTP;
@@ -276,7 +275,7 @@ private:
ChangeType* pnDashListState;
sal_uInt16* pPageType;
- sal_uInt16* pDlgType;
+ sal_uInt16 nDlgType;
sal_uInt16* pPosDashLb;
SfxMapUnit ePoolUnit;
@@ -315,7 +314,7 @@ public:
void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
- void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
@@ -355,8 +354,8 @@ private:
ChangeType* pnLineEndListState;
sal_uInt16* pPageType;
- sal_uInt16* pDlgType;
- sal_uInt16* pPosLineEndLb;
+ sal_uInt16 nDlgType;
+ sal_uInt16* pPosLineEndLb;
DECL_LINK( ClickAddHdl_Impl, void * );
DECL_LINK( ClickModifyHdl_Impl, void * );
@@ -386,7 +385,7 @@ public:
void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
- void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 007257b..34a1687 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -70,7 +70,6 @@ SvxAreaTabDialog::SvxAreaTabDialog
mnGradientListState ( CT_NONE ),
mnHatchingListState ( CT_NONE ),
mnPageType( PT_AREA ),
- mnDlgType( 0 ),
mbAreaTP( sal_False )
{
m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, 0 );
@@ -236,7 +235,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList );
( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList );
( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType );
- ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType );
+ ( (SvxAreaTabPage&) rPage ).SetDlgType( 0 );
( (SvxAreaTabPage&) rPage ).SetPos( mnPos );
( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
@@ -251,7 +250,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
( (SvxShadowTabPage&) rPage ).SetColorList( mpColorList );
( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType );
- ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType );
+ ( (SvxShadowTabPage&) rPage ).SetDlgType( 0 );
( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorListState );
( (SvxShadowTabPage&) rPage ).Construct();
@@ -261,7 +260,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
( (SvxGradientTabPage&) rPage ).SetColorList( mpColorList );
( (SvxGradientTabPage&) rPage ).SetGradientList( mpGradientList );
( (SvxGradientTabPage&) rPage ).SetPageType( &mnPageType );
- ( (SvxGradientTabPage&) rPage ).SetDlgType( &mnDlgType );
+ ( (SvxGradientTabPage&) rPage ).SetDlgType( 0 );
( (SvxGradientTabPage&) rPage ).SetPos( &mnPos );
( (SvxGradientTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxGradientTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
@@ -273,7 +272,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
( (SvxHatchTabPage&) rPage ).SetColorList( mpColorList );
( (SvxHatchTabPage&) rPage ).SetHatchingList( mpHatchingList );
( (SvxHatchTabPage&) rPage ).SetPageType( &mnPageType );
- ( (SvxHatchTabPage&) rPage ).SetDlgType( &mnDlgType );
+ ( (SvxHatchTabPage&) rPage ).SetDlgType( 0 );
( (SvxHatchTabPage&) rPage ).SetPos( &mnPos );
( (SvxHatchTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxHatchTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
@@ -285,7 +284,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
( (SvxBitmapTabPage&) rPage ).SetColorList( mpColorList );
( (SvxBitmapTabPage&) rPage ).SetBitmapList( mpBitmapList );
( (SvxBitmapTabPage&) rPage ).SetPageType( &mnPageType );
- ( (SvxBitmapTabPage&) rPage ).SetDlgType( &mnDlgType );
+ ( (SvxBitmapTabPage&) rPage ).SetDlgType( 0 );
( (SvxBitmapTabPage&) rPage ).SetPos( &mnPos );
( (SvxBitmapTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxBitmapTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
@@ -296,7 +295,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
( (SvxColorTabPage&) rPage ).SetColorList( mpColorList );
( (SvxColorTabPage&) rPage ).SetPageType( &mnPageType );
- ( (SvxColorTabPage&) rPage ).SetDlgType( &mnDlgType );
+ ( (SvxColorTabPage&) rPage ).SetDlgType( 0 );
( (SvxColorTabPage&) rPage ).SetPos( &mnPos );
( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorListState );
@@ -305,7 +304,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
else if (nId == m_nTransparenceTabPage)
{
( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType );
- ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType );
+ ( (SvxTransparenceTabPage&) rPage ).SetDlgType( 0 );
( (SvxTransparenceTabPage&) rPage ).Construct();
}
}
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index b712d27..8c640fe 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -65,7 +65,6 @@ SvxLineTabDialog::SvxLineTabDialog
nDashListState( CT_NONE ),
mnColorListState( CT_NONE ),
nPageType( 0 ), // We use it here primarily to get the right attributes with FillItemSet
- nDlgType( 0 ),
nPosDashLb( 0 ),
nPosLineEndLb( 0 ),
mbAreaTP( sal_False )
@@ -203,7 +202,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
( (SvxLineTabPage&) rPage ).SetColorList( pColorList );
( (SvxLineTabPage&) rPage ).SetDashList( pDashList );
( (SvxLineTabPage&) rPage ).SetLineEndList( pLineEndList );
- ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType );
+ ( (SvxLineTabPage&) rPage ).SetDlgType( 0 );
( (SvxLineTabPage&) rPage ).SetPageType( nPageType );
( (SvxLineTabPage&) rPage ).SetPosDashLb( &nPosDashLb );
( (SvxLineTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb );
@@ -218,7 +217,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
else if(nId == m_nStyleTabPage)
{
( (SvxLineDefTabPage&) rPage ).SetDashList( pDashList );
- ( (SvxLineDefTabPage&) rPage ).SetDlgType( &nDlgType );
+ ( (SvxLineDefTabPage&) rPage ).SetDlgType( 0 );
( (SvxLineDefTabPage&) rPage ).SetPageType( &nPageType );
( (SvxLineDefTabPage&) rPage ).SetPosDashLb( &nPosDashLb );
( (SvxLineDefTabPage&) rPage ).SetDashChgd( &nDashListState );
@@ -229,7 +228,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
( (SvxLineEndDefTabPage&) rPage ).SetLineEndList( pLineEndList );
( (SvxLineEndDefTabPage&) rPage ).SetPolyObj( pObj );
- ( (SvxLineEndDefTabPage&) rPage ).SetDlgType( &nDlgType );
+ ( (SvxLineEndDefTabPage&) rPage ).SetDlgType( 0 );
( (SvxLineEndDefTabPage&) rPage ).SetPageType( &nPageType );
( (SvxLineEndDefTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb );
( (SvxLineEndDefTabPage&) rPage ).SetLineEndChgd( &nLineEndListState );
@@ -240,7 +239,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
( (SvxShadowTabPage&) rPage ).SetColorList( pColorList );
( (SvxShadowTabPage&) rPage ).SetPageType( nPageType );
- ( (SvxShadowTabPage&) rPage ).SetDlgType( nDlgType );
+ ( (SvxShadowTabPage&) rPage ).SetDlgType( 0 );
( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorListState );
( (SvxShadowTabPage&) rPage ).Construct();
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 81373db..ec2f06d 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -58,7 +58,7 @@ SvxBitmapTabPage::SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs
pnBitmapListState ( 0 ),
pnColorListState ( 0 ),
pPageType ( 0 ),
- pDlgType ( 0 ),
+ nDlgType ( 0 ),
pbAreaTP ( 0 ),
bBmpChanged ( false ),
@@ -138,7 +138,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
sal_uInt16 nPos;
sal_uInt16 nCount;
- if( *pDlgType == 0 ) // area dialog
+ if( nDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -226,7 +226,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
{
- if( *pDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
+ if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
{
if(PT_BITMAP == *pPageType)
{
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index b5edc2d..3fd17d4 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -303,7 +303,7 @@ SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
// All the horrific pointers we store and should not
, pnColorListState( 0 )
, pPageType( NULL )
- , pDlgType( NULL )
+ , nDlgType( 0 )
, pPos( NULL )
, pbAreaTP( NULL )
, aXFStyleItem( XFILL_SOLID )
@@ -420,7 +420,7 @@ void SvxColorTabPage::Construct()
void SvxColorTabPage::ActivatePage( const SfxItemSet& )
{
- if( *pDlgType == 0 ) // area dialog
+ if( nDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -543,7 +543,7 @@ long SvxColorTabPage::CheckChanges_Impl()
delete aMessDlg;
}
}
- if( *pDlgType == 0 ) // area dialog
+ if( nDlgType == 0 ) // area dialog
{
nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -558,7 +558,7 @@ long SvxColorTabPage::CheckChanges_Impl()
sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
{
- if( ( *pDlgType != 0 ) ||
+ if( ( nDlgType != 0 ) ||
( *pPageType == PT_COLOR && *pbAreaTP == sal_False ) )
{
OUString aString;
@@ -1170,7 +1170,7 @@ void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame )
pColorList = pPtr ? pPtr->GetValue() : XColorList::GetStdColorList();
SetPageType( &pShadow->nUnknownType );
- SetDlgType( &pShadow->nUnknownType );
+ SetDlgType( COLORPAGE_UNKNOWN );
SetPos( &pShadow->nUnknownPos );
SetAreaTP( &pShadow->bIsAreaTP );
SetColorChgd( (ChangeType*)&pShadow->nChangeType );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 10d708e..81bdb68 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -54,7 +54,7 @@ SvxGradientTabPage::SvxGradientTabPage
pnGradientListState ( 0 ),
pnColorListState ( 0 ),
pPageType ( 0 ),
- pDlgType ( 0 ),
+ nDlgType ( 0 ),
pPos ( 0 ),
pbAreaTP ( 0 ),
@@ -154,7 +154,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
sal_uInt16 nPos;
sal_uInt16 nCount;
- if( *pDlgType == 0 ) // area dialog
+ if( nDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -308,7 +308,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
{
- if( *pDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False )
+ if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False )
{
// CheckChanges(); <-- duplicate inquiry ?
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 6ebda18..fd1a854 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -56,7 +56,7 @@ SvxHatchTabPage::SvxHatchTabPage
pnHatchingListState ( 0 ),
pnColorListState ( 0 ),
pPageType ( 0 ),
- pDlgType ( 0 ),
+ nDlgType ( 0 ),
pPos ( 0 ),
pbAreaTP ( 0 ),
@@ -149,7 +149,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
sal_uInt16 nPos;
sal_uInt16 nCount;
- if( *pDlgType == 0 ) // area dialog
+ if( nDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -279,7 +279,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
{
- if( *pDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
+ if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
{
if( *pPageType == PT_HATCH )
{
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 451fcf8..44d1413 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -158,7 +158,7 @@ void SvxLineDefTabPage::Construct()
void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
{
- if( *pDlgType == 0 ) // area dialog
+ if( nDlgType == 0 ) // area dialog
{
// ActivatePage() is called before the dialog receives PageCreated() !!!
if( pDashList.is() )
@@ -258,7 +258,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
{
- if( *pDlgType == 0 ) // line dialog
+ if( nDlgType == 0 ) // line dialog
{
if( *pPageType == 2 )
{
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index bb3a096..0442da7 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -144,7 +144,7 @@ void SvxLineEndDefTabPage::Construct()
void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
{
- if( *pDlgType == 0 ) // area dialog
+ if( nDlgType == 0 ) // area dialog
{
// ActivatePage() is called before the dialog receives PageCreated() !!!
if( pLineEndList.is() )
@@ -206,7 +206,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet )
{
- if( *pDlgType == 0 ) // line dialog
+ if( nDlgType == 0 ) // line dialog
{
if( *pPageType == 3 )
{
commit 534b3b4c8b8e039171b381123d4c4195273f71ca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:11:57 2014 +0000
coverity#1130476 Uninitialized pointer field
Change-Id: I8c91942fef7456e1a371d435710907afa35f6f89
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 2073629..5ddd8f4 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -111,20 +111,26 @@ public:
class SwPostItContent : public SwContent
{
const SwFmtFld* pFld;
- SwRangeRedline* pRedline;
+ SwRangeRedline* pRedline;
bool mbPostIt;
public:
SwPostItContent( const SwContentType* pCnt,
const OUString& rName,
const SwFmtFld* pField,
long nYPos )
- : SwContent( pCnt, rName, nYPos ), pFld( pField ),mbPostIt(true)
+ : SwContent(pCnt, rName, nYPos)
+ , pFld(pField)
+ , pRedline(NULL)
+ , mbPostIt(true)
{}
SwPostItContent( const SwContentType* pCnt,
const OUString& rName,
SwRangeRedline* pRed,
long nYPos )
- : SwContent( pCnt, rName, nYPos ), pRedline( pRed ),mbPostIt(false)
+ : SwContent(pCnt, rName, nYPos)
+ , pFld(NULL)
+ , pRedline(pRed)
+ , mbPostIt(false)
{}
const SwFmtFld* GetPostIt() { return pFld; }
commit 47fa23322b3c342ebc8976b9775ab49850607702
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:08:08 2014 +0000
coverity#1158281 Uncaught exception
Change-Id: I44e0d45de692414a11249068b122b33de4856458
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 6b105e3..cda7b0f 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3596,7 +3596,9 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( )
}
sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index ed2b2f2..a8bea06 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -417,7 +417,9 @@ public:
throw (::com::sun::star::uno::RuntimeException,
std::exception);
virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
commit 1b80fd24613f9eeb64ff204223843aaa5b58362a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:07:05 2014 +0000
coverity#1158280 Uncaught exception
Change-Id: I39e9470f65afa57b0c636c68b0a7dfea86c45bac
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 04dae13..6b105e3 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3552,7 +3552,8 @@ sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const ::com::sun::sta
}
sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 9c9bf70..ed2b2f2 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -414,7 +414,8 @@ public:
virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSelectedPortionCount( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
commit fe86c09f13c88d8696969f4cc569a545bdbf3304
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:06:19 2014 +0000
coverity#1158279 Uncaught exception
Change-Id: Ie3e09c02a819b61291dec3230b3dd16c93de23eb
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index d5daf11..04dae13 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1729,7 +1729,9 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
sal_Int32 nIndex,
const uno::Sequence< OUString >& aRequestedAttributes )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException,
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index ff1d841..9c9bf70 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -323,7 +323,10 @@ public:
virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
commit 9232547c4f09b02395d0e549c545fa211202c72c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:05:13 2014 +0000
coverity#1158278 Uncaught exception
Change-Id: Ib64bb9e5db6d1176e507ba4ba43ff332c42bf397
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index abc9050..d5daf11 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3605,7 +3605,9 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSe
}
sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 3337627..ff1d841 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -415,7 +415,9 @@ public:
virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
commit ae9564cd87ce40233f3a48fa9138141b9be0dbf2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:04:08 2014 +0000
coverity#1158282 Uncaught exception
Change-Id: I7d3188fb2ab7ea496c468cb8080a9a299fc92dce
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index a7b4b78..abc9050 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3617,7 +3617,9 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSele
}
sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index f83e43f..3337627 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -417,7 +417,9 @@ public:
virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset)
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
commit 36df9c07a102121e8d7daf2305d7f86101294a49
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:01:59 2014 +0000
coverity#158285 Uncaught exception
Change-Id: I84c0f48f8899f9120005a514bff85a07ff91a377
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index a5aba25..646bc4d 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -851,7 +851,8 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL SwAccessibleDocument::get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
- throw ( ::com::sun::star::uno::RuntimeException )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index dba4525..b244d33 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -214,7 +214,8 @@ public:
// XAccessibleGetAccFlowTo
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
};
#endif
commit c53ea976a321574e3526d337a70ed08c343479ce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 10:00:45 2014 +0000
coverity#1158286 Uncaught exception
Change-Id: Ie072cf53a483ae5115d708adfaa0817a60389446
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 5c27f98..a5aba25 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -604,7 +604,9 @@ void SAL_CALL SwAccessibleDocument::disposing( const ::com::sun::star::lang::Eve
}
uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 580e0bf..dba4525 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -198,7 +198,9 @@ public:
::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
// thread safe C++ interface
commit 1311835cb6033ca8ab693c546324c5e66697b6ce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:58:32 2014 +0000
coverity#1158306 Uncaught exception
Change-Id: I899fed4be60366d77d50940cea670c75be41856c
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index e18d741..5fb27fb 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3963,7 +3963,8 @@ ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& W
}
uno::Any SAL_CALL
-ScVbaRange::getRowHeight() throw (uno::RuntimeException)
+ScVbaRange::getRowHeight()
+ throw (uno::RuntimeException, std::exception)
{
sal_Int32 nLen = m_Areas->getCount();
if ( nLen > 1 )
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 93663cd..87e4722 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -178,7 +178,8 @@ public:
virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException);
virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) throw (css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL getRowHeight() throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getRowHeight()
+ throw(css::uno::RuntimeException, std::exception);
virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getWidth() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException);
commit d83befd58d7713249e80ecfe74a16209dbda2ac7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:57:29 2014 +0000
coverity#1158305 Uncaught exception
Change-Id: I7ac01a1abd7f7137d82df28ec2d93ef24d9b64a1
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index a474fff..e18d741 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3763,7 +3763,8 @@ ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException)
// returns calc internal col. width ( in points )
double
-ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno::RuntimeException)
+ScVbaRange::getCalcColWidth(const table::CellRangeAddress& rAddress)
+ throw (uno::RuntimeException, std::exception)
{
ScDocument* pDoc = getScDocument();
sal_uInt16 nWidth = pDoc->GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) );
@@ -3773,7 +3774,8 @@ ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno
}
double
-ScVbaRange::getCalcRowHeight( const table::CellRangeAddress& rAddress ) throw (uno::RuntimeException)
+ScVbaRange::getCalcRowHeight(const table::CellRangeAddress& rAddress)
+ throw (uno::RuntimeException, std::exception)
{
ScDocument* pDoc = getDocumentFromRange( mxRange );
sal_uInt16 nWidth = pDoc->GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 25074be..93663cd 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -87,8 +87,10 @@ class ScVbaRange : public ScVbaRange_BASE
sal_Bool mbIsRows;
sal_Bool mbIsColumns;
css::uno::Reference< ov::excel::XValidation > m_xValidation;
- double getCalcColWidth( const css::table::CellRangeAddress& ) throw (css::uno::RuntimeException);
- double getCalcRowHeight( const css::table::CellRangeAddress& ) throw (css::uno::RuntimeException);
+ double getCalcColWidth(const css::table::CellRangeAddress&)
+ throw (css::uno::RuntimeException, std::exception);
+ double getCalcRowHeight(const css::table::CellRangeAddress&)
+ throw (css::uno::RuntimeException, std::exception);
void visitArray( ArrayVisitor& vistor );
css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn = true ) throw( css::uno::RuntimeException );
commit 858dc2a4e260ddf21bae7e5325bfe193cab70455
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:55:50 2014 +0000
coverity#1158307 Uncaught exception
Change-Id: Iff8290c4b443a2520242328c616d3bc99ed865ff
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index aa4fe74..b4f5b8d 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1248,7 +1248,8 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc
}
::sal_Bool SAL_CALL
-ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
+ScVbaApplication::getDisplayFormulaBar()
+ throw (css::uno::RuntimeException, std::exception)
{
sal_Bool bRes = false;
ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index 105b201..220d08d 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -80,7 +80,8 @@ public:
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL getDisplayFormulaBar() throw ( css::uno::RuntimeException );
+ virtual ::sal_Bool SAL_CALL getDisplayFormulaBar()
+ throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException );
virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
commit 6ea531369227b5014edc8cbaab0a57dd15fa0bbd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:53:38 2014 +0000
coverity#1158319 Uncaught exception
Change-Id: I3b8af150fd84991ce27e311676bb1e1fe3669081
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 7916990..73a0f32 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -165,7 +165,9 @@ public:
throw( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL
- getAnchor(void) throw( ::com::sun::star::uno::RuntimeException );
+ getAnchor()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
// XComponent
virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 6d7d942..1ed1198 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1027,7 +1027,8 @@ void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTe
throw lang::IllegalArgumentException(); // anchor cannot be changed
}
-uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() throw(uno::RuntimeException)
+uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 6bdfbb1eac02708946c63fca3c4ef7e9062742c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:42:39 2014 +0000
coverity#440974 Dereference before null check
Change-Id: I680a2f9f53aaf9e45a0059173744afa9b6ef1d5a
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 5705a21..2a4a886 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -985,10 +985,12 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon )
for( int i = 0; i < nCount && !bGnomeIconSize; i++ )
{
char* pName = XGetAtomName( GetXDisplay(), pProps[i] );
- if( !strcmp( pName, "GNOME_PANEL_DESKTOP_AREA" ) )
- bGnomeIconSize = true;
if( pName )
+ {
+ if( !strcmp( pName, "GNOME_PANEL_DESKTOP_AREA" ) )
+ bGnomeIconSize = true;
XFree( pName );
+ }
}
if( pProps )
XFree( pProps );
commit 4d92cbf70c19485f73ddb42795fd768bc56385b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:40:53 2014 +0000
coverity#440971 Dereference before null check
Change-Id: I2bd6c0cffef5bf2e2d05781d4ec151f11d517cb6
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 2a97159..46f3238 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2083,7 +2083,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
const SfxStyleFamily eFam=pItem->GetFamily();
sal_uInt16 nMask;
- if( pItem && nActFilter != SFXSTYLEBIT_ALL )
+ if( nActFilter != SFXSTYLEBIT_ALL )
{
nMask = pItem->GetFilterList()[ nActFilter ]->nFlags;
if(!nMask) // automatic
commit 7b52b96a6f742952d7b4c57a60aee494a2e25cde
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:39:30 2014 +0000
coverity#440874 Dereference before null check
Change-Id: I542da40fe1209198ea784cf52372cd6d83292f33
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index ab25dfd..400b10b 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -365,8 +365,11 @@ throw(css::uno::RuntimeException)
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+ if (!mpMenu)
+ return;
+
sal_Int32 nItemCount = (sal_Int32)mpMenu->GetItemCount();
- if ( mpMenu && ( nCount > 0 ) && ( nPos >= 0 ) && ( nPos < nItemCount ) && ( nItemCount > 0 ))
+ if ( ( nCount > 0 ) && ( nPos >= 0 ) && ( nPos < nItemCount ) && ( nItemCount > 0 ))
{
sal_Int16 nP = sal::static_int_cast< sal_Int16 >(
std::min( (int)(nPos+nCount), (int)nItemCount ));
commit 0ee169f7833684c8ef16df259029cc169119f6f1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:37:37 2014 +0000
coverity#440872 Dereference before null check
Change-Id: I263f6c5c74f42b33155365ccb163c3b68f538a97
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 814cc47..d4d3666 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -119,13 +119,10 @@ HierarchyEntry::HierarchyEntry(
HierarchyUri aUri( rURL );
m_aServiceSpecifier = aUri.getService();
- if ( pProvider )
- {
- m_xConfigProvider
- = pProvider->getConfigProvider( m_aServiceSpecifier );
- m_xRootReadAccess
- = pProvider->getRootConfigReadNameAccess( m_aServiceSpecifier );
- }
+ m_xConfigProvider
+ = pProvider->getConfigProvider( m_aServiceSpecifier );
+ m_xRootReadAccess
+ = pProvider->getRootConfigReadNameAccess( m_aServiceSpecifier );
// Note: do not init m_aPath in init list. createPathFromHierarchyURL
// needs m_xContext and m_aMutex.
commit 426d0963835070bc596bbf7bd0d7c4d1d3419ef4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:36:14 2014 +0000
coverity#440831 Dereference before null check
Change-Id: If19c17088bfbc43e5079d88a3110491e56805749
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index b999216..e681176 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -460,7 +460,7 @@ sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Si
{
Point aPt( rPt );
Size aSz( rSz );
- if ( pAttr->IsCropped() )
+ if ( pAttr && pAttr->IsCropped() )
{
PolyPolygon aClipPolyPoly;
sal_Bool bRectClip;
commit 417a8624c7dd11da99f30e8d62bb4f53becd318e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:32:25 2014 +0000
coverity#440811 Dereference null return value
Change-Id: Iccf2f6dd757fe8d14a2f68a0492ea898d2f95490
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 33e05cf..51bebd4 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1915,7 +1915,10 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
void SfxBindings::ClearCache_Impl( sal_uInt16 nSlotId )
{
- GetStateCache(nSlotId)->ClearCache();
+ SfxStateCache* pCache = GetStateCache(nSlotId);
+ if (!pCache)
+ return
+ pCache->ClearCache();
}
//--------------------------------------------------------------------
commit 1a940e329aabb7929e7c12c34464098921b8a720
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:30:54 2014 +0000
coverity#440774 Logically dead code
Change-Id: Id6f13ba0f51bef17de6b5e200c71dbde06e3ab63
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index a05ee21..da47e8b 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1380,17 +1380,8 @@ OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool
sal_Unicode aBuf[128];
sal_Unicode* pBuf = aBuf;
sal_uInt16 nHour = rTime.GetHour();
- sal_Bool bHour12 = sal_False; //!TODO: AM/PM from default time format code
- if ( bHour12 )
- {
- nHour %= 12;
- // 0:00 -> 12:00
- if ( !nHour )
- nHour = 12;
- }
- else
- nHour %= 24;
+ nHour %= 24;
pBuf = ImplAdd2UNum( pBuf, nHour, sal_True /* IsTimeLeadingZero() */ );
pBuf = ImplAddString( pBuf, getTimeSep() );
@@ -1407,17 +1398,7 @@ OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool
}
}
- OUString aStr(aBuf, pBuf - aBuf);
-
- if ( bHour12 )
- {
- if ( (rTime.GetHour() % 24) >= 12 )
- aStr += getTimePM();
- else
- aStr += getTimeAM();
- }
-
- return aStr;
+ return OUString(aBuf, pBuf - aBuf);
}
commit 4d3b7c575a27aff055d738e540a52290621b6a3f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:26:33 2014 +0000
coverity#440521 Dereference before null check
Change-Id: I653b78d9404764d1c89d11154fd8e6a767df9cb0
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 24f9304..fcc2902 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -323,8 +323,7 @@ oslFileError SAL_CALL osl_createTempFile(
rtl_uString_release(temp_file_name);
}
- if (base_directory)
- rtl_uString_release(base_directory);
+ rtl_uString_release(base_directory);
return osl_error;
}
commit 81f9e937054a084e3fe6e9242db69e2476593188
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:25:58 2014 +0000
coverity#440520 Dereference before null check
Change-Id: Id0e2c8e5579ae81c368cf886e52c8306f271c067
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 579398c..24f9304 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -320,8 +320,7 @@ oslFileError SAL_CALL osl_createTempFile(
if (temp_file_url)
rtl_uString_release(temp_file_url);
- if (temp_file_name)
- rtl_uString_release(temp_file_name);
+ rtl_uString_release(temp_file_name);
}
if (base_directory)
commit b34210ee8d84114873616a3988d5dfa6cff8bb49
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:25:30 2014 +0000
coverity#440519 Dereference before null check
Change-Id: I78cfe1a807e59d63dc22fbec8bcadfa7596d5a96
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 53311b7..579398c 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -250,8 +250,7 @@ static oslFileError osl_create_temp_file_impl_(
if ((osl_File_E_None == osl_error) || (osl_error != osl_File_E_EXIST))
{
- if (rand_name)
- rtl_uString_release(rand_name);
+ rtl_uString_release(rand_name);
if (tmp_file_url)
rtl_uString_release(tmp_file_url);
commit 6ebd4a9925b47f2562a91a7a44aea84d95a0047c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:24:48 2014 +0000
coverity#440517 Dereference before null check
Change-Id: I9c09333d0879ba8dc9ef8c4cb2c1d9f0b3654d45
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 2aad4bb..53311b7 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -263,8 +263,7 @@ static oslFileError osl_create_temp_file_impl_(
if (osl_File_E_None == osl_error)
rtl_uString_assign(ppustr_temp_file_name, tmp_file_path);
- if (tmp_file_path)
- rtl_uString_release(tmp_file_path);
+ rtl_uString_release(tmp_file_path);
return osl_error;
}
commit e357c93e7b64784ff383a97b00c553a64f75d3b0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:23:36 2014 +0000
coverity#440504 Dereference before null check
Change-Id: Ia7c817ca0b002279bee8699e4940c57937657ad4
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 866a4f7..cc437d0 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -344,7 +344,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio
}
else
{
- if (pTypeDescr && (xRet = constructClass( pTypeDescr )).is())
+ if ((xRet = constructClass( pTypeDescr )).is())
_aElements.setValue( aName, makeAny( xRet ) ); // update
}
commit 51f252dbf22343bfd68bf707d3d10a19d621587e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:22:26 2014 +0000
coverity#440338 Dereference null return value
Change-Id: I5da7c1d8fe7f4632b386a02dd54f4b203a00fc25
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 5f85ca0..436ae20 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -135,7 +135,14 @@ static void getRuntimeImpl( PyRef & globalDict, PyRef &runtimeImpl )
Reference< XInterface > () );
}
- globalDict = PyRef( PyModule_GetDict(PyImport_AddModule("__main__")));
+ PyObject* pModule = PyImport_AddModule("__main__");
+
+ if (!pModule)
+ {
+ throw RuntimeException("can't import __main__ module", Reference< XInterface > ());
+ }
+
+ globalDict = PyRef( PyModule_GetDict(pModule));
if( ! globalDict.is() ) // FATAL !
{
commit 5806a777b0bd8c2c988586daac6e7b5a4085ef7e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 28 09:19:03 2014 +0000
coverity#440064 Logically dead code
Change-Id: I52c9e37ca4d3238b9018264b6542a9dcebca13f6
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 7519a7b..7787124 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -140,7 +140,7 @@ static double asciiToFloat(const sal_Char *s)
{
double d = 0.0;
double e, k;
- sal_Int32 neg = 0, negexp = 0;
+ sal_Int32 neg = 0;
if (*s == '-')
{
@@ -168,7 +168,6 @@ static double asciiToFloat(const sal_Char *s)
s++;
if (*s == '-')
{
- negexp = 1;
s++;
} else
{
@@ -184,10 +183,7 @@ static double asciiToFloat(const sal_Char *s)
{
for (k = 1; e > 0; k *= 10, e--)
;
- if (negexp)
- d /= k;
- else
- d *= k;
+ d /= k;
}
}
}
commit 12d7d3f368cfe82c2ec8c3f1779ebb43ef3d1453
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:36:06 2014 +0000
coverity#1130485 Uninitialized scalar field
Change-Id: I18e90afe2c2425a0b6b65fdf46497aac8c755fcf
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index 53e01bf..c4ff915 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -203,9 +203,11 @@ void AddressWalkerWriter::writeValue(double aValue)
// DataCellIterator
-DataCellIterator::DataCellIterator(ScRange aInputRange, bool aByColumn) :
- mInputRange(aInputRange),
- mByColumn(aByColumn)
+DataCellIterator::DataCellIterator(ScRange aInputRange, bool aByColumn)
+ : mInputRange(aInputRange)
+ , mByColumn(aByColumn)
+ , mCol(0)
+ , mRow(0)
{
if(aByColumn)
mCol = aInputRange.aStart.Col();
commit f829af4d8087f5521379002797821ab1c678916d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:34:43 2014 +0000
coverity#1132708 Unintended sign extension
Change-Id: Iaf73bf619c6dfa8c29b02c35410aadf972a71448
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 1081bf4..11ecdca 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -784,10 +784,8 @@ void SvxRectCtl::SetCS(CTL_STYLE eNew)
//Logic Pixel
long SvxPixelCtl::PointToIndex(const Point &aPt) const
{
- sal_uInt16 nX, nY;
-
- nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() );
- nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() );
+ sal_Int32 nX = aPt.X() * nLines / aRectSize.Width();
+ sal_Int32 nY = aPt.Y() * nLines / aRectSize.Height();
return nX + nY * nLines ;
}
@@ -796,8 +794,8 @@ Point SvxPixelCtl::IndexToPoint(long nIndex) const
{
DBG_ASSERT(nIndex >= 0 && nIndex < nSquares ," Check Index");
- sal_uInt16 nXIndex = nIndex % nLines ;
- sal_uInt16 nYIndex = sal_uInt16(nIndex / nLines) ;
+ sal_Int32 nXIndex = nIndex % nLines;
+ sal_Int32 nYIndex = nIndex / nLines;
Point aPtTl;
aPtTl.Y() = aRectSize.Height() * nYIndex / nLines + 1;
@@ -815,9 +813,8 @@ long SvxPixelCtl::ShowPosition( const Point &pt)
{
Point aPt = PixelToLogic( pt );
- sal_uInt16 nX, nY;
- nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() );
- nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() );
+ sal_Int32 nX = aPt.X() * nLines / aRectSize.Width();
+ sal_Int32 nY = aPt.Y() * nLines / aRectSize.Height();
ChangePixel( nX + nY * nLines );
commit a2a0e1b2a587d846450a129189ea3c5c324f362d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:27:26 2014 +0000
coverity#704212 Logically dead code
Change-Id: I1f915b4419ae754a3827c2c662e5799bade66835
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index efdb336..896273b 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -239,52 +239,42 @@ void SAL_CALL ChartController::setPosSize(
{
Size aLogicSize = m_pChartWindow->PixelToLogic( Size( Width, Height ), MapMode( MAP_100TH_MM ) );
- bool bIsEmbedded = true;
//todo: for standalone chart: detect whether we are standalone
- if( bIsEmbedded )
+ //change map mode to fit new size
+ awt::Size aModelPageSize = ChartModelHelper::getPageSize( getModel() );
+ sal_Int32 nScaleXNumerator = aLogicSize.Width();
+ sal_Int32 nScaleXDenominator = aModelPageSize.Width;
+ sal_Int32 nScaleYNumerator = aLogicSize.Height();
+ sal_Int32 nScaleYDenominator = aModelPageSize.Height;
+ MapMode aNewMapMode(
+ MAP_100TH_MM,
+ Point(0,0),
+ Fraction(nScaleXNumerator, nScaleXDenominator),
+ Fraction(nScaleYNumerator, nScaleYDenominator) );
+ m_pChartWindow->SetMapMode(aNewMapMode);
+ m_pChartWindow->setPosSizePixel( X, Y, Width, Height, Flags );
+
+ //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100%
+ uno::Reference< beans::XPropertySet > xProp( m_xChartView, uno::UNO_QUERY );
+ if( xProp.is() )
{
- //change map mode to fit new size
- awt::Size aModelPageSize = ChartModelHelper::getPageSize( getModel() );
- sal_Int32 nScaleXNumerator = aLogicSize.Width();
- sal_Int32 nScaleXDenominator = aModelPageSize.Width;
- sal_Int32 nScaleYNumerator = aLogicSize.Height();
- sal_Int32 nScaleYDenominator = aModelPageSize.Height;
- MapMode aNewMapMode(
- MAP_100TH_MM,
- Point(0,0),
- Fraction(nScaleXNumerator, nScaleXDenominator),
- Fraction(nScaleYNumerator, nScaleYDenominator) );
- m_pChartWindow->SetMapMode(aNewMapMode);
- m_pChartWindow->setPosSizePixel( X, Y, Width, Height, Flags );
-
- //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100%
- uno::Reference< beans::XPropertySet > xProp( m_xChartView, uno::UNO_QUERY );
- if( xProp.is() )
- {
- uno::Sequence< beans::PropertyValue > aZoomFactors(4);
- aZoomFactors[0].Name = "ScaleXNumerator";
- aZoomFactors[0].Value = uno::makeAny( nScaleXNumerator );
- aZoomFactors[1].Name = "ScaleXDenominator";
- aZoomFactors[1].Value = uno::makeAny( nScaleXDenominator );
- aZoomFactors[2].Name = "ScaleYNumerator";
- aZoomFactors[2].Value = uno::makeAny( nScaleYNumerator );
- aZoomFactors[3].Name = "ScaleYDenominator";
- aZoomFactors[3].Value = uno::makeAny( nScaleYDenominator );
- xProp->setPropertyValue( "ZoomFactors", uno::makeAny( aZoomFactors ));
- }
-
- //a correct work area is at least necessary for correct values in the position and size dialog and for dragging area
- if(m_pDrawViewWrapper)
- {
- Rectangle aRect(Point(0,0), m_pChartWindow->GetOutputSize());
- m_pDrawViewWrapper->SetWorkArea( aRect );
- }
+ uno::Sequence< beans::PropertyValue > aZoomFactors(4);
+ aZoomFactors[0].Name = "ScaleXNumerator";
+ aZoomFactors[0].Value = uno::makeAny( nScaleXNumerator );
+ aZoomFactors[1].Name = "ScaleXDenominator";
+ aZoomFactors[1].Value = uno::makeAny( nScaleXDenominator );
+ aZoomFactors[2].Name = "ScaleYNumerator";
+ aZoomFactors[2].Value = uno::makeAny( nScaleYNumerator );
+ aZoomFactors[3].Name = "ScaleYDenominator";
+ aZoomFactors[3].Value = uno::makeAny( nScaleYDenominator );
+ xProp->setPropertyValue( "ZoomFactors", uno::makeAny( aZoomFactors ));
}
- else
+
+ //a correct work area is at least necessary for correct values in the position and size dialog and for dragging area
+ if(m_pDrawViewWrapper)
{
- //change visarea
- ChartModelHelper::setPageSize( awt::Size( aLogicSize.Width(), aLogicSize.Height() ), getModel() );
- m_pChartWindow->setPosSizePixel( X, Y, Width, Height, Flags );
+ Rectangle aRect(Point(0,0), m_pChartWindow->GetOutputSize());
+ m_pDrawViewWrapper->SetWorkArea( aRect );
}
m_pChartWindow->Invalidate();
}
commit 92026cc8444cca42c517da03f5f139d71a1a149d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:22:47 2014 +0000
coverity#440938 Logically dead code
Change-Id: I33f895ab913eee0dd6a5df05cd2f4cffb88cc1ef
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index d745b4b..cf02e15 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -935,7 +935,6 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath )
SgfHeader aHead;
SgfEntry aEntr;
sal_uLong nNext;
- bool bRdFlag=false; // graphic entry read ?
bool bRet=false; // return value
aIniPath.Append(OUString("sgf.ini"));
@@ -947,7 +946,7 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath )
rInp>>aHead;
if (aHead.ChkMagic() && aHead.Typ==SgfStarDraw && aHead.Version==SGV_VERSION) {
nNext=aHead.GetOffset();
- while (nNext && !bRdFlag && !rInp.GetError()) {
+ while (nNext && !rInp.GetError()) {
rInp.Seek(nFileStart+nNext);
rInp>>aEntr;
nNext=aEntr.GetOffset();
@@ -955,9 +954,6 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath )
bRet=SgfFilterSDrw( rInp,aHead,aEntr,rMtf );
}
} // while(nNext)
- if (bRdFlag) {
- if (!rInp.GetError()) bRet=true; // seems ok
- }
}
delete pSgfFonts;
return(bRet);
commit c051007c1b744ab072547107a7820551f992ad18
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:21:42 2014 +0000
coverity#440882 Logically dead code
Change-Id: Ia54cffe6368d320c717b941b4f3df036f924c343
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index beb36f7..1fbcba9 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -521,7 +521,7 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util
{
nParmIndex = 0;
aToken = aParamName;
- aParamName = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : OUString();
+ aParamName = aToken.getToken( 0, ':', nParmIndex );
aParamType = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : OUString();
}
commit f5bcc7d91ca2b1bcd636a9d07b2c888f65469c2f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:16:23 2014 +0000
coverity#440030 Logically dead code
Change-Id: I77428c6cf1f79dcc0e2c5e1d52f9b4b8c88130e3
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 1308803..9ea0138 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -293,20 +293,7 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
}
else
{
- if (bCmdFile)
- {
- m_inputFiles.push_back(av[i]);
- }
- else
- {
- OUString system_filepath;
- if (osl_getCommandArg( i-1, &system_filepath.pData )
- != osl_Process_E_None)
- {
- OSL_ASSERT(false);
- }
- m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding()));
- }
+ m_inputFiles.push_back(av[i]);
}
}
}
commit d09c534c982cdb37535c03504ec7420636efb033
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:15:25 2014 +0000
coverity#440029 Logically dead code
Change-Id: Id071c8658b473b9d393a32e1da2c2474bb7361d3
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index db7d896..5e9130c 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -51,9 +51,6 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
}
i = 1;
- } else
- {
- i = 0;
}
char *s=NULL;
@@ -219,19 +216,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
}
} else
{
- if (bCmdFile)
- {
- m_inputFiles.push_back(av[i]);
- } else
- {
- OUString system_filepath;
- if (osl_getCommandArg( i-1, &system_filepath.pData )
- != osl_Process_E_None)
- {
- OSL_ASSERT(false);
- }
- m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding()));
- }
+ m_inputFiles.push_back(av[i]);
}
}
}
commit ba5261057cc759a9bd1e3b5fb5917dd84793d325
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:13:22 2014 +0000
coverity#440026 Logically dead code
Change-Id: Ib269314be090d2d65b593b1c47fea1e10ef2582b
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index ce46492..fb9adb3 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.hxx
@@ -660,32 +660,21 @@ inline uno_Sequence * icopyConstructSequence(
{
char * pElements = pDest->elements;
void ** pSourceElements = (void **)pSource->elements;
- if (mapping)
- {
- typelib_TypeDescription * pElementTypeDescr = 0;
- TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType );
- for ( sal_Int32 nPos = nElements; nPos--; )
- {
- ((void **)pElements)[nPos] = 0;
- if (((void **)pSourceElements)[nPos])
- {
- (*mapping->mapInterface)(
- mapping, (void **)pElements + nPos,
- pSourceElements[nPos],
- (typelib_InterfaceTypeDescription *)
- pElementTypeDescr );
- }
- }
- TYPELIB_DANGER_RELEASE( pElementTypeDescr );
- }
- else
+ typelib_TypeDescription * pElementTypeDescr = 0;
+ TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType );
+ for ( sal_Int32 nPos = nElements; nPos--; )
{
- for ( sal_Int32 nPos = nElements; nPos--; )
+ ((void **)pElements)[nPos] = 0;
+ if (((void **)pSourceElements)[nPos])
{
- ((void **)pElements)[nPos] = pSourceElements[nPos];
- _acquire( ((void **)pElements)[nPos], acquire );
+ (*mapping->mapInterface)(
+ mapping, (void **)pElements + nPos,
+ pSourceElements[nPos],
+ (typelib_InterfaceTypeDescription *)
+ pElementTypeDescr );
}
}
+ TYPELIB_DANGER_RELEASE( pElementTypeDescr );
}
break;
}
commit 5c734f440a685796bfca467e3d828581d747cab0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:11:09 2014 +0000
coverity#738565 Uninitialized scalar field
Change-Id: Ie969773240bd7ecdcf56d7c533010d0aa32872c8
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index f3b32d9..f6cb5b2 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -382,6 +382,7 @@ SfxLibraryContainer::SfxLibraryContainer( void )
, mbOasis2OOoFormat( false )
, mpBasMgr( NULL )
, mbOwnBasMgr( false )
+ , meInitMode(DEFAULT)
{
DBG_CTOR( SfxLibraryContainer, NULL );
commit ab4b2e0b566d1ca5f730ef07ab335e4546d78346
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:09:02 2014 +0000
coverity#983594 Uncaught exception
Change-Id: Ic49f88b44216a24df8a236b755d22b2537245c5f
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
index 4eff637..57c4a8b 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
@@ -104,8 +104,12 @@ namespace accessibility
sal_Bool IsAlive_Impl() const;
sal_Bool IsShowing_Impl() const;
- Rectangle GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
- Rectangle GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
+ Rectangle GetBoundingBox()
+ throw (css::lang::DisposedException,
+ css::uno::RuntimeException);
+ Rectangle GetBoundingBoxOnScreen()
+ throw (css::lang::DisposedException,
+ css::uno::RuntimeException);
void EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
void NotifyAccessibleEvent( sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _aOldValue, const ::com::sun::star::uno::Any& _aNewValue );
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 98666fd..3d2cefa 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -163,7 +163,8 @@ namespace accessibility
return bShowing;
}
// -----------------------------------------------------------------------------
- Rectangle AccessibleListBoxEntry::GetBoundingBox() throw ( lang::DisposedException )
+ Rectangle AccessibleListBoxEntry::GetBoundingBox()
+ throw (lang::DisposedException, uno::RuntimeException)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -172,7 +173,8 @@ namespace accessibility
return GetBoundingBox_Impl();
}
// -----------------------------------------------------------------------------
- Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException )
+ Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen()
+ throw (lang::DisposedException, uno::RuntimeException)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
commit 420ca6138c2bc56fcb98262c48b4bf2822cd73cd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 20:04:13 2014 +0000
coverity#706219 Uncaught exception
Change-Id: I1c2566337347679453bee46a78a4a0ecd7fdd2fb
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index b0108d5..19b0051 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
@@ -79,8 +79,12 @@ namespace accessibility
sal_Bool IsAlive_Impl() const;
sal_Bool IsShowing_Impl() const;
- Rectangle GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
- Rectangle GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
+ Rectangle GetBoundingBox()
+ throw (css::lang::DisposedException,
+ css::uno::RuntimeException);
+ Rectangle GetBoundingBoxOnScreen()
+ throw (css::lang::DisposedException,
+ css::uno::RuntimeException);
void EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
protected:
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 2217d82..437dc48 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -149,7 +149,8 @@ throw(RuntimeException)
return bShowing;
}
// -----------------------------------------------------------------------------
- Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() throw ( lang::DisposedException )
+ Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox()
+ throw (lang::DisposedException, uno::RuntimeException)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -158,7 +159,8 @@ throw(RuntimeException)
return GetBoundingBox_Impl();
}
// -----------------------------------------------------------------------------
- Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException )
+ Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen()
+ throw (lang::DisposedException, uno::RuntimeException)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
More information about the Libreoffice-commits
mailing list