[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Oct 8 10:36:37 PDT 2011
binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx | 1
binfilter/bf_svx/source/items/svx_paraitem.cxx | 2
binfilter/bf_svx/source/items/svx_xmlcnitm.cxx | 14 +--
binfilter/bf_svx/source/outliner/svx_outleeng.cxx | 4
binfilter/bf_svx/source/outliner/svx_outlin2.cxx | 58 -------------
binfilter/bf_svx/source/outliner/svx_outliner.cxx | 92 +++++-----------------
binfilter/bf_svx/source/outliner/svx_outlvw.cxx | 35 --------
binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx | 72 ++---------------
binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx | 22 -----
binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx | 23 -----
binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx | 69 ----------------
binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx | 58 +------------
binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx | 51 ------------
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 58 +------------
binfilter/bf_svx/source/svdraw/svx_svdview.cxx | 14 ---
binfilter/bf_svx/source/unodraw/svx_unopage.cxx | 3
binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx | 15 ---
binfilter/bf_svx/source/unoedit/svx_unoforou.cxx | 21 -----
binfilter/bf_svx/source/unoedit/svx_unoviwou.cxx | 18 ----
binfilter/inc/bf_svx/lspcitem.hxx | 4
binfilter/inc/bf_svx/outliner.hxx | 70 ----------------
binfilter/inc/bf_svx/svdcrtv.hxx | 4
binfilter/inc/bf_svx/svddrgv.hxx | 3
binfilter/inc/bf_svx/svdedtv.hxx | 32 -------
binfilter/inc/bf_svx/svdedxv.hxx | 32 -------
binfilter/inc/bf_svx/svdhdl.hxx | 55 +++----------
binfilter/inc/bf_svx/svdmrkv.hxx | 2
binfilter/inc/bf_svx/unoforou.hxx | 2
binfilter/inc/bf_svx/unoviwou.hxx | 6 -
binfilter/inc/bf_xmloff/xmlcnitm.hxx | 8 -
30 files changed, 93 insertions(+), 755 deletions(-)
New commits:
commit a732e64c4fa9463c5f7fba9f7690bee496f2a54e
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Oct 8 10:36:11 2011 -0700
More DBG_BF_ASSERT cleanup in bf_svx
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
index 66d5440..65b8c8c 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
@@ -885,7 +885,6 @@ void SdXShape::SetEmptyPresObj( sal_Bool bEmpty ) throw()
pOutliner->SetVertical( bVertical );
pOutliner->SetStyleSheetPool( (SfxStyleSheetPool*)pDoc->GetStyleSheetPool() );
pOutliner->SetStyleSheet( 0, pPage->GetTextStyleSheetForObject( pObj ) );
- pOutliner->Insert( pPage->GetPresObjText( pPage->GetPresObjKind(pObj) ) );
pObj->SetOutlinerParaObject( pOutliner->CreateParaObject() );
pOutliner->Clear();
}
diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx
index 181a460..7064d52 100644
--- a/binfilter/bf_svx/source/items/svx_paraitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx
@@ -307,7 +307,7 @@ using namespace ::com::sun::star;
/*?*/ XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); XubString aText;
+/*?*/ XubString aText;
/*?*/ return aText;
/*?*/ }
diff --git a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
index dbccc4a..264f025 100644
--- a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
+++ b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
@@ -213,25 +213,23 @@ using rtl::OUString;
/*N*/ }
/*N*/ USHORT SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
+/*N*/ { return 0; // DBG_BF_ASSERT VIRTUAL
/*N*/ }
/*N*/ USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT /*nIdx*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
+/*N*/ { return 0; // DBG_BF_ASSERT VIRTUAL
/*N*/ }
/*N*/ const OUString& SvXMLAttrContainerItem::GetNamespace( USHORT /*i*/ ) const
/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ static OUString aStripped;
-/*N*/ return aStripped;
+/*N*/ static OUString aStripped; // DBG_BF_ASSERT VIRTUAL
+/*N*/ return aStripped;
/*N*/ }
/*N*/ const OUString& SvXMLAttrContainerItem::GetPrefix( USHORT /*i*/ ) const
/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ static OUString aStripped;
-/*N*/ return aStripped;
+/*N*/ static OUString aStripped; // DBG_BF_ASSERT VIRTUAL
+/*N*/ return aStripped;
/*N*/ }
diff --git a/binfilter/bf_svx/source/outliner/svx_outleeng.cxx b/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
index 8a4941e..c60fdea 100644
--- a/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outleeng.cxx
@@ -86,9 +86,7 @@ namespace binfilter {
/*N*/ void OutlinerEditEng::ParagraphHeightChanged( USHORT nPara )
/*N*/ {
-/*N*/ pOwner->ParagraphHeightChanged( nPara );
-/*N*/
-/*N*/ EditEngine::ParagraphHeightChanged( nPara );
+/*N*/ EditEngine::ParagraphHeightChanged( nPara );
/*N*/ }
diff --git a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
index 0fcc6c2..1bbd338 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
@@ -26,14 +26,11 @@
*
************************************************************************/
-
#ifdef _MSC_VER
#pragma hdrstop
#endif
-
-
#include <forbiddencharacterstable.hxx>
#define _OUTLINER_CXX
@@ -99,55 +96,34 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ pEditEngine->SetBackgroundColor( rColor );
/*N*/ }
-
-
-
-
/*N*/ ULONG Outliner::GetTextHeight() const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
/*N*/ return pEditEngine->GetTextHeight();
/*N*/ }
-
-
/*N*/ void Outliner::SetNotifyHdl( const Link& rLink )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
/*N*/ pEditEngine->aOutlinerNotifyHdl = rLink;
/*N*/
-/*N*/ if ( rLink.IsSet() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if ( !rLink.IsSet() )
/*N*/ pEditEngine->SetNotifyHdl( Link() );
/*N*/
/*N*/ }
-
-
-
/*N*/ void Outliner::SetDefTab( USHORT nTab )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
/*N*/ pEditEngine->SetDefTab( nTab );
/*N*/ }
-
-
/*N*/ BOOL Outliner::UpdateFields()
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
/*N*/ return pEditEngine->UpdateFields();
/*N*/ }
-
-
-
-
-
-
-
-
/*N*/ void Outliner::SetPaperSize( const Size& rSize )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -160,16 +136,12 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ return pEditEngine->GetPaperSize();
/*N*/ }
-
-
/*N*/ void Outliner::ClearPolygon()
/*N*/ {
/*N*/ DBG_CHKTHIS( Outliner, 0 );
/*N*/ pEditEngine->ClearPolygon();
/*N*/ }
-
-
/*N*/ void Outliner::SetMinAutoPaperSize( const Size& rSz )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -262,20 +234,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ return pEditEngine->GetLineCount( (USHORT)nParagraph );
/*N*/ }
-/*N*/ USHORT Outliner::GetLineLen( ULONG /* nParagraph */, USHORT /* nLine */ ) const
-/*N*/ {
-/*N*/ DBG_CHKTHIS(Outliner,0);
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
-
-/*?*/ ULONG Outliner::GetLineHeight( ULONG /* nParagraph */, ULONG /* nLine */ )
-/*?*/ {
-/*?*/ DBG_CHKTHIS(Outliner,0);
- DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return 0;
-/*?*/ }
-
/*N*/ void Outliner::QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -291,9 +249,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
-
-
-
/*N*/ void Outliner::SetEditTextObjectPool( SfxItemPool* pPool )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -319,13 +274,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
-/*N*/ ULONG Outliner::GetTextHeight( ULONG ) const
-/*N*/ {
-/*N*/ DBG_CHKTHIS(Outliner,0);
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
-
/*N*/ Point Outliner::GetDocPos( const Point& rPaperPos ) const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -437,7 +385,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
-
/*N*/ USHORT Outliner::GetScriptType( const ESelection& rSelection ) const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -451,9 +398,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
-
-
-
/*N*/ BOOL Outliner::IsForceAutoColor() const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
diff --git a/binfilter/bf_svx/source/outliner/svx_outliner.cxx b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
index 040953d..c0b37d5 100644
--- a/binfilter/bf_svx/source/outliner/svx_outliner.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
@@ -101,11 +101,6 @@ namespace binfilter {
/*N*/ rnDepth = nMaxDepth;
/*N*/ }
-/*N*/ Paragraph* Outliner::Insert(const XubString&, ULONG, USHORT)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-
/*N*/ void Outliner::ParagraphInserted( USHORT nPara )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -113,11 +108,7 @@ namespace binfilter {
/*N*/ if ( bBlockInsCallback )
/*N*/ return;
/*N*/
-/*N*/ if( bPasting || pEditEngine->IsInUndo() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !( bPasting || pEditEngine->IsInUndo() ) )
/*N*/ {
/*N*/ USHORT nDepth = 0;
/*N*/ if ( nPara )
@@ -395,8 +386,6 @@ namespace binfilter {
/*N*/ pEditEngine->SetUpdateMode( bUpdate );
/*N*/ }
-// pView == 0 -> Tabulatoren nicht beachten
-
/*N*/ void Outliner::SetText( const OutlinerParaObject& rPObj )
/*N*/ {
@@ -554,13 +543,6 @@ namespace binfilter {
/*N*/ ImplCheckNumBulletItem( nPara );
/*N*/ ImplCalcBulletText( nPara, FALSE, FALSE );
/*N*/
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if ( bUndo )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ pEditEngine->SetUpdateMode( bUpdate );
/*N*/ }
/*N*/ }
@@ -617,10 +599,6 @@ namespace binfilter {
/*N*/ ESelection aSel( nPara, 0, nPara, 0 );
/*N*/ aStdFont = EditEngine::CreateFontFromItemSet( pEditEngine->GetAttribs( aSel ), GetScriptType( aSel ) );
/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ Font aBulletFont;
/*N*/ if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
@@ -664,12 +642,7 @@ namespace binfilter {
/*N*/ void Outliner::PaintBullet( USHORT nPara, const Point& /*rStartPos*/,
/*N*/ const Point& /*rOrigin*/, short /*nOrientation*/, OutputDevice* /*pOutDev*/ )
/*N*/ {
-/*N*/ DBG_CHKTHIS(Outliner,0);
-/*N*/
-/*N*/ if ( ImplHasBullet( nPara ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ ImplHasBullet( nPara ); // DBG_BF_ASSERT -- side affects?
/*N*/ }
/*N*/ #ifndef SVX_LIGHT
@@ -749,12 +722,6 @@ namespace binfilter {
/*N*/ return pParaList->GetAbsPos( pPara );
/*N*/ }
-/*N*/ void Outliner::ParagraphHeightChanged( USHORT )
-/*N*/ {
-/*N*/ DBG_CHKTHIS(Outliner,0);
-/*N*/ // MT: Kann wohl weg...
-/*N*/ }
-
/*N*/ ULONG Outliner::GetParagraphCount() const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
@@ -854,13 +821,6 @@ namespace binfilter {
/*N*/ {
/*N*/ SfxItemSet aAttrs( pEditEngine->GetParaAttribs( n ) );
/*N*/
-/*N*/ // MT 05/00: Default-Item muss erstmal richtig sein => Dann koennen diese ganzen komischen Defaults weg!!!
-/*N*/ // const SvxNumBulletItem& rNumBullet = (const SvxNumBulletItem&) pEditEngine->GetParaAttrib( n, EE_PARA_NUMBULLET );
-/*N*/ // const SvxNumberFormat* pFmt = NULL;
-/*N*/ // if ( ( rNumBullet.GetNumRule()->GetLevelCount() > pPara->GetDepth() ) &&
-/*N*/ // ( ( pFtm = rNumBullet.GetNumRule()->Get( pPara->GetDepth() ) != NULL ) )
-/*N*/ // {
-/*N*/ // }
/*N*/ if ( !bHasLRSpace )
/*N*/ {
/*N*/ SvxLRSpaceItem aLRSpaceItem = lcl_ImplGetDefLRSpaceItem( pPara->GetDepth(), GetRefMapMode().GetMapUnit() );
@@ -936,10 +896,6 @@ namespace binfilter {
/*N*/ if ( nBulletWidth < aBulletSize.Width() ) // Bullet macht sich Platz
/*N*/ nBulletWidth = aBulletSize.Width();
/*N*/
-/*N*/ if ( bAdjust && !bOutlineMode )
-/*N*/ {{DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-/*N*/
/*N*/ // Vertikal:
/*N*/ ParagraphInfos aInfos = pEditEngine->GetParagraphInfos( nPara );
/*N*/ if ( aInfos.bValid )
@@ -981,10 +937,6 @@ namespace binfilter {
/*N*/
/*N*/ aBulletArea = Rectangle( aTopLeft, aBulletSize );
/*N*/ }
-/*N*/ if ( bReturnPaperPos )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ return aBulletArea;
/*N*/ }
@@ -1066,30 +1018,30 @@ namespace binfilter {
/*N*/ return pEditEngine->GetParaAttribs( (USHORT)nPara );
/*N*/ }
-/*N*/ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, EMPTYARG )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, EMPTYARG ) // DBG_BF_ASSERT
+{
+ return 0;
+}
-/*N*/ IMPL_LINK( Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK( Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG ) // DBG_BF_ASSERT
+{
+ return 0;
+}
-/*N*/ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, EMPTYARG )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, EMPTYARG ) // DBG_BF_ASSERT
+{
+ return 0;
+}
-/*N*/ IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, EMPTYARG )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, EMPTYARG ) // DBG_BF_ASSERT
+{
+ return 0;
+}
-/*N*/ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG ) // DBG_BF_ASSERT
+{
+ return 0;
+}
/*N*/ void Outliner::ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds )
/*N*/ {
diff --git a/binfilter/bf_svx/source/outliner/svx_outlvw.cxx b/binfilter/bf_svx/source/outliner/svx_outlvw.cxx
index 62f5fa8..da2a36a 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlvw.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlvw.cxx
@@ -39,71 +39,36 @@
namespace binfilter {
-// Breite der Randzonen innerhalb derer beim D&D gescrollt wird
-#define OL_SCROLL_LRBORDERWIDTHPIX 10
-#define OL_SCROLL_TBBORDERWIDTHPIX 10
-
-// Wert, um den Fensterinhalt beim D&D gescrollt wird
-#define OL_SCROLL_HOROFFSET 20 /* in % von VisibleSize.Width */
-#define OL_SCROLL_VEROFFSET 20 /* in % von VisibleSize.Height */
-
-/*N*/ DBG_NAME(OutlinerView)
-
/*N*/ OutlinerView::~OutlinerView()
/*N*/ {
-/*N*/ DBG_DTOR(OutlinerView,0);
/*N*/ delete pEditView;
/*N*/ }
-
/*N*/ Rectangle OutlinerView::GetVisArea() const
/*N*/ {
-/*N*/ DBG_CHKTHIS(OutlinerView,0);
/*N*/ return pEditView->GetVisArea();
/*N*/ }
-/*N*/ void OutlinerView::Cut()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void OutlinerView::Paste()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
- // =====================================================================
-// ====================== Einfache Durchreicher =======================
-// ======================================================================
-
-
/*N*/ void OutlinerView::SetSelection( const ESelection& rSel )
/*N*/ {
-/*N*/ DBG_CHKTHIS(OutlinerView,0);
/*N*/ pEditView->SetSelection( rSel );
/*N*/ }
/*N*/ Window* OutlinerView::GetWindow() const
/*N*/ {
-/*N*/ DBG_CHKTHIS(OutlinerView,0);
/*N*/ return pEditView->GetWindow();
/*N*/ }
/*N*/ Rectangle OutlinerView::GetOutputArea() const
/*N*/ {
-/*N*/ DBG_CHKTHIS(OutlinerView,0);
/*N*/ return pEditView->GetOutputArea();
/*N*/ }
/*N*/ ESelection OutlinerView::GetSelection()
/*N*/ {
-/*N*/ DBG_CHKTHIS(OutlinerView,0);
/*N*/ return pEditView->GetSelection();
/*N*/ }
-/*N*/ void OutlinerView::Copy()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
index ae15556..0fb5e4a 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
@@ -33,29 +33,6 @@
namespace binfilter {
-#define XOR_CREATE_PEN PEN_SOLID
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ class ImpSdrConnectMarker: public SdrViewUserMarker
-/*N*/ {
-/*N*/ const SdrObject* pAktObj;
-/*N*/ const SdrPageView* pAktPV;
-/*N*/
-
-/*N*/ public:
-/*N*/ ImpSdrConnectMarker(SdrCreateView* pInView): SdrViewUserMarker(pInView),pAktObj(NULL),pAktPV(NULL) {}
-/*N*/ ~ImpSdrConnectMarker() {}
-/*N*/ void SetTargetObject(const SdrObject* pObj);
-/*N*/ }; // svdvmark
-
-
-/*N*/ void ImpSdrConnectMarker::SetTargetObject(const SdrObject* pObj)
-/*N*/ {
-/*N*/ if (pAktObj!=pObj) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -88,29 +65,16 @@ namespace binfilter {
/*N*/ bAutoClosePolys=TRUE;
/*N*/ nAutoCloseDistPix=5;
/*N*/ nFreeHandMinDistPix=10;
-/*N*/
-/*N*/ pConnectMarker=new ImpSdrConnectMarker(this);
-/*N*/ pConnectMarker->SetLineWidth(2);
-/*N*/ pConnectMarker->SetAnimateDelay(500);
-/*N*/ pConnectMarker->SetAnimateCount(3);
-/*N*/ pConnectMarker->SetAnimateSpeed(100);
-/*N*/ pConnectMarker->SetAnimateToggle(TRUE);
-/*N*/ }
-
-/*N*/ void SdrCreateView::ImpMakeCreateAttr()
-/*N*/ {
/*N*/ }
/*N*/ SdrCreateView::SdrCreateView(SdrModel* pModel1, OutputDevice* pOut):
/*N*/ SdrDragView(pModel1,pOut)
/*N*/ {
/*N*/ ImpClearVars();
-/*N*/ ImpMakeCreateAttr();
/*N*/ }
/*N*/ SdrCreateView::~SdrCreateView()
/*N*/ {
-/*N*/ delete pConnectMarker;
/*N*/ delete pCurrentLibObj;
/*N*/ delete pAktCreate;
/*N*/ }
@@ -122,20 +86,15 @@ namespace binfilter {
/*N*/ }
-
-
/*N*/ void SdrCreateView::BrkAction()
/*N*/ {
/*N*/ SdrDragView::BrkAction();
-/*N*/ BrkCreateObj();
/*N*/ }
/*N*/ void SdrCreateView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const
/*N*/ {
/*N*/ SdrDragView::ToggleShownXor(pOut,pRegion);
-/*N*/ if (pAktCreate!=NULL && aDragStat.IsShown()) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ BOOL SdrCreateView::CheckEdgeMode()
@@ -145,8 +104,6 @@ namespace binfilter {
/*?*/ if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE;
/*N*/ }
/*N*/ if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE || pCurrentLibObj!=NULL) {
-/*?*/ if (pConnectMarker->IsVisible()) {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ pConnectMarker->SetTargetObject(NULL);
/*N*/ return FALSE;
/*N*/ } else {
/*N*/ // TRUE heisst: MouseMove soll Connect checken
@@ -155,16 +112,24 @@ namespace binfilter {
/*N*/ }
-
-
/*N*/ BOOL SdrCreateView::IsTextTool() const
/*N*/ {
-/*N*/ return eEditMode==SDREDITMODE_CREATE && pCurrentLibObj==NULL && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
+/*N*/ return eEditMode==SDREDITMODE_CREATE
+ && pCurrentLibObj==NULL
+ && nAktInvent==SdrInventor
+ && ( nAktIdent==OBJ_TEXT
+ || nAktIdent==OBJ_TEXTEXT
+ || nAktIdent==OBJ_TITLETEXT
+ || nAktIdent==OBJ_OUTLINETEXT
+ );
/*N*/ }
/*N*/ BOOL SdrCreateView::IsEdgeTool() const
/*N*/ {
-/*N*/ return eEditMode==SDREDITMODE_CREATE && pCurrentLibObj==NULL && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
+/*N*/ return eEditMode==SDREDITMODE_CREATE
+ && pCurrentLibObj==NULL
+ && nAktInvent==SdrInventor
+ && (nAktIdent==OBJ_EDGE);
/*N*/ }
@@ -206,19 +171,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
-
-
-
-/*N*/ void SdrCreateView::BrkCreateObj()
-/*N*/ {
-/*N*/ if (pAktCreate!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrCreateView::WriteRecords(SvStream& rOut) const
diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
index 2fcf741..bba22a1 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
@@ -100,23 +100,11 @@ namespace binfilter {
/*N*/ void SdrDragView::BrkAction()
/*N*/ {
/*N*/ SdrExchangeView::BrkAction();
-/*N*/ BrkDragObj();
/*N*/ }
/*N*/ void SdrDragView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const
/*N*/ {
/*N*/ SdrExchangeView::ToggleShownXor(pOut,pRegion);
- if (pDragBla!=NULL && aDragStat.IsShown() &&
- 1 )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ void SdrDragView::BrkDragObj()
-/*N*/ {
-/*N*/ if (pDragBla!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -124,22 +112,14 @@ namespace binfilter {
/*N*/ void SdrDragView::SetNoDragXorPolys(BOOL bOn)
/*N*/ {
/*N*/ if (IsNoDragXorPolys()!=bOn) {
-/*N*/ BOOL bDragging=pDragBla!=NULL;
-/*N*/ BOOL bShown=bDragging && aDragStat.IsShown();
-/*N*/ if (bShown) {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ bNoDragXorPolys=bOn;
-/*N*/ if (bDragging) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ if (bShown) {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
/*N*/ }
/*N*/ void SdrDragView::SetDragStripes(BOOL bOn)
/*N*/ {
-/*N*/ if (pDragBla!=NULL && aDragStat.IsShown()) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ } else {
+/*N*/ if ( !(pDragBla!=NULL && aDragStat.IsShown() ) )
/*N*/ bDragStripes=bOn;
-/*N*/ }
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx
index 22775af..f4d91fe 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx
@@ -153,8 +153,6 @@ namespace binfilter {
/*N*/ ImpResetPossibilityFlags();
/*N*/ aMark.ForceSort();
/*N*/ ULONG nMarkAnz=aMark.GetMarkCount();
-/*N*/ if (nMarkAnz!=0) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ ImpCheckToTopBtmPossible();
/*N*/ ((SdrPolyEditView*)this)->ImpCheckPolyPossibilities();
/*N*/ bPossibilitiesDirty=FALSE;
@@ -181,27 +179,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef WIN
-
-
-
-
- // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
-
-#endif
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx
index ec42f62..72cdb35 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx
@@ -53,78 +53,11 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
/*N*/ void SdrEditView::ImpCheckToTopBtmPossible()
/*N*/ {
-/*N*/ ULONG nAnz=aMark.GetMarkCount();
-/*N*/ if (nAnz==0) return;
-/*?*/ if (nAnz==1) { DBG_BF_ASSERT(0, "STRIP");
-/*N*/ } else {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ aMark.GetMarkCount(); // DBG_BF_ASSERT -- side effects?
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// #### #### ### # # ####
-// # # # # # # # # #
-// # ## #### # # # # ####
-// # # # # # # # # #
-// #### # # ### ### #
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ void SdrEditView::GroupMarked(const SdrObject* /*pUserGrp*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// # # # # #### #### ### # # ####
-// # # ## # # # # # # # # # #
-// # # # # # # ## #### # # # # ####
-// # # # ## # # # # # # # # #
-// ### # # #### # # ### ### #
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ void SdrEditView::UnGroupMarked()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// ### ### # # # # ##### #### ##### ##### ### #### ### # # #
-// # # # # ## # # # # # # # # # # # # # # # # #
-// # # # # # # # # #### #### # # # # #### # # # #
-// # # # # # ## # # # # # # # # # # # # # #
-// ### ### # # # ##### # # # # ### # ### #### #
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// # # ##### ##### ### ##### # # ##### # # # #### ### #### #####
-// ## ## # # # # # # # # # ## ## # # # # # # #
-// # # # #### # ##### ### # # #### ### # # # # #### # # #### #
-// # # # # # # # # # # # # # # # # # # #
-// # # ##### # # # # # #### ##### # # # # ### # # #
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx
index 77e1a14..44efc3a 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx
@@ -71,10 +71,9 @@ namespace binfilter {
/*N*/ SdrObjEditView::~SdrObjEditView()
/*N*/ {
/*N*/ pTextEditWin = NULL; // Damit es in EndTextEdit kein ShowCursor gibt
-/*N*/ if (IsTextEdit()){DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ if (pTextEditOutliner!=NULL) {
-/*?*/ delete pTextEditOutliner;
-/*N*/ }
+/*N*/ if (pTextEditOutliner!=NULL) {
+/*?*/ delete pTextEditOutliner;
+/*N*/ }
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -89,7 +88,6 @@ namespace binfilter {
/*N*/ void SdrObjEditView::BrkAction()
/*N*/ {
-/*N*/ BrkMacroObj();
/*N*/ SdrGlueEditView::BrkAction();
/*N*/ }
@@ -107,65 +105,25 @@ namespace binfilter {
/*?*/ if (eKind==HINT_DEFAULTTABCHG) {
/*?*/ pTextEditOutliner->SetDefTab(pMod->GetDefaultTabulator());
/*?*/ }
-/*?*/ if (eKind==HINT_DEFFONTHGTCHG) {
-/*?*/ // ...
-/*?*/ }
-/*?*/ if (eKind==HINT_MODELSAVED) { // #43095#
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
/*N*/ }
/*N*/ void SdrObjEditView::ModelHasChanged()
/*N*/ {
/*N*/ SdrGlueEditView::ModelHasChanged();
-/*N*/ if (IsTextEdit() && !pTextEditObj->IsInserted()) {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ // TextEditObj geaendert?
-/*N*/ if (IsTextEdit()) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-/*N*/ BOOL SdrObjEditView::BegTextEdit(SdrObject*, SdrPageView*, Window*,
-/*N*/ SdrOutliner*, OutlinerView*,
-/*N*/ BOOL, BOOL)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
-/*N*/ SdrEndTextEditKind SdrObjEditView::EndTextEdit(BOOL)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; return eRet;
-/*N*/ }
+SdrEndTextEditKind SdrObjEditView::EndTextEdit(BOOL)
+{
+ SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED;
+ return eRet;
+}
/*N*/ void SdrObjEditView::DelWin(OutputDevice* pWin1)
/*N*/ {
/*N*/ SdrGlueEditView::DelWin(pWin1);
-/*N*/ if (pTextEditObj!=NULL && !bTextEditOnlyOneView && pWin1->GetOutDevType()==OUTDEV_WINDOW) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@ @@ @@@@ @@@@ @@@@@ @@@@ @@ @@ @@@@ @@@@@ @@@@@
-// @@@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@@ @@@ @@ @@ @@ @@ @@
-// @@@@@@@ @@ @@ @@ @@ @@ @@ @@ @@@@@@@ @@ @@ @@ @@ @@
-// @@@@@@@ @@@@@@ @@ @@@@@ @@ @@ @@@@@@@ @@ @@ @@ @@ @@@@
-// @@ @ @@ @@ @@ @@ @@ @@ @@ @@ @@ @ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@@@ @@ @@ @@@@ @@ @@ @@@@ @@@@@ @@@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-/*N*/ void SdrObjEditView::BrkMacroObj()
-/*N*/ {
-/*N*/ if (pMacroObj!=NULL) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
index b1ec998..d12fc2f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
@@ -33,12 +33,9 @@
// #105678#
namespace binfilter {
-/*N*/ SdrHdl::~SdrHdl()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+SdrHdl::~SdrHdl() {}
////////////////////////////////////////////////////////////////////////////////////////////////////
-// #97016# II
/*N*/ class ImplHdlListData
/*N*/ {
@@ -50,19 +47,7 @@ namespace binfilter {
/*N*/ };
-// #105678# Help struct for re-sorting handles
-struct ImplHdlAndIndex
-{
- SdrHdl* mpHdl;
- sal_uInt32 mnIndex;
-};
-
-// #105678# Help method for sorting handles taking care of OrdNums, keeping order in
-// single objects and re-sorting polygon handles intuitively
-
////////////////////////////////////////////////////////////////////////////////////////////////////
-// #97016# II
-
/*N*/ SdrHdl* SdrHdlList::GetFocusHdl() const
/*N*/ {
@@ -72,8 +57,6 @@ struct ImplHdlAndIndex
/*?*/ return 0L;
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ SdrHdlList::SdrHdlList(SdrMarkView* pV)
/*N*/ : pImpl(new ImplHdlListData(pV))
/*N*/ , aList(1024,32,32)
@@ -92,46 +75,14 @@ struct ImplHdlAndIndex
/*N*/ }
-/*N*/ void SdrHdlList::SetRotateShear(BOOL bOn)
-/*N*/ {
-/*N*/ bRotateShear = bOn;
-/*N*/ }
-
-/*N*/ void SdrHdlList::SetDistortShear(BOOL bOn)
-/*N*/ {
-/*N*/ bDistortShear = bOn;
-/*N*/ }
-
-/*N*/ void SdrHdlList::SetFineHdl(BOOL bOn)
-/*N*/ {
-/*N*/ if(bFineHandles != bOn)
-/*N*/ {
-/*N*/ // remember new state
-/*N*/ bFineHandles = bOn;
-/*N*/
-/*N*/ // propagate change to IAOs
-/*N*/ for(UINT32 i=0; i<GetHdlCount(); i++)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-
/*N*/ void SdrHdlList::Clear()
/*N*/ {
-/*N*/ for (ULONG i=0; i<GetHdlCount(); i++)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ aList.Clear();
/*N*/
/*N*/ bRotateShear=FALSE;
/*N*/ bDistortShear=FALSE;
/*N*/ }
-/*N*/ void SdrHdlList::Sort()
-/*N*/ {
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index 859eb5c..3283c8f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -155,9 +155,6 @@ namespace binfilter {
/*N*/ void SdrMarkView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const
/*N*/ {
/*N*/ SdrSnapView::ToggleShownXor(pOut,pRegion);
-/*N*/ if ((bMarking || bMarkingPoints || bMarkingGluePoints) && aDragStat.IsShown()) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -198,29 +195,23 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrMarkView::BrkMarkObj()
-/*N*/ {
-/*N*/ if (bMarking) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrMarkView::BrkMarkPoints()
-/*N*/ {
-/*N*/ if (bMarkingPoints) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrMarkView::BrkMarkGluePoints()
-/*N*/ {
-/*N*/ if (bMarkingGluePoints) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ void SdrMarkView::ImpShowMarkHdl(OutputDevice* /*pOut*/, const Region* /*pRegion*/, BOOL /*bNoRefHdl*/)
-/*N*/ {
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ void SdrMarkView::ShowMarkHdl(OutputDevice* pOut, BOOL bNoRefHdl)
@@ -248,8 +239,6 @@ namespace binfilter {
/*N*/ ULONG nMarkAnz=aMark.GetMarkCount();
/*N*/ BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
/*N*/ BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
-/*N*/ if (nMarkAnz==1 && bStdDrag && bFrmHdl) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if (!bStdDrag && !bFrmHdl) {
/*?*/ // Grundsaetzlich erstmal alle anderen Dragmodi nur mit FrameHandles
/*?*/ bFrmHdl=TRUE;
@@ -262,11 +251,6 @@ namespace binfilter {
/*?*/ }
/*?*/ }
/*N*/ }
-/*N*/ if (!bFrmHdl) {
-/*N*/ // FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann
-/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/ return bFrmHdl;
/*N*/ }
@@ -274,7 +258,6 @@ namespace binfilter {
/*N*/ {
/*N*/ // #105722# remember old focus handle values to search for it again
/*N*/ const SdrHdl* pSaveOldFocusHdl = aHdl.GetFocusHdl();
-/*N*/ sal_Bool bSaveOldFocus(sal_False);
/*N*/
/*N*/ if(pSaveOldFocusHdl
/*N*/ && pSaveOldFocusHdl->GetObj()
@@ -304,50 +287,26 @@ namespace binfilter {
/*N*/ }
/*N*/ if (bFrmHdl) {
/*N*/ Rectangle aRect(GetMarkedObjRect());
-/*N*/ if (!aRect.IsEmpty()) { // sonst nix gefunden
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ } else {
-/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ } // for nMarkNum
/*N*/ } // if bFrmHdl else
-/*N*/ // GluePoint-Handles
-/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
// Drehpunkt/Spiegelachse
/*N*/ AddDragModeHdl(eDragMode);
/*N*/
/*N*/ // add custom handles (used by other apps, e.g. AnchorPos)
/*N*/ AddCustomHdl();
-/*N*/
-/*N*/ // sort handles
-/*N*/ aHdl.Sort();
-/*N*/
-/*N*/ // #105722# try to restore focus handle index from remembered values
-/*N*/ if(bSaveOldFocus)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ void SdrMarkView::AddCustomHdl()
-/*N*/ {
-/*N*/ // add custom handles (used by other apps, e.g. AnchorPos)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ void SdrMarkView::AddDragModeHdl(SdrDragMode /*eMode*/)
-/*N*/ {
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ void SdrMarkView::CheckMarked()
/*N*/ {
-/*N*/ for (ULONG nm=aMark.GetMarkCount(); nm>0;) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
- // #97995# at least reset the remembered BoundRect to prevent handle
- // generation if bForceFrameHandles is TRUE.
/*N*/ bMarkedObjRectDirty = TRUE;
/*N*/ }
@@ -553,12 +512,7 @@ namespace binfilter {
/*N*/
/*N*/ bMarkedObjRectDirty=TRUE;
/*N*/ bMarkedPointsRectsDirty=TRUE;
-/*N*/ #ifndef SVX_LIGHT
-/*?*/ if (pItemBrowser!=NULL) DBG_BF_ASSERT(0, "STRIP");
-/*N*/ #endif
/*N*/ BOOL bOneEdgeMarked=FALSE;
-/*N*/ if (aMark.GetMarkCount()==1) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ ImpSetGlueVisible4(bOneEdgeMarked);
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
index 306c237..8642c26 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
@@ -122,27 +122,17 @@ namespace binfilter {
/*?*/ eSel.nStartPara=eSel.nEndPara;
/*?*/ eSel.nStartPos=eSel.nEndPos;
/*?*/ GetTextEditOutlinerView()->SetSelection(eSel);
-/*?*/ #ifndef SVX_LIGHT
-/*?*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ #endif
/*N*/ } else if (HasMarkedGluePoints()) UnmarkAllGluePoints();
-/*N*/ else if (HasMarkedPoints()) {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ else UnmarkAllObj();
+/*N*/ else if ( !HasMarkedPoints() )
+/*N*/ UnmarkAllObj();
/*N*/ }
-
-
-
-
-
-
/*N*/ void SdrView::DeleteMarked()
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
/*N*/ void SdrView::WriteRecords(SvStream& rOut) const
/*N*/ {
/*N*/ {
diff --git a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
index e8deb83..d000972 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
@@ -343,8 +343,6 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference<
_SelectObjectsInView( xShapes, pPageView );
- pView->GroupMarked();
-
pView->AdjustMarkHdl();
const SdrMarkList& rMarkList = pView->GetMarkList();
if( rMarkList.GetMarkCount() == 1 )
@@ -378,7 +376,6 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
Reference< drawing::XShape > xShape( aGroup, UNO_QUERY );
_SelectObjectInView( xShape, pPageView );
- pView->UnGroupMarked();
pView->HidePage(pPageView);
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
index 1aeb2c4..24c8698 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
@@ -641,21 +641,6 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( sal_Bool bCre
// enter edit mode
mpView->EndTextEdit();
- if( mpView->BegTextEdit( mpObject, NULL, NULL, (SdrOutliner*)NULL, NULL, FALSE, FALSE ) )
- {
- SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
- if( pTextObj->IsTextEditActive() )
- {
- // create new view forwarder
- mpViewForwarder = CreateViewForwarder();
- }
- else
- {
- // failure. Somehow, BegTextEdit did not set
- // our SdrTextObj into edit mode
- mpView->EndTextEdit();
- }
- }
}
}
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx b/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx
index 14fd32f..82db667 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx
@@ -328,9 +328,9 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) con
// #109151# Don't use paragraph height, but line height
// instead. aLast is already CTL-correct
if( bIsVertical)
- aLast.SetSize( Size( rOutliner.GetLineHeight(nPara,0), 1 ) );
+ aLast.SetSize( Size( 0, 1 ) );
else
- aLast.SetSize( Size( 1, rOutliner.GetLineHeight(nPara,0) ) );
+ aLast.SetSize( Size( 1, 0 ) );
}
return aLast;
@@ -349,19 +349,11 @@ Rectangle SvxOutlinerForwarder::GetParaBounds( USHORT nPara ) const
if( rOutliner.IsVertical() )
{
- // #101701#
- // Hargl. Outliner's 'external' methods return the rotated
- // dimensions, 'internal' methods like GetTextHeight( n )
- // don't rotate.
- ULONG nWidth = rOutliner.GetTextHeight( nPara );
-
- return Rectangle( aSize.Width() - aPnt.Y() - nWidth, 0, aSize.Width() - aPnt.Y(), aSize.Height() );
+ return Rectangle( aSize.Width() - aPnt.Y(), 0, aSize.Width() - aPnt.Y(), aSize.Height() );
}
else
{
- ULONG nHeight = rOutliner.GetTextHeight( nPara );
-
- return Rectangle( 0, aPnt.Y(), aSize.Width(), aPnt.Y() + nHeight );
+ return Rectangle( 0, aPnt.Y(), aSize.Width(), aPnt.Y() );
}
}
@@ -418,11 +410,6 @@ USHORT SvxOutlinerForwarder::GetLineCount( USHORT nPara ) const
return static_cast < USHORT >( rOutliner.GetLineCount(nPara) );
}
-USHORT SvxOutlinerForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
-{
- return rOutliner.GetLineLen(nPara, nLine);
-}
-
sal_Bool SvxOutlinerForwarder::QuickFormatDoc( BOOL )
{
rOutliner.QuickFormatDoc();
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoviwou.cxx b/binfilter/bf_svx/source/unoedit/svx_unoviwou.cxx
index 0284a4d..0b41cc0 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoviwou.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoviwou.cxx
@@ -144,24 +144,6 @@ sal_Bool SvxDrawOutlinerViewForwarder::SetSelection( const ESelection& rSelectio
return sal_True;
}
-sal_Bool SvxDrawOutlinerViewForwarder::Copy()
-{
- mrOutlinerView.Copy();
- return sal_True;
-}
-
-sal_Bool SvxDrawOutlinerViewForwarder::Cut()
-{
- mrOutlinerView.Cut();
- return sal_True;
-}
-
-sal_Bool SvxDrawOutlinerViewForwarder::Paste()
-{
- mrOutlinerView.Paste();
- return sal_True;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/lspcitem.hxx b/binfilter/inc/bf_svx/lspcitem.hxx
index 244440d..2c44c6b 100644
--- a/binfilter/inc/bf_svx/lspcitem.hxx
+++ b/binfilter/inc/bf_svx/lspcitem.hxx
@@ -110,8 +110,8 @@ public:
inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; }
virtual USHORT GetValueCount() const { return SVX_LINESPACE_END; }
- virtual String GetValueTextByPos( USHORT nPos ) const;
- virtual USHORT GetEnumValue() const { return 0; } // DBG_BF_ASSERT
+ virtual String GetValueTextByPos( USHORT nPos ) const; // DBG_BF_ASSERT
+ virtual USHORT GetEnumValue() const { return 0; } // DBG_BF_ASSERT
virtual void SetEnumValue( USHORT /* nNewVal */ ) {} // DBG_BF_ASSERT
};
diff --git a/binfilter/inc/bf_svx/outliner.hxx b/binfilter/inc/bf_svx/outliner.hxx
index ae3b2fb..1996c5b 100644
--- a/binfilter/inc/bf_svx/outliner.hxx
+++ b/binfilter/inc/bf_svx/outliner.hxx
@@ -139,29 +139,6 @@ private:
USHORT GetDepth() const { return nDepth; }
};
-struct ParaRange
-{
- USHORT nStartPara;
- USHORT nEndPara;
-
- ParaRange( USHORT nS, USHORT nE ) { nStartPara = nS, nEndPara = nE; }
-
- void Adjust();
- USHORT Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); }
-};
-
-inline void ParaRange::Adjust()
-{
- if ( nStartPara > nEndPara )
- {
- USHORT nTmp = nStartPara;
- nStartPara = nEndPara;
- nEndPara = nTmp;
- }
-}
-
-#define OL_ROOTPARENT (Paragraph*)NULL
-
class OutlinerView
{
friend class Outliner;
@@ -171,37 +148,6 @@ private:
Outliner* pOwner;
EditView* pEditView;
- // Drag & Drop
- BOOL bBeginDragAtMove_OLDMEMBER;
- BOOL bInDragMode;
- Point aDDStartPosRef;
- Point aDDStartPosPix;
- ULONG nDDStartPara;
- ULONG nDDStartParaVisChildCount;
- ULONG nDDCurPara;
- USHORT nDDStartDepth;
- USHORT nDDCurDepth;
- USHORT nDDMaxDepth;
- BOOL bDDChangingDepth;
- BOOL bDDCursorVisible;
- long* pHorTabArrDoc;
- long nDDScrollLRBorderWidthWin; // Left Right
- long nDDScrollTBBorderWidthWin; // Top Bottom
- long nDDScrollLROffs;
- long nDDScrollTDOffs;
-
- void* pDummy;
- ULONG nDummy;
-
- enum MouseTarget {
- MouseText = 0,
- MouseBullet = 1,
- MouseHypertext = 2, // ausserhalb OutputArea
- MouseOutside = 3, // ausserhalb OutputArea
- MouseDontKnow = 4
- };
- MouseTarget OLD_ePrevMouseTarget;
-
public:
virtual ~OutlinerView();
@@ -215,14 +161,7 @@ public:
Rectangle GetVisArea() const;
- void Cut();
- void Copy();
- void Paste();
-
- // Depricated
-
ESelection GetSelection();
-
void SetSelection( const ESelection& );
};
@@ -421,8 +360,6 @@ protected:
void ParagraphInserted( USHORT nParagraph );
void ParagraphDeleted( USHORT nParagraph );
void ParaAttribsChanged( USHORT nParagraph );
- void ParagraphHeightChanged( USHORT nParagraph );
-
void PaintBullet( USHORT nPara, const Point& rStartPos,
const Point& rOrigin, short nOrientation,
@@ -447,9 +384,6 @@ public:
void SetKernAsianPunctuation( BOOL bEnabled );
-
- Paragraph* Insert( const String& rText, ULONG nAbsPos = LIST_APPEND,
- USHORT nDepth = 0 );
void SetText( const OutlinerParaObject& );
void SetText( const String& rText, Paragraph* pParagraph );
String GetText( Paragraph* pPara, ULONG nParaCount=1 ) const;
@@ -587,8 +521,6 @@ public:
void SetEndMovingHdl( const Link& rLink){aEndMovingHdl=rLink;}
ULONG GetLineCount( ULONG nParagraph ) const;
- USHORT GetLineLen( ULONG nParagraph, USHORT nLine ) const;
- ULONG GetLineHeight( ULONG nParagraph, ULONG nLine = 0 );
SfxUndoManager& GetUndoManager();
@@ -624,9 +556,7 @@ public:
void SetRefDevice( OutputDevice* pRefDev );
OutputDevice* GetRefDevice() const;
-
ULONG GetTextHeight() const;
- ULONG GetTextHeight( ULONG nParagraph ) const;
Point GetDocPosTopLeft( ULONG nParagraph );
Point GetDocPos( const Point& rPaperPos ) const;
BOOL IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 );
diff --git a/binfilter/inc/bf_svx/svdcrtv.hxx b/binfilter/inc/bf_svx/svdcrtv.hxx
index e4d7946..26b6642 100644
--- a/binfilter/inc/bf_svx/svdcrtv.hxx
+++ b/binfilter/inc/bf_svx/svdcrtv.hxx
@@ -46,7 +46,6 @@ class XLineAttrSetItem;
class XFillAttrSetItem;
class SdrEdgeObj;
class SdrObjConnection;
-class ImpSdrConnectMarker;
////////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -65,7 +64,6 @@ protected:
SdrPageView* pCreatePV; // Hier wurde die Erzeugung gestartet
SdrObject* pCurrentLibObj;
SdrDragMethod* pLibObjDragMeth;
- ImpSdrConnectMarker* pConnectMarker;
Pointer aAktCreatePointer;
@@ -84,7 +82,6 @@ protected:
private:
void ImpClearVars();
- void ImpMakeCreateAttr();
protected:
@@ -132,7 +129,6 @@ public:
const SdrObject* GetCurrentLibObj() const { return pCurrentLibObj; }
// Starten des normalen Create
- void BrkCreateObj();
BOOL IsCreateObj() const { return pAktCreate!=NULL; }
SdrObject* GetCreateObj() const { return pAktCreate; }
diff --git a/binfilter/inc/bf_svx/svddrgv.hxx b/binfilter/inc/bf_svx/svddrgv.hxx
index 65bc27a..4b13fbd 100644
--- a/binfilter/inc/bf_svx/svddrgv.hxx
+++ b/binfilter/inc/bf_svx/svddrgv.hxx
@@ -129,7 +129,6 @@ public:
// Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese
// Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und
// wird zum Ende des Draggings destruiert.
- void BrkDragObj();
BOOL IsDragObj() const { return pDragBla!=NULL && !bInsPolyPoint && !bInsGluePoint; }
SdrHdl* GetDragHdl() const { return pDragHdl; }
SdrDragMethod* GetDragMethod() const { return pDragBla; }
@@ -151,7 +150,6 @@ public:
// Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt.
BOOL BegInsObjPoint(USHORT nIdx, const Point& rPnt, BOOL bNewObj, OutputDevice* pOut=NULL, short nMinMov=-3) { return BegInsObjPoint(TRUE,nIdx,rPnt,bNewObj,pOut,nMinMov); }
BOOL BegInsObjPoint(const Point& rPnt, BOOL bNewObj, OutputDevice* pOut=NULL, short nMinMov=-3) { return BegInsObjPoint(FALSE,0,rPnt,bNewObj,pOut,nMinMov); }
- void BrkInsObjPoint() { BrkDragObj(); }
BOOL IsInsObjPoint() const { return pDragBla!=NULL && bInsPolyPoint; }
// Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
@@ -159,7 +157,6 @@ public:
void SetInsObjPointMode(BOOL bOn) { bInsObjPointMode = bOn; }
BOOL IsInsObjPointMode() const { return bInsObjPointMode; }
- void BrkInsGluePoint() { BrkDragObj(); }
BOOL IsInsGluePoint() const { return pDragBla!=NULL && bInsGluePoint; }
// Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
diff --git a/binfilter/inc/bf_svx/svdedtv.hxx b/binfilter/inc/bf_svx/svdedtv.hxx
index 5f4fa0a..b2bbb44 100644
--- a/binfilter/inc/bf_svx/svdedtv.hxx
+++ b/binfilter/inc/bf_svx/svdedtv.hxx
@@ -195,11 +195,6 @@ public:
// verwendet. NotifyNewUndoAction() wird in diesem Fall erst beim letzten
// EndUndo() gerufen. NotifyNewUndoAction() wird nicht gerufen bei einer
// leeren Klammerung.
-#ifndef WIN
- // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
-#else // ifndef WIN
- // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
-#endif
// Verschieben eines Layer (Layerreihenfolge aendern)
@@ -235,22 +230,6 @@ public:
BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
- // Alle markierten Objekte zu einer Gruppe zusammenfassen.
- // Anschliessend wird die neue Gruppe markiert. Bei einer
- // seitenuebergreifenden Markierung wird eine Gruppe je Seite erzeugt.
- // Alle erzeugten Gruppen sind anschliessend markiert.
- // Ueber pUserGrp kann ein eigenes Gruppenobjekt vorgegeben werden. Dieses
- // wird jedoch nicht direkt verwendet, sondern via Clone kopiert.
- // Wird NULL uebergeben, macht sich die Methode SdrObjGroup-Instanzen.
- void GroupMarked(const SdrObject* pUserGrp=NULL);
-
- // Alle markierten Objektgruppen werden aufgeloesst (1 Level).
- // Anschliessend sind statt der Gruppenobjekte alle ehemaligen
- // Memberobjekte der aufgeloesten Gruppen markiert. Waren zum auch Objekte
- // markiert, die keine Gruppenobjekte sind, so bleiben diese weiterhin
- // zusaetzlich markiert.
- void UnGroupMarked();
-
BOOL IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
BOOL IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
BOOL IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
@@ -267,17 +246,6 @@ public:
// das SnapRect der Obj verwendet. Ist bBoundRects=TRUE, werden stattdessen
// die BoundRects ausgerichtet.
- // Markierte Objekte etwas nach "oben" holen
-
- // Markierte Objekte etwas nach "unten" holen
-
- // Markierte Objekte ganz nach "oben" stellen
-
- // Markierte Objekte ganz nach "unten" stellen
-
- // Markierte direkt vor das uebergebene Objekt stellen
- // NULL -> wie PutMarkedToTop();
-
// Markierte direkt hinter das uebergebene Objekt stellen
// NULL -> wie PutMarkedToBtm();
diff --git a/binfilter/inc/bf_svx/svdedxv.hxx b/binfilter/inc/bf_svx/svdedxv.hxx
index 1fbaefd..eb63f83 100644
--- a/binfilter/inc/bf_svx/svdedxv.hxx
+++ b/binfilter/inc/bf_svx/svdedxv.hxx
@@ -110,19 +110,6 @@ protected:
private:
void ImpClearVars();
-protected:
-
- // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen.
- // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein.
-
- // Hintergrundfarbe fuer die Outlinerviews bestimmen
-
- // Feststellen, ob der gesamte Text markiert ist. Liefert auch TRUE wenn
- // kein Text vorhanden ist.
-
- // Handler fuer AutoGrowing Text bei aktivem Outliner
-
-
public:
SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut=NULL);
virtual ~SdrObjEditView();
@@ -142,29 +129,13 @@ public:
void SetQuickTextEditMode(BOOL bOn) { bQuickTextEditMode=bOn; }
BOOL IsQuickTextEditMode() const { return bQuickTextEditMode; }
- // Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View
- // angemeldete Win verwendet.
- // Der Cursor des Fensters an dem Editiert wird wird bei
- // BegTextEdit() gemerkt und bei EndTextEdit() wieder restauriert.
- // Die App muss sicherstellen, das die zum Zeitpunkt des BegEdit am
- // Windows angemeldete Cursorinstanz beim EndTextEdit noch gueltig ist.
- // Ueber den Parameter pEditOutliner kann die Applikation einen eigenen
- // Outliner vorgeben, der zum Editieren verwendet wird. Dieser gehoert
- // nach Aufruf von BegTextEdit der SdrObjEditView und wird von dieser
- // spaeter via delete zerstoert (falls bDontDeleteOutliner=FALSE). Die
- // SdrObjEditView setzt dann das Modusflag (EditEngine/Outliner) an
- // dieser Instanz und ausserdem auch den StatusEventHdl.
- // Ebenso kann eine spezifische OutlinerView vorgegeben werden.
- BOOL BegTextEdit(SdrObject* pObj, SdrPageView* pPV=NULL, Window* pWin=NULL,
- SdrOutliner* pGivenOutliner=NULL, OutlinerView* pGivenOutlinerView=NULL,
- BOOL bDontDeleteOutliner=FALSE, BOOL bOnlyOneView=FALSE);
// bDontDeleteReally ist ein Spezialparameter fuer den Writer.
// Ist dieses Flag gesetzt, dann wird ein evtl. leeres Textobjekt
// nicht geloescht. Stattdessen gibt es dann einen Returncode
// SDRENDTEXTEDIT_SHOULDBEDELETED (anstelle von SDRENDTEXTEDIT_BEDELETED)
// der besagt, dass das Objekt geloescht werden sollte.
SdrEndTextEditKind EndTextEdit(BOOL bDontDeleteReally=FALSE);
- BOOL IsTextEdit() const { return pTextEditObj!=NULL; }
+ BOOL IsTextEdit() const { return pTextEditObj != NULL; }
// Folgende Methode addiert einen passenden Offset zum MouseEvent
// um diesen an den Outliner weiterzureichen.
@@ -195,7 +166,6 @@ public:
// Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==TRUE).
void SetMacroMode(BOOL bOn) { bMacroMode=bOn; }
BOOL IsMacroMode() const { return bMacroMode; }
- void BrkMacroObj();
BOOL IsMacroObj() const { return pMacroObj!=NULL; }
BOOL IsMacroObjDown() const { return bMacroDown; }
};
diff --git a/binfilter/inc/bf_svx/svdhdl.hxx b/binfilter/inc/bf_svx/svdhdl.hxx
index bd4824e..48d9d5c 100644
--- a/binfilter/inc/bf_svx/svdhdl.hxx
+++ b/binfilter/inc/bf_svx/svdhdl.hxx
@@ -46,7 +46,6 @@ class Window;
namespace binfilter {
-class SdrHdlList;
class SdrObject;
class SdrPageView;
class SdrHdlBitmapSet;
@@ -139,8 +138,8 @@ class SdrHdl
public:
virtual ~SdrHdl();
- SdrHdlKind GetKind() const { DBG_BF_ASSERT(0, "STRIP"); return HDL_MOVE; }
- SdrObject* GetObj() const {DBG_BF_ASSERT(0, "STRIP"); return NULL; }
+ SdrHdlKind GetKind() const { return HDL_MOVE; }
+ SdrObject* GetObj() const { return NULL; }
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -152,35 +151,12 @@ public:
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Spiegelachse
-
-// Ein SdrHdlBezWgt hat Kenntnis von seinem "BasisHandle". Seine Draw-Methode
-// zeichnet zusaetzlich eine Linie von seiner Position zur Position dieses
-// BasisHandles.
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// #97016# II
class ImplHdlListData;
class SdrHdlList
{
protected:
- // #97016# II: use ImplHdlListData here to hold two data items
- //SdrMarkView* pView;
ImplHdlListData* pImpl;
Container aList;
@@ -202,27 +178,28 @@ public:
~SdrHdlList();
void Clear();
- // #97016# II
SdrHdl* GetFocusHdl() const;
// Access to View
- // #97016# II: moved implementation to cxx
SdrMarkView* GetView() const;
// Sortierung: 1.Level Erst Refpunkt-Handles, dann normale Handles, dann Glue, dann User, dann Plushandles
// 2.Level PageView (Pointer)
// 3.Level Position (x+y)
- void Sort();
- ULONG GetHdlCount() const { return aList.Count(); }
- SdrHdl* GetHdl(ULONG nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); }
- USHORT GetHdlSize() const { return nHdlSize; }
- BOOL IsMoveOutside() const { return bMoveOutside; }
- void SetRotateShear(BOOL bOn);
- BOOL IsRotateShear() const { return bRotateShear; }
- void SetDistortShear(BOOL bOn);
- BOOL IsDistortShear() const { return bDistortShear; }
- void SetFineHdl(BOOL bOn);
- BOOL IsFineHdl() const { return bFineHandles; }
+ ULONG GetHdlCount() const { return aList.Count(); }
+ SdrHdl* GetHdl(ULONG nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); }
+ USHORT GetHdlSize() const { return nHdlSize; }
+
+ BOOL IsMoveOutside() const { return bMoveOutside; }
+
+ void SetRotateShear(BOOL bOn) { bRotateShear = bOn; }
+ BOOL IsRotateShear() const { return bRotateShear; }
+
+ void SetDistortShear(BOOL bOn) { bDistortShear = bOn; }
+ BOOL IsDistortShear() const { return bDistortShear; }
+
+ void SetFineHdl(BOOL bOn) { bFineHandles = bOn; }
+ BOOL IsFineHdl() const { return bFineHandles; }
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/svdmrkv.hxx b/binfilter/inc/bf_svx/svdmrkv.hxx
index cc12627..65b9224 100644
--- a/binfilter/inc/bf_svx/svdmrkv.hxx
+++ b/binfilter/inc/bf_svx/svdmrkv.hxx
@@ -158,7 +158,6 @@ protected:
unsigned bForceFrameHandles : 1; // Persistent - FrameDrag auch bei Einzelobjekten
unsigned bPlusHdlAlways : 1; // Persistent
unsigned bMarkHdlWhenTextEdit : 1; // Persistent, default=FALSE
-// unsigned bSolidHdlBackgroundInvalid : 1; // Hintergrund der Handles ungueltig?
unsigned bInsPolyPoint : 1; // z.Zt InsPolyPointDragging
unsigned bEdgesOfMarkedNodesDirty : 1;
unsigned bMarkedObjRectDirty : 1;
@@ -177,7 +176,6 @@ protected:
virtual void SetMarkHandles(); // aHdl (Liste der Handles) fuellen
-// virtual void DrawMarkHdl(OutputDevice* pOut, BOOL bNoRefHdl) const; // Togglen der Handles
virtual void SetMarkRects(); // Rects an den PageViews
virtual void CheckMarked(); // MarkList nach Del und Lock Layer durchsuchen...
diff --git a/binfilter/inc/bf_svx/unoforou.hxx b/binfilter/inc/bf_svx/unoforou.hxx
index f5534c1..99cd087 100644
--- a/binfilter/inc/bf_svx/unoforou.hxx
+++ b/binfilter/inc/bf_svx/unoforou.hxx
@@ -100,7 +100,7 @@ public:
virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
virtual USHORT GetLineCount( USHORT nPara ) const;
- virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const;
+ virtual USHORT GetLineLen( USHORT /* nPara */, USHORT /* nLine */ ) const { return 0; } // DBG_BF_ASSERT
virtual sal_Bool Delete( const ESelection& );
virtual sal_Bool InsertText( const String&, const ESelection& );
virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE );
diff --git a/binfilter/inc/bf_svx/unoviwou.hxx b/binfilter/inc/bf_svx/unoviwou.hxx
index 50ed8b4..d5d2f8c 100644
--- a/binfilter/inc/bf_svx/unoviwou.hxx
+++ b/binfilter/inc/bf_svx/unoviwou.hxx
@@ -57,9 +57,9 @@ public:
virtual sal_Bool GetSelection( ESelection& rSelection ) const;
virtual sal_Bool SetSelection( const ESelection& rSelection );
- virtual sal_Bool Copy();
- virtual sal_Bool Cut();
- virtual sal_Bool Paste();
+ virtual sal_Bool Copy() { return sal_True; } // DBG_BF_ASSERT
+ virtual sal_Bool Cut() { return sal_True; } // DBG_BF_ASSERT
+ virtual sal_Bool Paste() { return sal_True; } // DBG_BF_ASSERT
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_xmloff/xmlcnitm.hxx b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
index c6bf1a4..7d59ea9 100644
--- a/binfilter/inc/bf_xmloff/xmlcnitm.hxx
+++ b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
@@ -84,10 +84,10 @@ public:
const ::rtl::OUString& GetAttrLName( sal_uInt16 i ) const;
const ::rtl::OUString& GetAttrValue( sal_uInt16 i ) const;
- sal_uInt16 GetFirstNamespaceIndex() const; // { return 0; } // DBG_BF_ASSERT
- sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; // { return 0; } // DBG_BF_ASSERT
- const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const;
- const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const;
+ sal_uInt16 GetFirstNamespaceIndex() const; // { return 0; } DBG_BF_ASSERT
+ sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; // { return 0; } DBG_BF_ASSERT
+ const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const; // DBG_BF_ASSERT
+ const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const; // DBG_BF_ASSERT
};
}//end of namespace binfilter
More information about the Libreoffice-commits
mailing list