[Libreoffice-commits] .: editeng/inc editeng/source filter/inc filter/source linguistic/source svtools/inc svtools/source sw/source unusedcode.easy vcl/inc vcl/source
Michael Meeks
michael at kemper.freedesktop.org
Mon Feb 13 08:11:29 PST 2012
editeng/inc/editeng/editview.hxx | 3 ---
editeng/source/editeng/editdoc.cxx | 8 --------
editeng/source/editeng/editdoc.hxx | 1 -
editeng/source/editeng/editview.cxx | 19 -------------------
filter/inc/filter/msfilter/msdffimp.hxx | 1 -
filter/source/msfilter/msdffimp.cxx | 10 ----------
linguistic/source/lngsvcmgr.cxx | 15 ---------------
linguistic/source/lngsvcmgr.hxx | 3 ---
svtools/inc/svtools/ctrlbox.hxx | 1 -
svtools/inc/svtools/filectrl.hxx | 1 -
svtools/source/control/ctrlbox.cxx | 22 ----------------------
svtools/source/control/filectrl.cxx | 9 ---------
sw/source/filter/ww8/ww8par.hxx | 1 -
sw/source/filter/ww8/ww8par5.cxx | 5 -----
unusedcode.easy | 10 ----------
vcl/inc/vcl/metric.hxx | 1 -
vcl/source/gdi/metric.cxx | 7 -------
17 files changed, 117 deletions(-)
New commits:
commit abc235e73e70ffba83240759a8500a08becc9d71
Author: Elton Chung <elton at layerjet.com>
Date: Mon Feb 13 16:08:52 2012 +0000
Remove unused code
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index ef02fa9..7f3dd4c 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -103,7 +103,6 @@ public:
void ShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool bForceVisCursor = sal_True );
void HideCursor();
- EESelectionMode GetSelectionMode() const;
void SetSelectionMode( EESelectionMode eMode );
void SetReadOnly( sal_Bool bReadOnly );
@@ -133,10 +132,8 @@ public:
void SetVisArea( const Rectangle& rRec );
const Rectangle& GetVisArea() const;
- void SetPointer( const Pointer& rPointer );
const Pointer& GetPointer() const;
- void SetCursor( const Cursor& rCursor );
Cursor* GetCursor() const;
void InsertText( const String& rNew, sal_Bool bSelect = sal_False );
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 0161eaa..50f96a2 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1169,14 +1169,6 @@ ItemList::ItemList() : CurrentItem( 0 )
{
}
-const SfxPoolItem* ItemList::FindAttrib( sal_uInt16 nWhich )
-{
- for ( size_t i = 0, n = aItemPool.size(); i < n; ++i )
- if ( aItemPool[ i ]->Which() == nWhich )
- return aItemPool[ i ];
- return NULL;
-}
-
const SfxPoolItem* ItemList::First()
{
CurrentItem = 0;
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 2b35c3e..32bfb24 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -187,7 +187,6 @@ private:
public:
ItemList();
- const SfxPoolItem* FindAttrib( sal_uInt16 nWhich );
const SfxPoolItem* First();
const SfxPoolItem* Next();
size_t Count() { return aItemPool.size(); };
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index ee9f749..bff5f04 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -362,25 +362,12 @@ const Rectangle& EditView::GetOutputArea() const
return pImpEditView->GetOutputArea();
}
-void EditView::SetPointer( const Pointer& rPointer )
-{
- DBG_CHKTHIS( EditView, 0 );
- pImpEditView->SetPointer( rPointer );
-}
-
const Pointer& EditView::GetPointer() const
{
DBG_CHKTHIS( EditView, 0 );
return pImpEditView->GetPointer();
}
-void EditView::SetCursor( const Cursor& rCursor )
-{
- DBG_CHKTHIS( EditView, 0 );
- delete pImpEditView->pCursor;
- pImpEditView->pCursor = new Cursor( rCursor );
-}
-
Cursor* EditView::GetCursor() const
{
DBG_CHKTHIS( EditView, 0 );
@@ -629,12 +616,6 @@ Point EditView::GetWindowPosTopLeft( sal_uInt16 nParagraph )
return pImpEditView->GetWindowPos( aDocPos );
}
-EESelectionMode EditView::GetSelectionMode() const
-{
- DBG_CHKTHIS( EditView, 0 );
- return pImpEditView->GetSelectionMode();
-}
-
void EditView::SetSelectionMode( EESelectionMode eMode )
{
DBG_CHKTHIS( EditView, 0 );
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 88a009e..e2d6ced 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -129,7 +129,6 @@ public:
bool GetPropertyBool( sal_uInt32 nId, bool bDefault = false ) const;
/** Returns a string property. */
::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const;
- void SetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) const;
sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const;
void Merge( DffPropSet& rMasterPropSet ) const;
void InitializePropSet() const;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index aee3bd9..da90330 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -518,16 +518,6 @@ bool DffPropSet::GetPropertyBool( sal_uInt32 nId, bool bDefault ) const
return aBuffer.makeStringAndClear();
}
-void DffPropSet::SetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) const
-{
- if ( !mpFlags[ nId ].bSet )
- {
- ( (DffPropSet*) this )->Insert( nId, (void*)(sal_uIntPtr)nValue );
- ( (DffPropSet*) this )->mpFlags[ nId ].bSet = sal_True;
- }
- ( (DffPropSet*) this )->mpContents[ nId ] = nValue;
-};
-
sal_Bool DffPropSet::SeekToContent( sal_uInt32 nRecType, SvStream& rStrm ) const
{
nRecType &= 0x3ff;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 00acac2..7973611 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1762,21 +1762,6 @@ sal_Bool LngSvcMgr::AddLngSvcEvtBroadcaster(
}
-sal_Bool LngSvcMgr::RemoveLngSvcEvtBroadcaster(
- const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
-{
- sal_Bool bRes = sal_False;
- if (rxBroadcaster.is())
- {
- DBG_ASSERT( pListenerHelper, "pListenerHelper non existent" );
- if (!pListenerHelper)
- GetListenerHelper_Impl();
- bRes = pListenerHelper->RemoveLngSvcEvtBroadcaster( rxBroadcaster );
- }
- return bRes;
-}
-
-
OUString SAL_CALL
LngSvcMgr::getImplementationName()
throw(uno::RuntimeException)
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 635a853..0e27a70 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -174,9 +174,6 @@ public:
sal_Bool AddLngSvcEvtBroadcaster(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
- sal_Bool RemoveLngSvcEvtBroadcaster(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
};
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 3828cf7..7143d3c 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -560,7 +560,6 @@ public:
virtual void SetValue( sal_Int64 nNewValue );
virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const;
virtual sal_Int64 GetValue() const;
- void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit );
void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); }
private:
diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index 7a0f546..9e5b3dc 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
@@ -97,7 +97,6 @@ public:
//------
//manipulate the Button-Text:
XubString GetButtonText() const { return maButtonText; }
- void SetButtonText( const XubString& rStr );
//------
//use this to manipulate the dialog bevore executing it:
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 00cd75f..deb207b 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -2005,26 +2005,4 @@ sal_Int64 FontSizeBox::GetValue() const
return GetValue( FUNIT_NONE );
}
-// -----------------------------------------------------------------------
-
-void FontSizeBox::SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit )
-{
- if ( !bRelative )
- {
- sal_Int64 nTempValue = MetricField::ConvertValue( nNewValue, GetBaseValue(), GetDecimalDigits(), eInUnit, GetUnit() );
- FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() );
- // conversion loses precision
- // however font sizes should never have a problem with that
- String aName = aFontSizeNames.Size2Name( static_cast<long>(nTempValue) );
- if ( aName.Len() && (GetEntryPos( aName ) != LISTBOX_ENTRY_NOTFOUND) )
- {
- mnLastValue = nTempValue;
- SetText( aName );
- return;
- }
- }
-
- MetricBox::SetUserValue( nNewValue, eInUnit );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 9372cd8..d3ec177 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -208,13 +208,4 @@ void FileControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize
GetEdit().SetStyle( nOldEditStyle );
}
-// -----------------------------------------------------------------------
-
-void FileControl::SetButtonText( const XubString& rStr )
-{
- mnInternalFlags &= ~FILECTRL_ORIGINALBUTTONTEXT;
- maButtonText = rStr;
- Resize();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 98bd410..af9e089 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -507,7 +507,6 @@ class FieldEntry
xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); };
::rtl::OUString GetBookmarkName();
- ::rtl::OUString GetBookmarkType();
::rtl::OUString GetBookmarkCode();
void SetBookmarkName(::rtl::OUString bookmarkName);
void SetBookmarkType(::rtl::OUString bookmarkType);
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e6b1de4..b5fcd56 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -855,11 +855,6 @@ FieldEntry &FieldEntry::operator=(const FieldEntry &rOther) throw()
return msBookmarkName;
}
-::rtl::OUString FieldEntry::GetBookmarkType()
-{
- return msMarkType;
-}
-
::rtl::OUString FieldEntry::GetBookmarkCode()
{
return msMarkCode;
diff --git a/unusedcode.easy b/unusedcode.easy
index 7252328..4661170 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -22,16 +22,10 @@ CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsign
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*)
-DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
Dialog::Dialog(Window*, ResId const&)
DirEntry::SetBase(String const&, char)
-EditView::GetSelectionMode() const
-EditView::SetCursor(Cursor const&)
-EditView::SetPointer(Pointer const&)
Export::GetNativeFile(rtl::OString const&)
Export::getCurrentDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)
-FieldEntry::GetBookmarkType()
-FileControl::SetButtonText(String const&)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
@@ -41,9 +35,7 @@ FmEntryDataArray::Remove(FmEntryData* const&, unsigned short)
FmFieldWinMgr::GetChildWindowId()
FmFormObj::getType() const
FmPropBrwMgr::GetChildWindowId()
-FontCharMap::GetLastChar() const
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
-FontSizeBox::SetUserValue(long, FieldUnit)
FontStyleBox::FontStyleBox(Window*, long)
FormattedField::SetValidateText(String const&, String const*)
FuncData::FuncData(rtl::OUString const&)
@@ -67,9 +59,7 @@ InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
-ItemList::FindAttrib(unsigned short)
KeyboardSettings::CopyData()
-LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&)
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx
index a23a95b..e140b3f 100644
--- a/vcl/inc/vcl/metric.hxx
+++ b/vcl/inc/vcl/metric.hxx
@@ -104,7 +104,6 @@ public:
int GetCharCount() const;
sal_uInt32 GetFirstChar() const;
- sal_uInt32 GetLastChar() const;
sal_uInt32 GetNextChar( sal_uInt32 ) const;
sal_uInt32 GetPrevChar( sal_uInt32 ) const;
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index d0ad6e9..a523b41 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -859,13 +859,6 @@ sal_uInt32 FontCharMap::GetFirstChar() const
// -----------------------------------------------------------------------
-sal_uInt32 FontCharMap::GetLastChar() const
-{
- return mpImpl->GetLastChar();
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt32 FontCharMap::GetNextChar( sal_uInt32 cChar ) const
{
return mpImpl->GetNextChar( cChar );
More information about the Libreoffice-commits
mailing list