[Libreoffice-commits] .: sw/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Mon Feb 21 01:45:39 PST 2011
sw/source/ui/app/docshini.cxx | 70 ++++++++++++++---------------
sw/source/ui/app/docst.cxx | 101 +++++++++++++++++++-----------------------
2 files changed, 81 insertions(+), 90 deletions(-)
New commits:
commit 20251c2b789fd01c5ffa7ae95c6d1ebc2216e0dd
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Mon Feb 21 10:45:11 2011 +0100
Translated comments from German to English
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index a3d7276..06bf06a 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -108,7 +108,7 @@ using ::rtl::OUString;
/*--------------------------------------------------------------------
- Beschreibung: Document laden
+ Description: Load Document
--------------------------------------------------------------------*/
@@ -121,11 +121,11 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
sal_Bool bHTMLTemplSet = sal_False;
if( bRet )
{
- AddLink(); // pDoc / pIo ggf. anlegen
+ AddLink(); // create pDoc / pIo if applicable
sal_Bool bWeb = ISA( SwWebDocShell );
if ( bWeb )
- bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );//Styles aus HTML.vor
+ bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );// Styles from HTML.vor
else if( ISA( SwGlobalDocShell ) )
GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument
@@ -358,7 +358,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor mit SfxCreateMode ?????
+ Description: Ctor with SfxCreateMode ?????
--------------------------------------------------------------------*/
@@ -377,7 +377,7 @@ SwDocShell::SwDocShell( SfxObjectCreateMode eMode ) :
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor / Dtor
+ Description: Ctor / Dtor
--------------------------------------------------------------------*/
@@ -396,7 +396,7 @@ SwDocShell::SwDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor / Dtor
+ Description: Ctor / Dtor
--------------------------------------------------------------------*/
@@ -415,7 +415,7 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
}
/*--------------------------------------------------------------------
- Beschreibung: Dtor
+ Description: Dtor
--------------------------------------------------------------------*/
@@ -433,15 +433,15 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
RemoveLink();
delete pFontList;
- // wir als BroadCaster werden auch unser eigener Listener
- // (fuer DocInfo/FileNamen/....)
+ // we, as BroadCaster also become our own Listener
+ // (for DocInfo/FileNames/....)
EndListening( *this );
SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
- // wird nur die DocInfo fuer den Explorer gelesen, ist das Item nicht da
+ // when only DocInfo is read for the Explorer, the Item is not there
if(pColItem)
{
XColorTable* pTable = pColItem->GetColorTable();
- // wurde eine neue Table angelegt, muss sie auch geloescht werden.
+ // when a new Table was created, it has to be deleted as well.
if((void*)pTable != (void*)(XColorTable::GetStdColorTable()) )
delete pTable;
}
@@ -453,8 +453,8 @@ void SwDocShell::Init_Impl()
{
SetPool(&SW_MOD()->GetPool());
SetBaseModel(new SwXTextDocument(this));
- // wir als BroadCaster werden auch unser eigener Listener
- // (fuer DocInfo/FileNamen/....)
+ // we, as BroadCaster also become our own Listener
+ // (for DocInfo/FileNames/....)
StartListening( *this );
//position of the "Automatic" style filter for the stylist (app.src)
SetAutoStyleFilterIndex(3);
@@ -463,7 +463,7 @@ void SwDocShell::Init_Impl()
SetMapUnit( MAP_TWIP );
}
/*--------------------------------------------------------------------
- Beschreibung: AddLink
+ Description: AddLink
--------------------------------------------------------------------*/
@@ -478,18 +478,18 @@ void SwDocShell::AddLink()
}
else
pDoc->acquire();
- pDoc->SetDocShell( this ); // am Doc den DocShell-Pointer setzen
+ pDoc->SetDocShell( this ); // set the DocShell-Pointer for Doc
uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY);
((SwXTextDocument*)xDoc.get())->Reactivate(this);
SetPool(&pDoc->GetAttrPool());
- // am besten erst wenn eine sdbcx::View erzeugt wird !!!
+ // most suitably not until a sdbcx::View is created!!!
pDoc->SetOle2Link(LINK(this, SwDocShell, Ole2ModifiedHdl));
}
/*--------------------------------------------------------------------
- Beschreibung: neue FontList erzeugen Aenderung Drucker
+ Description: create new FontList Change Printer
--------------------------------------------------------------------*/
@@ -510,13 +510,13 @@ void SwDocShell::UpdateFontList()
}
/*--------------------------------------------------------------------
- Beschreibung: RemoveLink
+ Description: RemoveLink
--------------------------------------------------------------------*/
void SwDocShell::RemoveLink()
{
- // Uno-Object abklemmen
+ // disconnect Uno-Object
uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY);
((SwXTextDocument*)xDoc.get())->Invalidate();
aFinishedTimer.Stop();
@@ -532,24 +532,24 @@ void SwDocShell::RemoveLink()
pDoc->SetDocShell( 0 );
if( !nRefCt )
delete pDoc;
- pDoc = 0; // wir haben das Doc nicht mehr !!
+ pDoc = 0; // we don't have the Doc anymore!!
}
}
void SwDocShell::InvalidateModel()
{
- // Uno-Object abklemmen
+ // disconnect Uno-Object
uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY);
((SwXTextDocument*)xDoc.get())->Invalidate();
}
void SwDocShell::ReactivateModel()
{
- // Uno-Object abklemmen
+ // disconnect Uno-Object
uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY);
((SwXTextDocument*)xDoc.get())->Reactivate(this);
}
/*--------------------------------------------------------------------
- Beschreibung: Laden, Default-Format
+ Description: Load, Default-Format
--------------------------------------------------------------------*/
@@ -560,13 +560,13 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
if( SfxObjectShell::Load( rMedium ))
{
RTL_LOGFILE_CONTEXT_TRACE( aLog, "after SfxInPlaceObject::Load" );
- if( pDoc ) // fuer Letzte Version !!
- RemoveLink(); // das existierende Loslassen
+ if( pDoc ) // for last version!!
+ RemoveLink(); // release the existing
- AddLink(); // Link setzen und Daten updaten !!
+ AddLink(); // set Link and update Data!!
- // Das Laden
- // fuer MD
+ // Loading
+ // for MD
OSL_ENSURE( !mxBasePool.is(), "who hasn't destroyed their Pool?" );
mxBasePool = new SwDocStyleSheetPool( *pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
if(GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
@@ -595,12 +595,12 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
case SFX_CREATE_MODE_INTERNAL:
case SFX_CREATE_MODE_EMBEDDED:
{
- // fuer MWERKS (Mac-Compiler): kann nicht selbststaendig casten
+ // for MWERKS (Mac-Compiler): can't cast autonomously
SwTransferable::InitOle( this, *pDoc );
}
- // SfxProgress unterdruecken, wenn man Embedded ist
+ // suppress SfxProgress, when we are Embedded
SW_MOD()->SetEmbeddedLoadSave( sal_True );
- // kein break;
+ // no break;
case SFX_CREATE_MODE_STANDARD:
case SFX_CREATE_MODE_PREVIEW:
@@ -608,7 +608,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
Reader *pReader = ReadXML;
if( pReader )
{
- // die DocInfo vom Doc am DocShell-Medium setzen
+ // set Doc's DocInfo at DocShell-Medium
RTL_LOGFILE_CONTEXT_TRACE( aLog, "before ReadDocInfo" );
SwReader aRdr( rMedium, aEmptyStr, pDoc );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "before Read" );
@@ -653,7 +653,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
LoadingFinished();
}
- // SfxProgress unterdruecken, wenn man Embedded ist
+ // suppress SfxProgress, when we are Embedded
SW_MOD()->SetEmbeddedLoadSave( sal_False );
}
@@ -667,7 +667,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
if( pDoc )
RemoveLink();
- AddLink(); // Link setzen und Daten updaten !!
+ AddLink(); // set Link and update Data!!
do { // middle check loop
sal_uInt32 nErr = ERR_SWG_READ_ERROR;
@@ -676,7 +676,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
uno::Reference < container::XNameAccess > xAccess( rMedium.GetStorage(), uno::UNO_QUERY );
if ( xAccess->hasByName( aStreamName ) && rMedium.GetStorage()->isStreamElement( aStreamName ) )
{
- // Das Laden
+ // Loading
SwWait aWait( *this, sal_True );
{
OSL_ENSURE( !mxBasePool.is(), "who hasn't destroyed their Pool?" );
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 8374fad..5025d3f 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -113,14 +113,13 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
while (nWhich)
{
- // aktuelle Vorlage zu jeder Familie ermitteln
- //
+ // determine current template to every family
String aName;
switch (nWhich)
{
case SID_STYLE_APPLY:
- {//hier wird die Vorlage und ihre Familie an die StyleBox
- //uebergeben, damit diese Familie angezeigt wird
+ {// here the template and its family are passed to the StyleBox
+ // so that this family is being showed
if(pShell->IsFrmSelected())
{
SwFrmFmt* pFmt = pShell->GetCurFrmFmt();
@@ -260,7 +259,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
/*--------------------------------------------------------------------
- Beschreibung: StyleSheet-Requeste auswerten
+ Description: evaluate StyleSheet-Requests
--------------------------------------------------------------------*/
@@ -460,7 +459,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
nRet = Delete(aParam, nFamily);
break;
case SID_STYLE_APPLY:
- // Shellwechsel in ApplyStyles
+ // Shell-switch in ApplyStyles
nRet = ApplyStyles(aParam, nFamily, pActShell, rReq.GetModifier() );
break;
case SID_STYLE_WATERCAN:
@@ -492,7 +491,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
if(bSetReturn)
{
- if(rReq.IsAPI()) // Basic bekommt nur TRUE oder FALSE
+ if(rReq.IsAPI()) // Basic only gets TRUE or FALSE
rReq.SetReturnValue(SfxUInt16Item(nSlot, nRet !=0));
else
rReq.SetReturnValue(SfxUInt16Item(nSlot, nRet));
@@ -501,7 +500,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
}
/*--------------------------------------------------------------------
- Beschreibung: Edit
+ Description: Edit
--------------------------------------------------------------------*/
@@ -524,7 +523,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
pStyle = &mxBasePool->Make( rName, (SfxStyleFamily)nFamily, nMask );
- // die aktuellen als Parent setzen
+ // set the current one as Parent
SwDocStyleSheet* pDStyle = (SwDocStyleSheet*)pStyle;
switch( nFamily )
{
@@ -616,14 +615,13 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
if(!pStyle)
return FALSE;
- // Dialoge zusammenstoepseln
- //
+ // put dialogues together
rtl::Reference< SwDocStyleSheet > xTmp( new SwDocStyleSheet( *(SwDocStyleSheet*)pStyle ) );
if( SFX_STYLE_FAMILY_PARA == nFamily )
{
SfxItemSet& rSet = xTmp->GetItemSet();
::SwToSfxPageDescAttr( rSet );
- // erstmal nur eine Null
+ // firstly only a Zero
rSet.Put(SwBackgroundDestinationItem(SID_PARA_BACKGRND_DESTINATION, 0));
// merge list level indent attributes into the item set if needed
xTmp->MergeIndentAttrsOfListStyle( rSet );
@@ -642,7 +640,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
}
if (!bBasic)
{
- // vor dem Dialog wird der HtmlMode an der DocShell versenkt
+ // prior to the dialog the HtmlMode at the DocShell is being sunk
USHORT nHtmlMode = ::GetHtmlMode(this);
// In HTML mode, we do not always have a printer. In order to show
@@ -666,7 +664,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
{
GetWrtShell()->StartAllAction();
- // nur bei Absatz-Vorlagen die Maske neu setzen
+ // newly set the mask only with paragraph-templates
if( bNew )
{
nRet = SFX_STYLE_FAMILY_PARA == pStyle->GetFamily()
@@ -723,9 +721,9 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
mxBasePool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *xTmp.get() ) );
// JP 19.09.97:
- // Dialog vorm EndAction zerstoeren - bei Seitenvorlagen kann
- // muss der ItemSet zerstoert werden, damit die Cursor aus den
- // Kopf-/Fusszeilen entfernt werden. Sonst kommts zu GPFs!!!
+ // Destroy dialog before EndAction - with page-templates the
+ // ItemSet must be destroyed, so that the cursors get removed
+ // from Headers/Footers. Otherwise "GPF" happen!!!
delete pDlg;
pDoc->SetModified();
@@ -749,12 +747,12 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
}
else
{
- // vor dem Dialog wird der HtmlMode an der DocShell versenkt
+ // prior to the dialog the HtmlMode at the DocShell is being sunk
PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(this)));
GetWrtShell()->StartAllAction();
- // nur bei Absatz-Vorlagen die Maske neu setzen
+ // newly set the mask only with paragraph-templates
if( bNew )
{
nRet = SFX_STYLE_FAMILY_PARA == pStyle->GetFamily()
@@ -799,7 +797,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
}
/*--------------------------------------------------------------------
- Beschreibung: Delete
+ Description: Delete
--------------------------------------------------------------------*/
@@ -821,7 +819,7 @@ USHORT SwDocShell::Delete(const String &rName, USHORT nFamily)
}
/*--------------------------------------------------------------------
- Beschreibung: Vorlage anwenden
+ Description: apply template
--------------------------------------------------------------------*/
@@ -889,7 +887,7 @@ USHORT SwDocShell::ApplyStyles(const String &rName, USHORT nFamily,
}
/*--------------------------------------------------------------------
- Beschreibung: Giesskanne starten
+ Description: start watering-can
--------------------------------------------------------------------*/
@@ -948,7 +946,7 @@ USHORT SwDocShell::DoWaterCan(const String &rName, USHORT nFamily)
}
/*--------------------------------------------------------------------
- Beschreibung: Vorlage Updaten
+ Description: update template
--------------------------------------------------------------------*/
@@ -977,8 +975,7 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell*
GetWrtShell()->StartUndo(UNDO_INSFMTATTR, &aRewriter);
GetWrtShell()->FillByEx(pColl);
- // Vorlage auch anwenden, um harte Attributierung
- // zu entfernen
+ // also apply template to remove hard set attributes
GetWrtShell()->SetTxtFmtColl( pColl );
GetWrtShell()->EndUndo(UNDO_INSFMTATTR, NULL);
GetWrtShell()->EndAllAction();
@@ -1001,8 +998,7 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell*
pFrm->SetFmtAttr( aSet );
- // Vorlage auch anwenden, um harte Attributierung
- // zu entfernen
+ // also apply template to remove hard set attributes
pCurrWrtShell->SetFrmFmt( pFrm, TRUE );
pCurrWrtShell->EndAllAction();
}
@@ -1015,8 +1011,7 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell*
{
pCurrWrtShell->StartAllAction();
pCurrWrtShell->FillByEx(pChar);
- // Vorlage auch anwenden, um harte Attributierung
- // zu entfernen
+ // also apply template to remove hard set attributes
pCurrWrtShell->EndAllAction();
}
@@ -1041,7 +1036,7 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell*
}
/*--------------------------------------------------------------------
- Beschreibung: NewByExample
+ Description: NewByExample
--------------------------------------------------------------------*/
@@ -1053,8 +1048,8 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily,
rName, (SfxStyleFamily)nFamily );
if(!pStyle)
{
- // JP 07.07.95: behalte die akt. Maske vom PI bei, dadurch werden
- // neue sofort in den sichtbaren Bereich einsortiert
+ // JP 07.07.95: preserve the current mask of PI, then the new one is
+ // immediately merged with the viewable area
if( SFXSTYLEBIT_ALL == nMask || SFXSTYLEBIT_USED == nMask )
nMask = SFXSTYLEBIT_USERDEF;
else
@@ -1073,11 +1068,10 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily,
{
pCurrWrtShell->StartAllAction();
pCurrWrtShell->FillByEx(pColl);
- // Vorlage auch anwenden, um harte Attributierung
- // zu entfernen
+ // also apply template to remove hard set attributes
pColl->SetDerivedFrom(pCurrWrtShell->GetCurTxtFmtColl());
- // setze die Maske noch an der Collection:
+ // set the mask at the Collection:
USHORT nId = pColl->GetPoolFmtId() & 0x87ff;
switch( nMask & 0x0fff )
{
@@ -1121,8 +1115,7 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily,
pFrm->SetDerivedFrom( pFFmt );
pFrm->SetFmtAttr( aSet );
- // Vorlage auch anwenden, um harte Attributierung
- // zu entfernen
+ // also apply template to remove hard set attributes
pCurrWrtShell->SetFrmFmt( pFrm );
pCurrWrtShell->EndAllAction();
}
@@ -1156,12 +1149,12 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily,
pCurrWrtShell->GetDoc()->CopyPageDesc( rSrc, rDest );
- // PoolId darf NIE kopiert werden!
+ // PoolId must NEVER be copied!
rDest.SetPoolFmtId( nPoolId );
rDest.SetPoolHelpId( nHId );
rDest.SetPoolHlpFileId( nHFId );
- // werden Kopf-/Fusszeilen angelegt, so gibt es kein Undo mehr!
+ // when Headers/Footers are created, there is no Undo anymore!
pCurrWrtShell->GetDoc()->DelAllUndoObj();
pCurrWrtShell->EndAllAction();
@@ -1202,23 +1195,21 @@ void SwDocShell::LoadStyles( SfxObjectShell& rSource )
--------------------------------------------------*/
void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocument )
{
-/* [Beschreibung]
-
- Diese Methode wird vom SFx gerufen, wenn aus einer Dokument-Vorlage
- Styles nachgeladen werden sollen. Bestehende Styles soll dabei
- "uberschrieben werden. Das Dokument mu"s daher neu formatiert werden.
- Daher werden die Applikationen in der Regel diese Methode "uberladen
- und in ihrer Implementierung die Implementierung der Basisklasse
- rufen.
+/* [Description]
+
+ This method is called by SFx if Styles have to be reloaded from a
+ document-template. Existing Styples should be overwritten by that.
+ That's why the document has to be reformatted. Therefore applications
+ will usually overload this method and call the baseclass' implementation
+ in their implementation.
*/
- // ist die Source unser Document, dann uebernehmen wir das
- // abpruefen selbst (wesentlich schneller und laeuft nicht ueber
- // die Kruecke SfxStylePool
+ // When the source is our document, we do the checking ourselves
+ // (much quicker and doesn't use the crutch StxStylePool).
if( rSource.ISA( SwDocShell ))
{
- //JP 28.05.99: damit die Kopf-/Fusszeilen nicht den fixen Inhalt
- // der Vorlage erhalten, einmal alle FixFelder der
- // Source aktualisieren
+ //JP 28.05.99: in order for the Headers/Footers not to get the fixed content
+ // of the template, update all the Source's
+ // FixFields once.
if(!bPreserveCurrentDocument)
((SwDocShell&)rSource).pDoc->SetFixFields(false, NULL);
if( pWrtShell )
@@ -1233,8 +1224,8 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocu
pDoc->ReplaceStyles( *((SwDocShell&)rSource).pDoc );
if( !bModified && pDoc->IsModified() && !pView )
{
- // die View wird spaeter angelegt, ueberschreibt aber das
- // Modify-Flag. Per Undo ist sowieso nichts mehr zu machen
+ // the View is created later, but overwrites the Modify-Flag.
+ // Undo doesn't work anymore anyways.
pDoc->SetUndoNoResetModified();
}
}
More information about the Libreoffice-commits
mailing list