summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/inc/comphelper/oslfile2streamwrap.hxx2
-rw-r--r--comphelper/source/streaming/oslfile2streamwrap.cxx27
-rw-r--r--connectivity/inc/connectivity/sqlnode.hxx2
-rw-r--r--connectivity/source/parse/sqlnode.cxx2
-rw-r--r--editeng/inc/editeng/editview.hxx1
-rw-r--r--editeng/source/editeng/editview.cxx9
-rw-r--r--unotools/inc/unotools/bootstrap.hxx3
-rw-r--r--unotools/source/config/bootstrap.cxx17
-rw-r--r--unusedcode.easy8
-rw-r--r--vcl/inc/vcl/tabctrl.hxx4
-rw-r--r--vcl/source/control/tabctrl.cxx25
11 files changed, 3 insertions, 97 deletions
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index d62ca3db4108..e817be98d456 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -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
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 68af33298336..81951b546c81 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.cxx
@@ -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;
}
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index 1d8381a9a321..4f8385a8c0f4 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -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;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index f9789002828f..a40553037759 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -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
{
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 887439ef3267..ef02fa98bcba 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -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 );
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index c94738658e21..239da7ef6c9a 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -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 );
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx
index 2c9d17ff607a..5a98181457c4 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/unotools/inc/unotools/bootstrap.hxx
@@ -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);
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 157f869460de..d3ca6358ed2f 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -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)
diff --git a/unusedcode.easy b/unusedcode.easy
index 6e3a2fb5d280..46e92f4e2162 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -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)
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 380fb2e70883..970044a377f8 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -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;
};
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 7bdd0d3af0bf..799c96bbd1a8 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -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;
generated by cgit (git 2.34.1) at 2024-12-26 21:36:28 +0000