[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc oox/source writerfilter/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Feb 7 13:49:54 PST 2011
binfilter/bf_basic/source/comp/token.cxx | 163 ----
binfilter/bf_basic/source/sbx/sbxobj.cxx | 30
binfilter/bf_sc/source/core/data/sc_drwlayer.cxx | 16
binfilter/bf_sc/source/core/data/sc_olinetab.cxx | 29
binfilter/bf_sc/source/core/tool/sc_detfunc.cxx | 38 -
binfilter/bf_sc/source/core/tool/sc_interpr3.cxx | 183 -----
binfilter/bf_sch/source/core/sch_chtmod2a.cxx | 24
binfilter/bf_sch/source/core/sch_chtmode1.cxx | 54 -
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 152 ----
binfilter/bf_sch/source/core/sch_globfunc.cxx | 53 -
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 59 -
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 1
binfilter/bf_sfx2/source/bastyp/fltlst.hxx | 10
binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx | 54 -
binfilter/bf_svtools/source/config/svt_cmdoptions.cxx | 12
binfilter/bf_svtools/source/config/svt_compatibility.cxx | 8
binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx | 1
binfilter/bf_svtools/source/config/svt_fontoptions.cxx | 6
binfilter/bf_svtools/source/config/svt_internaloptions.cxx | 146 ----
binfilter/bf_svtools/source/config/svt_localisationoptions.cxx | 6
binfilter/bf_svtools/source/config/svt_menuoptions.cxx | 7
binfilter/bf_svtools/source/config/svt_miscopt.cxx | 4
binfilter/bf_svtools/source/config/svt_options3d.cxx | 7
binfilter/bf_svtools/source/config/svt_printwarningoptions.cxx | 6
binfilter/bf_svtools/source/config/svt_startoptions.cxx | 7
binfilter/bf_svtools/source/config/svt_workingsetoptions.cxx | 6
binfilter/bf_svtools/source/items1/svt_poolio.cxx | 15
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 1
binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx | 12
binfilter/bf_svx/source/unodraw/svx_unomod.cxx | 24
binfilter/bf_svx/source/unoedit/svx_unofored.cxx | 39 -
binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx | 171 ----
binfilter/bf_svx/source/xoutdev/svx_xout.cxx | 58 -
binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx | 31
binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx | 20
binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx | 25
binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx | 33
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 36 -
binfilter/inc/bf_sch/chmod3d.hxx | 5
binfilter/inc/bf_svx/deflt3d.hxx | 78 --
binfilter/inc/bf_svx/light3d.hxx | 7
binfilter/inc/bf_svx/svdcrtv.hxx | 10
binfilter/inc/bf_svx/svddrgv.hxx | 10
binfilter/inc/bf_svx/svdglev.hxx | 10
binfilter/inc/bf_svx/svdlayer.hxx | 8
binfilter/inc/bf_svx/svdopath.hxx | 23
binfilter/inc/bf_svx/svdpoev.hxx | 18
binfilter/inc/bf_svx/svdpool.hxx | 16
binfilter/inc/bf_svx/view3d.hxx | 26
binfilter/inc/bf_sw/fmtcol.hxx | 27
binfilter/inc/bf_sw/io.hxx | 25
binfilter/inc/bf_sw/pagedesc.hxx | 9
binfilter/inc/bf_sw/tox.hxx | 9
binfilter/inc/bf_sw/unoobj.hxx | 36 -
oox/source/export/chartexport.cxx | 45 -
writerfilter/source/dmapper/DomainMapper.cxx | 357 ----------
56 files changed, 26 insertions(+), 2240 deletions(-)
New commits:
commit f8c91fc05b01c4373100e5c41ea7cba86dc119e5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 7 22:41:12 2011 +0100
Remove dead code
diff --git a/binfilter/bf_basic/source/comp/token.cxx b/binfilter/bf_basic/source/comp/token.cxx
index d4ab2de..f616808 100644
--- a/binfilter/bf_basic/source/comp/token.cxx
+++ b/binfilter/bf_basic/source/comp/token.cxx
@@ -189,169 +189,6 @@ static TokenTable aTokTable_Basic [] = { // Token-Tabelle:
{ NIL, "" }
};
-/*
-TokenTable aTokTable_Java [] = { // Token-Tabelle:
-
- { JS_LOG_NOT, "!" },
- { JS_NE, "!=" },
- { JS_MOD, "%" },
- { JS_ASS_MOD, "%=" },
- { JS_BIT_AND, "&" },
- { JS_LOG_AND, "&&" },
- { JS_ASS_AND, "&=" },
- { JS_LPAREN, "(" },
- { JS_RPAREN, ")" },
- { JS_MUL, "*" },
- { JS_ASS_MUL, "*=" },
- { JS_PLUS, "+" },
- { JS_INC, "++" },
- { JS_ASS_PLUS, "+=" },
- { JS_COMMA, "," },
- { JS_MINUS, "-" },
- { JS_DEC, "--" },
- { JS_ASS_MINUS, "-=" },
- { JS_DIV, "/" },
- { JS_ASS_DIV, "/=" },
- { JS_COND_SEL, ":" },
- { JS_LT, "<" },
- { JS_LSHIFT, "<<" },
- { JS_ASS_LSHIFT,"<<=" },
- { JS_LE, "<=" },
- { JS_NE, "<>" },
- { JS_ASSIGNMENT,"=" },
- { JS_EQ, "==" },
- { JS_GT, ">" },
- { JS_RSHIFT, ">>" },
- { JS_ASS_RSHIFT,">>=" },
- { JS_RSHIFT_Z, ">>>" },
- { JS_ASS_RSHIFT_Z,">>>=" },
- { JS_GE, ">=" },
- { JS_COND_QUEST,"?" },
- { ACCESS, "Access" },
- { ALIAS, "Alias" },
- { AND, "And" },
- { ANY, "Any" },
- { APPEND, "Append" },
- { AS, "As" },
- { BASE, "Base" },
- { BINARY, "Binary" },
- { TBOOLEAN, "Boolean" },
- { BYVAL, "ByVal", },
- { CALL, "Call" },
- { CASE, "Case" },
- { _CDECL_, "Cdecl" },
- { CLOSE, "Close" },
- { COMPARE, "Compare" },
- { _CONST_, "Const" },
- { TCURRENCY,"Currency" },
- { TDATE, "Date" },
- { DECLARE, "Declare" },
- { DEFBOOL, "DefBool" },
- { DEFCUR, "DefCur" },
- { DEFDATE, "DefDate" },
- { DEFDBL, "DefDbl" },
- { DEFERR, "DefErr" },
- { DEFINT, "DefInt" },
- { DEFLNG, "DefLng" },
- { DEFOBJ, "DefObj" },
- { DEFSNG, "DefSng" },
- { DEFSTR, "DefStr" },
- { DEFVAR, "DefVar" },
- { DIM, "Dim" },
- { DO, "Do" },
- { TDOUBLE, "Double" },
- { EACH, "Each" },
- { ELSE, "Else" },
- { ELSEIF, "ElseIf" },
- { END, "End" },
- { ENDFUNC, "End Function" },
- { ENDIF, "End If" },
- { ENDSELECT,"End Select" },
- { ENDSUB, "End Sub" },
- { ENDTYPE, "End Type" },
- { ENDIF, "EndIf" },
- { EQV, "Eqv" },
- { ERASE, "Erase" },
- { _ERROR_, "Error" },
- { EXIT, "Exit" },
- { EXPLICIT, "Explicit" },
- { FOR, "For" },
- { FUNCTION, "Function" },
- { GLOBAL, "Global" },
- { GOSUB, "GoSub" },
- { GOTO, "GoTo" },
- { IF, "If" },
- { IMP, "Imp" },
- { _IN_, "In" },
- { INPUT, "Input" }, // auch INPUT #
- { TINTEGER, "Integer" },
- { IS, "Is" },
- { LET, "Let" },
- { LIB, "Lib" },
- { LINE, "Line" },
- { LINEINPUT,"Line Input" },
- { LOCAL, "Local" },
- { LOCK, "Lock" },
- { TLONG, "Long" },
- { LOOP, "Loop" },
- { LPRINT, "LPrint" },
- { LSET, "LSet" }, // JSM
- { MOD, "Mod" },
- { NAME, "Name" },
- { NEW, "New" },
- { NEXT, "Next" },
- { NOT, "Not" },
- { TOBJECT, "Object" },
- { ON, "On" },
- { OPEN, "Open" },
- { OPTION, "Option" },
- { _OPTIONAL_, "Optional" },
- { OR, "Or" },
- { OUTPUT, "Output" },
- { PRESERVE, "Preserve" },
- { PRINT, "Print" },
- { PRIVATE, "Private" },
- { PUBLIC, "Public" },
- { RANDOM, "Random" },
- { READ, "Read" },
- { REDIM, "ReDim" },
- { REM, "Rem" },
- { RESUME, "Resume" },
- { RETURN, "Return" },
- { RSET, "RSet" }, // JSM
- { SELECT, "Select" },
- { SET, "Set" },
- { SHARED, "Shared" },
- { TSINGLE, "Single" },
- { STATIC, "Static" },
- { STEP, "Step" },
- { STOP, "Stop" },
- { TSTRING, "String" },
- { SUB, "Sub" },
- { STOP, "System" },
- { TEXT, "Text" },
- { THEN, "Then" },
- { TO, "To", },
- { TYPE, "Type" },
- { UNTIL, "Until" },
- { TVARIANT, "Variant" },
- { WEND, "Wend" },
- { WHILE, "While" },
- { WITH, "With" },
- { WRITE, "Write" }, // auch WRITE #
- { XOR, "Xor" },
- { JS_LINDEX, "[" },
- { JS_RINDEX, "]" },
- { JS_BIT_XOR, "^" },
- { JS_ASS_XOR, "^=" },
- { JS_BIT_OR, "|" },
- { JS_ASS_OR, "|=" },
- { JS_LOG_OR, "||" },
- { JS_BIT_NOT, "~" },
- { NIL }
-};
-*/
-
// Der Konstruktor ermittelt die Laenge der Token-Tabelle.
SbiTokenizer::SbiTokenizer( const ::rtl::OUString& rSrc, StarBASIC* pb )
diff --git a/binfilter/bf_basic/source/sbx/sbxobj.cxx b/binfilter/bf_basic/source/sbx/sbxobj.cxx
index e5fa237..1d754d6 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -46,8 +46,6 @@ static USHORT nNameHash = 0, nParentHash = 0;
/////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////
-
SbxObject::SbxObject( const XubString& rClass )
: SbxVariable( SbxOBJECT ), aClassName( rClass )
{
@@ -426,20 +424,6 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
SbxVariable* pRes = pObjs->Find( rName, SbxCLASS_OBJECT );
if( pRes )
{
-/* Wegen haeufiger Probleme (z.B. #67000) erstmal ganz raus
-#ifdef DBG_UTIL
- if( pRes->GetHashCode() != nNameHash
- && pRes->GetHashCode() != nParentHash )
- {
- XubString aMsg( "SBX-Objekt \"" );
- aMsg += pRes->GetName();
- aMsg += "\"\n in Objekt \"";
- aMsg += GetName();
- aMsg += "\" bereits vorhanden";
- DbgError( (const char*)aMsg.GetStr() );
- }
-#endif
-*/
return PTR_CAST(SbxObject,pRes);
}
}
@@ -477,20 +461,6 @@ void SbxObject::Insert( SbxVariable* pVar )
if( pOld == pVar )
return;
-/* Wegen haeufiger Probleme (z.B. #67000) erstmal ganz raus
-#ifdef DBG_UTIL
- if( pOld->GetHashCode() != nNameHash
- && pOld->GetHashCode() != nParentHash )
- {
- XubString aMsg( "SBX-Element \"" );
- aMsg += pVar->GetName();
- aMsg += "\"\n in Objekt \"";
- aMsg += GetName();
- aMsg += "\" bereits vorhanden";
- DbgError( (const char*)aMsg.GetStr() );
- }
-#endif
-*/
EndListening( pOld->GetBroadcaster(), TRUE );
if( pVar->GetClass() == SbxCLASS_PROPERTY )
{
diff --git a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
index 4c40322..a3f61aa 100644
--- a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
@@ -31,8 +31,6 @@
#endif
// INCLUDE ---------------------------------------------------------------
-
-
#include "scitems.hxx"
#include <bf_svx/eeitem.hxx>
#define ITEMID_FIELD EE_FEATURE_FIELD
@@ -175,7 +173,6 @@ BOOL bDrawIsInUndo = FALSE; //! Member
/*?*/ SetColorTable( OFF_APP()->GetStdColorTable() );
/*N*/
/*N*/ SetSwapGraphics(TRUE);
-/*N*/ // SetSwapAsynchron(TRUE); // an der View
/*N*/
/*N*/ SetScaleUnit(MAP_100TH_MM);
/*N*/ SfxItemPool& rPool = GetItemPool();
@@ -246,8 +243,6 @@ BOOL bDrawIsInUndo = FALSE; //! Member
/*N*/ //! remove this method?
/*N*/ }
-
-
/*N*/ void ScDrawLayer::ScAddPage( USHORT nTab )
/*N*/ {
/*N*/ if (bDrawIsInUndo)
@@ -267,10 +262,6 @@ BOOL bDrawIsInUndo = FALSE; //! Member
/*N*/ pPage->SetName(rNewName);
/*N*/ }
-
-
-
-
/*N*/ void ScDrawLayer::SetPageSize( USHORT nPageNo, const Size& rSize )
/*N*/ {
/*N*/ SdrPage* pPage = GetPage(nPageNo);
@@ -345,7 +336,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ ScWriteHeader aHdr( rStream );
/*N*/
-/*N*/ //-/ const_cast<ScDrawLayer*>(this)->PrepareStore(); // non-const
/*N*/ const_cast<ScDrawLayer*>(this)->PreSave(); // non-const
/*N*/
/*N*/ {
@@ -750,12 +740,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-
-
-
-
-
// static
/*N*/ inline BOOL IsNamedObject( SdrObject* pObj, const String& rName )
diff --git a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
index 302bf1b..fa7b810 100644
--- a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
@@ -272,35 +272,6 @@ namespace binfilter {
/*N*/ rSizeChanged = TRUE;
/*N*/ }
/*N*/
-/* nicht zusammenfassen!
-
- // zusammenfassen
-
- USHORT nCount = aCollections[nLevel].GetCount();
- USHORT nIndex;
- bFound = FALSE;
- for ( nIndex=0; nIndex<nCount && !bFound; nIndex++ )
- {
- if ( ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetEnd() + 1 == nStartCol )
- {
- nStartCol = ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetStart();
- aCollections[nLevel].AtFree(nIndex);
- nCount = aCollections[nLevel].GetCount(); // Daten geaendert
- bFound = TRUE;
- }
- }
-
- bFound = FALSE;
- for ( nIndex=0; nIndex<nCount && !bFound; nIndex++ )
- {
- if ( ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetStart() == nEndCol + 1 )
- {
- nEndCol = ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetEnd();
- aCollections[nLevel].AtFree(nIndex);
- bFound = TRUE;
- }
- }
-*/
/*N*/ ScOutlineEntry* pNewEntry = new ScOutlineEntry( nStartCol, nEndCol+1-nStartCol, bHidden );
/*N*/ pNewEntry->SetVisible( bVisible );
/*N*/ aCollections[nLevel].Insert( pNewEntry );
diff --git a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
index 5a96bc3..66c5f5f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
@@ -85,16 +85,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
//------------------------------------------------------------------------
-//-/class ScPublicAttrObj : public SdrAttrObj
-//-/{
-//-/private:
-//-/ ScPublicAttrObj() {} // wird nicht angelegt
-//-/public:
-//-/ const XLineAttrSetItem* GetLineAttr() { return pLineAttr; }
-//-/};
-
-//------------------------------------------------------------------------
-
/*N*/ class ScDetectiveData
/*N*/ {
/*N*/ private:
@@ -381,19 +371,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/ BOOL bObjEndAlien =
/*N*/ lcl_IsOtherTab( ((const XLineEndItem&)pObject->GetItem(XATTR_LINEEND)).GetValue() );
/*N*/
-/*N*/ //-/ BOOL bObjStartAlien = FALSE;
-/*N*/ //-/ BOOL bObjEndAlien = FALSE;
-/*N*/ //-/ const XLineAttrSetItem* pLineAttrs =
-/*N*/ //-/ ((ScPublicAttrObj*)(SdrAttrObj*)pObject)->GetLineAttr();
-/*N*/ //-/ if (pLineAttrs)
-/*N*/ //-/ {
-/*N*/ //-/ const SfxItemSet& rSet = pLineAttrs->GetItemSet();
-/*N*/ //-/ bObjStartAlien = (((const XLineStartItem&)rSet.Get(XATTR_LINESTART)).
-/*N*/ //-/ GetValue().GetPointCount() == 4 );
-/*N*/ //-/ bObjEndAlien = (((const XLineEndItem&)rSet.Get(XATTR_LINEEND)).
-/*N*/ //-/ GetValue().GetPointCount() == 4 );
-/*N*/ //-/ }
-/*N*/
/*N*/ BOOL bStartHit = bStartAlien ? bObjStartAlien :
/*N*/ ( !bObjStartAlien && aStartRect.IsInside(pObject->GetPoint(0)) );
/*N*/ BOOL bEndHit = bEndAlien ? bObjEndAlien :
@@ -454,7 +431,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ???
/*N*/
-/*N*/ //-/ pArrow->SetAttributes( rAttrSet, FALSE );
/*N*/ pArrow->SetItemSetAndBroadcast(rAttrSet);
/*N*/
/*N*/ ScDrawLayer::SetAnchor( pArrow, SCA_CELL );
@@ -496,7 +472,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ SdrRectObj* pBox = new SdrRectObj(Rectangle(aStartCorner,aEndCorner));
/*N*/
-/*N*/ //-/ pBox->SetAttributes( rData.GetBoxSet(), FALSE );
/*N*/ pBox->SetItemSetAndBroadcast(rData.GetBoxSet());
/*N*/
/*N*/ ScDrawLayer::SetAnchor( pBox, SCA_CELL );
@@ -534,7 +509,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ???
/*N*/
-/*N*/ //-/ pArrow->SetAttributes( rAttrSet, FALSE );
/*N*/ pArrow->SetItemSetAndBroadcast(rAttrSet);
/*N*/
/*N*/ ScDrawLayer::SetAnchor( pArrow, SCA_CELL );
@@ -611,7 +585,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/ SdrCircObj* pCircle = new SdrCircObj( OBJ_CIRC, aRect );
/*N*/ SfxItemSet& rAttrSet = rData.GetCircleSet();
/*N*/
-/*N*/ //-/ pCircle->SetAttributes( rAttrSet, FALSE );
/*N*/ pCircle->SetItemSetAndBroadcast(rAttrSet);
/*N*/
/*N*/ ScDrawLayer::SetAnchor( pCircle, SCA_CELL );
@@ -692,17 +665,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/ void ScDetectiveFunc::DeleteBox( USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2 )
/*N*/ {
-/* String aStr;
- aStr += nCol1;
- aStr += '/';
- aStr += nRow1;
- aStr += '/';
- aStr += nCol2;
- aStr += '/';
- aStr += nRow2;
- InfoBox(0,aStr).Execute();
-*/
-/*N*/
/*N*/ Point aStartCorner = GetDrawPos( nCol1, nRow1, FALSE );
/*N*/ Point aEndCorner = GetDrawPos( nCol2+1, nRow2+1, FALSE );
/*N*/ Rectangle aObjRect;
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
index bb1fcf3..293324d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
@@ -48,8 +48,6 @@ namespace binfilter {
#define SCdEpsilon 1.0E-7
#define SC_MAX_ITERATION_COUNT 20
#define MAX_ANZ_DOUBLE_FOR_SORT 100000
-// PI jetzt als F_PI aus solar.h
-//#define PI 3.1415926535897932
//-----------------------------------------------------------------------------
@@ -61,7 +59,6 @@ public:
// iteration for inverse distributions
-//template< class T > double lcl_IterateInverse( const T& rFunction, double x0, double x1, BOOL& rConvError )
double lcl_IterateInverse( const ScDistFunc& rFunction, double x0, double x1, BOOL& rConvError )
{
rConvError = FALSE;
@@ -263,10 +260,6 @@ double ScInterpreter::Fakultaet(double x)
}
else
SetError(errNoValue);
-/* // Stirlingsche Naeherung zu ungenau
- else
- x = pow(x/exp(1), x) * sqrt(x) * SQRT_2_PI * (1.0 + 1.0 / (12.0 * x));
-*/
return x;
}
@@ -289,20 +282,6 @@ double ScInterpreter::BinomKoeff(double n, double k)
k--;
n--;
}
-/*
- double f1 = n; // Zaehler
- double f2 = k; // Nenner
- n--;
- k--;
- while (k > 0.0)
- {
- f2 *= k;
- f1 *= n;
- k--;
- n--;
- }
- nVal = f1 / f2;
-*/
}
return nVal;
}
@@ -438,74 +417,16 @@ double ScInterpreter::GetFDist(double x, double fF1, double fF2)
double alpha = fF2/2.0;
double beta = fF1/2.0;
return (GetBetaDist(arg, alpha, beta));
-/*
- double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
- sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
- return (0.5-gauss(Z));
-*/
}
double ScInterpreter::GetTDist(double T, double fDF)
{
return 0.5 * GetBetaDist(fDF/(fDF+T*T), fDF/2.0, 0.5);
-/*
- USHORT DF = (USHORT) fDF;
- double A = T / sqrt(DF);
- double B = 1.0 + A*A;
- double R;
- if (DF == 1)
- R = 0.5 + atan(A)/F_PI;
- else if (DF % 2 == 0)
- {
- double S0 = A/(2.0 * sqrt(B));
- double C0 = S0;
- for (USHORT i = 2; i <= DF-2; i+=2)
- {
- C0 *= (1.0 - 1.0/(double)i)/B;
- S0 += C0;
- }
- R = 0.5 + S0;
- }
- else
- {
- double S1 = A / (B * F_PI);
- double C1 = S1;
- for (USHORT i = 3; i <= DF-2; i+=2)
- {
- C1 *= (1.0 - 1.0/(double)i)/B;
- S1 += C1;
- }
- R = 0.5 + atan(A)/F_PI + S1;
- }
- return 1.0 - R;
-*/
}
double ScInterpreter::GetChiDist(double fChi, double fDF)
{
return 1.0 - GetGammaDist(fChi/2.0, fDF/2.0, 1.0);
-/*
- double x = 1.0;
- for (double i = fDF; i >= 2.0; i -= 2.0)
- x *= fChi/i;
- x *= exp(-fChi/2.0);
- if (fmod(fDF, 2.0) != 0.0)
- x *= sqrt(2.0*fChi/F_PI);
- double S = 1.0;
- double T = 1.0;
- double G = fDF;
- BOOL bStop = FALSE;
- while (!bStop)
- {
- G += 2.0;
- T *= fChi/G;
- if (T < 1.0E-7)
- bStop = TRUE;
- else
- S += T;
- }
- return 1.0 - x*S;
-*/
}
void ScInterpreter::ScLogGamma()
@@ -680,16 +601,7 @@ void ScInterpreter::ScB()
double xs = GetDouble();
double p = GetDouble();
double n = GetDouble();
-// alter Stand 300-SC
-// if ((xs < n) && (xe < n) && (p < 1.0))
-// {
-// double Varianz = sqrt(n * p * (1.0 - p));
-// xs = fabs(xs - (n * p /* / 2.0 STE */ ));
-// xe = fabs(xe - (n * p /* / 2.0 STE */ ));
-//// STE double nVal = gauss((xs + 0.5) / Varianz) + gauss((xe + 0.5) / Varianz);
-// double nVal = fabs(gauss(xs / Varianz) - gauss(xe / Varianz));
-// PushDouble(nVal);
-// }
+
if (xe <= n && xs <= xe &&
p < 1.0 && p > 0.0 && n >= 0.0 && xs >= 0.0 )
{
@@ -1084,27 +996,6 @@ void ScInterpreter::ScHypGeomDist()
double fFactor =
BinomKoeff( n, x ) / BinomKoeff( N, M ) * BinomKoeff( N - n, M - x );
-/*
- double fFactor;
- if (x == n - N + M)
- fFactor = BinomKoeff(M,x)/BinomKoeff(N,n);
- else
- {
- double fIndex = N - M - n;
- if (fIndex >= 0.0)
- {
- fFactor = BinomKoeff(N-M,n)/BinomKoeff(N,n);
- for (double i = 0; i < x; i++)
- fFactor *= (M-i)*(n-i)/((i+1.0)*(N-M-n+i+1.0));
- }
- else
- {
- fFactor = BinomKoeff(M,-fIndex)/BinomKoeff(N,n);
- for (double i = -fIndex + 1.0; i < x; i++)
- fFactor *= (M-i)*(n-i)/((i+1)*(N-M-n+i+1.0));
- }
- }
-*/
PushDouble(fFactor);
}
}
@@ -1633,8 +1524,6 @@ void ScInterpreter::ScTTest()
}
fT = fabs(fSum1/fCount1 - fSum2/fCount2)/sqrt(fS1+fS2);
double c = fS1/(fS1+fS2);
-// s.u. fF = ::rtl::math::approxFloor(1.0/(c*c/(fCount1-1.0)+(1.0-c)*(1.0-c)/(fCount2-1.0)));
-// fF = ::rtl::math::approxFloor((fS1+fS2)*(fS1+fS2)/(fS1*fS1/(fCount1-1.0) + fS2*fS2/(fCount2-1.0)));
// GetTDist wird mit GetBetaDist berechnet und kommt auch mit nicht ganzzahligen
// Freiheitsgraden klar. Dann stimmt das Ergebnis auch mit Excel ueberein (#52406#):
@@ -1722,11 +1611,6 @@ void ScInterpreter::ScFTest()
fF2 = fCount1-1.0;
}
PushDouble(2.0*GetFDist(fF, fF1, fF2));
-/*
- double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
- sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
- PushDouble(1.0-2.0*gauss(Z));
-*/
}
void ScInterpreter::ScChiTest()
@@ -1780,25 +1664,6 @@ void ScInterpreter::ScChiTest()
else
fDF = (double)(nC1-1)*(double)(nR1-1);
PushDouble(GetChiDist(fChi, fDF));
-/*
- double fX, fS, fT, fG;
- fX = 1.0;
- for (double fi = fDF; fi >= 2.0; fi -= 2.0)
- fX *= fChi/fi;
- fX *= exp(-fChi/2.0);
- if (fmod(fDF, 2.0) != 0.0)
- fX *= sqrt(2.0*fChi/F_PI);
- fS = 1.0;
- fT = 1.0;
- fG = fDF;
- while (fT >= 1.0E-7)
- {
- fG += 2.0;
- fT *= fChi/fG;
- fS += fT;
- }
- PushDouble(1.0 - fX*fS);
-*/
}
void ScInterpreter::ScKurt()
@@ -2601,22 +2466,6 @@ void ScInterpreter::ScLarge()
#else
double* pSArray = pSortArray;
#endif
-/*
- ULONG nCount = 1;
- double nOldVal = pSArray[nSize-1];
- for (long i = nSize-2; i >= 0 && nCount < k; i--)
- {
- if (pSArray[i] != nOldVal)
- {
- nCount++;
- nOldVal = pSArray[i];
- }
- }
- if (nCount < k)
- SetNoValue();
- else
- PushDouble(nOldVal);
-*/
PushDouble( pSArray[ nSize-k ] );
}
if (pSortArray)
@@ -2651,22 +2500,6 @@ void ScInterpreter::ScSmall()
#else
double* pSArray = pSortArray;
#endif
-/*
- ULONG nCount = 1;
- double nOldVal = pSArray[0];
- for (ULONG i = 1; i < nSize && nCount < k; i++)
- {
- if (pSArray[i] != nOldVal)
- {
- nCount++;
- nOldVal = pSArray[i];
- }
- }
- if (nCount < k)
- SetNoValue();
- else
- PushDouble(nOldVal);
-*/
PushDouble( pSArray[ k-1 ] );
}
if (pSortArray)
@@ -2684,20 +2517,6 @@ void ScInterpreter::ScPercentrank()
BYTE nParamCount = GetByte();
if ( !MustHaveParamCount( nParamCount, 2 ) )
return;
-/* wird nicht unterstuetzt
- double fPrec;
- if (nParamCount == 3)
- {
- fPrec = ::rtl::math::approxFloor(GetDouble());
- if (fPrec < 1.0)
- {
- SetIllegalArgument();
- return;
- }
- }
- else
- fPrec = 3.0;
-*/
double fNum = GetDouble();
double* pSortArray = NULL;
ULONG nSize = 0;
diff --git a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
index d2ed296..3201e1d 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
@@ -40,9 +40,8 @@
#ifndef _SVX_CHRTITEM_HXX //autogen
#define ITEMID_DOUBLE 0
#define ITEMID_CHARTDATADESCR SCHATTR_DATADESCR_DESCR
-
-
#endif
+
#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT
#define ITEMID_FONTWIDTH EE_CHAR_FONTWIDTH
#include <bf_svx/fwdtitem.hxx>
@@ -56,17 +55,16 @@
#include <math.h>
#include <float.h>
-
#include "pairs.hxx"
#include "globfunc.hxx"
-
#include <bf_svx/xlineit.hxx>
// header for Line
#include "chaxis.hxx"
#include "chdescr.hxx"
#include "calculat.hxx"
+
namespace binfilter {
#define SCH_SIN(a) (sin((double)a * F_PI / 18000.0))
@@ -74,11 +72,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* DataDescription Array initialisieren (loeschen)
-|*
-\************************************************************************/
-/*************************************************************************
-|*
|* Kreisdiagramm erzeugen
|*
\************************************************************************/
@@ -640,7 +633,6 @@ namespace binfilter {
/*N*/ pLineObject = NULL;
/*N*/
if( ((const SfxBoolItem &) rDataRowAttr.Get( SCHATTR_STAT_AVERAGE )).GetValue() )
-// pStatLists[ nRow ]->NbcInsertObject( AverageValueY( nRow, FALSE, aRect,
{DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ aSplinePoints.clear();
@@ -760,7 +752,6 @@ namespace binfilter {
/*N*/ pLineObject->InsertUserData( new SchObjectId( CHOBJID_DIAGRAM_ROWSLINE ));
/*N*/ pLineObject->InsertUserData( new SchDataRow( (short)nRow ));
/*N*/
-//-/ pObj->NbcSetAttributes( aLineAttr, FALSE );
/*N*/ pLineObject->SetItemSet( aLineAttr);
/*N*/
/*N*/ }
@@ -1058,7 +1049,6 @@ namespace binfilter {
/*N*/ MergeDataPointAttr(aDataPointAttr,nCol,nRow);
/*N*/
/*N*/ long nIndex = nCol + nRow * nColCnt;
-/*N*/ // double fData = fabs(GetData(nCol, nRow, bPercent));
/*N*/ double fData = GetData(nCol, nRow, bPercent);
/*N*/
/*N*/ if (pYAxisList)
@@ -1122,7 +1112,7 @@ namespace binfilter {
/*N*/
/*N*/ nPoints ++;
/*N*/
-/*N*/ if(HasSymbols(nRow)) // if ((eChartStyle == CHSTYLE_2D_NET_SYMBOLS) ||(eChartStyle == CHSTYLE_2D_NET_SYMBOLS_STACK) ||(eChartStyle == CHSTYLE_2D_NET_SYMBOLS_PERCENT))
+/*N*/ if(HasSymbols(nRow))
/*N*/ {
/*N*/ SdrObject *pNewObj = CreateSymbol (aDataLine[nPoints - 1], nRow, nCol,
/*N*/ (SfxItemSet &) rDataRowAttr, nLegendHeight);
@@ -1154,7 +1144,6 @@ namespace binfilter {
/*?*/ pObj->InsertUserData(new SchDataRow((short)nRow));
/*?*/ pRowLists[nRow]->NbcInsertObject(pObj,0); //#54870# Linie nach hinten
/*?*/
-/*?*/ //-/ pObj->NbcSetAttributes(aLineAttr, FALSE);
/*?*/ pObj->SetItemSet(aLineAttr);
/*?*/
/*?*/ nPoints = 0;
@@ -1193,7 +1182,6 @@ namespace binfilter {
/*N*/ pObj->InsertUserData(new SchDataRow((short)nRow));
/*N*/ pRowLists[nRow]->NbcInsertObject(pObj,0);//#54870# hinter die Symbole mit der Linie
/*N*/
-/*N*/ //-/ pObj->NbcSetAttributes(aLineAttr, FALSE);
/*N*/ pObj->SetItemSet(aLineAttr);
/*N*/
/*N*/ }
@@ -1330,12 +1318,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Trage ggf. Mittelwert und Fehlerbalken ein
-|*
-\************************************************************************/
-
-/*************************************************************************
-|*
|* Erstelle Kreissegment
|*
\************************************************************************/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode1.cxx b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
index 0b93527..a0842bf 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode1.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
@@ -46,8 +46,6 @@
#define ITEMID_DOUBLE 0
#define ITEMID_CHARTDATADESCR SCHATTR_DATADESCR_DESCR
#define ITEMID_CHARTTEXTORIENT SCHATTR_TEXT_ORIENT
-
-
#endif
#define ITEMID_FONT EE_CHAR_FONTINFO
@@ -61,33 +59,22 @@
#include <bf_svx/dialogs.hrc>
#include "math.h"
-
#include <bf_svx/xlnedcit.hxx>
-
#include <bf_svx/xlnstcit.hxx>
-
#include <bf_svx/xlnedwit.hxx>
-
#include <bf_svx/xlnstwit.hxx>
-
#include <bf_svx/xlnedit.hxx>
-
#include <bf_svx/xlnstit.hxx>
-
#include <bf_svx/xlndsit.hxx>
-
-
#include <bf_svx/xlnclit.hxx>
-
#include <bf_svx/xlnwtit.hxx>
#include "pairs.hxx"
#include "datalog.hxx"
-
#include "chaxis.hxx"
-
#include "chmod3d.hxx"
#include "schmod.hxx"
+
namespace binfilter {
/************************************************************************/
@@ -249,8 +236,6 @@ namespace binfilter {
/*N*/ aAreaAttr.Put(SdrTextAutoGrowWidthItem( bIsTitle ));
/*N*/ aAreaAttr.Put(rAttr);
/*N*/
-/*N*/
-/*N*/ //-/ pObj->NbcSetAttributes(aAreaAttr, FALSE);//#63904# 10%
/*N*/ pObj->SetItemSet(aAreaAttr);//#63904# 10%
/*N*/
/*N*/ pObj->InsertUserData(new SchObjectId(nId));
@@ -277,12 +262,6 @@ namespace binfilter {
/*N*/ const SfxItemSet& rAttr,
/*N*/ const long /*nMaximumWidth*/)
/*N*/ {
-/*N*/ // #97992# calling SetItemSet results in changing the p...Attr in the ChartModel
-/*N*/ // because of the implementation of SchRectObj. Maybe this is wrong, but it seemed
-/*N*/ // to risky, therefore I set here all the correct items to prevent loss
-/*N*/ // SfxItemSet aObjAttr( *pItemPool, nAreaWhichPairs );
-/*N*/ // aObjAttr.Put(rAttr);
-/*N*/ // rTextObj.SetItemSetAndBroadcast(aAreaAttr);
/*N*/ rTextObj.SetItemSetAndBroadcast( rAttr );
/*N*/
/*N*/ if ( rTextObj.GetOutlinerParaObject())
@@ -372,7 +351,6 @@ namespace binfilter {
/*N*/ // the outliner.
/*N*/ SfxItemSet aTextAttr(*pItemPool, nTextOrientWhichPairs);
/*N*/ aTextAttr.Put(GetAttr(CHOBJID_DIAGRAM_X_AXIS));
-/*N*/ // SetTextAttributes (aTextAttr);
/*N*/
/*N*/ double fAct = fMinX;
/*N*/
@@ -428,7 +406,6 @@ namespace binfilter {
/*N*/ // the outliner.
/*N*/ SfxItemSet aTextAttr(*pItemPool, nTextOrientWhichPairs);
/*N*/ aTextAttr.Put(*pLclAxisAttr);
-/*N*/ // SetTextAttributes (aTextAttr);
/*N*/
/*N*/ for (short i = 0; i < nCnt; i++)
/*N*/ {
@@ -475,13 +452,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Text-H”he ermitteln
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Datenzeilen-Attributsets initialisieren
|*
\************************************************************************/
@@ -883,13 +853,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Defaultfarben kopieren
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Defaultfarben loeschen
|*
\************************************************************************/
@@ -923,12 +886,6 @@ namespace binfilter {
/*N*/ void ChartModel::SetTextAttributes (SfxItemSet & rTextAttributes)
/*N*/ {
-/* static SfxItemSet * pLastItemSet = NULL;
- if (&rTextAttributes == pLastItemSet)
- return;
- else
- pLastItemSet = &rTextAttributes;
-*/
/*N*/ ULONG nParagraphCount = pOutliner->GetParagraphCount();
/*N*/ for (ULONG i=0; i<nParagraphCount; i++)
/*N*/ pOutliner->SetParaAttribs(i, rTextAttributes);
@@ -1059,15 +1016,6 @@ namespace binfilter {
/*N*/ return (bGetRotated && nDegrees) ? aRot : aSize;
/*N*/ }
-/*************************************************************************
-|*
-|* Liefert die Hoehe von n Textzeilen, mit den uebergebenen Attributen
-|* FG: 13.2.97 Hier wird einfach n mal die Texthoehe einer Zeile zurueckgegeben
-|*
-\************************************************************************/
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index dc78e61..7649f1d 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -67,16 +67,11 @@
#include <sal/types.h>
#include <bf_svx/xlnedit.hxx>
-
#include <bf_svx/xlnstit.hxx>
-
#include <bf_svx/xlndsit.hxx>
-
#include <bf_svx/xlnclit.hxx>
-
#include <bf_svx/xlnwtit.hxx>
-
#include "glob.hrc"
#include "chtscene.hxx"
@@ -206,9 +201,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ // if( bOnlyInserted )
-/*N*/ // pAxisAttr->ClearItem( SCHATTR_AXIS_SHOWDESCR );
-/*N*/
/*N*/ return *pAxisAttr;
/*N*/ }
@@ -1003,14 +995,6 @@ namespace binfilter {
/*N*/ return;
/*N*/ bAttrAutoStorage=FALSE; //Rekursionen verhindern
/*N*/
-/*N*/ //Eventuell 3D-Materialfarbe in 2D-Füllfarbe konvertieren:
-/* const SfxPoolItem *pPoolItem;
- if( SFX_ITEM_SET == rAttr.GetItemState( SID_ATTR_3D_MAT_COLOR, TRUE, &pPoolItem ) )
- {
- Color aNew = ( ( const SvxColorItem* ) pPoolItem )->GetValue();
- ((SfxItemSet&)rAttr).Put(XFillColorItem(String(),aNew));
- }
-*/
/*N*/ DBG_ITEMS(((SfxItemSet&)rAttr),this);
/*N*/
/*N*/ SchObjectId* pObjId = GetObjectId(*pObj);
@@ -1056,7 +1040,6 @@ namespace binfilter {
/*N*/ SdrObject *pO = aIterator.Next();
/*N*/ SchObjectId *pI = GetObjectId(*pO);
/*N*/ if(pI && pI->GetObjId()==CHOBJID_DIAGRAM_WALL && pO!=pObj)
-/*N*/ //-/ pO->SetAttributes(rAttr,FALSE);
/*N*/ pO->SetItemSetAndBroadcast(rAttr);
/*N*/ }
/*N*/ }
@@ -1201,49 +1184,6 @@ namespace binfilter {
/*N*/ return pObj;
/*N*/ }
-// GetAttr-Methoden:
-//GetAttr(id) Diese Methode sucht anhand der Id den passenden Model-eigenen AttrSet
-//Achtung! Wenn zu einer ID kein Set existiert, wird *pDummyAttr returned!
-//(ungefährlich, geringer Overhead, wirft daher nur DBG__TRACE)
-//Nicht-Singuläre Objekte können nicht an der ID alleine identifiziert werden,
-//in diesem Fall muss GetAttr(SdrObject*) statt GetAttr(long id) gerufen werden
-// GetAttr(long id, SfxItemSet&) besorgt alle für ein Objekt verfügbaren und
-// gültigen Attribute
-
-/*
-Fehlen evtl. noch in GetAttr(ID):
-
-#define CHOBJID_DIAGRAM 13
-#define CHOBJID_DIAGRAM_X_GRID_MAIN 22
-#define CHOBJID_DIAGRAM_Y_GRID_MAIN 23
-#define CHOBJID_DIAGRAM_Z_GRID_MAIN 24
-#define CHOBJID_DIAGRAM_X_GRID_HELP 25
-#define CHOBJID_DIAGRAM_Y_GRID_HELP 26
-#define CHOBJID_DIAGRAM_Z_GRID_HELP 27
-#define CHOBJID_DIAGRAM_ROWS 29
-#define CHOBJID_DIAGRAM_ROWSLINE 30
-#define CHOBJID_DIAGRAM_DESCRGROUP 32
-#define CHOBJID_DIAGRAM_DESCR_ROW 33
-#define CHOBJID_DIAGRAM_DESCR_COL 38
-#define CHOBJID_DIAGRAM_DESCR_SYMBOL 39
-#define CHOBJID_DIAGRAM_NET 41
-#define CHOBJID_DIAGRAM_STACKEDGROUP 46
-#define CHOBJID_DIAGRAM_STATISTICS_GROUP 48
-
-
- nur GetAttr(pObj):
-#define CHOBJID_DIAGRAM_AVERAGEVALUE 42
-#define CHOBJID_DIAGRAM_REGRESSION 45
-#define CHOBJID_DIAGRAM_ERROR 43
-
-#define CHOBJID_LEGEND_SYMBOL_ROW 36
-#define CHOBJID_LEGEND_SYMBOL_COL 37
-#define CHOBJID_DIAGRAM_DATA 31
-#define CHOBJID_DIAGRAM_SPECIAL_GROUP 55
-#define CHOBJID_DIAGRAM_ROWGROUP 28
-
- */
-
/*N*/ void ChartModel::SetAttributes(const long nId,const SfxItemSet& rAttr,BOOL bMerge)
/*N*/ {
/*N*/ CHART_TRACE( "ChartModel::SetAttributes" );
@@ -1252,30 +1192,6 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/ if(!bMerge)
/*N*/ rItemSet.ClearItem();
-
- //sobald die member bShow*Descr endlich entfallen, kann das hier alles weg
-/* if(nId==CHOBJID_DIAGRAM_X_AXIS || nId==CHOBJID_DIAGRAM_Y_AXIS || nId==CHOBJID_DIAGRAM_Z_AXIS)
- {
- const SfxPoolItem *pPoolItem=NULL;
- if( rAttr.GetItemState( SCHATTR_AXIS_SHOWDESCR, FALSE, &pPoolItem ) == SFX_ITEM_SET )
- {
- BOOL bShow = ( (const SfxBoolItem*) pPoolItem)->GetValue();
- switch(nId)
- {
- case CHOBJID_DIAGRAM_X_AXIS:
- bShowXDescr=bShow;
- break;
- case CHOBJID_DIAGRAM_Y_AXIS:
- bShowYDescr=bShow;
- break;
- case CHOBJID_DIAGRAM_Z_AXIS:
- bShowZDescr=bShow;
- break;
- }
- }
- }*/
-
-
/*N*/ rItemSet.Put(rAttr);
/*N*/ }
/*N*/ SfxItemSet& ChartModel::GetAttr(const long nObjId,const long nIndex1/*=-1*/) const
@@ -1348,11 +1264,6 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/ case CHOBJID_LEGEND:
/*N*/ return *pLegendAttr;
/*N*/
- /*return *pTitleAttr;
- return *pAxisAttr;
- return *pGridAttr;
- return *pChartAttr;*/
-/*N*/
/*N*/ case CHOBJID_DIAGRAM_REGRESSION:
/*?*/ return *aRegressAttrList[ nIndex1 ];
/*N*/ case CHOBJID_DIAGRAM_ERROR:
@@ -1424,7 +1335,6 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/ {
/*N*/ BOOL bNeedChanges=TRUE; //noch ungenutzt, zur evtl. Optimierung
/*N*/
-/*N*/
/*N*/ //ToDo: optimieren! klappt wegen XChartView so nicht:
/*N*/ //BOOL bForceBuild=FALSE;
/*N*/ BOOL bForceBuild=TRUE;
@@ -1436,7 +1346,6 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/ {
/*N*/ pObj=(GetObjWithId ((USHORT)nId,*GetPage(0),0,IM_DEEPWITHGROUPS));
/*N*/ if(pObj)
-/*N*/ //-/ pObj->SetAttributes(rAttr,FALSE);
/*N*/ pObj->SetItemSetAndBroadcast(rAttr);
/*N*/ }
/*N*/
@@ -1510,67 +1419,6 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/
/*N*/ return bResult;
/*N*/ }
-/* Anmerkungen zu GetObjectAttr,SetObjectAttr:
-
-- das koennte bei get(????) fehlen:
- CompareSets (*pYGridMainAttr, *pGridAttr);
- CompareSets (*pZGridMainAttr, *pGridAttr);
- CompareSets (*pXGridHelpAttr, *pGridAttr);
- CompareSets (*pYGridHelpAttr, *pGridAttr);
- CompareSets (*pZGridHelpAttr, *pGridAttr);
-
-- evtl. sollten default-itemwerte erkannt und wieder entfert werden (SET)
-
-- erweitern auf DataRowPoint!
-
-- Das koennte man mal alles oben hineintun....
-
-#define CHOBJID_TEXT 1
-#define CHOBJID_AREA 2
-#define CHOBJID_LINE 3
-
-
-
-#define CHOBJID_TITLE_MAIN 11
-#define CHOBJID_TITLE_SUB 12
-#define CHOBJID_DIAGRAM 13
-
-#define CHOBJID_DIAGRAM_TITLE_X_AXIS 16
-#define CHOBJID_DIAGRAM_TITLE_Y_AXIS 17
-#define CHOBJID_DIAGRAM_TITLE_Z_AXIS 18
-
-
-#define CHOBJID_DIAGRAM_ROWGROUP 28
-#define CHOBJID_DIAGRAM_ROWS 29
-#define CHOBJID_DIAGRAM_ROWSLINE 30
-#define CHOBJID_DIAGRAM_DATA 31
-#define CHOBJID_DIAGRAM_DESCRGROUP 32
-#define CHOBJID_DIAGRAM_DESCR_ROW 33
-#define CHOBJID_DIAGRAM_DESCR_COL 38
-#define CHOBJID_DIAGRAM_DESCR_SYMBOL 39
-#define CHOBJID_LEGEND 34
-#define CHOBJID_LEGEND_BACK 35
-#define CHOBJID_LEGEND_SYMBOL_ROW 36
-#define CHOBJID_LEGEND_SYMBOL_COL 37
-#define CHOBJID_DIAGRAM_NET 41
-#define CHOBJID_DIAGRAM_AVERAGEVALUE 42
-#define CHOBJID_DIAGRAM_ERROR 43
-#define CHOBJID_DIAGRAM_REGRESSION 45
-#define CHOBJID_DIAGRAM_STACKEDGROUP 46
-#define CHOBJID_DIAGRAM_STATISTICS_GROUP 48
-#define CHOBJID_DIAGRAM_X_GRID_MAIN_GROUP 49
-#define CHOBJID_DIAGRAM_Y_GRID_MAIN_GROUP 50
-#define CHOBJID_DIAGRAM_Z_GRID_MAIN_GROUP 51
-#define CHOBJID_DIAGRAM_X_GRID_HELP_GROUP 52
-#define CHOBJID_DIAGRAM_Y_GRID_HELP_GROUP 53
-#define CHOBJID_DIAGRAM_Z_GRID_HELP_GROUP 54
-#define CHOBJID_DIAGRAM_SPECIAL_GROUP 55
-
-pYGridMainAttr->Put(rAttr);
-*/
-
-
-
/*N*/ UINT32 ChartModel::GetNumFmt(long nObjId,BOOL bPercent)
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index 21e0a30..1854058 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -25,12 +25,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifdef _MSC_VER
#pragma optimize("e",off)
-
-
#pragma hdrstop
#endif
+
#define ITEMID_FONTLIST 0
#define ITEMID_POSTURE 0
#define ITEMID_WEIGHT 0
@@ -56,7 +56,6 @@
#define ITEMID_FONTWIDTH EE_CHAR_FONTWIDTH
#include <bf_svtools/whiter.hxx>
-
#include <bf_svx/eeitem.hxx>
#include "schattr.hxx"
@@ -67,26 +66,15 @@
#define ITEMID_CHARTDATADESCR SCHATTR_DATADESCR_DESCR
#include <bf_svtools/eitem.hxx>
-
#endif
-
#include <bf_svx/fhgtitem.hxx>
-
-
-
#include <bf_svx/svxids.hrc>
-
-
#include <globfunc.hxx>
-
-
-
#include "math.h"
#include "float.h"
-
#include <bf_svx/fontitem.hxx>
#include <bf_svx/wghtitem.hxx>
#include <bf_svx/udlnitem.hxx>
@@ -116,7 +104,6 @@ namespace binfilter {
/*N*/ pObj->SetMoveProtect (bProtect);
/*N*/ pObj->SetResizeProtect (bResize);
/*N*/ if (pAttr)
-/*N*/ //-/ pObj->NbcSetAttributes (*pAttr, FALSE);//#63904# Nbc neu
/*N*/ pObj->SetItemSet(*pAttr);
/*N*/
/*N*/ return pObj;
@@ -450,13 +437,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Faktor fuer Koordinaten-Multiplikation berechnen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Konvertiert in echte RGB-Farben.
|*
\************************************************************************/
@@ -495,21 +475,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* "Entstapelt" den angegebenen String.
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Aendert die Helligkeit der Fuellfarbe des Ziel-ItemSets;
-|* Liefert die alte Fuellfarbe zurueck.
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Position des ungedrehten Rechtecks entsprechend der Ausrichtung anpassen
|*
\************************************************************************/
@@ -1281,12 +1246,6 @@ namespace binfilter {
/*N*/ rFont.SetPitch( pFontItem->GetPitch());
/*N*/ }
/*N*/
-/*N*/ // rFont.SetColor( ((const SvxColorItem&)rSet.Get( EE_CHAR_COLOR )).GetValue() );
-/*N*/ // rFont.SetName( ((const SvxFontItem&)rSet.Get( EE_CHAR_FONTINFO )).GetFamilyName() );
-/*N*/ // rFont.SetFamily( ((const SvxFontItem&)rSet.Get( EE_CHAR_FONTINFO )).GetFamily() );
-/*N*/ // rFont.SetPitch( ((const SvxFontItem&)rSet.Get( EE_CHAR_FONTINFO )).GetPitch() );
-/*N*/ // rFont.SetCharSet( ((const SvxFontItem&)rSet.Get( EE_CHAR_FONTINFO )).GetCharSet() );
-/*N*/
/*N*/ // Scale the font's horizontal size like the vertical size. Assume that the original size is
/*N*/ // 7pt. The scaling is done here because the item EE_CHAR_FONTWIDTH holds a horizontal scaling
/*N*/ // factor. The horizontal size can therefore not be stored there. But as the font is scaled
@@ -1294,9 +1253,6 @@ namespace binfilter {
/*N*/ long nFontHeight = static_cast<const SvxFontHeightItem&>(rSet.Get(EE_CHAR_FONTHEIGHT)).GetHeight();
/*N*/ long nFontWidth = 0; // #89001# use default font width
/*N*/ rFont.SetSize (Size (nFontWidth, nFontHeight));
-/*N*/ // Old line.
-/*N*/ // rFont.SetSize( Size( ((const SvxFontWidthItem&)rSet.Get( EE_CHAR_FONTWIDTH )).GetWidth(),
-/*N*/ // ((const SvxFontHeightItem&)rSet.Get( EE_CHAR_FONTHEIGHT )).GetHeight() ) );
/*N*/
/*N*/ rFont.SetWeight( ((const SvxWeightItem&)rSet.Get( EE_CHAR_WEIGHT )).GetWeight() );
/*N*/ rFont.SetUnderline( ((const SvxUnderlineItem&)rSet.Get( EE_CHAR_UNDERLINE )).GetUnderline() );
@@ -1304,12 +1260,8 @@ namespace binfilter {
/*N*/ rFont.SetItalic( ((const SvxPostureItem&)rSet.Get( EE_CHAR_ITALIC )).GetPosture() );
/*N*/ rFont.SetOutline( ((const SvxContourItem&)rSet.Get( EE_CHAR_OUTLINE )).GetValue() );
/*N*/ rFont.SetShadow( ((const SvxShadowedItem&)rSet.Get( EE_CHAR_SHADOW )).GetValue() );
-/*N*/ //rFont.SetEscapement( ((const SvxEscapementItem&)rSet.Get( EE_CHAR_ESCAPEMENT)).GetEsc() );
-/*N*/ //rFont.SetPropr( ((const SvxEscapementItem&)rSet.Get( EE_CHAR_ESCAPEMENT)).GetProp() );
/*N*/ rFont.SetKerning( ((const SvxAutoKernItem&)rSet.Get( EE_CHAR_PAIRKERNING )).GetValue() );
-/*N*/ //rFont.SetFixKerning( ((const SvxKerningItem&)rSet.Get( EE_CHAR_KERNING )).GetValue() );
/*N*/ rFont.SetWordLineMode( ((const SvxWordLineModeItem&)rSet.Get( EE_CHAR_WLM )).GetValue() );
-/*N*/ // rFont.SetOrientation( (short)(rDesc.Orientation*10) );
/*N*/ }
@@ -1385,7 +1337,6 @@ namespace binfilter {
/*N*/ Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() );
/*N*/ nColor=aColor.GetRGBColor();
/*N*/ }
-/*N*/ //-/ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_3D_MAT_COLOR, TRUE, &pPoolItem ) )
/*N*/ if( SFX_ITEM_SET == rSet.GetItemState( SDRATTR_3DOBJ_MAT_COLOR, TRUE, &pPoolItem ) )
/*N*/ {
/*N*/ Color aNew( ((const SvxColorItem*) pPoolItem )->GetValue() );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 6d39d76..64cc9ec 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -29,41 +29,25 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
-
-
#include <rtl/uuid.h>
#include <rtl/memory.h>
#include <bf_svx/unofield.hxx>
-
-
-
-
#include <bf_svx/UnoForbiddenCharsTable.hxx>
-
#include <bf_svx/forbiddencharacterstable.hxx>
-
#include <bf_svx/UnoNamespaceMap.hxx>
-
#include <bf_svx/unoapi.hxx>
-
#include <bf_svx/unofill.hxx>
-
#include <bf_svx/svdorect.hxx>
#include <toolkit/awt/vclxdevice.hxx>
#include <bf_svtools/unoimap.hxx>
-
#include <bf_svx/unolingu.hxx>
#include <bf_svx/svdpagv.hxx>
-
#include <bf_svx/unoshape.hxx>
#include <bf_svx/unonrule.hxx>
-
-// #99870# Support creation of GraphicObjectResolver and EmbeddedObjectResolver
#include <bf_svx/xmleohlp.hxx>
-
#include <bf_svx/xmlgrhlp.hxx>
#include "bf_sd/docshell.hxx"
@@ -88,6 +72,7 @@
#include <frmview.hxx>
#include <legacysmgr/legacy_binfilters_smgr.hxx>
+
namespace binfilter {
using namespace ::osl;
@@ -199,9 +184,6 @@ SdXImpressDocument::SdXImpressDocument( SdDrawDocShell* pShell ) throw()
mbImpressDoc = pDoc && pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS;
}
-/***********************************************************************
-* *
-***********************************************************************/
SdXImpressDocument::~SdXImpressDocument() throw()
{
}
@@ -209,38 +191,6 @@ SdXImpressDocument::~SdXImpressDocument() throw()
// uno helper
-/******************************************************************************
-* Erzeugt anhand der uebergebennen SdPage eine SdDrawPage. Wurde fuer diese *
-* SdPage bereits eine SdDrawPage erzeugt, wird keine neue SdDrawPage erzeug. *
-******************************************************************************/
-/*
-uno::Reference< drawing::XDrawPage > SdXImpressDocument::CreateXDrawPage( SdPage* pPage ) throw()
-{
- DBG_ASSERT(pPage,"SdXImpressDocument::CreateXDrawPage( NULL? )");
-
- uno::Reference< drawing::XDrawPage > xDrawPage;
-
- if(pPage)
- {
- xDrawPage = SvxDrawPage::GetPageForSdrPage(pPage);
-
- if(!xDrawPage.is())
- {
- if(pPage->IsMasterPage())
- {
- xDrawPage = (presentation::XPresentationPage*)new SdMasterPage( this, pPage );
- }
- else
- {
- xDrawPage = (SvxDrawPage*)new SdDrawPage( this, pPage );
- }
- }
- }
-
- return xDrawPage;
-}
-*/
-
UNO3_GETIMPLEMENTATION_IMPL( SdXImpressDocument );
// XInterface
@@ -332,9 +282,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId( ) t
return aId;
}
-/***********************************************************************
-* *
-***********************************************************************/
void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
if( pDoc )
@@ -398,9 +345,6 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SfxBaseModel::Notify( rBC, rHint );
}
-/******************************************************************************
-* *
-******************************************************************************/
SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate ) throw()
{
sal_uInt16 nPageCount = pDoc->GetSdPageCount( PK_STANDARD );
@@ -1842,7 +1786,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
pRefNotesPage->GetRgtBorder(),
pRefNotesPage->GetLwrBorder() );
pDoc->InsertMasterPage(pMNotesPage, nInsertPos + 1);
-// pMNotesPage->InsertMasterPage( pMPage->GetPageNum() );
pMNotesPage->SetLayoutName( aLayoutName );
pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
rModel.SetModified();
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
index 261a3f9..57c0c08 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
@@ -1733,7 +1733,6 @@ void SdDrawPage::setBackground( const uno::Any& rValue )
pBackground->fillItemSet( (SdDrawDocument*)GetPage()->GetModel(), aSet );
}
-//-/ pObj->NbcSetAttributes( aSet, sal_False );
if( aSet.Count() == 0 )
{
GetPage()->SetBackgroundObj( NULL );
diff --git a/binfilter/bf_sfx2/source/bastyp/fltlst.hxx b/binfilter/bf_sfx2/source/bastyp/fltlst.hxx
index 3f864a0..210aca0 100644
--- a/binfilter/bf_sfx2/source/bastyp/fltlst.hxx
+++ b/binfilter/bf_sfx2/source/bastyp/fltlst.hxx
@@ -33,24 +33,16 @@
// includes
//*****************************************************************************************************************
#include <fcontnr.hxx>
-
#include <cppuhelper/implbase1.hxx>
-
#include <rtl/ustring.hxx>
-
#include <osl/mutex.hxx>
-
#include <com/sun/star/uno/Reference.hxx>
-
#include <com/sun/star/util/XFlushable.hpp>
-
#include <com/sun/star/util/XFlushListener.hpp>
-
#include <com/sun/star/document/XEventListener.hpp>
-
#include <com/sun/star/lang/EventObject.hpp>
-
#include <com/sun/star/uno/RuntimeException.hpp>
+
namespace binfilter {
//*****************************************************************************************************************
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
index 5a9a2eb..6da1945 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
@@ -115,28 +115,6 @@ using namespace ::com::sun::star::frame;
//-----------------------------------------------------------------------------
/*N*/ SFX_IMPL_XINTERFACE_5( SfxDocumentInfoObject, OWeakObject, ::com::sun::star::document::XDocumentInfo, ::com::sun::star::lang::XComponent, ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XFastPropertySet, ::com::sun::star::beans::XPropertyAccess )
/*N*/ SFX_IMPL_XTYPEPROVIDER_5( SfxDocumentInfoObject, ::com::sun::star::document::XDocumentInfo, ::com::sun::star::lang::XComponent, ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XFastPropertySet, ::com::sun::star::beans::XPropertyAccess )
-/*
-::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > SfxDocumentInfoObject::getStaticIdlClass()
-{
- // Global Method, must be guarded (multithreading)
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- {
- // use the standard class implementation of the usr library
- static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > xClass =
- createStandardClass(
- "com.sun.star.comp.sfx2.DocumentInfo",
- OWeakObject::getStaticIdlClass(),
- 4,
- ::getCppuType((const ::com::sun::star::lang::XComponent*)0),
- ::getCppuType((const ::com::sun::star::document::XDocumentInfo*)0),
- ::getCppuType((const ::com::sun::star::beans::XPropertyAccess*)0),
- ::getCppuType((const ::com::sun::star::beans::XPropertySet*)0),
- ::getCppuType((const ::com::sun::star::beans::XFastPropertySet*)0) );
-
- return xClass;
- }
-}
-*/
//-----------------------------------------------------------------------------
/*N*/ struct SfxDocumentInfoObject_Impl
/*N*/ {
@@ -196,12 +174,6 @@ using namespace ::com::sun::star::frame;
/*N*/ {
/*N*/ ::com::sun::star::lang::EventObject aEvent( (::cppu::OWeakObject *)this );
/*N*/ _pImp->_aDisposeContainer.disposeAndClear( aEvent );
-
-/*
- _xCurrent = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > ();
- for ( sal_uInt32 n = _aControllers.ge.getLength(); n; --n )
- SequenceRemoveElementAt( _aControllers, n-1 );
-*/
/*N*/ }
//-----------------------------------------------------------------------------
@@ -929,32 +901,6 @@ Reference< XInterface > SAL_CALL bf_BinaryDocInfo_createInstance(const Reference
}
-//=============================================================================
-/* ASMUSS
-#ifdef TEST_CODE
- // Testcode fuer DocumentInfoObject
- // Einmal zum Holen
- ::com::sun::star::uno::Reference< XServiceManager > xMan = getGlobalServiceManager();
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Uik > aIfaces( 2 );
- aIfaces.getArray()[0] = ::getCppuType((const Reference< ::com::sun::star::document::XDocumentInfo >*)0);
- aIfaces.getArray()[1] = ::getCppuType((const Reference< ::com::sun::star::beans::XFastPropertySet >*)0);
- ::com::sun::star::uno::Reference< XServiceProvider > xSSI = xMan->getServiceProvider(
- "com.sun.star.document.DocumentInfo", aIfaces, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Uik >() );
-// automatisch auskommentiert - [getIdlClass(es) or queryInterface] - Bitte XTypeProvider benutzen!
-// ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentInfo > xInfo = (::com::sun::star::document::XDocumentInfo*) xSSI->newInstance()->queryInterface( ::getCppuType((const Reference< ::com::sun::star::document::XDocumentInfo >*)0) );
-
-// automatisch auskommentiert - [getIdlClass(es) or queryInterface] - Bitte XTypeProvider benutzen!
-// ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > xProps = (::com::sun::star::beans::XFastPropertySet*) xInfo->queryInterface( ::getCppuType((const Reference< ::com::sun::star::beans::XFastPropertySet >*)0) );
-
-
- // Laden und Werte auslesen
- xInfo->load( StringToOUString( aURL, CHARSET_SYSTEM ) );
- ::com::sun::star::uno::Any aValue = xProps->getFastPropertyValue( WID_FROM );
- String aAuthor = OUStringToString( aValue.getString(), CHARSET_SYSTEM );
-#endif
-*/
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx b/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx
index 0aa3089..a1e840d 100644
--- a/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx
@@ -28,31 +28,19 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
#include <bf_svtools/cmdoptions.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>
-
#include <cppuhelper/weakref.hxx>
-
#include <tools/urlobj.hxx>
-
#include <rtl/ustrbuf.hxx>
-
#include <itemholder1.hxx>
-
#include <algorithm>
#include <boost/unordered_map.hpp>
diff --git a/binfilter/bf_svtools/source/config/svt_compatibility.cxx b/binfilter/bf_svtools/source/config/svt_compatibility.cxx
index 217c01e..9b6bbfe 100644
--- a/binfilter/bf_svtools/source/config/svt_compatibility.cxx
+++ b/binfilter/bf_svtools/source/config/svt_compatibility.cxx
@@ -28,21 +28,14 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
#include <bf_svtools/compatibility.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
@@ -50,7 +43,6 @@
#endif
#include <itemholder1.hxx>
-
#include <algorithm>
//_________________________________________________________________________________________________________________
diff --git a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
index e4d8e38..df1fd71 100644
--- a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
diff --git a/binfilter/bf_svtools/source/config/svt_fontoptions.cxx b/binfilter/bf_svtools/source/config/svt_fontoptions.cxx
index 6a821a0..436f6cc 100644
--- a/binfilter/bf_svtools/source/config/svt_fontoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_fontoptions.cxx
@@ -33,17 +33,11 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/fontoptions.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>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
diff --git a/binfilter/bf_svtools/source/config/svt_internaloptions.cxx b/binfilter/bf_svtools/source/config/svt_internaloptions.cxx
index 50d0f25..3131df3 100644
--- a/binfilter/bf_svtools/source/config/svt_internaloptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_internaloptions.cxx
@@ -31,23 +31,14 @@
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
#include <deque>
-
#include <bf_svtools/internaloptions.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>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -88,54 +79,13 @@ namespace binfilter
#define FIXPROPERTYHANDLE_SENDCRASHMAIL 1
#define FIXPROPERTYHANDLE_USEMAILUI 2
#define FIXPROPERTYHANDLE_CURRENTTEMPURL 3
-//#define FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE 3
-//#define FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP 4
-//#define FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP 5
-//#define FIXPROPERTYHANDLE_REMOVEMENUENTRYLOGOUT 6
-
#define FIXPROPERTYCOUNT 4
-/*
-#define PROPERTYNAME_RECOVERYLIST OUString(RTL_CONSTASCII_USTRINGPARAM("RecoveryList" ))
-#define PROPERTYNAME_URL OUString(RTL_CONSTASCII_USTRINGPARAM("OrgURL" ))
-#define PROPERTYNAME_FILTER OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName" ))
-#define PROPERTYNAME_TEMPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("TempURL" ))
-
-#define OFFSET_URL 0
-#define OFFSET_FILTER 1
-#define OFFSET_TEMPNAME 2
-*/
#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" ))
#define FIXR OUString(RTL_CONSTASCII_USTRINGPARAM("r" ))
//_________________________________________________________________________________________________________________
// private declarations!
//_________________________________________________________________________________________________________________
-/*
-struct tIMPL_RecoveryEntry
-{
- OUString sURL ;
- OUString sFilter ;
- OUString sTempName ;
-
- tIMPL_RecoveryEntry()
- {
- sURL = OUString();
- sFilter = OUString();
- sTempName = OUString();
- }
-
- tIMPL_RecoveryEntry( const OUString& sNewURL ,
- const OUString& sNewFilter ,
- const OUString& sNewTempName )
- {
- sURL = sNewURL ;
- sFilter = sNewFilter ;
- sTempName = sNewTempName ;
- }
-};
-
-typedef deque< tIMPL_RecoveryEntry > tIMPL_RecoveryStack;
-*/
class SvtInternalOptions_Impl : public ConfigItem
{
//-------------------------------------------------------------------------------------------------------------
@@ -152,7 +102,6 @@ class SvtInternalOptions_Impl : public ConfigItem
sal_Bool m_bSendCrashMail ; /// cache "SendCrashMail" of Internal section
sal_Bool m_bUseMailUI;
OUString m_aCurrentTempURL ;
- // tIMPL_RecoveryStack m_aRecoveryList ; /// cache "RecoveryList" of Internal section
//-------------------------------------------------------------------------------------------------------------
// public methods
//-------------------------------------------------------------------------------------------------------------
@@ -299,29 +248,6 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl()
seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL ] >>= m_bSendCrashMail ;
seqValues[FIXPROPERTYHANDLE_USEMAILUI ] >>= m_bUseMailUI ;
seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL ] >>= m_aCurrentTempURL ;
-// seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE ] >>= m_bRemoveMenuEntryClose ;
-// seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ] >>= m_bRemoveMenuEntryBackToWebtop ;
-// seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP ] >>= m_bRemoveMenuEntryNewWebtop ;
-// seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYLOGOUT ] >>= m_bRemoveMenuEntryLogout ;
-/*
- // Read dynamical set "RecoveryList" then.
- // 3 subkeys for every item!
- // Attention: Start at next element after last fixed entry! We must ignore "Slot" and "SendCrashMail" ...
- tIMPL_RecoveryEntry aEntry;
- sal_uInt32 nCount = seqValues.getLength() ;
- sal_uInt32 nPosition = FIXPROPERTYCOUNT ;
-
- while( nPosition<nCount )
- {
- seqValues[nPosition] >>= aEntry.sURL ;
- ++nPosition;
- seqValues[nPosition] >>= aEntry.sFilter ;
- ++nPosition;
- seqValues[nPosition] >>= aEntry.sTempName ;
- ++nPosition;
- m_aRecoveryList.push_front( aEntry );
- }
-*/
// We don't need any notifications here.
// "Slot" and "SendCrashMail" are readonly(!) and our recovery list should not modified during runtime - it's used
// by our crash guard only ... otherwise we have a big problem.
@@ -353,49 +279,6 @@ void SvtInternalOptions_Impl::Commit()
pValues[0] <<= m_aCurrentTempURL;
PutProperties( aNames, aValues );
-
-/*
- // Write set of dynamic properties then.
- ClearNodeSet( PROPERTYNAME_RECOVERYLIST );
-
- tIMPL_RecoveryEntry aItem ;
- OUString sNode ;
- Sequence< PropertyValue > seqPropertyValues( 3 ) ; // Every node in set has 3 sub-nodes!( url, filter, tempname )
-
- // Copy list entries to save-list and write it to configuration.
-
- sal_uInt32 nCount = m_aRecoveryList.size();
- for( sal_uInt32 nItem=0; nItem<nCount; ++nItem )
- {
- aItem = m_aRecoveryList.top();
- m_aRecoveryList.pop();
- sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
- seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ;
- seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ;
- seqPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ;
- seqPropertyValues[OFFSET_FILTER ].Value <<= aItem.sFilter ;
- seqPropertyValues[OFFSET_TEMPNAME ].Value <<= aItem.sTempName ;
-
- SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues );
- }
-
- tIMPL_RecoveryStack::iterator iRecovery = m_aRecoveryList.begin();
- for ( sal_uInt32 nItem=0; iRecovery != m_aRecoveryList.end(); ++nItem, ++iRecovery)
- {
- aItem = *iRecovery;
- sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR +
- OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
- seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ;
- seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ;
- seqPropertyValues[OFFSET_URL ].Value <<= iRecovery->sURL ;
- seqPropertyValues[OFFSET_FILTER ].Value <<= iRecovery->sFilter ;
- seqPropertyValues[OFFSET_TEMPNAME ].Value <<= iRecovery->sTempName ;
- SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues );
- }
-
- */
}
//*****************************************************************************************************************
@@ -403,14 +286,6 @@ void SvtInternalOptions_Impl::Commit()
//*****************************************************************************************************************
Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames()
{
- /*
- // First get ALL names of current existing list items in configuration!
- Sequence< OUString > seqRecoveryItems = GetNodeNames( PROPERTYNAME_RECOVERYLIST );
- // Get information about list counts ...
- sal_Int32 nRecoveryCount = seqRecoveryItems.getLength();
- // ... and create a property list with right size! (+2...for fix properties!) (*3 ... = sub nodes for every set node!)
- Sequence< OUString > seqProperties( FIXPROPERTYCOUNT + (nRecoveryCount*3) );
- */
Sequence< OUString > seqProperties(4);
// Add names of fix properties to list.
@@ -418,26 +293,7 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames()
seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL ] = FIXPROPERTYNAME_SENDCRASHMAIL ;
seqProperties[FIXPROPERTYHANDLE_USEMAILUI ] = FIXPROPERTYNAME_USEMAILUI ;
seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL ] = FIXPROPERTYNAME_CURRENTTEMPURL ;
-// seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE ] = FIXPROPERTYNAME_REMOVEMENUENTRYCLOSE;
-// seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ] = FIXPROPERTYNAME_REMOVEMENUENTRYBACKTOWEBTOP;
-// seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP ] = FIXPROPERTYNAME_REMOVEMENUENTRYNEWWEBTOP;
-// seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYLOGOUT ] = FIXPROPERTYNAME_REMOVEMENUENTRYLOGOUT;
-/*
- sal_uInt32 nPosition = FIXPROPERTYCOUNT;
- // Add names for recovery list to list.
- // 3 subkeys for every item!
- // nPosition is the start point of an list item, nItem an index into right list of node names!
- for( sal_Int32 nItem=0; nItem<nRecoveryCount; ++nItem )
- {
- seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_URL ;
- ++nPosition;
- seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_FILTER ;
- ++nPosition;
- seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_TEMPNAME ;
- ++nPosition;
- }
-*/
- // Return result.
+
return seqProperties;
}
diff --git a/binfilter/bf_svtools/source/config/svt_localisationoptions.cxx b/binfilter/bf_svtools/source/config/svt_localisationoptions.cxx
index da702be..2ac5802 100644
--- a/binfilter/bf_svtools/source/config/svt_localisationoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_localisationoptions.cxx
@@ -31,17 +31,11 @@
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
#include <bf_svtools/localisationoptions.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>
#include <rtl/logfile.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_menuoptions.cxx b/binfilter/bf_svtools/source/config/svt_menuoptions.cxx
index b9447fa..ab62c00 100644
--- a/binfilter/bf_svtools/source/config/svt_menuoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_menuoptions.cxx
@@ -31,19 +31,12 @@
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
#include <bf_svtools/menuoptions.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>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
diff --git a/binfilter/bf_svtools/source/config/svt_miscopt.cxx b/binfilter/bf_svtools/source/config/svt_miscopt.cxx
index 0b96110..d5d2b12 100644
--- a/binfilter/bf_svtools/source/config/svt_miscopt.cxx
+++ b/binfilter/bf_svtools/source/config/svt_miscopt.cxx
@@ -27,15 +27,11 @@
************************************************************************/
#include <bf_svtools/miscopt.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>
#include <tools/link.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_options3d.cxx b/binfilter/bf_svtools/source/config/svt_options3d.cxx
index cc39ed8..747be61 100644
--- a/binfilter/bf_svtools/source/config/svt_options3d.cxx
+++ b/binfilter/bf_svtools/source/config/svt_options3d.cxx
@@ -31,19 +31,12 @@
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
#include <bf_svtools/options3d.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>
-
#include <itemholder1.hxx>
//_________________________________________________________________________________________________________________
diff --git a/binfilter/bf_svtools/source/config/svt_printwarningoptions.cxx b/binfilter/bf_svtools/source/config/svt_printwarningoptions.cxx
index 1281d66..01e6d4c 100644
--- a/binfilter/bf_svtools/source/config/svt_printwarningoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_printwarningoptions.cxx
@@ -33,17 +33,11 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/printwarningoptions.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>
-
#include <itemholder1.hxx>
//_________________________________________________________________________________________________________________
diff --git a/binfilter/bf_svtools/source/config/svt_startoptions.cxx b/binfilter/bf_svtools/source/config/svt_startoptions.cxx
index 24e11bf..38a38c2 100644
--- a/binfilter/bf_svtools/source/config/svt_startoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_startoptions.cxx
@@ -31,19 +31,12 @@
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
#include <bf_svtools/startoptions.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>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
diff --git a/binfilter/bf_svtools/source/config/svt_workingsetoptions.cxx b/binfilter/bf_svtools/source/config/svt_workingsetoptions.cxx
index a191d57..68844c2 100644
--- a/binfilter/bf_svtools/source/config/svt_workingsetoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_workingsetoptions.cxx
@@ -33,17 +33,11 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/workingsetoptions.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>
-
#include <itemholder1.hxx>
//_________________________________________________________________________________________________________________
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 3a7b189..14a56ab 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-
#include <string.h>
#include <stdio.h>
@@ -635,7 +634,6 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
{
// SlotId, Which-Id und Item-Version besorgen
USHORT nCount, nVersion, nWhich;
- //!USHORT nSlotId = aWhichIdsRec.GetContentTag();
rStream >> nWhich;
if ( pImp->nLoadingVersion != pImp->nVersion )
// Which-Id aus File-Version in Pool-Version verschieben
@@ -647,10 +645,6 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
rStream >> nVersion;
rStream >> nCount;
- //!SFX_ASSERTWARNING( !nSlotId || !HasMap() ||
- //! ( nSlotId == GetSlotId( nWhich, FALSE ) ) ||
- //! !GetSlotId( nWhich, FALSE ),
- //! nWhich, "Slot/Which mismatch" );
USHORT nIndex = GetIndex_Impl(nWhich);
SfxPoolItemArray_Impl **ppArr = pImp->ppPoolItems + nIndex;
@@ -688,7 +682,6 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
{
// SlotId, Which-Id und Item-Version besorgen
USHORT nVersion, nWhich;
- //!USHORT nSlotId = aDefsRec.GetContentTag();
rStream >> nWhich;
if ( pImp->nLoadingVersion != pImp->nVersion )
// Which-Id aus File-Version in Pool-Version verschieben
@@ -699,8 +692,6 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
continue;
rStream >> nVersion;
- //!SFX_ASSERTWARNING( !HasMap() || ( nSlotId == GetSlotId( nWhich, FALSE ) ),
- //! nWhich, "Slot/Which mismatch" );
// Pool-Default-Item selbst laden
SfxPoolItem *pItem =
@@ -844,11 +835,6 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
if ( !bOwnPool )
nWhich = nMappedWhich;
- //!SFX_ASSERTWARNING( !nSlot || !HasMap() ||
- //! ( nSlot == GetSlotId( nWhich, FALSE ) ) ||
- //! !GetSlotId( nWhich, FALSE ),
- //! nWhich, "Slot/Which mismatch" );
-
USHORT nIndex = GetIndex_Impl(nWhich);
ppArr = pImp->ppPoolItems + nIndex;
pNewArr = new SfxPoolItemArray_Impl( nCount );
@@ -955,7 +941,6 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
SFX_TRACE( "reusing item", pOldItem );
}
}
- //! DBG_ASSERT( bFound, "old-item not found in file" );
if ( !bFound )
{
SFX_TRACE( "item not found: ", pOldItem );
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
index 8f23141..12548fc 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-
#include <ctype.h>
#include <stdlib.h>
#include <float.h>
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx b/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx
index e048db5..0639aff 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-
#define INCL_DOS
#include <stdlib.h>
@@ -534,11 +533,6 @@ HSZ ImpDdeMgr::DdeCreateStringHandle( PSZ pszString, int iCodePage)
return (HSZ)0;
// Atom-Table beachtet Gross/Kleinschreibung, DDEML aber nicht
- // OV 12.4.96: Services,Topics,Items case-sensitiv!!!
- // (Grosskundenanforderung (Reuter-DDE))
- //strlwr( pszString );
- //*pszString = (char)toupper(*pszString);
-
HATOMTBL hAtomTable = WinQuerySystemAtomTable();
ATOM aAtom = WinAddAtom( hAtomTable, pszString );
return (HSZ)aAtom;
@@ -680,7 +674,6 @@ BOOL ImpDdeMgr::DisconnectAll()
break;
}
}
- //WRITESTATUS("After DisconnectAll()")
return bRet;
}
@@ -720,7 +713,6 @@ void ImpDdeMgr::FreeTransactions( ImpDdeMgrData* pData, HCONV hConvOwner )
return;
Transaction* pTrans = GetTransTable( pData );
-// ImpHCONV* pConvTable = GetConvTable( pData );
pTrans++;
for( USHORT nPos=1; nPos < pData->nMaxTransCount; nPos++, pTrans++ )
{
@@ -771,10 +763,6 @@ BOOL ImpDdeMgr::OwnsConversationHandles()
return FALSE;
}
-
-
-// *********************************************************************
-// *********************************************************************
// *********************************************************************
USHORT DdeInitialize(ULONG* pidInst, PFNCALLBACK pfnCallback,
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
index 5163edb..a3e551f 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
@@ -29,29 +29,17 @@
#define _SVX_USE_UNOGLOBALS_
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
-
-
#include <vcl/svapp.hxx>
-
-
-
#include <bf_svtools/unoevent.hxx>
-
-
-
#include <unofill.hxx>
-
#include <unonrule.hxx>
-
#include <bf_svtools/unoimap.hxx>
#include <fmdpage.hxx>
#include <fmmodel.hxx>
-
#include <fmpage.hxx>
#include <bf_sfx2/sfx.hrc>
-
#include <unoapi.hxx>
#include "globl3d.hxx"
@@ -60,6 +48,7 @@
#include "svdobj.hxx"
#include "unoshape.hxx"
#include <boost/unordered_map.hpp>
+
namespace binfilter {
//-////////////////////////////////////////////////////////////////////
@@ -138,11 +127,6 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint*
switch( pSdrHint->GetKind() )
{
-// case HINT_LAYERCHG: // Layerdefinition geaendert
-// case HINT_LAYERORDERCHG: // Layerreihenfolge geaendert (Insert/Remove/ChangePos)
-// case HINT_LAYERSETCHG: // Layerset geaendert
-// case HINT_LAYERSETORDERCHG: // Layersetreihenfolge geaendert (Insert/Remove/ChangePos)
-
case HINT_PAGECHG: // Page geaendert
aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageModified" ) );
pPage = pSdrHint->GetPage();
@@ -163,12 +147,6 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint*
aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeRemoved" ) );
pObj = pSdrHint->GetObject();
break;
-// HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert
-// HINT_DEFFONTHGTCHG, // Default FontHeight geaendert
-// HINT_CONTROLINSERTED, // UnoControl wurde eingefuegt
-// HINT_CONTROLREMOVED, // UnoControl wurde entfernt
-// HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page
-// HINT_OBJLISTCLEAR // Is called before an SdrObjList will be cleared
default:
return sal_False;
}
diff --git a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
index 4a8046a..fa89ca7 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
@@ -235,45 +235,6 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
if( !bEmpty && !bGaps && nLastEnd < ( nEndPos - 1 ) )
bGaps = TRUE;
-/*
- // since we have no portion with our item or if there were gaps
- if( bEmpty || bGaps )
- {
- // we need to check the paragraph item
- const SfxItemSet& rParaSet = rEditEngine.GetParaAttribs( nPara );
- if( rParaSet.GetItemState( nWhich ) == SFX_ITEM_SET )
- {
- eState = SFX_ITEM_SET;
- // get item from the paragraph
- const SfxPoolItem* pTempItem = rParaSet.GetItem( nWhich );
- if( pParaItem )
- {
- if( *pParaItem != *pTempItem )
- return SFX_ITEM_DONTCARE;
- }
- else
- {
- pParaItem = pTempItem;
- }
-
- // set if theres no last item or if its the same
- eParaState = SFX_ITEM_SET;
- }
- else if( bEmpty )
- {
- eParaState = SFX_ITEM_DEFAULT;
- }
- else if( bGaps )
- {
- // gaps and item not set in paragraph, thats a dont care
- return SFX_ITEM_DONTCARE;
- }
- }
- else
- {
- eParaState = SFX_ITEM_SET;
- }
-*/
if( bEmpty )
eParaState = SFX_ITEM_DEFAULT;
else if( bGaps )
diff --git a/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx b/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
index 7436f5c..4eddca0 100644
--- a/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
@@ -453,13 +453,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* XPolygon::GetSize()
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
|* XPolygon::SetPointCount()
|*
*************************************************************************/
@@ -510,20 +503,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* XPolygon::Insert()
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
-|* XPolygon::Insert()
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
|* XPolygon::Remove()
|*
*************************************************************************/
@@ -569,37 +548,7 @@ namespace binfilter {
/*N*/
/*N*/ Rectangle aRect(XOutCalcXPolyExtent(*this, pOut));
-// USHORT nCount = pImpXPolygon->nPoints;
-// if( !nCount )
-// return Rectangle();
-
-// Polygon aPoly = XOutCreatePolygon(*this, pOut);
-// Rectangle aRect = aPoly.GetBoundRect();
-/*
- if ( pOut == NULL )
- {
- BOOL bHasBezier = FALSE;
-
- for (USHORT i = 0; i < nCount; i++)
- {
- if ( pImpXPolygon->pFlagAry[i] == (BYTE) XPOLY_CONTROL )
- {
- bHasBezier = TRUE;
- i = nCount;
- }
- }
- if ( bHasBezier )
- { // Breite und Hoehe um 1 Prozent erweitern, um Differenzen zur
- // ungenauen Bezierberechnung (wg. fehlendem OutputDevice) auszugleichen
- long nWDiff = aRect.GetWidth() / 200;
- long nHDiff = aRect.GetHeight() / 200;
- aRect.Left() -= nWDiff;
- aRect.Right() += nWDiff;
- aRect.Top() -= nHDiff;
- aRect.Bottom() += nHDiff;
- }
- }
-*/ return aRect;
+ return aRect;
/*N*/ }
/*************************************************************************
@@ -735,24 +684,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* XPolygon::IsSmooth()
-|*
-|* Kurzform zur Abfrage von SMOOTH- und SYMMTR-Flag
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
-|* XPolygon::CalcDistance()
-|*
-|* Abstand zwischen zwei Punkten berechnen
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
|* XPolygon::SubdivideBezier()
|*
|* Bezierkurve unterteilen
@@ -872,43 +803,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* XPolygon::CalcSmoothJoin()
-|*
-|* glatten Uebergang zu einer Bezierkurve berechnen, indem der
-|* entsprechende Punkt auf die Verbindungslinie von zwei anderen
-|* Punkten projiziert wird
-|* Center = End- bzw. Anfangspunkt der Bezierkurve
-|* Drag = der bewegte Punkt, der die Verschiebung von Pnt vorgibt
-|* Pnt = der zu modifizierende Punkt
-|* Wenn Center am Anfang bzw. Ende des Polygons liegt, wird Pnt
-|* auf die entgegengesetzte Seite verlegt
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* XPolygon::CalcTangent()
-|*
-|* Tangente fuer den Uebergang zwischen zwei Bezierkurven berechnen
-|* Center = End- bzw. Anfangspunkt der Bezierkurven
-|* Prev = vorheriger Zugpunkt
-|* Next = naechster Zugpunkt
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* XPolygon::PointsToBezier()
-|*
-|* wandelt vier Polygonpunkte in eine Bezierkurve durch diese Punkte um
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* XPolygon::Translate()
|*
|* Polygon auf den uebergebenen Punkt verschieben
@@ -958,20 +852,6 @@ namespace binfilter {
/*N*/ nNewY = -(long)floor(fSin * nX - fCos * nY + 0.5);
/*N*/ pPt->X() = nNewX + nCenterX;
/*N*/ pPt->Y() = nNewY + nCenterY;
-/*N*/
- /* und so stand das in einem anderen File auf T:
- dass ich am 29-11-1995 gegettet habe. Joe M.
- USHORT nPntCnt = pImpXPolygon->nPoints;
-
- for (USHORT i = 0; i < nPntCnt; i++)
- {
- Point P = pImpXPolygon->pPointAry[i] - rCenter;
- long X = P.X();
- long Y = P.Y();
- P.X() = (long)floor(fCos * X + fSin * Y + 0.5);
- P.Y() = -(long)floor(fSin * X - fCos * Y + 0.5);
- pImpXPolygon->pPointAry[i] = P + rCenter;
- */
/*N*/ }
/*N*/ }
@@ -1047,39 +927,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* XPolygon::SlantY()
-|*
-|* XPolygon in Y-Richtung um einen beliebigen Winkel kippen,
-|* bezogen auf eine Referenz-X-Koordinate
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
-|* XPolygon::Distort()
-|*
-|* XPolygon verzerren, indem die Koordinaten relativ zu einem
-|* Referenzrechteck in ein beliebiges Viereck skaliert werden
-|* Zuordnung der Viereck-Punkte im Polygon zum Referenzrechteck:
-|* 0: links oben 0----1
-|* 1: rechts oben | |
-|* 2: rechts unten 3----2
-|* 3: links unten
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Bestimme den linken, unteren Punkt des Polygons und richte das
-|* Polygon so aus, dass dieser Punkt auf dem Index 0 liegt
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* XPolygon::operator>>()
|*
|* Beschreibung Stream-Leseoperator
@@ -1569,22 +1416,6 @@ void XPolyPolygon::Move( long nHorzMove, long nVertMove )
/*N*/ return *this;
/*N*/ }
-
-/*************************************************************************
-|*
-|* XPolyPolygon::operator==()
-|*
-*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|* XPolyPolygon::operator!=()
-|*
-*************************************************************************/
-
-
/*************************************************************************
|*
|* XPolyPolygon::Translate()
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xout.cxx b/binfilter/bf_svx/source/xoutdev/svx_xout.cxx
index 38a40cd..bce5854 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xout.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xout.cxx
@@ -159,8 +159,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( rXPoly.GetPointCount() > 0 )
/*N*/ {
-/*N*/ // #100127# Too much hassle below this method
-/*N*/ // const Polygon aPoly( XOutCreatePolygonBezier(rXPoly, pOut) );
/*N*/ const Polygon aPoly( XOutCreatePolygon(rXPoly, pOut) );
/*N*/ DrawLinePolygon(aPoly, FALSE);
/*N*/ }
@@ -241,8 +239,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( rXPoly.GetPointCount() > 0 )
/*N*/ {
-/*N*/ // #100127# Too much hassle below this method
-/*N*/ // const Polygon aPoly( XOutCreatePolygonBezier(rXPoly, pOut) );
/*N*/ const Polygon aPoly( XOutCreatePolygon(rXPoly, pOut) );
/*N*/
/*N*/ DrawFillPolyPolygon( aPoly );
@@ -266,8 +262,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if( rXPolyPoly[i].GetPointCount() > 0 )
/*N*/ {
-/*N*/ // #100127# Too much hassle below this method
-/*N*/ // aPolyPoly.Insert(XOutCreatePolygonBezier(rXPolyPoly[i], pOut));
/*N*/ aPolyPoly.Insert(XOutCreatePolygon(rXPolyPoly[i], pOut));
/*N*/ }
/*N*/ }
@@ -324,7 +318,6 @@ namespace binfilter {
|*
\************************************************************************/
-//-/void XOutputDevice::SetLineAttr(const XLineAttrSetItem& rAttr)
/*N*/ void XOutputDevice::SetLineAttr(const SfxItemSet& rSet)
/*N*/ {
/*N*/ const BOOL bPureMtf = ( pOut->GetOutDevType() != OUTDEV_PRINTER ) && ( pOut->GetConnectMetaFile() != NULL );
@@ -508,10 +501,8 @@ namespace binfilter {
|*
\************************************************************************/
-//-/void XOutputDevice::SetFillAttr(const XFillAttrSetItem& rAttr)
/*N*/ void XOutputDevice::SetFillAttr(const SfxItemSet& rSet)
/*N*/ {
-/*N*/ //-/ const SfxItemSet& rSet = rAttr.GetItemSet();
/*N*/ const XFillFloatTransparenceItem& rFloatTransItem = (const XFillFloatTransparenceItem&) rSet.Get( XATTR_FILLFLOATTRANSPARENCE );
/*N*/
/*N*/ eFillStyle = bIgnoreFillAttr ? XFILL_NONE : ITEMVALUE( rSet, XATTR_FILLSTYLE, XFillStyleItem );
@@ -646,23 +637,18 @@ namespace binfilter {
|*
\************************************************************************/
-//-/void XOutputDevice::SetTextAttr(const XTextAttrSetItem& rAttr)
/*N*/ void XOutputDevice::SetTextAttr(const SfxItemSet& rSet)
/*N*/ {
-/*N*/ //-/ const SfxItemSet& rSet = rAttr.GetItemSet();
-/*N*/
/*N*/ eFormTextStyle = ITEMVALUE( rSet, XATTR_FORMTXTSTYLE, XFormTextStyleItem );
/*N*/ eFormTextAdjust = ITEMVALUE( rSet, XATTR_FORMTXTADJUST, XFormTextAdjustItem );
/*N*/ nFormTextDistance = ITEMVALUE( rSet, XATTR_FORMTXTDISTANCE, XFormTextDistanceItem );
/*N*/ nFormTextStart = ITEMVALUE( rSet, XATTR_FORMTXTSTART, XFormTextStartItem );
/*N*/ bFormTextMirror = ITEMVALUE( rSet, XATTR_FORMTXTMIRROR, XFormTextMirrorItem );
/*N*/
-/*N*/ // Neu ab 27.06.95 ESO
/*N*/ bFormTextOutline = ITEMVALUE( rSet, XATTR_FORMTXTOUTLINE, XFormTextOutlineItem );
/*N*/ eFormTextShadow = ITEMVALUE( rSet, XATTR_FORMTXTSHADOW, XFormTextShadowItem );
/*N*/ aFormTextShdwColor = ITEMVALUE( rSet, XATTR_FORMTXTSHDWCOLOR, XFormTextShadowColorItem );
/*N*/
-/*N*/ // Neu ab 09.11.95 KA
/*N*/ nFormTextShdwTransp = ITEMVALUE( rSet, XATTR_FORMTXTSHDWTRANSP, XFormTextShadowTranspItem );
/*N*/ nFormTextShdwXVal = ITEMVALUE( rSet, XATTR_FORMTXTSHDWXVAL, XFormTextShadowXValItem );
/*N*/ nFormTextShdwYVal = ITEMVALUE( rSet, XATTR_FORMTXTSHDWYVAL, XFormTextShadowYValItem );
@@ -672,50 +658,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* XOutputDevice::OverridePen()
-|*
-|* StarView-Pen temporaer ueberschreiben, wenn SetLineAttr zu
-|* zeitkritisch ist. !ACHTUNG! Vor weiteren XOut-Ausgaben muessen
-|* die Attribute mit SetLineAttr neu gesetzt werden
-|*
-\************************************************************************/
-
-//#ifndef NOOLDSV
-//
-///*N*/ void XOutputDevice::OverridePen(const Pen& rPen)
-///*N*/ {
-///*N*/ nLineWidth = 0;
-///*N*/ bHair = TRUE;
-///*N*/ bLineStart = FALSE;
-///*N*/ bLineEnd = FALSE;
-///*N*/ eLineStyle = ( rPen.GetStyle() == PEN_NULL ) ? XLINE_NONE : XLINE_SOLID;
-///*N*/ pOut->SetLineColor( rPen.GetColor() );
-///*N*/ }
-//
-//#endif
-
-/*************************************************************************
-|*
-|* XOutputDevice::OverrideFillInBrush()
-|*
-|* StarView-Brush temporaer ueberschreiben, wenn SetFillAttr zu
-|* zeitkritisch ist. !ACHTUNG! Vor weiteren XOut-Ausgaben muessen
-|* die Attribute mit SetFillAttr neu gesetzt werden
-|*
-\************************************************************************/
-
-//#ifndef NOOLDSV
-//
-///*N*/ void XOutputDevice::OverrideFillInBrush( const Brush& rBrush )
-///*N*/ {
-///*N*/ eFillStyle = ( rBrush.GetStyle() == BRUSH_NULL ) ? XFILL_NONE : XFILL_SOLID;
-///*N*/ pOut->SetFillColor( rBrush.GetColor() );
-///*N*/ }
-//
-//#endif
-
-/*************************************************************************
-|*
|* XOutputDevice:OverrideLineColor()
|*
|* StarView-Linecolor temporaer ueberschreiben, wenn SetLineAttr zu
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index 678bdd6..d186781 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -29,15 +29,13 @@
// include ---------------------------------------------------------------
#ifndef SVX_LIGHT
-
#include "XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include "xmlxtimp.hxx"
-
#endif
-#include <vcl/svapp.hxx>
+#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
#include <vcl/virdev.hxx>
#include <bf_svtools/itemset.hxx>
@@ -50,12 +48,10 @@
#include "xoutx.hxx"
#include <xlineit0.hxx>
-
#include <xlnclit.hxx>
-
#include <xlnwtit.hxx>
-
#include <xlndsit.hxx>
+
namespace binfilter {
using namespace ::com::sun::star;
@@ -256,28 +252,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ BOOL XDashList::Save()
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-
-
-/*
-
-
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, TRUE );
- aMedium.IsRemote();
-
- SvStream* pStream = aMedium.GetOutStream();
- if( !pStream )
- return( FALSE );
-
- // UNICODE: *pStream << String( pszChckDash0, 4 );
- pStream->WriteByteString(String( pszChckDash0, 4 ));
-
- ImpStore( *pStream );
-
- aMedium.Close();
- aMedium.Commit();
-
- return( aMedium.GetError() == 0 );
-*/
/*N*/ }
/************************************************************************/
@@ -353,7 +327,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ pVD->DrawRect( Rectangle( aZero, aVDSize ) );
/*N*/ pXLSet->GetItemSet().Put( XLineDashItem( String(), Get( nIndex )->GetDash() ) );
/*N*/
-/*N*/ //-/ pXOut->SetLineAttr( *pXLSet );
/*N*/ pXOut->SetLineAttr( pXLSet->GetItemSet() );
/*N*/
/*N*/ pXOut->DrawLine( Point( 0, aVDSize.Height() / 2 ),
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
index e3343ce..312d540 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
@@ -251,25 +251,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ BOOL XGradientList::Save()
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-
-/*
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, TRUE );
- aMedium.IsRemote();
-
- SvStream* pStream = aMedium.GetOutStream();
- if( !pStream )
- return( FALSE );
-
- // UNICODE: *pStream << String( pszChckGradient0, 4 );
- pStream->WriteByteString(String( pszChckGradient0, 4 ));
-
- ImpStore( *pStream );
-
- aMedium.Close();
- aMedium.Commit();
-
- return( aMedium.GetError() == 0 );
-*/
/*N*/ }
/************************************************************************/
@@ -336,7 +317,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ pXFSet->GetItemSet().Put(
/*N*/ XFillGradientItem( pXPool, Get( nIndex )->GetGradient() ) );
-/*N*/ //-/ pXOut->SetFillAttr( *pXFSet );
/*N*/ pXOut->SetFillAttr( pXFSet->GetItemSet() );
/*N*/
/*N*/ // #73550#
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index 5bdfb0f..ae09938 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -29,13 +29,11 @@
// include ---------------------------------------------------------------
#ifndef SVX_LIGHT
-
#include "XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/svapp.hxx>
#include "xmlxtimp.hxx"
-
#endif
#include <tools/urlobj.hxx>
@@ -51,10 +49,9 @@
#include "dlgutil.hxx"
#include <xflhtit.hxx>
-
#include <xflclit.hxx>
-
#include <xfillit0.hxx>
+
namespace binfilter {
using namespace ::com::sun::star;
@@ -253,24 +250,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ BOOL XHatchList::Save()
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-/*
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, TRUE );
- aMedium.IsRemote();
-
- SvStream* pStream = aMedium.GetOutStream();
- if( !pStream )
- return( FALSE );
-
- // UNICODE: *pStream << String( pszChckHatch0, 4 );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list