editeng/source/editeng/editdoc.cxx | 1 + editeng/source/items/svxfont.cxx | 1 - editeng/source/misc/txtrange.cxx | 1 - editeng/source/uno/unoipset.cxx | 9 --------- editeng/source/uno/unotext.cxx | 20 -------------------- editeng/source/uno/unotext2.cxx | 12 ------------ editeng/source/xml/xmltxtexp.cxx | 1 + editeng/source/xml/xmltxtimp.cxx | 2 +- 8 files changed, 3 insertions(+), 44 deletions(-)
New commits: commit b4fd20fc6b4d7635c607fb2022e6694ed8466022 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Apr 9 14:42:34 2014 +0200 Clean up function declarations and some unused functions Change-Id: Id9e29dcaab64b0244b5c53abb48ac27253a11917 diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 7845483..356975c 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -54,6 +54,7 @@ #include <editdbg.hxx> #include <editeng/eerdll.hxx> #include <eerdll2.hxx> +#include <impedit.hxx> #include <rtl/ustrbuf.hxx> diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index ec69a0d..19acc72 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -182,7 +182,6 @@ public: const sal_Int32 nIdx, const sal_Int32 nLen, const sal_Bool bUpper ) = 0; - OutputDevice *GetOut() { return pOut; } const OUString &GetTxt() const { return rTxt; } sal_Int32 GetIdx() const { return nIdx; } sal_Int32 GetLen() const { return nLen; } diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index 4b6b11a..29ec0a6 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -142,7 +142,6 @@ public: sal_Bool IsClosed() const { return bClosed; } void SetConcat( const sal_Bool bNew ){ bConcat = bNew; } sal_Bool IsConcat() const { return bConcat; } - sal_uInt8 GetAct() const { return nAct; } }; SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, LongDqPtr pLong, diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 2222d8e..a051997 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -34,15 +34,6 @@ using namespace ::rtl; using ::std::vector; - - -struct SfxItemPropertyMapEntryHash -{ - size_t operator()(const SfxItemPropertyMapEntry* pMap) const { return (size_t)pMap; } -}; - - - struct SvxIDPropertyCombine { sal_uInt16 nWID; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 1bbd3b2..f0f2391 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1551,21 +1551,6 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< } } - -// class SvxUnoTextRange - - -uno::Reference< uno::XInterface > SvxUnoTextRange_NewInstance() -{ - SvxUnoText aText; - uno::Reference< text::XTextRange > xRange( new SvxUnoTextRange( aText ) ); -#ifndef _MSC_VER - return xRange; -#else - return (uno::Reference< uno::XInterface >)xRange; -#endif -} - SvxUnoTextRange::SvxUnoTextRange( const SvxUnoTextBase& rParent, bool bPortion /* = false */ ) throw() :SvxUnoTextRangeBase( rParent.GetEditSource(), bPortion ? ImplGetSvxTextPortionSvxPropertySet() : rParent.getPropertySet() ), mbPortion( bPortion ) @@ -2333,11 +2318,6 @@ SvxUnoText::~SvxUnoText() throw() { } -uno::Sequence< uno::Type > SAL_CALL getStaticTypes() throw() -{ - return SvxUnoTextBase::getStaticTypes(); -} - // uno::XInterface uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index e661102..9520113 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -456,18 +456,6 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement() return uno::makeAny( xRange ); } - -// class SvxUnoTextCursor - - -uno::Reference< uno::XInterface > SvxUnoTextCursor_NewInstance() -{ - SvxUnoText aText; - uno::Reference< text::XText > xText( (text::XText*)new SvxUnoTextCursor( aText ) ); - uno::Reference< uno::XInterface > xInt( xText, uno::UNO_QUERY ); - return xInt; -} - SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw() : SvxUnoTextRangeBase(rText), mxParentText( const_cast<SvxUnoTextBase*>(&rText) ) diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 65debcb..6e5b01b 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -45,6 +45,7 @@ #include <editeng/unofield.hxx> #include <editeng/editeng.hxx> #include "editsource.hxx" +#include "editxml.hxx" #include <editeng/unonrule.hxx> #include <editeng/unoipset.hxx> diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 0761c6e..a72f577 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -36,6 +36,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlstyle.hxx> #include "editsource.hxx" +#include "editxml.hxx" #include <editeng/editeng.hxx> #include <editeng/unotext.hxx> #include <editeng/unoprnms.hxx> @@ -114,7 +115,6 @@ public: virtual ~SvxXMLXTextImportComponent() throw (); - static sal_Bool load( const OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw(); protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits