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

fdo#39446 - Bloat Removal. Removing uncallable code with callcatcher

Browse Source 
Removed several unused methods.

Could not remove ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() and ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun:⭐:uno::Any const&) because it breaks compilation (they are implementing pure virtual methods).
Should Test::test1Table1Page() really be removed? (test class)

Conflicts:
        unusedcode.easy

Change-Id: I98a761f66f28e3a82661c10a5fa1dc7e109fff2f
This commit is contained in:
Jean-Noël Rouvignac
2013-02-06 14:47:47 +01:00
committed by Thorsten Behrens
parent 408d5d92ee
commit 875c997c7d
21 changed files with 1 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/inc/editeng/editobj.hxx
View File

@@ -96,14 +96,12 @@ public:
void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
bool RemoveParaAttribs( sal_uInt16 nWhich = 0 );
bool IsFieldObject() const;
const SvxFieldItem* GetField() const;
bool HasField( sal_Int32 nType = com::sun::star::text::textfield::Type::UNSPECIFIED ) const;
const SfxItemSet& GetParaAttribs(size_t nPara) const;
void SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs);
void GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const;
void SetStyleSheet(size_t nPara, const String& rName, const SfxStyleFamily& eFamily);

10
editeng/source/editeng/editobj.cxx
View File

@@ -266,21 +266,11 @@ const SfxItemSet& EditTextObject::GetParaAttribs(size_t nPara) const
return mpImpl->GetParaAttribs(nPara);
}
void EditTextObject::SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs)
{
mpImpl->SetParaAttribs(nPara, rAttribs);
}
bool EditTextObject::RemoveCharAttribs( sal_uInt16 nWhich )
{
return mpImpl->RemoveCharAttribs(nWhich);
}
bool EditTextObject::RemoveParaAttribs( sal_uInt16 nWhich )
{
return mpImpl->RemoveParaAttribs(nWhich);
}
void EditTextObject::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const
{
mpImpl->GetStyleSheet(nPara, rName, eFamily);

1
l10ntools/inc/po.hxx
View File

@@ -89,7 +89,6 @@ public:
friend class PoOfstream;
friend class PoIfstream;
PoHeader();
PoHeader( const OString& rExtSrc );
PoHeader( std::ifstream& rOldPo );
~PoHeader();

7
l10ntools/source/po.cxx
View File

@@ -631,13 +631,6 @@ namespace
}
}
//Default Constructor
PoHeader::PoHeader()
: m_pGenPo( 0 )
, m_bIsInitialized( false )
{
}
//Template Constructor
PoHeader::PoHeader( const OString& rExtSrc )
: m_pGenPo( new GenPoEntry() )

2
sfx2/inc/sfx2/templateabstractview.hxx
View File

@@ -100,8 +100,6 @@ public:
void deselectOverlayItems ();
void deselectOverlayItem (const sal_uInt16 nItemId);
void sortOverlayItems (const boost::function<bool (const ThumbnailViewItem*,
const ThumbnailViewItem*) > &func);

5
sfx2/source/control/templateabstractview.cxx
View File

@@ -163,11 +163,6 @@ void TemplateAbstractView::deselectOverlayItems()
mpItemView->deselectItems();
}
void TemplateAbstractView::deselectOverlayItem(const sal_uInt16 nItemId)
{
mpItemView->deselectItem(nItemId);
}
void TemplateAbstractView::sortOverlayItems(const boost::function<bool (const ThumbnailViewItem*,
const ThumbnailViewItem*) > &func)
{

1
tools/inc/tools/line.hxx
View File

@@ -49,7 +49,6 @@ public:
sal_Bool Intersection( const Line& rLine, double& rIntersectionX, double& rIntersectionY ) const;
sal_Bool Intersection( const Line& rLine, Point& rIntersection ) const;
sal_Bool Intersection( const Rectangle& rRect, Line& rIntersection ) const;
double GetDistance( const double& rPtX, const double& rPtY ) const;
double GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); }

57
tools/source/generic/line.cxx
View File

