summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-29 12:29:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-03-29 12:44:23 +0100
commit21ca0847952be3eabc7c11200a2b70e0801a8fc6 (patch)
treeaeab1f2d0b33c9b8a07114a6dca46661c5b7788e /editeng
parent9ce98add53128716524ec06dd1f90548326adce0 (diff)
callcatcher: update list
Diffstat (limited to 'editeng')
-rw-r--r--editeng/inc/editeng/unotext.hxx5
-rw-r--r--editeng/source/uno/unotext.cxx9
-rw-r--r--editeng/source/uno/unotext2.cxx18
3 files changed, 3 insertions, 29 deletions
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 127771b42bb4..ace08dddb5a0 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -485,7 +485,9 @@ public:
virtual ~SvxUnoText() throw();
// Internal
- UNO3_GETIMPLEMENTATION_DECL( SvxUnoText )
+ static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw(::com::sun::star::uno::RuntimeException);
};
// ====================================================================
@@ -536,7 +538,6 @@ protected:
using SvxUnoTextRangeBase::getPropertyValue;
public:
- SvxUnoTextContent() throw();
SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw();
SvxUnoTextContent( const SvxUnoTextContent& rContent ) throw();
virtual ~SvxUnoTextContent() throw();
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 469e2d70da4c..ab24176ee589 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2162,15 +2162,6 @@ SvxUnoText::~SvxUnoText() throw()
{
}
-SvxUnoText* SvxUnoText::getImplementation( const uno::Reference< uno::XInterface >& xInt )
-{
- uno::Reference< lang::XUnoTunnel > xUT( xInt, uno::UNO_QUERY );
- if( xUT.is() )
- return reinterpret_cast<SvxUnoText*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SvxUnoText::getUnoTunnelId())));
- else
- return NULL;
-}
-
namespace
{
class theSvxUnoTextUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextUnoTunnelId > {};
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 095763f69f36..e3fb8c93a9b4 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -102,24 +102,6 @@ uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuc
// ====================================================================
// class SvxUnoTextContent
// ====================================================================
-uno::Reference< text::XText > xDummyText;
-
-static SvxUnoText* getDummyText() throw()
-{
- if(!xDummyText.is())
- xDummyText = new SvxUnoText();
-
- return SvxUnoText::getImplementation( xDummyText );
-}
-
-SvxUnoTextContent::SvxUnoTextContent() throw()
-: SvxUnoTextContent_Base(*getDummyText())
-, mnParagraph(0)
-, mrParentText(*getDummyText())
-, maDisposeListeners(maDisposeContainerMutex)
-, mbDisposing( false )
-{
-}
SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw()
: SvxUnoTextContent_Base(rText)