diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-01-18 02:00:12 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-01-18 02:01:16 +0900 |
commit | c2c669db137b9ace3928612834ea080f3e661fef (patch) | |
tree | 31ce279cab959fc9018d82d11a0945d738be14bf /sw | |
parent | 0f1fc0dfea41b7c74565683ba13e0dfc9177c7e5 (diff) |
removed dead macro
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/poolfmt.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmltab.cxx | 11 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 1 | ||||
-rw-r--r-- | sw/source/filter/ww1/fltshell.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlithlp.hxx | 10 |
10 files changed, 0 insertions, 40 deletions
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 6b5868ac7e37..cd64889640a6 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -91,11 +91,8 @@ const sal_uInt16 PT_22 = 22 * 20; // 22 pt const sal_uInt16 PT_24 = 24 * 20; // 22 pt -//const sal_uInt16 HTML_PARSPACE = ((CM_05 * 7) / 10); #define HTML_PARSPACE GetMetricVal( CM_05 ) -static const sal_Char sKomma[] = ", "; - static const sal_uInt16 aHeadlineSizes[ 2 * MAXLEVEL ] = { // PT_16, PT_14, PT_14, PT_12, PT_12, // normal // we do everything procentual now: diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 97087f566f29..8cc76ac6ed6c 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -108,12 +108,6 @@ using namespace ::com::sun::star; #endif -#define HTML_BULLETCHAR_DISC 34 -#define HTML_BULLETCHAR_CIRCLE 38 -#define HTML_BULLETCHAR_SQUARE 36 - -#define COLFUZZY 20 - //----------------------------------------------------------------------- HTMLOutEvent aAnchorEventTable[] = diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 06aa3bfd2957..42eebd5225a0 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -67,11 +67,8 @@ #include <numrule.hxx> #define NETSCAPE_DFLT_BORDER 1 -#define NETSCAPE_DFLT_CELLPADDING 1 #define NETSCAPE_DFLT_CELLSPACING 2 -//#define FIX56334 - using ::editeng::SvxBorderLine; using namespace ::com::sun::star; @@ -1408,15 +1405,11 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox, // Wenn die Zelle ueber mehrere Zeilen geht muss ein evtl. // an der Zeile gesetzter Hintergrund an die Zelle uebernommen // werden. -#ifndef FIX56334 // Wenn es sich um eine Tabelle in der Tabelle handelt und // die Zelle ueber die gesamte Heoehe der Tabelle geht muss // ebenfalls der Hintergrund der Zeile uebernommen werden, weil // die Line von der GC (zu Recht) wegoptimiert wird. if( nRowSpan > 1 || (this != pTopTable && nRowSpan==nRows) ) -#else - if( nRowSpan > 1 ) -#endif { pBGBrushItem = ((*pRows)[nRow])->GetBGBrush(); if( !pBGBrushItem && this != pTopTable ) @@ -1691,13 +1684,11 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper, HTMLTableRow *pTopRow = (*pRows)[nTopRow]; sal_uInt16 nRowHeight = pTopRow->GetHeight(); const SvxBrushItem *pBGBrushItem = 0; -#ifndef FIX56334 if( this == pTopTable || nTopRow>0 || nBottomRow<nRows ) { // An der Line eine Frabe zu setzen macht keinen Sinn, wenn sie // die auesserste und gleichzeitig einzige Zeile einer Tabelle in // der Tabelle ist. -#endif pBGBrushItem = pTopRow->GetBGBrush(); if( !pBGBrushItem && this != pTopTable ) @@ -1709,9 +1700,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper, if( !pBGBrushItem ) pBGBrushItem = GetInhBGBrush(); } -#ifndef FIX56334 } -#endif if( nTopRow==nBottomRow-1 && (nRowHeight || pBGBrushItem) ) { SwTableLineFmt *pFrmFmt = (SwTableLineFmt*)pLine->ClaimFrmFmt(); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 23cc0df2d024..b4f7f16baec3 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -111,8 +111,6 @@ #include <swerror.h> #define FONTSIZE_MASK 7 -#define FONTCOLOR_MASK (1<<15) -#define FONT_MASK (1<<14) #define HTML_ESC_PROP 80 #define HTML_ESC_SUPER DFLT_ESC_SUPER diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 4ceb9b51f41b..633ad33dd1b9 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -64,7 +64,6 @@ class SwHTMLTxtFtns; extern SwAttrFnTab aHTMLAttrFnTab; -//#define HTML_PARSPACE ((MM50 * 7) / 10) #define HTML_PARSPACE (MM50) // Flags fuer die Ausgabe von Rahmen aller Art diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 284fbb5e6439..0afe3d3cf075 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -71,8 +71,6 @@ #include <shellres.hxx> -#define MAX_FIELDLEN 64000 - using namespace com::sun::star; static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, sal_Bool bNext) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c14e189f93db..5335ae7c9125 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -150,8 +150,6 @@ #include "WW8Sttbf.hxx" #include "WW8FibData.hxx" -#define MM_250 1417 // WW-Default fuer Hor. Seitenraender: 2.5 cm -#define MM_200 1134 // WW-Default fuer u.Seitenrand: 2.0 cm using namespace ::com::sun::star; using namespace sw::util; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 246bd606ae36..989a5dbba71f 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -149,7 +149,6 @@ struct WW8OleMap; typedef WW8OleMap* WW8OleMap_Ptr; SV_DECL_PTRARR_DEL(WW8LFOInfos,WW8LFOInfo_Ptr,16,16) -// SV_DECL_PTRARR_SORT_DEL(WW8AuthorInfos, WW8AuthorInfo_Ptr,16,16) SV_DECL_PTRARR_SORT_DEL(WW8OleMaps, WW8OleMap_Ptr,16,16) class WW8Reader : public StgReader diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index f27ef6bc51cd..e39f5c7d9a8b 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -95,8 +95,6 @@ #include <algorithm> // #i24377# -//#define WW_NATIVE_TOC 0 - #define MAX_FIELDLEN 64000 #define WW8_TOX_LEVEL_DELIM ':' diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index 67622a8b5e74..4bfb7e2d4c8e 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -46,16 +46,6 @@ namespace rtl { class OUString; } /** Define various helper variables and functions for xmlimpit.cxx and * xmlexpit.cxx. */ - -#define SVX_XML_BORDER_STYLE_NONE 0 -#define SVX_XML_BORDER_STYLE_SOLID 1 -#define SVX_XML_BORDER_STYLE_DOUBLE 2 - -#define SVX_XML_BORDER_WIDTH_THIN 0 -#define SVX_XML_BORDER_WIDTH_MIDDLE 1 -#define SVX_XML_BORDER_WIDTH_THICK 2 - - sal_Bool lcl_frmitems_parseXMLBorder( const ::rtl::OUString& rValue, const SvXMLUnitConverter& rUnitConverter, sal_Bool& rHasStyle, sal_uInt16& rStyle, |