summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-10 21:51:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-11 14:46:45 +0100
commit2106d8e648449d34b195068eef5f672a14ea64a8 (patch)
treece43da57f52c0bad223d123a37129da918fb5668
parentef877aab7ee88f03b36447af82904fc94938f569 (diff)
callcatcher: update unused code
Change-Id: Id5f730fc447b11000b266954f9e7f5287bad02f4
-rw-r--r--dbaccess/source/core/api/KeySet.cxx33
-rw-r--r--dbaccess/source/core/api/KeySet.hxx12
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx9
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx26
-rw-r--r--oox/inc/oox/helper/containerhelper.hxx2
-rw-r--r--oox/source/helper/containerhelper.cxx10
-rw-r--r--unotools/inc/unotools/ucbhelper.hxx3
-rw-r--r--unotools/source/ucbhelper/ucbhelper.cxx28
-rwxr-xr-xunusedcode.easy12
9 files changed, 3 insertions, 132 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 3a114a9c7f59..5e9f23362980 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1667,39 +1667,6 @@ sal_Bool SAL_CALL OKeySet::rowDeleted( ) throw(SQLException, RuntimeException)
return bDeleted;
}
-::rtl::OUString OKeySet::getComposedTableName(const ::rtl::OUString& _sCatalog,
- const ::rtl::OUString& _sSchema,
- const ::rtl::OUString& _sTable)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getComposedTableName" );
- ::rtl::OUString aComposedName;
- Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
-
- if( xMetaData.is() && xMetaData->supportsTableCorrelationNames() )
- {
- aComposedName = ::dbtools::composeTableName( xMetaData, _sCatalog, _sSchema, _sTable, sal_False, ::dbtools::eInDataManipulation );
- // first we have to check if the composed tablename is in the select clause or if an alias is used
- Reference<XTablesSupplier> xTabSup(m_xComposer,UNO_QUERY);
- Reference<XNameAccess> xSelectTables = xTabSup->getTables();
- OSL_ENSURE(xSelectTables.is(),"No Select tables!");
- if(xSelectTables.is())
- {
- if(!xSelectTables->hasByName(aComposedName))
- { // the composed name isn't used in the select clause so we have to find out which name is used instead
- ::rtl::OUString sCatalog,sSchema,sTable;
- ::dbtools::qualifiedNameComponents(xMetaData,m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
- aComposedName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
- }
- else
- aComposedName = ::dbtools::composeTableNameForSelect( m_xConnection, _sCatalog, _sSchema, _sTable );
- }
- }
- else
- aComposedName = ::dbtools::composeTableNameForSelect( m_xConnection, _sCatalog, _sSchema, _sTable );
-
- return aComposedName;
-}
-
namespace dbaccess
{
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index b98086dbb625..bbf35688c359 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -110,18 +110,6 @@ namespace dbaccess
sal_Bool m_bRowCountFinal;
- /**
- getComposedTableName return the composed table name for the query
- @param _sCatalog the catalogname may be empty
- @param _sSchema the schemaname may be empty
- @param _sTable the tablename
-
- @return the composed name
- */
- ::rtl::OUString getComposedTableName( const ::rtl::OUString& _sCatalog,
- const ::rtl::OUString& _sSchema,
- const ::rtl::OUString& _sTable);
-
/** copies the values from the insert row into the key row
*
* \param _rInsertRow the row which was inserted
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index c4c8ccb96d74..4e0cb09ce32a 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -130,15 +130,6 @@ namespace dbaui
Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory);
- /** return a vector which contains all key columns for the @see com::sun::star::sdbc::KeyType _nKeyType
- @param _rxTable the table which must be a @see com::sun::star::sdbcx::XColumnsSupplier
- @param _nKeyType @see com::sun::star::sdbc::KeyType
- */
-
- ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> >
- getKeyColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxKeys,
- sal_Int32 _nKeyType);
-
/** fills a map and a vector with localized type names
@param _rxConnection the connection to acces the metadata
@param _rsTypeNames a list of localized type names seperated with ';'
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index cc5409441d91..78c57565dbc1 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -306,32 +306,6 @@ void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference<
}
// -----------------------------------------------------------------------------
-::std::vector< Reference<XNameAccess> > getKeyColumns(const Reference<XIndexAccess >& _rxKeys,
- sal_Int32 _nKeyType)
-{
- // use keys and indexes for excat postioning
- // first the keys
- ::std::vector< Reference<XNameAccess> > vRet;
- if(_rxKeys.is())
- {
- Reference<XPropertySet> xProp;
- for(sal_Int32 i=0;i< _rxKeys->getCount();++i)
- {
- _rxKeys->getByIndex(i) >>= xProp;
- sal_Int32 nKeyType = 0;
- xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
- if(_nKeyType == nKeyType)
- {
- Reference<XColumnsSupplier> xKeyColsSup(xProp,UNO_QUERY);
- OSL_ENSURE(xKeyColsSup.is(),"Columnsupplier is null!");
- vRet.push_back(xKeyColsSup->getColumns());
- }
- }
- }
-
- return vRet;
-}
-// -----------------------------------------------------------------------------
TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
sal_Int32 _nType,
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index ce71d5216b94..bed8990dcd92 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -86,8 +86,6 @@ public:
/** Returns the ordered list of all value ranges. */
inline const ValueRangeVector& getRanges() const { return maRanges; }
- /** Returns an intersection of the range list and the passed range. */
- ValueRangeVector getIntersection( const ValueRange& rRange ) const;
private:
ValueRangeVector maRanges;
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index a19e9b40713b..a888552d8659 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -92,16 +92,6 @@ void ValueRangeSet::insert( const ValueRange& rRange )
}
}
-ValueRangeVector ValueRangeSet::getIntersection( const ValueRange& rRange ) const
-{
- ValueRangeVector aRanges;
- // find the range that contains nFirst or the first range that follows nFirst
- ValueRangeVector::const_iterator aIt = ::std::lower_bound( maRanges.begin(), maRanges.end(), rRange, ValueRangeComp() );
- for( ValueRangeVector::const_iterator aEnd = maRanges.end(); (aIt != aEnd) && (aIt->mnFirst <= rRange.mnLast); ++aIt )
- aRanges.push_back( ValueRange( ::std::max( aIt->mnFirst, rRange.mnFirst ), ::std::min( aIt->mnLast, rRange.mnLast ) ) );
- return aRanges;
-}
-
// ============================================================================
Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Reference< XComponentContext >& rxContext )
diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx
index 358d8e119c60..13dd45a89db9 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -56,9 +56,6 @@ UNOTOOLS_DLLPUBLIC com::sun::star::uno::Any GetProperty(
rtl::OUString const & url, rtl::OUString const & property);
UNOTOOLS_DLLPUBLIC bool MakeFolder(
- rtl::OUString const & url, bool exclusive = false);
-
-UNOTOOLS_DLLPUBLIC bool MakeFolder(
ucbhelper::Content & parent, rtl::OUString const & title,
ucbhelper::Content & result, bool exclusive = false);
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index cbb9ee917cb2..3dc4c9352c30 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -244,34 +244,6 @@ bool utl::UCBContentHelper::Kill(rtl::OUString const & url) {
}
bool utl::UCBContentHelper::MakeFolder(
- rtl::OUString const & url, bool exclusive)
-{
- INetURLObject o(url);
- SAL_WARN_IF(o.HasError(), "unotools", "Invalid URL \"" << url << '"');
- rtl::OUString title(
- o.getName(
- INetURLObject::LAST_SEGMENT, true,
- INetURLObject::DECODE_WITH_CHARSET));
- o.removeSegment();
- ucbhelper::Content parent;
- ucbhelper::Content res;
- return
- ucbhelper::Content::create(
- o.GetMainURL(INetURLObject::NO_DECODE),
- new ucbhelper::CommandEnvironment(
- css::uno::Reference<css::task::XInteractionHandler>(
- (css::uno::Reference<css::lang::XMultiServiceFactory>(
- comphelper::getProcessServiceFactory(),
- css::uno::UNO_SET_THROW)->
- createInstance(
- rtl::OUString( "com.sun.star.uui.InteractionHandler"))),
- css::uno::UNO_QUERY_THROW),
- css::uno::Reference<css::ucb::XProgressHandler>()),
- parent)
- && MakeFolder(parent, title, res, exclusive);
-}
-
-bool utl::UCBContentHelper::MakeFolder(
ucbhelper::Content & parent, rtl::OUString const & title,
ucbhelper::Content & result, bool exclusive)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 4458f6268484..f7f94ed6c2ef 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -161,12 +161,6 @@ SwMailMergeChildWindow::GetChildWindowId()
SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
SwOutlineNodes::Insert(SwNode* const*, unsigned short)
SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
-SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short)
-SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&)
-SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
-SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short)
-SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short)
-SwPosFlyFrms::Remove(unsigned short, unsigned short)
SwRects::Replace(SwRect const&, unsigned short)
SwRects::Replace(SwRect const*, unsigned short, unsigned short)
SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*)
@@ -174,7 +168,6 @@ SwRedlineDataParentSortArr::DeleteAndDestroy(unsigned short, unsigned short)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const&)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned short, unsigned short)
-SwSections::DeleteAndDestroy(unsigned short, unsigned short)
SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
SwSortElements::Insert(SwSortElement* const&, unsigned short&)
@@ -647,7 +640,6 @@ connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
connectivity::toString(com::sun::star::uno::Any const&)
cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XAnimatedSprite> const&, boost::shared_ptr<cppcanvas::internal::ImplSpriteCanvas::TransformationArbiter> const&)
-dbaui::getKeyColumns(com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, int)
dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&)
dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent const&)
dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdb::SQLContext const&)
@@ -664,9 +656,10 @@ nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
+oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
+oox::xls::CellBlock::RichStringCell::RichStringCell(com::sun::star::table::CellAddress const&, boost::shared_ptr<oox::xls::RichString> const&, oox::xls::Font const*)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
@@ -677,6 +670,7 @@ std::__cxx1998::multimap<_xmlNode*, com::sun::star::uno::Reference<com::sun::sta
std::__cxx1998::vector<OrderedEntry*, std::allocator<OrderedEntry*> >::~vector()
std::__cxx1998::vector<ServiceInfo*, std::allocator<ServiceInfo*> >::~vector()
std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
+std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector()
svxform::DataNavigatorManager::GetChildWindowId()
svxform::FmFilterNavigatorWinMgr::GetChildWindowId()
svxform::NavigatorFrameManager::GetChildWindowId()