[Libreoffice-commits] core.git: 34 commits - cui/source dbaccess/source filter/source include/sfx2 include/sot include/svtools include/svx include/vcl oox/source sd/source sfx2/source starmath/source svtools/source svx/source sw/inc sw/source unusedcode.easy vcl/generic vcl/inc vcl/source vcl/unx
Caolán McNamara
caolanm at redhat.com
Wed Feb 12 05:06:09 PST 2014
cui/source/tabpages/tabstpge.cxx | 6 +
dbaccess/source/ui/control/tabletree.cxx | 9 --
dbaccess/source/ui/inc/tabletree.hxx | 5 -
filter/source/msfilter/msdffimp.cxx | 19 ++---
include/sfx2/tabdlg.hxx | 6 -
include/sfx2/templateabstractview.hxx | 5 -
include/sot/storage.hxx | 1
include/svtools/itemdel.hxx | 2
include/svtools/toolpanel/toolpaneldeck.hxx | 9 --
include/svtools/vclxaccessibleheaderbaritem.hxx | 1
include/svx/frmdirlbox.hxx | 1
include/vcl/ppdparser.hxx | 1
oox/source/shape/ShapeContextHandler.cxx | 15 ++--
sd/source/core/drawdoc2.cxx | 2
sfx2/source/appl/childwin.cxx | 6 -
sfx2/source/control/dispatch.cxx | 8 +-
sfx2/source/control/templateabstractview.cxx | 12 ---
sfx2/source/control/unoctitm.cxx | 1
sfx2/source/dialog/tabdlg.cxx | 25 ------
sfx2/source/dialog/templdlg.cxx | 52 --------------
sfx2/source/inc/templdgi.hxx | 58 ++++++++++++++--
starmath/source/view.cxx | 21 +++--
svtools/source/control/vclxaccessibleheaderbaritem.cxx | 19 -----
svtools/source/misc/itemdel.cxx | 23 +++---
svtools/source/toolpanel/toolpaneldeck.cxx | 20 -----
svx/source/accessibility/AccessibleTextHelper.cxx | 14 ---
svx/source/dialog/connctrl.cxx | 6 +
svx/source/dialog/frmdirlbox.cxx | 7 -
sw/inc/expfld.hxx | 2
sw/inc/frmfmt.hxx | 7 -
sw/inc/unotxdoc.hxx | 5 +
sw/source/core/access/accmap.cxx | 58 ----------------
sw/source/core/access/accnotextframe.cxx | 27 -------
sw/source/core/fields/fldlst.cxx | 30 --------
sw/source/core/layout/atrfrm.cxx | 17 ----
sw/source/filter/html/htmlatr.cxx | 3
sw/source/filter/html/htmlfly.cxx | 57 +--------------
sw/source/filter/html/htmlnum.cxx | 4 -
sw/source/filter/html/wrthtml.hxx | 4 -
sw/source/ui/inc/unotxvw.hxx | 61 ++++++++++++-----
sw/source/ui/uno/unotxdoc.cxx | 3
sw/source/ui/uno/unotxvw.cxx | 47 ++++++++-----
unusedcode.easy | 14 +--
vcl/generic/fontmanager/fontcache.cxx | 10 --
vcl/generic/fontmanager/fontmanager.cxx | 18 -----
vcl/inc/fontcache.hxx | 1
vcl/inc/fontmanager.hxx | 2
vcl/source/gdi/pngread.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 10 --
49 files changed, 219 insertions(+), 517 deletions(-)
New commits:
commit e79c381f4d4906d5ba6c02bb84b7a40475a5399b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 12:46:37 2014 +0000
coverity#441010 Dereference after null check
Change-Id: I3f35f2ed2154f75303d561efecd1638b73872b61
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index c5f78a56..06114c6 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -230,9 +230,9 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
}
}
- SfxDispatcher *pDisp = pBindings->GetDispatcher_Impl();
- SfxModule *pMod = pDisp ? SfxModule::GetActiveModule( pDisp->GetFrame() ) :0;
- if ( !pChild && pMod )
+ SfxDispatcher *pDisp = pBindings ? pBindings->GetDispatcher_Impl() : NULL;
+ SfxModule *pMod = pDisp ? SfxModule::GetActiveModule( pDisp->GetFrame() ) : NULL;
+ if (!pChild && pMod)
{
SfxChildWinFactArr_Impl *pFactories = pMod->GetChildWinFactories_Impl();
if ( pFactories )
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 5af6681..3a0cf04 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -504,50 +504,8 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange )
DockingWindow::StateChanged( nStateChange );
}
-
-//=========================================================================
-typedef std::vector<OUString> ExpandedEntries_t;
-
-/* [Description]
-
- TreeListBox class for displaying the hierarchical view of the templates
-*/
-
-class StyleTreeListBox_Impl : public DropListBox_Impl
-{
-private:
- SvTreeListEntry* pCurEntry;
- Link aDoubleClickLink;
- Link aDropLink;
- OUString aParent;
- OUString aStyle;
-
-protected:
- virtual void Command( const CommandEvent& rMEvt );
- virtual bool Notify( NotifyEvent& rNEvt );
- virtual sal_Bool DoubleClickHdl();
- virtual bool ExpandingHdl();
- virtual void ExpandedHdl();
- virtual sal_Bool NotifyMoving(SvTreeListEntry* pTarget,
- SvTreeListEntry* pEntry,
- SvTreeListEntry*& rpNewParent,
- sal_uIntPtr& rNewChildPos);
-public:
- StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle = 0);
-
- void SetDoubleClickHdl(const Link &rLink) { aDoubleClickLink = rLink; }
- void SetDropHdl(const Link &rLink) { aDropLink = rLink; }
- using SvTreeListBox::GetParent;
- const OUString& GetParent() const { return aParent; }
- const OUString& GetStyle() const { return aStyle; }
- void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const;
-
- virtual PopupMenu* CreateContextMenu( void );
-};
-
//-------------------------------------------------------------------------
-
void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) const
{
SvTreeListEntry *pEntry;
@@ -1261,9 +1219,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
}
MakeTree_Impl(aArr);
ExpandedEntries_t aEntries;
- if(pTreeBox)
- ((const StyleTreeListBox_Impl *)pTreeBox)->
- MakeExpanded_Impl( aEntries);
+ pTreeBox->MakeExpanded_Impl(aEntries);
pTreeBox->SetUpdateMode( sal_False );
pTreeBox->Clear();
const sal_uInt16 nCount = aArr.size();
@@ -1850,11 +1806,9 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
pTreeBox->SetNodeDefaultImages();
pTreeBox->SetSelectHdl(
LINK(this, SfxCommonTemplateDialog_Impl, FmtSelectHdl));
- ((StyleTreeListBox_Impl*)pTreeBox)->
- SetDoubleClickHdl(
+ pTreeBox->SetDoubleClickHdl(
LINK(this, SfxCommonTemplateDialog_Impl, ApplyHdl));
- ((StyleTreeListBox_Impl*)pTreeBox)->
- SetDropHdl(LINK(this, SfxCommonTemplateDialog_Impl, DropHdl));
+ pTreeBox->SetDropHdl(LINK(this, SfxCommonTemplateDialog_Impl, DropHdl));
pTreeBox->SetOptimalImageIndent();
FillTreeBox();
SelectStyle(aSelectEntry);
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 68da5bcb..8a4dfdc 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -81,6 +81,45 @@ public:
virtual bool Notify( NotifyEvent& rNEvt );
};
+typedef std::vector<OUString> ExpandedEntries_t;
+
+/* [Description]
+
+ TreeListBox class for displaying the hierarchical view of the templates
+*/
+
+class StyleTreeListBox_Impl : public DropListBox_Impl
+{
+private:
+ SvTreeListEntry* pCurEntry;
+ Link aDoubleClickLink;
+ Link aDropLink;
+ OUString aParent;
+ OUString aStyle;
+
+protected:
+ virtual void Command( const CommandEvent& rMEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
+ virtual sal_Bool DoubleClickHdl();
+ virtual bool ExpandingHdl();
+ virtual void ExpandedHdl();
+ virtual sal_Bool NotifyMoving(SvTreeListEntry* pTarget,
+ SvTreeListEntry* pEntry,
+ SvTreeListEntry*& rpNewParent,
+ sal_uIntPtr& rNewChildPos);
+public:
+ StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle = 0);
+
+ void SetDoubleClickHdl(const Link &rLink) { aDoubleClickLink = rLink; }
+ void SetDropHdl(const Link &rLink) { aDropLink = rLink; }
+ using SvTreeListBox::GetParent;
+ const OUString& GetParent() const { return aParent; }
+ const OUString& GetStyle() const { return aStyle; }
+ void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const;
+
+ virtual PopupMenu* CreateContextMenu( void );
+};
+
// class SfxActionListBox ------------------------------------------------
class SfxActionListBox : public DropListBox_Impl
@@ -140,7 +179,7 @@ protected:
SfxStyleFamilies* pStyleFamilies;
SfxTemplateItem* pFamilyState[MAX_FAMILIES];
SfxStyleSheetBasePool* pStyleSheetPool;
- SvTreeListBox* pTreeBox;
+ StyleTreeListBox_Impl* pTreeBox;
SfxObjectShell* pCurObjShell;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 >
xModuleManager;
commit cc7b1ee2f3a06c6f0a52f6c6de06b2dd21e1150c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 12:45:25 2014 +0000
coverity#440982 Dereference after null check
Change-Id: I5e19801311c2cb038b6e1c5e7e52a6022f62ea86
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 830397c..61f8ebf 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1368,11 +1368,13 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce )
// keep own tools internally for collecting
GetBindings()->GetDispatcher()->pImp->bUpdated = sal_False;
+ com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame;
SfxBindings* pBindings = GetBindings();
- if ( pBindings )
+ if (pBindings)
+ {
pBindings->DENTERREGISTRATIONS();
-
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame = pBindings->GetActiveFrame();
+ xFrame = pBindings->GetActiveFrame();
+ }
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, com::sun::star::uno::UNO_QUERY );
com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
if ( xPropSet.is() )
commit 7141cfa6a37209cca989709167937440c4f8aa75
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 12:41:19 2014 +0000
coverity#440973 Dereference after null check
Change-Id: I24caa53a66da4d724e4f8e5d4b06c7d3e9633f5e
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 413fa96..a900459 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -686,6 +686,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
// rListener->dispatchFinished potentially calls
// framework::Desktop::terminate -> SfxApplication::Deinitialize ->
// ~CntItemPool:
+ if (pDispatcher)
{
SfxAllItemSet aInternalSet( SFX_APP()->GetPool() );
if (xFrameRef.is()) // an empty set is no problem ... but an empty frame reference can be a problem !
commit a0bae848d42b675e4638420d632d710ed3cf76c3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 12:22:50 2014 +0000
coverity#736486 try and make coverity see through this better
Change-Id: I53d858cad02ae2c8f36de926b380d3a50810e141
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index ad56240..d6f7d65 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -38,12 +38,13 @@ class SfxItemDesruptor_Impl
Link aLink;
private:
- DECL_LINK( Delete, void * );
- SfxItemDesruptor_Impl( const SfxItemDesruptor_Impl& ); // n.i.
+ DECL_LINK( Delete, SfxItemDesruptor_Impl * );
+ SfxItemDesruptor_Impl( const SfxItemDesruptor_Impl& ); // n.i.
public:
- SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt );
- ~SfxItemDesruptor_Impl();
+ SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt );
+ void LaunchDeleteOnIdle();
+ ~SfxItemDesruptor_Impl();
};
// ------------------------------------------------------------------------
@@ -55,7 +56,10 @@ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ):
DBG_ASSERT( 0 == pItem->GetRefCount(), "disrupting pooled item" );
pItem->SetKind( SFX_ITEMS_DELETEONIDLE );
+}
+void SfxItemDesruptor_Impl::LaunchDeleteOnIdle()
+{
// process in Idle
GetpApp()->InsertIdleHdl( aLink, 1 );
}
@@ -75,18 +79,18 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
}
// ------------------------------------------------------------------------
-IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete)
+IMPL_LINK(SfxItemDesruptor_Impl, Delete, SfxItemDesruptor_Impl*, pImpl)
{
{DBG_CHKTHIS(SfxItemDesruptor_Impl, 0);}
- delete this;
+ delete pImpl;
return 0;
}
-// ------------------------------------------------------------------------
-void DeleteItemOnIdle( SfxPoolItem* pItem )
+void DeleteItemOnIdle(SfxPoolItem* pItem)
{
DBG_ASSERT( 0 == pItem->GetRefCount(), "deleting item in use" );
- new SfxItemDesruptor_Impl( pItem );
+ SfxItemDesruptor_Impl *pDesruptor = new SfxItemDesruptor_Impl(pItem);
+ pDesruptor->LaunchDeleteOnIdle();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 401a8cecee5861d37bd91239200dd49719a0cac4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 12:13:55 2014 +0000
return value unused
Change-Id: I22276dd551c4d1311a113ce6c38cc5eb97ed12ef
diff --git a/include/svtools/itemdel.hxx b/include/svtools/itemdel.hxx
index ef08ca9..da68f2f 100644
--- a/include/svtools/itemdel.hxx
+++ b/include/svtools/itemdel.hxx
@@ -23,7 +23,7 @@
class SfxPoolItem;
-SVT_DLLPUBLIC SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem );
+SVT_DLLPUBLIC void DeleteItemOnIdle( SfxPoolItem* pItem );
#endif
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 0e89b8b..ad56240 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -83,11 +83,10 @@ IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete)
}
// ------------------------------------------------------------------------
-SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem )
+void DeleteItemOnIdle( SfxPoolItem* pItem )
{
DBG_ASSERT( 0 == pItem->GetRefCount(), "deleting item in use" );
new SfxItemDesruptor_Impl( pItem );
- return pItem;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2ce5d7d2efdde745719f86be4aa6cceee5407e13
Author: Timothy Markle <tmarkle7 at gmail.com>
Date: Sat Feb 8 20:11:56 2014 +0100
fdo#66822 - refactor HTML export of image to bullet list
Replaced src attribute with style attribute in <ul>.
Removed invalid width, height, and align attributes.
Removed two unused variables rSize and pVert.
Change-Id: I40390bd02c7fb11a445da44d33492a59c8e6372c
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index f15a9ab..367d63a 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -974,8 +974,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
OSL_ENSURE( aNumInfo.GetNumRule(), "Wo ist die Numerierung geblieben???" );
OSL_ENSURE( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" );
const SwNumFmt& rNumFmt = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
- OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFmt.GetBrush(),
- rNumFmt.GetGraphicSize(), rNumFmt.GetGraphicOrientation() );
+ OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFmt.GetBrush() );
}
rHWrt.GetNumInfo() = aNumInfo;
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 4c07230..7e67b99 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1188,9 +1188,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
Writer& OutHTML_BulletImage( Writer& rWrt,
const sal_Char *pTag,
- const SvxBrushItem* pBrush,
- const Size &rSize,
- const SwFmtVertOrient* pVertOrient )
+ const SvxBrushItem* pBrush )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -1213,59 +1211,12 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
sOut.append('<').append(pTag);
sOut.append(' ');
- sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\"").
+ sOut.append(OOO_STRING_SVTOOLS_HTML_O_style).append("=\"").
+ append("list-style-image: ").append("url(").
append(OOO_STRING_SVTOOLS_HTML_O_data).append(":");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
- sOut.append('\"');
-
- // Groesse des Objekts Twips ohne Raender
- Size aPixelSz( 0, 0 );
- if( (rSize.Width() || rSize.Height()) && Application::GetDefaultDevice() )
- {
- aPixelSz =
- Application::GetDefaultDevice()->LogicToPixel( rSize,
- MapMode(MAP_TWIP) );
- if( !aPixelSz.Width() && rSize.Width() )
- aPixelSz.Width() = 1;
- if( !aPixelSz.Height() && rSize.Height() )
- aPixelSz.Height() = 1;
- }
-
- if( aPixelSz.Width() )
- {
- sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).
- append("=\"").append(static_cast<sal_Int32>(aPixelSz.Width())).append("\"");
- }
-
- if( aPixelSz.Height() )
- {
- sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).
- append("=\"").append(static_cast<sal_Int32>(aPixelSz.Height())).append("\"");
- }
-
- if( pVertOrient )
- {
- const sal_Char *pStr = 0;
- switch( pVertOrient->GetVertOrient() )
- {
- case text::VertOrientation::LINE_TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_top; break;
- case text::VertOrientation::CHAR_TOP:
- case text::VertOrientation::BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_texttop; break; // geht nicht
- case text::VertOrientation::LINE_CENTER:
- case text::VertOrientation::CHAR_CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_absmiddle; break; // geht nicht
- case text::VertOrientation::CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_middle; break;
- case text::VertOrientation::LINE_BOTTOM:
- case text::VertOrientation::CHAR_BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_absbottom; break; // geht nicht
- case text::VertOrientation::TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_bottom; break;
- case text::VertOrientation::NONE: break;
- }
- if( pStr )
- {
- sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).
- append("=\"").append(pStr).append("\"");
- }
- }
+ sOut.append(");").append('\"');
if (pTag)
sOut.append('>');
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 99ff3bd..d4bb297 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -827,9 +827,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OutHTML_BulletImage( rWrt,
0,
- rNumFmt.GetBrush(),
- rNumFmt.GetGraphicSize(),
- rNumFmt.GetGraphicOrientation() );
+ rNumFmt.GetBrush() );
}
else
{
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 95bd99d..bb954e5 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -630,9 +630,7 @@ Writer& OutHTML_Image( Writer&, const SwFrmFmt& rFmt,
const ImageMap *pGenImgMap = 0 );
Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pTag,
- const SvxBrushItem* pBrush,
- const Size &rSize,
- const SwFmtVertOrient* pVertOrient );
+ const SvxBrushItem* pBrush );
Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt );
Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt );
commit c2056dc4af2959066d0dd3918fbe742d206e195c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:27:34 2014 +0000
coverity#705850 Dereference before null check
Change-Id: Icb7dc092c1511006ab6592425d443dadcaeb1784
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 2051165..32d89ff 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -407,7 +407,7 @@ SdrPage* SdDrawDocument::RemovePage(sal_uInt16 nPgNum)
void SdDrawDocument::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos )
{
FmFormModel::InsertMasterPage( pPage, nPos );
- if( pPage && pPage->IsMasterPage() && (static_cast<SdPage*>(pPage)->GetPageKind() == PK_STANDARD) )
+ if( pPage->IsMasterPage() && (static_cast<SdPage*>(pPage)->GetPageKind() == PK_STANDARD) )
{
// new master page created, add its style family
SdStyleSheetPool* pStylePool = (SdStyleSheetPool*) GetStyleSheetPool();
commit 17fd9447264fd75fe990e40e5faab42c9720504c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:26:11 2014 +0000
coverity#708164 Uninitialized scalar field
Change-Id: I7de5d34dc2964f91cb4daa0eb754f9ad02e83667
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 3520a5b..68da5bcb 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -58,14 +58,19 @@ private:
protected:
SfxCommonTemplateDialog_Impl* pDialog;
- sal_uInt16 nModifier;
+ sal_uInt16 nModifier;
public:
- DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) :
- SvTreeListBox( pParent, rId ), pDialog( pD ) {}
- DropListBox_Impl( Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD ) :
- SvTreeListBox( pParent, nWinBits ), pDialog( pD ) {}
-
+ DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD )
+ : SvTreeListBox(pParent, rId)
+ , pDialog(pD)
+ , nModifier(0)
+ {}
+ DropListBox_Impl( Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD )
+ : SvTreeListBox(pParent, nWinBits)
+ , pDialog(pD)
+ , nModifier(0)
+ {}
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
using SvTreeListBox::ExecuteDrop;
commit 655514515794d221955c75510b261210a0d4a3ca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:24:08 2014 +0000
coverity#738374 Uncaught exception
Change-Id: I68e317d7f7a419ed5901d745a9477e0d4570db45
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 53f3c52..3a72a92 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -396,7 +396,10 @@ public:
// css::view::XRenderable
virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
- virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception);
// css::xforms::XFormsSupplier
virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms( ) throw (css::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 77c8a0a..9e3ca6b 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2918,7 +2918,8 @@ void SAL_CALL SwXTextDocument::render(
sal_Int32 nRenderer,
const uno::Any& rSelection,
const uno::Sequence< beans::PropertyValue >& rxOptions )
- throw (IllegalArgumentException, RuntimeException)
+ throw (IllegalArgumentException, RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
if(!IsValid())
commit be1fd3b6ac097e6360561f91947e2a0f15900d85
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:22:40 2014 +0000
coverity#738381 Uncaught exception
Change-Id: Ie94bd97976f98cad5f21c96ef7344d4e66983fcc
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 79e8dd1..2d39a05 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -115,7 +115,8 @@ public:
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setRubyList(
const ::com::sun::star::uno::Sequence<
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index ed021bd..9ff7027 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -537,7 +537,8 @@ uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings(void) throw(
return *pxViewSettings;
}
-Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAutomatic*/ ) throw(RuntimeException)
+Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAutomatic*/ )
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 4cafc422990a61686470308270a3f88606d55a7b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:21:44 2014 +0000
coverity#738382 Uncaught exception
Change-Id: I927b3a9b4961f733a41b917929b304196d273fc7
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 6178219..79e8dd1 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -121,7 +121,8 @@ public:
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 99c4175..ed021bd 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -585,7 +585,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
void SAL_CALL SwXTextView::setRubyList(
const Sequence< Sequence< PropertyValue > >& rRubyList, sal_Bool /*bAutomatic*/ )
- throw(RuntimeException)
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit fef8fb7a8cca7e12ac6c51a41f9bf6246de34e90
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:20:49 2014 +0000
coverity#738383 Uncaught exception
Change-Id: I70c710fe93aa864c2b1ca15d7ae1c04a158c149d
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 6d44c3d..6178219 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -87,7 +87,9 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
//XSelectionSupplier
- virtual ::com::sun::star::uno::Any SAL_CALL getSelection(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL getSelection()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface)
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException,
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 76fe50d..99c4175 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -326,7 +326,8 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface)
return bRet;
}
-uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException )
+uno::Any SwXTextView::getSelection()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference< uno::XInterface > aRef;
commit 7a9bdd799278743478f8cc7838b32c3b9870121d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:19:53 2014 +0000
coverity#738385 Uncaught exception
Change-Id: I74c6b17ce72f1c8d4bb8c47e6745f1471b4b4580
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 7117a6b..6d44c3d 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -140,7 +140,9 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//XTransferableSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException);
void NotifySelChanged();
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index cbc224e..76fe50d 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1776,7 +1776,8 @@ SwPaM* SwXTextViewCursor::GetPaM()
return rSh.GetCrsr();
}
-uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransferable( ) throw (uno::RuntimeException)
+uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransferable()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 34f79b088832a893e2c6e291e16270a62e457c62
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:18:49 2014 +0000
coverity#738387 Uncaught exception
Change-Id: I5950be0f874587ed3f4776b329401e43e6407bda
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 29b545d..7117a6b 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -124,7 +124,11 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 6a26281..cbc224e 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -767,7 +767,10 @@ void SAL_CALL SwXTextView::setPropertyValue(
uno::Any SAL_CALL SwXTextView::getPropertyValue(
const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
commit 1fd10ae66c1024e2105c268a04cdce7c6e8c2868
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:17:07 2014 +0000
coverity#738392 Uncaught exception
Change-Id: I342ab51f99fd589e79bf650befc5506ab04c3fc0
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index e0695fa..29b545d 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -88,7 +88,10 @@ public:
//XSelectionSupplier
virtual ::com::sun::star::uno::Any SAL_CALL getSelection(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& aInterface) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface)
+ throw (::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index bb2044a..6a26281 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -226,7 +226,9 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType )
return aRet;
}
-sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArgumentException, uno::RuntimeException )
+sal_Bool SwXTextView::select(const uno::Any& aInterface)
+ throw (lang::IllegalArgumentException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
commit 67d8131250d88cc67d03bddb0d594e3b0b1f9609
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:15:32 2014 +0000
coverity#738397 Uncaught exception
Change-Id: I727cc99662cd5bb93a795e51744086c0e005152e
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 5afc45c..e0695fa 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -212,7 +212,9 @@ public:
virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
//XScreenCursor
- virtual sal_Bool SAL_CALL screenDown(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL screenDown()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL screenUp(void) throw( ::com::sun::star::uno::RuntimeException );
//XViewCursor
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 2130b71..bb2044a 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1322,7 +1322,8 @@ sal_Int16 SwXTextViewCursor::getPage(void) throw( uno::RuntimeException )
return nRet;
}
-sal_Bool SwXTextViewCursor::screenDown(void) throw( uno::RuntimeException )
+sal_Bool SwXTextViewCursor::screenDown()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit ec95de6198dc329efe8ad644f075337d22479150
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:14:35 2014 +0000
coverity#738398 Uncaught exception
Change-Id: I51d0c9feaf34482382451d77ce39eec84d10f01f
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 7a871e4..5afc45c 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -183,7 +183,9 @@ public:
virtual void SAL_CALL collapseToEnd()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual sal_Bool SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isCollapsed()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 786d151..2130b71 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -986,7 +986,8 @@ void SwXTextViewCursor::collapseToEnd()
throw uno::RuntimeException();
}
-sal_Bool SwXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException )
+sal_Bool SwXTextViewCursor::isCollapsed()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit 70e3691090501df9ee281c875c89cf65df2de24b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:13:34 2014 +0000
coverity#738400 Uncaught exception
Change-Id: I8567bda45c4f1c9d90dbbf69368a74e27b79d9b0
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 626cd1a..7a871e4 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -178,9 +178,11 @@ public:
//XTextCursor - neu
virtual void SAL_CALL collapseToStart()
- throw(::com::sun::star::uno::RuntimeException,
- std::exception);
- virtual void SAL_CALL collapseToEnd( ) throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
+ virtual void SAL_CALL collapseToEnd()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 3ceecfa..786d151 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -962,7 +962,8 @@ void SwXTextViewCursor::collapseToStart()
throw uno::RuntimeException();
}
-void SwXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException )
+void SwXTextViewCursor::collapseToEnd()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit 0e0f99aed411ded56100eb737b083015c2f208f5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:11:55 2014 +0000
coverity#738402 Uncaught exception
Change-Id: Ic70b2b39d45a1e69be525071f9da214ccc4c5422
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index af52b7c..626cd1a 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -224,7 +224,9 @@ public:
virtual sal_Bool SAL_CALL isAtEndOfLine()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand)
throw (::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 4d22514..3ceecfa 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1665,7 +1665,8 @@ sal_Bool SwXTextViewCursor::isAtEndOfLine()
return bRet;
}
-void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand) throw( uno::RuntimeException )
+void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit 7717150491e73ec61eeb3aa1bc4d86d7e3a7dce1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:11:14 2014 +0000
coverity#738403 Uncaught exception
Change-Id: Ie8b6586b29976abddd204ad5150edda13bf27230
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index eb3e7bb..af52b7c 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -221,7 +221,9 @@ public:
virtual sal_Bool SAL_CALL isAtStartOfLine()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual sal_Bool SAL_CALL isAtEndOfLine(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL isAtEndOfLine()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand)
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 3949407..4d22514 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1648,7 +1648,8 @@ sal_Bool SwXTextViewCursor::isAtStartOfLine()
return bRet;
}
-sal_Bool SwXTextViewCursor::isAtEndOfLine(void) throw( uno::RuntimeException )
+sal_Bool SwXTextViewCursor::isAtEndOfLine()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit 0321ebad5645866a244cea0fa16cb00b9c49eace
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:10:16 2014 +0000
coverity#738405 Uncaught exception
Change-Id: Id6a851ec0799e2064b4b20c4a5dcefa4d5b81ee1
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 630368f..eb3e7bb 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -190,7 +190,9 @@ public:
//XPageCursor
virtual sal_Bool SAL_CALL jumpToFirstPage(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL jumpToLastPage(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL jumpToLastPage()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL jumpToNextPage(void) throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL jumpToPreviousPage(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 163ead7..3949407 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1228,7 +1228,8 @@ sal_Bool SwXTextViewCursor::jumpToFirstPage(void) throw( uno::RuntimeException )
return bRet;
}
-sal_Bool SwXTextViewCursor::jumpToLastPage(void) throw( uno::RuntimeException )
+sal_Bool SwXTextViewCursor::jumpToLastPage()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit 0fe927672450502cf0047a5ef4ff96edf4ca0c0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:09:16 2014 +0000
coverity#738409 Uncaught exception
Change-Id: Ide9369142230f1f2732aff1e6242299580eb9e65
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index e0a69d9..630368f 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -177,7 +177,9 @@ public:
virtual ::com::sun::star::awt::Point SAL_CALL getPosition(void) throw( ::com::sun::star::uno::RuntimeException );
//XTextCursor - neu
- virtual void SAL_CALL collapseToStart( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL collapseToStart()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL collapseToEnd( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 17f62fa..163ead7 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -938,7 +938,8 @@ awt::Point SwXTextViewCursor::getPosition(void) throw( uno::RuntimeException )
return aRet;
}
-void SwXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException )
+void SwXTextViewCursor::collapseToStart()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit 5cd19ed6edad7ca4871f75c32283393a7cfcd810
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:08:20 2014 +0000
coverity#738411 Uncaught exception
Change-Id: I9ef08a451101a65816d3ee00d4bf6e27c536eb0e
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 92e63d4..e0a69d9 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -219,7 +219,9 @@ public:
std::exception);
virtual sal_Bool SAL_CALL isAtEndOfLine(void) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 5f1a31f..17f62fa 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1676,7 +1676,8 @@ void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand) throw( uno::RuntimeExcep
throw uno::RuntimeException();
}
-void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand) throw( uno::RuntimeException )
+void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit 99ab7e44e4c5511445b3164008860765908f9946
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:07:15 2014 +0000
coverity#738412 Uncaught exception
Change-Id: Iece48b2b8682b38854ca50f158587f9de050e71f
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 5d1fbf8..92e63d4 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -214,7 +214,9 @@ public:
// virtual sal_Bool goRight(sal_Int16 nCount, sal_Bool bExpand) throw( ::com::sun::star::uno::RuntimeException );
//XLineCursor
- virtual sal_Bool SAL_CALL isAtStartOfLine(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL isAtStartOfLine()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL isAtEndOfLine(void) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 68c12b3..5f1a31f 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1629,7 +1629,8 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) throw( uno:
return bRet;
}
-sal_Bool SwXTextViewCursor::isAtStartOfLine(void) throw( uno::RuntimeException )
+sal_Bool SwXTextViewCursor::isAtStartOfLine()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit e0abe02ed51bb626725643debd6d7134bd40c220
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:02:49 2014 +0000
coverity#1079301 Uninitialized pointer field
Change-Id: I8b8ea2d56d5aac9e5577e60b44b4d2eddf265dce
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 9833f05..38a334e 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -96,7 +96,6 @@ class SOT_DLLPUBLIC SotStorage : virtual public SotObject
friend class SotStorageStream;
friend class SvStorage;
- BaseStorage * m_pTmpStg; // Temp-Storage fuer Transacted, nur auf diesem schreiben! ??? Useless ???
BaseStorage * m_pOwnStg; // Zielstorage
SvStream * m_pStorStm; // nur fuer SDSTORAGES
sal_uLong m_nError;
commit ced290dd025b5fc1f448694564043a34ca461b42
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 10:01:49 2014 +0000
coverity#1079302 Uninitialized pointer field
Change-Id: Icf395a9784ca0992e92f793bc556293a7d4870ce
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index f920e0d..cf9ea87 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -44,8 +44,10 @@ private:
public:
- TabWin_Impl( Window* pParent, WinBits nBits) :
- Window( pParent, nBits )
+ TabWin_Impl(Window* pParent, WinBits nBits)
+ : Window(pParent, nBits)
+ , mpPage(0)
+ , nTabStyle(0)
{
}
commit c92c8b28bd199286b5e9b0d8c6ad6b85e33b2ae3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:59:37 2014 +0000
coverity#1093230 Dereference before null check
Change-Id: I6ec85d718726f874864be93268a88604fb84a2b2
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index ac63fe787..ea547cc 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -1462,7 +1462,7 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd )
// BMP_FORMAT_24BIT_TC_RGB
// only use DirectScanline when we have no preview shifting stuff and access to content
const bool bDoDirectScanline(
- bCkeckDirectScanline && !nXStart && 1 == nXAdd && !mnPreviewShift && mpAcc);
+ bCkeckDirectScanline && !nXStart && 1 == nXAdd && !mnPreviewShift);
const bool bCustomColorTable(mpColorTable != mpDefaultColorTable);
if(bDoDirectScanline && !mpScanline)
commit e414cdbf3321d579537b372d815d50c31195ecc3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:53:37 2014 +0000
coverity#1103660 Division or modulo by zero
Change-Id: I468b218635e10e04bb25150b6275e187ba8a8316
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 627a443..7b5e042 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1012,17 +1012,18 @@ Size SmViewShell::GetTextLineSize(OutputDevice& rDevice, const OUString& rLine)
Size aSize(rDevice.GetTextWidth(rLine), rDevice.GetTextHeight());
sal_uInt16 nTabs = comphelper::string::getTokenCount(rLine, '\t');
-
+ long nTabPos = 0;
if (nTabs > 0)
- {
- long TabPos = rDevice.GetTextWidth(OUString('n')) * 8;
+ nTabPos = rDevice.approximate_char_width() * 8;
+ if (nTabPos)
+ {
aSize.Width() = 0;
for (sal_uInt16 i = 0; i < nTabs; i++)
{
if (i > 0)
- aSize.Width() = ((aSize.Width() / TabPos) + 1) * TabPos;
+ aSize.Width() = ((aSize.Width() / nTabPos) + 1) * nTabPos;
OUString aText = rLine.getToken(i, '\t');
aText = comphelper::string::stripStart(aText, '\t');
@@ -1101,16 +1102,18 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co
SAL_INFO( "starmath", "SmViewShell::DrawTextLine" );
Point aPoint (rPosition);
- sal_uInt16 nTabs = comphelper::string::getTokenCount(rLine, '\t');
+ sal_uInt16 nTabs = comphelper::string::getTokenCount(rLine, '\t');
+ long nTabPos = 0;
if (nTabs > 0)
- {
- long TabPos = rDevice.GetTextWidth(OUString('n')) * 8;
+ nTabPos = rDevice.approximate_char_width() * 8;
- for (sal_uInt16 i = 0; i < nTabs; i++)
+ if (nTabPos)
+ {
+ for (sal_uInt16 i = 0; i < nTabs; ++i)
{
if (i > 0)
- aPoint.X() = ((aPoint.X() / TabPos) + 1) * TabPos;
+ aPoint.X() = ((aPoint.X() / nTabPos) + 1) * nTabPos;
OUString aText = rLine.getToken(i, '\t');
aText = comphelper::string::stripStart(aText, '\t');
commit 19cda6c79c6e2f2c77a6ec25fcd28e4c1bea5268
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:50:32 2014 +0000
coverity#1103661 Division or modulo by zero
Change-Id: I1506e4e0b1dccac1e9f3dc3094268eaa89d3f6be
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 7ed4c86..677cba8 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -77,10 +77,12 @@ void SvxXConnectionPreview::AdaptSize()
// Adapt size
if( pObjList )
{
- SetMapMode( MAP_100TH_MM );
+ Rectangle aRect = pObjList->GetAllObjBoundRect();
+ if (aRect.GetHeight() == 0 || aRect.GetHeight() == 0)
+ return;
+ SetMapMode( MAP_100TH_MM );
OutputDevice* pOD = pView->GetFirstOutputDevice(); // GetWin( 0 );
- Rectangle aRect = pObjList->GetAllObjBoundRect();
MapMode aMapMode = GetMapMode();
aMapMode.SetMapUnit( pOD->GetMapMode().GetMapUnit() );
commit 542988856011fad099cfbe6ba93305fb6a4e0214
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:45:59 2014 +0000
coverity#1103671 Unchecked dynamic_cast
Change-Id: I7a0e483550b0f7bbe91f20acde5a09ca43eb02c2
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index eeb70ae..bd983e3 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -452,13 +452,16 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
}
else if (mxChartShapeContext.is())
{
- basegfx::B2DHomMatrix aMatrix;
ChartGraphicDataContext* pChartGraphicDataContext = dynamic_cast<ChartGraphicDataContext*>(mxChartShapeContext.get());
- oox::drawingml::ShapePtr pShapePtr( pChartGraphicDataContext->getShape());
- // See SwXTextDocument::createInstance(), ODF import uses the same hack.
- pShapePtr->setServiceName("com.sun.star.drawing.temporaryForXMLImportOLE2Shape");
- pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, pShapePtr->getFillProperties() );
- xResult = pShapePtr->getXShape();
+ if (pChartGraphicDataContext)
+ {
+ basegfx::B2DHomMatrix aMatrix;
+ oox::drawingml::ShapePtr xShapePtr( pChartGraphicDataContext->getShape());
+ // See SwXTextDocument::createInstance(), ODF import uses the same hack.
+ xShapePtr->setServiceName("com.sun.star.drawing.temporaryForXMLImportOLE2Shape");
+ xShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, xShapePtr->getFillProperties() );
+ xResult = xShapePtr->getXShape();
+ }
mxChartShapeContext.clear();
}
else if (mxWpsContext.is())
commit 6f3fd680ea3769384a98fa620532a64d12fede4a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:43:30 2014 +0000
that delete of pWrapPolygon looks dodgy to me
seeing as it is only conditionally replaced later
Change-Id: I6801de8472b88f37a34aea260336750cb3c47015
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index e3915d4..d270b0e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5287,6 +5287,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
if (SeekToContent(DFF_Prop_pWrapPolygonVertices, rSt))
{
delete pTextImpRec->pWrapPolygon;
+ pTextImpRec->pWrapPolygon = NULL;
sal_uInt16 nNumElemVert, nNumElemMemVert, nElemSizeVert;
rSt >> nNumElemVert >> nNumElemMemVert >> nElemSizeVert;
if (nNumElemVert && ((nElemSizeVert == 8) || (nElemSizeVert == 4)))
@@ -7290,16 +7291,11 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
SvxMSDffImportRec::~SvxMSDffImportRec()
{
- if (pClientAnchorBuffer)
- delete[] pClientAnchorBuffer;
- if (pClientDataBuffer)
- delete[] pClientDataBuffer;
- if (pWrapPolygon)
- delete pWrapPolygon;
- if (pXRelTo)
- delete pXRelTo;
- if (pYRelTo)
- delete pYRelTo;
+ delete[] pClientAnchorBuffer;
+ delete[] pClientDataBuffer;
+ delete pWrapPolygon;
+ delete pXRelTo;
+ delete pYRelTo;
}
void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
commit 3337331359cdc530549932de3e84bf1d2334579d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:42:15 2014 +0000
coverity#1169881 Use after free
this method is *way* too long and convoluted
Change-Id: Ib34d400043358a5426bbf5652e0bb12f8c49312a
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f3a98ef..e3915d4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5364,8 +5364,9 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
}
else
{
+ if (pTextImpRec != pImpRec)
+ delete pTextImpRec;
delete pImpRec;
- delete pTextImpRec;
}
}
commit 2aa0a5230361faef1e053c0badebdd99353dfd71
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:22:58 2014 +0000
SetCaptionFmt never called, so pCaptionFmt always NULL
Follow logical consequences of the always-NULL.
And, depressingly, big slabs of the IA2 caption code
in writer doesn't actually do anything.
Change-Id: I35f7ffac19db683010b656b3c88f81b65233b080
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 636f0cb..22ddea9 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -44,13 +44,11 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt
::com::sun::star::uno::XInterface> m_wXObject;
protected:
- SwFrmFmt* pCaptionFmt;
SwFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT,
const sal_uInt16* pWhichRange = 0 )
: SwFmt( rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange),
pDrvdFrm, nFmtWhich )
- ,pCaptionFmt( NULL )
{}
SwFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
@@ -58,7 +56,6 @@ protected:
const sal_uInt16* pWhichRange = 0 )
: SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange),
pDrvdFrm, nFmtWhich )
- ,pCaptionFmt( NULL )
{}
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue );
@@ -125,10 +122,6 @@ public:
virtual OUString GetDescription() const;
- sal_Bool HasCaption() const;
- void SetCaptionFmt(SwFrmFmt* pFmt);
- SwFrmFmt* GetCaptionFmt() const;
-
SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::uno::XInterface> const& GetXObject() const
{ return m_wXObject; }
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index a692a1e..99a43f2 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -3323,64 +3323,10 @@ sal_Bool SwAccessibleMap::ReplaceChild (
}
::com::sun::star::uno::Reference< XAccessible >
- SwAccessibleMap::GetAccessibleCaption (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape)
+ SwAccessibleMap::GetAccessibleCaption (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&)
throw (::com::sun::star::uno::RuntimeException)
{
- SdrObject* captionedObject = GetSdrObjectFromXShape(xShape);
-
- SwDrawContact *pContact = (SwDrawContact*)GetUserCall( captionedObject );
- OSL_ENSURE( RES_DRAWFRMFMT == pContact->GetFmt()->Which(),
- "fail" );
- if( !pContact )
- return 0;
-
- SwDrawFrmFmt *pCaptionedFmt = (SwDrawFrmFmt *)pContact->GetFmt();
- if( !pCaptionedFmt )
- return 0;
-
- SwFlyFrm* pFrm = NULL;
- if (pCaptionedFmt->HasCaption())
- {
- const SwFrmFmt *pCaptionFrmFmt = pCaptionedFmt->GetCaptionFmt();
- SwClientIter aIter (*(SwModify*)pCaptionFrmFmt);
- pFrm = (SwFlyFrm*)aIter.First( TYPE ( SwFlyFrm ));
- }
- if (!pFrm)
- return 0;
- //SwFrmFmt* pFrm = pCaptionedFmt->GetCaptionFmt();
- uno::Reference < XAccessible > xAcc( GetContext((SwFrm*)pFrm,sal_True) );
- //Reference < XAccessibleShape > xAccShape( xAcc, UNO_QUERY );
-
- uno::Reference< XAccessibleContext > xAccContext = xAcc->getAccessibleContext();
- if( xAccContext.is() )
- { //get the parent of caption frame, which is paragaph
- uno::Reference< XAccessible > xAccParent = xAccContext->getAccessibleParent();
- if(xAccParent.is())
- {
- //get the great parent of caption frame which is text frame.
- uno::Reference< XAccessibleContext > xAccParentContext = xAccParent->getAccessibleContext();
- uno::Reference< XAccessible > xAccGreatParent = xAccParentContext->getAccessibleParent();
- if(xAccGreatParent.is())
- {
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= xAccParent;
- ( static_cast< SwAccessibleContext * >(xAccGreatParent.get()) )->FireAccessibleEvent( aEvent );
-
- }
-
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= xAcc;
- ( static_cast< SwAccessibleContext * >(xAccParent.get()) )->FireAccessibleEvent( aEvent );
- }
- }
-
- if(xAcc.get())
- return xAcc;
- else
- return NULL;
-
+ return NULL;
}
Point SwAccessibleMap::PixelToCore( const Point& rPoint ) const
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 378c521..45f340a 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -346,11 +346,8 @@ sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getHyperLinkIndex( sal_Int32 )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- CHECK_FOR_DEFUNC( XAccessibleHypertext );
-
- sal_Int32 nRet = 0;
- return nRet;
+ return 0;
}
AccessibleRelation SwAccessibleNoTextFrame::makeRelation( sal_Int16 nType, const SwFlyFrm* pFrm )
@@ -367,28 +364,8 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleNoTextFrame::getAcce
throw ( uno::RuntimeException )
{
SolarMutexGuard aGuard;
- CHECK_FOR_DEFUNC( XAccessibleContext );
-
- // get the caption frame, and insert label relations into helper
-
- AccessibleRelationSetHelper* pHelper = new AccessibleRelationSetHelper();
-
- SwFlyFrm* pFlyFrm = getFlyFrm();
- DBG_ASSERT( pFlyFrm != NULL, "fly frame expected" );
-
- SwFlyFrm* pCaptionFrm = NULL;
- const SwFrmFmt* pFrm = pFlyFrm ->GetFmt()->GetCaptionFmt();
- if (pFrm)
- {
- SwClientIter aIter (*(SwModify*)pFrm);
- pCaptionFrm = (SwFlyFrm*)aIter.First( TYPE ( SwFlyFrm ));
- }
- if(pCaptionFrm!=NULL)
- {
- pHelper->AddRelation( makeRelation( AccessibleRelationType::DESCRIBED_BY, pCaptionFrm ) );
- }
- return pHelper;
+ return new AccessibleRelationSetHelper();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index e8cbaad..71cfacdf 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3224,21 +3224,4 @@ IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint,
return 0;
}
-sal_Bool SwFrmFmt::HasCaption() const
-{
- if(pCaptionFmt != NULL && pCaptionFmt->GetDepends())
- return sal_True;
- return sal_False;
-}
-
-void SwFrmFmt::SetCaptionFmt(SwFrmFmt * pFmt)
-{
- pCaptionFmt = pFmt;
-}
-
-SwFrmFmt* SwFrmFmt::GetCaptionFmt() const
-{
- return pCaptionFmt;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 5b015d1..186d439 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -155,7 +155,6 @@ SwAccessibleTable::SetTableData(SwAccessibleTableData_Impl*)
SwCntntFrm::DelFrms(SwCntntNode const&)
SwExtraRedlineTbl::Contains(SwExtraRedline const*) const
SwExtraRedlineTbl::Remove(SwExtraRedline const*)
-SwFrmFmt::SetCaptionFmt(SwFrmFmt*)
SwPostItField::GetByName(SwDoc*, rtl::OUString const&)
SwTableRowRedline::SwTableRowRedline(SwRedlineData const&, SwTableLine&)
SwViewImp::FireColumnChangeEvent(unsigned short, unsigned short)
commit 0d3082dbf2e87bed462246307a13e206f7617081
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 12 09:11:02 2014 +0000
callcatcher: update unused code
Change-Id: Iaaad9302ef8edb47fa95ce8ca608b6f36449521b
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index d410b29..81965a4 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -83,15 +83,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOTableTreeListBox(Window *p
return new OTableTreeListBox(pParent, nWinStyle);
}
-OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId& rResId, sal_Bool _bVirtualRoot)
- :OMarkableTreeListBox(pParent, rResId)
- ,m_xImageProvider( new ImageProvider )
- ,m_bVirtualRoot(_bVirtualRoot)
- ,m_bNoEmptyFolders( false )
-{
- implSetDefaultImages();
-}
-
void OTableTreeListBox::implSetDefaultImages()
{
ImageProvider aImageProvider;
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 2972867..6bd14cf 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -50,11 +50,6 @@ public:
void init(bool bVirtualRoot) { m_bVirtualRoot = bVirtualRoot; }
- OTableTreeListBox(
- Window* pParent,
- const ResId& rResId,
- sal_Bool _bVirtualRoot );
-
typedef ::std::pair< OUString,sal_Bool> TTableViewName;
typedef ::std::vector< TTableViewName > TNames;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index a34c06d..24653e2 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -146,12 +146,6 @@ public:
sal_uInt16 nPageCreateId ); // Identifier of the Factory Method to create the page
void AddTabPage( sal_uInt16 nId,
- CreateTabPage pCreateFunc, // != 0
- GetTabPageRanges pRangesFunc, // can be 0
- sal_Bool bItemsOnDemand = sal_False);
-
-
- void AddTabPage( sal_uInt16 nId,
const OUString &rRiderText,
CreateTabPage pCreateFunc, // != 0
GetTabPageRanges pRangesFunc, // can be 0
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index fc2df86..3be1cab 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -80,9 +80,8 @@ class SFX2_DLLPUBLIC TemplateAbstractView : public ThumbnailView
{
public:
- TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren);
- TemplateAbstractView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
- TemplateAbstractView ( Window* pParent );
+ TemplateAbstractView(Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren);
+ TemplateAbstractView(Window* pParent);
virtual ~TemplateAbstractView ();
diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx
index c4ed250..1bc2026 100644
--- a/include/svtools/toolpanel/toolpaneldeck.hxx
+++ b/include/svtools/toolpanel/toolpaneldeck.hxx
@@ -151,12 +151,6 @@ namespace svt
::Window& GetPanelWindowAnchor();
const ::Window& GetPanelWindowAnchor() const;
- /** sets the window which should act as parent in the A11Y object hierarchy.
-
- Calling this method has no effect if CreateAccessible had always been called.
- */
- ::Window* GetAccessibleParentWindow() const;
-
// IToolPanelDeck
virtual size_t GetPanelCount() const;
virtual PToolPanel GetPanel( const size_t i_nPos ) const;
@@ -179,9 +173,6 @@ namespace svt
private:
::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl;
-
- private:
- using Window::GetAccessibleParentWindow;
};
//........................................................................
diff --git a/include/svtools/vclxaccessibleheaderbaritem.hxx b/include/svtools/vclxaccessibleheaderbaritem.hxx
index e5c6950..10a5c82 100644
--- a/include/svtools/vclxaccessibleheaderbaritem.hxx
+++ b/include/svtools/vclxaccessibleheaderbaritem.hxx
@@ -57,7 +57,6 @@ private:
sal_Int32 m_nIndexInParent;
protected:
- DECL_LINK( WindowEventListener, VclSimpleEvent* );
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 4fd3081..dd13fc7 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -39,7 +39,6 @@ namespace svx {
class SVX_DLLPUBLIC FrameDirectionListBox : public ListBox
{
public:
- explicit FrameDirectionListBox( Window* pParent, const ResId& rResId );
explicit FrameDirectionListBox( Window* pParent, WinBits nBits );
virtual ~FrameDirectionListBox();
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 11dfb72..aea233c 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -246,7 +246,6 @@ public:
int getFonts() const
{ return m_pFontList ? m_pFontList->countValues() : 0; }
- OUString getFont( int ) const;
OUString translateKey( const OUString& i_rKey,
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index ddaac09..33e007da 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -137,18 +137,6 @@ TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits nWinStyle,
maFTName.Hide();
}
-TemplateAbstractView::TemplateAbstractView(Window *pParent, const ResId &rResId, bool bDisableTransientChildren)
- : ThumbnailView(pParent,rResId,bDisableTransientChildren),
- mnCurRegionId(0),
- maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)),
- maFTName(this, SfxResId(FT_NAME))
-{
- maAllButton.Hide();
- maAllButton.SetStyle(maAllButton.GetStyle() | WB_FLATBUTTON);
- maAllButton.SetClickHdl(LINK(this,TemplateAbstractView,ShowRootRegionHdl));
- maFTName.Hide();
-}
-
TemplateAbstractView::TemplateAbstractView(Window *pParent)
: ThumbnailView(pParent),
mnCurRegionId(0),
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d7e9052..fb8856a 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -717,31 +717,6 @@ void SfxTabDialog::AddTabPage( sal_uInt16 nId, const OUString &rRiderText, sal_B
AddTabPage( nId, rRiderText, 0, 0, bItemsOnDemand, nPos );
}
-
-// -----------------------------------------------------------------------
-
-void SfxTabDialog::AddTabPage
-
-/* [Description]
-
- Adding a page to the dialogue. Must correspond to a entry in the
- TabControl in the resource of the dialogue.
-*/
-
-(
- sal_uInt16 nId, // Page ID
- CreateTabPage pCreateFunc, // Pointer to the Factory Method
- GetTabPageRanges pRangesFunc, // Pointer to the Method for quering
- // Ranges onDemand
- sal_Bool bItemsOnDemand // indicates whether the set of this page is
- // requested when created
-)
-{
- pImpl->aData.push_back(
- new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
-}
-
-
/*
Adds a page to the dialog. The Name must correspond to a entry in the
TabControl in the dialog .ui
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index d5cbb02..21b1728 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -65,25 +65,6 @@ VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem()
// -----------------------------------------------------------------------------
-IMPL_LINK( VCLXAccessibleHeaderBarItem, WindowEventListener, VclSimpleEvent*, pEvent )
-{
- DBG_CHKTHIS( VCLXAccessibleHeaderBarItem, 0 );
- DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "VCLXAccessibleHeaderBarItem::WindowEventListener: unknown window event!" );
-
- if ( pEvent && pEvent->ISA( VclWindowEvent ) )
- {
- DBG_ASSERT( ((VclWindowEvent*)pEvent)->GetWindow(), "VCLXAccessibleHeaderBarItem::WindowEventListener: no window!" );
- if ( !((VclWindowEvent*)pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() || ( pEvent->GetId() == VCLEVENT_OBJECT_DYING ) )
- {
- ProcessWindowEvent( *(VclWindowEvent*)pEvent );
- }
- }
-
- return 0;
-}
-
-// -----------------------------------------------------------------------------
-
void VCLXAccessibleHeaderBarItem::ProcessWindowEvent( const VclWindowEvent& )
{
}
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 2653de0..8564c1f 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -73,7 +73,6 @@ namespace svt
,m_pDummyPanel( new DummyPanel )
,m_pLayouter()
,m_bInDtor( false )
- ,m_pAccessibleParent( NULL )
{
m_aPanels.AddListener( *this );
m_aPanelAnchor.Show();
@@ -118,9 +117,6 @@ namespace svt
bool FocusActivePanel();
- void SetAccessibleParentWindow( Window* i_pAccessibleParent );
- Window* GetAccessibleParentWindow() const { return m_pAccessibleParent; }
-
protected:
// IToolPanelDeckListener
virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition );
@@ -141,7 +137,6 @@ namespace svt
PanelDeckListeners m_aListeners;
PDeckLayouter m_pLayouter;
bool m_bInDtor;
- Window* m_pAccessibleParent;
};
//--------------------------------------------------------------------
@@ -343,12 +338,6 @@ namespace svt
// are dying, and we already sent this notification in our dtor.
}
- //--------------------------------------------------------------------
- void ToolPanelDeck_Impl::SetAccessibleParentWindow( Window* i_pAccessibleParent )
- {
- m_pAccessibleParent = i_pAccessibleParent;
- }
-
//====================================================================
//= ToolPanelDeck
//====================================================================
@@ -516,15 +505,6 @@ namespace svt
}
//--------------------------------------------------------------------
- Window* ToolPanelDeck::GetAccessibleParentWindow() const
- {
- Window* pAccessibleParent( m_pImpl->GetAccessibleParentWindow() );
- if ( !pAccessibleParent )
- pAccessibleParent = Window::GetAccessibleParentWindow();
- return pAccessibleParent;
- }
-
- //--------------------------------------------------------------------
Reference< XWindowPeer > ToolPanelDeck::GetComponentInterface( sal_Bool i_bCreate )
{
Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( sal_False ) );
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 00d0263..f2ec440 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -76,20 +76,6 @@ using namespace ::com::sun::star::accessibility;
namespace accessibility
{
- Window* GetCurrentEditorWnd()
- {
- Window* pWin = NULL;
- SfxViewFrame* pFrame = SfxViewFrame::Current();
- if (pFrame)
- {
- const SfxViewShell * pViewShell = pFrame->GetViewShell();
- if(pViewShell)
- {
- pWin = pViewShell->GetWindow();
- }
- }
- return pWin;
- }
//------------------------------------------------------------------------
//
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 0d977d9..d10a6bf 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -38,13 +38,6 @@ inline SvxFrameDirection lclVoidToEnum( void* pDirection )
} // namespace
-// ============================================================================
-
-FrameDirectionListBox::FrameDirectionListBox( Window* pParent, const ResId& rResId ) :
- ListBox( pParent, rResId )
-{
-}
-
FrameDirectionListBox::FrameDirectionListBox( Window* pParent, WinBits nBits ) :
ListBox( pParent, nBits )
{
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index c9fbebd..f2e3eba 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -375,8 +375,6 @@ public:
Compare TmpLst with current fields. */
sal_uInt16 BuildSortLst();
- void RemoveUnselectedFlds();
-
private:
SwEditShell* pSh;
_SetGetExpFlds* pSrtLst;
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index fae983f..11857f7 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -169,34 +169,4 @@ sal_uInt16 SwInputFieldList::BuildSortLst()
return pSrtLst->size();
}
-/// remove all fields outside of any selections from list
-void SwInputFieldList::RemoveUnselectedFlds()
-{
- _SetGetExpFlds* pNewLst = new _SetGetExpFlds();
-
- FOREACHPAM_START(pSh->GetCrsr())
- {
- for (sal_uInt16 i = 0; i < Count();)
- {
- _SetGetExpFld* pFld = (*pSrtLst)[i];
- SwPosition aPos(*PCURCRSR->GetPoint());
-
- pFld->GetPos( aPos );
-
- if (aPos >= *PCURCRSR->Start() && aPos < *PCURCRSR->End())
- {
- // field in selection
- pNewLst->insert( (*pSrtLst)[i] );
- pSrtLst->erase(i);
- }
- else
- i++;
- }
- }
- FOREACHPAM_END()
-
- delete pSrtLst;
- pSrtLst = pNewLst;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 72b0e89..5b015d1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,4 @@
+(anonymous namespace)::hasNonEmpty(std::vector<double, std::allocator<double> > const&, int, int)
AddressWalker::pop()
BackingWindow::LinkStubOpenTemplateHdl(void*, void*)
BigInt::BigInt(unsigned int)
@@ -152,9 +153,11 @@ SwAccessiblePortionData::GetAttrFldType(int)
SwAccessibleTable::ClearSelectionCellCache()
SwAccessibleTable::SetTableData(SwAccessibleTableData_Impl*)
SwCntntFrm::DelFrms(SwCntntNode const&)
+SwExtraRedlineTbl::Contains(SwExtraRedline const*) const
+SwExtraRedlineTbl::Remove(SwExtraRedline const*)
SwFrmFmt::SetCaptionFmt(SwFrmFmt*)
-SwInputFieldList::RemoveUnselectedFlds()
SwPostItField::GetByName(SwDoc*, rtl::OUString const&)
+SwTableRowRedline::SwTableRowRedline(SwRedlineData const&, SwTableLine&)
SwViewImp::FireColumnChangeEvent(unsigned short, unsigned short)
SwViewImp::FirePageChangeEvent(unsigned short, unsigned short)
SwViewImp::FireSectionChangeEvent(unsigned short, unsigned short)
@@ -170,7 +173,6 @@ TypeManager::decompose(rtl::OUString const&, bool, rtl::OUString*, int*, std::ve
TypeManager::foundAtPrimaryProvider(rtl::OUString const&) const
TypeManager::loadProvider(rtl::OUString const&, bool)
UnoApiTest::closeDocument(com::sun::star::uno::Reference<com::sun::star::lang::XComponent>)
-VCLXAccessibleHeaderBarItem::LinkStubWindowEventListener(void*, void*)
ValueSet::ImplGetVisibleItem(unsigned short)
VclMultiLineEdit::IsRightToLeft() const
VclMultiLineEdit::SetTextSelectable(bool)
@@ -178,7 +180,6 @@ accessibility::AccessibleParaManager::Release(int)
accessibility::AccessibleShape::AccessibleShape(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&, accessibility::AccessibleShapeTreeInfo const&, int)
accessibility::Document::justifySelection(TextPaM&, TextPaM&)
accessibility::Document::notifySelectionChange(int, int)
-accessibility::GetCurrentEditorWnd()
apitest::CellProperties::testRotateReference()
apitest::CellProperties::testVertJustify()
apitest::DataPilotField::testAutoShowInfo()
@@ -330,9 +331,6 @@ oox::xls::FormulaParser::convertBoolToFormula(bool) const
oox::xls::WorkbookHelper::getDocShell()
oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
-psp::FontCache::markEmptyDir(int, bool)
-psp::PPDParser::getFont(int) const
-psp::PrintFontManager::getFontListWithFastInfo(std::list<psp::FastPrintFontInfo, std::allocator<psp::FastPrintFontInfo> >&)
registry::tools::Options::Options(char const*)
registry::tools::Options::badOption(char const*, char const*) const
registry::tools::Options::initOptions(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&)
@@ -372,13 +370,14 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::Formu
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
svl::SharedStringPool::SharedStringPool()
-svt::ToolPanelDeck_Impl::SetAccessibleParentWindow(Window*)
svx::frame::Style::Style(editeng::SvxBorderLine const&, double, unsigned short)
sw::access::SwAccessibleChild::GetAnchorPosition() const
utl::MediaDescriptor::PROP_DEEPDETECTION()
utl::toISO8601(com::sun::star::util::Time const&)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, int)
writerfilter::WW8TableManager::WW8TableManager()
+writerfilter::dmapper::TrackChangesHandler::TrackChangesHandler(int)
+writerfilter::dmapper::TrackChangesHandler::getRedlineProperties() const
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::BinaryObj> >)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, rtl::OUString const&)
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index cbb899e..4644b7a 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -741,14 +741,4 @@ void FontCache::createCacheDir( int nDirID )
m_aCache[nDirID].m_nTimestamp = (sal_Int64)aStat.st_mtime;
}
-/*
- * FontCache::markEmptyDir
- */
-void FontCache::markEmptyDir( int nDirID, bool bNoFiles )
-{
- createCacheDir( nDirID );
- m_aCache[nDirID].m_bNoFiles = bNoFiles;
- m_bDoFlush = true;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index cc3a32e..4f4d99b 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1527,24 +1527,6 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo
// -------------------------------------------------------------------------
-void PrintFontManager::getFontListWithFastInfo( ::std::list< FastPrintFontInfo >& rFonts )
-{
- rFonts.clear();
- ::std::list< fontID > aFontList;
- getFontList( aFontList );
-
- ::std::list< fontID >::iterator it;
- for( it = aFontList.begin(); it != aFontList.end(); ++it )
- {
- FastPrintFontInfo aInfo;
- aInfo.m_nID = *it;
- fillPrintFontInfo( getFont( *it ), aInfo );
- rFonts.push_back( aInfo );
- }
-}
-
-// -------------------------------------------------------------------------
-
bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const
{
PrintFont* pFont = getFont( nFontID );
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index abce743..777c896 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -72,7 +72,6 @@ public:
bool getFontCacheFile( int nDirID, const OString& rFile, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const;
void updateFontCacheEntry( const PrintFontManager::PrintFont*, bool bFlush );
- void markEmptyDir( int nDirID, bool bNoFiles = true );
// returns false for non cached directory
// a cached but empty directory will return true but not append anything
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index 94ce3b2..f0d95f1 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -339,8 +339,6 @@ public:
// returns the ids of all managed fonts.
void getFontList( std::list< fontID >& rFontIDs );
- // get the font list and fast font info.
- void getFontListWithFastInfo( std::list< FastPrintFontInfo >& rFonts );
// get font info for a specific font
bool getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 83e8d4c..dc0c3f9 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1495,16 +1495,6 @@ void PPDParser::getDefaultResolution( int& rXRes, int& rYRes ) const
rYRes = 300;
}
-OUString PPDParser::getFont( int nFont ) const
-{
- if( ! m_pFontList )
- return OUString();
-
- if( nFont >=0 && nFont < m_pFontList->countValues() )
- return m_pFontList->getValue( nFont )->m_aOption;
- return OUString();
-}
-
OUString PPDParser::translateKey( const OUString& i_rKey,
const com::sun::star::lang::Locale& i_rLocale ) const
{
More information about the Libreoffice-commits
mailing list