summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcos Paulo de Souza <marcos.souza.org@gmail.com>2013-08-31 13:10:23 -0300
committerCaolán McNamara <caolanm@redhat.com>2013-09-01 09:15:44 +0000
commit1d3483ed279982278b2f9fb1bab63485523e48c5 (patch)
tree449e6a4b8999e0ba54359b4b8d26a32e819942ad
parent92ce8daf21f2081eca9b4f4294115b904c168a46 (diff)
Remove some unused code from unusedcode.easy
Change-Id: Ic3e96eebbb914c5b905a8c58532ead9cb01dd41d Reviewed-on: https://gerrit.libreoffice.org/5721 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--connectivity/source/commontools/dbconversion.cxx38
-rw-r--r--include/connectivity/dbconversion.hxx6
-rw-r--r--include/svx/AffineMatrixItem.hxx2
-rw-r--r--include/tools/stream.hxx4
-rw-r--r--include/vcl/menu.hxx5
-rw-r--r--include/vcl/status.hxx3
-rw-r--r--oox/source/core/filterbase.cxx19
-rw-r--r--sc/source/filter/inc/sheetdatabuffer.hxx1
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx2
-rw-r--r--sc/source/filter/oox/sheetdatabuffer.cxx15
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx8
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx27
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx21
-rw-r--r--svx/source/xoutdev/xattr2.cxx5
-rw-r--r--tools/source/stream/strmunx.cxx9
-rw-r--r--unusedcode.easy17
-rw-r--r--vcl/source/window/menu.cxx40
-rw-r--r--vcl/source/window/status.cxx50
18 files changed, 1 insertions, 271 deletions
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index cd2b1c3d1a3e..1449b99779ce 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -136,44 +136,6 @@ namespace dbtools
return aReturn;
}
- //------------------------------------------------------------------------------
- sal_Int32 DBTypeConversion::toINT32(const utl::Date& rVal)
- {
- return ((sal_Int32)(rVal.Day%100)) +
- (((sal_Int32)(rVal.Month%100))*100) +
- (((sal_Int32) rVal.Year%10000)*10000);
- }
-
- //------------------------------------------------------------------------------
- sal_Int64 DBTypeConversion::toINT64(const utl::Time& rVal)
- {
- // normalize time
- sal_Int32 nSeconds = rVal.Seconds + rVal.NanoSeconds / nanoSecInSec;
- sal_Int32 nNanoSeconds = rVal.NanoSeconds % nanoSecInSec;
- sal_Int32 nMinutes = rVal.Minutes + nSeconds / secInMin;
- nSeconds = nSeconds % secInMin;
- sal_Int32 nHours = rVal.Hours + nMinutes / minInHour;
- nMinutes = nMinutes % minInHour;
-
- // assemble time
- return nNanoSeconds +
- nSeconds * secMask +
- nMinutes * minMask +
- nHours * hourMask;
- }
-
- //------------------------------------------------------------------------------
- sal_Int32 DBTypeConversion::getMsFromTime(const utl::Time& rVal)
- {
- sal_Int32 nHour = rVal.Hours;
- sal_Int32 nMin = rVal.Minutes;
- sal_Int32 nSec = rVal.Seconds;
- sal_Int32 nNanoSec = rVal.NanoSeconds;
-
- return ((nHour*3600000)+(nMin*60000)+(nSec*1000)+(nNanoSec/1000000));
- }
-
- //------------------------------------------------------------------------------
sal_Int64 DBTypeConversion::getNsFromTime(const utl::Time& rVal)
{
sal_Int32 nHour = rVal.Hours;
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index 4bc0ed722422..d579d0e61a80 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -110,9 +110,6 @@ namespace dbtools
static ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
static ::com::sun::star::util::DateTime toDateTime(const OUString& _sSQLDate);
-
- // TODO: consider removing getMsFromTime
- static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time& rVal);
static sal_Int64 getNsFromTime(const ::com::sun::star::util::Time& rVal);
static sal_Int32 toDays(const ::com::sun::star::util::Date& _rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
@@ -121,9 +118,6 @@ namespace dbtools
static double toDouble(const ::com::sun::star::util::Time& rVal);
static double toDouble(const ::com::sun::star::util::DateTime& rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
- static sal_Int32 toINT32(const ::com::sun::star::util::Date& rVal);
- static sal_Int64 toINT64(const ::com::sun::star::util::Time& rVal);
-
static ::com::sun::star::util::Date toDate(sal_Int32 _nVal);
static ::com::sun::star::util::Time toTime(sal_Int64 _nVal);
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index 20fa4ae8f15b..e37d71d1741a 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -45,8 +45,6 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-
- const com::sun::star::geometry::AffineMatrix2D& GetAffineMatrix2D() const;
};
#endif // _SVX_AFFINEMATRIXITEM_HXX
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index d71f1587d18c..b051e9a7e7a0 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -658,9 +658,7 @@ private:
OUString aFilename;
sal_uInt16 nLockCounter;
bool bIsOpen;
-#ifdef UNX
- sal_uInt32 GetFileHandle() const;
-#endif
+
// Forbidden and not implemented.
SvFileStream (const SvFileStream&);
SvFileStream & operator= (const SvFileStream&);
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 54bb0a66726b..78a1644cc51d 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -273,9 +273,7 @@ public:
void SetItemImage( sal_uInt16 nItemId, const Image& rImage );
Image GetItemImage( sal_uInt16 nItemId ) const;
void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 );
- long GetItemImageAngle( sal_uInt16 nItemId ) const;
void SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror );
- sal_Bool GetItemImageMirrorMode( sal_uInt16 ) const;
void SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand );
OUString GetItemCommand( sal_uInt16 nItemId ) const;
@@ -304,10 +302,7 @@ public:
void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; }
const Link& GetSelectHdl() const { return aSelectHdl; }
- void SetLogo( const MenuLogo& rLogo );
- void SetLogo();
sal_Bool HasLogo() const { return pLogo ? sal_True : sal_False; }
- MenuLogo GetLogo() const;
void AddEventListener( const Link& rEventListener );
void RemoveEventListener( const Link& rEventListener );
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index a1a53fd86214..e8a2305bb13d 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -136,13 +136,10 @@ public:
void HideItem( sal_uInt16 nItemId );
sal_Bool IsItemVisible( sal_uInt16 nItemId ) const;
- void ShowItems();
- void HideItems();
sal_Bool AreItemsVisible() const { return mbVisibleItems; }
void RedrawItem( sal_uInt16 nItemId );
- void CopyItems( const StatusBar& rStatusBar );
void Clear();
sal_uInt16 GetItemCount() const;
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index f30362f3e493..ff498af719d2 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -158,7 +158,6 @@ struct FilterBaseImpl
void setDocumentModel( const Reference< XComponent >& rxComponent ) throw( IllegalArgumentException );
void initializeFilter();
- void finalizeFilter();
};
// ----------------------------------------------------------------------------
@@ -196,24 +195,6 @@ void FilterBaseImpl::initializeFilter()
}
}
-void FilterBaseImpl::finalizeFilter()
-{
- try
- {
- // writing back the FilterData to the MediaDescriptor
- maMediaDesc["FilterData"] = makeAny(maFilterData.getAsConstPropertyValueList());
- // write the descriptor back to the document model (adds the passwords)
- mxModel->attachResource( maFileUrl, maMediaDesc.getAsConstPropertyValueList() );
- // unlock the model controllers
- mxModel->unlockControllers();
- }
- catch( Exception& )
- {
- }
-}
-
-// ============================================================================
-
FilterBase::FilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
mxImpl( new FilterBaseImpl( rxContext ) )
{
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx
index e826bd2d9954..192f35934c19 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -181,7 +181,6 @@ private:
const DataTableModel& rModel ) const;
/** Writes all cell formatting attributes to the passed cell range list. (depreciates writeXfIdRangeProperties) */
- void writeXfIdRangeListProperties( sal_Int32 nXfId, sal_Int32 nNumFmtId, const ApiCellRangeList& rRanges ) const;
void applyCellMerging( const ::com::sun::star::table::CellRangeAddress& rRange );
void addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const ::com::sun::star::table::CellRangeAddress& rAddress, bool bProcessRowRange = false );
private:
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index cbedfb3a2464..0f5ce548c7d4 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -985,8 +985,6 @@ public:
/** Writes the cell formatting attributes of the specified XF to the passed property set. */
void writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const;
- /** Writes the cell formatting attributes of the specified style XF to the passed property set. */
- void writeStyleXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const;
bool hasBorder( sal_Int32 nBorderId ) const;
private:
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 99e80547a9c9..7f9c8e44336a 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -696,21 +696,6 @@ void SheetDataBuffer::setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtI
}
}
-void SheetDataBuffer::writeXfIdRangeListProperties( sal_Int32 nXfId, sal_Int32 nNumFmtId, const ApiCellRangeList& rRanges ) const
-{
- StylesBuffer& rStyles = getStyles();
- ScRangeList aList;
- for ( ApiCellRangeList::const_iterator it = rRanges.begin(), it_end = rRanges.end(); it!=it_end; ++it )
- {
- ScRange* pRange = new ScRange();
- ScUnoConversion::FillScRange( *pRange, *it );
- aList.push_back( pRange );
- }
- ScMarkData aMark;
- aMark.MarkFromRangeList( aList, false );
- rStyles.writeCellXfToMarkData( aMark, nXfId, nNumFmtId );
-}
-
void lcl_SetBorderLine( ScDocument& rDoc, ScRange& rRange, SCTAB nScTab, sal_uInt16 nLine )
{
SCCOL nFromScCol = (nLine == BOX_LINE_RIGHT) ? rRange.aEnd.Col() : rRange.aStart.Col();
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index e34080eca1f9..d3f52dc11903 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -3374,14 +3374,6 @@ bool StylesBuffer::hasBorder( sal_Int32 nBorderId ) const
return pBorder && pBorder->hasBorder();
}
-void StylesBuffer::writeStyleXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const
-{
- if( Xf* pXf = maStyleXfs.get( nXfId ).get() )
- pXf->writeToPropertySet( rPropSet );
-}
-
-// ============================================================================
-
} // namespace xls
} // namespace oox
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 788e0ce0c5a1..a50da0bcbcbb 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -869,33 +869,6 @@ void FrameworkHelper::RunOnResourceActivation(
}
}
-
-
-
-void FrameworkHelper::RunOnResourceDeactivation(
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
- const Callback& rCallback,
- const bool bRunOnDeactivationEnd)
-{
- if (mxConfigurationController.is()
- && ! mxConfigurationController->getResource(rxResourceId).is())
- {
- rCallback(false);
- }
- else
- {
- RunOnEvent(
- bRunOnDeactivationEnd
- ? msResourceDeactivationEndEvent
- : msResourceDeactivationEvent,
- FrameworkHelperResourceIdFilter(rxResourceId),
- rCallback);
- }
-}
-
-
-
-
/** A callback that sets a flag to a specified value when the callback is
called.
*/
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 9964bb6fd32c..c5796adb717b 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -279,27 +279,6 @@ public:
const cssu::Reference<cssdf::XResourceId>& rxResourceId,
const Callback& rCallback);
- /** Run the given callback when the specified resource has been
- deactivated. When the resource is not active already when
- this method is called then rCallback is called before this
- method returns.
- @param rxResourceId
- Wait for the deactivation of this resource before calling
- rCallback.
- @param rCallback
- The callback to be called when the resource is
- deactivated.
- @param bRunOnDeactivationEnd
- The callback is run either when the deactivation starts
- and the callback can still access the resource or when the
- deactivatio is complete and the resource is no longer available.
-
- */
- void RunOnResourceDeactivation(
- const cssu::Reference<cssdf::XResourceId>& rxResourceId,
- const Callback& rCallback,
- const bool bRunOnDeactivationEnd);
-
/** Normally the requested changes of the configuration are executed
asynchronously. However, there is at least one situation (searching
with the Outliner) where the surrounding code does not cope with
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index c7a94993e0a8..7c20c0001aeb 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -296,11 +296,6 @@ bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
return false;
}
-const com::sun::star::geometry::AffineMatrix2D& AffineMatrixItem::GetAffineMatrix2D() const
-{
- return maMatrix;
-}
-
// class XLineCapItem -
TYPEINIT1_AUTOFACTORY(XLineCapItem, SfxEnumItem);
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 61e7fa87a0d9..24eaceecd37d 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -331,15 +331,6 @@ SvFileStream::~SvFileStream()
delete pInstanceData;
}
-sal_uInt32 SvFileStream::GetFileHandle() const
-{
- sal_IntPtr handle;
- if (osl_getFileOSHandle(pInstanceData->rHandle, &handle) == osl_File_E_None)
- return (sal_uInt32) handle;
- else
- return (sal_uInt32) -1;
-}
-
sal_uInt16 SvFileStream::IsA() const
{
return ID_FILESTREAM;
diff --git a/unusedcode.easy b/unusedcode.easy
index 3845da1d4353..6a5859226a30 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -3,7 +3,6 @@
(anonymous namespace)::StringTokenizer::StringTokenizer(rtl::OUString const&, unsigned short)
(anonymous namespace)::StringTokenizer::getNextToken()
(anonymous namespace)::VBATest::testMiscOLEStuff()
-AffineMatrixItem::GetAffineMatrix2D() const
BackingWindow::LinkStubWindowEventListener(void*, void*)
Bcp47CountryEntry::getLocale() const
BitmapReadAccess::GetColorWithFallback(long, long, BitmapColor const&) const
@@ -15,11 +14,6 @@ FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&
ImplRegionBand::IsInside(long, long)
ImplRegionBand::IsOver(long, long)
LanguageTag::reset(_rtl_Locale const&)
-Menu::GetItemImageAngle(unsigned short) const
-Menu::GetItemImageMirrorMode(unsigned short) const
-Menu::GetLogo() const
-Menu::SetLogo()
-Menu::SetLogo(MenuLogo const&)
OWriteAccelatorDocumentHandler::OWriteAccelatorDocumentHandler(std::__debug::list<SvtAcceleratorConfigItem, std::allocator<SvtAcceleratorConfigItem> > const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>)
OWriteAccelatorDocumentHandler::WriteAcceleratorDocument()
OutputDevice::GetCanvas() const
@@ -76,10 +70,6 @@ SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno::Any, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, com::sun::star::uno::Any> > > const&)
SfxTemplatePanelControl::SetParagraphFamily()
SmFontPickList::Contains(Font const&) const
-StatusBar::CopyItems(StatusBar const&)
-StatusBar::HideItems()
-StatusBar::ShowItems()
-SvFileStream::GetFileHandle() const
SvdProgressInfo::ReportError()
SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
SvpSalInstance::PostedEventsInQueue()
@@ -143,9 +133,6 @@ connectivity::file::OStatement_Base::reset()
connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
-dbtools::DBTypeConversion::getMsFromTime(com::sun::star::util::Time const&)
-dbtools::DBTypeConversion::toINT32(com::sun::star::util::Date const&)
-dbtools::DBTypeConversion::toINT64(com::sun::star::util::Time const&)
drawinglayer::attribute::FontAttribute::isDefault() const
drawinglayer::attribute::MaterialAttribute3D::isDefault() const
drawinglayer::attribute::Sdr3DLightAttribute::isDefault() const
@@ -161,11 +148,8 @@ framework::MenuBarManager::getComponentContext()
framework::MenuManager::getContext()
jfw_plugin::VendorBase::createInstance()
oox::core::Decrypt::aes128cbc(std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&)
-oox::core::FilterBaseImpl::finalizeFilter()
oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
-oox::xls::SheetDataBuffer::writeXfIdRangeListProperties(int, int, oox::xls::ApiCellRangeList const&) const
-oox::xls::StylesBuffer::writeStyleXfToPropertySet(oox::PropertySet&, int) const
oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
@@ -181,7 +165,6 @@ sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
sd::framework::FrameworkHelper::GetPaneWindow(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&)
sd::framework::FrameworkHelper::GetResource(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&)
sd::framework::FrameworkHelper::RequestResourceDeactivation(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&)
-sd::framework::FrameworkHelper::RunOnResourceDeactivation(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, boost::function<void (bool)> const&, bool)
sd::framework::Pane::SetWindow(Window*)
sd::sidebar::CurrentMasterPagesSelector::NotifyHint(SfxBroadcaster&, SfxHint const&)
sd::sidebar::LayoutMenu::GetMinimumWidth()
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 848fa4c97d65..69625d613be2 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1958,26 +1958,6 @@ Image Menu::GetItemImage( sal_uInt16 nItemId ) const
return Image();
}
-long Menu::GetItemImageAngle( sal_uInt16 nItemId ) const
-{
- MenuItemData* pData = pItemList->GetData( nItemId );
-
- if ( pData )
- return pData->nItemImageAngle;
- else
- return 0;
-}
-
-sal_Bool Menu::GetItemImageMirrorMode( sal_uInt16 nItemId ) const
-{
- MenuItemData* pData = pItemList->GetData( nItemId );
-
- if ( pData )
- return pData->bMirrorMode;
- else
- return sal_False;
-}
-
void Menu::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand )
{
size_t nPos;
@@ -3093,26 +3073,6 @@ sal_Bool Menu::HasValidEntries( sal_Bool bCheckPopups )
return bValidEntries;
}
-void Menu::SetLogo( const MenuLogo& rLogo )
-{
- delete pLogo;
- pLogo = new MenuLogo( rLogo );
-}
-
-void Menu::SetLogo()
-{
- delete pLogo;
- pLogo = NULL;
-}
-
-MenuLogo Menu::GetLogo() const
-{
- MenuLogo aLogo;
- if ( pLogo )
- aLogo = *pLogo;
- return aLogo;
-}
-
void Menu::ImplKillLayoutData() const
{
delete mpLayoutData, mpLayoutData = NULL;
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 5b263c28d99f..dd35e90d29f7 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1052,56 +1052,6 @@ sal_Bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const
return sal_False;
}
-// -----------------------------------------------------------------------
-
-void StatusBar::ShowItems()
-{
- if ( !mbVisibleItems )
- {
- mbVisibleItems = sal_True;
- if ( !mbProgressMode )
- Invalidate();
-
- ImplCallEventListeners( VCLEVENT_STATUSBAR_SHOWALLITEMS );
- }
-}
-
-// -----------------------------------------------------------------------
-
-void StatusBar::HideItems()
-{
- if ( mbVisibleItems )
- {
- mbVisibleItems = sal_False;
- if ( !mbProgressMode )
- Invalidate();
-
- ImplCallEventListeners( VCLEVENT_STATUSBAR_HIDEALLITEMS );
- }
-}
-
-// -----------------------------------------------------------------------
-
-void StatusBar::CopyItems( const StatusBar& rStatusBar )
-{
- // Alle Items entfernen
- for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) {
- delete (*mpItemList)[ i ];
- }
- mpItemList->clear();
-
- // Items kopieren
- for ( size_t i = 0, n = rStatusBar.mpItemList->size(); i < n; ++i ) {
- mpItemList->push_back( new ImplStatusItem( *(*rStatusBar.mpItemList)[ i ] ) );
- }
-
- mbFormat = sal_True;
- if ( ImplIsItemUpdate() )
- Invalidate();
-}
-
-// -----------------------------------------------------------------------
-
void StatusBar::Clear()
{
// Alle Item loeschen