From 42deae1e9d3ea0ed4ff5d1423c786d15ebcebfea Mon Sep 17 00:00:00 2001
From: Alexander Wilms <f.alexander.wilms@gmail.com>
Date: Sun, 9 Feb 2014 01:04:08 +0100
Subject: Translate German comments and remove superfluous ones as well as
visual noise
Conflicts:
sc/source/ui/view/select.cxx
sc/source/ui/view/viewdata.cxx
sw/source/core/text/redlnitr.cxx
sw/source/core/text/txtfrm.cxx
sw/source/core/text/txtftn.cxx
sw/source/ui/table/tabledlg.cxx
Change-Id: I23371b913514d656552bc6f7fb4ba554ee6a3694
---
chart2/source/controller/main/ElementSelector.cxx | 4 +-
sc/source/ui/view/pivotsh.cxx | 12 --
sc/source/ui/view/select.cxx | 31 +---
sc/source/ui/view/viewdata.cxx | 72 ++++----
sw/source/core/edit/ednumber.cxx | 2 +-
sw/source/core/text/blink.cxx | 1 -
sw/source/core/text/guess.cxx | 5 -
sw/source/core/text/itratr.cxx | 94 +++-------
sw/source/core/text/itratr.hxx | 4 -
sw/source/core/text/itrpaint.cxx | 48 ++---
sw/source/core/text/noteurl.cxx | 3 -
sw/source/core/text/porlay.hxx | 22 +--
sw/source/core/text/redlnitr.cxx | 55 +++---
sw/source/core/text/txtdrop.cxx | 111 +++--------
sw/source/core/text/txtfrm.cxx | 144 +++------------
sw/source/core/text/txtftn.cxx | 135 +-------------
sw/source/filter/writer/writer.cxx | 36 ++--
sw/source/filter/writer/wrt_fn.cxx | 3 +-
sw/source/filter/ww1/fltshell.cxx | 122 +++++-------
sw/source/filter/ww1/w1class.cxx | 64 ++++---
sw/source/filter/ww1/w1class.hxx | 185 ++++++-------------
sw/source/filter/ww1/w1filter.cxx | 214 ++++++++++------------
sw/source/filter/ww1/w1par.cxx | 22 +--
sw/source/filter/ww1/w1sprm.cxx | 13 +-
sw/source/filter/ww1/w1struct.hxx | 22 +--
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 38 +---
sw/source/filter/xml/XMLRedlineImportHelper.hxx | 69 ++++---
sw/source/filter/xml/swxml.cxx | 5 +-
sw/source/filter/xml/wrtxml.cxx | 7 -
sw/source/filter/xml/wrtxml.hxx | 18 +-
sw/source/filter/xml/xmlbrsh.cxx | 1 -
sw/source/filter/xml/xmlbrshe.hxx | 2 -
sw/source/filter/xml/xmlbrshi.hxx | 1 -
sw/source/filter/xml/xmlexp.cxx | 1 -
sw/source/filter/xml/xmlexp.hxx | 1 -
sw/source/filter/xml/xmlexpit.cxx | 3 +-
sw/source/filter/xml/xmlfmt.cxx | 11 --
sw/source/filter/xml/xmlfmte.cxx | 2 -
sw/source/filter/xml/xmlfonte.cxx | 5 -
sw/source/filter/xml/xmlimp.cxx | 17 --
sw/source/filter/xml/xmlimpit.cxx | 7 +-
sw/source/filter/xml/xmlitem.cxx | 1 -
sw/source/filter/xml/xmlitem.hxx | 1 -
sw/source/filter/xml/xmliteme.cxx | 4 -
sw/source/filter/xml/xmlitemi.cxx | 5 -
sw/source/filter/xml/xmlithlp.cxx | 3 -
sw/source/filter/xml/xmlithlp.hxx | 4 -
sw/source/filter/xml/xmlitmap.hxx | 7 -
sw/source/filter/xml/xmlitmpr.cxx | 1 -
sw/source/filter/xml/xmlmeta.cxx | 6 -
sw/source/filter/xml/xmlscript.cxx | 2 -
sw/source/filter/xml/xmltble.cxx | 10 +-
sw/source/filter/xml/xmltbli.cxx | 34 +---
sw/source/filter/xml/xmltbli.hxx | 2 -
sw/source/filter/xml/xmltext.cxx | 3 -
sw/source/filter/xml/xmltexte.cxx | 2 -
sw/source/filter/xml/xmltexti.cxx | 5 -
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 104 +++++------
sw/source/ui/dialog/ascfldlg.cxx | 6 +-
sw/source/ui/dialog/docstdlg.cxx | 17 +-
sw/source/ui/misc/titlepage.cxx | 4 +-
sw/source/ui/table/chartins.cxx | 9 +-
sw/source/ui/table/colwd.cxx | 8 -
sw/source/ui/table/convert.cxx | 2 -
sw/source/ui/table/rowht.cxx | 4 -
sw/source/ui/table/swtablerep.cxx | 4 +-
sw/source/ui/table/tabledlg.cxx | 63 +++----
sw/source/ui/table/tablemgr.cxx | 23 +--
sw/source/ui/table/tablepg.hxx | 5 +-
69 files changed, 582 insertions(+), 1369 deletions(-)
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index fba6fb468a18..bb2459a58642 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -111,7 +111,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
Reference< lang::XMultiServiceFactory > xFact( xChartController->getModel(), uno::UNO_QUERY );
if( xFact.is() )
xChartView = xFact->createInstance( CHART_VIEW_SERVICE_NAME );
- ExplicitValueProvider* pExplicitValueProvider = 0;//ExplicitValueProvider::getExplicitValueProvider(xChartView); dies erzeugt alle sichtbaren datenpinkte, das ist zu viel
+ ExplicitValueProvider* pExplicitValueProvider = 0; //ExplicitValueProvider::getExplicitValueProvider(xChartView); this creates all visible data points, that's too much
ObjectHierarchy aHierarchy( xChartDoc, pExplicitValueProvider, true /*bFlattenDiagram*/, true /*bOrderingForElementSelector*/ );
lcl_addObjectsToList( aHierarchy, aHierarchy.getRootNodeOID(), m_aEntries, 0, xChartDoc );
@@ -168,7 +168,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
nEntryCount = 100;
SetDropDownLineCount( nEntryCount );
}
- SaveValue();//remind current selection pos
+ SaveValue(); //remind current selection pos
}
void SelectorListBox::ReleaseFocus_Impl()
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index d9d3602664cc..8782062421e7 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -38,13 +38,10 @@
#include "dbdocfun.hxx"
#include "uiitems.hxx"
#include "scabstdlg.hxx"
-//------------------------------------------------------------------------
#define ScPivotShell
#include "scslots.hxx"
-//------------------------------------------------------------------------
-
TYPEINIT1( ScPivotShell, SfxShell );
SFX_IMPL_INTERFACE(ScPivotShell, SfxShell, ScResId(SCSTR_PIVOTSHELL))
@@ -52,9 +49,6 @@ SFX_IMPL_INTERFACE(ScPivotShell, SfxShell, ScResId(SCSTR_PIVOTSHELL))
SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_PIVOT) );
}
-
-//------------------------------------------------------------------------
-
ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
SfxShell(pViewSh),
pViewShell( pViewSh )
@@ -72,12 +66,10 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Pivot));
}
-//------------------------------------------------------------------------
ScPivotShell::~ScPivotShell()
{
}
-//------------------------------------------------------------------------
void ScPivotShell::Execute( SfxRequest& rReq )
{
switch ( rReq.GetSlot() )
@@ -140,7 +132,6 @@ void ScPivotShell::Execute( SfxRequest& rReq )
}
}
-//------------------------------------------------------------------------
void ScPivotShell::GetState( SfxItemSet& rSet )
{
ScDocShell* pDocSh = pViewShell->GetViewData()->GetDocShell();
@@ -175,9 +166,6 @@ void ScPivotShell::GetState( SfxItemSet& rSet )
}
}
-
-//------------------------------------------------------------------------
-
ScDPObject* ScPivotShell::GetCurrDPObject()
{
const ScViewData& rViewData = *pViewShell->GetViewData();
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 616c0e8f4a97..1b4b8ad38388 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -46,10 +46,7 @@ static bool bDidSwitch = false;
// -----------------------------------------------------------------------
-//
-// View (Gridwin / keyboard)
-//
-
+// View (Gridwin / keyboard)
ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) :
pViewData( pNewViewData ),
pEngine( NULL ),
@@ -149,8 +146,7 @@ void ScViewFunctionSet::SetSelectionEngine( ScViewSelectionEngine* pSelEngine )
pEngine = pSelEngine;
}
-// Drag & Drop
-
+// Drag & Drop
void ScViewFunctionSet::BeginDrag()
{
SCTAB nTab = pViewData->GetTabNo();
@@ -223,8 +219,7 @@ void ScViewFunctionSet::BeginDrag()
}
-// Selection
-
+// Selection
void ScViewFunctionSet::CreateAnchor()
{
if (bAnchor) return;
@@ -257,10 +252,10 @@ void ScViewFunctionSet::SetAnchor( SCCOL nPosX, SCROW nPosY )
}
else
{
- // nicht weg und gleich wieder hin
+ // don't go there and back again
if ( bStarted && pView->IsMarking( nPosX, nPosY, nTab ) )
{
- // nix
+ // don't do anything
}
else
{
@@ -318,7 +313,6 @@ bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool /*
aEffPos.Y() = -1;
// Scrolling
-
Size aWinSize = pEngine->GetWindow()->GetOutputSizePixel();
bool bRightScroll = ( aEffPos.X() >= aWinSize.Width() );
bool bLeftScroll = ( aEffPos.X() < 0 );
@@ -354,7 +348,6 @@ bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool /*
}
// moved out of fix limit?
-
ScSplitPos eWhich = GetWhich();
if ( eWhich == pViewData->GetActivePart() )
{
@@ -737,8 +730,6 @@ void ScViewFunctionSet::DeselectAll()
bAnchor = false;
}
-//------------------------------------------------------------------------
-
ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
ScSplitPos eSplitPos ) :
SelectionEngine( pWindow, pView->GetFunctionSet() ),
@@ -748,13 +739,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
EnableDrag( true );
}
-
-//------------------------------------------------------------------------
-
-//
-// column and row headers
-//
-
+// column and row headers
ScHeaderFunctionSet::ScHeaderFunctionSet( ScViewData* pNewViewData ) :
pViewData( pNewViewData ),
bColumn( false ),
@@ -818,7 +803,6 @@ bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool /
}
// Scrolling
-
Size aWinSize = pViewData->GetActiveWin()->GetOutputSizePixel();
bool bScroll;
if (bColumn)
@@ -827,7 +811,6 @@ bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool /
bScroll = ( rPointPixel.Y() < 0 || rPointPixel.Y() >= aWinSize.Height() );
// moved out of fix limit?
-
bool bSwitched = false;
if ( bColumn )
{
@@ -931,8 +914,6 @@ void ScHeaderFunctionSet::DeselectAll()
bAnchor = false;
}
-//------------------------------------------------------------------------
-
ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ) :
SelectionEngine( pWindow, pFuncSet )
{
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 7b764c362af9..de4070b4f4d6 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -71,8 +71,8 @@ using namespace com::sun::star;
#define TAG_TABBARWIDTH "tw:"
-static bool bMoveArea = false; //! Member?
-sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT; //! Member !!!
+static bool bMoveArea = false; // Member?
+sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT; // Member!
ScViewDataTable::ScViewDataTable() :
eZoomType( SVX_ZOOM_PERCENT ),
@@ -309,13 +309,13 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
nPasteFlags ( SC_PASTE_NONE ),
eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
nFillMode ( SC_FILL_NONE ),
- bActive ( true ), //! wie initialisieren?
+ bActive ( true ), // how to initialize?
bIsRefMode ( false ),
bDelMarkValid( false ),
bPagebreak ( false ),
bSelCtrlMouseClick( false )
{
- mpMarkData->SelectOneTable(0); // Sync with nTabNo.
+ mpMarkData->SelectOneTable(0); // Sync with nTabNo
SetGridMode ( true );
SetSyntaxMode ( false );
@@ -345,7 +345,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
*pOptions = pDoc->GetViewOptions();
}
- // keine ausgeblendete Tabelle anzeigen:
+ // don't show hidden tables
if (pDoc && !pDoc->IsVisible(nTabNo))
{
while ( !pDoc->IsVisible(nTabNo) && pDoc->HasTable(nTabNo+1) )
@@ -377,10 +377,10 @@ ScViewData::ScViewData( const ScViewData& rViewData ) :
aDefPageZoomY( rViewData.aDefPageZoomY ),
eRefType ( SC_REFTYPE_NONE ),
nTabNo ( rViewData.nTabNo ),
- nRefTabNo ( rViewData.nTabNo ), // kein RefMode
+ nRefTabNo ( rViewData.nTabNo ), // no RefMode
eEditActivePart( rViewData.eEditActivePart ),
nFillMode ( SC_FILL_NONE ),
- bActive ( true ), //! wie initialisieren?
+ bActive ( true ), // how to initialize?
bIsRefMode ( false ),
bDelMarkValid( false ),
bPagebreak ( rViewData.bPagebreak ),
@@ -500,7 +500,7 @@ void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab )
{
if (nDestTab==SC_TAB_APPEND)
- nDestTab = pDoc->GetTableCount() - 1; // am Doc muss vorher kopiert worden sein
+ nDestTab = pDoc->GetTableCount() - 1; // something had to have been copied
if (nDestTab > MAXTAB)
{
@@ -543,7 +543,7 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
UpdateCurrentTab();
mpMarkData->DeleteTab( nSrcTab );
- mpMarkData->InsertTab( nDestTab ); // ggf. angepasst
+ mpMarkData->InsertTab( nDestTab ); // adapted if needed
}
void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
@@ -902,8 +902,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
bool bWasThere = false;
if (pEditView[eWhich])
{
- // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert
-
+ // if the view is already therem don't call anything that changes the cursor position
if (bEditActive[eWhich])
bWasThere = true;
else
@@ -1061,8 +1060,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
pEditView[eWhich]->Scroll( 0, aOutputArea.Top() - aDocPos.Y() );
}
- // hier muss bEditActive schon gesetzt sein
- // (wegen Map-Mode bei Paint)
+ // here bEditActive needs to be set already
+ // (due to Map-Mode during Paint)
if (!bWasThere)
pNewEngine->InsertView(pEditView[eWhich]);
@@ -1076,7 +1075,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
}
pEditView[eWhich]->SetBackgroundColor( aBackCol );
- pEditView[eWhich]->Invalidate(); // needed ??
+ pEditView[eWhich]->Invalidate(); // needed?
// needed, wenn position changed
}
@@ -1782,7 +1781,7 @@ bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
}
}
- if (bNextIfLarge) // zu grosse Zellen ?
+ if (bNextIfLarge) // cells to big?
{
if ( rPosX == nStartPosX && nClickX > 0 )
{
@@ -1807,8 +1806,7 @@ bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
if (bTestMerge)
{
- //! public Methode um Position anzupassen
-
+ // public method to adapt position
SCCOL nOrigX = rPosX;
SCROW nOrigY = rPosY;
pDoc->SkipOverlapped(rPosX, rPosY, nTabNo);
@@ -1925,7 +1923,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY )
pThisTab->nPosY[eWhich] = 0;
}
-void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen
+void ScViewData::RecalcPixPos() // after zoom changes
{
for (sal_uInt16 eWhich=0; eWhich<2; eWhich++)
{
@@ -2045,7 +2043,7 @@ void ScViewData::SetScreen( const Rectangle& rVisArea )
{
SetScreenPos( rVisArea.TopLeft() );
- // hier ohne GetOutputFactor(), weil fuer Ausgabe in Metafile
+ // here without GetOutputFactor(), since it's for the output into a Metafile
aScrSize = rVisArea.GetSize();
aScrSize.Width() = (long)
@@ -2200,13 +2198,13 @@ void ScViewData::WriteUserData(OUString& rData)
rData += ";"; // Numerierung darf auf keinen Fall durcheinanderkommen
if (i < static_cast<SCTAB>(maTabData.size()) && maTabData[i])
{
- OUString cTabSep = OUString(SC_OLD_TABSEP); // wie 3.1
+ OUString cTabSep = OUString(SC_OLD_TABSEP); // like 3.1
if ( maTabData[i]->nCurY > MAXROW_30 ||
maTabData[i]->nPosY[0] > MAXROW_30 || maTabData[i]->nPosY[1] > MAXROW_30 ||
( maTabData[i]->eVSplitMode == SC_SPLIT_FIX &&
maTabData[i]->nFixPosY > MAXROW_30 ) )
{
- cTabSep = OUString(SC_NEW_TABSEP); // um eine 3.1-Version nicht umzubringen
+ cTabSep = OUString(SC_NEW_TABSEP); // in order to not kill a 3.1-version
}
@@ -2235,8 +2233,8 @@ void ScViewData::WriteUserData(OUString& rData)
void ScViewData::ReadUserData(const OUString& rData)
{
- if (rData.isEmpty()) // Leerer String kommt bei "neu Laden"
- return; // dann auch ohne Assertion beenden
+ if (rData.isEmpty()) // Leerer String kommt bei "neu Laden"
+ return; // then exit without assertion
sal_Int32 nCount = comphelper::string::getTokenCount(rData, ';');
if ( nCount <= 2 )
@@ -2250,29 +2248,25 @@ void ScViewData::ReadUserData(const OUString& rData)
// nicht pro Tabelle:
SCTAB nTabStart = 2;
- Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?)
+ Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; // evaluate (all sheets?)
OUString aZoomStr = rData.getToken(0, ';'); // Zoom/PageZoom/Modus
sal_uInt16 nNormZoom = sal::static_int_cast<sal_uInt16>(aZoomStr.getToken(0,'/').toInt32());
if ( nNormZoom >= MINZOOM && nNormZoom <= MAXZOOM )
- aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer)
+ aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normal" zoom (always)
sal_uInt16 nPageZoom = sal::static_int_cast<sal_uInt16>(aZoomStr.getToken(1,'/').toInt32());
if ( nPageZoom >= MINZOOM && nPageZoom <= MAXZOOM )
- aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt
- sal_Unicode cMode = aZoomStr.getToken(2,'/')[0]; // 0 oder "0"/"1"
+ aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-zoom, if set
+ sal_Unicode cMode = aZoomStr.getToken(2,'/')[0]; // 0 or "0"/"1"
SetPagebreakMode( cMode == '1' );
// SetPagebreakMode muss immer gerufen werden wegen CalcPPT / RecalcPixPos()
- //
// Tabelle kann ungueltig geworden sein (z.B. letzte Version):
- //
SCTAB nNewTab = static_cast<SCTAB>(rData.getToken(1, ';').toInt32());
if (pDoc->HasTable( nNewTab ))
SetTabNo(nNewTab);
- //
// wenn vorhanden, TabBar-Breite holen:
- //
OUString aTabOpt = rData.getToken(2, ';');
if (aTabOpt.startsWith(TAG_TABBARWIDTH))
@@ -2282,7 +2276,7 @@ void ScViewData::ReadUserData(const OUString& rData)
nTabStart = 3;
}
- // pro Tabelle:
+ // per table
SCTAB nPos = 0;
while ( nCount > nPos+nTabStart )
{
@@ -2882,7 +2876,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
void ScViewData::SetOptions( const ScViewOptions& rOpt )
{
- // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized...
+ // if visibility of horizontal ScrollBar is changed, TabBar may have to be resized...
bool bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) );
// if graphics are turned on or off, animation has to be started or stopped
@@ -2916,10 +2910,10 @@ bool ScViewData::IsOle()
return pDocShell && pDocShell->IsOle();
}
-bool ScViewData::UpdateFixX( SCTAB nTab ) // true = Wert geaendert
+bool ScViewData::UpdateFixX( SCTAB nTab ) // true = value changed
{
if (!ValidTab(nTab)) // Default
- nTab=nTabNo; // akuelle Tabelle
+ nTab=nTabNo; // current table
if (!pView || maTabData[nTab]->eHSplitMode != SC_SPLIT_FIX)
return false;
@@ -2944,17 +2938,17 @@ bool ScViewData::UpdateFixX( SCTAB nTab ) // true = Wert geaendert
{
maTabData[nTab]->nHSplitPos = nNewPos;
if (nTab == nTabNo)
- RecalcPixPos(); //! sollte nicht noetig sein !!!
+ RecalcPixPos(); // should not be needed
return true;
}
return false;
}
-bool ScViewData::UpdateFixY( SCTAB nTab ) // true = Wert geaendert
+bool ScViewData::UpdateFixY( SCTAB nTab ) // true = value changed
{
if (!ValidTab(nTab)) // Default
- nTab=nTabNo; // akuelle Tabelle
+ nTab=nTabNo; // current table
if (!pView || maTabData[nTab]->eVSplitMode != SC_SPLIT_FIX)
return false;
@@ -2979,7 +2973,7 @@ bool ScViewData::UpdateFixY( SCTAB nTab ) // true = Wert geaendert
{
maTabData[nTab]->nVSplitPos = nNewPos;
if (nTab == nTabNo)
- RecalcPixPos(); //! sollte nicht noetig sein !!!
+ RecalcPixPos(); // should not be needed
return true;
}
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 515146291b68..da1f030e14f2 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -271,7 +271,7 @@ sal_Bool SwEditShell::HasBullet() const
}
// <- #i29560#
-/// delete, split list
+// delete, split list
void SwEditShell::DelNumRules()
{
StartAllAction();
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index ffb6fe73183c..3b3e6aceec48 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -177,5 +177,4 @@ void SwBlink::FrmDelete( const SwRootFrm* pRoot )
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 75249436b3fc..f911e6a4e94b 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -526,13 +526,8 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
return false;
}
-/*************************************************************************
- * SwTxtGuess::AlternativeSpelling
- *************************************************************************/
-
// returns true if word at position nPos has a diffenrent spelling
// if hyphenated at this position (old german spelling)
-
bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
const sal_Int32 nPos )
{
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 53e0d0ae8881..9cf80527d9f0 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -57,10 +57,6 @@
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star;
-/*************************************************************************
- * SwAttrIter::Chg()
- *************************************************************************/
-
void SwAttrIter::Chg( SwTxtAttr *pHt )
{
OSL_ENSURE( pHt && pFnt, "No attribute of font available for change");
@@ -71,10 +67,6 @@ void SwAttrIter::Chg( SwTxtAttr *pHt )
nChgCnt++;
}
-/*************************************************************************
- * SwAttrIter::Rst()
- *************************************************************************/
-
void SwAttrIter::Rst( SwTxtAttr *pHt )
{
OSL_ENSURE( pHt && pFnt, "No attribute of font available for reset");
@@ -86,10 +78,6 @@ void SwAttrIter::Rst( SwTxtAttr *pHt )
nChgCnt--;
}
-/*************************************************************************
- * virtual SwAttrIter::~SwAttrIter()
- *************************************************************************/
-
SwAttrIter::~SwAttrIter()
{
delete pRedln;
@@ -116,10 +104,6 @@ SwTxtAttr *SwAttrIter::GetAttr( const sal_Int32 nPosition ) const
return (m_pTxtNode) ? m_pTxtNode->GetTxtAttrForCharAt(nPosition) : 0;
}
-/*************************************************************************
- * SwAttrIter::SeekAndChg()
- *************************************************************************/
-
bool SwAttrIter::SeekAndChgAttrIter( const sal_Int32 nNewPos, OutputDevice* pOut )
{
bool bChg = nStartIndex && nNewPos == nPos ? pFnt->IsFntChg() : Seek( nNewPos );
@@ -131,8 +115,7 @@ bool SwAttrIter::SeekAndChgAttrIter( const sal_Int32 nNewPos, OutputDevice* pOut
}
if( bChg )
{
- // wenn der Aenderungszaehler auf Null ist, kennen wir die MagicNo
- // des gewuenschten Fonts ...
+ // if the change counter is zero, we know the MagicNo of the wanted font
if ( !nChgCnt && !nPropFont )
pFnt->SetMagic( aMagicNo[ pFnt->GetActual() ],
aFntIdx[ pFnt->GetActual() ], pFnt->GetActual() );
@@ -151,10 +134,6 @@ bool SwAttrIter::IsSymbol( const sal_Int32 nNewPos )
return pFnt->IsSymbol( pShell );
}
-/*************************************************************************
- * SwAttrIter::SeekStartAndChg()
- *************************************************************************/
-
bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFont )
{
if ( pRedln && pRedln->ExtOn() )
@@ -179,12 +158,11 @@ bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFo
if ( pHints && !bParaFont )
{
SwTxtAttr *pTxtAttr;
- // Solange wir noch nicht am Ende des StartArrays angekommen sind &&
- // das TextAttribut an Position 0 beginnt ...
+ // While we've not reached the end of the StartArray && the TextAttribute starts at position 0...
while ( ( nStartIndex < pHints->GetStartCount() ) &&
!(*(pTxtAttr=pHints->GetStart(nStartIndex))->GetStart()) )
{
- // oeffne die TextAttribute
+ // open the TextAttributes
Chg( pTxtAttr );
nStartIndex++;
}
@@ -199,8 +177,7 @@ bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFo
}
if( bChg )
{
- // wenn der Aenderungszaehler auf Null ist, kennen wir die MagicNo
- // des gewuenschten Fonts ...
+ // if the application counter is zero, we know the MagicNo of the wanted font
if ( !nChgCnt && !nPropFont )
pFnt->SetMagic( aMagicNo[ pFnt->GetActual() ],
aFntIdx[ pFnt->GetActual() ], pFnt->GetActual() );
@@ -209,12 +186,7 @@ bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFo
return bChg;
}
-/*************************************************************************
- * SwAttrIter::SeekFwd()
- *************************************************************************/
-
-// AMA: Neuer AttrIter Nov 94
-
+// AMA: New AttrIter Nov 94
void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
{
SwTxtAttr *pTxtAttr;
@@ -234,7 +206,7 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
nEndIndex++;
}
}
- else // ueberlies die nicht geoeffneten Enden
+ else // skip the not opended ends
{
while ( (nEndIndex < pHints->GetEndCount()) &&
(*pHints->GetEnd(nEndIndex)->GetAnyEnd() <= nNewPos) )
@@ -248,17 +220,13 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
(*(pTxtAttr=pHints->GetStart(nStartIndex))->GetStart()<=nNewPos))
{
- // oeffne die TextAttribute, deren Ende hinter der neuen Position liegt
+ // open the TextAttributes, whose ends lie behind the new position
if ( *pTxtAttr->GetAnyEnd() > nNewPos ) Chg( pTxtAttr );
nStartIndex++;
}
}
-/*************************************************************************
- * SwAttrIter::Seek()
- *************************************************************************/
-
bool SwAttrIter::Seek( const sal_Int32 nNewPos )
{
if ( pRedln && pRedln->ExtOn() )
@@ -280,7 +248,7 @@ bool SwAttrIter::Seek( const sal_Int32 nNewPos )
nStartIndex = nEndIndex = nPos = 0;
nChgCnt = 0;
- // Achtung!
+ // Attention!
// resetting the font here makes it necessary to apply any
// changes for extended input directly to the font
if ( pRedln && pRedln->ExtOn() )
@@ -304,10 +272,6 @@ bool SwAttrIter::Seek( const sal_Int32 nNewPos )
return pFnt->IsFntChg();
}
-/*************************************************************************
- * SwAttrIter::GetNextAttr()
- *************************************************************************/
-
sal_Int32 SwAttrIter::GetNextAttr( ) const
{
sal_Int32 nNext = COMPLETE_STRING;
@@ -336,7 +300,7 @@ sal_Int32 SwAttrIter::GetNextAttr( ) const
}
}
if (m_pTxtNode!=NULL) {
- //TODO maybe use hints like FieldHints for this instead of looking at the text...
+ // TODO maybe use hints like FieldHints for this instead of looking at the text...
const sal_Int32 l = nNext<m_pTxtNode->Len() ? nNext : m_pTxtNode->Len();
sal_Int32 p=nPos;
while (p<l && m_pTxtNode->GetTxt()[p] != CH_TXT_ATR_FIELDSTART
@@ -440,13 +404,13 @@ bool SwTxtNode::IsSymbol( const sal_Int32 nBegin ) const
class SwMinMaxNodeArgs
{
public:
- sal_uLong nMaxWidth; // Summe aller Rahmenbreite
- long nMinWidth; // Breitester Rahmen
- long nLeftRest; // noch nicht von Rahmen ueberdeckter Platz im l. Rand
- long nRightRest; // noch nicht von Rahmen ueberdeckter Platz im r. Rand
- long nLeftDiff; // Min/Max-Differenz des Rahmens im linken Rand
- long nRightDiff; // Min/Max-Differenz des Rahmens im rechten Rand
- sal_uLong nIndx; // Indexnummer des Nodes
+ sal_uLong nMaxWidth; // sum of all frame widths
+ long nMinWidth; // biggest frame
+ long nLeftRest; // space not already covered by frames in the left margin
+ long nRightRest; // space not already covered by frames in the right margin
+ long nLeftDiff; // Min/Max-difference of the frame in the left margin
+ long nRightDiff; // Min/Max-difference of the frame in the right margin
+ sal_uLong nIndx; // index of the node
void Minimum( long nNew ) { if( nNew > nMinWidth ) nMinWidth = nNew; }
};
@@ -476,7 +440,7 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn )
MSHORT nWhich = pNd->Which();
if( RES_DRAWFRMFMT != nWhich )
{
- // Enthaelt der Rahmen zu Beginn oder am Ende eine Tabelle?
+ // Does the frame contain a table at the start or the end?
const SwNodes& rNodes = pNd->GetDoc()->GetNodes();
const SwFmtCntnt& rFlyCntnt = pNd->GetCntnt();
sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
@@ -535,10 +499,9 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn )
return;
}
- // Rahmen, die recht bzw. links ausgerichtet sind, gehen nur
- // teilweise in die Max-Berechnung ein, da der Rand schon berueck-
- // sichtigt wird. Nur wenn die Rahmen in den Textkoerper ragen,
- // wird dieser Teil hinzuaddiert.
+ // Frames, which are left- or right-aligned are only party considered
+ // when calculating the maximum, since the border is already being considered.
+ // Only if the frame extends into the text body, this part is being added
switch( eHoriOri )
{
case text::HoriOrientation::RIGHT:
@@ -605,8 +568,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
const SvxLRSpaceItem &rSpace = GetSwAttrSet().GetLRSpace();
long nLROffset = rSpace.GetTxtLeft() + GetLeftMarginWithNum( true );
short nFLOffs;
- // Bei Numerierung ist ein neg. Erstzeileneinzug vermutlich
- // bereits gefuellt...
+ // For enumerations a negative first line indentation is probably filled already
if( !GetFirstLineOfsWithNum( nFLOffs ) || nFLOffs > nLROffset )
nLROffset = nFLOffs;
@@ -737,13 +699,13 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
&& rTmpSize.GetWidthPercent() )
{
/*-----------------------------------------------------------------------------
- * Hier ein HACK fuer folgende Situation: In dem Absatz befindet sich
- * ein Textrahmen mit relativer Groesse. Dann nehmen wir mal als minimale
- * Breite 0,5 cm und als maximale KSHRT_MAX.
- * Sauberer und vielleicht spaeter notwendig waere es, ueber den Inhalt
- * des Textrahmens zu iterieren und GetMinMaxSize rekursiv zu rufen.
+ * This is a hack for the wollowing situation: In the paragraph there's a
+ * text frame with relative size. Then let's take 0.5 cm as minimum width
+ * and KSHRT_MAX as maximum width
+ * It were cleaner and maybe neccessary later on to iterate over the content
+ * of the text frame and call GetMinMaxSize recursively
* --------------------------------------------------------------------------*/
- nAktWidth = FLYINCNT_MIN_WIDTH; // 0,5 cm
+ nAktWidth = FLYINCNT_MIN_WIDTH; // 0.5 cm
if( (long)rMax < KSHRT_MAX )
rMax = KSHRT_MAX;
}
@@ -832,7 +794,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
pOut = &pSh->GetRefDev();
else
{
- //Zugriff ueber StarONE, es muss keine Shell existieren oder aktiv sein.
+ // Access via StarONE, there's no need for an existing or active shell
if ( getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE) )
pOut = GetpApp()->GetDefaultDevice();
else
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 3edc31f45c0b..7b18a8afeddd 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -35,10 +35,6 @@ class SwRedlineItr;
class SwViewShell;
class SwTxtFrm;
-/*************************************************************************
- * class SwAttrIter
- *************************************************************************/
-
class SwAttrIter
{
friend class SwFontSave;
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index a96299756953..ab9a7d233edd 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -39,7 +39,6 @@
// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
-
#include "flyfrms.hxx"
#include "viewsh.hxx"
#include "itrpaint.hxx"
@@ -75,9 +74,6 @@ bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt )
SVX_CASEMAP_KAPITAELCHEN == rFnt.GetCaseMap();
}
-/*************************************************************************
- * SwTxtPainter::CtorInitTxtPainter()
- *************************************************************************/
void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewInf )
{
CtorInitTxtCursor( pNewFrm, pNewInf );
@@ -95,10 +91,6 @@ void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewIn
bPaintDrop = false;
}
-
-/*************************************************************************
- * SwTxtPainter::CalcPaintOfst()
- *************************************************************************/
SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
{
SwLinePortion *pPor = pCurr->GetFirstPortion();
@@ -166,7 +158,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
GetInfo().ResetSpaceIdx();
GetInfo().SetKanaComp( pCurr->GetpKanaComp() );
GetInfo().ResetKanaIdx();
- // Die Groesse des Frames
+ // The size of the frame
GetInfo().SetIdx( GetStart() );
GetInfo().SetPos( GetTopLeft() );
@@ -177,18 +169,18 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
SwLinePortion *pPor = bEndPor ? pCurr->GetFirstPortion() : CalcPaintOfst( rPaint );
- // Optimierung!
+ // Optimization!
const SwTwips nMaxRight = std::min( rPaint.Right(), Right() );
const SwTwips nTmpLeft = GetInfo().X();
if( !bEndPor && nTmpLeft >= nMaxRight )
return;
// DropCaps!
- // 7538: natuerlich auch auf dem Drucker
+ // 7538: of course for the printer, too
if( !bPaintDrop )
{
- // 8084: Optimierung, weniger Painten.
- // AMA: Durch 8084 wurde 7538 wiederbelebt!
+ // 8084: Optimization, less painting
+ // AMA: By 8084 7538 has been revived
// bDrawInWindow entfernt, damit DropCaps auch gedruckt werden
bPaintDrop = pPor == pCurr->GetFirstPortion()
&& GetDropLines() >= GetLineNr();
@@ -197,7 +189,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
KSHORT nTmpHeight, nTmpAscent;
CalcAscentAndHeight( nTmpAscent, nTmpHeight );
- // bClip entscheidet darueber, ob geclippt werden muss.
+ // bClip decides if there's a need to clip
// Das Ganze muss vor der Retusche stehen
bool bClip = ( bDrawInWindow || bUnderSz ) && !rClip.IsChg();
@@ -223,7 +215,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
#endif
}
- // Alignment:
+ // Alignment
OutputDevice* pOut = GetInfo().GetOut();
Point aPnt1( nTmpLeft, GetInfo().GetPos().Y() );
if ( aPnt1.X() < rPaint.Left() )
@@ -259,7 +251,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
if ( ! bAdjustBaseLine )
GetInfo().Y( nLineBaseLine );
- // 7529: PostIts prepainten
+ // 7529: Pre-paint post-its
if( GetInfo().OnWin() && pPor && !pPor->Width() )
{
SeekAndChg( GetInfo() );
@@ -280,7 +272,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
pPor->PrePaint( GetInfo(), pPor );
}
- // 7923: EndPortions geben auch Zeichen aus, deswegen den Fnt wechseln!
+ // 7923: EndPortions output chars, too, that's why we change the font
if( bEndPor )
SeekStartAndChg( GetInfo() );
@@ -327,8 +319,8 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
SeekAndChg( GetInfo() );
else if ( !bFirst && pPor->IsBreakPortion() && GetInfo().GetOpt().IsParagraph() )
{
- // Paragraphzeichen sollten den gleichen Font wie das Zeichen vor
- // haben, es sei denn, es gibt Redlining in dem Absatz.
+ // Paragraph symbols should have the same fon as the paragraph in fron of them,
+ // except for the case that there's redlining in the paragraph
if( GetRedln() )
SeekAndChg( GetInfo() );
else
@@ -337,7 +329,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
else
bSeeked = false;
-// bRest = false;
+ // bRest = false;
// Wenn das Ende der Portion hinausragt, wird geclippt.
// Es wird ein Sicherheitsabstand von Height-Halbe aufaddiert,
@@ -349,13 +341,13 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
rClip.ChgClip( rPaint, pFrm, pCurr->HasUnderscore() );
}
- // Portions, die "unter" dem Text liegen wie PostIts
+ // Portions, which lay "below" the text like post-its
SwLinePortion *pNext = pPor->GetPortion();
if( GetInfo().OnWin() && pNext && !pNext->Width() )
{
- // Fix 11289: Felder waren hier ausgeklammert wg. Last!=Owner beim
- // Laden von Brief.sdw. Jetzt sind die Felder wieder zugelassen,
- // durch bSeeked wird Last!=Owner vermieden.
+ // Fix 11289: Fields were omitted here because of Last!=Owner during
+ // loading Brief.sdw. Now the fields are allowed again,
+ // by bSeeked Last!=Owner is being avoided.
if ( !bSeeked )
SeekAndChg( GetInfo() );
pNext->PrePaint( GetInfo(), pPor );
@@ -461,7 +453,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
if( pArrow )
GetInfo().DrawRedArrow( *pArrow );
- // GetInfo().Y() must be current baseline.
+ // GetInfo().Y() must be current baseline
SwTwips nDiff = GetInfo().Y() + nTmpHeight - nTmpAscent - GetTxtFrm()->Frm().Bottom();
if( ( nDiff > 0 &&
( GetEnd() < GetInfo().GetTxt().getLength() ||
@@ -485,7 +477,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
long nAdjustBaseLine )
{
- // Check if common underline should not be continued.
+ // Check if common underline should not be continued
if ( IsUnderlineBreak( *pPor, *pFnt ) )
{
// delete underline font
@@ -496,7 +488,7 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
// If current underline matches the common underline font, we continue
// to use the common underline font.
- //Bug 120769:Color of underline display wrongly
+ // Bug 120769:Color of underline display wrongly
if ( GetInfo().GetUnderFnt() &&
GetInfo().GetUnderFnt()->GetFont().GetUnderline() == GetFnt()->GetUnderline() &&
GetInfo().GetFont() && GetInfo().GetFont()->GetUnderColor() != Color(COL_AUTO) )
@@ -566,9 +558,7 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
// check, if underlining is not isolated
if ( nIndx + GetInfo().GetLen() < nUnderEnd + 1 )
{
- //
// here starts the algorithm for calculating the underline font
- //
SwScriptInfo& rScriptInfo = GetInfo().GetParaPortion()->GetScriptInfo();
SwAttrIter aIter( *(SwTxtNode*)GetInfo().GetTxtFrm()->GetTxtNode(),
rScriptInfo );
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 2e972de409e8..3d20a393ed34 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -67,7 +67,4 @@ void SwNoteURL::FillImageMap( ImageMap *pMap, const Point &rPos,
}
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index e74a4fe1313f..32519556bd11 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -34,10 +34,6 @@ class SwDropPortion;
class SvStream;
class SwTxtFormatter;
-/*************************************************************************
- * class SwCharRange
- *************************************************************************/
-
class SwCharRange
{
sal_Int32 nStart, nLen;
@@ -61,10 +57,6 @@ public:
SwCharRange &operator+=(const SwCharRange &rRange);
};
-/*************************************************************************
- * class SwRepaint
- *************************************************************************/
-
// SwRepaint is a document-global SwRect
// nOfst states from where in the first line should be painted
// nRightOfst gives the right margin
@@ -84,13 +76,13 @@ public:
};
-/// Collection of SwLinePortion instances, representing one line of text.
+/// Collection of SwLinePortion instances, representing one line of text
class SwLineLayout : public SwTxtPortion
{
private:
SwLineLayout *pNext; // The next Line
- std::vector<long>* pLLSpaceAdd; // Used for justified alignment.
- std::deque<sal_uInt16>* pKanaComp; // Used for Kana compression.
+ std::vector<long>* pLLSpaceAdd; // Used for justified alignment
+ std::deque<sal_uInt16>* pKanaComp; // Used for Kana compression
KSHORT nRealHeight; // The height resulting from line spacing and register
bool bFormatAdj : 1;
bool bDummy : 1;
@@ -176,9 +168,7 @@ public:
// For special treatment for empty lines
virtual bool Format( SwTxtFormatInfo &rInf );
- //
- // STUFF FOR JUSTIFIED ALIGNMENT
- //
+ // Stuff for justified alignment
inline bool IsSpaceAdd() { return pLLSpaceAdd != NULL; }
void InitSpaceAdd(); // Creates pLLSpaceAdd if necessary
void CreateSpaceAdd( const long nInit = 0 );
@@ -195,9 +185,7 @@ public:
inline void RemoveFirstLLSpaceAdd() { pLLSpaceAdd->erase( pLLSpaceAdd->begin() ); }
inline std::vector<long>* GetpLLSpaceAdd() const { return pLLSpaceAdd; }
- //
- // STUFF FOR KANA COMPRESSION
- //
+ // Stuff for Kana compression
inline void SetKanaComp( std::deque<sal_uInt16>* pNew ){ pKanaComp = pNew; }
inline void FinishKanaComp() { delete pKanaComp; pKanaComp = NULL; }
inline std::deque<sal_uInt16>* GetpKanaComp() const { return pKanaComp; }
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 8d313c2f66ad..310e7d72e89e 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -42,12 +42,9 @@
using namespace ::com::sun::star;
-/*************************************************************************
- * SwAttrIter::CtorInitAttrIter()
- *************************************************************************/
void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm )
{
- // Beim HTML-Import kann es vorkommen, dass kein Layout existiert.
+ // during HTML-Import it can happen, that no layout exists
SwRootFrm* pRootFrm = rTxtNode.getIDocumentLayoutAccess()->GetCurrentLayout();
pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0;
@@ -155,20 +152,19 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
}
/*************************************************************************
- * SwRedlineItr - Der Redline-Iterator
+ * SwRedlineItr - The Redline-Iterator
*
- * Folgende Informationen/Zustaende gibt es im RedlineIterator:
+ * The foolowing information/states exist in RedlineIterator:
*
- * nFirst ist der erste Index der RedlineTbl, der mit dem Absatz ueberlappt.
+ * nFirst is the first index of RedlineTbl, which overlaps with the paragraph.
*
- * nAct ist der zur Zeit aktive ( wenn bOn gesetzt ist ) oder der naechste
- * in Frage kommende Index.
- * nStart und nEnd geben die Grenzen des Objekts innerhalb des Absatzes an.
+ * nAct is the currently active (if bOn is set) or the next possible index.
+ * nStart and nEnd give you the borders of the object within the paragraph.
*
- * Wenn bOn gesetzt ist, ist der Font entsprechend manipuliert worden.
+ * If bOn is set, the font has been manipulated according to it.
*
- * Wenn nAct auf COMPLETE_STRING gesetzt wurde ( durch Reset() ), so ist zur Zeit
- * kein Redline aktiv, nStart und nEnd sind invalid.
+ * If nAct is set to COMPLETE_STRING (via Reset()), then currently no
+ * Redline is active, nStart and nEnd are invalid.
*************************************************************************/
SwRedlineItr::SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt,
@@ -193,15 +189,14 @@ SwRedlineItr::~SwRedlineItr()
delete pExt;
}
-// Der Return-Wert von SwRedlineItr::Seek gibt an, ob der aktuelle Font
-// veraendert wurde durch Verlassen (-1) oder Betreten eines Bereichs (+1)
-
+// The return value of SwRedlineItr::Seek tells you if the current font
+// has been manipulated by leaving (-1) or accessing (+1) of a section
short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld)
{
short nRet = 0;
if( ExtOn() )
- return 0; // Abkuerzung: wenn wir innerhalb eines ExtendTextInputs sind
- // kann es keine anderen Attributwechsel (auch nicht durch Redlining) geben
+ return 0; // Abbreviation: if we're within an ExtendTextInputs
+ // there can't be other changes of attributes (not even by redlining)
if( bShow )
{
if( bOn )
@@ -209,20 +204,20 @@ short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld)
if( nNew >= nEnd )
{
--nRet;
- _Clear( &rFnt ); // Wir gehen hinter den aktuellen Bereich
- ++nAct; // und pruefen gleich den naechsten
+ _Clear( &rFnt ); // We go behind the current section
+ ++nAct; // and check the next one
}
else if( nNew < nStart )
{
--nRet;
- _Clear( &rFnt ); // Wir gehen vor den aktuellen Bereich
+ _Clear( &rFnt ); // We go in front of the current section
if( nAct > nFirst )
- nAct = nFirst; // Die Pruefung muss von vorne beginnen
+ nAct = nFirst; // the test has to run from the beginning
else
- return nRet + EnterExtend( rFnt, nNew ); // Es gibt keinen vor uns.
+ return nRet + EnterExtend( rFnt, nNew ); // There's none prior to us
}
else
- return nRet + EnterExtend( rFnt, nNew ); // Wir sind im gleichen Bereich geblieben.
+ return nRet + EnterExtend( rFnt, nNew ); // We stayed in the same section
}
if( COMPLETE_STRING == nAct || nOld > nNew )
nAct = nFirst;
@@ -365,9 +360,9 @@ sal_Int32 SwRedlineItr::_GetNextRedln( sal_Int32 nNext )
bool SwRedlineItr::_ChkSpecialUnderline() const
{
- // Wenn die Unterstreichung oder das Escapement vom Redling kommt,
- // wenden wir immer das SpecialUnderlining, d.h. die Unterstreichung
- // unter der Grundlinie an.
+ // If the underlining or the escapement is caused by redlining,
+ // we always apply the SpecialUnderlining, i.e. the underlining
+ // below the base line
for (size_t i = 0; i < m_Hints.size(); ++i)
{
MSHORT nWhich = m_Hints[i]->Which();
@@ -382,7 +377,7 @@ bool SwRedlineItr::CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd )
{
if( nFirst == COMPLETE_STRING )
return false;
- if( nChkEnd == nChkStart ) // Leerzeilen gucken ein Zeichen weiter.
+ if( nChkEnd == nChkStart ) // empty lines look one char further
++nChkEnd;
sal_Int32 nOldStart = nStart;
sal_Int32 nOldEnd = nEnd;
@@ -451,9 +446,9 @@ bool SwExtend::_Leave(SwFont& rFnt, sal_Int32 nNew)
MSHORT nOldAttr = rArr[ nPos - nStart ];
nPos = nNew;
if( Inside() )
- { // Wir sind innerhalb des ExtendText-Bereichs geblieben
+ { // We stayed within the ExtendText-section
MSHORT nAttr = rArr[ nPos - nStart ];
- if( nOldAttr != nAttr ) // Gibt es einen (inneren) Attributwechsel?
+ if( nOldAttr != nAttr ) // Is there an (inner) change of attributes?
{
rFnt = *pFnt;
ActualizeFont( rFnt, nAttr );
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index e60d9c862dea..8be7e90bd6a1 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -66,10 +66,6 @@ static bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf,
return false;
}
-/*************************************************************************
- * class SwDropSave
- *************************************************************************/
-
class SwDropSave
{
SwTxtPaintInfo* pInf;
@@ -97,20 +93,14 @@ SwDropSave::~SwDropSave()
pInf->Y( nY );
}
-/*************************************************************************
- * SwDropPortionPart DTor
- *************************************************************************/
-
+// SwDropPortionPart DTor
SwDropPortionPart::~SwDropPortionPart()
{
delete pFollow;
delete pFnt;
}
-/*************************************************************************
- * SwDropPortion CTor, DTor
- *************************************************************************/
-
+// SwDropPortion CTor, DTor
SwDropPortion::SwDropPortion( const MSHORT nLineCnt,
const KSHORT nDrpHeight,
const KSHORT nDrpDescent,
@@ -133,12 +123,7 @@ SwDropPortion::~SwDropPortion()
pBlink->Delete( this );
}
-/*************************************************************************
- * SwTxtNode::GetDropLen()
- *
- * nWishLen = 0 indicates that we want a whole word
- *************************************************************************/
-
+// nWishLen = 0 indicates that we want a whole word
MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
{
sal_Int32 nEnd = GetTxt().getLength();
@@ -260,12 +245,8 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen
return true;
}
-/*************************************************************************
- * SwDropPortion::PaintTxt()
- *************************************************************************/
-
-// Die Breite manipulieren, sonst werden die Buchstaben gestretcht
+// Manipulate the width, otherwise the chars are being stretched
void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
{
OSL_ENSURE( nDropHeight && pPart && nLines != 1, "Drop Portion painted twice" );
@@ -314,17 +295,13 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
const_cast<SwDropPortion*>(this)->SetJoinBorderWithPrev(false);
}
-/*************************************************************************
- * SwDropPortion::Paint()
- *************************************************************************/
-
void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
{
- // ganz normale Ausgabe wird w?hrend des normalen Paints erledigt
+ // normal output is being done during the normal painting
if( ! nDropHeight || ! pPart || nLines == 1 )
return;
- // Luegenwerte einstellen!
+ // set the lying values
const KSHORT nOldHeight = Height();
const KSHORT nOldWidth = Width();
const KSHORT nOldAscent = GetAscent();
@@ -333,7 +310,7 @@ void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
const SwParaPortion *pPara = rInf.GetParaPortion();
const Point aOutPos( nOldPosX + nX, nOldPosY - pPara->GetAscent()
- pPara->GetRealHeight() + pPara->Height() );
- // Retusche nachholen.
+ // make good for retouching
// Set baseline
((SwTxtPaintInfo&)rInf).Y( aOutPos.Y() + nDropHeight );
@@ -343,7 +320,7 @@ void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
((SwDropPortion*)this)->Width( Width() - nX );
((SwDropPortion*)this)->SetAscent( nDropHeight );
- // Clipregion auf uns einstellen!
+ // adapt Clipregion to us
// Und zwar immer, und nie mit dem bestehenden ClipRect
// verrechnen, weil dies auf die Zeile eingestellt sein koennte.
@@ -358,20 +335,16 @@ void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
// Das machen, was man sonst nur macht ...
PaintTxt( rInf );
- // Alte Werte sichern
+ // save old values
((SwDropPortion*)this)->Height( nOldHeight );
((SwDropPortion*)this)->Width( nOldWidth );
((SwDropPortion*)this)->SetAscent( nOldAscent );
((SwTxtPaintInfo&)rInf).Y( nOldPosY );
}
-/*************************************************************************
- * virtual SwDropPortion::Paint()
- *************************************************************************/
-
void SwDropPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
- // ganz normale Ausgabe wird hier erledigt.
+ // normal output is being done here
if( ! nDropHeight || ! pPart || 1 == nLines )
{
if ( rInf.OnWin() &&
@@ -396,11 +369,6 @@ void SwDropPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-/*************************************************************************
- * virtual Format()
- *************************************************************************/
-
-
bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
{
const sal_Int32 nOldLen = GetLen();
@@ -408,7 +376,7 @@ bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
if (!SwTxtPortion::Format( rInf ))
return false;
- // sieht zwar Scheisse aus, aber was soll man schon machen?
+ // looks like shit, but what can we do?
rInf.SetUnderFlow( 0 );
Truncate();
SetLen( nOldLen );
@@ -416,11 +384,6 @@ bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
return true;
}
-/*************************************************************************
- * virtual GetTxtSize()
- *************************************************************************/
-
-
SwPosSize SwDropPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
{
sal_uInt16 nMyX = 0;
@@ -464,19 +427,11 @@ SwPosSize SwDropPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
return aPosSize;
}
-/*************************************************************************
- * virtual GetCrsrOfst()
- *************************************************************************/
-
sal_Int32 SwDropPortion::GetCrsrOfst( const KSHORT ) const
{
return 0;
}
-/*************************************************************************
- * SwTxtFormatter::CalcDropHeight()
- *************************************************************************/
-
void SwTxtFormatter::CalcDropHeight( const MSHORT nLines )
{
const SwLinePortion *const pOldCurr = GetCurr();
@@ -495,7 +450,7 @@ void SwTxtFormatter::CalcDropHeight( const MSHORT nLines )
break;
}
- // Wenn wir nur eine Zeile haben returnen wir 0
+ // If we have only one line we return 0
if( GetNext() || GetDropLines() == 1 )
{
for( ; nDropLns < nLines; nDropLns++ )
@@ -538,13 +493,10 @@ void SwTxtFormatter::CalcDropHeight( const MSHORT nLines )
/*************************************************************************
* SwTxtFormatter::GuessDropHeight()
*
- * Wir schaetzen mal, dass die Fonthoehe sich nicht aendert und dass
- * erst mindestens soviele Zeilen gibt, wie die DropCap-Einstellung angibt.
+ * We assume hat the font height doesn't change and that at first there
+ * are at least as many lines, as the DropCap-setting claims
*
*************************************************************************/
-
-
-
void SwTxtFormatter::GuessDropHeight( const MSHORT nLines )
{
OSL_ENSURE( nLines, "GuessDropHeight: Give me more Lines!" );
@@ -560,10 +512,6 @@ void SwTxtFormatter::GuessDropHeight( const MSHORT nLines )
SetDropHeight( nHeight * nLines - GetDropDescent() );
}
-/*************************************************************************
- * SwTxtFormatter::NewDropPortion
- *************************************************************************/
-
SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
{
if( !pDropFmt )
@@ -579,7 +527,7 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
SwDropPortion *pDropPor = 0;
- // erste oder zweite Runde?
+ // first or second round?
if ( !( GetDropHeight() || IsOnceMore() ) )
{
if ( GetNext() )
@@ -653,12 +601,6 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
return pDropPor;
}
-/*************************************************************************
- * SwTxtPainter::PaintDropPortion()
- *************************************************************************/
-
-
-
void SwTxtPainter::PaintDropPortion()
{
const SwDropPortion *pDrop = GetInfo().GetParaPortion()->FindDropPortion();
@@ -675,7 +617,7 @@ void SwTxtPainter::PaintDropPortion()
GetInfo().SetKanaComp( pCurr->GetpKanaComp() );
GetInfo().ResetKanaIdx();
- // 8047: Drops und Dummies
+ // 8047: Drops and Dummies
while( !pCurr->GetLen() && Next() )
;
@@ -703,10 +645,10 @@ void SwTxtPainter::PaintDropPortion()
}
/*************************************************************************
- * clas SwDropCapCache
+ * class SwDropCapCache
*
- * Da die Berechnung der Fontgroesse der Initialen ein teures Geschaeft ist,
- * wird dies durch einen DropCapCache geschleust.
+ * Since the calculation of the font size is expensive, this is being
+ * channeled through a DropCapCache
*************************************************************************/
#define DROP_CACHE_SIZE 10
@@ -725,10 +667,7 @@ public:
void CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf );
};
-/*************************************************************************
- * SwDropCapCache Ctor / Dtor
- *************************************************************************/
-
+// SwDropCapCache Ctor / Dtor
SwDropCapCache::SwDropCapCache() : nIndex( 0 )
{
memset( &aMagicNo, 0, sizeof(aMagicNo) );
@@ -740,10 +679,6 @@ void SwDropPortion::DeleteDropCapCache()
delete pDropCapCache;
}
-/*************************************************************************
- * SwDropCapCache::CalcFontSize
- *************************************************************************/
-
void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
{
const void* pFntNo = 0;
@@ -857,7 +792,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
nAscent = rFnt.GetAscent( rInf.GetVsh(), *pOut );
- // Wir besorgen uns das alle Buchstaben umfassende Rechteck:
+ // we get the rectangle that covers all chars
bHaveGlyphRect = pOut->GetTextBoundRect( aRect, rInf.GetTxt(), 0,
nIdx, pCurrPart->GetLen() ) &&
! aRect.IsEmpty();
@@ -1016,10 +951,6 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
pDrop->SetY( (short)nDescent );
}
-/*************************************************************************
- * virtual Format()
- *************************************************************************/
-
bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
{
bool bFull = false;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index ce9fd3362b1c..08857df5bbc5 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -83,7 +83,7 @@ void SwTxtFrm::SwapWidthAndHeight()
{
const long nPrtOfstX = Prt().Pos().X();
Prt().Pos().X() = Prt().Pos().Y();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( IsVertLR() )
Prt().Pos().Y() = nPrtOfstX;
else
@@ -94,7 +94,7 @@ void SwTxtFrm::SwapWidthAndHeight()
{
const long nPrtOfstY = Prt().Pos().Y();
Prt().Pos().Y() = Prt().Pos().X();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if( IsVertLR() )
Prt().Pos().X() = nPrtOfstY;
else
@@ -116,7 +116,7 @@ void SwTxtFrm::SwapWidthAndHeight()
void SwTxtFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
{
// calc offset inside frame
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
long nOfstX, nOfstY;
if ( IsVertLR() )
{
@@ -132,7 +132,7 @@ void SwTxtFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
const long nWidth = rRect.Width();
const long nHeight = rRect.Height();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
rRect.Left(Frm().Left() + nOfstY);
else
@@ -156,7 +156,7 @@ void SwTxtFrm::SwitchHorizontalToVertical( Point& rPoint ) const
// calc offset inside frame
const long nOfstX = rPoint.X() - Frm().Left();
const long nOfstY = rPoint.Y() - Frm().Top();
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
rPoint.X() = Frm().Left() + nOfstY;
else
@@ -188,7 +188,7 @@ void SwTxtFrm::SwitchVerticalToHorizontal( SwRect& rRect ) const
// calc offset inside frame
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
nOfstX = rRect.Left() - Frm().Left();
else
@@ -218,7 +218,7 @@ void SwTxtFrm::SwitchVerticalToHorizontal( Point& rPoint ) const
// calc offset inside frame
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
if ( IsVertLR() )
nOfstX = rPoint.X() - Frm().Left();
else
@@ -329,10 +329,6 @@ SwDigitModeModifier::~SwDigitModeModifier()
((OutputDevice&)rOut).SetDigitLanguage( nOldLanguageType );
}
-/*************************************************************************
- * SwTxtFrm::Init()
- *************************************************************************/
-
void SwTxtFrm::Init()
{
OSL_ENSURE( !IsLocked(), "+SwTxtFrm::Init: this is locked." );
@@ -347,9 +343,6 @@ void SwTxtFrm::Init()
}
}
-/*************************************************************************
- * SwTxtFrm::SwTxtFrm()
- *************************************************************************/
SwTxtFrm::SwTxtFrm(SwTxtNode * const pNode, SwFrm* pSib )
: SwCntntFrm( pNode, pSib )
, nAllLines( 0 )
@@ -378,9 +371,6 @@ SwTxtFrm::SwTxtFrm(SwTxtNode * const pNode, SwFrm* pSib )
mnType = FRMC_TXT;
}
-/*************************************************************************
- * SwTxtFrm::~SwTxtFrm()
- *************************************************************************/
SwTxtFrm::~SwTxtFrm()
{
// Remove associated SwParaPortion from pTxtCache
@@ -402,9 +392,6 @@ void SwTxtFrm::ResetPreps()
}
}
-/*************************************************************************
- * SwTxtFrm::IsHiddenNow()
- *************************************************************************/
bool SwTxtFrm::IsHiddenNow() const
{
SwFrmSwapper aSwapper( this, true );
@@ -436,12 +423,7 @@ bool SwTxtFrm::IsHiddenNow() const
return false;
}
-
-/*************************************************************************
- * SwTxtFrm::HideHidden()
- *************************************************************************/
// removes Textfrm's attachments, when it's hidden
-
void SwTxtFrm::HideHidden()
{
OSL_ENSURE( !GetFollow() && IsHiddenNow(),
@@ -456,9 +438,6 @@ void SwTxtFrm::HideHidden()
ClearPara();
}
-/*************************************************************************
- * SwTxtFrm::HideFootnotes()
- *************************************************************************/
void SwTxtFrm::HideFootnotes( sal_Int32 nStart, sal_Int32 nEnd )
{
const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
@@ -542,9 +521,7 @@ bool sw_HideObj( const SwTxtFrm& _rFrm,
return bRet;
}
-/*************************************************************************
- * SwTxtFrm::HideAndShowObjects()
- *************************************************************************/
+
/** method to hide/show objects
OD 2004-01-15 #110582#
@@ -655,10 +632,10 @@ sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
nFound++;
}
- // Eine knifflige Sache mit den TxtAttr-Dummy-Zeichen (hier "$"):
- // "Dr.$Meyer" am Anfang der zweiten Zeile. Dahinter ein Blank eingegeben
- // und das Wort rutscht nicht in die erste Zeile, obwohl es ginge.
- // Aus diesem Grund nehmen wir das Dummy-Zeichen noch mit.
+ // A tricky situation with the TxtAttr-Dummy-character (in this case "$"):
+ // "Dr.$Meyer" at the beginning of the second line. Typing a blank after that
+ // doesn't result in the word moving into first line, even though that would work.
+ // For this reason we don't skip the dummy char.
while( nFound <= nEndLine && ' ' != rTxt[nFound] )
{
nFound++;
@@ -667,10 +644,6 @@ sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
return nFound;
}
-/*************************************************************************
- * SwTxtFrm::IsIdxInside()
- *************************************************************************/
-
bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const
{
if( nLen != COMPLETE_STRING && GetOfst() > nPos + nLen ) // the range preceded us
@@ -690,19 +663,12 @@ bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const
return pPara && ( nPos <= nMax + pPara->GetLen() );
}
-/*************************************************************************
- * SwTxtFrm::InvalidateRange()
- *************************************************************************/
inline void SwTxtFrm::InvalidateRange(const SwCharRange &aRange, const long nD)
{
if ( IsIdxInside( aRange.Start(), aRange.Len() ) )
_InvalidateRange( aRange, nD );
}
-/*************************************************************************
- * SwTxtFrm::_InvalidateRange()
- *************************************************************************/
-
void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
{
if ( !HasPara() )
@@ -716,10 +682,10 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
bool bInv = false;
if( 0 != nD )
{
- //Auf nDelta werden die Differenzen zwischen alter und
- //neuer Zeilenlaenge aufaddiert, deshalb ist es negativ,
- //wenn Zeichen eingefuegt wurden, positiv, wenn Zeichen
- //geloescht wurden.
+ // In nDelta the differences betwen old and new
+ // linelengths are being added, that's why it's negative
+ // if chars have been added and positive, if chars have
+ // deleted
*(pPara->GetDelta()) += nD;
bInv = true;
}
@@ -737,10 +703,6 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
}
}
-/*************************************************************************
- * SwTxtFrm::CalcLineSpace()
- *************************************************************************/
-
void SwTxtFrm::CalcLineSpace()
{
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
@@ -892,17 +854,13 @@ static void lcl_ModifyOfst( SwTxtFrm* pFrm, sal_Int32 nPos, sal_Int32 nLen )
}
}
-//Related: fdo#56031 filter out attribute changes that don't matter for
-//humans/a11y to stop flooding the destination mortal with useless noise
+// Related: fdo#56031 filter out attribute changes that don't matter for
+// humans/a11y to stop flooding the destination mortal with useless noise
static bool isA11yRelevantAttribute(MSHORT nWhich)
{
return nWhich != RES_CHRATR_RSID;
}
-/*************************************************************************
- * SwTxtFrm::Modify()
- *************************************************************************/
-
void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
const MSHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
@@ -1363,10 +1321,6 @@ bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const
return true;
}
-/*************************************************************************
- * SwTxtFrm::PrepWidows()
- *************************************************************************/
-
void SwTxtFrm::PrepWidows( const MSHORT nNeed, bool bNotify )
{
OSL_ENSURE(GetFollow() && nNeed, "+SwTxtFrm::Prepare: lost all friends");
@@ -1421,10 +1375,6 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, bool bNotify )
UNDO_SWAP( this )
}
-/*************************************************************************
- * SwTxtFrm::Prepare
- *************************************************************************/
-
static bool lcl_ErgoVadis( SwTxtFrm* pFrm, sal_Int32 &rPos, const PrepareHint ePrep )
{
const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo();
@@ -1899,11 +1849,6 @@ sal_Bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, sal_Bool
return SwTxtFrm::WouldFit( rMaxHeight, bSplit, sal_True );
}
-
-/*************************************************************************
- * SwTxtFrm::WouldFit()
- *************************************************************************/
-
/* SwTxtFrm::WouldFit()
* sal_True: wenn ich aufspalten kann.
* Es soll und braucht nicht neu formatiert werden.
@@ -2016,11 +1961,6 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTs
return bRet;
}
-
-/*************************************************************************
- * SwTxtFrm::GetParHeight()
- *************************************************************************/
-
KSHORT SwTxtFrm::GetParHeight() const
{
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
@@ -2055,19 +1995,14 @@ KSHORT SwTxtFrm::GetParHeight() const
return nHeight;
}
-
-/*************************************************************************
- * SwTxtFrm::GetFormatted()
- *************************************************************************/
-
// returns this _always_ in the formated state!
SwTxtFrm* SwTxtFrm::GetFormatted( bool bForceQuickFormat )
{
SWAP_IF_SWAPPED( this )
- //Kann gut sein, dass mir der IdleCollector mir die gecachten
- //Informationen entzogen hat. Calc() ruft unser Format.
- //Nicht bei leeren Absaetzen!
+ // Kann gut sein, dass mir der IdleCollector mir die gecachten
+ // Informationen entzogen hat. Calc() ruft unser Format.
+ // Nicht bei leeren Absaetzen!
if( !HasPara() && !(IsValid() && IsEmpty()) )
{
// Calc() must be called, because frame position can be wrong
@@ -2086,10 +2021,6 @@ SwTxtFrm* SwTxtFrm::GetFormatted( bool bForceQuickFormat )
return this;
}
-/*************************************************************************
- * SwTxtFrm::CalcFitToContent()
- *************************************************************************/
-
SwTwips SwTxtFrm::CalcFitToContent()
{
// #i31490#
@@ -2357,9 +2288,6 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
}
}
-/*************************************************************************
- * SwTxtFrm::GetLineSpace()
- *************************************************************************/
// OD 07.01.2004 #i11859# - change return data type
// add default parameter <_bNoPropLineSpacing> to control, if the
// value of a proportional line spacing is returned or not
@@ -2411,10 +2339,6 @@ long SwTxtFrm::GetLineSpace( const bool _bNoPropLineSpace ) const
return nRet;
}
-/*************************************************************************
- * SwTxtFrm::FirstLineHeight()
- *************************************************************************/
-
KSHORT SwTxtFrm::FirstLineHeight() const
{
if ( !HasPara() )
@@ -2453,8 +2377,7 @@ MSHORT SwTxtFrm::GetLineCount( sal_Int32 nPos )
void SwTxtFrm::ChgThisLines()
{
- //not necessary to format here (GerFormatted etc.), because we have to come from there!
-
+ // not necessary to format here (GerFormatted etc.), because we have to come from there!
sal_uLong nNew = 0;
const SwLineNumberInfo &rInf = GetNode()->getIDocumentLineNumberAccess()->GetLineNumberInfo();
if ( !GetTxt().isEmpty() && HasPara() )
@@ -2494,7 +2417,7 @@ void SwTxtFrm::ChgThisLines()
if( pNxt )
pNxt->InvalidateLineNum();
- //Extend repaint to the bottom.
+ // Extend repaint to the bottom.
if ( HasPara() )
{
SwRepaint *pRepaint = GetPara()->GetRepaint();
@@ -2502,7 +2425,7 @@ void SwTxtFrm::ChgThisLines()
Frm().Top()+Prt().Bottom()));
}
}
- else //Paragraphs which are not counted should not manipulate the AllLines.
+ else // Paragraphs which are not counted should not manipulate the AllLines.
nThisLines = nNew;
}
}
@@ -2523,8 +2446,8 @@ void SwTxtFrm::RecalcAllLines()
if ( !IsFollow() && rLineNum.GetStartValue() && rLineNum.IsCount() )
nNewNum = rLineNum.GetStartValue() - 1;
- //If it is a follow or not has not be considered if it is a restart at each page; the
- //restart should also take affekt at follows.
+ // If it is a follow or not has not be considered if it is a restart at each page; the
+ // restart should also take affekt at follows.
else if ( bRestart && FindPageFrm()->FindFirstBodyCntnt() == this )
{
nNewNum = 0;
@@ -2591,22 +2514,13 @@ void SwTxtFrm::VisitPortions( SwPortionHandler& rPH ) const
rPH.Finish();
}
-
-/*************************************************************************
- * SwTxtFrm::GetScriptInfo()
- *************************************************************************/
-
const SwScriptInfo* SwTxtFrm::GetScriptInfo() const
{
const SwParaPortion* pPara = GetPara();
return pPara ? &pPara->GetScriptInfo() : 0;
}
-/*************************************************************************
- * lcl_CalcFlyBasePos()
- * Helper function for SwTxtFrm::CalcBasePosForFly()
- *************************************************************************/
-
+// Helper function for SwTxtFrm::CalcBasePosForFly()
static SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect,
SwTxtFly& rTxtFly )
{
@@ -2653,10 +2567,6 @@ static SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect,
return nRet;
}
-/*************************************************************************
- * SwTxtFrm::CalcBasePosForFly()
- *************************************************************************/
-
void SwTxtFrm::CalcBaseOfstForFly()
{
OSL_ENSURE( !IsVertical() || !IsSwapped(),
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index fe9149a750e8..41dfb0e78702 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -55,10 +55,6 @@
using namespace ::com::sun::star;
-/*************************************************************************
- * _IsFtnNumFrm()
- *************************************************************************/
-
bool SwTxtFrm::_IsFtnNumFrm() const
{
const SwFtnFrm* pFtn = FindFtnFrm()->GetMaster();
@@ -67,12 +63,7 @@ bool SwTxtFrm::_IsFtnNumFrm() const
return !pFtn;
}
-/*************************************************************************
- * FindFtn()
- *************************************************************************/
-
// Sucht innerhalb einer Master-Follow-Kette den richtigen TxtFrm zum SwTxtFtn
-
SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
{
SwTxtFrm *pFrm = this;
@@ -87,12 +78,8 @@ SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
return pFrm;
}
-/*************************************************************************
- * CalcFtnFlag()
- *************************************************************************/
-
#ifdef DBG_UTIL
-void SwTxtFrm::CalcFtnFlag( sal_Int32 nStop )//For testing the SplitFrm
+void SwTxtFrm::CalcFtnFlag( sal_Int32 nStop )// For testing the SplitFrm
#else
void SwTxtFrm::CalcFtnFlag()
#endif
@@ -129,10 +116,6 @@ void SwTxtFrm::CalcFtnFlag()
}
}
-/*************************************************************************
- * CalcPrepFtnAdjust()
- *************************************************************************/
-
bool SwTxtFrm::CalcPrepFtnAdjust()
{
OSL_ENSURE( HasFtn(), "Wer ruft mich da?" );
@@ -190,12 +173,9 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
SwTwips nAdd;
SwTwips nRet = nLower;
- //
// Check if text is inside a table.
- //
if ( pFrm->IsInTab() )
{
- //
// If pFrm is inside a table, we have to check if
// a) The table is not allowed to split or
// b) The table row is not allowed to split
@@ -204,7 +184,6 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
// see SwFrm::FindFtnBossFrm. So we don't have to check
// the case that pFrm is inside a (footnote collecting) section
// within the table.
- //
const SwFrm* pRow = pFrm;
while( !pRow->IsRowFrm() || !pRow->GetUpper()->IsTabFrm() )
pRow = pRow->GetUpper();
@@ -275,11 +254,6 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
return nRet;
}
-
-/*************************************************************************
- * SwTxtFrm::GetFtnLine()
- *************************************************************************/
-
SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
{
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
@@ -315,14 +289,9 @@ SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
return nRet;
}
-/*************************************************************************
- * SwTxtFrm::GetFtnRstHeight()
- *************************************************************************/
-
// Ermittelt die max. erreichbare Hoehe des TxtFrm im Ftn-Bereich.
// Sie wird eingeschraenkt durch den unteren Rand der Zeile mit
// der Ftn-Referenz.
-
SwTwips SwTxtFrm::_GetFtnFrmHeight() const
{
OSL_ENSURE( !IsFollow() && IsInFtn(), "SwTxtFrm::SetFtnLine: moon walk" );
@@ -396,10 +365,6 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
return nHeight;
}
-/*************************************************************************
- * SwTxtFrm::FindQuoVadisFrm()
- *************************************************************************/
-
SwTxtFrm *SwTxtFrm::FindQuoVadisFrm()
{
// Erstmal feststellen, ob wir in einem FtnFrm stehen:
@@ -423,10 +388,6 @@ SwTxtFrm *SwTxtFrm::FindQuoVadisFrm()
return (SwTxtFrm*)pLast;
}
-/*************************************************************************
- * SwTxtFrm::RemoveFtn()
- *************************************************************************/
-
void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
{
if ( !IsFtnAllowed() )
@@ -600,9 +561,6 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
GetFollow()->ManipOfst( nOldOfst );
}
-/*************************************************************************
- * SwTxtFormatter::ConnectFtn()
- *************************************************************************/
// false, wenn irgendetwas schief gegangen ist.
// Es gibt eigentlich nur zwei Moeglichkeiten:
// a) Die Ftn ist bereits vorhanden
@@ -614,7 +572,6 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
// Optimierungen bei Endnoten.
// Noch ein Problem: wenn die Deadline im Ftn-Bereich liegt, muss die
// Ftn verschoben werden.
-
void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
{
OSL_ENSURE( !IsVertical() || !IsSwapped(),
@@ -624,10 +581,8 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
bInFtnConnect = true; //Bloss zuruecksetzen!
const bool bEnd = pFtn->GetFtn().IsEndNote();
- //
// We want to store this value, because it is needed as a fallback
// in GetFtnLine(), if there is no paragraph information available
- //
mnFtnLine = nDeadLine;
// Wir brauchen immer einen Boss (Spalte/Seite)
@@ -826,12 +781,6 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
return;
}
-
-
-/*************************************************************************
- * SwTxtFormatter::NewFtnPortion()
- *************************************************************************/
-
// Die Portion fuer die Ftn-Referenz im Text
SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
SwTxtAttr *pHint )
@@ -975,12 +924,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
return pRet;
}
-/*************************************************************************
- * SwTxtFormatter::NewFtnNumPortion()
- *************************************************************************/
-
// Die Portion fuer die Ftn-Nummerierung im Ftn-Bereich
-
SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
{
OSL_ENSURE( pFrm->IsInFtn() && !pFrm->GetIndPrev() && !rInf.IsFtnDone(),
@@ -1035,7 +979,6 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
/*************************************************************************
* SwTxtFormatter::NewErgoSumPortion()
*************************************************************************/
-
OUString lcl_GetPageNumber( const SwPageFrm* pPage )
{
OSL_ENSURE( pPage, "GetPageNumber: Homeless TxtFrm" );
@@ -1073,10 +1016,6 @@ SwErgoSumPortion *SwTxtFormatter::NewErgoSumPortion( SwTxtFormatInfo &rInf ) con
return pErgo;
}
-/*************************************************************************
- * SwTxtFormatter::FormatQuoVadis()
- *************************************************************************/
-
sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset )
{
OSL_ENSURE( ! pFrm->IsVertical() || ! pFrm->IsSwapped(),
@@ -1270,17 +1209,11 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset )
return nRet;
}
-
-/*************************************************************************
- * SwTxtFormatter::MakeDummyLine()
- *************************************************************************/
-
// MakeDummyLine() erzeugt eine Line, die bis zum unteren Seitenrand
// reicht. DummyLines bzw. DummyPortions sorgen dafuer, dass Oszillationen
// zum stehen kommen, weil Rueckflussmoeglichkeiten genommen werden.
// Sie werden bei absatzgebundenen Frames in Fussnoten und bei Ftn-
// Oszillationen verwendet.
-
void SwTxtFormatter::MakeDummyLine()
{
KSHORT nRstHeight = GetFrmRstHeight();
@@ -1295,9 +1228,6 @@ void SwTxtFormatter::MakeDummyLine()
}
}
-/*************************************************************************
- * class SwFtnSave
- *************************************************************************/
class SwFtnSave
{
SwTxtSizeInfo *pInf;
@@ -1311,10 +1241,6 @@ public:
~SwFtnSave();
};
-/*************************************************************************
- * SwFtnSave::SwFtnSave()
- *************************************************************************/
-
SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
const SwTxtFtn* pTxtFtn,
const bool bApplyGivenScriptType,
@@ -1378,10 +1304,6 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
pFnt = NULL;
}
-/*************************************************************************
- * SwFtnSave::~SwFtnSave()
- *************************************************************************/
-
SwFtnSave::~SwFtnSave()
{
if( pFnt )
@@ -1394,10 +1316,6 @@ SwFtnSave::~SwFtnSave()
}
}
-/*************************************************************************
- * SwFtnPortion::SwFtnPortion()
- *************************************************************************/
-
SwFtnPortion::SwFtnPortion( const OUString &rExpand,
SwTxtFtn *pFootn, KSHORT nReal )
: SwFldPortion( rExpand, 0 )
@@ -1411,20 +1329,12 @@ SwFtnPortion::SwFtnPortion( const OUString &rExpand,
SetWhichPor( POR_FTN );
}
-/*************************************************************************
- * SwFtnPortion::GetExpTxt()
- *************************************************************************/
-
bool SwFtnPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
{
rTxt = aExpand;
return true;
}
-/*************************************************************************
- * virtual SwFtnPortion::Format()
- *************************************************************************/
-
bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
{
// #i98418#
@@ -1444,10 +1354,6 @@ bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
return bFull;
}
-/*************************************************************************
- * virtual SwFtnPortion::Paint()
- *************************************************************************/
-
void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
// #i98418#
@@ -1457,10 +1363,6 @@ void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const
SwExpandPortion::Paint( rInf );
}
-/*************************************************************************
- * virtual SwFtnPortion::GetTxtSize()
- *************************************************************************/
-
SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const
{
// #i98418#
@@ -1476,10 +1378,6 @@ void SwFtnPortion::SetPreferredScriptType( sal_uInt8 nPreferredScriptType )
mnPreferredScriptType = nPreferredScriptType;
}
-/*************************************************************************
- * class SwQuoVadisPortion
- *************************************************************************/
-
SwFldPortion *SwQuoVadisPortion::Clone( const OUString &rExpand ) const
{
return new SwQuoVadisPortion( rExpand, aErgo );
@@ -1492,10 +1390,6 @@ SwQuoVadisPortion::SwQuoVadisPortion( const OUString &rExp, const OUString& rStr
SetWhichPor( POR_QUOVADIS );
}
-/*************************************************************************
- * virtual SwQuoVadisPortion::Format()
- *************************************************************************/
-
bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
{
// erster Versuch, vielleicht passt der Text
@@ -1523,10 +1417,6 @@ bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
return bFull;
}
-/*************************************************************************
- * virtual SwQuoVadisPortion::GetExpTxt()
- *************************************************************************/
-
bool SwQuoVadisPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
{
rTxt = aExpand;
@@ -1537,10 +1427,6 @@ bool SwQuoVadisPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
return true;
}
-/*************************************************************************
- * virtual SwQuoVadisPortion::HandlePortion()
- *************************************************************************/
-
void SwQuoVadisPortion::HandlePortion( SwPortionHandler& rPH ) const
{
OUString aString( aExpand );
@@ -1548,10 +1434,6 @@ void SwQuoVadisPortion::HandlePortion( SwPortionHandler& rPH ) const
rPH.Special( GetLen(), aString, GetWhichPor() );
}
-/*************************************************************************
- * virtual SwQuoVadisPortion::Paint()
- *************************************************************************/
-
void SwQuoVadisPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
// Wir wollen _immer_ per DrawStretchText ausgeben,
@@ -1565,10 +1447,6 @@ void SwQuoVadisPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-/*************************************************************************
- * class SwErgoSumPortion
- *************************************************************************/
-
SwFldPortion *SwErgoSumPortion::Clone( const OUString &rExpand ) const
{
return new SwErgoSumPortion( rExpand, OUString() );
@@ -1590,10 +1468,6 @@ sal_Int32 SwErgoSumPortion::GetCrsrOfst( const KSHORT ) const
return 0;
}
-/*************************************************************************
- * virtual SwErgoSumPortion::Format()
- *************************************************************************/
-
bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
{
const bool bFull = SwFldPortion::Format( rInf );
@@ -1612,11 +1486,6 @@ bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
return false;
}
-
-/*************************************************************************
- * SwParaPortion::SetErgoSumNum()
- *************************************************************************/
-
void SwParaPortion::SetErgoSumNum( const OUString& rErgo )
{
SwLineLayout *pLay = this;
@@ -1664,6 +1533,4 @@ bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo )
return pQuo->GetQuoTxt() == rQuo;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index eece35d3da4e..bcee1e0a0ae1 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -36,25 +36,23 @@ using namespace ::com::sun::star;
namespace
{
-
-SvStream& lcl_OutLongExt( SvStream& rStrm, sal_uLong nVal, bool bNeg )
-{
- sal_Char aBuf[28];
-
- int i = SAL_N_ELEMENTS(aBuf);
- aBuf[--i] = 0;
- do
+ SvStream& lcl_OutLongExt( SvStream& rStrm, sal_uLong nVal, bool bNeg )
{
- aBuf[--i] = '0' + static_cast<sal_Char>(nVal % 10);
- nVal /= 10;
- } while (nVal);
+ sal_Char aBuf[28];
- if (bNeg)
- aBuf[--i] = '-';
+ int i = SAL_N_ELEMENTS(aBuf);
+ aBuf[--i] = 0;
+ do
+ {
+ aBuf[--i] = '0' + static_cast<sal_Char>(nVal % 10);
+ nVal /= 10;
+ } while (nVal);
- return rStrm.WriteCharPtr( &aBuf[i] );
-}
+ if (bNeg)
+ aBuf[--i] = '-';
+ return rStrm.WriteCharPtr( &aBuf[i] );
+ }
}
typedef std::multimap<sal_uLong, const ::sw::mark::IMark*> SwBookmarkNodeTable;
@@ -93,7 +91,6 @@ void Writer_Impl::RemoveFontList( SwDoc& rDoc )
void Writer_Impl::InsertBkmk(const ::sw::mark::IMark& rBkmk)
{
-
sal_uLong nNd = rBkmk.GetMarkPos().nNode.GetIndex();
aBkmkNodePos.insert( SwBookmarkNodeTable::value_type( nNd, &rBkmk ) );
@@ -167,7 +164,7 @@ sal_Bool Writer::CopyNextPam( SwPaM ** ppPam )
if( (*ppPam)->GetNext() == pOrigPam )
{
*ppPam = pOrigPam; // set back to the beginning pam
- return sal_False; // end of the ring
+ return sal_False; // end of the ring
}
// otherwise copy the next value from the next Pam
@@ -220,8 +217,6 @@ Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const nEndId
return pNew;
}
-/////////////////////////////////////////////////////////////////////////////
-
// Stream-specific
SvStream& Writer::Strm()
{
@@ -432,10 +427,7 @@ sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt,
return rArr.size();
}
-////////////////////////////////////////////////////////////////////////////
-
// Storage-specific
-
sal_uLong StgWriter::WriteStream()
{
OSL_ENSURE( !this, "Write in Storages on a stream?" );
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 4011ddb70e48..d0917733d19f 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -90,7 +90,7 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt )
{
- // It must be a CntntNode !!
+ // It must be a CntntNode!
SwCntntNode * pCNd = rNode.GetCntntNode();
if( !pCNd )
return rWrt;
@@ -117,5 +117,4 @@ Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt )
return rWrt;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 994dad4e2d3d..8a1cc74862ce 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -77,7 +77,7 @@ static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext)
return pCNd;
}
-// ------ Stack entry for all text attributes -----------
+// Stack entry for all text attributes
SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, SfxPoolItem* pHt)
: m_aMkPos(rStartPos)
, m_aPtPos(rStartPos)
@@ -85,9 +85,9 @@ SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, SfxPoolItem* pHt)
, mnEndCP(-1)
, bIsParaEnd(false)
{
- pAttr = pHt; // store a copy of the attribute
+ pAttr = pHt; // store a copy of the attribute
bOld = sal_False; // used for marking Attributes *before* skipping field results
- bOpen = sal_True; // lock the attribute --> may first
+ bOpen = sal_True; // lock the attribute --> may first
bConsumedByField = sal_False;
}
@@ -129,7 +129,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck,
{
return false;
}
- // !!! The content indices always apply to the node !!!
+ // The content indices always apply to the node!
rRegion.GetPoint()->nNode = rMkPos.m_nNode.GetIndex() + 1;
SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
rRegion.GetPoint()->nContent.Assign(pCNd, rMkPos.m_nCntnt);
@@ -426,7 +426,7 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
SwPaM& rRegion, sal_Bool bCheck )
{
if (rEntry.MakeRegion(pDoc, rRegion, bCheck )){
-// sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
+ // sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
if (rRegion.GetPoint()->nNode.GetNode().FindTableBoxStartNode()
!= rRegion.GetMark()->nNode.GetNode().FindTableBoxStartNode())
{
@@ -670,7 +670,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
default:
{
- //Revised for more complex situations should be considered
+ // Revised for more complex situations should be considered
if ( !bSdODChecked )
{
bHasSdOD = HasSdOD();
@@ -772,7 +772,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
SwNodeIndex aEndNode(pEnd->nNode, -1);
const sal_Int32 nEndIdx = pEnd->nContent.GetIndex();
- //We don't support deleting content that is over one node, or removing a node.
+ // We don't support deleting content that is over one node, or removing a node.
OSL_ENSURE(aEndNode == aStartNode, "nodes must be the same, or this method extended");
if (aEndNode != aStartNode)
return;
@@ -813,19 +813,19 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
if (bTotallyContained)
{
- //after start, before end, delete
+ // after start, before end, delete
DeleteAndDestroy(nSize);
continue;
}
const sal_Int32 nCntntDiff = nEndIdx - nStartIdx;
- //to be adjusted
+ // to be adjusted
if (bEntryStartAfterSelStart)
{
if (bEntryStartBeforeSelEnd)
{
- //move start to new start
+ // move start to new start
rEntry.m_aMkPos.SetPos(aStartNode, nStartIdx);
}
else
@@ -846,7 +846,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
}
}
-//------ methods of SwFltAnchor follow -----------
+// methods of SwFltAnchor follow
SwFltAnchor::SwFltAnchor(SwFrmFmt* pFmt) :
SfxPoolItem(RES_FLTR_ANCHOR), pFrmFmt(pFmt)
{
@@ -914,7 +914,7 @@ void SwFltAnchorClient::Modify(const SfxPoolItem *, const SfxPoolItem * pNew)
}
}
-//------ methods of SwFltRedline follow -----------
+// methods of SwFltRedline follow
bool SwFltRedline::operator==(const SfxPoolItem& rItem) const
{
return this == &rItem;
@@ -925,7 +925,7 @@ SfxPoolItem* SwFltRedline::Clone( SfxItemPool* ) const
return new SwFltRedline(*this);
}
-//------ methods of SwFltBookmark follow -----------
+// methods of SwFltBookmark follow
SwFltBookmark::SwFltBookmark( const OUString& rNa, const OUString& rVa,
long nHand, const bool bIsTOCBookmark )
: SfxPoolItem( RES_FLTR_BOOKMARK )
@@ -967,8 +967,7 @@ SfxPoolItem* SwFltBookmark::Clone(SfxItemPool*) const
return new SwFltBookmark(*this);
}
-//------ methods of SwFltTOX follow -----------
-
+// methods of SwFltTOX follow
SwFltTOX::SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols)
: SfxPoolItem(RES_FLTR_TOX), pTOXBase(pBase), nCols( _nCols ),
bHadBreakItem( sal_False ), bHadPageDescItem( sal_False )
@@ -991,8 +990,7 @@ SfxPoolItem* SwFltTOX::Clone(SfxItemPool*) const
return new SwFltTOX(*this);
}
-//------ methods of SwFltSwSection follow -----------
-
+// methods of SwFltSwSection follow
SwFltSection::SwFltSection(SwSectionData *const pSect)
: SfxPoolItem(RES_FLTR_SECTION)
, m_pSection(pSect)
@@ -1015,14 +1013,11 @@ SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const
return new SwFltSection(*this);
}
-///////////////////////////////////////////////////////////////////////
-//
// here starts code generated by mdt. this is a shell, if possible, soon for
// all filters. the whole trouble of inserting texts and formatting attributes,
// manage positions, styles & headers/footers etc.
//
-
-//////////////////////////////////////////////////////////// SwFltShell
+// SwFltShell
SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFl) :
pCurrentPageDesc(0),
pSavedPos(0),
@@ -1322,7 +1317,6 @@ const SfxPoolItem& SwFltFormatCollection::GetAttr(sal_uInt16 nWhich)
// Bei Formatdefinitionen aus dem altuellen Style mit Parents
// sonst aus dem Node mit Parents
// Im Stack wird nicht nachgesehen
-
const SfxPoolItem& SwFltOutDoc::GetNodeOrStyAttr(sal_uInt16 nWhich)
{
SwCntntNode * pNd = pPaM->GetPoint()->nNode.GetNode().GetCntntNode();
@@ -1392,10 +1386,7 @@ bool SwFltShell::GetCaseVersalien()
.GetCaseMap() == SVX_CASEMAP_VERSALIEN;
}
-//-------------------------------------------------------------------------
// Tables
-//-------------------------------------------------------------------------
-
SwFltOutBase::~SwFltOutBase()
{
}
@@ -1510,7 +1501,7 @@ SwTableBox* SwFltOutDoc::GetBox(sal_uInt16 ny, sal_uInt16 nx /*= USHRT_MAX */)
if( nx == USHRT_MAX ) // current cell
nx = usTableX;
-// get structs to table cells
+ // get structs to table cells
const SwTableLines* pTableLines = &pTable->GetTabLines();
if(!pTableLines){
OSL_FAIL("SwFltOutDoc:GetBox:pTableLines");
@@ -1553,8 +1544,8 @@ void SwFltOutDoc::NextTableCell()
OSL_ENSURE(pTableBox != 0, "SwFltOutDoc:NextTableCell:pTableBox");
if(!pTableBox)
return;
-//#pragma message(__FILE__ "(?) : Sw's const problem")
-// insert cells:
+ //#pragma message(__FILE__ "(?) : Sw's const problem")
+ // insert cells:
if (++usTableX >= pTableBoxes->size())
GetDoc().GetNodes().InsBoxen(
GetDoc().IsIdxInTbl(pPaM->GetPoint()->nNode),
@@ -1575,7 +1566,7 @@ void SwFltOutDoc::NextTableRow()
SwTableBox* pTableBox = GetBox(usTableY, 0);
if (pTableBox)
{
-// duplicate row:
+ // duplicate row:
SwSelBoxes aSelBoxes;
aSelBoxes.insert( pTableBox );
GetDoc().InsertRow(aSelBoxes);
@@ -1665,7 +1656,7 @@ void SwFltOutDoc::SetCellBorder(const SvxBoxItem& rFmtBox,
pTableBox->GetFrmFmt()->SetFmtAttr(rFmtBox);
}
-// not activated !!!
+// not activated!
void SwFltOutDoc::SetCellSpace(sal_uInt16 nDist)
{
if(!pTable){
@@ -1721,8 +1712,8 @@ void SwFltOutDoc::EndTable()
OSL_ENSURE(pTable, "EndTable without table");
return;
}
- // Close all attributes, because otherwise
- // attributes extending into Flys might be created
+ // Close all attributes, because otherwise
+ // attributes extending into Flys might be created
rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
@@ -1743,7 +1734,7 @@ void SwFltOutDoc::EndTable()
sal_Bool SwFltOutDoc::SeekCell(short nRow, short nCol, sal_Bool bPam)
{
-// get structs to table cells
+ // get structs to table cells
const SwTableLines* pTableLines = &pTable->GetTabLines();
SwTableLine* pTableLine = (*pTableLines)[usTableY];
SwTableBoxes* pTableBoxes = &pTableLine->GetTabBoxes();
@@ -1774,16 +1765,11 @@ sal_Bool SwFltOutDoc::SeekCell(short nRow, short nCol, sal_Bool bPam)
return sal_True;
}
-
-//-----------------------------------------------------------------------------
// Flys in SwFltOutBase
-//-----------------------------------------------------------------------------
-
SfxItemSet* SwFltOutBase::NewFlyDefaults()
{
-// Set required default values ( except when they will be explicitly set
-// later )
-
+ // Set required default values ( except when they will be explicitly set
+ // later )
SfxItemSet* p = new SfxItemSet( GetDoc().GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
SwFmtFrmSize aSz( ATT_VAR_SIZE, MINFLY, MINFLY );
@@ -1827,10 +1813,7 @@ void SwFltOutBase::EndFly()
}
}
-//-----------------------------------------------------------------------------
// Flys in SwFltDoc
-//-----------------------------------------------------------------------------
-
/* virtual */ bool SwFltOutDoc::IsInFly()
{
return pFly != 0;
@@ -1851,23 +1834,23 @@ bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, 0 );
SfxItemSet* pSet = NewFlyDefaults();
-// Close all attributes, because otherwise attributes extending into Flys might
-// be created
+ // Close all attributes, because otherwise attributes extending into Flys might
+ // be created
rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
-// create Fly:
+ // create Fly:
OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // recursive doesn't work yet
pFlySavedPos = new SwPosition(*pPaM->GetPoint());
SwFmtAnchor aAnchor( eAnchor, 1 );
-// If the style contained Fly attributes, use them as defaults now
+ // If the style contained Fly attributes, use them as defaults now
if (pMoreAttrs)
pSet->Put(*pMoreAttrs);
-// this NOT for page-dependent Fly with page NUMBER !
+ // this NOT for page-dependent Fly with page NUMBER !
aAnchor.SetAnchor(pPaM->GetPoint()); // surprisingly, doesn't require
// the stack
@@ -1875,7 +1858,7 @@ bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
SwFrmFmt* pF = MakeFly( eAnchor, pSet );
delete pSet;
-// set pam in Fly
+ // set pam in Fly
const SwFmtCntnt& rCntnt = pF->GetCntnt();
OSL_ENSURE( rCntnt.GetCntntIdx(), "No prepared content." );
pPaM->GetPoint()->nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
@@ -1911,8 +1894,8 @@ void SwFltOutDoc::EndFly()
OSL_FAIL( "SwFltOutDoc::EndFly() in Table" );
return;
}
- // Close all attributes, because otherwise
- // attributes extending into Flys might be created
+ // Close all attributes, because otherwise
+ // attributes extending into Flys might be created
rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
@@ -1923,9 +1906,6 @@ void SwFltOutDoc::EndFly()
pFly = 0;
}
-//-----------------------------------------------------------------------------
-// Flys in SwFltFormatCollection
-//-----------------------------------------------------------------------------
/*virtual*/ bool SwFltFormatCollection::IsInFly()
{
return bHasFly;
@@ -1971,10 +1951,6 @@ bool SwFltFormatCollection::BeginStyleFly( SwFltOutDoc* pOutDoc )
return false;
}
-//-----------------------------------------------------------------------------
-// Flys in SwFltShell
-//-----------------------------------------------------------------------------
-
bool SwFltShell::BeginFly( RndStdIds eAnchor,
sal_Bool bAbsolutePos)
{
@@ -2018,10 +1994,6 @@ void SwFltShell::EndFly()
eSubMode = None;
}
-//-----------------------------------------------------------------------------
-// Footnotes
-//-----------------------------------------------------------------------------
-
void SwFltShell::BeginFootnote()
{
if( pOut->IsInFly() ){ // Happens at footnote in Fly, among others
@@ -2033,11 +2005,11 @@ void SwFltShell::BeginFootnote()
return;
}
-// Close all attributes, because otherwise attributes extending into
-// footnotes might be created
+ // Close all attributes, because otherwise attributes extending into
+ // footnotes might be created
aStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
-// Don't force-close EndStack for now, so bookmarks on footnotes can
-// be applied to PMW
+ // Don't force-close EndStack for now, so bookmarks on footnotes can
+ // be applied to PMW
SwFmtFtn aFtn;
GetDoc().InsertPoolItem(*pPaM, aFtn, 0);
@@ -2062,12 +2034,12 @@ void SwFltShell::EndFootnote()
{
if(!pSavedPos)
return;
- // Close all attributes, because otherwise
- // attributes extending out of footnotes might
- // be created
+ // Close all attributes, because otherwise
+ // attributes extending out of footnotes might
+ // be created
aStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
-// Don't force-close EndStack for now, so bookmarks on footnotes can
-// be applied to PMW
+ // Don't force-close EndStack for now, so bookmarks on footnotes can
+ // be applied to PMW
*pPaM->GetPoint() = *pSavedPos; // restore Cursor
delete pSavedPos;
@@ -2123,8 +2095,8 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
sal_uInt16 nPos;
if (bFollow && pFirstPageDesc->GetFollow() != pFirstPageDesc)
return pFirstPageDesc; // Error: already has Follow
-// Detection of duplicate names still missing (low probability of this
-// actually occurring)
+ // Detection of duplicate names still missing (low probability of this
+ // actually occurring)
nPos = GetDoc().MakePageDesc( SwViewShell::GetShellRes()->GetPageDescName(
GetDoc().GetPageDescCnt(), bFollow ? ShellResource::FOLLOW_PAGE : ShellResource::NORMAL_PAGE),
@@ -2132,7 +2104,8 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
pNewPD = &GetDoc().GetPageDesc(nPos);
if (bFollow)
- { // This one follows pPageDesc
+ {
+ // This one follows pPageDesc
pFirstPageDesc->SetFollow(pNewPD);
pNewPD->SetFollow(pNewPD);
}
@@ -2145,7 +2118,6 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
return pNewPD;
}
-///////////////////////////////////////////////// SwFltFormatCollection
SwFltFormatCollection::SwFltFormatCollection(
SwDoc& _rDoc, RES_POOL_COLLFMT_TYPE nType ) :
SwFltOutBase(_rDoc),
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index bfcbf3bbcbd5..7bdb397c29e4 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -37,7 +37,7 @@ Ww1SingleSprm* Ww1Sprm::pSingleSprm = 0;
-/////////////////////////////////////////////////////////////////// Fib
+// Fib
Ww1Fib::Ww1Fib( SvStream& _rStream )
: rStream(_rStream)
{
@@ -45,8 +45,7 @@ Ww1Fib::Ww1Fib( SvStream& _rStream )
rStream.Read( &aFib, sizeof( aFib )) == sizeof( aFib );
}
-///////////////////////////////////////////////////////////// PlainText
-
+// PlainText
Ww1PlainText::Ww1PlainText(Ww1Fib& rWwFib, sal_uLong nFilePos, sal_uLong nCountBytes)
: rFib(rWwFib), ulFilePos(nFilePos), ulCountBytes(nCountBytes),
ulSeek(0), bOK(true)
@@ -80,7 +79,7 @@ OUString Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const
OUString();
}
-///////////////////////////////////////////////////////////////// Style
+// Style
Ww1Style::Ww1Style()
: pPapx(0), pParent(0), stcBase(0), stcNext(0), bUsed(false)
{
@@ -213,7 +212,7 @@ sal_uInt16 Ww1Style::ReadEstcp(sal_uInt8*&p, sal_uInt16& rnCountBytes)
return 0;
}
-//////////////////////////////////////////////////////////// StyleSheet
+// StyleSheet
Ww1StyleSheet::Ww1StyleSheet(Ww1Fib& _rFib)
: cstcStd(0),
rFib(_rFib),
@@ -315,33 +314,32 @@ sal_uInt16 Ww1StyleSheet::ReadEstcp(sal_uInt8*& p, sal_uInt16& rnCountBytes)
return 0;
}
-///////////////////////////////////////////////////////////////// Fonts
-
+// Fonts
Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, sal_uLong nFieldFlgs)
: pFontA(0), rFib(rInFib), nFieldFlags(nFieldFlgs), nMax(0), bOK(false)
{
- if(rFib.GetFIB().cbSttbfffnGet() > 2 ) // ueberhaupt fonts?
+ if(rFib.GetFIB().cbSttbfffnGet() > 2 ) // any fonts at all?
{
SVBT16 nCountBytes;
OSL_ENSURE(rFib.GetFIB().cbSttbfffnGet() > sizeof(nCountBytes), "Ww1Fonts");
if (rFib.GetStream().Seek(rFib.GetFIB().fcSttbfffnGet())
== (sal_uLong)rFib.GetFIB().fcSttbfffnGet())
if (rFib.GetStream().Read(nCountBytes, sizeof(nCountBytes))
- == sizeof(nCountBytes)) // Laenge steht hier nochmal
+ == sizeof(nCountBytes)) // length is repeated here
{
OSL_ENSURE(SVBT16ToShort(nCountBytes)
== rFib.GetFIB().cbSttbfffnGet(), "redundant-size missmatch");
- // hoffentlich sind sie immer gleich
+ // hopefully they're always equal
W1_FFN* pA = (W1_FFN*)new char[rFib.GetFIB().cbSttbfffnGet()
- - sizeof(nCountBytes)]; // Alloziere Font-Array
+ - sizeof(nCountBytes)]; // allocate Font-Array
//~ Ww1: new-NULL
if (rFib.GetStream().Read(pA, rFib.GetFIB().cbSttbfffnGet()
- sizeof(nCountBytes)) == (sal_uLong)rFib.GetFIB().cbSttbfffnGet()
- - sizeof(nCountBytes)) // lese alle Fonts
- {} //nothing
+ - sizeof(nCountBytes)) // read all Fonts
+ {} // nothing
long nLeft = rFib.GetFIB().cbSttbfffnGet()
- - sizeof(nCountBytes); // Zaehle, wieviele Fonts enthalten
+ - sizeof(nCountBytes); // count how many contain fonts
W1_FFN* p = pA;
while (true)
{
@@ -357,9 +355,9 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, sal_uLong nFieldFlgs)
}
if (nMax)
{
- pFontA = new W1_FFN*[nMax]; // alloziere Index-Array
+ pFontA = new W1_FFN*[nMax]; // allocate Index-Array
//~ Ww1: new-NULL
- pFontA[0] = pA; // fuelle Index-Array
+ pFontA[0] = pA; // fill Index-Array
sal_uInt16 i;
for(i=1, p=pA; i<nMax; i++)
{
@@ -368,7 +366,7 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, sal_uLong nFieldFlgs)
}
}
else
- pFontA = 0; // Keine Eintraege -> kein Array
+ pFontA = 0; // no entries -> no Array
}
}
bOK = sal_True;
@@ -383,7 +381,7 @@ W1_FFN* Ww1Fonts::GetFFN(sal_uInt16 nNum)
return pRet;
}
-/////////////////////////////////////////////////////////////////// DOP
+// DOP
Ww1Dop::Ww1Dop(Ww1Fib& _rFib)
: rFib(_rFib)
{
@@ -398,7 +396,7 @@ Ww1Dop::Ww1Dop(Ww1Fib& _rFib)
rFib.GetStream().Read(&aDop, nRead) == (sal_uLong)nRead;
}
-/////////////////////////////////////////////////////////////// Picture
+// Picture
Ww1Picture::Ww1Picture(SvStream& rStream, sal_uLong ulFilePos)
: bOK(false), pPic(0)
{
@@ -416,7 +414,7 @@ Ww1Picture::Ww1Picture(SvStream& rStream, sal_uLong ulFilePos)
}
}
-////////////////////////////////////////////////////////////////// Sprm
+// Sprm
Ww1Sprm::Ww1Sprm(sal_uInt8* x, sal_uInt16 _nCountBytes)
: p(NULL),
nCountBytes(_nCountBytes),
@@ -699,7 +697,7 @@ void Ww1Sprm::InitTab()
aTab[163] = new Ww1SingleSprm(5, DUMPNAME("sprmTSetBrc10")); // 163 tap.rgtc[].rgbrc complex (see below) 5 bytes
}
-////////////////////////////////////////////////////////////// SprmPapx
+// SprmPapx
Ww1SprmPapx::Ww1SprmPapx(sal_uInt8* pByte, sal_uInt16 nSize) :
Ww1Sprm(Sprm(pByte, nSize), SprmSize(pByte, nSize))
{
@@ -724,7 +722,7 @@ sal_uInt8* Ww1SprmPapx::Sprm(sal_uInt8* pByte, sal_uInt16 nSize)
return pRet;
}
-/////////////////////////////////////////////////////////////////// Plc
+// Plc
Ww1Plc::Ww1Plc(Ww1Fib& rInFib, sal_uLong ulFilePos, sal_uInt16 nInCountBytes,
sal_uInt16 nInItemSize)
: p(0), nCountBytes(nInCountBytes), iMac(0), nItemSize(nInItemSize),
@@ -778,11 +776,11 @@ sal_uInt8* Ww1Plc::GetData(sal_uInt16 nIndex)
OSL_ENSURE(nIndex < iMac, "index out of bounds");
if (nIndex < iMac)
pRet = p + (iMac + 1) * sizeof(SVBT32) +
- nIndex * nItemSize; // Pointer auf Inhalts-Array
+ nIndex * nItemSize; // Pointer to content array
return pRet;
}
-///////////////////////////////////////////////////////////// PlcBookmarks
+// PlcBookmarks
// class Ww1StringList liest im Ctor eine Anzahl von P-Strings aus dem Stream
// in den Speicher und patcht sie zu C-Strings um.
// Die Anzahl wird in nMax zurueckgeliefert.
@@ -791,7 +789,7 @@ sal_uInt8* Ww1Plc::GetData(sal_uInt16 nIndex)
Ww1StringList::Ww1StringList( SvStream& rSt, sal_uLong nFc, sal_uInt16 nCb )
: pIdxA(0), nMax(0)
{
- if( nCb > 2 ) // ueberhaupt Eintraege ?
+ if( nCb > 2 ) // any entries at all?
{
SVBT16 nCountBytes;
OSL_ENSURE(nCb > sizeof(nCountBytes), "Ww1StringList");
@@ -929,7 +927,7 @@ const OUString Ww1Bookmarks::GetName() const
return aNames.GetStr( nPlcIdx[0] );
}
-/////////////////////////////////////////////////////////////////// Fkp
+// Fkp
Ww1Fkp::Ww1Fkp(SvStream& rStream, sal_uLong ulFilePos, sal_uInt16 _nItemSize) :
nItemSize(_nItemSize),
bOK(sal_False)
@@ -954,11 +952,11 @@ sal_uInt8* Ww1Fkp::GetData(sal_uInt16 nIndex)
OSL_ENSURE(nIndex<=Count(), "index out of bounds");
if (nIndex<=Count())
pRet = aFkp + (Count()+1) * sizeof(SVBT32) +
- nIndex * nItemSize; // beginn der strukturen
+ nIndex * nItemSize; // start of the structures
return pRet;
}
-//////////////////////////////////////////////////////////////// FkpPap
+// FkpPap
sal_Bool Ww1FkpPap::Fill(sal_uInt16 nIndex, sal_uInt8*& p, sal_uInt16& rnCountBytes)
{
OSL_ENSURE( nIndex < Count(), "Ww1FkpPap::Fill() Index out of Range" );
@@ -985,7 +983,7 @@ sal_Bool Ww1FkpPap::Fill(sal_uInt16 nIndex, sal_uInt8*& p, sal_uInt16& rnCountBy
return sal_True;
}
-//////////////////////////////////////////////////////////////// FkpChp
+// FkpChp
sal_Bool Ww1FkpChp::Fill(sal_uInt16 nIndex, W1_CHP& aChp)
{
OSL_ENSURE( nIndex < Count(), "Ww1FkpChp::Fill() Index out of Range" );
@@ -1003,7 +1001,7 @@ sal_Bool Ww1FkpChp::Fill(sal_uInt16 nIndex, W1_CHP& aChp)
return sal_True;
}
-///////////////////////////////////////////////////////////////// Assoc
+// Assoc
Ww1Assoc::Ww1Assoc(Ww1Fib& _rFib)
: rFib(_rFib), pBuffer(NULL), bOK(sal_False)
{
@@ -1039,7 +1037,7 @@ OUString Ww1Assoc::GetStr(sal_uInt16 code)
RTL_TEXTENCODING_MS_1252);
}
-/////////////////////////////////////////////////////////////////// Pap
+// Pap
Ww1Pap::Ww1Pap(Ww1Fib& _rFib)
: Ww1PlcPap(_rFib), nPlcIndex(0), nPushedPlcIndex(0xffff), nFkpIndex(0),
nPushedFkpIndex(0xffff), ulOffset(0), pPap(0)
@@ -1137,7 +1135,7 @@ sal_Bool Ww1Pap::HasId(sal_uInt16 nId)
return bRet;
}
-/////////////////////////////////////////////////////////////////// Chp
+// Chp
Ww1Chp::Ww1Chp(Ww1Fib& _rFib)
: Ww1PlcChp(_rFib), nPlcIndex(0), nPushedPlcIndex(0xffff), nFkpIndex(0),
nPushedFkpIndex(0xffff), ulOffset(0), pChp(0)
@@ -1183,7 +1181,7 @@ void Ww1Chp::operator++()
}
}
-////////////////////////////////////////////////////////////// Manager
+// Manager
Ww1Manager::Ww1Manager(SvStream& rStrm, sal_uLong nFieldFlgs)
: bOK(sal_False), bInTtp(false), bInStyle(false), bStopAll(false), aFib(rStrm),
aDop(aFib), aFonts(aFib, nFieldFlgs), aDoc(aFib), pDoc(&aDoc),
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 279575128d2f..1d0da194e3d1 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -65,8 +65,6 @@ class Ww1SprmSep;
class Ww1Style;
class Ww1StyleSheet;
-///////////////////////////////////////////////////////////////////////
-//
// nach moeglichkeit wurden in diesem modul methoden aehnlicher
// funktionalitaet gleich benannt. Die namen wurden wenn moeglich vom
// ww-filter uebernommen.
@@ -86,14 +84,10 @@ class Ww1StyleSheet;
// GetError() gibt zurueck, ob fehler aufgetreten ist
// Start(), Stop(), Out(), op<< siehe modul w1filter
// Dump() siehe modul w1dump
-//
-
-/////////////////////////////////////////////////////////////////// Fib
-//
-// file information block: wurzel des uebels: steht am beginn der
-// datei (seek(0)) und enthaelt alle positionen der strukturen der
-// datei
-//
+
+// file information block: root of the evil: it's at the start of the
+// file (seek(0)) and contains all positions of the structures of the
+// file.
class Ww1Fib
{
W1_FIB aFib;
@@ -107,10 +101,7 @@ public:
SvStream& GetStream() { return rStream; }
};
-/////////////////////////////////////////////////////////////////// Dop
-//
-// document property: eigenschaften des gesamten dokuments
-//
+// document property: properties of the entire document
class Ww1Dop
{
W1_DOP aDop;
@@ -126,11 +117,8 @@ public:
void Out(Ww1Shell&);
};
-///////////////////////////////////////////////////////////// PlainText
-//
-// ww-dateien koennen mehrere textbloecke enthalten (main-text,
-// fusznoten etc). PlainText vereinigt die gemeinsamkeiten
-//
+// ww-files can contain several blocks of text (main-text,
+// footnotes etc). PlainText vereinigt die gemeinsamkeiten
class Ww1PlainText
{
protected:
@@ -141,7 +129,7 @@ protected:
sal_Bool bOK;
public:
Ww1PlainText(Ww1Fib& rWwFib, sal_uLong nFilePos, sal_uLong nCountBytes);
- // innerhalb des textes
+ // within the text
sal_uLong Where() const { return ulSeek; }
void Seek( sal_uLong ulNew )
{
@@ -175,7 +163,6 @@ public:
static bool IsChar( sal_Unicode c ) { return c >= MinChar; }
};
-/////////////////////////////////////////////////////////////// DocText
class Ww1DocText : public Ww1PlainText
{
public:
@@ -185,7 +172,6 @@ public:
}
};
-/////////////////////////////////////////////////////////////// FtnText
class Ww1FtnText : public Ww1PlainText
{
public:
@@ -197,7 +183,6 @@ public:
}
};
-/////////////////////////////////////////////////////////////// HddText
class Ww1HddText : public Ww1PlainText
{
public:
@@ -209,7 +194,6 @@ public:
}
};
-/////////////////////////////////////////////////////////////// McrText
class Ww1McrText : public Ww1PlainText
{
public:
@@ -222,7 +206,6 @@ public:
}
};
-/////////////////////////////////////////////////////////////// AtnText
class Ww1AtnText : public Ww1PlainText
{
public:
@@ -235,10 +218,7 @@ public:
}
};
-///////////////////////////////////////////////////////////////// Style
-//
-// ein einzelner style oder vorlage
-//
+// a single style or template
class Ww1Style
{
OUString aName;
@@ -267,10 +247,7 @@ public:
void Out(Ww1Shell&, Ww1Manager&);
};
-//////////////////////////////////////////////////////////// StyleSheet
-//
-// die sammlung aller vorlagen (max. 256)
-//
+// collection of all templates (max. 256)
class Ww1StyleSheet
{
Ww1Style aStyles[256];
@@ -299,19 +276,16 @@ public:
return !bOK; }
};
-///////////////////////////////////////////////////////////////// Fonts
-//
// ww kennt nur font-nummern beim formatieren. nebenher gibts ein
// array von fonts, damit man aus der nummer einen konkreten font
// machen kann.
-//
class Ww1Fonts
{
protected:
W1_FFN** pFontA; // Array of Pointers to Font Description
Ww1Fib& rFib;
sal_uLong nFieldFlags;
- sal_uInt16 nMax; // Array-Groesse
+ sal_uInt16 nMax; // Array size
sal_Bool bOK;
public:
Ww1Fonts(Ww1Fib&, sal_uLong nFieldFlgs);
@@ -328,8 +302,7 @@ public:
SvxFontItem GetFont(sal_uInt16);
};
-//////////////////////////////////////////////////////////// SingleSprm
-//
+// SingleSprm
// diese klassen ersetzen die aSprmTab etc des ww6-filters. die
// funktionspointer sind hier virtuale methoden, fuer die typen (byte,
// word, var-sized etc) gibt es abgeleitete klassen. diese haben
@@ -341,20 +314,17 @@ public:
// wohlgemerkt: SingleSprms sind die _beschreibung_ und _funktion_ der
// Sprms, nicht deren inhalt. dieser musz uebergeben werden an die
// einzelnen methoden wie Size, Dump und Start/Stop.
-//
class Ww1SingleSprm
{
public:
#ifdef DUMP
-//
-// allein die virtuellen methoden stehen in der vtab, also je nachdem,
-// ob fuer dumper oder filter uebersetzt wird ausblenden: das spart
-// platz. ausserdem stehen die methoden fuer dumper bzw filter in
-// verschiedenen modulen, die im jeweils anderen projekt nicht
-// uebersetzt werden. das diese dann beim linken nicht zur verfuegung
-// stehen faellt dann auch nicht auf. Der Namensstring ist nur im
-// Dumper noetig: weg damit im Filter.
-//
+ // allein die virtuellen methoden stehen in der vtab, also je nachdem,
+ // ob fuer dumper oder filter uebersetzt wird ausblenden: das spart
+ // platz. ausserdem stehen die methoden fuer dumper bzw filter in
+ // verschiedenen modulen, die im jeweils anderen projekt nicht
+ // uebersetzt werden. das diese dann beim linken nicht zur verfuegung
+ // stehen faellt dann auch nicht auf. Der Namensstring ist nur im
+ // Dumper noetig: weg damit im Filter.
void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
virtual std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
@@ -523,7 +493,7 @@ public:
Ww1SingleSprmWord(sName) {
}
void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- // SetBorder() wird auch fuer Tabellen gebraucht, deshalb public
+ // SetBorder() is needed for tables, too. That's why it's public
static editeng::SvxBorderLine* SetBorder(editeng::SvxBorderLine*, W1_BRC10*);
};
@@ -586,7 +556,7 @@ public:
Ww1SingleSprmPChgTabsPapx(sal_Char* sName) :
Ww1SingleSprmByteSized(0, sName) {
}
- // Size() ist noch nicht aktiviert !!
+ // Size() is not yet activated!
void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
};
@@ -700,10 +670,7 @@ public:
void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
};
-////////////////////////////////////////////////////////////////// Sprm
-//
// der tatsaechlich in der datei auftretende datentyp Sprm
-//
class Ww1Sprm
{
sal_Bool ReCalc();
@@ -723,17 +690,17 @@ protected:
sal_Bool bOK;
sal_uInt16* pArr;
sal_uInt16 count;
-// ohne Token, mit laengen-byte/word
+ // ohne Token, mit laengen-byte/word
sal_uInt16 GetSize(sal_uInt8 nId, sal_uInt8* pSprm);
-// mit Token und LaengenByte
+ // mit Token und LaengenByte
sal_uInt16 GetSizeBrutto(sal_uInt8* pSprm) {
sal_uInt8 nId = *pSprm++;
return GetSize(nId, pSprm) + 1; }
-// gibt fuer nTh element id, size & zeiger auf daten:
-// sal_Bool Fill(sal_uInt16, sal_uInt8&, sal_uInt16&, sal_uInt8*&);
+ // returns for the n-th element id, size & pointer to data:
+ // sal_Bool Fill(sal_uInt16, sal_uInt8&, sal_uInt16&, sal_uInt8*&);
public:
-// SH: brauche ich public
-// gibt fuer nTh element id, size & zeiger auf daten:
+ // SH: I need it to be public
+ // returns for the n-th element id, size & pointer to data:
sal_Bool Fill(sal_uInt16, sal_uInt8&, sal_uInt16&, sal_uInt8*&);
Ww1Sprm(sal_uInt8*, sal_uInt16);
@@ -752,11 +719,8 @@ public:
static void DeinitTab();
};
-/////////////////////////////////////////////////////////////// Picture
-//
-// der wrapper um den datentyp PIC, eine struktur, die am beginn eines
-// bild-dateinamens oder eines eingebetteten bildes steht.
-//
+// the wrapper around the type PIC, a structure, which stands at the beginning
+// of a picture filename or an embedded picture
class Ww1Picture
{
sal_Bool bOK;
@@ -772,12 +736,9 @@ public:
void WriteBmp(SvStream&);
};
-/////////////////////////////////////////////////////////////////// Plc
-//
// eine der wichtigen array-strukturen der ww-dateien. sie beinhalten
// n+1 dateipositionen und n attribute, die zwischen den
// dateipositionen gelten.
-//
class Ww1Plc
{
sal_uInt8* p;
@@ -792,7 +753,7 @@ public:
Ww1Plc(Ww1Fib&, sal_uLong, sal_uInt16, sal_uInt16);
~Ww1Plc();
friend std::ostream& operator <<(std::ostream&, Ww1Plc&);
- sal_uLong Where(sal_uInt16); // wie im jeweiligen plc
+ sal_uLong Where(sal_uInt16); // like in each plc
void Seek(sal_uLong, sal_uInt16&);
void Fill(sal_uInt16 nIndex, sal_uLong& begin, sal_uLong& end) {
begin = Where(nIndex);
@@ -808,7 +769,6 @@ public:
//Plc 2, 2, 6, 0, 2, 0
//Fkp 1, 1, 0, 0, 0, 0
-/////////////////////////////////////////////////////////// PlcGlossary
class Ww1PlcGlossary : public Ww1Plc
{
public:
@@ -818,7 +778,6 @@ public:
}
};
-////////////////////////////////////////////////////// PlcAnnotationRef
class Ww1PlcAnnotationRef : public Ww1Plc
{
public:
@@ -828,7 +787,6 @@ public:
}
};
-////////////////////////////////////////////////////// PlcAnnotationTxt
class Ww1PlcAnnotationTxt : public Ww1Plc
{
public:
@@ -838,7 +796,7 @@ public:
}
};
-///////////////////////////////////////////////////////// PlcAnnotation
+// PlcAnnotation
class Ww1Annotation {
Ww1PlcAnnotationRef aRef;
Ww1PlcAnnotationTxt aTxt;
@@ -850,7 +808,6 @@ public:
friend std::ostream& operator <<(std::ostream&, Ww1Annotation&);
};
-//////////////////////////////////////////////////////////////// PlcSep
class Ww1PlcSep : public Ww1Plc
{
public:
@@ -861,7 +818,6 @@ public:
friend std::ostream& operator <<(std::ostream&, Ww1PlcSep&);
};
-//////////////////////////////////////////////////////////////// PlcChp
class Ww1PlcChp : public Ww1Plc
{
public:
@@ -872,7 +828,6 @@ public:
friend std::ostream& operator <<(std::ostream&, Ww1PlcChp&);
};
-//////////////////////////////////////////////////////////////// PlcPap
class Ww1PlcPap : public Ww1Plc
{
public:
@@ -883,7 +838,6 @@ public:
friend std::ostream& operator <<(std::ostream&, Ww1PlcPap&);
};
-//////////////////////////////////////////////////////// PlcFootnoteRef
class Ww1PlcFootnoteRef : public Ww1Plc
{
public:
@@ -894,7 +848,6 @@ public:
friend std::ostream& operator <<(std::ostream&, Ww1PlcFootnoteRef&);
};
-//////////////////////////////////////////////////////// PlcFootnoteTxt
class Ww1PlcFootnoteTxt : public Ww1Plc
{
public:
@@ -905,7 +858,6 @@ public:
friend std::ostream& operator <<(std::ostream&, Ww1PlcFootnoteTxt&);
};
-///////////////////////////////////////////////////////////// PlcFields
class Ww1PlcFields : public Ww1Plc
{
public:
@@ -914,12 +866,12 @@ public:
{}
W1_FLD* GetData(sal_uInt16 nIndex)
{ return (W1_FLD*)Ww1Plc::GetData(nIndex); }
- sal_uLong Where(sal_uInt16 nIndex) // absolut im file
+ sal_uLong Where(sal_uInt16 nIndex) // absolute within the file
{ return Ww1Plc::Where(nIndex) + rFib.GetFIB().fcMinGet(); }
friend std::ostream& operator <<(std::ostream&, Ww1PlcFields&);
};
-///////////////////////////////////////////////////////////// PlcBookmarks
+// PlcBookmarks
class Ww1StringList
{
sal_Char** pIdxA;
@@ -950,9 +902,9 @@ public:
{}
sal_uInt8* GetData(sal_uInt16 nIndex) { return Ww1Plc::GetData(nIndex); }
- // Position als CP
+ // Position as CP
sal_uLong WhereCP(sal_uInt16 nIndex) { return Ww1Plc::Where(nIndex); }
- // absolut im file
+ // absolute within the file
sal_uLong Where(sal_uInt16 nIndex)
{
return ( nIndex < Count() )
@@ -961,7 +913,6 @@ public:
}
};
-//////////////////////////////////////////////////////////////// PlcHdd
class Ww1PlcHdd : public Ww1Plc
{
public:
@@ -971,11 +922,8 @@ public:
{}
};
-/////////////////////////////////////////////////////////////////// Fkp
-//
// aehnlich den plcs aufgebaute arrays, die sich auf eine groesze von
-// 512 byte beschraenken.
-//
+// 512 byte beschraenken
class Ww1Fkp
{
protected:
@@ -990,7 +938,6 @@ public:
sal_uLong Where(sal_uInt16); // wie im entsprechenden fkp
};
-//////////////////////////////////////////////////////////////// FkpPap
class Ww1FkpPap : public Ww1Fkp
{
public:
@@ -1001,7 +948,6 @@ public:
sal_Bool Fill(sal_uInt16, sal_uInt8*&, sal_uInt16&);
};
-//////////////////////////////////////////////////////////////// FkpChp
class Ww1FkpChp : public Ww1Fkp
{
#ifdef DUMP
@@ -1020,7 +966,6 @@ public:
sal_Bool Fill(sal_uInt16, W1_CHP&);
};
-////////////////////////////////////////////////////////////// SprmPapx
class Ww1SprmPapx : public Ww1Sprm
{
W1_PAPX aPapx;
@@ -1033,7 +978,6 @@ public:
void Stop(Ww1Shell&, Ww1Manager&);
};
-/////////////////////////////////////////////////////////////// SprmSep
class Ww1SprmSep : public Ww1Sprm
{
public:
@@ -1043,7 +987,6 @@ public:
friend std::ostream& operator <<(std::ostream&, Ww1SprmSep&);
};
-///////////////////////////////////////////////////////////////// Assoc
class Ww1Assoc
{
enum fields { FileNext, Dot, Title, Subject, KeyWords, Comments,
@@ -1065,8 +1008,6 @@ public:
void Out(Ww1Shell&);
};
-////////////////////////////////////////////////////////// HeaderFooter
-//
// Header/Footer/Footnoteseparators sind einer nach dem naechsten in
// einem eigenen text gespeichert. ein plc trennt diesen text in
// einzelne teile. diese werden durchnummeriert als ihdd. nun gibt es
@@ -1080,19 +1021,18 @@ public:
// HeaderFooter merkt sich fuer jede der 9 die momentane einstellung
// (jedoch nicht die alten) und den naechstvergebbaren ihdd. ist ein
// teil nicht vorhanden bekommt er den wert 0xffff.
-//
class Ww1HeaderFooter : public Ww1PlcHdd
{
- sal_uInt16 nextIhdd; // naechster textteil im HddText
- sal_uInt16 nFtnSep; // fusznoten trenner
- sal_uInt16 nFtnFollowSep; // folge fusznoten trenner
- sal_uInt16 nFtnNote; // folgefunsznotennotiz
- sal_uInt16 nEvenHeadL; // kopfzeilen grader seiten
- sal_uInt16 nOddHeadL; // kopfzeilen ungrader seiten
- sal_uInt16 nEvenFootL; // fuszzeilen grader seiten
- sal_uInt16 nOddFootL; // fuszzeilen ungerader seiten
- sal_uInt16 nFirstHeadL; // kopfzeilen der ersten seite
- sal_uInt16 nFirstFootL; // fuszzeilen der ersten seite
+ sal_uInt16 nextIhdd; // naechster textteil im HddText
+ sal_uInt16 nFtnSep; // fusznoten trenner
+ sal_uInt16 nFtnFollowSep; // folge fusznoten trenner
+ sal_uInt16 nFtnNote; // folgefunsznotennotiz
+ sal_uInt16 nEvenHeadL; // kopfzeilen grader seiten
+ sal_uInt16 nOddHeadL; // kopfzeilen ungrader seiten
+ sal_uInt16 nEvenFootL; // fuszzeilen grader seiten
+ sal_uInt16 nOddFootL; // fuszzeilen ungerader seiten
+ sal_uInt16 nFirstHeadL; // kopfzeilen der ersten seite
+ sal_uInt16 nFirstFootL; // fuszzeilen der ersten seite
enum HeaderFooterMode {
None, FtnSep, FtnFollowSep, FtnNote, EvenHeadL, OddHeadL,
EvenFootL, OddFootL, FirstHeadL, MaxHeaderFooterMode
@@ -1205,20 +1145,19 @@ public:
void Stop(Ww1Shell&, Ww1Manager&, sal_Unicode&);
};
-//////////////////////////////////////////////////////////////// Fields
class Ww1Fields : public Ww1PlcFields
{
sal_uInt16 nPlcIndex;
OUString sErgebnis; // das von word errechnete ergebniss
SwField* pField;
- sal_uLong Where(sal_uInt16 nIndex) // innerhalb des textes
+ sal_uLong Where(sal_uInt16 nIndex) // within the text
{ return Ww1PlcFields::Where(nIndex) - rFib.GetFIB().fcMinGet(); }
public:
Ww1Fields(Ww1Fib& rFibL, sal_uLong ulFilePos, sal_uInt16 nBytes)
: Ww1PlcFields(rFibL, ulFilePos, nBytes), nPlcIndex(0), pField(0)
{}
- // innerhalb des textes
+ // within the text
sal_uLong Where() { return Where(nPlcIndex); }
void operator++()
{
@@ -1274,7 +1213,6 @@ public:
{}
};
-//////////////////////////////////////////////////////////////// Bookmarks
class Ww1Bookmarks
{
Ww1PlcBookmarkTxt aNames;
@@ -1304,7 +1242,6 @@ public:
void Out(Ww1Shell&, Ww1Manager&, sal_uInt16=0);
};
-///////////////////////////////////////////////////////////// Footnotes
class Ww1Footnotes : public Ww1PlcFootnoteRef
{
sal_uInt16 nPlcIndex;
@@ -1314,7 +1251,7 @@ public:
Ww1Footnotes(Ww1Fib& rFibL)
: Ww1PlcFootnoteRef(rFibL), nPlcIndex(0), aText(rFibL), bStarted(sal_False)
{}
- // innerhalb des textes
+ // within the text
sal_uLong Where()
{
sal_uLong ulRet = 0xffffffff;
@@ -1331,7 +1268,6 @@ public:
void Stop(Ww1Shell&, Ww1Manager&, sal_Unicode&);
};
-/////////////////////////////////////////////////////////////////// Sep
class Ww1Sep : public Ww1PlcSep
{
Ww1HeaderFooter aHdd;
@@ -1343,7 +1279,7 @@ public:
Ww1HeaderFooter& GetHdd() { return aHdd; }
void operator++() { nPlcIndex++; }
sal_uInt8* GetData() { return Ww1PlcSep::GetData(nPlcIndex); }
- // innerhalb des textes
+ // within the text
sal_uLong Where() { return Ww1PlcSep::Where(nPlcIndex); }
void SetGrpfIhdt(sal_uInt8 grpfIhdt)
{
@@ -1354,7 +1290,6 @@ public:
{ aHdd.Stop(rOut, rMan, c); }
};
-/////////////////////////////////////////////////////////////////// Pap
class Ww1Pap : public Ww1PlcPap
{
sal_uInt16 nPlcIndex;
@@ -1381,7 +1316,7 @@ class Ww1Pap : public Ww1PlcPap
public:
Ww1Pap(Ww1Fib& rFib);
~Ww1Pap() { delete pPap; }
- sal_uLong Where( sal_Bool bSetIndex = sal_True ); // innerhalb des textes
+ sal_uLong Where( sal_Bool bSetIndex = sal_True ); // within the text
void operator++();
sal_Bool FillStart(sal_uInt8*& pB, sal_uInt16& nSize)
{
@@ -1424,7 +1359,6 @@ public:
sal_Bool HasId(sal_uInt16 nId);
};
-/////////////////////////////////////////////////////////////////// Chp
class Ww1Chp : public Ww1PlcChp
{
sal_uInt16 nPlcIndex;
@@ -1448,7 +1382,7 @@ class Ww1Chp : public Ww1PlcChp
public:
Ww1Chp( Ww1Fib& rFib );
~Ww1Chp() { delete pChp; }
- sal_uLong Where( sal_Bool bSetIndex = sal_True ); // innerhalb des textes
+ sal_uLong Where( sal_Bool bSetIndex = sal_True ); // within the text
void operator++();
sal_Bool FillStart(W1_CHP& rChp)
{
@@ -1485,12 +1419,9 @@ public:
}
};
-/////////////////////////////////////////////////////////////// Manager
-//
// zentraler aufhaenger der ww-seite des filters, konstruiert aus dem
// inputstream (ww-datei) enthaelt er alles, was noetig ist, um in die
// shell (pm-seite) gepiped zu werden.
-//
class Ww1Manager
{
sal_Bool bOK;
@@ -1500,17 +1431,17 @@ class Ww1Manager
Ww1Fib aFib;
Ww1Dop aDop;
Ww1Fonts aFonts;
-// ab jetzt alles paarig, fuer 'pushed':
+ // ab jetzt alles paarig, fuer 'pushed':
Ww1DocText aDoc;
Ww1PlainText* pDoc;
sal_uLong ulDocSeek;
sal_uLong* pSeek;
Ww1TextFields aFld;
Ww1Fields* pFld;
-// selbst 'push'bar:
+ // selbst 'push'bar:
Ww1Chp aChp;
Ww1Pap aPap;
-// nicht in textbereichen vorhanden, wenn ge'pushed'
+ // nicht in textbereichen vorhanden, wenn ge'pushed'
Ww1Footnotes aFtn;
Ww1Bookmarks aBooks;
Ww1Sep aSep;
@@ -1523,7 +1454,7 @@ public:
Ww1Manager(SvStream& rStrm, sal_uLong nFieldFlgs);
sal_Bool GetError() const { return !bOK; }
-// Fuer Tabellen
+ // for tables
void SetInTtp(bool bSet = true) { bInTtp = bSet; }
bool IsInTtp() const { return bInTtp; }
void SetInStyle(bool bSet = true) { bInStyle = bSet; }
@@ -1534,7 +1465,7 @@ public:
sal_Bool HasTtp();
sal_Bool LastHasTtp();
-// Fuer Flys
+ // for flys
sal_Bool HasPPc();
sal_Bool HasPDxaAbs();
@@ -1542,7 +1473,7 @@ public:
Ww1PlainText& GetText() { return *pDoc; }
Ww1Dop& GetDop() { return aDop; }
Ww1Sep& GetSep() { return aSep; }
- // innerhalb des textes
+ // within the text
sal_uLong Where() { return pDoc->Where(); }
void Fill( sal_Unicode& rChr ) { pDoc->Out( rChr ); }
sal_uInt8 Fill( OUString& rStr, sal_uLong ulLen)
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 06b074b1772a..970461e97796 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -67,9 +67,6 @@
using namespace css;
using namespace nsSwDocInfoSubType;
-
-///////////////////////////////////////////////////////////////////////
-//
// hier stehen die methoden operator<<, Out, Start und Stop mit
// folgender Bedeutung: wenn moeglich wird die information aus dem
// dokument per
@@ -85,45 +82,46 @@ using namespace nsSwDocInfoSubType;
// ausnahme haben: hier stehen auch methoden, die aus anderen gruenden
// fuer den dumper sinnlos sind, zB wenn sie auf sv-strukturen beruhen
// wie zB GetFont() auf SvxFontItem.
-//
-/////////////////////////////////////////////////////////////// Manager
+// Manager
Ww1Shell& operator <<(Ww1Shell& rOut, Ww1Manager& This)
{
// verhindern, das bei rekusivem aufruf dies mehrfach passiert:
if (!This.Pushed())
{
- { // der wird nur temporaer gebraucht:
+ {
+ // is only needed temporarily
This.SetInStyle( true );
Ww1StyleSheet(This.aFib).Out(rOut, This);
This.SetInStyle( false );
}
- { // dieser auch:
+ {
+ // this one, too
Ww1Assoc(This.aFib).Out(rOut);
}
- // dieser nicht, der ist bereits member:
+ // dieser nicht, der ist bereits member:
This.aDop.Out(rOut);
- // Jetzt entscheiden, wie Seitenvorlagen erzeugt werden
+ // Jetzt entscheiden, wie Seitenvorlagen erzeugt werden
if (This.GetSep().Count() <= 1)
rOut.SetUseStdPageDesc();
}
- // und jetzt das eigentliche dok:
+ // and now the actual dok
sal_Unicode cUnknown = ' ';
while (*This.pSeek < This.pDoc->Count())
{
- // ausgabe des ProgressState nur, wenn im haupttext, da sonst
- // nicht bestimmt werden kann, wie weit wir sind:
+ // ausgabe des ProgressState nur, wenn im haupttext, da sonst
+ // nicht bestimmt werden kann, wie weit wir sind:
if (!This.Pushed())
::SetProgressState(This.Where() * 100 / This.pDoc->Count(),
rOut.GetDoc().GetDocShell());
- // hier werden abwechselnd die attribute und die zeichen in die
- // shell gepumpt. die positionen werden durch das lesen der
- // zeichen aus dem manager hoch- gezaehlt. erst alle attribute:
+ // hier werden abwechselnd die attribute und die zeichen in die
+ // shell gepumpt. die positionen werden durch das lesen der
+ // zeichen aus dem manager hoch- gezaehlt. erst alle attribute:
This.Out(rOut, cUnknown);
- // das textdocument pDoc ist ein Ww1PlainText, dessen Out()
- // methode solange ausgibt, bis entweder ein sonderzeichen
- // auftaucht oder die anzahl der auszugebenden zeichen erreicht
- // ist:
+ // das textdocument pDoc ist ein Ww1PlainText, dessen Out()
+ // methode solange ausgibt, bis entweder ein sonderzeichen
+ // auftaucht oder die anzahl der auszugebenden zeichen erreicht
+ // ist:
cUnknown = This.pDoc->Out(rOut, *This.pSeek);
}
This.SetStopAll(true);
@@ -134,7 +132,7 @@ Ww1Shell& operator <<(Ww1Shell& rOut, Ww1Manager& This)
void Ww1Manager::OutStop(Ww1Shell& rOut, sal_Unicode cUnknown)
{
- // Bookmarks brauchen nicht beendet werden ???
+ // bookmarks don't need to be ended?
if (pFld)
pFld->Stop(rOut, *this, cUnknown);
if (!Pushed())
@@ -149,7 +147,7 @@ void Ww1Manager::OutStop(Ww1Shell& rOut, sal_Unicode cUnknown)
void Ww1Manager::OutStart( Ww1Shell& rOut )
{
-// alle attribute, die's brauchen beginnen
+ // alle attribute, die's brauchen beginnen
if (!Pushed())
aSep.Start(rOut, *this);
if (true)
@@ -162,27 +160,27 @@ void Ww1Manager::OutStart( Ww1Shell& rOut )
pFld->Start(rOut, *this);
if (!Pushed())
aBooks.Start(rOut, *this);
-// bestimmen, wo das naechste Ereigniss ist:
+ // bestimmen, wo das naechste Ereigniss ist:
sal_uLong ulEnd = pDoc->Count(); // spaetestens am textende
if (!Pushed())
- if (ulEnd > aSep.Where()) // naechster Sep vorher?
+ if (ulEnd > aSep.Where()) // next Sep prior?
ulEnd = aSep.Where();
if (true)
- if (ulEnd > aPap.Where()) // naechster Pap vorher?
+ if (ulEnd > aPap.Where()) // next Pap prior?
ulEnd = aPap.Where();
if (true)
- if (ulEnd > aChp.Where()) // naechster Chp vorher?
+ if (ulEnd > aChp.Where()) // next Chp prior?
ulEnd = aChp.Where();
if (!Pushed())
- if (ulEnd > aFtn.Where()) // naechster Ftn vorher?
+ if (ulEnd > aFtn.Where()) // next Ftn prior?
ulEnd = aFtn.Where();
if (pFld)
- if (ulEnd > pFld->Where()) // naechster Fld vorher?
+ if (ulEnd > pFld->Where()) // next Fld prior?
ulEnd = pFld->Where();
if (!Pushed())
- if (ulEnd > aBooks.Where()) // naechster Bookmark vorher?
+ if (ulEnd > aBooks.Where()) // next Bookmark prior?
ulEnd = aBooks.Where();
- *pSeek = Where(); // momentane position
+ *pSeek = Where(); // current position
if (*pSeek < ulEnd) // sind wir bereits weiter?
*pSeek = ulEnd;
}
@@ -197,7 +195,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
// unbehandelte sonderzeichen augegeben. das werden genauso alle
// start-methoden gerufen und danach per where festgestellt, an
// welcher stelle die naechste aktion zu erwarten ist.
-//
+
// ist der manager in einem ge'push'ten mode, werden bestimmte
// elemente ausgeklammert. felder werden wiederum nur in besonderen
// faellen augeklammert, wenn naemlich bereiche ausgegeben werden, die
@@ -221,7 +219,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
OutStop( rOut, cUnknown ); // Attrs ggfs. beenden
-// meta-zeichen interpretieren:
+ // meta-zeichen interpretieren:
if (!Ww1PlainText::IsChar(cUnknown))
switch (cUnknown)
{
@@ -306,8 +304,6 @@ void Ww1Manager::Pop()
pFld = &aFld;
}
-///////////////////////////////////////////////////////////// Bookmarks
-
void Ww1Bookmarks::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16)
{
if (GetIsEnd())
@@ -317,7 +313,7 @@ void Ww1Bookmarks::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16)
}
const OUString & rName = GetName();
- if( rName.startsWith( "_Toc" ) ) // "_Toc*" ist ueberfluessig
+ if( rName.startsWith( "_Toc" ) ) // "_Toc*" is superfluous
return;
if( rOut.IsFlagSet( SwFltControlStack::HYPO )
@@ -329,11 +325,11 @@ void Ww1Bookmarks::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16)
if( nLen > MAX_FIELDLEN )
nLen = MAX_FIELDLEN;
- // Lese Inhalt des Bookmark
+ // read content of the bookmark
// geht vermulich auch ueber Ww1PlainText
OUString aVal( rMan.GetText().GetText( Where(), nLen ) );
- // in 2 Schritten, da OS/2 zu doof ist
+ // in 2 steps, since OS/2 is too stupid
SwFltBookmark aBook( rName, aVal, GetHandle() );
rOut << aBook;
}
@@ -347,7 +343,6 @@ void Ww1Bookmarks::Start(Ww1Shell& rOut, Ww1Manager& rMan)
}
}
-///////////////////////////////////////////////////////////// Footnotes
void Ww1Footnotes::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
if (rMan.Where() >= Where())
@@ -393,7 +388,6 @@ void Ww1Footnotes::Stop(Ww1Shell& /*rOut*/, Ww1Manager& rMan, sal_Unicode& c)
}
}
-//////////////////////////////////////////////////////////////// Fields
void Ww1Fields::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
if (rMan.Where() >= Where()){
@@ -449,7 +443,7 @@ static WWDateTime GetTimeDatePara( const OUString& rForm,
if( pTime )
*pTime = TF_SSMM_12;
}
- else // keine Zeit
+ else // no time
{
eDT = (WWDateTime)( eDT & ~(sal_uInt16)WW_TIME );
}
@@ -457,7 +451,7 @@ static WWDateTime GetTimeDatePara( const OUString& rForm,
sal_Int32 nDPos = 0;
while (true)
{
- nDPos = rForm.indexOf('M', nDPos); // M -> Datum
+ nDPos = rForm.indexOf('M', nDPos); // M -> date
if (nDPos == 0 || nDPos == -1)
break;
sal_Unicode cPrev = rForm[nDPos - 1];
@@ -468,7 +462,7 @@ static WWDateTime GetTimeDatePara( const OUString& rForm,
++nDPos;
}
- if (nDPos != -1) // Monat -> Datum ?
+ if (nDPos != -1) // month -> date ?
{
static SwDateFormat const aDateA[32] =
{
@@ -536,10 +530,10 @@ extern void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth)
{
- OUString sType; // der typ als string
- OUString sFormel; // die formel
+ OUString sType; // the type as string
+ OUString sFormel; // the formula
OUString sFormat;
- OUString sDTFormat; // Datum / Zeit-Format
+ OUString sDTFormat; // date/time format
W1_FLD* pData = GetData(); // die an den plc gebunden daten
OSL_ENSURE(pData->chGet()==19, "Ww1Fields"); // sollte beginn sein
@@ -655,12 +649,12 @@ oncemore:
SwSetExpFieldType( &rOut.GetDoc(), aName, nsSwGetSetExpType::GSE_STRING ) );
pField = new SwSetExpField((SwSetExpFieldType*)pFT, aStr);
((SwSetExpField*)pField)->SetSubType( nsSwExtendedSubType::SUB_INVISIBLE );
-// Invisible macht in 378 AErger, soll aber demnaechst gehen
+ // Invisible macht in 378 AErger, soll aber demnaechst gehen
// das Ignorieren des Bookmarks ist nicht implementiert
}
break;
- case 14: // info var
+ case 14: // info variable
{
OUString aSubType;
pos = aStr.indexOf(' ');
@@ -678,16 +672,16 @@ oncemore:
aSubType = rOut.ConvertUStr(aSubType);
- // ganz grosze schiete: der typ 'info' kann einem der
- // typen 15..31 entsprechen. er enthaelt als formel
- // das eingentliche feld der doc-info.
- // kein ';' benutzen mit folgendem macro:
+ // huge pile of shit: the type 'info' can represent one of
+ // types 15 to 31. it contains as formula the actual field
+ // of the doc info.
+ // Don't use ';' with the following macro
#define IS(sd, se, t) \
if (aSubType == sd || aSubType == se) \
rbType = t; \
else
- // deutsche bez. englische bez. typ-code
+ // german name english name type-code
IS("titel", "title", 15)
IS("thema", "subject", 16)
IS("autor", "author", 17)
@@ -756,7 +750,7 @@ oncemore:
case WW_BOTH: nReg = DI_SUB_DATE; break;
default:
break;
- // WW_DONTKNOW -> Default bereits gesetzt
+ // WW_DONTKNOW -> Default already set
}
pField = new SwDocInfoField((SwDocInfoFieldType*)
rOut.GetSysFldType(RES_DOCINFOFLD), nSub | nReg, OUString());
@@ -792,8 +786,8 @@ oncemore:
SwTimeFormat aTime = TF_SYSTEM;
WWDateTime eDT = GetTimeDatePara(sDTFormat, &aTime, &aDate);
- if( eDT == WW_DONTKNOW ) // kein D/T-Formatstring
- eDT = ( rbType == 32 ) ? WW_TIME : WW_DATE; // benutze ID
+ if( eDT == WW_DONTKNOW ) // no D/T-format string
+ eDT = ( rbType == 32 ) ? WW_TIME : WW_DATE; // use ID
if( eDT & WW_DATE )
{
@@ -807,7 +801,7 @@ oncemore:
if( eDT == WW_BOTH )
rOut << * pField << ' ';
- // Mogel: direkt einfuegen und Space dahinter
+ // Cheat: insert directly and a space afterwards
}
if( eDT & WW_TIME )
{
@@ -913,7 +907,7 @@ oncemore:
((SwSetExpField*)pField)->SetInputFlag( sal_True );
((SwSetExpField*)pField)->SetSubType(nsSwExtendedSubType::SUB_INVISIBLE);
}
- case 39: // fillin command
+ case 39: // filling command
pField = new SwInputField(
static_cast<SwInputFieldType*>(rOut.GetSysFldType( RES_INPUTFLD )),
OUString(), sFormel,
@@ -949,11 +943,11 @@ oncemore:
OUString sName;
while (*pFormel != '\0' && *pFormel != ' ')
{
- // ab hier koennte eine extension kommen
+ // from here on a extension could appear
if (*pFormel == '.')
pDot = pFormel;
else
- // aha: wir waren bislang noch in dirs
+ // so far we were in directories
if (*pFormel == '\\')
{
pDot = 0;
@@ -1032,16 +1026,15 @@ oncemore:
sal_uLong Ww1Fields::GetLength()
{
-// berechnet die laenge eines feldteiles. nicht mitgerechnet werden
-// die terminierenden zeichen im text (19, 20, 21) die beginn, trenner
-// und ende bedeuten.
+ // berechnet die laenge eines feldteiles. nicht mitgerechnet werden
+ // die terminierenden zeichen im text (19, 20, 21) die beginn, trenner
+ // und ende bedeuten.
sal_uLong ulBeg = Where();
sal_uLong ulEnd = Where(nPlcIndex+1);
OSL_ENSURE(ulBeg<ulEnd, "Ww1Fields");
return (ulEnd - ulBeg) - 1;
}
-/////////////////////////////////////////////////////////////////// Sep
void Ww1Sep::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
if (rMan.Where() >= Where())
@@ -1059,10 +1052,10 @@ void Ww1Sep::Start(Ww1Shell& rOut, Ww1Manager& rMan)
rFmt.SetFmtAttr(aLR);
SvxULSpaceItem aUL(rDOP.dyaTopGet(), rDOP.dyaBottomGet(), RES_UL_SPACE);
rFmt.SetFmtAttr(aUL);
- // sobald wir mit dem lesen der zeichen soweit sind, wo sep's
- // momentanes attribut beginnt, wird dieses attribut eingefuegt.
- // diese methode ist bei den meisten start/stop methoden der
- // memberklassen des managers identisch.
+ // sobald wir mit dem lesen der zeichen soweit sind, wo sep's
+ // momentanes attribut beginnt, wird dieses attribut eingefuegt.
+ // diese methode ist bei den meisten start/stop methoden der
+ // memberklassen des managers identisch.
sal_uInt8* pByte = GetData();
Ww1SprmSep aSprm(rFib, SVBT32ToUInt32(pByte + 2));
aSprm.Start(rOut, rMan);
@@ -1072,18 +1065,17 @@ void Ww1Sep::Start(Ww1Shell& rOut, Ww1Manager& rMan)
}
}
-/////////////////////////////////////////////////////////////////// Pap
void Ww1Pap::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
if (rMan.Where() >= Where())
{
sal_uInt8* pByte;
sal_uInt16 cb;
- // bereitstellen der zu startenden attribute
+ // bereitstellen der zu startenden attribute
if (FillStart(pByte, cb))
{
Ww1SprmPapx aSprm(pByte, cb);
- // und ausgeben:
+ // and give the following output
aSprm.Start(rOut, rMan);
}
++(*this);
@@ -1105,11 +1097,8 @@ void Ww1Pap::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
}
}
-//////////////////////////////////////////////////////////////// W1_CHP
-//
// momentan laesst sich die ausgabe von W1CHPxen nicht nur per define
-// loesen....
-//
+// loesen...
void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
{
if (fBoldGet())
@@ -1190,7 +1179,6 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
}
}
-/////////////////////////////////////////////////////////////////// Chp
void Ww1Chp::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
if (rMan.Where() >= Where())
@@ -1218,7 +1206,7 @@ void Ww1Chp::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
W1_CHP aChpx;
if (FillStop(aChpx))
{
- // zuerst alle toggle-flags
+ // zuerst alle toggle-flags
if (aChpx.fBoldGet())
rOut.EndItem(RES_CHRATR_WEIGHT);
if (aChpx.fItalicGet())
@@ -1229,8 +1217,8 @@ void Ww1Chp::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
rOut.EndItem(RES_CHRATR_CONTOUR);
if (aChpx.fSmallCapsGet() || aChpx.fCapsGet())
rOut.EndItem(RES_CHRATR_CASEMAP);
- // dann alle zahl-werte, diese haben flags, wenn sie gesetzt
- // sind..................
+ // dann alle zahl-werte, diese haben flags, wenn sie gesetzt
+ // sind...
if (aChpx.fsHpsGet())
rOut.EndItem(RES_CHRATR_FONTSIZE);
if (aChpx.fsKulGet())
@@ -1250,23 +1238,20 @@ void Ww1Chp::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
}
}
-///////////////////////////////////////////////////////////////// Style
void Ww1Style::Out(Ww1Shell& rOut, Ww1Manager& rMan)
{
-// Zuerst Basis, damit Attribute des Basis-Styles erkannt werden
-// first: Base................................................
+ // Zuerst Basis, damit Attribute des Basis-Styles erkannt werden
+ // first: Base
if(pParent->GetStyle(stcBase).IsUsed() ) // Basis gueltig ?
rOut.BaseStyle(stcBase);
-// next of all: CHP...............................................
+ // next of all: CHP
aChpx.Out(rOut, rMan);
-// Last: PAP.......................................................
+ // Last: PAP
if (pPapx)
pPapx->Start(rOut, rMan);
}
-////////////////////////////////////////////////////////// Ww1PlainText
-//
// die Out() methoden von plaintext fuer den filter geben eine anzahl
// zeichen aus auf die shell, einen string oder einen char, wieviel
// zeichen ausgegeben werden, bestimmt ulEnd, das das ende bestimmt,
@@ -1280,11 +1265,10 @@ void Ww1Style::Out(Ww1Shell& rOut, Ww1Manager& rMan)
// also beachten, dasz wenn !IsChar(Out(...)) gilt, ulEnd unter
// umstaenden nicht erreicht wurde. dann wurde das kontrollzeichen
// zwar (weg-)gelesen, jedoch noch nicht ausgegeben.
-//
sal_Unicode Ww1PlainText::Out( Ww1Shell& rOut, sal_uLong& ulEnd )
{
-// gibt die zeichen bis ulEnd aus, es sei den es kommen sonderzeichen
-// die eine bedeutung haben wie absatzende oder seitenumbruch.
+ // gibt die zeichen bis ulEnd aus, es sei den es kommen sonderzeichen
+ // die eine bedeutung haben wie absatzende oder seitenumbruch.
if (ulEnd > Count())
ulEnd = Count();
while (ulSeek < ulEnd)
@@ -1301,7 +1285,7 @@ sal_Unicode Ww1PlainText::Out( Ww1Shell& rOut, sal_uLong& ulEnd )
sal_Unicode Ww1PlainText::Out(OUString& rStr, sal_uLong ulEnd)
{
-// wie Out(Shell..., jedoch ausgabe auf einen string
+ // wie Out(Shell..., jedoch ausgabe auf einen string
rStr = "";
if (ulEnd > Count())
ulEnd = Count();
@@ -1317,9 +1301,7 @@ sal_Unicode Ww1PlainText::Out(OUString& rStr, sal_uLong ulEnd)
return Ww1PlainText::MinChar;
}
-//
// hier eruebrigt sich ulEnd...oder?
-//
sal_Unicode Ww1PlainText::Out( sal_Unicode& rRead )
{
rRead = (*this)[ulSeek];
@@ -1327,8 +1309,6 @@ sal_Unicode Ww1PlainText::Out( sal_Unicode& rRead )
return rRead;
}
-/////////////////////////////////////////////////////////// Ww1SprmPapx
-
void Ww1SprmPapx::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
if( !rMan.IsInStyle() ){ // Innerhalb Style gehts ueber die
@@ -1364,19 +1344,18 @@ void Ww1SprmPapx::Stop(Ww1Shell& rOut, Ww1Manager& rMan)
}
}
-///////////////////////////////////////////////////////////////// Fonts
SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
{
-// erzeugen eine fonts im sw-sinne aus den word-strukturen
+ // erzeugen eine fonts im sw-sinne aus den word-strukturen
FontFamily eFamily = FAMILY_DONTKNOW;
OUString aName;
FontPitch ePitch = PITCH_DONTKNOW;
rtl_TextEncoding eCharSet = RTL_TEXTENCODING_DONTKNOW;
switch (nFCode)
{
-// In the Winword 1.x format, the names of the first three fonts were
-// omitted from the table and assumed to be "Tms Rmn" (for ftc = 0),
-// "Symbol", and "Helv"
+ // In the Winword 1.x format, the names of the first three fonts were
+ // omitted from the table and assumed to be "Tms Rmn" (for ftc = 0),
+ // "Symbol", and "Helv"
case 0:
eFamily = FAMILY_ROMAN;
aName = "Tms Rmn";
@@ -1399,23 +1378,23 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
W1_FFN* pF = GetFFN(nFCode - 3);
if (pF != 0)
{
- // Fontname .........................................
+ // Fontname
aName = OUString( (sal_Char*)pF->szFfnGet(), strlen( (sal_Char*)pF->szFfnGet() ),
RTL_TEXTENCODING_MS_1252 );
- // Pitch .............................................
+ // Pitch
static const FontPitch ePitchA[] =
{
PITCH_DONTKNOW, PITCH_FIXED, PITCH_VARIABLE, PITCH_DONTKNOW
};
ePitch = ePitchA[pF->prgGet()];
- // CharSet ...........................................
+ // CharSet
eCharSet = RTL_TEXTENCODING_MS_1252;
if (aName.equalsIgnoreAsciiCase("Symbol")
|| aName.equalsIgnoreAsciiCase("Symbol Set")
|| aName.equalsIgnoreAsciiCase("Wingdings")
|| aName.equalsIgnoreAsciiCase("ITC Zapf Dingbats") )
eCharSet = RTL_TEXTENCODING_SYMBOL;
- // FontFamily ........................................
+ // FontFamily
sal_uInt16 b = pF->ffGet();
static const FontFamily eFamilyA[] =
{
@@ -1436,7 +1415,7 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
}
break;
}
- // Extrawurst Hypo
+ // Extrawurst Hypo
if ( SwFltGetFlag( nFieldFlags, SwFltControlStack::HYPO )
&& ( aName.equalsIgnoreAsciiCase("Helv")
|| aName.equalsIgnoreAsciiCase("Helvetica") ) )
@@ -1447,12 +1426,12 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
}
else
{
- // VCL matcht die Fonts selber
- // allerdings passiert bei Helv, Tms Rmn und System Monospaced
- // Scheisse, so dass diese ersetzt werden muessen.
- // Nach TH sollen diese durch feste Werte ersetzt werden,
- // also nicht ueber System::GetStandardFont, damit keine
- // Namenslisten auftauchen ( Dieses koennte den User verwirren )
+ // VCL matcht die Fonts selber
+ // allerdings passiert bei Helv, Tms Rmn und System Monospaced
+ // Scheisse, so dass diese ersetzt werden muessen.
+ // Nach TH sollen diese durch feste Werte ersetzt werden,
+ // also nicht ueber System::GetStandardFont, damit keine
+ // Namenslisten auftauchen ( Dieses koennte den User verwirren )
if( aName.equalsIgnoreAsciiCase("Helv"))
{
aName = "Helvetica";
@@ -1471,11 +1450,10 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
ePitch = PITCH_FIXED;
}
}
-// nun koennen wir den font basteln: .........................
+ // nun koennen wir den font basteln
return SvxFontItem(eFamily, aName, OUString(), ePitch, eCharSet, RES_CHRATR_FONT);
}
-/////////////////////////////////////////////////////////////////// Dop
void Ww1Dop::Out(Ww1Shell& rOut)
{
//~ mdt: fehlt
@@ -1521,11 +1499,10 @@ void Ww1Dop::Out(Ww1Shell& rOut)
}
-///////////////////////////////////////////////////////////////// Assoc
void Ww1Assoc::Out(Ww1Shell& rOut)
{
-//~ mdt: fehlen: FileNext, Dot, DataDoc, HeaderDoc, Criteria1,
-// Criteria2, Criteria3, Criteria4, Criteria5, Criteria6, Criteria7
+ //~ mdt: fehlen: FileNext, Dot, DataDoc, HeaderDoc, Criteria1,
+ // Criteria2, Criteria3, Criteria4, Criteria5, Criteria6, Criteria7
SwDocShell *pDocShell(rOut.GetDoc().GetDocShell());
OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell) {
@@ -1546,7 +1523,6 @@ void Ww1Assoc::Out(Ww1Shell& rOut)
}
}
-//////////////////////////////////////////////////////////// StyleSheet
void Ww1StyleSheet::OutDefaults(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 stc)
{
switch (stc){
@@ -1787,7 +1763,7 @@ void Ww1StyleSheet::Out(Ww1Shell& rOut, Ww1Manager& rMan)
}
}
-////////////////////////////////////////////////////////////// Picture
+// Picture
static sal_uLong GuessPicSize(W1_PIC* pPic)
{
sal_uInt16 maxx = pPic->mfp.xExtGet();
@@ -1796,11 +1772,9 @@ static sal_uLong GuessPicSize(W1_PIC* pPic)
return 120L + (sal_uLong)padx * maxy;
}
-//
// folgende methode schreibt eine windows-.BMP-datei aus einem
// embeddeten bild in ww-1 dateien
// gelesen wird 4-bit format, geschrieben jedoch 8-bit.
-//
void Ww1Picture::WriteBmp(SvStream& rOut)
{
long nSize = pPic->lcbGet() - (sizeof(*pPic)-sizeof(pPic->rgb));
@@ -1971,11 +1945,10 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1Manager& /*rMan*/)
rOut << *pGraphic;
}
-////////////////////////////////////////////////////////// HeaderFooter
void Ww1HeaderFooter::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
-// wird sowieso nur bei SEPs aufgerufen, keine weitere pruefung
-// noetig:
+ // wird sowieso nur bei SEPs aufgerufen, keine weitere pruefung
+ // noetig:
if (!rMan.Pushed())
{
while (++(*this))
@@ -2045,5 +2018,4 @@ void Ww1HeaderFooter::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx
index ba035c80eb2e..cef5b5911544 100644
--- a/sw/source/filter/ww1/w1par.cxx
+++ b/sw/source/filter/ww1/w1par.cxx
@@ -27,13 +27,10 @@
#include <swerror.h>
#include <statstr.hrc>
-//----------------------------------------
-// Initialisieren der Feld-FilterFlags
-//----------------------------------------
-
+// Initialisieren der Feld-FilterFlags
static sal_uLong WW1_Read_FieldIniFlags()
{
-// sal_uInt16 i;
+ // sal_uInt16 i;
static const sal_Char* aNames[ 1 ] = { "WinWord/WW1F" };
sal_uInt32 aVal[ 1 ];
SwFilterOptions aOpt( 1, aNames, aVal );
@@ -49,21 +46,18 @@ static sal_uLong WW1_Read_FieldIniFlags()
return nFieldFlags;
}
-////////////////////////////////////////////////// StarWriter-Interface
-//
+// StarWriter-Interface
// Eine Methode liefern die call-Schnittstelle fuer den Writer.
// Read() liest eine Datei. hierzu werden zwei Objekte erzeugt, die Shell,
// die die Informationen aufnimmt und der Manager der sie aus der Datei liest.
// Diese werden dann einfach per Pipe 'uebertragen'.
-//
-
sal_uLong WW1Reader::Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, const OUString& /*cName*/)
{
sal_uLong nRet = ERR_SWG_READ_ERROR;
OSL_ENSURE(pStrm!=NULL, "W1-Read ohne Stream");
if (pStrm != NULL)
{
- sal_Bool bNew = !bInsertMode; // Neues Doc ( kein Einfuegen )
+ sal_Bool bNew = !bInsertMode; // New Doc ( kein Einfuegen )
// erstmal eine shell konstruieren: die ist schnittstelle
// zum writer-dokument
@@ -91,12 +85,12 @@ sal_uLong WW1Reader::Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, co
else
{
if( pMan->GetFib().GetFIB().fComplexGet() )
- //!!! ACHTUNG: hier muss eigentlich ein Error
+ // Attention: hier muss eigentlich ein Error
// wegen Fastsave kommen, das der PMW-Filter
// das nicht unterstuetzt. Stattdessen temporaer
// nur eine Warnung, bis die entsprechende
// Meldung und Behandlung weiter oben eingebaut ist.
-// nRet = WARN_WW6_FASTSAVE_ERR;
+ // nRet = WARN_WW6_FASTSAVE_ERR;
// Zum Einchecken mit neuem String:
nRet = ERR_WW6_FASTSAVE_ERR;
}
@@ -109,18 +103,14 @@ sal_uLong WW1Reader::Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, co
return nRet;
}
-///////////////////////////////////////////////////////////////// Shell
-//
// Die Shell ist die Schnittstelle vom Filter zum Writer. Sie ist
// abgeleitet von der mit ww-filter gemeinsam benutzten Shell
// SwFltShell und enthaelt alle fuer ww1 noetigen Erweiterungen. Wie
// in einen Stream werden alle Informationen, die aus der Datei
// gelesen werden, in die shell ge'piped'.
-//
Ww1Shell::Ww1Shell( SwDoc& rD, SwPaM& rPam, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags)
: SwFltShell(&rD, rPam, rBaseURL, bNew, nFieldFlags)
{
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 6759f53d1ff1..db4e093da221 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -51,11 +51,10 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-/////////////////////////////////////////////////////////////// Ww1Sprm
void Ww1Sprm::Stop( Ww1Shell& rOut, Ww1Manager& rMan)
{
if(IsUsed())
- for(short i=Count()-1;i>=0;i--){ // rueckwaerts
+ for(short i=Count()-1;i>=0;i--){ // backwards
sal_uInt8 nId;
sal_uInt16 nSize;
sal_uInt8* pSprm;
@@ -82,7 +81,6 @@ void Ww1Sprm::Start(
Start(rOut, rMan, i);
}
-//////////////////////////////////////////////////////////// SingleSprm
void Ww1SingleSprm::Start(
Ww1Shell&, sal_uInt8 /*nId*/, sal_uInt8*, sal_uInt16, Ww1Manager&)
{
@@ -94,12 +92,10 @@ void Ww1SingleSprm::Stop(
// OSL_ENSURE(FALSE, "Unknown Sprm");
}
-////////////////////////////////////////////////////////////////// STOP
-//
+// STOP
// The following defines are used for implementing the SingleSprm
// classes' Stop() members, because they normally merely put
// EndItem(s) into the shell.
-//
#define STOP1(Class, Code) \
void Class::Stop( \
Ww1Shell& rOut, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) { \
@@ -109,14 +105,12 @@ void Ww1SingleSprm::Stop(
Ww1Shell& rOut, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) { \
rOut.EndItem(Code1).EndItem(Code2); }
-/////////////////////////////////////////////////////// SingleSprmXxxxx
-//
+// SingleSprmXxxxx
// This starts the evaluation of the actual sprms. Each sprmtyp has
// its own class implementing the virtual methods start and stop. The
// classes are referenced from the sprm table, a static member of
// Ww1Sprm. When an sprm is encountered in the document, the virtual
// methods will be called at the formatting boundaries.
-//
void Ww1SingleSprmPDxaLeft::Start(
Ww1Shell& rOut, sal_uInt8, sal_uInt8* pSprm, sal_uInt16, Ww1Manager&)
{
@@ -637,5 +631,4 @@ void Ww1SingleSprmPFromText::Start(
#undef STOP1
#undef STOP2
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx
index 611fe8410a23..058ad9317e8b 100644
--- a/sw/source/filter/ww1/w1struct.hxx
+++ b/sw/source/filter/ww1/w1struct.hxx
@@ -27,7 +27,7 @@
class Ww1Shell;
class Ww1Manager;
-struct W1_FIB /////////////////////////////////////////////////////////
+struct W1_FIB
{
SVBT16 wIdent;// 0x0 int magic number
sal_uInt16 wIdentGet() {
@@ -371,7 +371,7 @@ struct W1_FIB /////////////////////////////////////////////////////////
// entries in the plcfbtePapx is less than this, the plcfbtePapx is incomplete.
};
-struct W1_DOP ///////////////////////////////////// Document Properties
+struct W1_DOP //Document Properties
{
SVBT16 fFlags;
sal_uInt16 fFlagsGet() {
@@ -497,7 +497,7 @@ struct W1_DOP ///////////////////////////////////// Document Properties
};
// cbDOP is 66.
-struct W1_CHP /////////////////////////////////////////////////////////
+struct W1_CHP
{
SVBT16 fChar;
SVBT16 ftc;// Font Code
@@ -604,7 +604,7 @@ struct W1_FFN ///////////////////////////////////////// Font Descriptor
sal_uInt8* szFfnGet() { return szFfn; }
};
-struct W1_PHE /////////////////////////////////////// Paragraph Height
+struct W1_PHE // Paragraph Height
{
SVBT16 fFlags;
sal_uInt16 fFlagsGet() {
@@ -629,7 +629,7 @@ struct W1_PHE /////////////////////////////////////// Paragraph Height
return SVBT16ToShort(xxx); }
};
-struct W1_PAPX ///////////////////////// Paragraph Property Difference
+struct W1_PAPX // Paragraph Property Difference
{
sal_uInt8 stc;
sal_uInt8 stcGet() { return stc; }
@@ -639,7 +639,7 @@ struct W1_PAPX ///////////////////////// Paragraph Property Difference
return grpprl; }
};
-struct W1_BRC //////////////////////////////////////////// Border Code
+struct W1_BRC // Border Code
{
SVBT16 aBits;
sal_uInt16 aBitsGet() {
@@ -668,7 +668,7 @@ struct W1_BRC //////////////////////////////////////////// Border Code
return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 11) & 0x001f); }
};
-struct W1_BRC10 ///////////////////////////////// Border Code Word 1.0
+struct W1_BRC10 // Border Code Word 1.0
{
SVBT16 aBits;
sal_uInt16 aBitsGet() {
@@ -687,7 +687,7 @@ struct W1_BRC10 ///////////////////////////////// Border Code Word 1.0
return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 15) & 0x0001); }
};
-struct W1_FLD //////////////////////////////////////// FieldDescriptor
+struct W1_FLD // FieldDescriptor
{
sal_uInt8 ch; // boundary-type (begin(19), separator (20), end (21))
sal_uInt8 chGet() { return ch; }
@@ -708,7 +708,7 @@ struct W1_FLD //////////////////////////////////////// FieldDescriptor
return (fltGet() >> 6) & 1; }
};
-struct W1_PIC /////////////////////////////////////// PictureStructure
+struct W1_PIC // PictureStructure
{
SVBT32 lcb;// 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file.
sal_uLong lcbGet() {
@@ -797,7 +797,7 @@ struct W1_PIC /////////////////////////////////////// PictureStructure
sal_uInt8* rgbGet() { return &rgb; }
};
-struct W1_TBD /////////////////////////////////////////////////////////
+struct W1_TBD
{
sal_uInt8 aBits1;
sal_uInt8 aBits1Get() { return aBits1; }
@@ -811,7 +811,7 @@ struct W1_TBD /////////////////////////////////////////////////////////
// * int :2 C0 reserved
};
-struct W1_TC //////////////////////////////////////////////////////////
+struct W1_TC
{
sal_uInt8 aBits1;
sal_uInt8 aBits1Get() { return aBits1; }
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index aef72a3887e2..3c230fda29d6 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -32,8 +32,6 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
@@ -49,11 +47,7 @@ using ::com::sun::star::beans::XPropertySetInfo;
// collision with tools/DateTime: use UNO DateTime as util::DateTime
// using util::DateTime;
-
-//
// a few helper functions
-//
-
static SwDoc* lcl_GetDocViaTunnel( Reference<XTextCursor> & rCursor )
{
Reference<XUnoTunnel> xTunnel( rCursor, UNO_QUERY);
@@ -71,12 +65,10 @@ static SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange )
SwXTextRange *const pXRange =
::sw::UnoTunnelGetImplementation<SwXTextRange>(xTunnel);
// #i115174#: this may be a SvxUnoTextRange
-// OSL_ENSURE( pXRange, "SwXTextRange missing" );
+ // OSL_ENSURE( pXRange, "SwXTextRange missing" );
return (pXRange) ? pXRange->GetDoc() : 0;
}
-
-//
// XTextRangeOrNodeIndexPosition: store a position into the text
// *either* as an XTextRange or as an SwNodeIndex. The reason is that
// we must store either pointers to StartNodes (because redlines may
@@ -84,12 +76,11 @@ static SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange )
// be no existing type that could do both. Things are complicated by
// the matter that (e.g in section import) we delete a few characters,
// which may cause bookmarks (as used by XTextRange) to be deleted.
-//
class XTextRangeOrNodeIndexPosition
{
Reference<XTextRange> xRange;
- SwNodeIndex* pIndex; /// pIndex will point to the *previous* node
+ SwNodeIndex* pIndex; // pIndex will point to the *previous* node
public:
XTextRangeOrNodeIndexPosition();
@@ -197,25 +188,21 @@ bool XTextRangeOrNodeIndexPosition::IsValid()
return ( xRange.is() || (pIndex != NULL) );
}
-
-//
// RedlineInfo: temporary storage for redline data
-//
-
class RedlineInfo
{
public:
RedlineInfo();
~RedlineInfo();
- /// redline type (insert, delete, ...)
+ // redline type (insert, delete, ...)
RedlineType_t eType;
// info fields:
- OUString sAuthor; /// change author string
- OUString sComment; /// change comment string
- util::DateTime aDateTime; /// change DateTime
- sal_Bool bMergeLastParagraph; /// the SwRangeRedline::IsDelLastPara flag
+ OUString sAuthor; // change author string
+ OUString sComment; // change comment string
+ util::DateTime aDateTime; // change DateTime
+ sal_Bool bMergeLastParagraph; // the SwRangeRedline::IsDelLastPara flag
// each position can may be either empty, an XTextRange, or an SwNodeIndex
@@ -225,13 +212,13 @@ public:
// end pos of anchor (may be empty)
XTextRangeOrNodeIndexPosition aAnchorEnd;
- /// index of content node (maybe NULL)
+ // index of content node (maybe NULL)
SwNodeIndex* pContentIndex;
- /// next redline info (for hierarchical redlines)
+ // next redline info (for hierarchical redlines)
RedlineInfo* pNextRedline;
- /// store whether we expect an adjustment for this redline
+ // store whether we expect an adjustment for this redline
bool bNeedsAdjustment;
};
@@ -255,11 +242,7 @@ RedlineInfo::~RedlineInfo()
delete pNextRedline;
}
-
-//
// XMLRedlineImportHelper
-//
-
XMLRedlineImportHelper::XMLRedlineImportHelper(
bool bNoRedlinesPlease,
const Reference<XPropertySet> & rModel,
@@ -752,7 +735,6 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline(
return pData;
}
-
void XMLRedlineImportHelper::SetShowChanges( sal_Bool bShow )
{
bShowChanges = bShow;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 0b562bcaa9ac..391c78968465 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star {
namespace frame { class XModel; }
} } }
-
typedef ::std::map< OUString, RedlineInfo* > RedlineMapType;
class XMLRedlineImportHelper
@@ -51,11 +50,11 @@ class XMLRedlineImportHelper
RedlineMapType aRedlineMap;
- /// if sal_True, no redlines should be inserted into document
- /// (This typically happen when a document is loaded in 'insert'-mode.)
+ // if sal_True, no redlines should be inserted into document
+ // (This typically happen when a document is loaded in 'insert'-mode.)
bool bIgnoreRedlines;
- /// save information for saving and reconstruction of the redline mode
+ // save information for saving and reconstruction of the redline mode
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> xModelPropertySet;
::com::sun::star::uno::Reference<
@@ -67,7 +66,7 @@ class XMLRedlineImportHelper
public:
XMLRedlineImportHelper(
- bool bIgnoreRedlines, /// ignore redlines mode
+ bool bIgnoreRedlines, // ignore redlines mode
// property sets of model + import info for saving + restoring the
// redline mode
@@ -77,34 +76,34 @@ public:
::com::sun::star::beans::XPropertySet> & rImportInfoSet );
virtual ~XMLRedlineImportHelper();
- /// create a redline object
- /// (The redline will be inserted into the document after both start
- /// and end cursor has been set.)
+ // create a redline object
+ // (The redline will be inserted into the document after both start
+ // and end cursor has been set.)
void Add(
- const OUString& rType, /// redline type (insert, del,... )
- const OUString& rId, /// use to identify this redline
- const OUString& rAuthor, /// name of the author
- const OUString& rComment, /// redline comment
- const ::com::sun::star::util::DateTime& rDateTime, /// date+time
- sal_Bool bMergeLastParagraph); /// merge last paragraph?
-
- /// create a text section for the redline, and return an
- /// XText/XTextCursor that may be used to write into it.
+ const OUString& rType, // redline type (insert, del,... )
+ const OUString& rId, // use to identify this redline
+ const OUString& rAuthor, // name of the author
+ const OUString& rComment, // redline comment
+ const ::com::sun::star::util::DateTime& rDateTime, // date+time
+ sal_Bool bMergeLastParagraph); // merge last paragraph?
+
+ // create a text section for the redline, and return an
+ // XText/XTextCursor that may be used to write into it.
::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> CreateRedlineTextSection(
- ::com::sun::star::uno::Reference< /// needed to get the document
+ ::com::sun::star::uno::Reference< // needed to get the document
::com::sun::star::text::XTextCursor> xOldCursor,
- const OUString& rId); /// ID used to RedlineAdd() call
+ const OUString& rId); // ID used to RedlineAdd() call
- /// Set start or end position for a redline in the text body.
- /// Accepts XTextRange objects.
+ // Set start or end position for a redline in the text body.
+ // Accepts XTextRange objects.
void SetCursor(
- const OUString& rId, /// ID used in RedlineAdd() call
- sal_Bool bStart, /// start or end Range
- ::com::sun::star::uno::Reference< /// the actual XTextRange
+ const OUString& rId, // ID used in RedlineAdd() call
+ sal_Bool bStart, // start or end Range
+ ::com::sun::star::uno::Reference< // the actual XTextRange
::com::sun::star::text::XTextRange> & rRange,
- /// text range is (from an XML view) outside of a paragraph
- /// (i.e. before a table)
+ // text range is (from an XML view) outside of a paragraph
+ // (i.e. before a table)
sal_Bool bIsOusideOfParagraph);
/**
@@ -116,19 +115,19 @@ public:
* only be considered valid if it points to the next text node
* after the position given in a previous SetCursor */
void AdjustStartNodeCursor(
- const OUString& rId, /// ID used in RedlineAdd() call
+ const OUString& rId, // ID used in RedlineAdd() call
sal_Bool bStart,
- /// XTextRange _inside_ a table/section
+ // XTextRange _inside_ a table/section
::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange> & rRange);
- /// set redline mode: show changes
+ // set redline mode: show changes
void SetShowChanges( sal_Bool bShowChanges );
- /// set redline mode: record changes
+ // set redline mode: record changes
void SetRecordChanges( sal_Bool bRecordChanges );
- /// set redline protection key
+ // set redline protection key
void SetProtectionKey(
const ::com::sun::star::uno::Sequence<sal_Int8> & rKey );
@@ -139,15 +138,15 @@ private:
void InsertIntoDocument(RedlineInfo* pRedline);
SwRedlineData* ConvertRedline(
- RedlineInfo* pRedline, /// RedlineInfo to be converted
- SwDoc* pDoc); /// document needed for Author-ID conversion
+ RedlineInfo* pRedline, // RedlineInfo to be converted
+ SwDoc* pDoc); // document needed for Author-ID conversion
- /** save the redline mode (if rPropertySet is non-null) */
+ // save the redline mode (if rPropertySet is non-null)
void SaveRedlineMode(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropertySet);
- /** don't restore the saved redline mode */
+ // don't restore the saved redline mode
void DontRestoreRedlineMode();
};
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index f7ab28263365..25e8d73fe9db 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -269,7 +269,7 @@ sal_Int32 ReadThroughComponent(
return 0;
}
-/// read a component (storage version)
+// read a component (storage version)
sal_Int32 ReadThroughComponent(
uno::Reference<embed::XStorage> xStorage,
uno::Reference<XComponent> xModelComponent,
@@ -616,8 +616,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
comphelper::GenericPropertySet_CreateInstance(
new comphelper::PropertySetInfo( aInfoMap ) ) );
- // ---- get BuildId from parent container if available
-
+ // get BuildId from parent container if available
uno::Reference< container::XChild > xChild( xModelComp, uno::UNO_QUERY );
if( xChild.is() )
{
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 0c761d587580..587ff082a345 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -63,12 +63,10 @@ SwXMLWriter::SwXMLWriter( const OUString& rBaseURL )
SetBaseURL( rBaseURL );
}
-
SwXMLWriter::~SwXMLWriter()
{
}
-
sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& xStatusIndicator,
const OUString& aDocHierarchicalName )
{
@@ -587,14 +585,9 @@ bool SwXMLWriter::WriteThroughComponent(
return xFilter->filter( rMediaDesc );
}
-
-// -----------------------------------------------------------------------
-
void GetXMLWriter( const OUString& /*rName*/, const OUString& rBaseURL, WriterRef& xRet )
{
xRet = new SwXMLWriter( rBaseURL );
}
-// -----------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index 8a8f8d0f3906..130f036c886c 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -58,25 +58,25 @@ private:
// helper methods to write XML streams
- /// write a single XML stream into the package
+ // write a single XML stream into the package
bool WriteThroughComponent(
- /// the component we export
+ // the component we export
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent> & xComponent,
- const sal_Char* pStreamName, /// the stream name
- /// service factory for pServiceName
+ const sal_Char* pStreamName, // the stream name
+ // service factory for pServiceName
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext> & rFactory,
- const sal_Char* pServiceName, /// service name of the component
- /// the argument (XInitialization)
+ const sal_Char* pServiceName, // service name of the component
+ // the argument (XInitialization)
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any> & rArguments,
- /// output descriptor
+ // output descriptor
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue> & rMediaDesc );
- /// write a single output stream
- /// (to be called either directly or by WriteThroughComponent(...))
+ // write a single output stream
+ // (to be called either directly or by WriteThroughComponent(...))
bool WriteThroughComponent(
const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream> & xOutputStream,
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 9d7976d0cb18..a077b7200bfa 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -239,5 +239,4 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem )
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx
index 4ca96faaa13f..ab960ca8f9cb 100644
--- a/sw/source/filter/xml/xmlbrshe.hxx
+++ b/sw/source/filter/xml/xmlbrshe.hxx
@@ -23,7 +23,6 @@
#include <rtl/ustring.hxx>
#include <xmloff/attrlist.hxx>
-
class SvxBrushItem;
class SwXMLExport;
@@ -43,7 +42,6 @@ public:
void exportXML( const SvxBrushItem& rItem );
};
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index f862558fc0c6..943315f6bb72 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -76,7 +76,6 @@ public:
const SvxBrushItem& GetItem() const { return *pItem; }
};
-
#endif // _XMLBRSHI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index df90df5b57ad..103474304f66 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -63,7 +63,6 @@
#include <pausethreadstarting.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 07f6e158b2bc..27e249a200d0 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -153,7 +153,6 @@ inline const SvXMLUnitConverter& SwXMLExport::GetTwipUnitConverter() const
return *pTwipUnitConv;
}
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLEXP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index b1e5182bf6d0..53013664cc18 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -50,13 +50,12 @@
#include "fmtrowsplt.hxx"
-
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
using uno::Any;
-/** fills the given attribute list with the items in the given set */
+// fills the given attribute list with the items in the given set
void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
SvXMLAttributeList& rAttrList,
const SfxItemSet& rSet,
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 64c1a6eddd65..6e025f4b7c93 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -187,8 +187,6 @@ SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) :
}
}
-// ---------------------------------------------------------------------
-
class SwXMLConditionContext_Impl : public SvXMLImportContext
{
sal_uInt32 nCondition;
@@ -259,8 +257,6 @@ SwXMLConditionContext_Impl::~SwXMLConditionContext_Impl()
TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext );
-// ---------------------------------------------------------------------
-
typedef std::vector<SwXMLConditionContext_Impl*> SwXMLConditions_Impl;
class SwXMLTextStyleContext_Impl : public XMLTextStyleContext
@@ -423,8 +419,6 @@ void SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
}
}
-// ---------------------------------------------------------------------
-
class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext
{
OUString sMasterPageName;
@@ -717,8 +711,6 @@ bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName()
}
}
-// ---------------------------------------------------------------------
-//
class SwXMLStylesContext_Impl : public SvXMLStylesContext
{
SwXMLItemSetStyleContext_Impl *GetSwStyle( sal_uInt16 i ) const;
@@ -927,8 +919,6 @@ void SwXMLStylesContext_Impl::EndElement()
GetSwImport().InsertStyles( IsAutomaticStyle() );
}
-// ---------------------------------------------------------------------
-//
class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
{
protected:
@@ -983,7 +973,6 @@ void SwXMLMasterStylesContext_Impl::EndElement()
FinishStyles( !GetSwImport().IsInsertMode() );
GetSwImport().FinishStyles();
}
-// ---------------------------------------------------------------------
SvXMLImportContext *SwXMLImport::CreateStylesContext(
const OUString& rLocalName,
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 7404235f082b..3aa03025311f 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -251,7 +251,6 @@ void SwXMLExport::_ExportMasterStyles()
GetPageExport()->exportMasterStyles( sal_False );
}
-// ---------------------------------------------------------------------
class SwXMLAutoStylePoolP : public SvXMLAutoStylePoolP
{
SvXMLExport& rExport;
@@ -338,7 +337,6 @@ SwXMLAutoStylePoolP::SwXMLAutoStylePoolP(SvXMLExport& rExp ) :
{
}
-
SwXMLAutoStylePoolP::~SwXMLAutoStylePoolP()
{
}
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index 1f1dd574de06..78b614d08384 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "hintids.hxx"
#include <com/sun/star/text/XTextDocument.hpp>
#include <xmloff/XMLFontAutoStylePool.hxx>
@@ -27,7 +26,6 @@
#include <xmlexp.hxx>
#include <xmlimp.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::text;
@@ -35,9 +33,7 @@ using namespace ::com::sun::star::text;
class SwXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool
{
public:
-
SwXMLFontAutoStylePool_Impl( SwXMLExport& rExport, bool blockFontEmbedding );
-
};
SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl(
@@ -73,7 +69,6 @@ SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl(
}
}
-
XMLFontAutoStylePool* SwXMLExport::CreateFontAutoStylePool()
{
bool blockFontEmbedding = false;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index f1a999f5054d..77278f2ad0bb 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/document/PrinterIndependentLayout.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
@@ -66,7 +65,6 @@
#include <comphelper/servicehelper.hxx>
#include <comphelper/processfactory.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -79,8 +77,6 @@ using namespace ::com::sun::star::xforms;
using namespace ::xmloff::token;
using namespace ::std;
-//----------------------------------------------------------------------------
-
enum SwXMLDocTokens
{
XML_TOK_DOC_FONTDECLS,
@@ -109,8 +105,6 @@ static SvXMLTokenMapEntry aDocTokenMap[] =
XML_TOKEN_MAP_END
};
-// ----------------------------------------------------------------------------
-
class SwXMLBodyContext_Impl : public SvXMLImportContext
{
const SwXMLImport& GetSwImport() const
@@ -152,8 +146,6 @@ SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext(
return GetSwImport().CreateBodyContentContext( rLocalName );
}
-// ----------------------------------------------------------------------------
-
// #i69629#
// enhance class <SwXMLDocContext_Impl> in order to be able to create subclasses
// NB: virtually inherit so we can multiply inherit properly
@@ -357,7 +349,6 @@ void SwXMLDocStylesContext_Impl::EndElement()
GetImport().GetTextImport()->SetOutlineStyles(
(rSwImport.GetStyleFamilyMask() & SFX_STYLE_FAMILY_PARA ) ? sal_True : sal_False);
}
-//----------------------------------------------------------------------------
const SvXMLTokenMap& SwXMLImport::GetDocElemTokenMap()
{
@@ -924,7 +915,6 @@ void SwXMLImport::endDocument( void )
ClearTextImport();
}
-
// Locally derive XMLTextShapeImportHelper, so we can take care of the
// form import This is Writer, but not text specific, so it should go
// here!
@@ -942,7 +932,6 @@ class SvTextShapeImportHelper : public XMLTextShapeImportHelper
Reference<drawing::XDrawPage> xPage;
public:
-
SvTextShapeImportHelper(SvXMLImport& rImp);
virtual ~SvTextShapeImportHelper();
};
@@ -976,7 +965,6 @@ SvTextShapeImportHelper::~SvTextShapeImportHelper()
}
}
-
XMLTextImportHelper* SwXMLImport::CreateTextImport()
{
return new SwXMLTextImportHelper( GetModel(), *this, getImportInfo(),
@@ -1518,11 +1506,7 @@ void SwXMLImport::initialize(
}
}
-
-//
// UNO component registration helper functions
-//
-
OUString SAL_CALL SwXMLImport_getImplementationName() throw()
{
return OUString(
@@ -1648,7 +1632,6 @@ SwDoc* SwImport::GetDocFromXMLImport( SvXMLImport& rImport )
return pDoc;
}
-
void SwXMLImport::initXForms()
{
// obtain SwDoc
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 1b73883d6c10..3bdac75eac22 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "xmlimpit.hxx"
#include <sax/tools/converter.hxx>
@@ -31,7 +30,6 @@
#include <editeng/xmlcnitm.hxx>
#include <editeng/memberids.hrc>
-
#include "hintids.hxx"
#include "unomid.h"
#include <svx/unomid.hxx>
@@ -75,7 +73,7 @@ SvXMLImportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries )
mrMapEntries = rMapEntries;
}
-/** fills the given itemset with the attributes in the given list */
+// fills the given itemset with the attributes in the given list
void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
uno::Reference< xml::sax::XAttributeList > xAttrList,
const SvXMLUnitConverter& rUnitConverter,
@@ -439,7 +437,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
SvxBoxItem* pBox = PTR_CAST(SvxBoxItem, &rItem);
OSL_ENSURE( pBox != NULL, "Wrong WHich-ID" );
- /** copy SvxBorderLines */
+ // copy SvxBorderLines
BoxHolder aBoxes(pBox);
sal_Int32 nTemp;
@@ -988,5 +986,4 @@ bool SvXMLImportItemMapper::PutXMLValue(
return bOk;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index 75445bbfe76f..7e674ac05944 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -71,5 +71,4 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 2573ce8a10f8..2d0670c9a160 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -66,7 +66,6 @@ public:
};
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 645d0285e480..538412e1fa0f 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/util/MeasureUnit.hpp>
#include <hintids.hxx>
@@ -51,7 +50,6 @@ extern SvXMLItemMapEntry aXMLTableItemMap[];
extern SvXMLItemMapEntry aXMLTableRowItemMap[];
extern SvXMLItemMapEntry aXMLTableCellItemMap[];
-
class SwXMLTableItemMapper_Impl: public SvXMLExportItemMapper
{
SwXMLBrushItemExport aBrushItemExport;
@@ -217,8 +215,6 @@ inline void SwXMLTableItemMapper_Impl::SetAbsWidth( sal_uInt32 nAbs )
nAbsWidth = nAbs;
}
-// ----------------------------------------------------------------------------
-
void SwXMLExport::_InitItemExport()
{
pTwipUnitConv = new SvXMLUnitConverter(getComponentContext(),
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 6441658e998b..86d9a3e66888 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <rtl/ustring.hxx>
#include <com/sun/star/util/MeasureUnit.hpp>
@@ -243,8 +242,6 @@ void SwXMLImportTableItemMapper_Impl::finished(
}
}
-// ---------------------------------------------------------------------
-
class SwXMLItemSetContext_Impl : public SvXMLItemSetContext
{
SvXMLImportContextRef xBackground;
@@ -331,8 +328,6 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
void SwXMLImport::_InitItemImport()
{
pTwipUnitConv = new SvXMLUnitConverter( GetComponentContext(),
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 4907c074c0e6..e1a383bbebac 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -40,7 +40,6 @@ using ::editeng::SvxBorderLine;
using namespace ::xmloff::token;
using namespace ::com::sun::star;
-
#define API_LINE_NONE 0x7FFF
#define API_LINE_SOLID 0
#define API_LINE_DOTTED 1
@@ -55,7 +54,6 @@ using namespace ::com::sun::star;
#define SVX_XML_BORDER_WIDTH_MIDDLE 1
#define SVX_XML_BORDER_WIDTH_THICK 2
-
const struct SvXMLEnumMapEntry psXML_BorderStyles[] =
{
{ XML_NONE, API_LINE_NONE },
@@ -353,5 +351,4 @@ const struct SvXMLEnumMapEntry aXML_KeepTogetherType[] =
{ XML_TOKEN_INVALID, 0}
};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx
index 7abab391bd2e..5388fa063bc2 100644
--- a/sw/source/filter/xml/xmlithlp.hxx
+++ b/sw/source/filter/xml/xmlithlp.hxx
@@ -31,11 +31,8 @@ struct SvXMLEnumMapEntry;
class SvXMLUnitConverter;
class Color;
-
-
/** Define various helper variables and functions for xmlimpit.cxx and
* xmlexpit.cxx. */
-
bool sw_frmitems_parseXMLBorder( const OUString& rValue,
const SvXMLUnitConverter& rUnitConverter,
bool& rHasStyle, sal_uInt16& rStyle,
@@ -69,7 +66,6 @@ extern const struct SvXMLEnumMapEntry aXMLTableAlignMap[];
extern const struct SvXMLEnumMapEntry aXMLTableVAlignMap[];
extern const struct SvXMLEnumMapEntry aXML_KeepTogetherType[];
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 2fd6fdc9dc6b..031853f0a7a4 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -24,11 +24,9 @@
#include <tools/ref.hxx>
#include <xmloff/xmltoken.hxx>
-
#define MID_SW_FLAG_MASK 0x0000ffff
// this flags are used in the item mapper for import and export
-
#define MID_SW_FLAG_SPECIAL_ITEM_IMPORT 0x80000000
#define MID_SW_FLAG_NO_ITEM_IMPORT 0x40000000
#define MID_SW_FLAG_SPECIAL_ITEM_EXPORT 0x20000000
@@ -39,8 +37,6 @@
#define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000
#define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both import and export
-// ---
-
struct SvXMLItemMapEntry
{
sal_uInt16 nNameSpace; // declares the Namespace in which this item
@@ -56,8 +52,6 @@ struct SvXMLItemMapEntry
// and localName
};
-// ---
-
class SvXMLItemMapEntries_impl;
/** this class manages an array of SvXMLItemMapEntry. It is
@@ -83,7 +77,6 @@ public:
SV_DECL_REF( SvXMLItemMapEntries )
SV_IMPL_REF( SvXMLItemMapEntries )
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx
index f2796f8bee66..e19630af2c48 100644
--- a/sw/source/filter/xml/xmlitmpr.cxx
+++ b/sw/source/filter/xml/xmlitmpr.cxx
@@ -24,7 +24,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_TOKEN_INVALID;
// TODO: optimize this!
-
class SvXMLItemMapEntries_impl
{
public:
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 6352f2be4134..79b121a2773a 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -41,8 +41,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
-// ---------------------------------------------------------------------
-
uno::Reference<document::XDocumentProperties>
SwXMLImport::GetDocumentProperties() const
{
@@ -76,8 +74,6 @@ SvXMLImportContext *SwXMLImport::CreateMetaContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
enum SvXMLTokenMapAttrs
{
XML_TOK_META_STAT_TABLE = 1,
@@ -161,8 +157,6 @@ void SwXMLImport::SetStatistics(
pProgress->SetValue( 0 );
}
-// ---------------------------------------------------------------------
-
void SwXMLExport::_ExportMeta()
{
SvXMLExport::_ExportMeta();
diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx
index e5f55ad44c15..39b8dda5a884 100644
--- a/sw/source/filter/xml/xmlscript.cxx
+++ b/sw/source/filter/xml/xmlscript.cxx
@@ -26,8 +26,6 @@
using namespace ::com::sun::star;
-// ---------------------------------------------------------------------
-
SvXMLImportContext *SwXMLImport::CreateScriptContext(
const OUString& rLocalName )
{
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index e3c8ab72e1a7..4eb18137900b 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/text/XTextTable.hpp>
#include <com/sun/star/text/XTextSection.hpp>
@@ -94,8 +93,6 @@ struct SwXMLTableColumnCmpWidth_Impl
}
};
-// ---------------------------------------------------------------------
-
class SwXMLTableColumns_Impl : public o3tl::sorted_vector<SwXMLTableColumn_Impl*, o3tl::less_ptr_to<SwXMLTableColumn_Impl> > {
public:
~SwXMLTableColumns_Impl() { DeleteAndDestroyAll(); }
@@ -180,8 +177,6 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
}
}
-// ---------------------------------------------------------------------
-
typedef vector< SwFrmFmt* > SwXMLFrmFmts_Impl;
class SwXMLTableFrmFmtsSort_Impl
@@ -746,7 +741,7 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd )
nAbsWidth = pTblFmt->FindLayoutRect(sal_True).Width();
if( !nAbsWidth )
{
- // TODO???
+ // TODO?
}
}
ExportTableFmt( *pTblFmt, nAbsWidth );
@@ -762,8 +757,6 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd )
}
}
-// ---------------------------------------------------------------------
-
void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
sal_uInt16 nColSpan,
sal_uInt16 nRowSpan,
@@ -803,7 +796,6 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
if( pBoxSttNd )
{
// start node -> normal cell
-
// get cell range for table
Reference<XCell> xCell = SwXCell::CreateXCell( (SwFrmFmt *)rTblInfo.GetTblFmt(),
(SwTableBox *)&rBox,
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 11802da12ffc..a554381d476a 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -155,8 +155,6 @@ const SvXMLTokenMap& SwXMLImport::GetTableCellAttrTokenMap()
return *pTableCellAttrTokenMap;
}
-// ---------------------------------------------------------------------
-
class SwXMLTableCell_Impl
{
OUString aStyleName;
@@ -283,8 +281,6 @@ inline void SwXMLTableCell_Impl::Dispose()
xSubTable = 0;
}
-// ---------------------------------------------------------------------
-
typedef boost::ptr_vector<SwXMLTableCell_Impl> SwXMLTableCells_Impl;
class SwXMLTableRow_Impl
@@ -398,8 +394,6 @@ void SwXMLTableRow_Impl::Dispose()
aCells[i].Dispose();
}
-// ---------------------------------------------------------------------
-
class SwXMLTableCellContext_Impl : public SvXMLImportContext
{
OUString aStyleName;
@@ -650,7 +644,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
{
sXmlId = xAttrList->getValueByIndex( i );
}
-//FIXME: RDFa
+ //FIXME: RDFa
}
}
@@ -747,8 +741,6 @@ void SwXMLTableCellContext_Impl::EndElement()
GetImport().GetTextImport()->SetCellParaStyleDefault(sSaveParaDefault);
}
-// ---------------------------------------------------------------------
-
class SwXMLTableColContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
@@ -800,7 +792,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
IsXMLToken( aLocalName, XML_ID ) )
{
(void) rValue;
-//FIXME where to put this??? columns do not actually exist in writer...
+ //FIXME where to put this??? columns do not actually exist in writer...
}
}
@@ -834,8 +826,6 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl()
{
}
-// ---------------------------------------------------------------------
-
class SwXMLTableColsContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
@@ -892,8 +882,6 @@ SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
class SwXMLTableRowContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
@@ -1014,8 +1002,6 @@ SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
class SwXMLTableRowsContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
@@ -1078,8 +1064,6 @@ SvXMLImportContext *SwXMLTableRowsContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
class SwXMLDDETableContext_Impl : public SvXMLImportContext
{
OUString sConnectionName;
@@ -1260,9 +1244,6 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
return pType;
}
-
-// ---------------------------------------------------------------------
-
class TableBoxIndex
{
public:
@@ -1415,7 +1396,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
if( xTable.is() )
{
-//FIXME
+ //FIXME
// xml:id for RDF metadata
GetImport().SetXmlId(xTable, sXmlId);
@@ -1954,7 +1935,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
sal_uInt32 nBottomRow,
sal_uInt32 nRightCol )
{
-//FIXME: here would be a great place to handle XmlId for cell
+ //FIXME: here would be a great place to handle XmlId for cell
SwTableBox *pBox = new SwTableBox( pBoxFmt, 0, pUpper );
sal_uInt32 nColSpan = nRightCol - nLeftCol;
@@ -2051,7 +2032,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
sal_uInt32 /*nTopRow*/, sal_uInt32 nLeftCol, sal_uInt32 /*nBottomRow*/,
sal_uInt32 nRightCol )
{
-//FIXME: here would be a great place to handle XmlId for cell
+ //FIXME: here would be a great place to handle XmlId for cell
SwTableBox *pBox;
sal_uInt32 nColSpan = nRightCol - nLeftCol;
sal_Int32 nColWidth = GetColumnWidth( nLeftCol, nColSpan );
@@ -2225,7 +2206,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
sal_uInt32 nBottomRow,
sal_uInt32 nRightCol )
{
-//FIXME: here would be a great place to handle XmlId for row
+ //FIXME: here would be a great place to handle XmlId for row
SwTableLine *pLine;
if( !pUpper && 0UL==nTopRow )
{
@@ -2507,7 +2488,6 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
// In this case, the columns get the correct width even if the
// the sum of the relative withs is smaller than the available
// width in TWIP. Therfore, we can use the relative width.
- //
nWidth = nRelWidth > USHRT_MAX ? USHRT_MAX : nRelWidth;
}
if( nRelWidth != nWidth && nRelWidth && nCols )
@@ -2861,7 +2841,7 @@ void SwXMLTableContext::MakeTable()
void SwXMLTableContext::MakeTable( SwTableBox *pBox, sal_Int32 nW )
{
-//FIXME: here would be a great place to handle XmlId for subtable
+ //FIXME: here would be a great place to handle XmlId for subtable
pLineFmt = GetParentTable()->pLineFmt;
pBoxFmt = GetParentTable()->pBoxFmt;
nWidth = nW;
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 3423eea0ceb7..cc5c36e4072e 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -46,8 +46,6 @@ namespace com { namespace sun { namespace star {
namespace text { class XTextCursor; }
} } }
-
-
class SwXMLTableContext : public XMLTextTableContext
{
OUString aStyleName;
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index 8e1e208334d9..d04345bba744 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -24,9 +24,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
-// ---------------------------------------------------------------------
-
-
class SwXMLBodyContentContext_Impl : public SvXMLImportContext
{
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 17105e61411c..e3612656635f 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -64,8 +64,6 @@ enum SvEmbeddedObjectTypes
SV_EMBEDDED_FRAME
};
-// ---------------------------------------------------------------------
-
SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode(
const Reference < XPropertySet >& rPropSet ) const
{
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 8acec644cded..c3bc76b7a796 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -62,7 +62,6 @@
#include <svtools/embedhlp.hxx>
#include <svl/urihelper.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -71,7 +70,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
using namespace xml::sax;
-
struct XMLServiceMapEntry_Impl
{
const sal_Char *sFilterService;
@@ -955,7 +953,6 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
// redlining helper methods
// (override to provide the real implementation)
-
void SwXMLTextImportHelper::RedlineAdd(
const OUString& rType,
const OUString& rId,
@@ -1030,6 +1027,4 @@ void SwXMLTextImportHelper::SetChangesProtectionKey(
pRedlineHelper->SetProtectionKey( rKey );
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index abd3c50a3297..d99365d1573f 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -66,23 +66,23 @@ SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG)
struct SpellState
{
bool m_bInitialCall;
- bool m_bLockFocus; //lock the focus notification while a modal dialog is active
+ bool m_bLockFocus; // lock the focus notification while a modal dialog is active
bool m_bLostFocus;
- //restart and progress information
+ // restart and progress information
sal_uInt16 m_SpellStartPosition;
- bool m_bBodySpelled; //body already spelled
- bool m_bOtherSpelled; //frames, footnotes, headers and footers spelled
- bool m_bStartedInOther; //started the spelling insided of the _other_ area
+ bool m_bBodySpelled; // body already spelled
+ bool m_bOtherSpelled; // frames, footnotes, headers and footers spelled
+ bool m_bStartedInOther; // started the spelling insided of the _other_ area
bool m_bStartedInSelection; // there was an initial text selection
SwPaM* pOtherCursor; // position where the spelling inside the _other_ area started
- bool m_bDrawingsSpelled; //all drawings spelled
- Reference<XTextRange> m_xStartRange; //text range that marks the start of spelling
- const SdrObject* m_pStartDrawing; //draw text object spelling started in
- ESelection m_aStartDrawingSelection; //draw text start selection
+ bool m_bDrawingsSpelled; // all drawings spelled
+ Reference<XTextRange> m_xStartRange; // text range that marks the start of spelling
+ const SdrObject* m_pStartDrawing; // draw text object spelling started in
+ ESelection m_aStartDrawingSelection; // draw text start selection
bool m_bRestartDrawing; // the first selected drawing object is found again
- //lose/get focus information to decide if spelling can be continued
+ // lose/get focus information to decide if spelling can be continued
ShellModes m_eSelMode;
const SwNode* m_pPointNode;
const SwNode* m_pMarkNode;
@@ -91,7 +91,7 @@ struct SpellState
const SdrOutliner* m_pOutliner;
ESelection m_aESelection;
- //iterating over draw text objects
+ // iterating over draw text objects
std::list<SdrTextObj*> m_aTextObjects;
bool m_bTextObjectsCollected;
@@ -109,7 +109,7 @@ struct SpellState
m_pStartDrawing(0),
m_bRestartDrawing(false),
- m_eSelMode(SHELL_MODE_OBJECT), //initially invalid
+ m_eSelMode(SHELL_MODE_OBJECT), // initially invalid
m_pPointNode(0),
m_pMarkNode(0),
m_nPointPos(0),
@@ -141,7 +141,7 @@ static void lcl_LeaveDrawText(SwWrtShell& rSh)
{
rSh.GetDrawView()->SdrEndTextEdit( sal_True );
Point aPt(LONG_MIN, LONG_MIN);
- //go out of the frame
+ // go out of the frame
rSh.SelectObj(aPt, SW_LEAVE_FRAME);
rSh.EnterStdMode();
rSh.GetView().AttrChangedNotify(&rSh);
@@ -198,12 +198,12 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
SHELL_MODE_LIST_TEXT == eSelMode ||
SHELL_MODE_TABLE_LIST_TEXT == eSelMode ||
SHELL_MODE_TEXT == eSelMode;
- //Writer text outside of the body
+ // Writer text outside of the body
bool bOtherText = false;
if( m_pSpellState->m_bInitialCall )
{
- //if no text selection exists the cursor has to be set into the text
+ // if no text selection exists the cursor has to be set into the text
if(!bDrawText && !bNormalText)
{
if(!MakeTextSelection_Impl(*pWrtShell, eSelMode))
@@ -218,7 +218,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
}
if(bNormalText)
{
- //set cursor to the start of the sentence
+ // set cursor to the start of the sentence
if(!pWrtShell->HasSelection())
pWrtShell->GoStartSentence();
else
@@ -226,7 +226,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
pWrtShell->ExpandToSentenceBorders();
m_pSpellState->m_bStartedInSelection = true;
}
- //determine if the selection is outside of the body text
+ // determine if the selection is outside of the body text
bOtherText = !(pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY);
m_pSpellState->m_SpellStartPosition = bOtherText ? SPELL_START_OTHER : SPELL_START_BODY;
if(bOtherText)
@@ -238,7 +238,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
else
{
SwPaM* pCrsr = pWrtShell->GetCrsr();
- //mark the start position only if not at start of doc
+ // mark the start position only if not at start of doc
if(!pWrtShell->IsStartOfDoc())
{
m_pSpellState->m_xStartRange =
@@ -285,10 +285,10 @@ The code below would only be part of the solution.
if(!FindNextDrawTextError_Impl(*pWrtShell) || !SpellDrawText_Impl(*pWrtShell, aRet))
{
lcl_LeaveDrawText(*pWrtShell);
- //now the drawings have been spelled
+ // now the drawings have been spelled
m_pSpellState->m_bDrawingsSpelled = true;
- //the spelling continues at the other content
- //if there's any that has not been spelled yet
+ // the spelling continues at the other content
+ // if there's any that has not been spelled yet
if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt())
{
pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART );
@@ -300,7 +300,7 @@ The code below would only be part of the solution.
}
else
m_pSpellState->m_bOtherSpelled = true;
- //if no result has been found try at the body text - completely
+ // if no result has been found try at the body text - completely
if(!m_pSpellState->m_bBodySpelled && !aRet.size())
{
pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START );
@@ -316,14 +316,14 @@ The code below would only be part of the solution.
}
else
{
- //spell inside of the Writer text
+ // spell inside of the Writer text
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
// if there is a selection (within body or header/footer text)
// then spell/grammar checking should not move outside of it.
if (!m_pSpellState->m_bStartedInSelection)
{
- //find out which text has been spelled body or other
+ // find out which text has been spelled body or other
bOtherText = !(pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY);
if(bOtherText && m_pSpellState->m_bStartedInOther && m_pSpellState->pOtherCursor)
{
@@ -337,12 +337,12 @@ The code below would only be part of the solution.
}
if(!aRet.size())
{
- //end spelling
+ // end spelling
pWrtShell->SpellEnd();
if(bOtherText)
{
m_pSpellState->m_bOtherSpelled = true;
- //has the body been spelled?
+ // has the body been spelled?
if(!m_pSpellState->m_bBodySpelled)
{
pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START );
@@ -370,7 +370,7 @@ The code below would only be part of the solution.
}
}
- //search for a draw text object that contains error and spell it
+ // search for a draw text object that contains error and spell it
if(!aRet.size() &&
(m_pSpellState->m_bDrawingsSpelled ||
!FindNextDrawTextError_Impl(*pWrtShell) || !SpellDrawText_Impl(*pWrtShell, aRet)))
@@ -383,7 +383,6 @@ The code below would only be part of the solution.
}
// now only the rest of the body text can be spelled -
// if the spelling started inside of the body
- //
bool bCloseMessage = true;
if(!aRet.size() && !m_pSpellState->m_bStartedInSelection)
{
@@ -407,11 +406,11 @@ The code below would only be part of the solution.
}
m_pSpellState->m_xStartRange = 0;
LockFocusNotification( false );
- //take care that the now valid selection is stored
+ // take care that the now valid selection is stored
LoseFocus();
}
else
- bCloseMessage = false; //no closing message if a wrap around has been denied
+ bCloseMessage = false; // no closing message if a wrap around has been denied
}
}
if(!aRet.size())
@@ -420,15 +419,15 @@ The code below would only be part of the solution.
{
LockFocusNotification( true );
OUString sInfo(SW_RES(STR_SPELLING_COMPLETED));
- //#i84610#
+ // #i84610#
Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5
InfoBox(pTemp, sInfo ).Execute();
LockFocusNotification( false );
- //take care that the now valid selection is stored
+ // take care that the now valid selection is stored
LoseFocus();
}
- //close the spelling dialog
+ // close the spelling dialog
GetBindings().GetDispatcher()->Execute(FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON);
}
}
@@ -533,7 +532,7 @@ void SwSpellDialogChildWindow::GetFocus()
ShellModes eSelMode = pWrtShell->GetView().GetShellMode();
if(eSelMode != m_pSpellState->m_eSelMode)
{
- //prevent initial invalidation
+ // prevent initial invalidation
if(m_pSpellState->m_bLostFocus)
bInvalidate = true;
}
@@ -583,7 +582,7 @@ void SwSpellDialogChildWindow::GetFocus()
void SwSpellDialogChildWindow::LoseFocus()
{
- //prevent initial invalidation
+ // prevent initial invalidation
m_pSpellState->m_bLostFocus = true;
if(m_pSpellState->m_bLockFocus)
return;
@@ -602,7 +601,7 @@ void SwSpellDialogChildWindow::LoseFocus()
case SHELL_MODE_TABLE_TEXT:
case SHELL_MODE_TABLE_LIST_TEXT:
{
- //store a node pointer and a pam-position to be able to check on next GetFocus();
+ // store a node pointer and a pam-position to be able to check on next GetFocus();
SwPaM* pCursor = pWrtShell->GetCrsr();
m_pSpellState->m_pPointNode = pCursor->GetNode(true);
m_pSpellState->m_pMarkNode = pCursor->GetNode(false);
@@ -624,7 +623,7 @@ void SwSpellDialogChildWindow::LoseFocus()
}
}
break;
- default:;//prevent warning
+ default:;// prevent warning
}
}
else
@@ -658,10 +657,8 @@ SwWrtShell* SwSpellDialogChildWindow::GetWrtShell_Impl()
return pView ? pView->GetWrtShellPtr(): 0;
}
-/*-------------------------------------------------------------------------
- set the cursor into the body text - necessary if any object is selected
- on start of the spelling dialog
- -----------------------------------------------------------------------*/
+// set the cursor into the body text - necessary if any object is selected
+// on start of the spelling dialog
bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellModes eSelMode)
{
SwView& rView = rShell.GetView();
@@ -692,7 +689,7 @@ bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM
rView.AttrChangedNotify(&rShell);
break;
}
- //otherwise no break to deselect the object
+ // otherwise no break to deselect the object
case SHELL_MODE_GRAPHIC:
case SHELL_MODE_OBJECT:
{
@@ -713,7 +710,7 @@ bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM
{
rView.LeaveDrawCreate();
Point aPt(LONG_MIN, LONG_MIN);
- //go out of the frame
+ // go out of the frame
rShell.SelectObj(aPt, SW_LEAVE_FRAME);
SfxBindings& rBind = rView.GetViewFrame()->GetBindings();
rBind.Invalidate( SID_ATTR_SIZE );
@@ -723,13 +720,12 @@ bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM
}
}
break;
- default:; //prevent warning
+ default:; // prevent warning
}
return true;
}
-/*-------------------------------------------------------------------------
- select the next draw text object that has a spelling error
- -----------------------------------------------------------------------*/
+
+// select the next draw text object that has a spelling error
bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
{
bool bNextDoc = false;
@@ -739,7 +735,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
SwView& rView = rSh.GetView();
SwDoc* pDoc = rView.GetDocShell()->GetDoc();
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
- //start at the current draw object - if there is any selected
+ // start at the current draw object - if there is any selected
SdrTextObj* pCurrentTextObj = 0;
if ( rMarkList.GetMarkCount() == 1 )
{
@@ -747,7 +743,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
if( pObj && pObj->ISA(SdrTextObj) )
pCurrentTextObj = static_cast<SdrTextObj*>(pObj);
}
- //at first fill the list of drawing objects
+ // at first fill the list of drawing objects
if(!m_pSpellState->m_bTextObjectsCollected )
{
m_pSpellState->m_bTextObjectsCollected = true;
@@ -798,10 +794,10 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
}
if(bHasSpellError)
{
- //now the current one has to be deselected
+ // now the current one has to be deselected
if(pCurrentTextObj)
pDrView->SdrEndTextEdit( sal_True );
- //and the found one should be activated
+ // and the found one should be activated
rSh.MakeVisible(pTextObj->GetLogicRect());
Point aTmp( 0,0 );
rSh.SelectObj( aTmp, 0, pTextObj );
@@ -816,7 +812,6 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
return bNextDoc;
}
-
bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellPortions& rPortions)
{
bool bRet = false;
@@ -826,8 +821,8 @@ bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellP
if(pOutliner)
{
bRet = pOutliner->SpellSentence(pSdrView->GetTextEditOutlinerView()->GetEditView(), rPortions, m_bIsGrammarCheckingOn);
- //find out if the current selection is in the first spelled drawing object
- //and behind the initial selection
+ // find out if the current selection is in the first spelled drawing object
+ // and behind the initial selection
if(bRet && m_pSpellState->m_bRestartDrawing)
{
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -850,5 +845,4 @@ void SwSpellDialogChildWindow::LockFocusNotification(bool bLock)
m_pSpellState->m_bLockFocus = bLock;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 97a7cc509bd3..ef45dbaf969a 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -134,7 +134,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
sal_uInt16 nAppScriptType = GetI18NScriptTypeOfLanguage( (sal_uInt16)GetAppLanguage() );
SwDoc* pDoc = rDocSh.GetDoc();
- // initialise language
+ // initialize language
{
if( !aOpt.GetLanguage() )
{
@@ -189,7 +189,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
aFontNames.insert( aInf.GetName() );
}
- // insert to listbox
+ // insert into listbox
for( std::set< OUString >::const_iterator it = aFontNames.begin();
it != aFontNames.end(); ++it )
{
@@ -220,7 +220,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
m_pLanguageLB->Hide();
}
- // initialise character set
+ // initialize character set
m_pCharSetLB->FillFromTextEncodingTable( pStream != NULL );
m_pCharSetLB->SelectTextEncoding( aOpt.GetCharSet() );
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index bb133daaa07c..d66984a6c4f8 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -76,11 +76,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet)
{
}
-/*--------------------------------------------------------------------
- Description: fill ItemSet when changed
- --------------------------------------------------------------------*/
-
-
+// Description: fill ItemSet when changed
sal_Bool SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/)
{
return sal_False;
@@ -89,11 +85,8 @@ sal_Bool SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/)
void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/)
{
}
-/*------------------------------------------------------------------------
- Description: update / set data
-------------------------------------------------------------------------*/
-
+// Description: update / set data
void SwDocStatPage::SetData(const SwDocStat &rStat)
{
m_pTableNo->SetText(OUString::number( rStat.nTbl ));
@@ -106,11 +99,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat)
m_pCharExclSpacesNo->SetText(OUString::number( rStat.nCharExcludingSpaces ));
}
-/*------------------------------------------------------------------------
- Description: update statistics
-------------------------------------------------------------------------*/
-
-
+// Description: update statistics
void SwDocStatPage::Update()
{
SfxViewShell *pVSh = SfxViewShell::Current();
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 4aa91e0fe147..70ce11bf5c24 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -59,7 +59,7 @@ namespace
sal_uInt16 nDontCare;
lcl_GetPageDesc(pSh, nDontCare, &pPageFmtDesc);
- //If we want a new number then set it, otherwise reuse the existing one
+ // If we want a new number then set it, otherwise reuse the existing one
sal_uInt16 nPgNo;
if (nNewNumber)
{
@@ -85,7 +85,7 @@ namespace
}
}
- //If we want a new descriptior then set it, otherwise reuse the existing one
+ // If we want a new descriptior then set it, otherwise reuse the existing one
if (!pNewDesc)
{
SwFmtPageDesc aPageFmtDesc(pPageFmtDesc ? *pPageFmtDesc : &rCurrentDesc);
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index eb9cb6c32ff9..c33991127529 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -60,12 +60,9 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-
-
Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart )
{
- // !! positioning code according to spepc; similar to Calc fuins2.cxx
-
+ // positioning code according to spepc; similar to Calc fuins2.cxx
Point aRet;
OSL_ENSURE( pParentWin, "Window not found" );
@@ -247,7 +244,6 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
}
}
-
void AutoEdit::KeyInput( const KeyEvent& rEvt )
{
sal_uInt16 nCode = rEvt.GetKeyCode().GetCode();
@@ -255,7 +251,4 @@ void AutoEdit::KeyInput( const KeyEvent& rEvt )
Edit::KeyInput( rEvt );
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 134cab20871f..16207f89191e 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -31,7 +31,6 @@
#include <cmdid.h>
#include <table.hrc>
-
IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
{
sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1;
@@ -42,8 +41,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
}
IMPL_LINK_NOARG_INLINE_END(SwTableWidthDlg, LoseFocusHdl)
-
-
SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc )
: SvxStandardDialog( pParent, "ColumnWidthDialog", "modules/swriter/ui/columnwidth.ui" )
, rFnc(rTableFnc)
@@ -70,8 +67,6 @@ SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc )
LoseFocusHdl();
}
-
-
void SwTableWidthDlg::Apply()
{
rFnc.InitTabCols();
@@ -80,7 +75,4 @@ void SwTableWidthDlg::Apply()
static_cast< sal_uInt16 >(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP))));
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 4fc5ecfcb34c..fd2e827fbdb0 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -78,7 +78,6 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim,
}
}
-
sal_uInt16 nInsMode = 0;
if (mpBorderCB->IsChecked())
nInsMode |= tabopts::DEFAULT_BORDER;
@@ -97,7 +96,6 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim,
rInsTblOpts.mnInsMode = nInsMode;
}
-
SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
: SfxModalDialog(&rView.GetViewFrame()->GetWindow(), "ConvertTextTableDialog", "modules/swriter/ui/converttexttable.ui" )
, sConvertTextTable(SW_RES(STR_CONVERT_TEXT_TABLE))
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 76ae477e78bd..348c5e8045af 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -22,7 +22,6 @@
#include <sfx2/dispatch.hxx>
#include <svx/dlgutil.hxx>
-
#include <fmtfsize.hxx>
#include <swtypes.hxx>
#include <rowht.hxx>
@@ -50,7 +49,6 @@ void SwTableHeightDlg::Apply()
rSh.SetRowHeight( aSz );
}
-
SwTableHeightDlg::SwTableHeightDlg(Window *pParent, SwWrtShell &rS)
: SvxStandardDialog(pParent, "RowHeightDialog", "modules/swriter/ui/rowheight.ui")
, rSh( rS )
@@ -77,6 +75,4 @@ SwTableHeightDlg::SwTableHeightDlg(Window *pParent, SwWrtShell &rS)
}
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index 9eae380e0ad8..f1176b07727f 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
@@ -53,7 +52,6 @@
#include <table.hrc>
#include "swtablerep.hxx"
-
SwTableRep::SwTableRep( const SwTabCols& rTabCol )
:
nTblWidth(0),
@@ -172,7 +170,7 @@ sal_Bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
}
}
-// intercept rounding errors
+ // intercept rounding errors
if(std::abs((long)nOldLeft - (long)rTabCols.GetLeft()) < 3)
rTabCols.SetLeft(nOldLeft);
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 0ab390563d1e..c6cb1405489c 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -61,7 +61,6 @@
using namespace ::com::sun::star;
-
SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", rSet)
, pTblData(0)
@@ -103,13 +102,12 @@ SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet)
Init();
}
-
void SwFormatTablePage::Init()
{
m_aLeftMF.SetMetricFieldMin(-999999);
m_aRightMF.SetMetricFieldMin(-999999);
- // handler
+ //handler
Link aLk = LINK( this, SwFormatTablePage, AutoClickHdl );
m_pFullBtn->SetClickHdl( aLk );
m_pFreeBtn->SetClickHdl( aLk );
@@ -155,15 +153,15 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
m_aWidthMF.SetRefValue(pTblData->GetSpace());
m_aLeftMF.SetRefValue(pTblData->GetSpace());
m_aRightMF.SetRefValue(pTblData->GetSpace());
- m_aLeftMF.SetMetricFieldMin(0); // will be overwritten by the Percentfield
- m_aRightMF.SetMetricFieldMin(0); // -""-
- m_aLeftMF.SetMetricFieldMax(99); //
- m_aRightMF.SetMetricFieldMax(99); //
+ m_aLeftMF.SetMetricFieldMin(0); //will be overwritten by the Percentfield
+ m_aRightMF.SetMetricFieldMin(0); //dito
+ m_aLeftMF.SetMetricFieldMax(99);
+ m_aRightMF.SetMetricFieldMax(99);
m_aLeftMF.SetPrcntValue(m_aLeftMF.NormalizePercent(nLeft ), FUNIT_TWIP );
m_aRightMF.SetPrcntValue(m_aRightMF.NormalizePercent(nRight ), FUNIT_TWIP );
}
else
- ModifyHdl(m_aLeftMF.get()); // correct values again
+ ModifyHdl(m_aLeftMF.get()); //correct values again
if(m_pFreeBtn->IsChecked())
{
@@ -176,7 +174,6 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
return 0;
}
-
IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox )
{
sal_Bool bRestore = sal_True,
@@ -232,8 +229,8 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox )
if(bFull && bRestore)
{
- // After being switched on automatic, the width was pinned
- // in order to restore the width while switching back to.
+ //After being switched on automatic, the width was pinned
+ //in order to restore the width while switching back to.
bFull = sal_False;
m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(nSaveWidth ), FUNIT_TWIP );
}
@@ -259,7 +256,6 @@ void SwFormatTablePage::RightModify()
}
}
-
IMPL_LINK_INLINE_START( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
{
if( m_aRightMF.get() == pEdit)
@@ -371,17 +367,15 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit)
bModified = sal_True;
}
-
SfxTabPage* SwFormatTablePage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
{
return new SwFormatTablePage( pParent, rAttrSet );
}
-
sal_Bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
{
- // Test if one of the controls still has the focus.
+ //Test if one of the controls still has the focus
if (m_aWidthMF.HasFocus())
ModifyHdl(m_aWidthMF.get());
else if (m_aLeftMF.HasFocus())
@@ -426,7 +420,6 @@ sal_Bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
return bModified;
}
-
void SwFormatTablePage::Reset( const SfxItemSet& )
{
const SfxItemSet& rSet = GetItemSet();
@@ -558,7 +551,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& )
m_pBottomMF->SaveValue();
}
- //text direction
+ //Text direction
if( SFX_ITEM_SET == rSet.GetItemState( RES_FRAMEDIR, true, &pItem ) )
{
sal_uIntPtr nVal = ((SvxFrameDirectionItem*)pItem)->GetValue();
@@ -603,10 +596,10 @@ void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet )
int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
{
- // os: VCL sorgt nicht dafuer, dass das aktive Control im
- // dialog bei OK den focus verliert
+ //os: VCL doesn't take care of making the active widget
+ //in the dialog lose the focus
m_pNameED->GrabFocus();
- // Test the table name for spaces
+ //test the table name for spaces
OUString sTblName = m_pNameED->GetText();
if(sTblName.indexOf(' ') != -1)
{
@@ -716,6 +709,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
}
return sal_True;
}
+
//Description: Page column configuration
SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "TableColumnPage",
@@ -815,7 +809,6 @@ void SwTableColumnPage::Reset( const SfxItemSet& )
};
-
void SwTableColumnPage::Init(sal_Bool bWeb)
{
FieldUnit aMetric = ::GetDfltMetric(bWeb);
@@ -841,7 +834,6 @@ void SwTableColumnPage::Init(sal_Bool bWeb)
m_pProportionalCB->SetClickHdl( aLk );
};
-
IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
{
//move display window
@@ -880,7 +872,6 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
return 0;
};
-
IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
{
bModified = sal_True;
@@ -889,7 +880,6 @@ IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
};
IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, MetricField*, pEdit )
-
IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
{
bModified = sal_True;
@@ -898,7 +888,6 @@ IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
};
IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, MetricField*, pEdit )
-
IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
{
if (pEdit->IsModified())
@@ -910,7 +899,6 @@ IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
};
IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
-
IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
{
sal_Bool bCheck = pBox->IsChecked();
@@ -942,7 +930,6 @@ sal_Bool SwTableColumnPage::FillItemSet( SfxItemSet& )
return bModified;
};
-
void SwTableColumnPage::ModifyHdl( MetricField* pField )
{
PercentField *pEdit = NULL;
@@ -970,7 +957,6 @@ void SwTableColumnPage::ModifyHdl( MetricField* pField )
UpdateCols( nAktPos );
};
-
void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
{
SwTwips nSum = 0;
@@ -987,7 +973,7 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
if(!bModifyTable && !bProp )
{
-// the table width is constant, the difference is balanced with the other columns
+ //The table width is constant, the difference is balanced with the other columns
sal_uInt16 nLoopCount = 0;
while( nDiff )
{
@@ -1027,8 +1013,8 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
}
else if(bModifyTable && !bProp)
{
-// Difference is balanced by the width of the table,
-// other columns remain unchanged.
+ //Difference is balanced by the width of the table,
+ //other columns remain unchanged.
OSL_ENSURE(nDiff <= pTblData->GetSpace() - nTableWidth, "wrong maximum" );
SwTwips nActSpace = pTblData->GetSpace() - nTableWidth;
if(nDiff > nActSpace)
@@ -1043,8 +1029,8 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
}
else if(bModifyTable & bProp)
{
-// All columns will be changed proportionally with,
-// the table width is adjusted accordingly.
+ //All columns will be changed proportionally with,
+ //the table width is adjusted accordingly.
OSL_ENSURE(nDiff * nNoOfVisibleCols <= pTblData->GetSpace() - nTableWidth, "wrong maximum" );
long nAdd = nDiff;
if(nDiff * nNoOfVisibleCols > pTblData->GetSpace() - nTableWidth)
@@ -1128,7 +1114,6 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& )
}
-
int SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
@@ -1191,7 +1176,6 @@ int SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet )
return sal_True;
}
-
SwTwips SwTableColumnPage::GetVisibleWidth(sal_uInt16 nPos)
{
sal_uInt16 i=0;
@@ -1210,7 +1194,6 @@ SwTwips SwTableColumnPage::GetVisibleWidth(sal_uInt16 nPos)
return nReturn;
}
-
void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth)
{
sal_uInt16 i=0;
@@ -1351,7 +1334,7 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
{
bool bModified = false;
- // Repeat Heading
+ //Repeat Heading
if(TriState(m_pHeadLineCB->IsChecked()) != m_pHeadLineCB->GetSavedValue() ||
OUString::number( static_cast< sal_Int32 >(m_pRepeatHeaderNF->GetValue()) ) != m_pRepeatHeaderNF->GetSavedValue() )
{
@@ -1374,7 +1357,7 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
sal_Bool bState = m_pPageCollCB->IsChecked();
- // If we have a page style, then there's no break
+ //If we have a page style, then there's no break
sal_Bool bPageItemPut = sal_False;
if ( bState != m_pPageCollCB->GetSavedValue() ||
( bState &&
@@ -1470,7 +1453,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet )
bool bFlowAllowed = !bHtmlMode || rHtmlOpt.IsPrintLayoutExtension();
if(bFlowAllowed)
{
- // Inserting of the existing page templates in the list box.
+ //Inserting of the existing page templates in the list box
const sal_uInt16 nCount = pShell->GetPageDescCnt();
sal_uInt16 i;
@@ -1804,6 +1787,4 @@ void SwTextFlowPage::DisablePageBreak()
m_pPageNoNF->Disable();
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx
index 947e3ddaa61e..d823f4571932 100644
--- a/sw/source/ui/table/tablemgr.cxx
+++ b/sw/source/ui/table/tablemgr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
@@ -48,7 +47,6 @@
using namespace ::com::sun::star;
// Adjust line height (dialogue)
-
void SwTableFUNC::ColWidthDlg( Window *pParent )
{
InitTabCols();
@@ -62,8 +60,6 @@ void SwTableFUNC::ColWidthDlg( Window *pParent )
}
// Determine the width
-
-
SwTwips SwTableFUNC::GetColWidth(sal_uInt16 nNum) const
{
SwTwips nWidth = 0;
@@ -94,8 +90,6 @@ SwTwips SwTableFUNC::GetColWidth(sal_uInt16 nNum) const
return nWidth;
}
-
-
SwTwips SwTableFUNC::GetMaxColWidth( sal_uInt16 nNum ) const
{
OSL_ENSURE(nNum <= aCols.Count(), "Index out of Area");
@@ -116,8 +110,6 @@ SwTwips SwTableFUNC::GetMaxColWidth( sal_uInt16 nNum ) const
return GetColWidth(nNum);
}
-
-
void SwTableFUNC::SetColWidth(sal_uInt16 nNum, SwTwips nNewWidth )
{
// set current width
@@ -155,8 +147,6 @@ void SwTableFUNC::SetColWidth(sal_uInt16 nNum, SwTwips nNewWidth )
pSh->EndAllAction();
}
-
-
void SwTableFUNC::InitTabCols()
{
OSL_ENSURE(pSh, "no Shell");
@@ -165,20 +155,16 @@ void SwTableFUNC::InitTabCols()
pSh->GetTabCols( aCols );
}
-
-
SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, sal_Bool bCopyFmt)
: pFmt(pShell->GetTableFmt()),
pSh(pShell),
bCopy(bCopyFmt)
{
- // if applicable copy the format for edit
+ // if applicable copy the format for edit
if( pFmt && bCopy )
pFmt = new SwFrmFmt( *pFmt );
}
-
-
SwTableFUNC::~SwTableFUNC()
{
if(bCopy)
@@ -338,9 +324,6 @@ sal_uInt16 SwTableFUNC::GetCurColNum() const
return nPos - nCount;
}
-
-
-
sal_uInt16 SwTableFUNC::GetColCount() const
{
sal_uInt16 nCount = 0;
@@ -350,8 +333,6 @@ sal_uInt16 SwTableFUNC::GetColCount() const
return aCols.Count() - nCount;
}
-
-
int SwTableFUNC::GetRightSeparator(int nNum) const
{
OSL_ENSURE( nNum < (int)GetColCount() ,"Index out of range");
@@ -365,6 +346,4 @@ int SwTableFUNC::GetRightSeparator(int nNum) const
return i - 1;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 92732c00c444..24b6ee83d238 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -90,7 +90,6 @@ public:
};
// TabPage Format/Table/Columns
-
#define MET_FIELDS 6 //Number of the used MetricFields
class SwTableColumnPage : public SfxTabPage
@@ -109,8 +108,8 @@ class SwTableColumnPage : public SfxTabPage
SwTwips nMinWidth;
sal_uInt16 nNoOfCols;
sal_uInt16 nNoOfVisibleCols;
- //Remember the width, when switching to autoalign
- sal_uInt16 aValueTbl[MET_FIELDS];//primary assignment of the MetricFields
+ // Remember the width, when switching to autoalign
+ sal_uInt16 aValueTbl[MET_FIELDS];// primary assignment of the MetricFields
sal_Bool bModified:1;
sal_Bool bModifyTbl:1;
sal_Bool bPercentMode:1;
--
cgit