@@ -98,63 +98,6 @@ sal_Bool Line::Intersection( const Line& rLine, double& rIntersectionX, double&
return bOk;
}
sal_Bool Line::Intersection( const Rectangle& rRect, Line& rIntersection ) const
{
const sal_Bool bStartInside = rRect.IsInside( maStart );
const sal_Bool bEndInside = rRect.IsInside( maEnd );
sal_Bool bRet = sal_True;
if( bStartInside && bEndInside )
{
// line completely inside rect
rIntersection.maStart = maStart;
rIntersection.maEnd = maEnd;
}
else
{
// calculate intersections
const Point aTL( rRect.TopLeft() ), aTR( rRect.TopRight() );
const Point aBR( rRect.BottomRight() ), aBL( rRect.BottomLeft() );
Point aIntersect1, aIntersect2;
Point* pCurIntersection = &aIntersect1;
if( Intersection( Line( aTL, aTR ), *pCurIntersection ) )
pCurIntersection = &aIntersect2;
if( Intersection( Line( aTR, aBR ), *pCurIntersection ) )
pCurIntersection = ( pCurIntersection == &aIntersect1 ) ? &aIntersect2 : NULL;
if( pCurIntersection && Intersection( Line( aBR, aBL ), *pCurIntersection ) )
pCurIntersection = ( pCurIntersection == &aIntersect1 ) ? &aIntersect2 : NULL;
if( pCurIntersection && Intersection( Line( aBL, aTL ), *pCurIntersection ) )
pCurIntersection = ( pCurIntersection == &aIntersect1 ) ? &aIntersect2 : NULL;
if( !pCurIntersection )
{
// two intersections
rIntersection.maStart = aIntersect1;
rIntersection.maEnd = aIntersect2;
}
else if( pCurIntersection == &aIntersect2 )
{
// one intersection
rIntersection.maStart = aIntersect1;
if( ( maStart != aIntersect1 ) && bStartInside )
rIntersection.maEnd = maStart;
else if( ( maEnd != aIntersect1 ) && bEndInside )
rIntersection.maEnd = maEnd;
else
rIntersection.maEnd = rIntersection.maStart;
}
else
bRet = sal_False;
}
return bRet;
}
double Line::GetDistance( const double& rPtX, const double& rPtY ) const
{
double fDist;

14
unusedcode.easy
View File

@@ -1,10 +1,3 @@
Application::GetDisplayScreenName(unsigned int)
EditTextObject::RemoveParaAttribs(unsigned short)
EditTextObject::SetParaAttribs(unsigned long, SfxItemSet const&)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
Line::Intersection(Rectangle const&, Line&) const
PoHeader::PoHeader()
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX()
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
@@ -13,7 +6,6 @@ StyleSettings::GetPersonaFooter() const
TemplateAbstractView::deselectOverlayItem(unsigned short)
Test::test1Table1Page()
TextEngine::GetLeftMargin() const
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
apitest::XCellRangesQuery::testQueryFormulaCells()
apitest::XDataPilotDescriptor::testGetHiddenFields()
apitest::XDataPilotFieldGrouping::testCreateDateGroup()
@@ -41,14 +33,10 @@ connectivity::file::OStatement_Base::reset()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
sc_apitest::main()
oox::drawingml::TextListStyle::dump() const # Only used in debug mode
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*)
test::BootstrapFixtureBase::getPathFromWorkdir(char const*)
test::BootstrapFixtureBase::getURLFromWorkdir(char const*)
writerfilter::logger(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
writerfilter::rtftok::RTFSprms::swap(writerfilter::rtftok::RTFSprms&)

2
vcl/inc/outfont.hxx
View File

@@ -191,8 +191,6 @@ class FontSelectPattern : public FontSelectPatternAttributes
public:
FontSelectPattern( const Font&, const String& rSearchName,
const Size&, float fExactHeight );
FontSelectPattern( const PhysicalFontFace&, const Size&,
float fExactHeight, int nOrientation, bool bVertical );
public: // TODO: change to private
const PhysicalFontFace* mpFontData; // a matching PhysicalFontFace object

1
vcl/inc/vcl/settings.hxx
View File

@@ -867,7 +867,6 @@ public:
{ CopyData(); mpData->maFrameStyle = rStyle; }
const BitmapEx GetPersonaHeader() const;
const BitmapEx GetPersonaFooter() const;
void SetStandardStyles();

1
vcl/inc/vcl/svapp.hxx
View File

@@ -287,7 +287,6 @@ public:
static unsigned int GetDisplayBuiltInScreen();
// Practically, this means - Get the screen we should run a presentation on.
static unsigned int GetDisplayExternalScreen();
SAL_DLLPRIVATE static rtl::OUString GetDisplayScreenName( unsigned int nScreen );
static const LocaleDataWrapper& GetAppLocaleDataWrapper();

6
vcl/source/app/settings.cxx
View File

@@ -766,12 +766,6 @@ const BitmapEx StyleSettings::GetPersonaHeader() const
return mpData->maPersonaHeaderBitmap;
}
const BitmapEx StyleSettings::GetPersonaFooter() const
{
setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->maPersonaFooterBitmap );
return mpData->maPersonaFooterBitmap;
}
// -----------------------------------------------------------------------
void StyleSettings::SetStandardStyles()

6
vcl/source/app/svapp.cxx
View File

