mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove various unused methods and source files

Browse Source
This commit is contained in:
Caolán McNamara
2012-03-06 22:43:13 +00:00
parent 04f067623f
commit bbc6d8506d
18 changed files with 0 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editeng/inc/editeng/unotext.hxx
View File

@@ -423,15 +423,12 @@ protected:
public:
SvxUnoTextBase( ) throw();
SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw();
SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw();
SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > xParent ) throw();
SvxUnoTextBase( const SvxUnoTextBase& rText ) throw();
virtual ~SvxUnoTextBase() throw();
UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase )
ESelection InsertField( const SvxFieldItem& rField ) throw();
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > createTextCursorBySelection( const ESelection& rSel );
// ::com::sun::star::text::XSimpleText

27
editeng/source/uno/unotext.cxx
View File

@@ -1581,14 +1581,6 @@ SvxUnoTextBase::SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw()
{
}
SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw()
: SvxUnoTextBase_Base( pSource, _pSet )
{
ESelection aSelection;
::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );
SetSelection( aSelection );
}
SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, uno::Reference < text::XText > xParent ) throw()
: SvxUnoTextBase_Base( pSource, _pSet )
{
@@ -1608,25 +1600,6 @@ SvxUnoTextBase::~SvxUnoTextBase() throw()
{
}
// Internal
ESelection SvxUnoTextBase::InsertField( const SvxFieldItem& rField ) throw()
{
SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
if( pForwarder )
{
pForwarder->QuickInsertField( rField, GetSelection() );
GetEditSource()->UpdateData();
// Adapt selection
//! It would be easier if the EditEngine would return the selection
//! on QuickInsertText...
CollapseToStart();
GoRight( 1, sal_True ); // Field is always 1 character
}
return GetSelection(); // Selection with the field
}
uno::Reference< text::XTextCursor > SvxUnoTextBase::createTextCursorBySelection( const ESelection& rSel )
{
SvxUnoTextCursor* pCursor = new SvxUnoTextCursor( *this );

1
sc/source/filter/xml/xmltabi.cxx
View File

@@ -51,7 +51,6 @@
#include <xmloff/xmltkmap.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/formsimp.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/XMLEventsImportContext.hxx>

11
sfx2/source/doc/oleprops.cxx
View File

@@ -146,9 +146,6 @@ public:
explicit SfxOleStringPropertyBase(
sal_Int32 nPropId, sal_Int32 nPropType,
rtl_TextEncoding eTextEnc );
explicit SfxOleStringPropertyBase(
sal_Int32 nPropId, sal_Int32 nPropType,
rtl_TextEncoding eTextEnc, const String& rValue );
inline const String& GetValue() const { return maValue; }
inline void SetValue( const String& rValue ) { maValue = rValue; }
@@ -529,14 +526,6 @@ SfxOleStringPropertyBase::SfxOleStringPropertyBase(
{
}
SfxOleStringPropertyBase::SfxOleStringPropertyBase(
sal_Int32 nPropId, sal_Int32 nPropType, rtl_TextEncoding eTextEnc, const String& rValue ) :
SfxOlePropertyBase( nPropId, nPropType ),
SfxOleStringHelper( eTextEnc ),
maValue( rValue )
{
}
// ----------------------------------------------------------------------------
SfxOleString8Property::SfxOleString8Property(

2
svtools/inc/svtools/xwindowitem.hxx
View File

@@ -50,8 +50,6 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
public:
TYPEINFO();
XWindowItem();
explicit XWindowItem( sal_uInt16 nWhich, Window * pWin );
XWindowItem( sal_uInt16 nWhich, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > & rxWin );
XWindowItem( const XWindowItem &rItem );
~XWindowItem();

BIN
svtools/qa/cppunit/data/emf/pass/CVE-2008-2245-1.emf Normal file
View File

Binary file not shown.

19
svtools/source/misc/xwindowitem.cxx
View File

@@ -45,25 +45,6 @@ XWindowItem::XWindowItem() :
}
XWindowItem::XWindowItem( sal_uInt16 nWhichId, Window * pWin ) :
SfxPoolItem( nWhichId )
{
if (pWin)
{
m_xWin = uno::Reference< awt::XWindow >( pWin->GetComponentInterface(), uno::UNO_QUERY );
// the assertion can't possibly fails since VCLXWindow implements XWindow...
DBG_ASSERT( m_xWin.is(), "failed to get XWindow" );
}
}
XWindowItem::XWindowItem( sal_uInt16 nWhichId, uno::Reference< awt::XWindow > & rxWin ) :
SfxPoolItem( nWhichId ),
m_xWin( rxWin )
{
}
XWindowItem::XWindowItem( const XWindowItem &rItem ) :
SfxPoolItem( Which() ),
m_xWin( rItem.m_xWin )

13
unusedcode.easy
View File

@@ -133,7 +133,6 @@ SfxFoundCacheArr_Impl::Remove(unsigned short, unsigned short)
SfxMedium::GetHdl()
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
SfxOleStringPropertyBase::SfxOleStringPropertyBase(int, int, unsigned short, String const&)
SfxPartChildWnd_Impl::GetChildWindowId()
SfxPopupWindow::LinkStubDelete(void*, void*)
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
@@ -198,11 +197,6 @@ SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short)
SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short)
SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
SvxAreaTabPage::LinkStubClickBitmapHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickColorHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickGradientHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickHatchingHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickInvisibleHdl_Impl(void*, void*)
SvxAutocorrWordList::Insert(SvxAutocorrWord* const&, unsigned short&)
SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short)
SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short)
@@ -226,8 +220,6 @@ SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
SvxUnoTextBase::InsertField(SvxFieldItem const&)
SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*)
SvxUnoTextContent::SvxUnoTextContent()
SwAttrIter::Dump(SvStream&) const
SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
@@ -391,7 +383,6 @@ Window::PostUserEvent(unsigned long&, unsigned long, void*)
X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
XMLElement::Equals(rtl::OUString)
XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter()
XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&)
XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&, rtl::OUString const&)
XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
@@ -400,8 +391,6 @@ XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
XMLFormsContext::XMLFormsContext(SvXMLImport&, unsigned short, rtl::OUString const&)
XMLPagePropertySetMapper::XMLPagePropertySetMapper(UniReference<XMLPropertyHandlerFactory> const&)
XMLParentNode::AddChild(XMLChildNode*, unsigned long)
XMLParentNode::GetChildElement(XMLElement*)
XMLParentNode::RemoveChild(XMLElement*)
@@ -417,8 +406,6 @@ XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const
XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, Rectangle&, short)
XWindowItem::XWindowItem(unsigned short, Window*)
XWindowItem::XWindowItem(unsigned short, com::sun::star::uno::Reference<com::sun::star::awt::XWindow>&)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
_CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
_CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)

