diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-31 09:24:53 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-31 13:04:16 +0000 |
| commit | fa277f5952d719f0dbc880301343e6653548bd03 (patch) | |
| tree | 29fc49d64d52763663da8d20139a626deaa0ae10 | |
| parent | coverity#1202803 Explicit null dereferenced (diff) | |
| download | core-fa277f5952d719f0dbc880301343e6653548bd03.tar.gz core-fa277f5952d719f0dbc880301343e6653548bd03.zip | |
callcatcher: a titchy bit more ww1 filter fallout
Change-Id: I38517bb7fbf4ab1e9314a28973b707223d7120e7
| -rw-r--r-- | include/vcl/metaact.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/basflt/fltshell.cxx | 14 | ||||
| -rw-r--r-- | sw/source/filter/inc/fltshell.hxx | 1 | ||||
| -rw-r--r-- | unusedcode.easy | 1 | ||||
| -rw-r--r-- | vcl/source/gdi/metaact.cxx | 6 |
5 files changed, 0 insertions, 25 deletions
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 1aea53f3a0a4..d75d5ec73d3b 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -89,10 +89,7 @@ public: void Delete() { if ( 0 == --mnRefCount ) delete this; } public: - OUString GetTypeName() { return TypeName( mnType ); } - static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ); - static OUString TypeName( sal_uInt16 nType ); }; class VCL_DLLPUBLIC MetaPixelAction : public MetaAction diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index f94b8020eb6a..5b941025f740 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -737,20 +737,6 @@ const SfxPoolItem* SwFltControlStack::GetOpenStackAttr(const SwPosition& rPos, s return 0; } -const SfxPoolItem* SwFltControlStack::GetFmtAttr(const SwPosition& rPos, sal_uInt16 nWhich) -{ - SfxPoolItem* pHt = GetFmtStackAttr(nWhich); - if (pHt) - return (const SfxPoolItem*)pHt; - - // the attribute does not exist on the stack; query the document - SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode(); - - if (!pNd) // no ContentNode, take the default attribute - return &pDoc->GetAttrPool().GetDefaultItem(nWhich); - return &pNd->GetAttr(nWhich); -} - void SwFltControlStack::Delete(const SwPaM &rPam) { const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End(); diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 5ea953c5b14c..3738c19f2576 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -186,7 +186,6 @@ public: void KillUnlockedAttrs(const SwPosition& pPos); SfxPoolItem* GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0); const SfxPoolItem* GetOpenStackAttr(const SwPosition& rPos, sal_uInt16 nWhich); - const SfxPoolItem* GetFmtAttr(const SwPosition& rPos, sal_uInt16 nWhich); void Delete(const SwPaM &rPam); bool empty() const { return maEntries.empty(); } diff --git a/unusedcode.easy b/unusedcode.easy index d1271ea1c046..ad3ba9c3f2a1 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -5,7 +5,6 @@ GDriveDocument::GDriveDocument(GDriveSession*) GDriveFolder::GDriveFolder(GDriveSession*) GDriveProperty::GDriveProperty() GDriveSession::GDriveSession() -MetaAction::TypeName(unsigned short) OpenGLContext::renderToFile() OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long) OutputDevice::GetCanvas() const diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 365bd46edbfe..50b856b22f09 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -273,12 +273,6 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData return pAction; } -OUString MetaAction::TypeName( sal_uInt16 nType ) -{ - const char *name = meta_action_name( nType ); - return OUString( name, strlen( name ), RTL_TEXTENCODING_ASCII_US ); -} - MetaPixelAction::MetaPixelAction() : MetaAction(META_PIXEL_ACTION) {} |