@@ -1224,12 +1224,6 @@ unsigned int Application::GetScreenCount()
return pSys ? pSys->GetDisplayScreenCount() : 0;
}
rtl::OUString Application::GetDisplayScreenName( unsigned int nScreen )
{
SalSystem* pSys = ImplGetSalSystem();
return pSys ? pSys->GetDisplayScreenName( nScreen ) : rtl::OUString();
}
bool Application::IsUnifiedDisplay()
{
SalSystem* pSys = ImplGetSalSystem();

8
vcl/source/gdi/outdev3.cxx
View File

@@ -2172,14 +2172,6 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace
// NOTE: no normalization for width/height/orientation
}
FontSelectPattern::FontSelectPattern( const PhysicalFontFace& rFontData,
const Size& rSize, float fExactHeight, int nOrientation, bool bVertical )
: FontSelectPatternAttributes(rFontData, rSize, fExactHeight, nOrientation, bVertical)
, mpFontData( &rFontData )
, mpFontEntry( NULL )
{
}
void FontSelectPattern::copyAttributes(const FontSelectPatternAttributes &rAttributes)
{
static_cast<FontSelectPatternAttributes&>(*this) = rAttributes;

2
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
View File

@@ -398,8 +398,6 @@ protected:
/**
Creates handler for a stream.
*/
void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC logger(string prefix, string message);
void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props);
void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n);
void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/,

20
writerfilter/source/resourcemodel/util.cxx
View File

@@ -35,26 +35,6 @@ namespace writerfilter
{
using namespace com::sun::star;
using namespace std;
using text::TextContentAnchorType;
static string & logger_file()
{
static string _logger_file = string(getenv("TEMP")?getenv("TEMP"):"/tmp") + "/writerfilter.ooxml.tmp";
return _logger_file;
}
static ofstream & logger_stream()
{
static ofstream _logger_stream(logger_file().c_str());
return _logger_stream;
}
void logger(string prefix, string message)
{
logger_stream() << prefix << ":" << message << endl;
logger_stream().flush();
}
string xmlify(const string & str)
{

7
writerfilter/source/rtftok/rtfsprm.cxx
View File

@@ -192,13 +192,6 @@ RTFSprms& RTFSprms::operator=(const RTFSprms& rOther)
return *this;
}
void RTFSprms::swap(RTFSprms& rOther)
{
boost::intrusive_ptr<RTFSprmsImpl> pTmp = rOther.m_pSprms;
rOther.m_pSprms = m_pSprms;
m_pSprms = pTmp;
}
void RTFSprms::clear()
{
if (m_pSprms->m_nRefCount == 1)

1
writerfilter/source/rtftok/rtfsprm.hxx
View File

@@ -71,7 +71,6 @@ namespace writerfilter {
bool erase(Id nKeyword);
/// Removes elements, which are already in the reference set.
void deduplicate(RTFSprms& rReference);
void swap(RTFSprms& rOther);
size_t size() const { return m_pSprms->size(); }
bool empty() const { return m_pSprms->empty(); }
Entry_t& back() { return m_pSprms->back(); }

26
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
View File

@@ -132,30 +132,4 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno:
return m_Entries;
}
//Helper method
void SanExtensionImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) {
unsigned int i ;
if( value != NULL && vlen != 0 ) {
Sequence< sal_Int8 > extnv( vlen ) ;
for( i = 0; i < vlen ; i ++ )
extnv[i] = *( value + i ) ;
m_xExtnValue = extnv ;
} else {
m_xExtnValue = Sequence<sal_Int8>();
}
if( id != NULL && idlen != 0 ) {
Sequence< sal_Int8 > extnId( idlen ) ;
for( i = 0; i < idlen ; i ++ )
extnId[i] = *( id + i ) ;
m_xExtnId = extnId ;
} else {
m_xExtnId = Sequence<sal_Int8>();
}
m_critical = critical ;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

26
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
View File

@@ -195,30 +195,4 @@ namespace {
}
//Helper method
void SanExtensionImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) {
unsigned int i ;
if( value != NULL && vlen != 0 ) {
Sequence< sal_Int8 > extnv( vlen ) ;
for( i = 0; i < vlen ; i ++ )
extnv[i] = *( value + i ) ;
m_xExtnValue = extnv ;
} else {
m_xExtnValue = Sequence<sal_Int8>();
}
if( id != NULL && idlen != 0 ) {
Sequence< sal_Int8 > extnId( idlen ) ;
for( i = 0; i < idlen ; i ++ )
extnId[i] = *( id + i ) ;
m_xExtnId = extnId ;
} else {
m_xExtnId = Sequence<sal_Int8>();
}
m_critical = critical ;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */