Cleanup for ww1.

5 files changed, 1 insertions, 46 deletions

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index c07963eb88..737c9019f1 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -80,7 +80,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::i18n;
 
-//using namespace ::utl;
 #ifndef S2U
 #define S2U(rString) OUString::createFromAscii(rString)
 #endif
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index e279b4fbfb..3fd630122b 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -792,20 +792,6 @@ BYTE* Ww1Plc::GetData(USHORT nIndex)
     return pRet;
 }
 
-/////////////////////////////////////////////////////////////////// Sep
-
-//////////////////////////////////////////////////////////////// PlcSep
-
-//////////////////////////////////////////////////////////////// PlcPap
-
-//////////////////////////////////////////////////////////////// PlcChp
-
-//////////////////////////////////////////////////////////////// PlcFnr
-
-///////////////////////////////////////////////////////////// PlcFnText
-
-///////////////////////////////////////////////////////////// PlcFields
-
 ///////////////////////////////////////////////////////////// PlcBookmarks
 // class Ww1StringList liest im Ctor eine Anzahl von P-Strings aus dem Stream
 // in den Speicher und patcht sie zu C-Strings um.
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 7182ab139e..fba7ee3f88 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -267,7 +267,6 @@ public:
     void SetParent(Ww1StyleSheet* newParent) 	{ pParent = newParent; }
     void SetName(const String& rName) 	{ bUsed = TRUE; aName = rName; }
     const String& GetName() const		{ return aName; }
-//	Ww1Style& GetNext();
     Ww1Style& GetBase();
     USHORT GetnBase() const				{ return stcBase; }
     USHORT GetnNext() const				{ return stcNext; }
@@ -390,7 +389,6 @@ public:
 
 class Ww1SingleSprmByteSized : public Ww1SingleSprm {
 public:
-//	ostream& Dump(ostream&, BYTE*, USHORT);
     USHORT Size(BYTE*);
     Ww1SingleSprmByteSized(USHORT nBytes, sal_Char* sName = 0) :
         Ww1SingleSprm(nBytes, sName) {
@@ -399,7 +397,6 @@ public:
 
 class Ww1SingleSprmWordSized : public Ww1SingleSprm {
 public:
-//	ostream& Dump(ostream&, BYTE*, USHORT);
     USHORT Size(BYTE*);
     Ww1SingleSprmWordSized(USHORT nBytes, sal_Char* sName = 0) :
         Ww1SingleSprm(nBytes, sName) {
@@ -409,7 +406,6 @@ public:
 class Ww1SingleSprmByte : public Ww1SingleSprm {
 public:
     ostream& Dump(ostream&, BYTE*, USHORT);
-//	USHORT Size(BYTE*);
     Ww1SingleSprmByte(sal_Char* sName = 0) :
         Ww1SingleSprm(1, sName) {
         }
@@ -418,7 +414,6 @@ public:
 class Ww1SingleSprmBool : public Ww1SingleSprmByte {
 public:
     ostream& Dump(ostream&, BYTE*, USHORT);
-//	USHORT Size(BYTE*);
     Ww1SingleSprmBool(sal_Char* sName = 0) :
         Ww1SingleSprmByte(sName) {
         }
@@ -427,7 +422,6 @@ public:
 class Ww1SingleSprm4State : public Ww1SingleSprmByte {
 public:
     ostream& Dump(ostream&, BYTE*, USHORT);
-//	USHORT Size(BYTE*);
     Ww1SingleSprm4State(sal_Char* sName = 0) :
         Ww1SingleSprmByte(sName) {
         }
@@ -436,7 +430,6 @@ public:
 class Ww1SingleSprmWord : public Ww1SingleSprm {
 public:
     ostream& Dump(ostream&, BYTE*, USHORT);
-//	USHORT Size(BYTE*);
     Ww1SingleSprmWord(sal_Char* sName = 0)
     : Ww1SingleSprm(2, sName) {}
 };
@@ -444,7 +437,6 @@ public:
 class Ww1SingleSprmLong : public Ww1SingleSprm {
 public:
     ostream& Dump(ostream&, BYTE*, USHORT);
-//	USHORT Size(BYTE*);
     Ww1SingleSprmLong(sal_Char* sName = 0) :
         Ww1SingleSprm(4, sName) {
         }
@@ -529,7 +521,6 @@ public:
 
 class Ww1SingleSprmPBrc : public Ww1SingleSprmWord {
 protected:
-//	SvxBorderLine* SetBorder(SvxBorderLine*, W1_BRC*);
     // spezielle start-routine, je nach sprm verschieden versorgt
     // mit einem BoxItem.
     void Start(Ww1Shell&, BYTE, W1_BRC10*, USHORT, Ww1Manager&, SvxBoxItem&);
@@ -650,14 +641,6 @@ public:
     : Ww1SingleSprmWord(sName) {}
 };
 
-//class Ww1SingleSprmTDxaLeft : public Ww1SingleSprmWord {
-//public:
-//	Ww1SingleSprmTDxaLeft(sal_Char* sName) :
-//		Ww1SingleSprmWord(sName) {
-//		}
-//	void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
-//};
-
 class Ww1SingleSprmTDxaGapHalf : public Ww1SingleSprmWord {
 public:
     Ww1SingleSprmTDxaGapHalf(sal_Char* sName) :
@@ -935,7 +918,6 @@ public:
 ///////////////////////////////////////////////////////////// PlcFields
 class Ww1PlcFields : public Ww1Plc
 {
-    //USHORT Fill(USHORT, BYTE&, String&, String&, String&);
 public:
     Ww1PlcFields(Ww1Fib& rFibL, ULONG start, USHORT nBytes)
         : Ww1Plc(rFibL, start, nBytes, 2)
@@ -972,7 +954,6 @@ public:
 
 class Ww1PlcBookmarkPos : public Ww1Plc
 {
-//	USHORT Fill(USHORT, BYTE&, String&, String&, String&);
 public:
     Ww1PlcBookmarkPos(Ww1Fib& _rFib, ULONG start, USHORT nBytes, BOOL bEnd)
         : Ww1Plc(_rFib, start, nBytes, (bEnd) ? 0 : 2)
@@ -988,7 +969,6 @@ public:
                ? Ww1Plc::Where(nIndex) + rFib.GetFIB().fcMinGet()
                : 0xffffffff;
     }
-//	friend ostream& operator <<(ostream&, Ww1PlcBookmarks&);
 };
 
 //////////////////////////////////////////////////////////////// PlcHdd
@@ -1147,7 +1127,6 @@ public:
         if (grpfIhdt & 0x0002) nFtnFollowSep = nextIhdd++;
         if (grpfIhdt & 0x0004) nFtnNote = nextIhdd++;
     }
-//	~Ww1HeaderFooter() {}
     void SetGrpfIhdt(USHORT grpfIhdt)
     {
         if (grpfIhdt & 0x0001) nEvenHeadL = nextIhdd++;
@@ -1249,7 +1228,6 @@ public:
     Ww1Fields(Ww1Fib& rFibL, ULONG ulFilePos, USHORT nBytes)
         : Ww1PlcFields(rFibL, ulFilePos, nBytes), nPlcIndex(0), pField(0)
     {}
-//	~Ww1Fields() {}
     // innerhalb des textes
     ULONG Where() 		{ return Where(nPlcIndex); }
     void operator++(int)
@@ -1316,8 +1294,6 @@ class Ww1Bookmarks
     USHORT nPlcIdx[2];
     USHORT nIsEnd;
     BOOL bOK;
-//	ULONG Where(USHORT nIndex) { // innerhalb des textes
-//		return Ww1PlcFields::Where(nIndex) - rFib.GetFIB().fcMinGet(); }
 public:
     Ww1Bookmarks(Ww1Fib& rFib);
     ~Ww1Bookmarks()
@@ -1348,7 +1324,6 @@ public:
     Ww1Footnotes(Ww1Fib& rFibL)
         : Ww1PlcFootnoteRef(rFibL), nPlcIndex(0), aText(rFibL), bStarted(FALSE)
     {}
-//	~Ww1Footnotes() {}
     // innerhalb des textes
     ULONG Where()
     {
@@ -1383,7 +1358,6 @@ public:
     void SetGrpfIhdt(BYTE grpfIhdt)
     {
         GetHdd().SetGrpfIhdt(grpfIhdt);
-//		GetHdd().Start(rOut, rMan);
     }
     void Start(Ww1Shell&, Ww1Manager&);
     void Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode& c)
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index e20884bf57..661153d9f6 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -55,7 +55,6 @@
 #include <com/sun/star/text/RelOrientation.hpp>
 
 using namespace ::com::sun::star;
-//using namespace text;
 
 static USHORT aFrmMgrRange[] = {
                             RES_FRMATR_BEGIN, RES_FRMATR_END-1,
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index ddfa451d2c..89dd2e180a 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -31,8 +31,7 @@
 #include <svtools/svtreebx.hxx>
 #include "swcont.hxx"
 
-#include<map>
-//using namespace std;
+#include <map>
 
 class SwWrtShell;
 class SwContentType;
@@ -109,7 +108,6 @@ class SwContentTree : public SvTreeListBox
     using SvListView::Select;
 
 protected:
-//  virtual void    Command( const CommandEvent& rCEvt );
     virtual void	RequestHelp( const HelpEvent& rHEvt );
     virtual void 	InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
@@ -197,7 +195,6 @@ public:
     SwWrtShell*			GetHiddenWrtShell() {return pHiddenShell;}
 
     DECL_LINK( ContentDoubleClickHdl, SwContentTree * );
-//  DECL_LINK( PopupHdl, Menu* );
     DECL_LINK( TimerUpdate, Timer * );
 
     virtual long    GetTabPos( SvLBoxEntry*, SvLBoxTab* );