[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
svx/inc/svx/srchdlg.hxx |4
svx/source/dialog/srchdlg.cxx | 42 --
unusedcode.easy |3 ---
3 files changed, 49 deletions(-)
New commits:
commit 57c8929c6bf037a767e7016d28b7656cd8fddfb7
Author: Santiago Martinez smvar...@gmail.com
Date: Thu Feb 16 21:34:44 2012 +0100
Remove unused code in SvxSearchDialog
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index e5d2844..852c681 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -127,7 +127,6 @@ friend class SvxSearchDialogWrapper;
friend class SvxJSearchOptionsDialog;
public:
-SvxSearchDialog( Window* pParent, SfxBindings rBind );
SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings
rBind );
~SvxSearchDialog();
@@ -136,9 +135,6 @@ public:
// Window
virtual voidActivate();
-voidGetSearchItems( SfxItemSet rSet );
-voidGetReplaceItems( SfxItemSet rSet );
-
const SearchAttrItemList* GetSearchItemList() const
{ return pSearchList; }
const SearchAttrItemList* GetReplaceItemList() const
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 305436b..d090ff6 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -336,18 +336,6 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos,
sal_uInt16 nLen )
// class SvxSearchDialog -
-SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxBindings rBind ) :
-
-SfxModelessDialog( rBind, NULL, pParent, SVX_RES( RID_SVXDLG_SEARCH ) ),
-
-INI_LIST()
-
-{
-Construct_Impl();
-}
-
-// ---
-
SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin,
SfxBindings rBind ) :
SfxModelessDialog( rBind, pChildWin, pParent, SVX_RES( RID_SVXDLG_SEARCH
) ),
@@ -2241,36 +2229,6 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *,
pTimer )
// ---
-void SvxSearchDialog::GetSearchItems( SfxItemSet rSet )
-{
-xub_StrLen nLen;
-
-if ( !pImpl-bMultiLineEdit )
-nLen = aSearchAttrText.GetText().Len();
-else
-nLen = pImpl-aSearchFormats.GetText().Len();
-
-if ( nLen pSearchList )
-pSearchList-Get( rSet );
-}
-
-// ---
-
-void SvxSearchDialog::GetReplaceItems( SfxItemSet rSet )
-{
-xub_StrLen nLen;
-
-if ( !pImpl-bMultiLineEdit )
-nLen = aReplaceAttrText.GetText().Len();
-else
-nLen = pImpl-aReplaceFormats.GetText().Len();
-
-if ( nLen pReplaceList )
-pReplaceList-Get( rSet );
-}
-
-// ---
-
String SvxSearchDialog::BuildAttrText_Impl( String rStr,
sal_Bool bSrchFlag ) const
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 43a51a8..d1331fe 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -337,9 +337,6 @@ SvxRelativeField::SvxRelativeField(Window*, long)
SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
SvxRubyChildWindow::GetChildWindowId()
SvxRuler::GetDefTabDist() const
-SvxSearchDialog::GetReplaceItems(SfxItemSet)
-SvxSearchDialog::GetSearchItems(SfxItemSet)
-SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings)
SvxSelectionModeControl::GetDefItemWidth(StatusBar const)
SvxShapeText::SvxShapeText()
SvxTabStopArr::Insert(SvxTabStop const, unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
svx/inc/svx/xtable.hxx|1 -
svx/source/xoutdev/xtable.cxx | 15 ---
unusedcode.easy |1 -
3 files changed, 17 deletions(-)
New commits:
commit 8af1b357b1c87c9f3eea7660881b2ffacc133f58
Author: Santiago Martinez smvar...@gmail.com
Date: Mon Feb 13 21:52:07 2012 +0100
Remove unused code.
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index a5f2197..eaca035 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -238,7 +238,6 @@ protected:
XPropertyList( XPropertyListType t, const String
rPath,
XOutdevItemPool* pXPool = NULL );
-voidClear();
public:
virtual ~XPropertyList();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 1eedd7a..9d18cc0 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -91,21 +91,6 @@ XPropertyList::~XPropertyList()
SfxItemPool::Free(pXPool);
}
-void XPropertyList::Clear()
-{
-for( size_t i = 0, n = aList.size(); i n; ++i ) {
-delete aList[ i ];
-}
-aList.clear();
-if( pBmpList )
-{
-for ( size_t i = 0, n = pBmpList-size(); i n; ++i ) {
-delete (*pBmpList)[ i ];
-}
-pBmpList-clear();
-}
-}
-
long XPropertyList::Count() const
{
if( bListDirty )
diff --git a/unusedcode.easy b/unusedcode.easy
index 5142e88..95f65eb 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -622,7 +622,6 @@ XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl
const*) const
XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
XMLVisAreaContext::XMLVisAreaContext(SvXMLImport, unsigned short,
rtl::OUString const,
com::sun::star::uno::Referencecom::sun::star::xml::sax::XAttributeList
const, Rectangle, short)
-XPropertyList::Clear()
XWindowItem::XWindowItem(unsigned short, Window*)
XWindowItem::XWindowItem(unsigned short,
com::sun::star::uno::Referencecom::sun::star::awt::XWindow)
XclExpFontBuffer::Insert(ScPatternAttr const, short, XclExpColorType, bool)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
svx/inc/svx/svdotable.hxx| 12
svx/source/table/svdotable.cxx | 89 ---
svx/source/table/tablecontroller.cxx | 28 ---
svx/source/table/tablecontroller.hxx |3 -
unusedcode.easy |9 ---
5 files changed, 1 insertion(+), 140 deletions(-)
New commits:
commit 00a81960c1a1fdffd80e1bf84268ed2567ef6f7d
Author: Marc-André Laverdière-Papineau marc-an...@atc.tcs.com
Date: Fri Feb 10 11:49:22 2012 -0500
Removed some dead code
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index 1493e88..543b476 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -156,19 +156,12 @@ public:
void setActiveCell( const sdr::table::CellPos rPos );
void getActiveCellPos( sdr::table::CellPos rPos ) const;
-
sal_Int32 getRowCount() const;
sal_Int32 getColumnCount() const;
-
void getCellBounds( const sdr::table::CellPos rPos, ::Rectangle
rCellRect );
const SfxItemSet GetActiveCellItemSet() const;
- void InsertRows( sal_Int32 nIndex, sal_Int32 nCount = 1 );
- void InsertColumns( sal_Int32 nIndex, sal_Int32 nCount = 1 );
- void DeleteRows( sal_Int32 nIndex, sal_Int32 nCount = 1 );
- void DeleteColumns( sal_Int32 nIndex, sal_Int32 nCount = 1 );
-
void setTableStyle( const ::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess xAutoFormatStyle );
const ::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess getTableStyle() const;
@@ -196,10 +189,6 @@ public:
/** returns true only if we are in edit mode and the user actually changed
anything */
virtual bool IsRealyEdited() const;
-void FitFrameToTextSize();
-
-SdrOutliner* GetCellTextEditOutliner( const sdr::table::CellPos rPos )
const;
-
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt.
virtual void TakeTextRect( const sdr::table::CellPos rPos, SdrOutliner
rOutliner, ::Rectangle rTextRect, bool bNoEditText = false, ::Rectangle*
pAnchorRect=NULL, bool bLineWidth = true ) const;
@@ -286,6 +275,7 @@ public:
virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus );
+
//
// transformation interface for StarOfficeAPI. This implements support for
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index f9b8269..3f7535f 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -244,7 +244,6 @@ public:
void DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset );
-const SfxPoolItem* GetCellItem( const CellPos rPos, sal_uInt16 nWhich )
const;
// void GetBorderLines( const CellPos rPos, const SvxBorderLine** ppLeft,
const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const
SvxBorderLine** ppBottom ) const;
void operator=( const SdrTableObjImpl rSource );
@@ -697,17 +696,6 @@ void SdrTableObjImpl::UpdateCells( Rectangle rArea )
}
//
-
-
-const SfxPoolItem* SdrTableObjImpl::GetCellItem( const CellPos rPos,
sal_uInt16 nWhich ) const
-{
-CellRef xCell( getCell( rPos ) );
-if( xCell.is() )
-return xCell-GetItemSet().GetItem( nWhich );
-else
-return 0;
-}
-
-//
-
// BaseProperties section
//
-
@@ -1160,66 +1148,6 @@ const SfxItemSet SdrTableObj::GetActiveCellItemSet()
const
//
-void SdrTableObj::InsertRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
-{
-if( mpImpl-mxTable.is() ) try
-{
-Reference XTableRows xRows( mpImpl-mxTable-getRows(),
UNO_QUERY_THROW );
-xRows-insertByIndex( nIndex, nCount );
-}
-catch( Exception )
-{
-OSL_FAIL(SdrTableObj::InsertRows(), exception caught!);
-}
-}
-
-//
-
-void SdrTableObj::InsertColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
-{
-if( mpImpl-mxTable.is() ) try
-{
-Reference XTableColumns xColumns( mpImpl-mxTable-getColumns(),
UNO_QUERY_THROW );
-xColumns-insertByIndex( nIndex, nCount );
-}
-catch( Exception )
-{
-OSL_FAIL(SdrTableObj::InsertColumns(), exception caught!);
-}
-}
-
-//
-
-void SdrTableObj::DeleteRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
-{
-if( mpImpl-mxTable.is() ) try
-{
-Reference XTableRows xRows( mpImpl-mxTable-getRows(),
UNO_QUERY_THROW );
-xRows-removeByIndex(
[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
svx/inc/svx/svdpntv.hxx |8 --
svx/source/svdraw/svdpntv.cxx | 126 +-
unusedcode.easy |1
3 files changed, 5 insertions(+), 130 deletions(-)
New commits:
commit 18c1d56353838a393de5d75da65cc68e17d78492
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 10:10:54 2011 +
a ImplEncirclementOverlay is never constructed
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index c099d83..927f96c 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -133,9 +133,6 @@ class SVX_DLLPUBLIC SdrPaintView : public SfxListener,
public SfxRepeatTarget, p
friend classSdrGrafObj;
protected:
-// #114409#-2 Migrate Encirclement
-class ImplEncirclementOverlay* mpEncirclementOverlay;
-
SdrModel* pMod;
#ifdef DBG_UTIL
SdrItemBrowser* pItemBrowser;
@@ -293,8 +290,6 @@ public:
TYPEINFO();
virtual void ClearPageView();
-// virtual void ClearAll();
-// virtual void Clear(); // PageViews loeschen, Markierungen weg, ...
SdrModel* GetModel() const { return pMod; }
virtual sal_Bool IsAction() const;
@@ -487,9 +482,6 @@ public:
// werden soll. Wird NULL uebergeben, wird es in allen an der View
// angemeldeten OutputDevices gleichzeitig dargestellt.
void MovEncirclement(const Point rPnt);
-Rectangle EndEncirclement(sal_Bool bNoJustify = sal_False);
-void BrkEncirclement();
-sal_Bool IsEncirclement() const { return (0L != mpEncirclementOverlay); }
// use this mode as mode to draw all internal GraphicManager objects with
sal_uIntPtr GetGraphicManagerDrawMode() const { return
nGraphicManagerDrawMode; }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index dd6f700..4e66939 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -84,63 +84,6 @@ using namespace ::rtl;
using namespace ::com::sun::star;
-class ImplEncirclementOverlay
-{
-// The OverlayObjects
-::sdr::overlay::OverlayObjectList maObjects;
-
-// The remembered second position in logical coodinates
-basegfx::B2DPoint maSecondPosition;
-
-public:
-ImplEncirclementOverlay(const SdrPaintView rView, const
basegfx::B2DPoint rStartPos);
-~ImplEncirclementOverlay();
-
-void SetSecondPosition(const basegfx::B2DPoint rNewPosition);
-};
-
-ImplEncirclementOverlay::ImplEncirclementOverlay(const SdrPaintView rView,
const basegfx::B2DPoint rStartPos)
-: maSecondPosition(rStartPos)
-{
-for(sal_uInt32 a(0L); a rView.PaintWindowCount(); a++)
-{
-SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
-::sdr::overlay::OverlayManager* pTargetOverlay =
pCandidate-GetOverlayManager();
-
-if(pTargetOverlay)
-{
-::sdr::overlay::OverlayRollingRectangleStriped* aNew = new
::sdr::overlay::OverlayRollingRectangleStriped(
-rStartPos, rStartPos, false);
-pTargetOverlay-add(*aNew);
-maObjects.append(*aNew);
-}
-}
-}
-
-ImplEncirclementOverlay::~ImplEncirclementOverlay()
-{
-// The OverlayObjects are cleared using the destructor of
OverlayObjectList.
-// That destructor calls clear() at the list which removes all objects
from the
-// OverlayManager and deletes them.
-}
-
-void ImplEncirclementOverlay::SetSecondPosition(const basegfx::B2DPoint
rNewPosition)
-{
-if(rNewPosition != maSecondPosition)
-{
-// apply to OverlayObjects
-for(sal_uInt32 a(0L); a maObjects.count(); a++)
-{
-::sdr::overlay::OverlayRollingRectangleStriped rCandidate =
(::sdr::overlay::OverlayRollingRectangleStriped)maObjects.getOverlayObject(a);
-rCandidate.setSecondPosition(rNewPosition);
-}
-
-// remember new position
-maSecondPosition = rNewPosition;
-}
-}
-
-
// interface to SdrPaintWindow
SdrPaintWindow* SdrPaintView::FindPaintWindow(const OutputDevice rOut) const
@@ -260,12 +203,10 @@ void SdrPaintView::ImpClearVars()
aNam.ToUpperAscii();
maGridColor = Color( COL_BLACK );
-BrkEncirclement();
}
SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
-: mpEncirclementOverlay(0L),
-mpPageView(0L),
+: mpPageView(0L),
aDefaultAttr(pModel1-GetItemPool()),
mbBufferedOutputAllowed(false),
mbBufferedOverlayAllowed(false),
@@ -313,8 +254,6 @@ SdrPaintView::~SdrPaintView()
delete maPaintWindows.back();
maPaintWindows.pop_back();
}
-
-BrkEncirclement();
}
@@
