[Libreoffice-commits] .: 2 commits - sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Jan 25 22:55:35 PST 2011
sw/source/core/doc/docedt.cxx | 1 -
sw/source/filter/ww1/w1class.cxx | 14 --------------
sw/source/filter/ww1/w1class.hxx | 26 --------------------------
sw/source/filter/ww8/wrtww8gr.cxx | 7 -------
sw/source/ui/frmdlg/frmmgr.cxx | 1 -
sw/source/ui/inc/conttree.hxx | 5 +----
6 files changed, 1 insertion(+), 53 deletions(-)
New commits:
commit e84849a735ee0e8e51f5da5561f5dfa550bbf81f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jan 25 14:27:28 2011 +0100
Cleanup for ww1.
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index c07963e..737c901 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 e279b4f..3fd6301 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 7182ab1..fba7ee3 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 e20884b..661153d 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 ddfa451..89dd2e1 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* );
commit 6d53bc5190a7eed3c2aa0c737f1eec030d514722
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jan 25 14:16:10 2011 +0100
Remove unused DEBUG_KA.
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 8868e68..af58ad1 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -85,13 +85,6 @@
using namespace ::com::sun::star;
using namespace nsFieldFlags;
-// Damit KA debuggen kann, ohne sich den ganzen Writer zu holen, ist
-// temporaer dieses Debug gesetzt. Ist ausserdem noch das passende IniFlag
-// gesetzt, dann werden in d:\ Hilfsdateien erzeugt.
-// !! sollte demnaechst wieder entfernt werden !!
-// #define DEBUG_KA
-
-
// ToDo:
// 5. Die MapModes, die Win nicht kann, umrechnen
More information about the Libreoffice-commits
mailing list