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

callcatcher: remove some unused code

üst fd094baa
......@@ -48,11 +48,9 @@ class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper
{
::osl::Mutex m_aMutex;
::osl::File* m_pFile;
sal_Bool m_bFileOwner : 1;
public:
OSLInputStreamWrapper(::osl::File& _rStream);
OSLInputStreamWrapper(::osl::File* pStream, sal_Bool bOwner=sal_False);
virtual ~OSLInputStreamWrapper();
// stario::XInputStream
......
......@@ -38,23 +38,13 @@ namespace comphelper
//------------------------------------------------------------------
OSLInputStreamWrapper::OSLInputStreamWrapper( File& _rFile )
:m_pFile(&_rFile)
,m_bFileOwner(sal_False)
{
}
//------------------------------------------------------------------
OSLInputStreamWrapper::OSLInputStreamWrapper( File* pStream, sal_Bool bOwner )
:m_pFile( pStream )
,m_bFileOwner( bOwner )
: m_pFile(&_rFile)
{
}
//------------------------------------------------------------------
OSLInputStreamWrapper::~OSLInputStreamWrapper()
{
if( m_bFileOwner )
delete m_pFile;
}
//------------------------------------------------------------------------------
......@@ -92,14 +82,6 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_I
if (nMaxBytesToRead < 0)
throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
/*
if (m_pFile->IsEof())
{
aData.realloc(0);
return 0;
}
else
*/
return readBytes(aData, nMaxBytesToRead);
}
......@@ -119,11 +101,6 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st
{
throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
}
#ifdef DBG_UTIL
m_pFile->getPos(nCurrentPos);
// volatile int dummy = 0; // to take a look at last changes ;-)
#endif
}
//------------------------------------------------------------------------------
......@@ -163,8 +140,6 @@ void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedExc
throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
m_pFile->close();
if (m_bFileOwner)
delete m_pFile;
m_pFile = NULL;
}
......
......@@ -351,7 +351,7 @@ namespace connectivity
OSQLParseNode* getByRule(OSQLParseNode::Rule eRule) const;
#if OSL_DEBUG_LEVEL > 0
#if OSL_DEBUG_LEVEL > 1
// shows the ParseTree with tabs and linefeeds
void showParseTree( ::rtl::OUString& rString ) const;
void showParseTree( ::rtl::OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const;
......
......@@ -2235,7 +2235,7 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
}
}
}
#if OSL_DEBUG_LEVEL > 0
#if OSL_DEBUG_LEVEL > 1
// -----------------------------------------------------------------------------
void OSQLParseNode::showParseTree( ::rtl::OUString& rString ) const
{
......
......@@ -164,7 +164,6 @@ public:
const SfxItemSet& GetEmptyItemSet();
SfxItemSet GetAttribs();
void SetAttribs( const SfxItemSet& rSet );
void SetParaAttribs( const SfxItemSet& rSet, sal_uInt16 nPara );
void RemoveAttribs( sal_Bool bRemoveParaAttribs = sal_False, sal_uInt16 nWhich = 0 );
void RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0 );
void RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs = sal_False );
......
......@@ -500,15 +500,6 @@ void EditView::SetAttribs( const SfxItemSet& rSet )
PIMPEE->FormatAndUpdate( this );
}
void EditView::SetParaAttribs( const SfxItemSet& rSet, sal_uInt16 nPara )
{
DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
PIMPEE->SetParaAttribs( nPara, rSet );
// When you change paragraph attributes you must always format...
PIMPEE->FormatAndUpdate( this );
}
void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
{
DBG_CHKTHIS( EditView, 0 );
......
......@@ -80,9 +80,6 @@ namespace utl
/// get a file URL to the user installation [${userurl}]
static PathStatus locateUserInstallation(rtl::OUString& _rURL);
/// get a file URL to the shared data directory [default is ${insturl}/share]
static PathStatus locateSharedData(rtl::OUString& _rURL);
/// get a file URL to the user data directory [default is ${userurl}/user]
static PathStatus locateUserData(rtl::OUString& _rURL);
......
......@@ -675,24 +675,7 @@ PathStatus Bootstrap::locateUserInstallation(OUString& _rURL)
_rURL = aPathData.path;
return aPathData.status;
}
// ---------------------------------------------------------------------------------------
PathStatus Bootstrap::locateSharedData(OUString& _rURL)
{
OUString const csShareDirItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_SHAREDIR));
rtl::Bootstrap aData( data().getImplName() );
if ( aData.getFrom(csShareDirItem, _rURL) )
{
return checkStatusAndNormalizeURL(_rURL);
}
else
{
OUString const csShareDir(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_DIRNAME_SHAREDIR));
return getDerivedPath(_rURL, data().aBaseInstall_, csShareDir, aData, csShareDirItem);
}
}
// ---------------------------------------------------------------------------------------
PathStatus Bootstrap::locateUserData(OUString& _rURL)
......
......@@ -101,7 +101,6 @@ EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short)
EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(EECharAttrib const&, void*), void*)
EditView::GetSelectionMode() const
EditView::SetCursor(Cursor const&)
EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
EditView::SetPointer(Pointer const&)
ElementCollector::isAbleToNotify() const
ElementCollector::setSecurityId(int)
......@@ -1936,13 +1935,6 @@ graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigne
jfw_plugin::VendorBase::createInstance()
jfw_plugin::VendorBase::getJavaExePaths(int*)
jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
layout::MessageBox::MessageBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
layout::MessageBox::MessageBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
layout::MessageBox::MessageBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
layout::MessageBox::MessageBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
layout::TabControl::GetTabControl() const
layout::WindowImpl::setProperty(char const*, com::sun::star::uno::Any)
layout::getToolkit()
libcmis::SessionFactory::getRepositories(std::__debug::map<int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<int>, std::allocator<std::pair<int const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >)
libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&)
libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat)
......
......@@ -194,10 +194,6 @@ public:
using Control::GetIndexForPoint;
long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) const;
// returns the bounding rectangle of the union of tab page area and the
// corresponding tab
Rectangle GetTabPageBounds( sal_uInt16 nPageId ) const;
// returns the rectangle of the tab for page nPageId
Rectangle GetTabBounds( sal_uInt16 nPageId ) const;
};
......
......@@ -2140,31 +2140,6 @@ void TabControl::FillLayoutData() const
// -----------------------------------------------------------------------
Rectangle TabControl::GetTabPageBounds( sal_uInt16 nPage ) const
{
Rectangle aRet;
if( !HasLayoutData() || ! mpTabCtrlData->maLayoutPageIdToLine.size() )
FillLayoutData();
if( HasLayoutData() )
{
boost::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPage );
if( it != mpTabCtrlData->maLayoutPageIdToLine.end() )
{
if( it->second >= 0 && it->second < static_cast<int>(mpTabCtrlData->maTabRectangles.size()) )
{
aRet = mpTabCtrlData->maTabRectangles[ it->second ];
aRet.Union( const_cast<TabControl*>(this)->ImplGetTabRect( TAB_PAGERECT ) );
}
}
}
return aRet;
}
// -----------------------------------------------------------------------
Rectangle TabControl::GetTabBounds( sal_uInt16 nPageId ) const
{
Rectangle aRet;
......
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