[Libreoffice-commits] .: 10 commits - binfilter/bf_forms binfilter/bf_sc binfilter/bf_sw binfilter/bf_xmloff hwpfilter/source lotuswordpro/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Jan 30 13:59:58 PST 2011
binfilter/bf_forms/source/component/forms_Columns.cxx | 1
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 42 --
binfilter/bf_sc/source/core/data/sc_table1.cxx | 42 --
binfilter/bf_sc/source/core/data/sc_userdat.cxx | 308 ------------------
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 23 -
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 17
binfilter/bf_sw/source/core/text/porlin.hxx | 7
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 9
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx | 9
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx | 2
hwpfilter/source/hwpeq.cpp | 19 -
lotuswordpro/source/filter/lwpdrawobj.cxx | 70 ----
lotuswordpro/source/filter/lwpusewhen.hxx | 11
14 files changed, 6 insertions(+), 556 deletions(-)
New commits:
commit 482ce83ead9ae827720c531e166a8e51ad5e90ce
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jan 30 22:57:31 2011 +0100
Remove some dead code.
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index 079f0e9..fccf2fe 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -34,7 +34,6 @@
// SFX
#define _SFXAPPWIN_HXX
#define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX ***
#define _SFXCTRLITEM_HXX
#define _SFXPRNMON_HXX
#define _INTRO_HXX
@@ -52,7 +51,6 @@
#define _SFXEVENT_HXX
//sfxdlg.hxx
-//#define _SFXTABDLG_HXX
#define _BASEDLGS_HXX
#define _SFX_DINFDLG_HXX
#define _SFXDINFEDT_HXX
@@ -65,18 +63,13 @@
#define _SFX_TEMPLDLG_HXX
#define _SFXNEW_HXX
#define _SFXDOCMAN_HXX
-//#define _SFXDOCKWIN_HXX ***
//sfxdoc.hxx
-//#define _SFX_OBJSH_HXX
-//#define _SFX_CLIENTSH_HXX ***
-//#define _SFXDOCINF_HXX
#define _SFX_OBJFAC_HXX
#define _SFX_DOCFILT_HXX
#define _SFXDOCFILE_HXX
#define _VIEWFAC_HXX
#define _SFXVIEWFRM_HXX
-//#define _SFXVIEWSH_HXX ***
#define _MDIFRM_HXX
#define _SFX_IPFRM_HXX
#define _SFX_INTERNO_HXX
@@ -127,14 +120,11 @@ using namespace ::com::sun::star;
/*N*/ pRangeName = pNewRangeName;
/*N*/ }
-
-
/*N*/ ScDBCollection* ScDocument::GetDBCollection() const
/*N*/ {
/*N*/ return pDBCollection;
/*N*/ }
-
/*N*/ ScDBData* ScDocument::GetDBAtCursor(USHORT nCol, USHORT nRow, USHORT nTab, BOOL bStartOnly) const
/*N*/ {
/*N*/ if (pDBCollection)
@@ -158,13 +148,6 @@ using namespace ::com::sun::star;
/*N*/ return pDPCollection;
/*N*/ }
-
-
-
-
-
-
-
/*N*/ void ScDocument::SetScenario( USHORT nTab, BOOL bFlag )
/*N*/ {
/*N*/ if (nTab<=MAXTAB && pTab[nTab])
@@ -272,7 +255,6 @@ using namespace ::com::sun::star;
/*N*/ return FALSE;
/*N*/ }
-
/*N*/ BOOL ScDocument::LinkExternalTab( USHORT& rTab, const String& aDocTab,
/*N*/ const String& aFileName, const String& aTabName )
/*N*/ {
@@ -341,19 +323,9 @@ using namespace ::com::sun::star;
/*N*/ return pVal;
/*N*/ }
-
-
-
-
-
-
// kopiert aus diesem Dokument die Zellen von Positionen, an denen in pPosDoc
// auch Zellen stehen, nach pDestDoc
-
-
-
-
/*N*/ const ScRangeList* ScDocument::GetScenarioRanges( USHORT nTab ) const
/*N*/ {
/*N*/ if (nTab<=MAXTAB && pTab[nTab])
@@ -376,7 +348,6 @@ using namespace ::com::sun::star;
/*N*/ pTab[nTab]->SetActiveScenario( bActive );
/*N*/ }
-
/*N*/ void ScDocument::AddUnoObject( SfxListener& rObject )
/*N*/ {
/*N*/ if (!pUnoBroadcaster)
@@ -506,14 +477,11 @@ using namespace ::com::sun::star;
}
/*N*/ }
-
-
/*N*/ void ScDocument::Fill(USHORT, USHORT, USHORT, USHORT, const ScMarkData&, USHORT, FillDir, FillCmd, FillDateCmd, double, double)
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
/*N*/ void ScDocument::AutoFormat( USHORT, USHORT, USHORT, USHORT, USHORT, const ScMarkData& )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP");
@@ -571,16 +539,11 @@ using namespace ::com::sun::star;
#define SC_STRTYPE_HEADERS 4
-
/*N*/ BOOL ScDocument::IsEmbedded() const
/*N*/ {
/*N*/ return bIsEmbedded;
/*N*/ }
-
-
-
-
/*N*/ ScRange ScDocument::GetRange( USHORT nTab, const Rectangle& rMMRect )
/*N*/ {
/*N*/ ScTable* pTable = pTab[nTab];
@@ -665,7 +628,6 @@ using namespace ::com::sun::star;
/*N*/ return ScRange( nX1,nY1,nTab, nX2,nY2,nTab );
/*N*/ }
-
// VisArea auf Zellgrenzen anpassen
/*N*/ void lcl_SnapHor( ScTable* pTable, long& rVal, USHORT& rStartCol )
@@ -880,7 +842,6 @@ using namespace ::com::sun::star;
/*N*/ ApplyFlagsTab( nStartCol+1, nStartRow+1, nEndCol, nEndRow, nTab, SC_MF_HOR | SC_MF_VER );
/*N*/ }
-
/*N*/ void ScDocument::ExtendPrintArea( OutputDevice* pDev, USHORT nTab,
/*N*/ USHORT nStartCol, USHORT nStartRow, USHORT& rEndCol, USHORT nEndRow )
/*N*/ {
@@ -900,9 +861,6 @@ using namespace ::com::sun::star;
/*N*/ pTab[nTab]->DecRecalcLevel();
/*N*/ }
-
-
-
} //namespace binfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index 5018d3a..f16f8dd 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -37,7 +37,6 @@
// SFX
#define _SFXAPPWIN_HXX
#define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX ***
#define _SFXCTRLITEM_HXX
#define _SFXPRNMON_HXX
#define _INTRO_HXX
@@ -54,24 +53,20 @@
#define _SFX_MINFITEM_HXX
#define _SFXEVENT_HXX
-//#define _SI_HXX
-//#define SI_NODRW
#define _SI_DLL_HXX
#define _SIDLL_HXX
#define _SI_NOITEMS
#define _SI_NOOTHERFORMS
#define _SI_NOSBXCONTROLS
#define _SINOSBXCONTROLS
-#define _SI_NODRW //
+#define _SI_NODRW
#define _SI_NOCONTROL
#define _VCBRW_HXX
#define _VCTRLS_HXX
-//#define _VCSBX_HXX
#define _VCONT_HXX
#define _VDRWOBJ_HXX
#define _VCATTR_HXX
-
#define _SVX_DAILDLL_HXX
#define _SVX_HYPHEN_HXX
#define _SVX_IMPGRF_HXX
@@ -390,26 +385,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return bRet;
/*N*/ }
-/* vorher:
-
- BOOL bFound = FALSE;
- USHORT nMaxX = 0;
- USHORT nMaxY = 0;
- for (USHORT i=0; i<=MAXCOL; i++)
- if (!aCol[i].IsEmpty())
- {
- bFound = TRUE;
- nMaxX = i;
- USHORT nColY = aCol[i].GetLastEntryPos();
- if (nColY > nMaxY)
- nMaxY = nColY;
- }
-
- rEndCol = nMaxX;
- rEndRow = nMaxY;
- return bFound;
-*/
-
/*N*/ BOOL ScTable::GetPrintArea( USHORT& rEndCol, USHORT& rEndRow, BOOL bNotes ) const
/*N*/ {
/*N*/ BOOL bFound = FALSE;
@@ -452,8 +427,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return bFound;
/*N*/ }
-
-
/*N*/ BOOL ScTable::GetDataStart( USHORT& rStartCol, USHORT& rStartRow ) const
/*N*/ {
/*N*/ BOOL bFound = FALSE;
@@ -507,11 +480,6 @@ DBG_BF_ASSERT(0, "STRIP");
DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-
-
-
-
/*N*/ void ScTable::GetNextPos( USHORT&, USHORT&, short, short,
/*N*/ BOOL, BOOL, const ScMarkData& )
/*N*/ {
@@ -670,15 +638,12 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-
-
/*N*/ void ScTable::UpdateInsertTab(USHORT nTable)
/*N*/ {
/*N*/ if (nTab >= nTable) nTab++;
/*N*/ for (USHORT i=0; i <= MAXCOL; i++) aCol[i].UpdateInsertTab(nTable);
/*N*/ }
-
/*N*/ void ScTable::UpdateDeleteTab( USHORT nTable, BOOL bIsMove, ScTable* pRefUndo )
/*N*/ {
/*N*/ if (nTab > nTable) nTab--;
@@ -864,11 +829,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ rSaveTab.SetRepeat( pRepeatColRange, pRepeatRowRange );
/*N*/ }
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/data/sc_userdat.cxx b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
index baeab9e..61345c6 100644
--- a/binfilter/bf_sc/source/core/data/sc_userdat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
@@ -41,90 +41,20 @@
#define _TREELIST_HXX
#define _CACHESTR_HXX
#define _NEW_HXX
-//#define _SHL_HXX
-//#define _LINK_HXX
-//#define _ERRCODE_HXX
-//#define _GEN_HXX
-//#define _FRACT_HXX
-//#define _STRING_HXX
-//#define _MTF_HXX
-//#define _CONTNR_HXX
-//#define _LIST_HXX
-//#define _TABLE_HXX
#define _DYNARY_HXX
-//#define _UNQIDX_HXX
#define _SVMEMPOOL_HXX
-//#define _UNQID_HXX
-//#define _DEBUG_HXX
-//#define _DATE_HXX
-//#define _TIME_HXX
-//#define _DATETIME_HXX
-//#define _INTN_HXX
-//#define _WLDCRD_HXX
-//#define _FSYS_HXX
-//#define _STREAM_HXX
#define _SV_MULTISEL_HXX
//SV
-//#define _CLIP_HXX ***
#define _CONFIG_HXX
#define _CURSOR_HXX
#define _FONTDLG_HXX
#define _PRVWIN_HXX
-//#define _COLOR_HXX
-//#define _PAL_HXX
-//#define _BITMAP_HXX
-//#define _GDIOBJ_HXX
-//#define _POINTR_HXX
-//#define _ICON_HXX
-//#define _IMAGE_HXX
-//#define _KEYCOD_HXX
-//#define _EVENT_HXX
#define _HELP_HXX
-//#define _APP_HXX
-//#define _MDIAPP_HXX
-//#define _TIMER_HXX
-//#define _METRIC_HXX
-//#define _REGION_HXX
-//#define _OUTDEV_HXX
-//#define _SYSTEM_HXX
-//#define _VIRDEV_HXX
-//#define _JOBSET_HXX
-//#define _PRINT_HXX
-//#define _WINDOW_HXX
-//#define _SYSWIN_HXX
-//#define _WRKWIN_HXX
#define _MDIWIN_HXX
-//#define _FLOATWIN_HXX
-//#define _DOCKWIN_HXX
-//#define _CTRL_HXX
-//#define _SCRBAR_HXX
-//#define _BUTTON_HXX
-//#define _IMAGEBTN_HXX
-//#define _FIXED_HXX
-//#define _GROUP_HXX
-//#define _EDIT_HXX
-//#define _COMBOBOX_HXX
-//#define _LSTBOX_HXX
-//#define _SELENG_HXX ***
-//#define _SPLIT_HXX
#define _SPIN_HXX
-//#define _FIELD_HXX
-//#define _MOREBTN_HXX ***
-//#define _TOOLBOX_HXX
-//#define _STATUS_HXX ***
-//#define _DIALOG_HXX
-//#define _MSGBOX_HXX
-//#define _SYSDLG_HXX
#define _FILDLG_HXX
-//#define _PRNDLG_HXX
#define _COLDLG_HXX
-//#define _TABDLG_HXX
-//#define _MENU_HXX
-//#define _GDIMTF_HXX
-//#define _POLY_HXX
-//#define _ACCEL_HXX
-//#define _GRAPH_HXX
#define _SOUND_HXX
#if defined WIN
@@ -134,48 +64,28 @@
//svtools
#define _SCRWIN_HXX
#define _RULER_HXX
-//#define _TABBAR_HXX
-//#define _VALUESET_HXX
#define _STDMENU_HXX
-//#define _STDCTRL_HXX
-//#define _CTRLBOX_HXX
#define _CTRLTOOL_HXX
#define _EXTATTR_HXX
#define _FRM3D_HXX
#define _EXTATTR_HXX
//SVTOOLS
-//#define _SVTREELIST_HXX ***
#define _FILTER_HXX
-//#define _SVLBOXITM_HXX ***
-//#define _SVTREEBOX_HXX ***
#define _SVICNVW_HXX
#define _SVTABBX_HXX
//sfxcore.hxx
-//#define _SFXINIMGR_HXX ***
-//#define _SFXCFGITEM_HXX
-//#define _SFX_PRINTER_HXX
#define _SFXGENLINK_HXX
#define _SFXHINTPOST_HXX
#define _SFXDOCINF_HXX
#define _SFXLINKHDL_HXX
-//#define _SFX_PROGRESS_HXX
//sfxsh.hxx
-//#define _SFX_SHELL_HXX
-//#define _SFXAPP_HXX
-//#define _SFXDISPATCH_HXX
-//#define _SFXMSG_HXX ***
-//#define _SFXOBJFACE_HXX ***
-//#define _SFXREQUEST_HXX
#define _SFXMACRO_HXX
// SFX
-//#define _SFXAPPWIN_HXX ***
#define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX
-//#define _SFXCTRLITEM_HXX
#define _SFXPRNMON_HXX
#define _INTRO_HXX
#define _SFXMSGDESCR_HXX
@@ -192,84 +102,41 @@
#define _SFXEVENT_HXX
//sfxdoc.hxx
-//#define _SFX_OBJSH_HXX
-//#define _SFX_CLIENTSH_HXX
-//#define _SFXDOCINF_HXX
-//#define _SFX_OBJFAC_HXX
#define _SFX_DOCFILT_HXX
-//#define _SFXDOCFILE_HXX ***
-//define _VIEWFAC_HXX
-//#define _SFXVIEWFRM_HXX
-//#define _SFXVIEWSH_HXX
-//#define _MDIFRM_HXX ***
#define _SFX_IPFRM_HXX
-//#define _SFX_INTERNO_HXX
//sfxdlg.hxx
-//#define _SFXTABDLG_HXX
-//#define _BASEDLGS_HXX ***
#define _SFX_DINFDLG_HXX
#define _SFXDINFEDT_HXX
#define _SFX_MGETEMPL_HXX
#define _SFX_TPLPITEM_HXX
-//#define _SFX_STYLEDLG_HXX
#define _NEWSTYLE_HXX
-//#define _SFXDOCTEMPL_HXX ***
-//#define _SFXDOCTDLG_HXX ***
-//#define _SFX_TEMPLDLG_HXX ***
-//#define _SFXNEW_HXX ***
#define _SFXDOCMAN_HXX
-//#define _SFXDOCKWIN_HXX
//sfxitems.hxx
#define _SFX_WHMAP_HXX
#define _ARGS_HXX
-//#define _SFXPOOLITEM_HXX
-//#define _SFXINTITEM_HXX
-//#define _SFXENUMITEM_HXX
#define _SFXFLAGITEM_HXX
-//#define _SFXSTRITEM_HXX
#define _SFXPTITEM_HXX
#define _SFXRECTITEM_HXX
-//#define _SFXITEMPOOL_HXX
-//#define _SFXITEMSET_HXX
#define _SFXITEMITER_HXX
#define _SFX_WHITER_HXX
#define _SFXPOOLCACH_HXX
-//#define _AEITEM_HXX
#define _SFXRNGITEM_HXX
-//#define _SFXSLSTITM_HXX
-//#define _SFXSTYLE_HXX
-
-//xout.hxx
-//#define _XENUM_HXX
-//#define _XPOLY_HXX
-//#define _XATTR_HXX
-//#define _XOUTX_HXX
-//#define _XPOOL_HXX
-//#define _XTABLE_HXX
//svdraw.hxx
#define _SDR_NOITEMS
#define _SDR_NOTOUCH
#define _SDR_NOTRANSFORM
-//#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS
-//#define SI_NOITEMS
-//#define SI_NODRW
#define _SI_NOSBXCONTROLS
-//#define _VCATTR_HXX
#define _VCONT_HXX
-//#define _VCSBX_HXX
#define _SI_NOOTHERFORMS
#define _VCTRLS_HXX
-//#define _VCDRWOBJ_HXX
#define _SI_NOCONTROL
#define _SETBRW_HXX
#define _VCBRW_HXX
#define _SI_NOSBXCONTROLS
-//#define _SIDLL_HXX ***
#define _SVX_DAILDLL_HXX
#define _SVX_HYPHEN_HXX
@@ -286,7 +153,7 @@
#define _SVX_SPLDLG_HXX
#define _SVX_THESDLG_HXX
-// neu
+// new
#define _BIGINT_HXX
#define _SFXMULTISEL_HXX
#define _STACK_HXX
@@ -295,97 +162,23 @@
#define _TREELIST_HXX
#define _CACHESTR_HXX
#define _NEW_HXX
-//#define _SHL_HXX
-//#define _LINK_HXX
-//#define _ERRCODE_HXX
-//#define _GEN_HXX
-//#define _FRACT_HXX
-//#define _STRING_HXX
-//#define _MTF_HXX
-//#define _CONTNR_HXX
-//#define _LIST_HXX
-//#define _TABLE_HXX
#define _DYNARY_HXX
-//#define _UNQIDX_HXX
#define _SVMEMPOOL_HXX
-//#define _UNQID_HXX
-//#define _DEBUG_HXX
-//#define _DATE_HXX
-//#define _TIME_HXX
-//#define _DATETIME_HXX
-//#define _INTN_HXX
-//#define _WLDCRD_HXX
-//#define _FSYS_HXX
-//#define _STREAM_HXX
#define _CACHESTR_HXX
#define _SV_MULTISEL_HXX
//SV
-//#define _CLIP_HXX ***
#define _CONFIG_HXX
#define _CURSOR_HXX
#define _FONTDLG_HXX
#define _PRVWIN_HXX
-//#define _COLOR_HXX
-//#define _PAL_HXX
-//#define _BITMAP_HXX
-//#define _GDIOBJ_HXX
-//#define _POINTR_HXX
-//#define _ICON_HXX
-//#define _IMAGE_HXX
-//#define _KEYCOD_HXX
-//#define _EVENT_HXX
#define _HELP_HXX
-//#define _APP_HXX
-//#define _MDIAPP_HXX
-//#define _TIMER_HXX
-//#define _METRIC_HXX
-//#define _REGION_HXX
-//#define _OUTDEV_HXX
-//#define _SYSTEM_HXX
-//#define _VIRDEV_HXX
-//#define _JOBSET_HXX
-//#define _PRINT_HXX
-//#define _WINDOW_HXX
-//#define _SYSWIN_HXX
-//#define _WRKWIN_HXX
#define _MDIWIN_HXX
-//#define _FLOATWIN_HXX
-//#define _DOCKWIN_HXX
-//#define _CTRL_HXX
-//#define _SCRBAR_HXX
-//#define _BUTTON_HXX
-//#define _IMAGEBTN_HXX
-//#define _FIXED_HXX
-//#define _GROUP_HXX
-//#define _EDIT_HXX
-//#define _COMBOBOX_HXX
-//#define _LSTBOX_HXX
-//#define _SELENG_HXX ***
-//#define _SPLIT_HXX
#define _SPIN_HXX
-//#define _FIELD_HXX
-//#define _MOREBTN_HXX ***
-//#define _TOOLBOX_HXX
-//#define _STATUS_HXX ***
-//#define _DIALOG_HXX
-//#define _MSGBOX_HXX
-//#define _SYSDLG_HXX
#define _FILDLG_HXX
-//#define _PRNDLG_HXX
#define _COLDLG_HXX
-//#define _TABDLG_HXX
-//#define _MENU_HXX ***
-//#define _GDIMTF_HXX
-//#define _POLY_HXX
-//#define _ACCEL_HXX
-//#define _GRAPH_HXX
#define _SOUND_HXX
-
-
-
-
#define _BIGINT_HXX
#define _SFXMULTISEL_HXX
#define _STACK_HXX
@@ -394,91 +187,20 @@
#define _TREELIST_HXX
#define _CACHESTR_HXX
#define _NEW_HXX
-//#define _SHL_HXX
-//#define _LINK_HXX
-//#define _ERRCODE_HXX
-//#define _GEN_HXX
-//#define _FRACT_HXX
-//#define _STRING_HXX
-//#define _MTF_HXX
-//#define _CONTNR_HXX
-//#define _LIST_HXX
-//#define _TABLE_HXX
#define _DYNARY_HXX
-//#define _UNQIDX_HXX
#define _SVMEMPOOL_HXX
-//#define _UNQID_HXX
-//#define _DEBUG_HXX
-//#define _DATE_HXX
-//#define _TIME_HXX
-//#define _DATETIME_HXX
-//#define _INTN_HXX
-//#define _WLDCRD_HXX
-//#define _FSYS_HXX
-//#define _STREAM_HXX
#define _CACHESTR_HXX
#define _SV_MULTISEL_HXX
//SV
-//#define _CLIP_HXX ***
#define _CONFIG_HXX
#define _CURSOR_HXX
#define _FONTDLG_HXX
#define _PRVWIN_HXX
-//#define _COLOR_HXX
-//#define _PAL_HXX
-//#define _BITMAP_HXX
-//#define _GDIOBJ_HXX
-//#define _POINTR_HXX
-//#define _ICON_HXX
-//#define _IMAGE_HXX
-//#define _KEYCOD_HXX
-//#define _EVENT_HXX
#define _HELP_HXX
-//#define _APP_HXX
-//#define _MDIAPP_HXX
-//#define _TIMER_HXX
-//#define _METRIC_HXX
-//#define _REGION_HXX
-//#define _OUTDEV_HXX
-//#define _SYSTEM_HXX
-//#define _VIRDEV_HXX
-//#define _JOBSET_HXX
-//#define _PRINT_HXX
-//#define _WINDOW_HXX
-//#define _SYSWIN_HXX
-//#define _WRKWIN_HXX
#define _MDIWIN_HXX
-//#define _FLOATWIN_HXX
-//#define _DOCKWIN_HXX
-//#define _CTRL_HXX
-//#define _SCRBAR_HXX
-//#define _BUTTON_HXX
-//#define _IMAGEBTN_HXX
-//#define _FIXED_HXX
-//#define _GROUP_HXX
-//#define _EDIT_HXX
-//#define _COMBOBOX_HXX
-//#define _LSTBOX_HXX
-//#define _SELENG_HXX ***
-//#define _SPLIT_HXX
#define _SPIN_HXX
-//#define _FIELD_HXX
-//#define _MOREBTN_HXX ***
-//#define _TOOLBOX_HXX
-//#define _STATUS_HXX ***
-//#define _DIALOG_HXX
-//#define _MSGBOX_HXX
-//#define _SYSDLG_HXX
-//#define _FILDLG_HXX
-//#define _PRNDLG_HXX
#define _COLDLG_HXX
-//#define _TABDLG_HXX
-//#define _MENU_HXX
-//#define _GDIMTF_HXX
-//#define _POLY_HXX
-//#define _ACCEL_HXX
-//#define _GRAPH_HXX
#define _SOUND_HXX
#if defined WIN
@@ -488,48 +210,28 @@
//svtools
#define _SCRWIN_HXX
#define _RULER_HXX
-//#define _TABBAR_HXX
-//#define _VALUESET_HXX
#define _STDMENU_HXX
-//#define _STDCTRL_HXX
-//#define _CTRLBOX_HXX
#define _CTRLTOOL_HXX
#define _EXTATTR_HXX
#define _FRM3D_HXX
#define _EXTATTR_HXX
//SVTOOLS
-//#define _SVTREELIST_HXX ***
#define _FILTER_HXX
-//#define _SVLBOXITM_HXX ***
-//#define _SVTREEBOX_HXX ***
#define _SVICNVW_HXX
#define _SVTABBX_HXX
//sfxcore.hxx
-//#define _SFXINIMGR_HXX ***
-//#define _SFXCFGITEM_HXX
-//#define _SFX_PRINTER_HXX
#define _SFXGENLINK_HXX
#define _SFXHINTPOST_HXX
#define _SFXDOCINF_HXX
#define _SFXLINKHDL_HXX
-//#define _SFX_PROGRESS_HXX
//sfxsh.hxx
-//#define _SFX_SHELL_HXX
-//#define _SFXAPP_HXX
-//#define _SFXDISPATCH_HXX
-//#define _SFXMSG_HXX ***
-//#define _SFXOBJFACE_HXX ***
-//#define _SFXREQUEST_HXX
#define _SFXMACRO_HXX
// SFX
-//#define _SFXAPPWIN_HXX ***
#define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX
-//#define _SFXCTRLITEM_HXX
#define _SFXPRNMON_HXX
#define _INTRO_HXX
#define _SFXMSGDESCR_HXX
@@ -545,7 +247,6 @@
#define _SFX_MINFITEM_HXX
#define _SFXEVENT_HXX
-
#define _SFXFILEDLG_HXX
#define _SFXIMGMGR_HXX
#define _SFXIPFRM_HXX
@@ -559,7 +260,6 @@
#define _SFX_MINFITEM_HXX
#define _SFXOBJFACE_HXX
#define _SFXOBJFAC_HXX
-//#define _SFXREQUEST_HXX
#define _SFX_SAVEOPT_HXX
#define _SFXSTBITEM_HXX
#define _SFXSTBMGR_HXX
@@ -583,8 +283,6 @@
// INCLUDE ---------------------------------------------------------------
-
-
#include "drwlayer.hxx"
#include "rechead.hxx"
#include "userdat.hxx"
@@ -714,10 +412,6 @@ namespace binfilter {
rIStm, ::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE));
/*N*/ }
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a6266c88f6596996c122c276fbcb5577244cb82d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jan 30 22:57:10 2011 +0100
Remove TEST, DEBUG and dead code.
diff --git a/hwpfilter/source/hwpeq.cpp b/hwpfilter/source/hwpeq.cpp
index cc0cafa..fd3a0cf 100644
--- a/hwpfilter/source/hwpeq.cpp
+++ b/hwpfilter/source/hwpeq.cpp
@@ -39,9 +39,6 @@ using namespace std;
#include "hwpeq.h"
#include <sal/types.h>
#include <sal/macros.h>
-//#define TEST
-//#define DEBUG
-
/* @Man: hwp¼ö½ÄÀ» LaTeXÀ¸·Î ¹Ù²Ù±â */
#ifdef WIN32
@@ -537,8 +534,7 @@ static int next_token(MzString &white, MzString &token, istream *strm)
}
else
token << (char) ch;
- // cout << "WHITE : " << "|" << white.c_str() << "|" << endl ;
- // cout << "TOKEN : " << "|" << token.c_str() << "|" << endl ;
+
return token.length();
}
@@ -580,11 +576,7 @@ static int eq_word(MzString& outs, istream *strm, int status)
int ch, result, nargs;
char keyword[256];
hwpeq *eq;
-#ifdef DEBUG
- static int slevel = 0;
- slevel++;
-#endif
next_token(white, token, strm);
if (token.length() <= 0)
return 0;
@@ -641,11 +633,7 @@ static int eq_word(MzString& outs, istream *strm, int status)
}
}
outs << state;
-#ifdef DEBUG
- //if( slevel == 1 )
- // cout << "LEVEL[" << slevel << "]" << state << "\n";
- slevel--;
-#endif
+
return result;
}
@@ -749,9 +737,6 @@ void eq2latex(MzString& outs, char *s)
istringstream tstrm(s);
bool eqnarray = eq_sentence(tstr, &tstrm);
-#ifdef TEST
- cout << "Step1: " << endl << tstr.c_str() << endl;
-#endif
istringstream strm(tstr.c_str());
if( eqnarray )
commit feb81896f2b50e74ad9e6bbfcd5ab6b4826a110f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:45:59 2011 +0100
Remove MA_DEBUG.
diff --git a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
index 4bff776..9967ea8 100644
--- a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
@@ -67,29 +67,6 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwFtnIdxs &rFtnIdxs = pDoc->GetFtnIdxs();
/*N*/
-/*N*/ #ifdef MA_DEBUG
-/*N*/ //Wenn das Array nicht stimmt haben wir ein Problem, denn viele
-/*N*/ //Ftn-Functions bauen auf dem Array auf.
-/*N*/ for ( USHORT k = 0; k+1 < rFtnIdxs.Count(); ++k )
-/*N*/ {
-/*N*/ SwIndex aIdx1(&pDoc->GetNodes());
-/*N*/ SwIndex aIdx2(&pDoc->GetNodes());
-/*N*/ rFtnIdxs[k]->pFtn-> GetTxtNode().GetIndex(aIdx1);
-/*N*/ rFtnIdxs[k+1]->pFtn->GetTxtNode().GetIndex(aIdx2);
-/*N*/ if ( aIdx1.GetIndex() > aIdx2.GetIndex() )
-/*N*/ {
-/*N*/ ASSERT( !rFtnIdxs.Count(), "FtnIdxs not up to date" );
-/*N*/ }
-/*N*/ else if ( aIdx1.GetIndex() == aIdx2.GetIndex() )
-/*N*/ {
-/*N*/ SwTxtFtn *p1 = rFtnIdxs[k];
-/*N*/ SwTxtFtn *p2 = rFtnIdxs[k+1];
-/*N*/ ASSERT( *p1->GetStart() < *p2->GetStart(),
-/*N*/ "FtnIdxs not up to date" );
-/*N*/ }
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ USHORT nRet;
/*N*/ SwTxtFtnPtr pBla = (SwTxtFtn*)pAttr;
/*N*/ if ( rFtnIdxs.Seek_Entry( pBla, &nRet ) )
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index 0302b60..4aa65c3 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -630,23 +630,6 @@ namespace binfilter {
/*?*/ continue;
/*N*/ }
/*N*/
-/*N*/ #ifdef MA_DEBUG
-/*?*/ static USHORT nStop = USHRT_MAX;
-/*?*/ if ( pPage->GetPhyPageNum() == nStop )
-/*?*/ {
-/*?*/ int bla = 5;
-/*?*/ }
-/*?*/ Window *pWin = pImp->GetShell()->GetWin();
-/*?*/ if ( pWin )
-/*?*/ {
-/*?*/ pWin->Push( PUSH_FILLCOLOR );
-/*?*/ pWin->SetFillColor( COL_WHITE );
-/*?*/ Point aOfst( pImp->GetShell()->VisArea().Pos() );
-/*?*/ pWin->DrawRect( Rectangle( aOfst, Size( 2000, 1000 )));
-/*?*/ pWin->DrawText( Point( 500, 500 ) + aOfst, pPage->GetPhyPageNum() );
-/*?*/ pWin->Pop();
-/*?*/ }
-/*N*/ #endif
/*N*/ if ( nEndPage != USHRT_MAX && pPage->GetPhyPageNum() > nPercentPageNum )
/*N*/ {
/*?*/ nPercentPageNum = pPage->GetPhyPageNum();
commit 6ada77e610f1ca067bf5b937b9e640a192f72033
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:40:23 2011 +0100
cppcheck: remove unused variable pProps.
diff --git a/binfilter/bf_forms/source/component/forms_Columns.cxx b/binfilter/bf_forms/source/component/forms_Columns.cxx
index 8e5c009..54632bd 100644
--- a/binfilter/bf_forms/source/component/forms_Columns.cxx
+++ b/binfilter/bf_forms/source/component/forms_Columns.cxx
@@ -341,7 +341,6 @@ void OGridColumn::clearAggregateProperties(Sequence<Property>& seqProps, sal_Boo
void OGridColumn::setOwnProperties(Sequence<Property>& aDescriptor)
{
aDescriptor.realloc(5);
- Property* pProps = aDescriptor.getArray();
sal_Int32 nPos = 0;
DECL_PROP1(LABEL, ::rtl::OUString, BOUND);
DECL_PROP3(WIDTH, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT);
commit f35a459af969c33b48edabb301b805b76c28caeb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:38:57 2011 +0100
cppcheck: remove unused variable pContext.
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
index 3c68b07..e29f26c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
@@ -1972,8 +1972,6 @@ SvXMLImportContext *XMLParaContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
-
const SvXMLTokenMap& rTokenMap =
GetImport().GetTextImport()->GetTextPElemTokenMap();
sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
commit bcf2a9bfde41407a2ddf46460d9cac98ad619a55
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:13:56 2011 +0100
Remove dead code.
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index ab66c20..cb4d526 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -940,9 +940,7 @@ XFFrame* LwpDrawArc::CreateDrawObj(const rtl::OUString& rStyleName )
XFPoint aCtl2((double)m_aVector[2].x/TWIPS_PER_CM* m_pTransData->fScaleX,
(double)m_aVector[2].y/TWIPS_PER_CM * m_pTransData->fScaleY);
pArc->CurveTo(aDest, aCtl1, aCtl2);
-// pArc->CurveTo(XFPoint((double)m_aVector[3].x/TWIPS_PER_CM, (double)m_aVector[3].y/TWIPS_PER_CM),
-// XFPoint((double)m_aVector[1].x/TWIPS_PER_CM, (double)m_aVector[1].y/TWIPS_PER_CM),
-// XFPoint((double)m_aVector[2].x/TWIPS_PER_CM, (double)m_aVector[2].y/TWIPS_PER_CM));
+
this->SetPosition(pArc);
pArc->SetStyleName(rStyleName);
@@ -1051,39 +1049,6 @@ void LwpDrawTextBox::Read()
m_pStream->Read(&m_aTextRec.nTextRotation, sizeof(m_aTextRec.nTextRotation));
m_pStream->Read(&m_aTextRec.nTextExtraSpacing, sizeof(m_aTextRec.nTextExtraSpacing));
- /*#ifdef JAPANESE_ENABLED //For Amipro Support KOBA-WADA
- lubyte compText[3];
- lsshort TextLength;
- lubyte * pTextString;
- cBinaryData.GetUBytes(compText, 2);
- compText[2] = '\0';
- if (compText[0] == 0 && compText[1] == 0 && recLen > 105 )
- {
- // AmiPro R3.1J's extended text object format
- TextLength = recLen - 71 - 34;
- cBinaryData.SkipUBytes(32);
-
- pTextString = new lubyte[TextLength];
-
- LASSERT(pTextString != LNULL);
-
- cBinaryData.GetUBytes(pTextString, TextLength);
- }
- else
- {
- // AmiPro R3.X original text object format
-
- // some draw files in version 1.2 have an extra byte following '\0'.
- // can't rely on that, so read in the whole string into memory.
- TextLength = recLen - 71;
- pTextString = new lubyte[TextLength];
-
- LASSERT(pTextString != LNULL);
-
- strcpy((char *)pTextString, (const char *)compText);
- cBinaryData.GetUBytes(pTextString + 2, TextLength - 2);
- }
-#else*/
// some draw files in version 1.2 have an extra byte following '\0'.
// can't rely on that, so read in the whole string into memory.
@@ -1092,9 +1057,6 @@ void LwpDrawTextBox::Read()
m_aTextRec.pTextString = new sal_uInt8 [TextLength];
m_pStream->Read(m_aTextRec.pTextString, TextLength);
-
-//#endif // AmiPro
-
}
rtl::OUString LwpDrawTextBox::RegisterStyle()
@@ -1121,10 +1083,6 @@ rtl::OUString LwpDrawTextBox::RegisterStyle()
XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName )
{
XFFrame* pTextBox = new XFFrame(sal_True);
-/* this->SetPosition(pTextBox);
- XFRect aBoundRect((double)m_aObjHeader.nLeft/TWIPS_PER_CM, (double)m_aObjHeader.nTop/TWIPS_PER_CM,
- (double)(m_aObjHeader.nRight-m_aObjHeader.nLeft)/TWIPS_PER_CM, (double)(m_aObjHeader.nBottom-m_aObjHeader.nTop)/TWIPS_PER_CM);
- pTextBox->SetPosition(aBoundRect);*/
sal_Int16 TextLength = m_aObjHeader.nRecLen - 71;
rtl_TextEncoding aEncoding;
@@ -1138,10 +1096,6 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName )
aEncoding = LwpCharSetMgr::GetInstance()->GetTextCharEncoding();
}
-// XFTextSpan* pTextSpan = new XFTextSpan();
-// pTextSpan->SetText(rtl::OUString((sal_Char*)m_aTextRec.pTextString, (TextLength-2), aEncoding));
-// pTextSpan->SetStyleName(rStyleName);
-
XFParagraph* pXFPara = new XFParagraph();
pXFPara->Add(rtl::OUString((sal_Char*)m_aTextRec.pTextString, (TextLength-2), aEncoding));
pXFPara->SetStyleName(rStyleName);
@@ -1149,12 +1103,6 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName )
pTextBox->Add(pXFPara);
this->SetPosition(pTextBox);
- /*
- XFFrameStyle* pBoxStyle = new XFFrameStyle();
- pBoxStyle->SetYPosType(enumXFFrameYPosFromTop, enumXFFrameYRelFrame);
- pBoxStyle->SetXPosType(enumXFFrameXPosFromLeft, enumXFFrameXRelFrame);
- pBoxStyle->SetPadding(0.0, 0.0, 0.0, 0.0);
- */
XFTextBoxStyle* pBoxStyle = new XFTextBoxStyle();
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
@@ -1289,7 +1237,6 @@ void LwpDrawTextArt::Read()
m_pStream->Read(&m_aTextArtRec.nTextAttrs, sizeof(m_aTextArtRec.nTextAttrs));
m_pStream->Read(&m_aTextArtRec.nTextCharacterSet, sizeof(m_aTextArtRec.nTextCharacterSet));
-// m_pStream->Read(&m_aTextArtRec.nTextRotation, sizeof(m_aTextArtRec.nTextRotation));
m_aTextArtRec.nTextRotation = 0;
m_pStream->Read(&m_aTextArtRec.nTextExtraSpacing, sizeof(m_aTextArtRec.nTextExtraSpacing));
@@ -1512,12 +1459,6 @@ void LwpDrawBitmap::Read()
}
m_pStream->Read(pPicData, nDIBRemaining);
-
-/* FILE* pStream;
- pStream = fopen( "drawing_test.bmp", "w+" );
- fwrite(m_pImageData, sizeof(sal_uInt8), m_aBmpRec.nFileSize, pStream);
- fclose( pStream );
-*/
}
rtl::OUString LwpDrawBitmap::RegisterStyle()
commit 829b0ba7d15fd06935392d75ff71f4e8f6a27b07
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:11:52 2011 +0100
cppcheck: remove unused variable TextSizeIsCellHeight.
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index e237310..ab66c20 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1037,12 +1037,8 @@ void LwpDrawTextBox::Read()
m_pStream->Read(&m_aTextRec.nTextSize, sizeof(m_aTextRec.nTextSize));
- bool TextSizeIsCellHeight = true;
if (m_aTextRec.nTextSize < 0)
- {
- TextSizeIsCellHeight = false;
m_aTextRec.nTextSize = -m_aTextRec.nTextSize;
- }
//color
m_pStream->Read(&m_aTextRec.aTextColor.nR, 1);
@@ -1287,12 +1283,9 @@ void LwpDrawTextArt::Read()
m_pStream->SeekRel(1);// PitchAndFamily
m_pStream->Read(&m_aTextArtRec.nTextSize, sizeof(m_aTextArtRec.nTextSize));
- bool TextSizeIsCellHeight = true;
+
if (m_aTextArtRec.nTextSize < 0)
- {
- TextSizeIsCellHeight = false;
m_aTextArtRec.nTextSize = -m_aTextArtRec.nTextSize;
- }
m_pStream->Read(&m_aTextArtRec.nTextAttrs, sizeof(m_aTextArtRec.nTextAttrs));
m_pStream->Read(&m_aTextArtRec.nTextCharacterSet, sizeof(m_aTextArtRec.nTextCharacterSet));
commit 7c77d0c2aafe3b9ff732f75fba40ed0dd987021b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:05:56 2011 +0100
cppcheck: remove unused variable lLen.
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 0525dc0..a75257b 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -293,8 +293,6 @@ void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString& rBuffer)
aOpt.SetCharSet( RTL_TEXTENCODING_UNICODE );
xWrt->SetAsciiOptions( aOpt );
xWrt->bUCS2_WithStartChar = FALSE;
-
- long lLen;
}
}
commit 67b2050109057743324300add4f45f7e7a8d52a9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 21:52:42 2011 +0100
Remove DBGTXT.
diff --git a/binfilter/bf_sw/source/core/text/porlin.hxx b/binfilter/bf_sw/source/core/text/porlin.hxx
index b448b4c..afd2aba 100644
--- a/binfilter/bf_sw/source/core/text/porlin.hxx
+++ b/binfilter/bf_sw/source/core/text/porlin.hxx
@@ -231,14 +231,7 @@ inline void SwLinePortion::Truncate()
//$ ostream
-#ifdef DBGTXT
-#define CLASSIO( class ) \
- inline SvStream &operator<<( SvStream &rOs, const class &rClass ) {\
- return rClass.operator<<( rOs );\
- }
-#else
#define CLASSIO( class )
-#endif
CLASSIO( SwLinePortion )
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index b572253..39e349c 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -699,12 +699,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst )
/*N*/ {
-/*N*/ #ifdef DBGTXT
-/*N*/ // Es gibt tatsaechlich einen Sonderfall, in dem ein SetOfst(0)
-/*N*/ // zulaessig ist: bug 3496
-/*N*/ ASSERT( nNewOfst, "!SwTxtFrm::SetOfst: missing JoinFrm()." );
-/*N*/ #endif
-/*N*/
/*N*/ // Die Invalidierung unseres Follows ist nicht noetig.
/*N*/ // Wir sind ein Follow, werden gleich formatiert und
/*N*/ // rufen von dort aus das SetOfst() !
@@ -1598,9 +1592,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ sal_uInt8 nGo = 0;
/*N*/ while( bGoOn )
/*N*/ {
-/*N*/ #ifdef DBGTXT
-/*N*/ aDbstream << "OnceMore!" << endl;
-/*N*/ #endif
/*N*/ ++nGo;
/*N*/ rInf.Init();
/*N*/ rLine.Top();
diff --git a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
index d8cf99f..8992fd6 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
@@ -60,15 +60,6 @@ namespace binfilter {
/*N*/ void SwTxtIter::CtorInit( SwTxtFrm *pNewFrm, SwTxtInfo *pNewInf )
/*N*/ {
-/*N*/ #ifdef DBGTXT
-/*N*/ // nStopAt laesst sich vom CV bearbeiten.
-/*N*/ static MSHORT nStopAt = 0;
-/*N*/ if( nStopAt == pNewFrm->GetFrmId() )
-/*N*/ {
-/*N*/ int i = pNewFrm->GetFrmId();
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ SwTxtNode *pNode = pNewFrm->GetTxtNode();
/*N*/
/*N*/ ASSERT( pNewFrm->GetPara(), "No paragraph" );
commit d15e6459f01d6299fc9a5cef04823daa9d6fc854
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 21:52:26 2011 +0100
Remove double line spacing and a comment.
diff --git a/lotuswordpro/source/filter/lwpusewhen.hxx b/lotuswordpro/source/filter/lwpusewhen.hxx
index 39a6ae4..25fcd30 100644
--- a/lotuswordpro/source/filter/lwpusewhen.hxx
+++ b/lotuswordpro/source/filter/lwpusewhen.hxx
@@ -57,10 +57,6 @@
* @file
* For LWP filter architecture prototype
************************************************************************/
-/*************************************************************************
- * Change History
- Jan 2005 Created
- ************************************************************************/
#ifndef _LWPUSEWHEN_HXX
#define _LWPUSEWHEN_HXX
@@ -97,21 +93,14 @@ public:
inline void Read(LwpObjectStream* pStrm);
inline sal_Bool IsUseOnAllPages();
-
inline sal_Bool IsUseOnAllEvenPages();
-
inline sal_Bool IsUseOnAllOddPages();
-
inline sal_Bool IsUseOnPage();
inline sal_Bool IsStartOnThisPage();
-
inline sal_Bool IsStartOnNextPage();
-
inline sal_Bool IsStartOnNextEvenPage();
-
inline sal_Bool IsStartOnNextOddPage();
-
inline sal_Bool IsStartOnThisHF();
inline sal_uInt16 GetUsePage();
More information about the Libreoffice-commits
mailing list