Kaydet (Commit) fa277f59 authored tarafından Caolán McNamara's avatar Caolán McNamara

callcatcher: a titchy bit more ww1 filter fallout

Change-Id: I38517bb7fbf4ab1e9314a28973b707223d7120e7
üst a19817c3
...@@ -89,10 +89,7 @@ public: ...@@ -89,10 +89,7 @@ public:
void Delete() { if ( 0 == --mnRefCount ) delete this; } void Delete() { if ( 0 == --mnRefCount ) delete this; }
public: public:
OUString GetTypeName() { return TypeName( mnType ); }
static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ); static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData );
static OUString TypeName( sal_uInt16 nType );
}; };
class VCL_DLLPUBLIC MetaPixelAction : public MetaAction class VCL_DLLPUBLIC MetaPixelAction : public MetaAction
......
...@@ -737,20 +737,6 @@ const SfxPoolItem* SwFltControlStack::GetOpenStackAttr(const SwPosition& rPos, s ...@@ -737,20 +737,6 @@ const SfxPoolItem* SwFltControlStack::GetOpenStackAttr(const SwPosition& rPos, s
return 0; 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) void SwFltControlStack::Delete(const SwPaM &rPam)
{ {
const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End(); const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
......
...@@ -186,7 +186,6 @@ public: ...@@ -186,7 +186,6 @@ public:
void KillUnlockedAttrs(const SwPosition& pPos); void KillUnlockedAttrs(const SwPosition& pPos);
SfxPoolItem* GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0); SfxPoolItem* GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0);
const SfxPoolItem* GetOpenStackAttr(const SwPosition& rPos, sal_uInt16 nWhich); const SfxPoolItem* GetOpenStackAttr(const SwPosition& rPos, sal_uInt16 nWhich);
const SfxPoolItem* GetFmtAttr(const SwPosition& rPos, sal_uInt16 nWhich);
void Delete(const SwPaM &rPam); void Delete(const SwPaM &rPam);
bool empty() const { return maEntries.empty(); } bool empty() const { return maEntries.empty(); }
......
...@@ -5,7 +5,6 @@ GDriveDocument::GDriveDocument(GDriveSession*) ...@@ -5,7 +5,6 @@ GDriveDocument::GDriveDocument(GDriveSession*)
GDriveFolder::GDriveFolder(GDriveSession*) GDriveFolder::GDriveFolder(GDriveSession*)
GDriveProperty::GDriveProperty() GDriveProperty::GDriveProperty()
GDriveSession::GDriveSession() GDriveSession::GDriveSession()
MetaAction::TypeName(unsigned short)
OpenGLContext::renderToFile() OpenGLContext::renderToFile()
OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long) OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
OutputDevice::GetCanvas() const OutputDevice::GetCanvas() const
......
...@@ -273,12 +273,6 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ...@@ -273,12 +273,6 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData
return pAction; 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() : MetaPixelAction::MetaPixelAction() :
MetaAction(META_PIXEL_ACTION) MetaAction(META_PIXEL_ACTION)
{} {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment