summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-30 20:52:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-02 14:53:47 +0100
commitb26df89e6c9405c5818a6f31f2c012ab657c421d (patch)
tree2ffbd0eb473f70da7f03685528b479640bfbe7b2
parent54bc03051702ad279dfd17471a3d5c30003c892d (diff)
callcatcher: remove some unused code
-rw-r--r--basic/source/runtime/iosys.cxx22
-rw-r--r--comphelper/inc/comphelper/propertycontainerhelper.hxx7
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx16
-rw-r--r--editeng/source/editeng/editattr.hxx2
-rw-r--r--editeng/source/editeng/editdoc.cxx12
-rw-r--r--editeng/source/editeng/editdoc.hxx1
-rw-r--r--sc/source/ui/vba/vbaworksheet.cxx4
-rw-r--r--sc/source/ui/vba/vbaworksheet.hxx3
-rw-r--r--tools/inc/tools/svborder.hxx1
-rw-r--r--tools/source/generic/svborder.cxx18
-rwxr-xr-xunusedcode.easy6
-rw-r--r--xmloff/inc/xmloff/xmlimppr.hxx14
-rw-r--r--xmloff/source/style/xmlimppr.cxx11
13 files changed, 6 insertions, 111 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 6c72322961b7..675c27f380eb 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -399,12 +399,10 @@ void OslStream::SetSize( sal_uIntPtr nSize )
class UCBStream : public SvStream
{
Reference< XInputStream > xIS;
- Reference< XOutputStream > xOS;
Reference< XStream > xS;
Reference< XSeekable > xSeek;
public:
UCBStream( Reference< XInputStream > & xIS );
- UCBStream( Reference< XOutputStream > & xOS );
UCBStream( Reference< XStream > & xS );
~UCBStream();
virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
@@ -420,12 +418,6 @@ UCBStream::UCBStream( Reference< XInputStream > & rStm )
{
}
-UCBStream::UCBStream( Reference< XOutputStream > & rStm )
- : xOS( rStm )
- , xSeek( rStm, UNO_QUERY )
-{
-}
-
UCBStream::UCBStream( Reference< XStream > & rStm )
: xS( rStm )
, xSeek( rStm, UNO_QUERY )
@@ -439,8 +431,6 @@ UCBStream::~UCBStream()
{
if( xIS.is() )
xIS->closeInput();
- else if( xOS.is() )
- xOS->closeOutput();
else if( xS.is() )
{
Reference< XInputStream > xIS_ = xS->getInputStream();
@@ -488,13 +478,7 @@ sal_uIntPtr UCBStream::PutData( const void* pData, sal_uIntPtr nSize )
try
{
Reference< XOutputStream > xOSFromS;
- if( xOS.is() )
- {
- Sequence<sal_Int8> aData( (const sal_Int8 *)pData, nSize );
- xOS->writeBytes( aData );
- return nSize;
- }
- else if( xS.is() && (xOSFromS = xS->getOutputStream()).is() )
+ if( xS.is() && (xOSFromS = xS->getOutputStream()).is() )
{
Sequence<sal_Int8> aData( (const sal_Int8 *)pData, nSize );
xOSFromS->writeBytes( aData );
@@ -537,9 +521,7 @@ void UCBStream::FlushData()
try
{
Reference< XOutputStream > xOSFromS;
- if( xOS.is() )
- xOS->flush();
- else if( xS.is() && (xOSFromS = xS->getOutputStream()).is() )
+ if( xS.is() && (xOSFromS = xS->getOutputStream()).is() )
xOSFromS->flush();
else
SetError( ERRCODE_IO_GENERAL );
diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx
index e6439ea34e96..1ad37df570bb 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/comphelper/inc/comphelper/propertycontainerhelper.hxx
@@ -184,13 +184,6 @@ protected:
*/
void describeProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps) const;
- /** modify the attributes of an already registered property.
-
- You may want to use this if you're a derived from OPropertyContainer indirectly and want to override
- some settings your base class did.
- */
- void modifyAttributes(sal_Int32 _nHandle, sal_Int32 _nAddAttrib, sal_Int32 _nRemoveAttrib);
-
/** retrieves the description for a registered property
@throw com::sun::star::beans::UnknownPropertyException
if no property with the given name is registered
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 64aa82ea0130..f9d625df6531 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -487,22 +487,6 @@ const Property& OPropertyContainerHelper::getProperty( const ::rtl::OUString& _r
}
//--------------------------------------------------------------------------
-void OPropertyContainerHelper::modifyAttributes(sal_Int32 _nHandle, sal_Int32 _nAddAttrib, sal_Int32 _nRemoveAttrib)
-{
- // get the property somebody is asking for
- PropertiesIterator aPos = searchHandle(_nHandle);
- if (aPos == m_aProperties.end())
- {
- OSL_FAIL( "OPropertyContainerHelper::modifyAttributes: unknown handle!" );
- // should not happen if the derived class has built a correct property set info helper to be used by
- // our base class OPropertySetHelper
- return;
- }
- aPos->aProperty.Handle |= _nAddAttrib;
- aPos->aProperty.Handle &= ~_nRemoveAttrib;
-}
-
-//--------------------------------------------------------------------------
void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) const
{
Sequence< Property > aOwnProps(m_aProperties.size());
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 5855e476439b..45c66d2fa78e 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -68,7 +68,7 @@ class SfxVoidItem;
// -------------------------------------------------------------------------
// class EditAttrib
// -------------------------------------------------------------------------
-class EditAttrib : public boost::noncopyable
+class EditAttrib : private boost::noncopyable
{
private:
EditAttrib();
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index c05e379c00d6..54e2016e48ac 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1520,18 +1520,6 @@ EditPaM EditDoc::RemoveText()
return aPaM;
}
-void EditDoc::InsertText( EditPaM& rPaM, xub_Unicode c )
-{
- DBG_ASSERT( c != 0x0A, "EditDoc::InsertText: Newlines prohibited in paragraph!" );
- DBG_ASSERT( c != 0x0D, "EditDoc::InsertText: Newlines prohibited in paragraph!" );
- DBG_ASSERT( c != '\t', "EditDoc::InsertText: Newlines prohibited in paragraph!" );
-
- rPaM.GetNode()->Insert( c, rPaM.GetIndex() );
- rPaM.GetNode()->ExpandAttribs( rPaM.GetIndex(), 1, GetItemPool() );
-
- SetModified( sal_True );
-}
-
EditPaM EditDoc::InsertText( EditPaM aPaM, const XubString& rStr )
{
DBG_ASSERT( rStr.Search( 0x0A ) == STRING_NOTFOUND, "EditDoc::InsertText: Newlines prohibited in paragraph!" );
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 609e2bd5d246..c28ed07ac70e 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -780,7 +780,6 @@ public:
EditPaM Clear();
EditPaM RemoveText();
EditPaM RemoveChars( EditPaM aPaM, sal_uInt16 nChars );
- void InsertText( EditPaM& rPaM, xub_Unicode c );
EditPaM InsertText( EditPaM aPaM, const XubString& rStr );
EditPaM InsertParaBreak( EditPaM aPaM, sal_Bool bKeepEndingAttribs );
EditPaM InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem );
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index f73a81f3b0c1..13f1c4dcdf30 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -196,10 +196,6 @@ openNewDoc(rtl::OUString aSheetName )
return xModel;
}
-ScVbaWorksheet::ScVbaWorksheet( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : WorksheetImpl_BASE( xParent, xContext ), mbVeryHidden( false )
-{
-}
-
ScVbaWorksheet::ScVbaWorksheet(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< sheet::XSpreadsheet >& xSheet,
const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel)
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index d02244439062..a3771a24601a 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -72,9 +72,6 @@ class ScVbaWorksheet : public WorksheetImpl_BASE
css::uno::Reference< css::container::XNameAccess > getFormControls();
css::uno::Any getControlShape( const rtl::OUString& sName );
-protected:
-
- ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
public:
ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/tools/inc/tools/svborder.hxx b/tools/inc/tools/svborder.hxx
index 86c5feb4f4dc..27ccdd008d74 100644
--- a/tools/inc/tools/svborder.hxx
+++ b/tools/inc/tools/svborder.hxx
@@ -40,7 +40,6 @@ public:
{ nTop = nRight = nBottom = nLeft = 0; }
SvBorder( const Size & rSz )
{ nTop = nBottom = rSz.Height(); nRight = nLeft = rSz.Width(); }
- SvBorder( const Rectangle & rOuter, const Rectangle & rInner );
SvBorder( long nLeftP, long nTopP, long nRightP, long nBottomP )
{ nLeft = nLeftP; nTop = nTopP; nRight = nRightP; nBottom = nBottomP; }
sal_Bool operator == ( const SvBorder & rObj ) const
diff --git a/tools/source/generic/svborder.cxx b/tools/source/generic/svborder.cxx
index 0c55c9515f56..6b9f0d636e7f 100644
--- a/tools/source/generic/svborder.cxx
+++ b/tools/source/generic/svborder.cxx
@@ -30,24 +30,6 @@
#include <tools/svborder.hxx>
#include <osl/diagnose.h>
-SvBorder::SvBorder( const Rectangle & rOuter, const Rectangle & rInner )
-{
- Rectangle aOuter( rOuter );
- aOuter.Justify();
- Rectangle aInner( rInner );
- if( aInner.IsEmpty() )
- aInner = Rectangle( aOuter.Center(), aOuter.Center() );
- else
- aInner.Justify();
-
- OSL_ENSURE( aOuter.IsInside( aInner ),
- "SvBorder::SvBorder: sal_False == aOuter.IsInside( aInner )" );
- nTop = aInner.Top() - aOuter.Top();
- nRight = aOuter.Right() - aInner.Right();
- nBottom = aOuter.Bottom() - aInner.Bottom();
- nLeft = aInner.Left() - aOuter.Left();
-}
-
Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder )
{
// wegen Empty-Rect, GetSize muss als erstes gerufen werden
diff --git a/unusedcode.easy b/unusedcode.easy
index 3c3d21c0edbe..0e84d5b83bfb 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,7 +5,6 @@ CharPosArray::Replace(int const&, unsigned short)
CharPosArray::Replace(int const*, unsigned short, unsigned short)
CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
Dialog::Dialog(Window*, ResId const&)
-EditDoc::InsertText(EditPaM&, unsigned short)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
FmEntryDataArray::Insert(FmEntryData* const*, unsigned short)
@@ -111,7 +110,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
-ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
ScrollableWindow::MakeVisible(Rectangle const&, unsigned char)
SectReprArr::Insert(SectRepr* const&, unsigned short&)
SectReprArr::Insert(SectRepr* const*, unsigned short)
@@ -141,7 +139,6 @@ SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short)
SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*)
StgCache::Pos2Page(int)
StgHeader::SetClassId(ClsId const&)
-SvBorder::SvBorder(Rectangle const&, Rectangle const&)
SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
SvLBoxButtonData::SvLBoxButtonData()
SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short)
@@ -157,7 +154,6 @@ SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElementArr const*, unsigned short,
SvXMLEmbeddedElementArr::Remove(SvXMLEmbeddedElement* const&, unsigned short)
SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short)
SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
-SvXMLImportPropertyMapper::importXML(std::__debug::vector<XMLPropertyState, std::allocator<XMLPropertyState> >&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const
SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const
SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const&, unsigned short&)
@@ -307,7 +303,6 @@ TempFile::IsValid() const
TextEngine::GetLeftMargin() const
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
-UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&)
UnoControlBase::UnoControlBase()
UnoControlModel::Clone() const
UnoControlModel::GetImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
@@ -764,7 +759,6 @@ canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRang
cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&)
comphelper::EventLogger::EventLogger(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&)
-comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int)
comphelper::OSelectionChangeListener::disposeAdapter()
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index eb1e245a044a..ea12f8154e25 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -89,17 +89,9 @@ public:
void ChainImportMapper(
const UniReference< SvXMLImportPropertyMapper>& rMapper );
- /** fills the given itemset with the attributes in the given list */
- void importXML(
- ::std::vector< XMLPropertyState >& rProperties,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > xAttrList,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap,
- sal_uInt32 nPropType ) const;
-
- /** like above, except that the mart is only serached within the range
- * [nStartIdx, nEndIdx[
+ /** fills the given itemset with the attributes in the given list
+ * the map is only searched within the range
+ * [nStartIdx, nEndIdx[
*/
void importXML(
::std::vector< XMLPropertyState >& rProperties,
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index d896429fd9bc..624b46d4928a 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -112,17 +112,6 @@ void SvXMLImportPropertyMapper::ChainImportMapper(
}
}
-void SvXMLImportPropertyMapper::importXML(
- vector< XMLPropertyState >& rProperties,
- Reference< XAttributeList > xAttrList,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap,
- sal_uInt32 nPropType ) const
-{
- importXML( rProperties, xAttrList, rUnitConverter, rNamespaceMap,
- nPropType,-1, -1 );
-}
-
/** fills the given itemset with the attributes in the given list */
void SvXMLImportPropertyMapper::importXML(
vector< XMLPropertyState >& rProperties,