[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_goodies binfilter/bf_sc binfilter/bf_sch binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc filter/source writerfilter/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Feb 7 12:41:04 PST 2011
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 6
binfilter/bf_forms/source/component/forms_ImageControl.cxx | 60 -
binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx | 96 --
binfilter/bf_sc/source/core/data/sc_pivot.cxx | 29
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 11
binfilter/bf_sc/source/ui/inc/navipi.hxx | 32
binfilter/bf_sch/source/core/sch_chtm3d2.cxx | 58 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 48 -
binfilter/bf_starmath/source/starmath_rect.cxx | 102 --
binfilter/bf_svtools/source/config/svt_dynamicmenuoptions.cxx | 87 -
binfilter/bf_svtools/source/config/svt_historyoptions.cxx | 16
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 16
binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx | 83 -
binfilter/bf_svx/source/engine3d/svx_label3d.cxx | 72 -
binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx | 105 --
binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx | 31
binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx | 16
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 165 ---
binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx | 147 ---
binfilter/bf_svx/source/svdraw/svx_svdotext.cxx | 50 -
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 71 -
binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx | 40
binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx | 169 ---
binfilter/bf_svx/source/svdraw/svx_svdundo.cxx | 219 ----
binfilter/bf_svx/source/xoutdev/svx__xfont.cxx | 45
binfilter/bf_sw/source/core/inc/frame.hxx | 2
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoevent.cxx | 111 --
binfilter/inc/bf_goodies/b3dtex.hxx | 232 -----
binfilter/inc/bf_goodies/base3d.hxx | 315 ------
binfilter/inc/bf_svtools/nfversi.hxx | 1
binfilter/inc/bf_svx/svdmodel.hxx | 20
binfilter/inc/bf_svx/svdoedge.hxx | 2
binfilter/inc/bf_svx/svdpntv.hxx | 14
binfilter/inc/bf_svx/svdsnpv.hxx | 10
binfilter/inc/bf_svx/svdundo.hxx | 193 ----
binfilter/inc/bf_svx/svdview.hxx | 10
binfilter/inc/bf_sw/poolfmt.hxx | 8
filter/source/config/cache/filterfactory.cxx | 39
filter/source/config/cache/macros.hxx | 78 -
filter/source/config/cache/typedetection.cxx | 13
filter/source/flash/swfwriter1.cxx | 26
filter/source/graphicfilter/eos2met/eos2met.cxx | 24
filter/source/graphicfilter/icgm/actimpr.cxx | 127 --
filter/source/msfilter/escherex.cxx | 73 -
filter/source/msfilter/eschesdo.cxx | 94 --
filter/source/msfilter/msdffimp.cxx | 135 --
filter/source/msfilter/svdfppt.cxx | 125 --
filter/source/pdf/pdfexport.cxx | 82 -
filter/source/svg/svgscript.hxx | 90 -
writerfilter/source/dmapper/FontTable.cxx | 452 ----------
51 files changed, 19 insertions(+), 4035 deletions(-)
New commits:
commit 07ee6e33019cdcbf02ddc17df7661a197f1b2dfc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 7 20:11:01 2011 +0100
Remove lots of dead code
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index fe36d1e..26e8bc3 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -54,8 +54,6 @@
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-
-
#include "GroupManager.hxx"
#include "property.hrc"
@@ -971,10 +969,6 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
{
::rtl::OUString aResult;
- // Immer ANSI #58641
-// rString.Convert(CHARSET_SYSTEM, CHARSET_ANSI);
-
-
// Zeilenendezeichen werden als CR dargestellt
UniString sConverter = rString;
sConverter.ConvertLineEnd( LINEEND_CR );
diff --git a/binfilter/bf_forms/source/component/forms_ImageControl.cxx b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
index 1695c57..9473029 100644
--- a/binfilter/bf_forms/source/component/forms_ImageControl.cxx
+++ b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
@@ -44,12 +44,10 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
-
#include <unotools/streamhelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <com/sun/star/form/FormComponentType.hpp>
-
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <comphelper/property.hxx>
@@ -67,7 +65,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
-//using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::form;
@@ -567,31 +564,6 @@ StringSequence OImageControlControl::getSupportedServiceNames() throw()
void SAL_CALL OImageControlControl::createPeer(const Reference<XToolkit>& _rxToolkit, const Reference<XWindowPeer>& Parent) throw( RuntimeException )
{
OBoundControl::createPeer(_rxToolkit, Parent);
- // the following is not necessary anymore. The aggregated control (from the toolkit project)
- // itself will register as image consumer at the image producer, so there's no need to do this ourself.
- // This holds since our model is an XImageProducer itself, and thus hiding the XImageProducer of the aggregated
- // model. Before, we had two ImageProducers working in parallel.
- // 2003-05-15 - 109591 - fs at openoffice.org
-
-/**
- if (!m_xControl.is())
- return;
-
- // ImageConsumer vom Control holen
- Reference<XWindowPeer> xPeer = m_xControl->getPeer();
- Reference<XImageConsumer> xImageConsumer(xPeer, UNO_QUERY);
- if (!xImageConsumer.is())
- return;
-
- // ImageConsumer am Imageproducer setzen
- Reference<XImageProducerSupplier> xImageSource(m_xControl->getModel(), UNO_QUERY);
- if (!xImageSource.is())
- return;
- Reference<XImageProducer> xImageProducer = xImageSource->getImageProducer();
-
- xImageProducer->addConsumer(xImageConsumer);
- xImageProducer->startProduction();
-*/
}
//------------------------------------------------------------------------------
@@ -605,38 +577,6 @@ void OImageControlControl::implClearGraphics()
//------------------------------------------------------------------------------
void OImageControlControl::implInsertGraphics()
{
-// Reference< XPropertySet > xSet( getModel(), UNO_QUERY );
-// if ( !xSet.is() )
-// return;
-
-// ::rtl::OUString sTitle = FRM_RES_STRING(RID_STR_IMPORT_GRAPHIC);
-// // build some arguments for the upcoming dialog
-// try
-// {
-// ::binfilter::sfx2::FileDialogHelper aDialog( ::binfilter::sfx2::FILEOPEN_LINK_PREVIEW, SFXWB_GRAPHIC );
-// aDialog.SetTitle( sTitle );
-
-// Reference< XFilePickerControlAccess > xController(aDialog.GetFilePicker(), UNO_QUERY);
-// DBG_ASSERT( xController.is(), "OImageControlControl::implInsertGraphics: invalid file picker!" );
-// if ( xController.is() )
-// {
-// xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(sal_True));
-// xController->enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False);
-// }
-
-// if ( ERRCODE_NONE == aDialog.Execute() )
-// {
-// // reset the url property in case it already has the value we're about to set - in this case
-// // our propertyChanged would not get called without this.
-// implClearGraphics();
-
-// xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( aDialog.GetPath() ) ) );
-// }
-// }
-// catch(Exception&)
-// {
-// DBG_ERROR("OImageControlControl::implInsertGraphics: caught an exception while attempting to execute the FilePicker!");
-// }
}
// MouseListener
diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx b/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx
index 0eb7070..efa9012 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx
@@ -380,18 +380,6 @@ void B3dComplexPolygon::ComputeLastPolygon(BOOL bIsLast)
// Sind noch genug Punkte da?
if(aEntityBuffer.Count() < nNewPolyStart + 3)
{
- // Geometrie ausgeben, obwohl zuwenig Punkte fuer ein Polygon
-// if(pBase3D)
-// {
-// pBase3D->StartPrimitive(Base3DPolygon);
-// for(UINT32 a=0; a < aEntityBuffer.Count(); a++)
-// {
-// pBase3D->SetEdgeFlag(aEntityBuffer[a].IsEdgeVisible());
-// pBase3D->AddVertex(aEntityBuffer[a]);
-// }
-// pBase3D->EndPrimitive();
-// }
-// else
if(pGeometry)
{
pGeometry->StartComplexPrimitive();
@@ -404,39 +392,6 @@ void B3dComplexPolygon::ComputeLastPolygon(BOOL bIsLast)
{
if(!nNewPolyStart && bIsLast && IsConvexPolygon())
{
- // Falls das PolyPolygon nur aus einem Polygon besteht
- // und es Konvex ist, ist man fertig.
- // Um die Qualitaet zu verbessern, wird fuer
- // Polygone ab einer gewissen Punktzahl ein
- // abschliessender Mittelpunkt generiert.
-// if(pBase3D)
-// {
-// pBase3D->StartPrimitive(Base3DPolygon);
-// if(aEntityBuffer.Count() > 4)
-// {
-// B3dEntity aNew;
-// aNew.CalcMiddle(aEntityBuffer[0], aEntityBuffer[aEntityBuffer.Count() / 2]);
-// pBase3D->SetEdgeFlag(FALSE);
-// pBase3D->AddVertex(aNew);
-// for(UINT32 a=0; a < aEntityBuffer.Count(); a++)
-// {
-// pBase3D->SetEdgeFlag(aEntityBuffer[a].IsEdgeVisible());
-// pBase3D->AddVertex(aEntityBuffer[a]);
-// }
-// pBase3D->SetEdgeFlag(FALSE);
-// pBase3D->AddVertex(aEntityBuffer[0]);
-// }
-// else
-// {
-// for(UINT32 a=0; a < aEntityBuffer.Count(); a++)
-// {
-// pBase3D->SetEdgeFlag(aEntityBuffer[a].IsEdgeVisible());
-// pBase3D->AddVertex(aEntityBuffer[a]);
-// }
-// }
-// pBase3D->EndPrimitive();
-// }
-// else
if(pGeometry)
{
pGeometry->StartComplexPrimitive();
@@ -527,31 +482,6 @@ void B3dComplexPolygon::ChooseNormal()
|*
\************************************************************************/
-//void B3dComplexPolygon::EndPrimitive(Base3D* pB3D)
-//{
-// // Funktionszeiger setzen
-// pBase3D = pB3D;
-//
-// // Letztes angefangenes Poly verarbeiten
-// ComputeLastPolygon(TRUE);
-//
-// // Wenn es Kanten gibt
-// if(pEdgeList)
-// {
-// // Dreiecke generieren und ausgeben
-// pBase3D->StartPrimitive(Base3DTriangles);
-// while(pEdgeList)
-// ExtractTriangle();
-// pBase3D->EndPrimitive();
-// }
-//
-// // Buffer leeren
-// EmptyBuffers();
-//
-// // Zeiger wieder loeschen
-// pBase3D = NULL;
-//}
-
void B3dComplexPolygon::EndPrimitive(B3dGeometry *pGeom)
{
// Funktionszeiger setzen
@@ -1078,7 +1008,6 @@ void B3dComplexPolygon::ExtractTriangle()
if(!pRight)
{
-// DBG_ASSERT(0, "AW: Einzelne Kante als Startpunkt!");
RemoveFirstEdge(pEdgeList);
return;
}
@@ -1140,31 +1069,6 @@ void B3dComplexPolygon::ExtractTriangle()
bOrientationValid = TRUE;
}
- // Dreieck ausgeben
-// if(pBase3D)
-// {
-// if(bOrientation)
-// {
-// // Rechtsrum
-// pBase3D->SetEdgeFlag(bRightVisible);
-// pBase3D->AddVertex(*pEntTop);
-// pBase3D->SetEdgeFlag(bDidEdgeExist);
-// pBase3D->AddVertex(*pEntRight);
-// pBase3D->SetEdgeFlag(bLeftVisible);
-// pBase3D->AddVertex(*pEntLeft);
-// }
-// else
-// {
-// // Linksrum
-// pBase3D->SetEdgeFlag(bLeftVisible);
-// pBase3D->AddVertex(*pEntTop);
-// pBase3D->SetEdgeFlag(bDidEdgeExist);
-// pBase3D->AddVertex(*pEntLeft);
-// pBase3D->SetEdgeFlag(bRightVisible);
-// pBase3D->AddVertex(*pEntRight);
-// }
-// }
-// else
if(pGeometry)
{
pGeometry->StartComplexPrimitive();
diff --git a/binfilter/bf_sc/source/core/data/sc_pivot.cxx b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
index f31b559..5671f59 100644
--- a/binfilter/bf_sc/source/core/data/sc_pivot.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
@@ -830,11 +830,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ void ScPivot::GetDataFields(PivotField* pFieldArr, short& rCount) const
/*N*/ {
-/* for (short i=0; i<nDataCount; i++)
- pFieldArr[i] = aDataArr[i];
- rCount = nDataCount;
-*/
-/*N*/
/*N*/ rCount = 0;
/*N*/ for (short i=0; i<nDataCount; i++)
/*N*/ {
@@ -860,10 +855,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ BOOL ScPivot::CreateData(BOOL bKeepDest)
/*N*/ {
-/*N*/ //
-/*N*/ //
-/*N*/ //
-/*N*/
/*N*/ USHORT nOldCol2 = nDestCol2;
/*N*/ USHORT nOldRow2 = nDestRow2;
/*N*/
@@ -939,11 +930,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ pColRef = NULL;
/*N*/ }
-
-
-
-
-
//--------------------------------------------------------------------------------------------------
// Private Methoden
//--------------------------------------------------------------------------------------------------
@@ -1206,11 +1192,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*?*/ else
/*?*/ nColLines += (pRowList[i]->GetCount() * aRowArr[i].nFuncCount);
/*N*/ }
-/*N*/ /*
- // Ergebnisspalten des letzten Elements
- if (aRowArr[nRowCount-1].nCol != PIVOT_DATA_FIELD)
- nColLines += (pRowList[nRowCount-1]->GetCount() * aRowArr[nRowCount-1].nFuncCount);
- */
/*N*/ if (nColLines > MAXCOL)
/*?*/ nDestCol2 = MAXCOL+2; // ungueltig, 1 wird unten abgezogen
/*N*/ else if (bDataAtCol)
@@ -1252,11 +1233,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*?*/ else
/*?*/ nRowLines += (pColList[i]->GetCount() * aColArr[i].nFuncCount);
/*N*/ }
- /*
- // Ergebniszeilen des letzten Elements
- if (aColArr[nColCount-1].nCol != PIVOT_DATA_FIELD)
- nRowLines += (pColList[nColCount-1]->GetCount() * aColArr[nColCount-1].nFuncCount);
- */
/*N*/ if (nRowLines > MAXROW)
/*?*/ nDestRow2 = MAXROW+2; // ungueltig, 1 wird unten abgezogen
/*N*/ else if (!bDataAtCol)
@@ -1286,10 +1262,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ }
/*N*/ }
-
-
-
-
/*N*/ USHORT ScPivot::GetCategoryRow( USHORT nCol, USHORT nRow )
/*N*/ {
/*N*/ USHORT nMinRow = nSrcRow1;
@@ -1307,7 +1279,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index b31395b..005fc13 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -150,11 +150,6 @@ namespace binfilter {
/*N*/ case ocNominal:
/*N*/ case ocPercentSign:
/*N*/ return NUMBERFORMAT_PERCENT;
-/*N*/ // case ocSum:
-/*N*/ // case ocSumSQ:
-/*N*/ // case ocProduct:
-/*N*/ // case ocAverage:
-/*N*/ // return -1;
/*N*/ default:
/*N*/ return NUMBERFORMAT_NUMBER;
/*N*/ }
@@ -430,10 +425,6 @@ namespace binfilter {
/*N*/ if (bCompileXML)
/*N*/ rBuffer.append(sal_Unicode('['));
/*N*/ ComplRefData aRef( rRef );
-/*N*/ // falls abs/rel nicht separat: Relativ- in Abs-Referenzen wandeln!
-/*N*/ // AdjustReference( aRef.Ref1 );
-/*N*/ // if( !bSingleRef )
-/*N*/ // AdjustReference( aRef.Ref2 );
/*N*/ aRef.Ref1.CalcAbsIfRel( aPos );
/*N*/ if( !bSingleRef )
/*N*/ aRef.Ref2.CalcAbsIfRel( aPos );
@@ -823,8 +814,6 @@ namespace binfilter {
/*N*/ double fVal;
/*N*/ sal_uInt32 nIndex = ( pSymbolTable == pSymbolTableEnglish ?
/*N*/ pDoc->GetFormatTable()->GetStandardIndex( LANGUAGE_ENGLISH_US ) : 0 );
-/*N*/ // ULONG nIndex = 0;
-/*N*/ //// ULONG nIndex = pDoc->GetFormatTable()->GetStandardIndex(ScGlobal::eLnge);
/*N*/ if (pDoc->GetFormatTable()->IsNumberFormat( rSym, nIndex, fVal ) )
/*N*/ {
/*N*/ USHORT nType = pDoc->GetFormatTable()->GetType(nIndex);
diff --git a/binfilter/bf_sc/source/ui/inc/navipi.hxx b/binfilter/bf_sc/source/ui/inc/navipi.hxx
index c199ae0..0ad0e3d 100644
--- a/binfilter/bf_sc/source/ui/inc/navipi.hxx
+++ b/binfilter/bf_sc/source/ui/inc/navipi.hxx
@@ -65,38 +65,6 @@ enum NavListMode { NAV_LMODE_NONE = 0x4000,
NAV_LMODE_DOCS = 0x800,
NAV_LMODE_SCENARIOS = 0x400 };
-//========================================================================
-// class ScScenarioListBox -----------------------------------------------
-//========================================================================
-
-//========================================================================
-// class ScScenarioWindow ------------------------------------------------
-//========================================================================
-
-//==================================================================
-// class ColumnEdit
-//==================================================================
-
-
-//==================================================================
-// class RowEdit
-//==================================================================
-
-
-//==================================================================
-// class ScDocListBox
-//==================================================================
-
-
-//==================================================================
-// class CommandToolBox
-//==================================================================
-
-//==================================================================
-// class ScNavigatorDlg
-//==================================================================
-
-
//==================================================================
class ScNavigatorDialogWrapper: public SfxChildWindowContext
diff --git a/binfilter/bf_sch/source/core/sch_chtm3d2.cxx b/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
index 793e252..47a07f6 100644
--- a/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
@@ -177,12 +177,6 @@ namespace binfilter {
/*N*/
/*N*/ fRoundedEdge = ((double)((const Svx3DPercentDiagonalItem&)
/*N*/ rAttr.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue()) / 200.0;
-/*N*/ //-/ SfxItemState nState = rAttr.GetItemState( SID_ATTR_3D_PERCENT_DIAGONAL, TRUE, &pPoolItem );
-/*N*/ //-/ if( nState == SFX_ITEM_DEFAULT )
-/*N*/ //-/ fRoundedEdge = aDefltAttr3D.GetDefaultPercentDiag();
-/*N*/ //-/ else if( nState == SFX_ITEM_SET && pPoolItem )
-/*N*/ //-/ fRoundedEdge = SAL_STATIC_CAST( double, ( SAL_STATIC_CAST( const SfxUInt16Item*, pPoolItem )->GetValue() ))
-/*N*/ //-/ / 200.0;
/*N*/
/*N*/ // always use extra points, so set percent diagonal to 0.4 which is 0% in the UI
/*N*/ if( fRoundedEdge == 0.0 )
@@ -231,11 +225,6 @@ namespace binfilter {
/*N*/ pObj = new SchE3dLatheObj(aDefltAttr3D, aPolyPoly);
/*N*/ ((E3dLatheObj*)pObj)->SetItem( Svx3DHorizontalSegmentsItem( nSegs ));
/*N*/
-/*N*/
-/*N*/ // #67170# just write the necessary attributes
-/*N*/ //-/ SfxItemSet aSegmentAttr(*pItemPool, SID_ATTR_3D_START, SID_ATTR_3D_END,
-/*N*/ //-/ SCHATTR_STYLE_START, SCHATTR_STYLE_END,
-/*N*/ //-/ 0);
/*N*/ SfxItemSet aSegmentAttr(*pItemPool,
/*N*/ SDRATTR_3D_FIRST, SDRATTR_3D_LAST,
/*N*/ SCHATTR_STYLE_START, SCHATTR_STYLE_END,
@@ -300,10 +289,6 @@ namespace binfilter {
/*N*/ pObj = new SchE3dLatheObj( aDefltAttr3D, aPolyPoly );
/*N*/ ((E3dLatheObj*)pObj)->SetItem( Svx3DHorizontalSegmentsItem( nSegs ));
/*N*/
-/*N*/ // #67170# just write the necessary attributes
-/*N*/ //-/ SfxItemSet aSegmentAttr(*pItemPool, SID_ATTR_3D_START, SID_ATTR_3D_END,
-/*N*/ //-/ SCHATTR_STYLE_START, SCHATTR_STYLE_END,
-/*N*/ //-/ 0);
/*N*/ SfxItemSet aSegmentAttr(*pItemPool,
/*N*/ SDRATTR_3D_FIRST, SDRATTR_3D_LAST,
/*N*/ SCHATTR_STYLE_START, SCHATTR_STYLE_END,
@@ -381,7 +366,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ aTransMat.Translate(aDestCenter - aOldCenter);//An die gewuenschte Position schieben
-/*N*/ //aTransMat=pObj->GetTransform()*aTransMat;
/*N*/ pObj->NbcSetTransform(aTransMat);
/*N*/
/*N*/ pObj->SetModel (this);
@@ -442,7 +426,6 @@ namespace binfilter {
/*N*/ pParent->Insert3DObj (pMyObject);
/*N*/ pMyObject->SetModel (this);
/*N*/
-/*N*/ //-/ pMyObject->NbcSetAttributes(*pAttr, FALSE);
/*N*/ pMyObject->SetItemSet(*pAttr);
/*N*/
/*N*/ }
@@ -457,7 +440,6 @@ namespace binfilter {
/*N*/ pParent->Insert3DObj (pMyObject);
/*N*/ pMyObject->SetModel (this);
/*N*/
-/*N*/ //-/ pMyObject->NbcSetAttributes(*pAttr, FALSE);
/*N*/ pMyObject->SetItemSet(*pAttr);
/*N*/
/*N*/ }
@@ -557,52 +539,12 @@ namespace binfilter {
//////////////////////////////////////////////////////////////////////////////
-
-
/*N*/ void SchE3dObject::SetItemSet(const SfxItemSet& rSet)
/*N*/ {
/*N*/ E3dObject::SetItemSet(rSet);
/*N*/ ImpStoreObjcetsAttr(this);
/*N*/ }
-//////////////////////////////////////////////////////////////////////////////
-
-//-/void SchRectObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
-//-/{
-//-/ SdrRectObj::NbcSetAttributes(rAttr,bReplaceAll);
-//-/ ChartModel* pModel=(ChartModel*)GetModel();
-//-/ if(pModel)
-//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
-//-/};
-//-/void SchE3dExtrudeObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
-//-/{
-//-/ E3dExtrudeObj::NbcSetAttributes(rAttr,bReplaceAll);
-//-/ ChartModel* pModel=(ChartModel*)GetModel();
-//-/ if(pModel)
-//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
-//-/};
-//-/void SchE3dPolygonObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
-//-/{
-//-/ E3dPolygonObj::NbcSetAttributes(rAttr,bReplaceAll);
-//-/ ChartModel* pModel=(ChartModel*)GetModel();
-//-/ if(pModel)
-//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
-//-/};
-//-/void SchE3dLatheObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
-//-/{
-//-/ E3dLatheObj::NbcSetAttributes(rAttr,bReplaceAll);
-//-/ ChartModel* pModel=(ChartModel*)GetModel();
-//-/ if(pModel)
-//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
-//-/};
-//-/void SchE3dObject::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
-//-/{
-//-/ E3dObject::NbcSetAttributes(rAttr,bReplaceAll);
-//-/ ChartModel* pModel=(ChartModel*)GetModel();
-//-/ if(pModel)
-//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
-//-/};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index aa54236..34a5eb6 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -881,28 +881,6 @@ void SAL_CALL ChXDiagram::setPropertyValue( const ::rtl::OUString& aPropertyName
aSceneTAR.maMat = pScene->GetTransform();
aSceneTAR.maRect = pScene->GetSnapRect();
-// // rescue object transformations
-// SdrObjListIter aIter(*pScene->GetSubList(), IM_DEEPWITHGROUPS);
-// List aObjTrans;
-// while(aIter.IsMore())
-// {
-// E3dObject* p3DObj = (E3dObject*)aIter.Next();
-// Matrix4D* pNew = new Matrix4D;
-// *pNew = p3DObj->GetTransform();
-// aObjTrans.Insert(pNew, LIST_APPEND);
-// }
-
- // reset object transformations
-// aIter.Reset();
-// while(aIter.IsMore())
-// {
-// E3dObject* p3DObj = (E3dObject*)aIter.Next();
-// p3DObj->NbcResetTransform();
-// }
-
- // reset scene transformation and make a complete recalc
-// pScene->NbcResetTransform();
-
// fill old camera from new parameters
Camera3D aCam(pScene->GetCamera());
const Volume3D& rVolume = pScene->GetBoundVolume();
@@ -925,17 +903,6 @@ void SAL_CALL ChXDiagram::setPropertyValue( const ::rtl::OUString& aPropertyName
// set at scene
pScene->SetCamera(aCam);
- // set object transformations again at objects
-// aIter.Reset();
-// sal_uInt32 nIndex(0L);
-// while(aIter.IsMore())
-// {
-// E3dObject* p3DObj = (E3dObject*)aIter.Next();
-// Matrix4D* pMat = (Matrix4D*)aObjTrans.GetObject(nIndex++);
-// p3DObj->NbcSetTransform(*pMat);
-// delete pMat;
-// }
-
// set scene transformation again at scene
pScene->NbcSetTransform(aSceneTAR.maMat);
pScene->FitSnapRectToBoundVol();
@@ -1711,8 +1678,7 @@ Sequence<PropertyState> SAL_CALL ChXDiagram::getPropertyStates (
// Get the models attributes.
ChartType aType (mpModel);
-// SfxItemSet aAttributes (mpModel->GetItemPool(),
-// mpModel->GetAttr (mnWhichId, mnIndex).GetRanges());
+
// This needs still a bit of work. What is the best set of which id ranges?
SfxItemSet aAttributes (mpModel->GetItemPool(),
CHART_ROW_WHICHPAIRS,
@@ -1886,10 +1852,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChXDiagram::getSupportedServiceNames()
"com.sun.star.chart.StackableDiagram",
"com.sun.star.chart.Dim3DDiagram",
"com.sun.star.chart.ChartAxisZSupplier" );
- // Note: the required properties and interfaces and therefore the
- // service itself is always available
-// if( mpModel->Is3DChart() )
-// SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.chart.ChartAxisZSupplier" );
break;
case CHTYPE_AREA:
SvxServiceInfoHelper::addToSequence(
@@ -1903,10 +1865,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChXDiagram::getSupportedServiceNames()
"com.sun.star.chart.StackableDiagram",
"com.sun.star.chart.Dim3DDiagram",
"com.sun.star.chart.ChartAxisZSupplier" );
- // Note: the required properties and interfaces and therefore the
- // service itself is always available
-// if( mpModel->Is3DChart() )
-// SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.chart.ChartAxisZSupplier" );
break;
case CHTYPE_DONUT :
SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.chart.DonutDiagram" );
@@ -1924,10 +1882,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChXDiagram::getSupportedServiceNames()
"com.sun.star.chart.StackableDiagram",
"com.sun.star.chart.Dim3DDiagram",
"com.sun.star.chart.ChartAxisZSupplier" );
- // Note: the required properties and interfaces and therefore the
- // service itself is always available
-// if( mpModel->Is3DChart() )
-// SvxServiceInfoHelper::addToSequence(aSeq, 1, "com.sun.star.chart.ChartAxisZSupplier" );
break;
case CHTYPE_CIRCLE :
SvxServiceInfoHelper::addToSequence(
diff --git a/binfilter/bf_starmath/source/starmath_rect.cxx b/binfilter/bf_starmath/source/starmath_rect.cxx
index 3f97a23..9f52180 100644
--- a/binfilter/bf_starmath/source/starmath_rect.cxx
+++ b/binfilter/bf_starmath/source/starmath_rect.cxx
@@ -554,96 +554,6 @@ static xub_Unicode const aMathAlpha[] =
/*N*/ return *this;
/*N*/ }
-
-//SmRect & SmRect::ExtendBy(const Point &rPoint)
-// // extend current rectangle to include 'rPoint'.
-// // The effect should be similar to
-// // "ExtendBy(rRect, RCP_THIS, (BOOL) TRUE)"
-// // where 'rRect' is a SmRect of size and width 1 with no italic spaces
-// // (as by "SmRect (1, 1)") and position at 'rPoint'.
-//{
-// // get some values used for italic spaces adaption
-// // ! (need to be done before changing current SmRect) !
-// long nL = Min(GetItalicLeft(), rPoint.X()),
-// nR = Max(GetItalicRight(), rPoint.X());
-//
-// // this is the adaption of rectangle union
-// if (rPoint.X() < GetLeft())
-// SetLeft(rPoint.X());
-// if (rPoint.X() > GetRight())
-// SetRight(rPoint.X());
-// if (rPoint.Y() < GetTop())
-// SetTop(rPoint.Y());
-// if (rPoint.Y() > GetBottom())
-// SetBottom(rPoint.Y());
-//
-// SetItalicSpaces(GetLeft() - nL, nR - GetRight());
-//
-// return *this;
-//}
-
-
-//long SmRect::OrientedDist(const Point &rPoint) const
-// // return oriented distance of rPoint to the current rectangle,
-// // especially the return value is <= 0 iff the point is inside the
-// // rectangle.
-// // For simplicity the maximum-norm is used.
-//{
-// BOOL bIsInside = IsInsideItalicRect(rPoint);
-//
-// // build reference point to define the distance
-// Point aRef;
-// if (bIsInside)
-// { Point aIC (GetItalicCenterX(), GetCenterY());
-//
-// aRef.X() = rPoint.X() >= aIC.X() ? GetItalicRight() : GetItalicLeft();
-// aRef.Y() = rPoint.Y() >= aIC.Y() ? GetBottom() : GetTop();
-// }
-// else
-// {
-// // x-coordinate
-// if (rPoint.X() > GetItalicRight())
-// aRef.X() = GetItalicRight();
-// else if (rPoint.X() < GetItalicLeft())
-// aRef.X() = GetItalicLeft();
-// else
-// aRef.X() = rPoint.X();
-// // y-coordinate
-// if (rPoint.Y() > GetBottom())
-// aRef.Y() = GetBottom();
-// else if (rPoint.Y() < GetTop())
-// aRef.Y() = GetTop();
-// else
-// aRef.Y() = rPoint.Y();
-// }
-//
-// // build distance vector
-// Point aDist (aRef - rPoint);
-//
-// long nAbsX = labs(aDist.X()),
-// nAbsY = labs(aDist.Y());
-//
-// return bIsInside ? - Min(nAbsX, nAbsY) : Max (nAbsX, nAbsY);
-//}
-
-
-//BOOL SmRect::IsInsideRect(const Point &rPoint) const
-//{
-// return rPoint.Y() >= GetTop()
-// && rPoint.Y() <= GetBottom()
-// && rPoint.X() >= GetLeft()
-// && rPoint.X() <= GetRight();
-//}
-
-
-//BOOL SmRect::IsInsideItalicRect(const Point &rPoint) const
-//{
-// return rPoint.Y() >= GetTop()
-// && rPoint.Y() <= GetBottom()
-// && rPoint.X() >= GetItalicLeft()
-// && rPoint.X() <= GetItalicRight();
-//}
-
SmRect SmRect::AsGlyphRect() const
{
SmRect aRect (*this);
@@ -653,18 +563,6 @@ SmRect SmRect::AsGlyphRect() const
}
-// forward declaration
-
-
-
-
-////////////////////////////////////////
-// misc functions
-//
-
-
-
-
/*N*/ BOOL SmGetGlyphBoundRect(const OutputDevice &rDev,
/*N*/ const XubString &rText, Rectangle &rRect)
/*N*/ // basically the same as 'GetTextBoundRect' (in class 'OutputDevice')
diff --git a/binfilter/bf_svtools/source/config/svt_dynamicmenuoptions.cxx b/binfilter/bf_svtools/source/config/svt_dynamicmenuoptions.cxx
index f0e5080..2b84ab5 100644
--- a/binfilter/bf_svtools/source/config/svt_dynamicmenuoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_dynamicmenuoptions.cxx
@@ -33,17 +33,11 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/dynamicmenuoptions.hxx>
-
#include <bf_svtools/moduleoptions.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <tools/debug.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
#ifndef __SGI_STL_VECTOR
@@ -529,87 +523,6 @@ void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& )
void SvtDynamicMenuOptions_Impl::Commit()
{
DBG_ERROR( "SvtDynamicMenuOptions_Impl::Commit()\nNot implemented yet!\n" );
- /*
- // Write all properties!
- // Delete complete sets first.
- ClearNodeSet( SETNODE_NEWMENU );
- ClearNodeSet( SETNODE_WIZARDMENU );
- ClearNodeSet( SETNODE_HELPBOOKMARKS );
-
- MenuEntry aItem ;
- OUString sNode ;
- Sequence< PropertyValue > lPropertyValues( PROPERTYCOUNT );
- sal_uInt32 nItem = 0 ;
-
- // Copy "new" menu entries to save-list!
- sal_uInt32 nNewCount = m_aNewMenu.size();
- for( nItem=0; nItem<nNewCount; ++nItem )
- {
- aItem = m_aNewMenu[nItem];
- // Format: "New/1/URL"
- // "New/1/Title"
- // ...
- sNode = SETNODE_NEWMENU + PATHDELIMITER + PATHPREFIX + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
-
- lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER ;
- lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME ;
-
- lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ;
- lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier ;
- lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName ;
-
- SetSetProperties( SETNODE_NEWMENU, lPropertyValues );
- }
-
- // Copy "wizard" menu entries to save-list!
- sal_uInt32 nWizardCount = m_aWizardMenu.size();
- for( nItem=0; nItem<nWizardCount; ++nItem )
- {
- aItem = m_aWizardMenu[nItem];
- // Format: "Wizard/1/URL"
- // "Wizard/1/Title"
- // ...
- sNode = SETNODE_WIZARDMENU + PATHDELIMITER + PATHPREFIX + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
-
- lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER ;
- lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME ;
-
- lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ;
- lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier ;
- lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName ;
-
- SetSetProperties( SETNODE_WIZARDMENU, lPropertyValues );
- }
-
- // Copy help bookmarks entries to save-list!
- sal_uInt32 nHelpBookmarksCount = m_aHelpBookmarksMenu.size();
- for( nItem=0; nItem<nHelpBookmarksCount; ++nItem )
- {
- aItem = m_aHelpBookmarksMenu[nItem];
- // Format: "HelpBookmarks/1/URL"
- // "HelpBookmarks/1/Title"
- // ...
- sNode = SETNODE_HELPBOOKMARKS + PATHDELIMITER + PATHPREFIX + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
-
- lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER ;
- lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME ;
-
- lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ;
- lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier ;
- lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName ;
-
- SetSetProperties( SETNODE_HELPBOOKMARKS, lPropertyValues );
- }
- */
}
//*****************************************************************************************************************
diff --git a/binfilter/bf_svtools/source/config/svt_historyoptions.cxx b/binfilter/bf_svtools/source/config/svt_historyoptions.cxx
index 743fbc4..8d82fca 100644
--- a/binfilter/bf_svtools/source/config/svt_historyoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_historyoptions.cxx
@@ -33,15 +33,10 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/historyoptions.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <tools/debug.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
#ifndef __SGI_STL_DEQUE
@@ -349,17 +344,6 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
++nPosition;
m_aHelpBookmarks.push_back( aItem );
}
-
-/*TODO: Not used in the moment! see Notify() ...
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
- Sequence< OUString > seqNotifications( seqNames );
- sal_Int32 nNotifyCount = seqNames.getLength();
- seqNotifications.realloc( nNotifyCount+PROPERTYCOUNT_LISTNODES );
- seqNotification[nNotifyCount ] = PROPERTYNAME_PICKLIST;
- seqNotification[nNotifyCount+1] = PROPERTYNAME_HISTORY ;
- EnableNotification( seqNotification );
-*/
}
//*****************************************************************************************************************
diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index 4d99022..406147c 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -1809,15 +1809,7 @@ BOOL SvNumberformat::GetOutputString(String& sString,
}
return FALSE;
}
-/*
-void SvNumberformat::GetNextFareyNumber(ULONG nPrec, ULONG x0, ULONG x1,
- ULONG y0, ULONG y1,
- ULONG& x2,ULONG& y2)
-{
- x2 = ((y0+nPrec)/y1)*x1 - x0;
- y2 = ((y0+nPrec)/y1)*y1 - y0;
-}
-*/
+
ULONG SvNumberformat::ImpGGT(ULONG x, ULONG y)
{
if (y == 0)
@@ -2094,7 +2086,6 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
{
ULONG x2 = ((y0+nBasis)/y1)*x1 - x0; // naechste Farey-Zahl
ULONG y2 = ((y0+nBasis)/y1)*y1 - y0;
-// GetNextFareyNumber(nBasis, x0, x1, y0, y1, x2, y2);
x0 = x1;
y0 = y1;
x1 = x2;
@@ -2123,11 +2114,6 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
else // grosse Nenner
{ // 0,1234->123/1000
ULONG nGgt;
-/*
- nDiv = nBasis+1;
- nFrac = ((ULONG)floor(0.5 + fNumber *
- pow(10.0,rInfo.nCntExp)));
-*/
nDiv = 10000000;
nFrac = ((ULONG)floor(0.5 + fNumber * 10000000.0));
nGgt = ImpGGT(nDiv, nFrac);
diff --git a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
index b10d45b..20c734a 100644
--- a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
@@ -27,23 +27,12 @@
************************************************************************/
#include "svdstr.hrc"
-
-
#include "globl3d.hxx"
-
#include "polyob3d.hxx"
-
#include "extrud3d.hxx"
-
#include "e3dcmpt.hxx"
-
-
-
#include "svxids.hrc"
-
-
-
namespace binfilter {
/*N*/ TYPEINIT1(E3dExtrudeObj, E3dCompoundObject);
@@ -594,56 +583,6 @@ namespace binfilter {
/*N*/ }
-// #107245#
-// void E3dExtrudeObj::SetExtrudeSmoothed(BOOL bNew)
-// {
-// if(bExtrudeSmoothed != bNew)
-// {
-// bExtrudeSmoothed = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dExtrudeObj::SetExtrudeSmoothFrontBack(BOOL bNew)
-// {
-// if(bExtrudeSmoothFrontBack != bNew)
-// {
-// bExtrudeSmoothFrontBack = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dExtrudeObj::SetExtrudeCharacterMode(BOOL bNew)
-// {
-// if(bExtrudeCharacterMode != bNew)
-// {
-// bExtrudeCharacterMode = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dExtrudeObj::SetExtrudeCloseFront(BOOL bNew)
-// {
-// if(bExtrudeCloseFront != bNew)
-// {
-// bExtrudeCloseFront = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dExtrudeObj::SetExtrudeCloseBack(BOOL bNew)
-// {
-// if(bExtrudeCloseBack != bNew)
-// {
-// bExtrudeCloseBack = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
//////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
@@ -672,28 +611,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*************************************************************************
-|*
-|* Get the name of the object (singular)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Get the name of the object (plural)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Aufbrechen
-|*
-\************************************************************************/
-
-
-
// EOF
}
diff --git a/binfilter/bf_svx/source/engine3d/svx_label3d.cxx b/binfilter/bf_svx/source/engine3d/svx_label3d.cxx
index 7552776..fed0696 100644
--- a/binfilter/bf_svx/source/engine3d/svx_label3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_label3d.cxx
@@ -27,12 +27,10 @@
************************************************************************/
#include "svdstr.hrc"
-
#include "svdio.hxx"
-
#include "globl3d.hxx"
-
#include "label3d.hxx"
+
namespace binfilter {
/*N*/ TYPEINIT1(E3dLabelObj, E3dPointObj);
@@ -62,38 +60,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* virtuelle Methode, die ein 2D-Objekt zurueckgibt, falls moeglich
-|*
-\************************************************************************/
-
-//E3dDisplayObj* E3dLabelObj::MakeViewTransform(Viewport3D& rViewpt,
-// E3dLightList&,
-// E3dDisplayObj* pDispObj)
-//{
-// aViewPos = rViewpt.GetViewTransform() * GetTransPosition();
-//
-// // 2D-Position des Labels bestimmen
-// Point a2DPos = rViewpt.ProjectAndMap(aViewPos);
-// aViewPos -= rViewpt.GetPRP();
-//
-// if ( p2DLabelObj )
-// p2DLabelObj->SetAnchorPos(a2DPos);
-//
-// if ( pDispObj )
-// {
-// pDispObj->Set2DObj(p2DLabelObj);
-// pDispObj->Set3DObj(this);
-// }
-// else
-// pDispObj = new E3dDisplayObj(this, p2DLabelObj);
-//
-// SetDisplayObj(pDispObj);
-//
-// return pDispObj;
-//}
-
-/*************************************************************************
-|*
|* SdrPage auch an p2DLabelObj setzen
|*
\************************************************************************/
@@ -120,20 +86,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Anzahl der Handles zurueckgeben
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Handle-Liste fuellen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* In Stream schreiben
|*
\************************************************************************/
@@ -193,28 +145,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*************************************************************************
-|*
-|* Zuweisungsoperator
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Get the name of the object (singular)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Get the name of the object (plural)
-|*
-\************************************************************************/
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
index 6f8ace2..ef08685 100644
--- a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
@@ -27,24 +27,13 @@
************************************************************************/
#include "svdstr.hrc"
-
-
-
-
#include "globl3d.hxx"
-
#include "svdio.hxx"
-
#include "polyob3d.hxx"
-
#include "lathe3d.hxx"
-
-
-
#include "svxids.hrc"
-
namespace binfilter {
/*N*/ TYPEINIT1(E3dLatheObj, E3dCompoundObject);
@@ -370,13 +359,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Zuweisungsoperator
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Objektdaten in Stream speichern
|*
\************************************************************************/
@@ -801,20 +783,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Wandle das Objekt in ein Gruppenobjekt bestehend aus n Polygonen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Neue Segmentierung (Beschreibung siehe Header-File)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Lokale Parameter setzen mit Geometrieneuerzeugung
|*
\************************************************************************/
@@ -836,57 +804,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
-// #107245#
-// void E3dLatheObj::SetLatheSmoothed(BOOL bNew)
-// {
-// if(bLatheSmoothed != bNew)
-// {
-// bLatheSmoothed = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dLatheObj::SetLatheSmoothFrontBack(BOOL bNew)
-// {
-// if(bLatheSmoothFrontBack != bNew)
-// {
-// bLatheSmoothFrontBack = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dLatheObj::SetLatheCharacterMode(BOOL bNew)
-// {
-// if(bLatheCharacterMode != bNew)
-// {
-// bLatheCharacterMode = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dLatheObj::SetLatheCloseFront(BOOL bNew)
-// {
-// if(bLatheCloseFront != bNew)
-// {
-// bLatheCloseFront = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
-// #107245#
-// void E3dLatheObj::SetLatheCloseBack(BOOL bNew)
-// {
-// if(bLatheCloseBack != bNew)
-// {
-// bLatheCloseBack = bNew;
-// bGeometryValid = FALSE;
-// }
-// }
-
//////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
@@ -925,28 +842,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*************************************************************************
-|*
-|* Get the name of the object (singular)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Get the name of the object (plural)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Aufbrechen
-|*
-\************************************************************************/
-
-
-
// EOF
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
index f52f9ad..2a5a937 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
@@ -29,24 +29,11 @@
#include "svddrgv.hxx"
#include "svdio.hxx"
#include "svdstr.hrc" // Namen aus der Resource
+
namespace binfilter {
#define XOR_DRAG_PEN PEN_DOT
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@ @@@@@ @@@@ @@@@ @@ @@ @@ @@@@@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @ @@
-// @@ @@ @@@@@ @@@@@@ @@ @@@ @@@@@ @@ @@@@ @@@@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@@ @@ @@ @@@@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@@ @@ @@ @@@ @@@
-// @@@@@ @@ @@ @@ @@ @@@@@ @ @@ @@@@@ @@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ void SdrDragView::ImpClearVars()
/*N*/ {
/*N*/ bFramDrag=FALSE;
@@ -110,17 +97,12 @@ namespace binfilter {
/*N*/ return SdrExchangeView::IsAction() || pDragBla!=NULL;
/*N*/ }
-
-
-
/*N*/ void SdrDragView::BrkAction()
/*N*/ {
/*N*/ SdrExchangeView::BrkAction();
/*N*/ BrkDragObj();
-//STRIP012/*N*/ RefreshAllIAOManagers();
/*N*/ }
-
/*N*/ void SdrDragView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const
/*N*/ {
/*N*/ SdrExchangeView::ToggleShownXor(pOut,pRegion);
@@ -129,11 +111,8 @@ namespace binfilter {
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ void SdrDragView::BrkDragObj()
/*N*/ {
/*N*/ if (pDragBla!=NULL) {DBG_BF_ASSERT(0, "STRIP");
@@ -163,14 +142,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrDragView::WriteRecords(SvStream& rOut) const
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
index 758aa46..c51bb31 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
@@ -28,16 +28,8 @@
#include "svdetc.hxx"
#include "svdmrkv.hxx"
-
-
-
-
-
-
-
#include "svdstr.hrc"
-
// #105678#
namespace binfilter {
@@ -85,8 +77,6 @@ struct ImplHdlAndIndex
/*N*/ SdrHdlList::SdrHdlList(SdrMarkView* pV)
/*N*/ : pImpl(new ImplHdlListData(pV))
/*N*/ , aList(1024,32,32)
-/*N*/ //#97016# II
-/*N*/ //pView(pV)
/*N*/ {
/*N*/ nHdlSize = 3;
/*N*/ bRotateShear = FALSE;
@@ -98,12 +88,10 @@ struct ImplHdlAndIndex
/*N*/ SdrHdlList::~SdrHdlList()
/*N*/ {
/*N*/ Clear();
-/*N*/ //#97016# II
/*N*/ delete pImpl;
/*N*/ }
-
/*N*/ void SdrHdlList::SetRotateShear(BOOL bOn)
/*N*/ {
/*N*/ bRotateShear = bOn;
@@ -136,10 +124,6 @@ struct ImplHdlAndIndex
/*N*/ }
/*N*/ aList.Clear();
/*N*/
-/*N*/ // immediately remove from display
-//STRIP012/*N*/ if(pImpl->pView)
-//STRIP012/*N*/ pImpl->pView->RefreshAllIAOManagers();
-/*N*/
/*N*/ bRotateShear=FALSE;
/*N*/ bDistortShear=FALSE;
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index a62e6cf..aa60203 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -31,32 +31,20 @@
#include "svdio.hxx"
#include "svdoole2.hxx"
-
#include "svdstr.hrc"
-
-// #105722#
#include "svdopath.hxx"
-
-// #i13033#
#include "scene3d.hxx"
// OD 30.06.2003 #108784#
#include <svdovirt.hxx>
+
namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
//
-// @@ @@ @@@@ @@@@@ @@ @@ @@ @@ @@ @@@@@ @@ @@
-// @@@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @ @@
-// @@@@@@@ @@@@@@ @@@@@ @@@@ @@@@@ @@ @@@@ @@@@@@@
-// @@ @ @@ @@ @@ @@ @@ @@ @@ @@@ @@ @@ @@@@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@@ @@ @@ @@@ @@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @ @@ @@@@@ @@ @@
+// MARKVIEW
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrMarkView::ImpClearVars()
/*N*/ {
@@ -84,7 +72,6 @@ namespace binfilter {
/*N*/ bHdlHidden=FALSE;
/*N*/ bMrkPntDirty=FALSE;
/*N*/ bMarkHdlWhenTextEdit=FALSE;
-/*N*/ // bSolidHdlBackgroundInvalid=FALSE;
/*N*/ bMarkableObjCountDirty=FALSE; // noch nicht implementiert
/*N*/ nMarkableObjCount=0; // noch nicht implementiert
/*N*/ }
@@ -147,21 +134,9 @@ namespace binfilter {
/*N*/ SdrView* pV=(SdrView*)this;
/*N*/ if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!!
/*N*/ AdjustMarkHdl();
-// if (!IsSolidMarkHdl()) {
-// if (!bHdlShown) {
-// // Ein wenig unsauber ...
-// if ((bMarkHdlWhenTextEdit || !pV->IsTextEdit()) && // evtl. keine Handles bei TextEdit
-// !(pV->IsDragHdlHide() && pV->IsDragObj() && // Ggf. keine Handles beim Draggen
-// aDragStat.IsMinMoved() && !IS_TYPE(SdrDragMovHdl,pV->GetDragMethod()))) {
-// ShowMarkHdl(NULL);
-// }
-// }
-// }
}
/*N*/ }
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ BOOL SdrMarkView::IsAction() const
@@ -169,9 +144,6 @@ namespace binfilter {
/*N*/ return SdrSnapView::IsAction() || bMarking || bMarkingPoints || bMarkingGluePoints;
/*N*/ }
-
-
-
/*N*/ void SdrMarkView::BrkAction()
/*N*/ {
/*N*/ SdrSnapView::BrkAction();
@@ -187,11 +159,6 @@ namespace binfilter {
/*N*/ if ((bMarking || bMarkingPoints || bMarkingGluePoints) && aDragStat.IsShown()) {
/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-// if (bHdlShown) {
-// DrawMarkHdl(pOut,FALSE);
-// } else if (bRefHdlShownOnly) {
-// DrawMarkHdl(pOut,BOOL(2)); HACK(nur die Ref-Hdls painten)
-// }
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -229,13 +196,8 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
/*N*/ void SdrMarkView::BrkMarkObj()
/*N*/ {
/*N*/ if (bMarking) {DBG_BF_ASSERT(0, "STRIP");
@@ -244,10 +206,6 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
/*N*/ void SdrMarkView::BrkMarkPoints()
/*N*/ {
/*N*/ if (bMarkingPoints) {DBG_BF_ASSERT(0, "STRIP");
@@ -256,124 +214,30 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
/*N*/ void SdrMarkView::BrkMarkGluePoints()
/*N*/ {
/*N*/ if (bMarkingGluePoints) {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-//void SdrMarkView::DrawMarkHdl(OutputDevice* pOut, BOOL bNoRefHdl) const
-//{
-// if (bHdlHidden) return;
-//// if (IsSolidMarkHdl())
-// bNoRefHdl=FALSE; // geht leider erstmal nicht anders
-// BOOL bOnlyRefs=USHORT(bNoRefHdl)==2; HACK(nur die Ref-Hdls painten)
-// USHORT nWinAnz=GetWinCount();
-// USHORT nWinNum=0;
-// do {
-// OutputDevice* pO=pOut;
-// if (pO==NULL) {
-// pO=GetWin(nWinNum);
-// nWinNum++;
-// }
-// if (pO!=NULL) {
-// if (!bInsPolyPoint && !bNoRefHdl && !bOnlyRefs) {
-// aHdl.DrawAll(*pO);
-// } else {
-// ULONG nHdlAnz=aHdl.GetHdlCount();
-// for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
-// SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
-// SdrHdlKind eKind=pHdl->GetKind();
-// USHORT nPtNum=pHdl->GetObjHdlNum();
-// const SdrObject* pObj=pHdl->GetObj();
-// if ((!bInsPolyPoint || nPtNum!=nInsPointNum || pObj==NULL || pObj!=pMarkedObj) &&
-// (!bNoRefHdl || (eKind!=HDL_REF1 && eKind!=HDL_REF2 && eKind!=HDL_MIRX))!=bOnlyRefs) {
-// pHdl->Draw(*pO);
-// }
-// }
-// }
-// }
-// } while (pOut==NULL && nWinNum<nWinAnz);
-//}
-
/*N*/ void SdrMarkView::ImpShowMarkHdl(OutputDevice* /*pOut*/, const Region* /*pRegion*/, BOOL /*bNoRefHdl*/)
/*N*/ {
/*N*/ }
/*N*/ void SdrMarkView::ShowMarkHdl(OutputDevice* pOut, BOOL bNoRefHdl)
/*N*/ {
-// if (IsSolidMarkHdl())
/*N*/ bNoRefHdl=FALSE; // geht leider erstmal nicht anders
/*N*/ ImpShowMarkHdl(pOut,NULL,bNoRefHdl);
-
- // refresh IAOs
-//STRIP012/*N*/ RefreshAllIAOManagers();
/*N*/ }
/*N*/ void SdrMarkView::HideMarkHdl(OutputDevice* /*pOut*/, BOOL bNoRefHdl)
/*N*/ {
-// if (IsSolidMarkHdl())
/*N*/ bNoRefHdl=FALSE; // geht leider erstmal nicht anders
/*N*/ if (bHdlShown) {
-/*N*/ if (!bHdlHidden) { // #37331#
- // Optimierung geht nicht, weil diverse Handles trotz SolidHdl doch noch XOR gapainted werden
-// DrawMarkHdl(pOut,bNoRefHdl);
-// if (aHdl.IsSolidHdl()) {
-// BOOL bInvalidate=IsMarkHdlBackgroundInvalid();
-// USHORT nAnz=pOut==NULL ? aWinList.GetCount() : 1;
-// for (USHORT i=0; i<nAnz; i++) {
-// USHORT nWinNum=pOut==NULL ? i : aWinList.Find(pOut);
-// if (nWinNum!=SDRVIEWWIN_NOTFOUND) {
-// SdrViewWinRec& rWRec=GetWinRec(nWinNum);
-// if (rWRec.pVDev!=NULL) {
-// OutputDevice* pOut=rWRec.pWin;
-// if (bInvalidate) { // fuer den Writer in einigen Faellen Invalidieren
-// if (pOut->GetOutDevType()==OUTDEV_WINDOW) {
-// aHdl.Invalidate(*(Window*)pOut);
-// }
-// } else {
-// if (bNoRefHdl) {
-// ULONG nHdlAnz=aHdl.GetHdlCount();
-// for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
-// SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
-// SdrHdlKind eKind=pHdl->GetKind();
-// USHORT nPtNum=pHdl->GetObjHdlNum();
-// if (eKind!=HDL_REF1 && eKind!=HDL_REF2 && eKind!=HDL_MIRX) {
-// aHdl.RestoreBackground(*pOut,*rWRec.pVDev,(USHORT)nHdlNum);
-// }
-// }
-// } else {
-// aHdl.RestoreBackground(*pOut,*rWRec.pVDev);
-// }
-// }
-// }
-// }
-// }
-// }
-/*N*/ }
/*N*/ bRefHdlShownOnly=bNoRefHdl;
/*N*/ bHdlShown=FALSE;
/*N*/ }
-// bSolidHdlBackgroundInvalid=FALSE;
-
- // refresh IAOs
-// RefreshAllIAOManagers();
/*N*/ }
/*N*/ void SdrMarkView::SetMarkHdlHidden(BOOL /*bOn*/)
@@ -478,19 +342,11 @@ namespace binfilter {
/*N*/ }
-
-
/*N*/ void SdrMarkView::CheckMarked()
/*N*/ {
/*N*/ for (ULONG nm=aMark.GetMarkCount(); nm>0;) {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
- // #67670# When this leads to a change, MarkListHasChanged()
- // had been called before. Calling MarkListHasChanged() again
- // could lead to problems in sfx, see BUG description.
- // if(bChg)
- // MarkListHasChanged();
-
// #97995# at least reset the remembered BoundRect to prevent handle
// generation if bForceFrameHandles is TRUE.
/*N*/ bMarkedObjRectDirty = TRUE;
@@ -662,9 +518,6 @@ namespace binfilter {
/*N*/ if(bRestraintPaint && bVis)
/*N*/ {
/*?*/ ShowMarkHdl(NULL);
-/*N*/
-/*N*/ // refresh IAOs
-//STRIP012/*N*/ //--/ RefreshAllIAOManagers();
/*N*/ }
/*N*/ }
@@ -689,20 +542,6 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// #i13033#
-// Helper method for building the transitive hull of all selected
-// objects
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ void SdrMarkView::MarkListHasChanged()
/*N*/ {
/*N*/ aMark.SetNameDirty();
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
index 2bd3f10..15e5c80 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
@@ -36,35 +36,21 @@
#include <bf_svtools/smplhint.hxx>
#include "xlnstwit.hxx"
-
#include "xlnedwit.hxx"
#include <eeitemid.hxx>
-
#include "eeitem.hxx"
#include <xlnstcit.hxx>
-
#include <xlnwtit.hxx>
-
-
#include <bf_svtools/style.hxx>
-
#include <bf_svtools/whiter.hxx>
-
-
#include <xflclit.hxx>
-
-
#include <xfltrit.hxx>
-
#include <xlnedcit.hxx>
-
#include <adjitem.hxx>
#include "xflbckit.hxx"
-
-
#include "xbtmpit.hxx"
#include "xlndsit.hxx"
#include "xlnedit.hxx"
@@ -72,6 +58,7 @@
#include "xflhtit.hxx"
#include "xlnstit.hxx"
#include "xoutx.hxx"
+
namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -415,49 +402,6 @@ namespace binfilter {
/*N*/ // des Model, falls noch kein StyleSheet gesetzt.
/*N*/ if(mpObjectItemSet && !GetStyleSheet() && pModel && !pModel->IsLoading())
/*N*/ NbcSetStyleSheet(pModel->GetDefaultStyleSheet(), TRUE);
-
-/* this code was removed because NbcSetStyleSheet called with TRUE does not
- alter the hard attributes. So they don't need to be restored, a useless
- process that cost us up to 20% for xml import. Also there is a memory
- leek with aSet.Put( *pItem->Clone() );
- {
- SfxStyleSheet* pDefSS = pModel->GetDefaultStyleSheet();
-
- if(pDefSS)
- {
- SfxItemPool* pPool = GetItemPool();
- if ( pPool )
- {
- // Take hard attributes
- SfxItemSet aSet(*pPool,
- SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,
- SDRATTR_NOTPERSIST_LAST+1, SDRATTR_END,
- EE_ITEMS_START,EE_ITEMS_END,
- 0,0);
-
- const SfxItemSet& rItemSet = GetItemSet();
-
- SfxWhichIter aIter( rItemSet );
- sal_uInt16 nWhich( aIter.FirstWhich() );
- const SfxPoolItem* pItem = NULL;
-
- while( nWhich )
- {
- if( SFX_ITEM_SET == rItemSet.GetItemState( nWhich, FALSE, &pItem ) )
- aSet.Put( *pItem->Clone() );
- nWhich = aIter.NextWhich();
- }
- // Set the StyleSheet
- NbcSetStyleSheet(pDefSS, TRUE);
-
- // Set the hard attributes
- SetItemSet( aSet );
- }
- else
- NbcSetStyleSheet(pDefSS, TRUE);
- }
- }
-*/
/*N*/ }
/*N*/ }
@@ -869,20 +813,6 @@ namespace binfilter {
/*N*/
/*N*/ if(bShadOn)
/*?*/ {
-// LineAttr for shadow no longer necessary, lines and line shadows are drawn in Paint()
-// routines individually (grep for CreateLinePoly())
-//
-// if (pLineAttr!=NULL) {
-// XLineAttrSetItem aL(*pLineAttr);
-// aL.GetItemSet().Put(XLineColorItem(String(),aShadCol));
-// aL.GetItemSet().Put(XLineTransparenceItem(nTransp));
-// rXOut.SetLineAttr(aL);
-// }
-
-// #103692# Caller must now handle noFill case
-// if(!bNoFill)
-// {
-
/*?*/ const SdrShadowColorItem& rShadColItem = ((const SdrShadowColorItem&)(rSet.Get(SDRATTR_SHADOWCOLOR)));
/*?*/ Color aShadCol(rShadColItem.GetValue());
/*?*/ sal_uInt16 nTransp = ((const SdrShadowTransparenceItem&)(rSet.Get(SDRATTR_SHADOWTRANSPARENCE))).GetValue();
@@ -968,81 +898,6 @@ namespace binfilter {
/*N*/ return ((XLineStyleItem&)(GetItem(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE;
/*N*/ }
-// #94547# Have to re-activate more performant, but corrected version.
-// This is necessary since SetItemSet() of the old implementation calls
-// ItemSetChanged() which replaces in textobjects all text items which
-// is wrong behaviour for BurnInStyleSheet.
-
-// #91695# back to corrected old version. Have to check new version again for later builds.
-//void SdrAttrObj::BurnInStyleSheetAttributes( BOOL bPseudoSheetsOnly )
-//{
-// SfxItemPool* pPool = GetItemPool();
-// if ( pPool && mpStyleSheet )
-// {
-// // Get StyleSheet attributes
-// SfxItemSet aSet(*pPool,
-// SDRATTR_START, SDRATTR_NOTPERSIST_FIRST-1,
-// SDRATTR_NOTPERSIST_LAST+1, SDRATTR_END,
-// EE_ITEMS_START,EE_ITEMS_END,
-// 0,0);
-//
-// SfxWhichIter aIter( mpStyleSheet->GetItemSet() );
-// sal_uInt16 nWhich( aIter.FirstWhich() );
-// const SfxPoolItem* pItem = NULL;
-//
-// while( nWhich )
-// {
-// if( SFX_ITEM_SET == mpStyleSheet->GetItemSet().GetItemState(nWhich, TRUE, &pItem) )
-// aSet.Put( *pItem );
-//
-// nWhich = aIter.NextWhich();
-// }
-//
-// SfxWhichIter aHardAttrIter( GetItemSet() );
-// nWhich = aHardAttrIter.FirstWhich();
-//
-// while( nWhich )
-// {
-// if( SFX_ITEM_SET == GetItemSet().GetItemState(nWhich, FALSE, &pItem) )
-// aSet.Put( *pItem );
-//
-// nWhich = aHardAttrIter.NextWhich();
-// }
-//
-// // Set StyleSheet attributes as hard attributes
-// SetItemSet( aSet );
-// }
-//}
-
-/*
-void SdrAttrObj::BurnInStyleSheetAttributes( BOOL bPseudoSheetsOnly )
-{
- // #89025# Added more performant implementation
- if(mpStyleSheet)
- {
- const SfxItemSet& rSet = mpStyleSheet->GetItemSet();
- SfxWhichIter aIter(rSet);
- sal_uInt16 nWhich(aIter.FirstWhich());
- const SfxPoolItem *pItem = NULL;
-
- ImpForceItemSet();
- const SfxItemSet* pParentSet = mpObjectItemSet->GetParent();
- if(pParentSet != 0L)
- mpObjectItemSet->SetParent(0L);
-
- while(nWhich)
- {
- if(SFX_ITEM_SET == rSet.GetItemState(nWhich, TRUE, &pItem))
- mpObjectItemSet->Put(*pItem);
- nWhich = aIter.NextWhich();
- }
-
- if(pParentSet != 0L)
- mpObjectItemSet->SetParent(pParentSet);
- }
-}
-*/
-
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
index 6729fc1..a4d2d12 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
@@ -36,31 +36,21 @@
#include "svdtxhdl.hxx" // DrawTextToPath
#include "writingmodeitem.hxx"
-
-
#include <editstat.hxx>
-
#include <outlobj.hxx>
-
#include <editobj.hxx>
-
#include "fhgtitem.hxx"
#include <bf_svtools/itempool.hxx>
#include "adjitem.hxx"
-
-
#include "itemdata.hxx"
-
#include "flditem.hxx"
-
#include <vcl/salbtype.hxx> // FRound
#include "xflgrit.hxx"
-
#include "xoutx.hxx"
#include <bf_goodies/matrix3d.hxx>
@@ -73,13 +63,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
////////////////////////////////////////////////////////////////////////////////////////////////////
//
-// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@@@ @@@ @@ @@ @@ @@@@@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@ @@ @@ @@ @@@@ @@@@@ @@@@
+// TEXTOBJ
//
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -582,32 +566,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ {
/*N*/ rOutliner.SetMinAutoPaperSize(Size(0, nAnkHgt));
/*N*/ }
-/*N*/
-/*N*/ // #103335# back to old solution, thus #100801# will be back and needs to be solved in
-/*N*/ // another way.
-// if (eHAdj==SDRTEXTHORZADJUST_BLOCK)
-// {
-// if(IsVerticalWriting())
-// rOutliner.SetMinAutoPaperSize(Size(nAnkWdt, nAnkHgt));
-// else
-// rOutliner.SetMinAutoPaperSize(Size(nAnkWdt, 0));
-// }
-
-// // #100801# MinAutoPaperSize needs always to be set completely
-// // when Verical
-// if(IsVerticalWriting())
-// {
-// rOutliner.SetMinAutoPaperSize(Size(nAnkWdt, nAnkHgt));
-// }
-//
-// if(SDRTEXTHORZADJUST_BLOCK == eHAdj)
-// {
-// // #89459#
-// if(!IsVerticalWriting())
-// {
-// rOutliner.SetMinAutoPaperSize(Size(nAnkWdt, 0));
-// }
-// }
/*N*/ }
/*N*/
/*N*/ rOutliner.SetPaperSize(aNullSize);
@@ -638,7 +596,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // rOutliner.Clear();
/*?*/ rOutliner.SetTextObj( NULL );
/*N*/ }
/*N*/
@@ -736,14 +693,9 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ return pPara;
/*N*/ }
-
-
// Geht z.Zt. nur wenn das Obj schon wenigstens einmal gepaintet wurde
// Denn dann ist der MtfAnimator initiallisiert
-
-
-
/*N*/ void SdrTextObj::ImpAddTextToBoundRect()
/*N*/ {
/*N*/ if (pOutlinerParaObject!=NULL) {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
index d114bcd..c84091b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
@@ -445,10 +445,6 @@ using namespace ::com::sun::star;
/*N*/ DBG_ASSERT(pObj!=NULL,"SdrObjList::SetObjectOrdNum: Object nicht gefunden");
/*N*/ if (pObj!=NULL) {
/*N*/ DBG_ASSERT(pObj->IsInserted(),"SdrObjList::SetObjectOrdNum: ZObjekt hat keinen Inserted-Status");
- /*if (pModel!=NULL) {
- // Hier muss ein anderer Broadcast her!
- if (pObj->GetPage()!=NULL) pModel->Broadcast(SdrHint(*pObj));
- }*/
/*N*/ aList.Remove(nOldObjNum);
/*N*/ aList.Insert(pObj,nNewObjNum);
/*N*/ pObj->SetOrdNum(nNewObjNum);
@@ -701,53 +697,6 @@ using namespace ::com::sun::star;
/*N*/ else
/*N*/ {
/*N*/ bOk=pObj->Paint(rXOut,rInfoRec);
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Vector2D aTRScale;
-// double fTRShear;
-// double fTRRotate;
-// Vector2D aTRTranslate;
-// Matrix3D aOrigMat;
-// XPolyPolygon aTRPolyPolygon;
-//
-// BOOL bIsPath = pObj->TRGetBaseGeometry(aOrigMat, aTRPolyPolygon);
-// aOrigMat.DecomposeAndCorrect(aTRScale, fTRShear, fTRRotate, aTRTranslate);
-// Vector2D aVectorTranslate;
-// aVectorTranslate.X() = FRound(aTRTranslate.X());
-// aVectorTranslate.Y() = FRound(aTRTranslate.Y());
-//
-// Point aPoint(aVectorTranslate.X(), aVectorTranslate.Y());
-// Rectangle aTRBaseRect(
-// aPoint,
-// Size(FRound(aTRScale.X()), FRound(aTRScale.Y())));
-//
-// Color aLineColorMerk(rXOut.GetOutDev()->GetLineColor());
-// Color aFillColorMerk(rXOut.GetOutDev()->GetFillColor());
-// rXOut.GetOutDev()->SetFillColor();
-//
-// rXOut.GetOutDev()->SetLineColor(COL_BLACK);
-// rXOut.GetOutDev()->DrawRect(aTRBaseRect);
-//
-// if(bIsPath)
-// {
-// rXOut.GetOutDev()->SetLineColor(COL_LIGHTRED);
-// XPolyPolygon aTRPoPo(aTRPolyPolygon);
-// aTRPoPo.Move(aTRBaseRect.Left(), aTRBaseRect.Top());
-// sal_uInt16 nCount(aTRPoPo.Count());
-// for(sal_uInt16 a(0); a < nCount; a++)
-// rXOut.GetOutDev()->DrawPolygon(XOutCreatePolygon(aTRPoPo[a], rXOut.GetOutDev()));
-// }
-//
-// rXOut.GetOutDev()->SetLineColor(aLineColorMerk);
-// rXOut.GetOutDev()->SetFillColor(aFillColorMerk);
-//
-// static BOOL bDoTestSetAllGeometry(FALSE);
-// if(bDoTestSetAllGeometry)
-// pObj->TRSetBaseGeometry(aOrigMat, aTRPolyPolygon);
-//
-//
-//////////////////////////////////////////////////////////////////////////////
/*N*/ }
/*N*/
/*N*/ // nach dem ersten Objekt bei reinem Hintergrundcache
@@ -1142,10 +1091,6 @@ using namespace ::com::sun::star;
/*N*/ delete pLayerAdmin;
/*N*/ }
-
-
-
-
/*N*/ void SdrPage::SetSize(const Size& aSiz)
/*N*/ {
/*N*/ nWdt=aSiz.Width();
@@ -1232,13 +1177,6 @@ using namespace ::com::sun::star;
/*N*/ return nBordLwr;
/*N*/ }
-// #i3694#
-// This GetOffset() method is not needed anymore, it even leads to errors.
-//Point SdrPage::GetOffset() const
-//{
-// return Point();
-//}
-
/*N*/ void SdrPage::SetModel(SdrModel* pNewModel)
/*N*/ {
/*N*/ SdrModel* pOldModel=pModel;
@@ -1370,15 +1308,6 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ void SdrPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if (rIn.GetError()!=0) return;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
index f425c08..0902f3f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
@@ -27,10 +27,8 @@
************************************************************************/
#include <com/sun/star/awt/PosSize.hpp>
-
#include <toolkit/helper/vclunohelper.hxx>
-
#include "svdpagv.hxx"
#include "svdouno.hxx"
#include "svdpage.hxx"
@@ -227,12 +225,6 @@ using namespace ::com::sun::star;
/*N*/ }
//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
/*N*/ USHORT SdrUnoControlList::Find(uno::Reference< awt::XControlModel > rUnoControlModel) const
/*N*/ {
/*N*/ SdrUnoControlAccess aAccess(rUnoControlModel);
@@ -264,7 +256,6 @@ using namespace ::com::sun::star;
/*N*/ return nRet;
/*N*/ }
-
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ SdrPageViewWinRec::SdrPageViewWinRec(SdrPageView& rNewPageView, OutputDevice* pOut)
/*N*/ :rView( rNewPageView.GetView() )
@@ -299,28 +290,6 @@ using namespace ::com::sun::star;
/*N*/ Window* pWindow = (Window*) pOutDev;
/*N*/ xControlContainer = VCLUnoHelper::CreateControlContainer( pWindow );
- // #100394# xC->setVisible triggers window->Show() and this has
- // problems when the view is not completely constructed which may
- // happen when loading. This leads to accessibility broadcasts which
- // throw asserts due to the not finished view. All this chan be avoided
- // since xC->setVisible is here called only for the side effect in
- // UnoControlContainer::setVisible(...) which calls createPeer(...).
- // This will now be called directly from here.
-
- // UnoContainerModel erzeugen
- // uno::Reference< awt::XWindow > xC(xControlContainer, uno::UNO_QUERY);
- // CreateControlContainer() is only used from
- // , thus it seems not necessary to make
- // it visible her at all.
- // #58917# Das Show darf nicht am VCL-Fenster landen, weil dann Assertion vom SFX
- // BOOL bVis = pWindow->IsVisible();
- // xC->setVisible(TRUE);
- // if ( !bVis )
- // pWindow->Hide();
- // if( !mxContext.is() && bVisible )
- // // Es ist ein TopWindow, also automatisch anzeigen
- // createPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > (), ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > () );
-
/*N*/ uno::Reference< awt::XControl > xControl(xControlContainer, uno::UNO_QUERY);
/*N*/ if(xControl.is())
/*N*/ {
@@ -395,11 +364,7 @@ using namespace ::com::sun::star;
/*N*/ aPgOrg.X()=pPage->GetLftBorder();
/*N*/ aPgOrg.Y()=pPage->GetUppBorder();
/*N*/ }
-/*N*/ // aOut.SetOutDev(rView.pWin);
-/*N*/ // aOut.SetOffset(rOffs);
-/*N*/ // eDrwStat=RS_READY;
/*N*/ bHasMarked=FALSE;
-/*N*/ //aDragPoly.Clear();
/*N*/ aLayerVisi.SetAll();
/*N*/ aLayerPrn.SetAll();
/*N*/ bVisible=FALSE;
@@ -851,10 +816,6 @@ using namespace ::com::sun::star;
/*N*/ SdrNamedSubRecord aSubRecord(rOut,STREAM_WRITE,SdrInventor,SDRIORECNAME_PAGVHELPLINES);
/*N*/ rOut<<rPageView.aHelpLines;
/*N*/ }
-/*N*/ //if (GetAktGroup()!=NULL) {
-/*N*/ // // ...
-/*N*/ // //rOut<<aAktGroup;
-/*N*/ //}
/*N*/ return rOut;
/*N*/ }
@@ -891,7 +852,6 @@ using namespace ::com::sun::star;
/*N*/ rIn>>rPageView.aHelpLines;
/*N*/ } break;
/*N*/ case SDRIORECNAME_PAGVAKTGROUP: {
-/*N*/ //rIn>>aAktGroup; fehlende Implementation!
/*N*/ } break;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
index 1eb41d4..1348cac 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
@@ -37,17 +37,9 @@
#include "svdograf.hxx"
#include "svdouno.hxx"
-
-
#include <bf_svtools/whiter.hxx>
-
-
-
#include <bf_svtools/style.hxx>
-
-
-
#include "xoutx.hxx"
namespace binfilter {
@@ -57,11 +49,6 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ FrameAnimator::FrameAnimator(SdrView& rNewView):
/*N*/ rView(rNewView)
/*N*/ {
@@ -70,144 +57,20 @@ using namespace ::com::sun::star;
/*N*/ pOut=NULL;
/*N*/ }
-
-
/*N*/ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ return 0;
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//#define TEST_IAO
-
/*N*/ SdrViewWinRec::SdrViewWinRec(OutputDevice* pW)
/*N*/ : pWin(pW),
-/*N*/ // pVDev(NULL),
-//STRIP012/*N*/ pIAOManager(NULL),
/*N*/ bXorVisible(FALSE)
/*N*/ {
-/*N*/ // is it a window?
-/*N*/ if(pW && pW->GetOutDevType() == OUTDEV_WINDOW)
-/*N*/ {
-/*N*/ // create B2dIAOManager for this window
-//STRIP012/*N*/ pIAOManager = new B2dIAOManager((Window*)pW);
-//STRIP012#ifdef TEST_IAO
-//STRIP012/*?*/ if(pIAOManager)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ // create some demo shapes
-//STRIP012/*?*/ B2dIAOLine* pLine;
-//STRIP012/*?*/ B2dIAOMarker* pMarker;
-//STRIP012/*?*/ B2dIAOBitmapObj* pBitmap;
-//STRIP012/*?*/ B2dIAOTriangle* pTriangle;
-//STRIP012/*?*/
-//STRIP012/*?*/ static BOOL bCreateLines = FALSE;
-//STRIP012/*?*/ static BOOL bCreateMarkers = FALSE;
-//STRIP012/*?*/ static BOOL bCreateField = FALSE;
-//STRIP012/*?*/ static BOOL bCreateSingleMarker = FALSE;
-//STRIP012/*?*/ static BOOL bCreateBitmap = FALSE;
-//STRIP012/*?*/ static BOOL bCreateBitmapField = FALSE;
-//STRIP012/*?*/ static BOOL bCreateTriangle = FALSE;
-//STRIP012/*?*/
-//STRIP012/*?*/ if(bCreateLines)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ pLine = new B2dIAOLine(pIAOManager, Point(5000, 5200), Point(5000, 7000));
-//STRIP012/*?*/ pLine->SetBaseColor(Color(COL_CYAN));
-//STRIP012/*?*/ pLine = new B2dIAOLineStriped(pIAOManager, Point(5100, 5200), Point(5100, 7000));
-//STRIP012/*?*/ pLine->SetBaseColor(Color(COL_BLUE));
-//STRIP012/*?*/ B2dIAOLineTwoColor* p2Line = new B2dIAOLineTwoColor(pIAOManager, Point(5200, 5200), Point(5200, 7000));
-//STRIP012/*?*/ p2Line->SetBaseColor(Color(COL_YELLOW));
-//STRIP012/*?*/ p2Line->Set2ndColor(Color(COL_BLACK));
-//STRIP012/*?*/ B2dIAOLineTwoColorAnim* p3Line = new B2dIAOLineTwoColorAnim(pIAOManager, Point(5300, 5200), Point(5300, 7000));
-//STRIP012/*?*/ p3Line->SetBaseColor(Color(COL_YELLOW));
-//STRIP012/*?*/ p3Line->Set2ndColor(Color(COL_BLACK));
-//STRIP012/*?*/ }
-//STRIP012/*?*/
-//STRIP012/*?*/ if(bCreateMarkers)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(5000, 5000), B2D_IAO_MARKER_POINT);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(COL_LIGHTRED));
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(5100, 5000), B2D_IAO_MARKER_PLUS);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(COL_LIGHTGREEN));
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(5200, 5000), B2D_IAO_MARKER_CROSS);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(COL_LIGHTBLUE));
-//STRIP012/*?*/
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(5000, 5100), B2D_IAO_MARKER_RECT_5X5);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(COL_LIGHTGREEN));
-//STRIP012/*?*/ pMarker->Set2ndColor(Color(COL_BLACK));
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(5100, 5100), B2D_IAO_MARKER_RECT_7X7);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(COL_LIGHTGREEN));
-//STRIP012/*?*/ pMarker->Set2ndColor(Color(COL_BLACK));
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(5200, 5100), B2D_IAO_MARKER_RECT_9X9);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(COL_LIGHTGREEN));
-//STRIP012/*?*/ pMarker->Set2ndColor(Color(COL_BLACK));
-//STRIP012/*?*/ }
-//STRIP012/*?*/
-//STRIP012/*?*/ if(bCreateField || bCreateBitmapField)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ static UINT16 nNumX = 10;
-//STRIP012/*?*/ static UINT16 nNumY = 10;
-//STRIP012/*?*/ static UINT16 nStart = 2000;
-//STRIP012/*?*/ static UINT16 nEnd = 16000;
-//STRIP012/*?*/
-//STRIP012/*?*/ for(UINT16 a=nStart;a<nEnd;a+=(nEnd-nStart)/nNumX)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ for(UINT16 b=nStart;b<nEnd;b+=(nEnd-nStart)/nNumY)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ if(bCreateField)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(a, b), B2D_IAO_MARKER_RECT_7X7);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(
-//STRIP012/*?*/ (((a-nStart)*256L)/(nEnd-nStart)),
-//STRIP012/*?*/ (((b-nStart)*256L)/(nEnd-nStart)),
-//STRIP012/*?*/ 0x80));
-//STRIP012/*?*/ pMarker->Set2ndColor(Color(COL_BLACK));
-//STRIP012/*?*/ }
-//STRIP012/*?*/ if(bCreateBitmapField)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ Bitmap aBitmap(Size(10, 10), 8);
-//STRIP012/*?*/ pBitmap = new B2dIAOBitmapObj(pIAOManager, Point(a, b), aBitmap);
-//STRIP012/*?*/ }
-//STRIP012/*?*/ }
-//STRIP012/*?*/ }
-//STRIP012/*?*/ }
-//STRIP012/*?*/ if(bCreateSingleMarker)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ pMarker = new B2dIAOMarker(pIAOManager, Point(5000, 5000), B2D_IAO_MARKER_RECT_7X7);
-//STRIP012/*?*/ pMarker->SetBaseColor(Color(COL_LIGHTGREEN));
-//STRIP012/*?*/ pMarker->Set2ndColor(Color(COL_BLACK));
-//STRIP012/*?*/ }
-//STRIP012/*?*/ if(bCreateBitmap)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ Bitmap aBitmap(Size(10, 10), 8);
-//STRIP012/*?*/ pBitmap = new B2dIAOBitmapObj(pIAOManager, Point(6000, 6000), aBitmap);
-//STRIP012/*?*/ }
-//STRIP012/*?*/ if(bCreateTriangle)
-//STRIP012/*?*/ {
-//STRIP012/*?*/ pTriangle = new B2dIAOTriangle(pIAOManager, Point(5000, 5000), Point(7000, 5000), Point(6000, 7000), Color(COL_YELLOW));
-//STRIP012/*?*/ pLine = new B2dIAOLine(pIAOManager, pTriangle->GetBasePosition(), pTriangle->Get2ndPosition());
-//STRIP012/*?*/ pLine = new B2dIAOLine(pIAOManager, pTriangle->Get2ndPosition(), pTriangle->Get3rdPosition());
-//STRIP012/*?*/ pLine = new B2dIAOLine(pIAOManager, pTriangle->Get3rdPosition(), pTriangle->GetBasePosition());
-//STRIP012/*?*/
-//STRIP012/*?*/ pTriangle = new B2dIAOBitmapTriangle(pIAOManager, Point(8000, 5000), Point(10000, 5000), Point(9000, 7000), Color(COL_RED));
-//STRIP012/*?*/ pLine = new B2dIAOLine(pIAOManager, pTriangle->GetBasePosition(), pTriangle->Get2ndPosition());
-//STRIP012/*?*/ pLine = new B2dIAOLine(pIAOManager, pTriangle->Get2ndPosition(), pTriangle->Get3rdPosition());
-//STRIP012/*?*/ pLine = new B2dIAOLine(pIAOManager, pTriangle->Get3rdPosition(), pTriangle->GetBasePosition());
-//STRIP012/*?*/ }
-//STRIP012/*?*/ }
-//STRIP012#endif
-/*N*/ }
/*N*/ }
/*N*/ SdrViewWinRec::~SdrViewWinRec()
/*N*/ {
-/*N*/ // if (pVDev!=NULL)
-/*N*/ // delete pVDev;
-/*N*/
-/*N*/ // cleanup IAOManager for this window
-//STRIP012/*N*/ if(pIAOManager)
-//STRIP012/*N*/ delete pIAOManager;
-//STRIP012/*N*/ pIAOManager = NULL;
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -240,20 +103,6 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@ @@@@ @@ @@ @@ @@@@@@ @@ @@ @@ @@@@@ @@ @@
-// @@ @@ @@ @@ @@ @@@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@@@@@ @@ @@ @@ @@ @@ @@ @ @@
-// @@@@@ @@@@@@ @@ @@@@@@ @@ @@@@@ @@ @@@@ @@@@@@@
-// @@ @@ @@ @@ @@ @@@ @@ @@@ @@ @@ @@@@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@@ @@ @@ @@@ @@@
-// @@ @@ @@ @@ @@ @@ @@ @ @@ @@@@@ @@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ TYPEINIT2(SdrPaintView,SfxListener,SfxRepeatTarget);
/*N*/ DBG_NAME(SdrPaintView)
@@ -445,8 +294,6 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
/*?*/ void SdrPaintView::ImpAsyncPaintDone( const SdrObject* /*pObj*/ )
/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}
/*?*/ }
@@ -529,9 +376,6 @@ using namespace ::com::sun::star;
/*N*/ return IsEncirclement();
/*N*/ }
-
-
-
/*N*/ void SdrPaintView::BrkAction()
/*N*/ {
/*N*/ BrkEncirclement();
@@ -557,9 +401,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrPaintView::ShowShownXor(OutputDevice* pOut, BOOL bShow)
@@ -678,7 +519,6 @@ using namespace ::com::sun::star;
/*N*/ }
-
/*N*/ SdrPageView* SdrPaintView::GetPageView(const SdrPage* pPage) const
/*N*/ {
/*N*/ if (pPage==NULL) return NULL;
@@ -692,10 +532,6 @@ using namespace ::com::sun::star;
/*N*/ else return pPV;
/*N*/ }
-
-
-
-
/*N*/ USHORT SdrPaintView::GetHiddenPV(const SdrPage* pPage) const
/*N*/ {
/*N*/ BOOL bWeiter=TRUE;
@@ -890,10 +726,7 @@ using namespace ::com::sun::star;
/*N*/ } {
/*N*/ SdrNamedSubRecord aSubRecord(rOut,STREAM_WRITE,SdrInventor,SDRIORECNAME_VIEWAKTLAYER);
/*N*/
-/*N*/ // UNICODE: rOut << aAktLayer;
/*N*/ rOut.WriteByteString(aAktLayer);
-/*N*/
-/*N*/ // UNICODE: rOut << aMeasureLayer;
/*N*/ rOut.WriteByteString(aMeasureLayer);
/*N*/ }
/*N*/ }
@@ -948,12 +781,10 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ case SDRIORECNAME_VIEWAKTLAYER:
/*N*/ {
-/*N*/ // UNICODE: rIn >> aAktLayer;
/*N*/ rIn.ReadByteString(aAktLayer);
/*N*/
/*N*/ if(rSubHead.GetBytesLeft() > 0)
/*N*/ {
-/*N*/ // UNICODE: rIn >> aMeasureLayer;
/*N*/ rIn.ReadByteString(aMeasureLayer);
/*N*/ }
/*N*/ break;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx b/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx
index 1c4283e..aaba3a8 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx
@@ -31,24 +31,8 @@
#include "scene3d.hxx"
-// #i11426#
-
-// #109587#
-
-// #109587#
namespace binfilter {
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod)
/*N*/ : SdrUndoAction(rNewMod),
/*N*/ aBuf(1024,32,32),
@@ -74,25 +58,11 @@ namespace binfilter {
/*N*/ aBuf.Insert(pAct,CONTAINER_APPEND);
/*N*/ }
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
//
-// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@@@ @@ @@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@ @@@@@ @@@@ @@@@@ @@@@ @@ @@@@
+// OBJECTS
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
/*N*/ SdrUndoAction(*rNewObj.GetModel()),
@@ -100,29 +70,6 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-
-// #94278# common call method for evtl. page change when UNDO/REDO
-// is triggered
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj):
@@ -153,11 +100,6 @@ namespace binfilter {
/*N*/ if (pUndoGroup!=NULL) delete pUndoGroup;
/*N*/ }
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect):
/*N*/ SdrUndoObj(rNewObj),
/*N*/ bOwner(FALSE),
@@ -183,113 +125,16 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// #i11702#
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@ @@@@ @@ @@ @@@@@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@@ @@@@ @@@@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@
-// @@@@@ @@ @@ @@ @@@@@ @@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
//
-// @@@@@ @@@@ @@@@ @@@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@
-// @@@@@ @@@@@@ @@ @@@ @@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@@@@ @@@@@ @@@@
+// PAGES
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ SdrUndoPage::SdrUndoPage(SdrPage& rNewPg):
/*N*/ SdrUndoAction(*rNewPg.GetModel()), pPage(&rNewPg)
/*N*/ { }
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg):
/*N*/ SdrUndoPage(rNewPg),
/*N*/ bItsMine(FALSE)
@@ -306,66 +151,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@ @@ @@@@ @@@@ @@@@@@ @@@@@ @@@@@ @@@@@ @@@@ @@@@ @@@@@ @@@@
-// @@@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@@@@ @@@@@@ @@@@ @@ @@@@ @@@@@ @@@@@ @@@@@@ @@ @@@ @@@@ @@@@
-// @@ @ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@@@ @@ @@@@@ @@ @@ @@ @@ @@ @@@@@ @@@@@ @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
index 41855ac..1980e05 100644
--- a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
@@ -33,63 +33,20 @@
#include <bf_svx/xdef.hxx>
#include "xoutx.hxx"
-
-// #101498#
#include "outliner.hxx"
-
#include <com/sun/star/i18n/ScriptType.hdl>
-
#include <com/sun/star/i18n/XBreakIterator.hpp>
-
-
#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
#include "unolingu.hxx"
#include <legacysmgr/legacy_binfilters_smgr.hxx>
+
namespace binfilter {
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::i18n;
-/*************************************************************************
-|*
-|* XOutGetCharOutline()
-|*
-|* Ein Zeichen eines Outlinefonts in ein Bezier-PolyPolygon umwandeln
-|* Wenn keine Umwandlung moeglich ist, wird ein leeres PolyPolygon
-|* zurueckgegeben
-|*
-*************************************************************************/
-
-// #102382# Remove XOutGetCharOutline
-// #100318# deprecated, use XOutGetTextOutline
-//XPolyPolygon XOutGetCharOutline( USHORT nChar, OutputDevice& rOut, BOOL bOptimizeSize )
-//{
-// PolyPolygon aPolyPoly;
-//
-// //if( !rOut.GetGlyphOutline( (xub_Unicode) nChar, aPolyPoly, bOptimizeSize ) && rOut.GetOutDevType() == OUTDEV_PRINTER )
-// // #97492#
-// String aGlyphString((xub_Unicode) nChar);
-//
-// if( !rOut.GetTextOutline(aPolyPoly, aGlyphString) && OUTDEV_PRINTER == rOut.GetOutDevType())
-// {
-// VirtualDevice aVDev;
-// aVDev.SetMapMode( rOut.GetMapMode() );
-// aVDev.SetFont( rOut.GetFont() );
-// aVDev.SetTextAlign( rOut.GetTextAlign() );
-// // #97492#
-// //aVDev.GetGlyphOutline( (xub_Unicode) nChar, aPolyPoly, FALSE );
-// aVDev.GetTextOutline(aPolyPoly, aGlyphString);
-// }
-//
-// // #97492# since GetTextOutline(...) is base line oriented, the
-// // polygon needs to be moved one line height
-// aPolyPoly.Move(0, rOut.GetFontMetric().GetAscent());
-//
-// return XPolyPolygon( aPolyPoly );
-//}
-
// #100318# new for XOutGetCharOutline
// #102382# new interface for XOutGetTextOutline to support PolyPolyVector
/*N*/ sal_Bool XOutGetTextOutlines(PolyPolyVector& rPolyPolyVector, const String& rText, OutputDevice& rOut,
diff --git a/binfilter/bf_sw/source/core/inc/frame.hxx b/binfilter/bf_sw/source/core/inc/frame.hxx
index 7881565..3c313a5 100644
--- a/binfilter/bf_sw/source/core/inc/frame.hxx
+++ b/binfilter/bf_sw/source/core/inc/frame.hxx
@@ -331,8 +331,6 @@ class SwFrm: public SwClient
// Implementiert in text/txtftn.cxx, verhindert Ftn-Oszillation
friend void ValidateTxt( SwFrm *pFrm );
-// friend void CalcAnchorAndKeep( SwFlyFrm * );
-
friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );
//Cache fuer (Umrandungs-)Attribute.
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index 9341c5a..6059409 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -68,10 +68,8 @@
#include <bodyfrm.hxx>
#include <dbg_lay.hxx>
#include <bf_svx/frmdiritem.hxx>
-namespace binfilter {
-
-
+namespace binfilter {
/*************************************************************************
|*
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoevent.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoevent.cxx
index 5a62e8e..c07be90 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoevent.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoevent.cxx
@@ -33,30 +33,19 @@
// HINTIDs must be on top; it is required for the macitem.hxx header
#include "hintids.hxx"
-
#include "unoevent.hxx"
-
#include <errhdl.hxx>
-
#include "unoframe.hxx"
-
#include "unostyle.hxx"
-
#include "swevent.hxx"
-
#include "docstyle.hxx"
-
#include <bf_sfx2/sfx.hrc>
-
#include <bf_svx/svxids.hrc>
-
#include "fmtinfmt.hxx"
-
#include <bf_svtools/macitem.hxx>
-
#include <rtl/ustrbuf.hxx>
-
#include <com/sun/star/beans/PropertyValue.hpp>
+
namespace binfilter {
using namespace ::com::sun::star;
@@ -83,93 +72,6 @@ const sal_Char sAPI_SwHyperlinkEventDescriptor[] =
const sal_Char sAPI_SwAutoTextEventDescriptor[] =
"SwAutoTextEventDescriptor";
-
-// //
-// // tables of all known events handled by this class
-// //
-
-// // careful: keep aKnownEventIDs and aKnownEventNames in sync!
-
-// const USHORT aKnownEventIDs[] =
-// {
-// SW_EVENT_OBJECT_SELECT,
-// SW_EVENT_START_INS_GLOSSARY,
-// SW_EVENT_END_INS_GLOSSARY,
-// SW_EVENT_MAIL_MERGE,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list