1
xmloff/Library_xo.mk
View File

@@ -171,7 +171,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/forms/formevents \
xmloff/source/forms/formlayerexport \
xmloff/source/forms/formlayerimport \
xmloff/source/forms/formsimp \
xmloff/source/forms/gridcolumnproptranslator \
xmloff/source/forms/layerexport \
xmloff/source/forms/layerimport \

1
xmloff/Package_inc.mk
View File

@@ -75,7 +75,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx))

1
xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
View File

@@ -45,7 +45,6 @@ class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3<
::com::sun::star::xml::sax::XExtendedDocumentHandler > xExtHandler;
public:
XMLEmbeddedObjectExportFilter() throw();
XMLEmbeddedObjectExportFilter( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > & rHandler ) throw();
virtual ~XMLEmbeddedObjectExportFilter () throw();

51
xmloff/inc/xmloff/formsimp.hxx
View File

@@ -1,51 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _XMLOFF_FORMSIMP_HXX
#define _XMLOFF_FORMSIMP_HXX
#include <xmloff/xmlictxt.hxx>
//////////////////////////////////////////////////////////////////////////////
// presentations:animations
class XMLFormsContext : public SvXMLImportContext
{
public:
TYPEINFO();
XMLFormsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName);
virtual ~XMLFormsContext();
virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
};
#endif // _XMLOFF_ANIMIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
View File

@@ -34,10 +34,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter() throw()
{
}
XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter(
const Reference< XDocumentHandler > & rHandler ) throw() :
xHandler( rHandler ),

11
xmloff/source/draw/sdpropls.cxx
View File

@@ -1572,17 +1572,6 @@ void XMLShapeExportPropertyMapper::handleElementItem(
}
}
//////////////////////////////////////////////////////////////////////////////
XMLPagePropertySetMapper::XMLPagePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef)
: XMLPropertySetMapper( aXMLSDPresPageProps, rFactoryRef )
{
}
XMLPagePropertySetMapper::~XMLPagePropertySetMapper()
{
}
// ----------------------------------------
XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) :

7
xmloff/source/draw/sdpropls.hxx
View File

@@ -297,13 +297,6 @@ public:
sal_uInt32 nIdx = 0 ) const;
};
class XMLPagePropertySetMapper : public XMLPropertySetMapper
{
public:
XMLPagePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef);
~XMLPagePropertySetMapper();
};
class XMLPageExportPropertyMapper : public SvXMLExportPropertyMapper
{
private:

1
xmloff/source/draw/ximppage.cxx
View File

@@ -40,7 +40,6 @@
#include "ximpshap.hxx"
#include "animimp.hxx"
#include "XMLStringBufferImportContext.hxx"
#include <xmloff/formsimp.hxx>
#include <xmloff/xmlictxt.hxx>
#include "ximpstyl.hxx"
#include <xmloff/prstylei.hxx>

57
xmloff/source/forms/formsimp.cxx
View File

@@ -1,57 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <xmloff/xmlimp.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/nmspmap.hxx>
#include <xmloff/formsimp.hxx>
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
TYPEINIT1( XMLFormsContext, SvXMLImportContext );
XMLFormsContext::XMLFormsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName )
: SvXMLImportContext(rImport, nPrfx, rLocalName)
{
}
XMLFormsContext::~XMLFormsContext()
{
}
SvXMLImportContext * XMLFormsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
return GetImport().GetFormImport()->createContext( nPrefix, rLocalName, xAttrList );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
xmloff/source/text/txtimp.cxx
View File

@@ -85,7 +85,6 @@
#include "XMLAutoMarkFileContext.hxx"
#include "XMLCalculationSettingsContext.hxx"
#include <xmloff/formsimp.hxx>
#include "XMLNumberStylesImport.hxx"
// XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
#include <com/sun/star/beans/XPropertyState.hpp>