[Libreoffice-commits] .: 3 commits - sw/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Tue Feb 22 05:24:40 PST 2011
sw/source/ui/app/app.src | 14 ++--
sw/source/ui/app/appopt.cxx | 38 ++++++------
sw/source/ui/app/docsh.cxx | 127 ++++++++++++++++++++----------------------
sw/source/ui/app/docsh2.cxx | 23 ++-----
sw/source/ui/app/docshdrw.cxx | 4 -
5 files changed, 98 insertions(+), 108 deletions(-)
New commits:
commit b4f478fce57b47f5d035ed07488cf969b120537b
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Tue Feb 22 12:25:25 2011 +0100
Translated comments German -> English
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 80f0b6b..abf8758 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -362,7 +362,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
}
- /*-----------------01.02.97 11.36-------------------
+ /*------------------------------------------------
Background only in WebDialog
--------------------------------------------------*/
if(SFX_ITEM_SET == rSet.GetItemState(RES_BACKGROUND))
@@ -437,7 +437,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
}
- // dann an der akt. View und Shell die entsp. Elemente setzen
+ // set elements for the current view and shell
ApplyUsrPref( aViewOpt, pAppView,
bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB);
}
@@ -510,7 +510,7 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
SwView* pCurrView = GetView();
if(pCurrView)
{
- // wenn Text dann nicht WebView und umgekehrt
+ // if text then not WebView and vice versa
BOOL bWebView = 0 != PTR_CAST(SwWebView, pCurrView);
if( (bWebView && RID_SW_TP_HTML_OPTTABLE_PAGE == nId) ||
(!bWebView && RID_SW_TP_HTML_OPTTABLE_PAGE != nId) )
commit 1c3fd02c580eb09eaa00d191a1dd2fe6dcc4e73d
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Tue Feb 22 12:13:16 2011 +0100
Removed bug reporter and date
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index be6600a..57c42f8 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -94,10 +94,9 @@
#include <txtftn.hxx>
#include <ftnidx.hxx>
-// --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
+// #i20883# Digital Signatures and Encryption
#include <fldbas.hxx>
#include <docary.hxx>
-// <--
#include <swerror.h> // Error messages
#include <helpid.h>
#include <cmdid.h>
@@ -617,10 +616,10 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
UpdateDocInfoForSave();
}
- // --> FME 2007-5-7 #i76360# Update document statistics
+ // #i76360# Update document statistics
SwDocStat aDocStat( pDoc->GetDocStat() );;
pDoc->UpdateDocStat( aDocStat );
- // <--
+
CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
@@ -944,7 +943,7 @@ ULONG SwDocShell::GetMiscStatus() const
return SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE;
}
-// --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
+// #i20883# Digital Signatures and Encryption
sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates )
{
// get global state like HIDDENINFORMATION_DOCUMENTVERSIONS
@@ -978,7 +977,7 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates )
return nState;
}
-// <--
+
void SwDocShell::GetState(SfxItemSet& rSet)
{
@@ -1127,13 +1126,13 @@ void SwDocShell::PrepareReload()
::DelAllGrfCacheEntries( pDoc );
}
-// --> OD 2006-11-07 #i59688#
+// #i59688#
// linked graphics are now loaded on demand.
// Thus, loading of linked graphics no longer needed and necessary for
// the load of document being finished.
void SwDocShell::LoadingFinished()
{
- // --> OD 2007-10-08 #i38810#
+ // #i38810#
// Original fix fails after integration of cws xmlsec11:
// interface <SfxObjectShell::EnableSetModified(..)> no longer works, because
// <SfxObjectShell::FinishedLoading(..)> doesn't care about its status and
@@ -1141,7 +1140,7 @@ void SwDocShell::LoadingFinished()
// Thus, manuell modify the document, if its modified and its links are updated
// before <FinishedLoading(..)> is called.
const bool bHasDocToStayModified( pDoc->IsModified() && pDoc->LinksUpdated() );
- // <--
+
FinishedLoading( SFX_LOADED_ALL );
SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this);
if(pVFrame)
@@ -1217,26 +1216,24 @@ void SwDocShell::CalcLayoutForOLEObjects()
}
-// --> FME 2005-02-25 #i42634# Overwrites SfxObjectShell::UpdateLinks
+// #i42634# Overwrites SfxObjectShell::UpdateLinks
// This new function is necessary to trigger update of links in docs
// read by the binary filter:
void SwDocShell::UpdateLinks()
{
GetDoc()->UpdateLinks(TRUE);
- // --> FME 2005-07-27 #i50703# Update footnote numbers
+ // #i50703# Update footnote numbers
SwTxtFtn::SetUniqueSeqRefNo( *GetDoc() );
SwNodeIndex aTmp( GetDoc()->GetNodes() );
GetDoc()->GetFtnIdxs().UpdateFtn( aTmp );
- // <--
}
uno::Reference< frame::XController >
SwDocShell::GetController()
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > aRet;
- // --> FME 2007-10-15 #i82346# No view in page preview
+ // #i82346# No view in page preview
if ( GetView() )
- // <--
aRet = GetView()->GetController();
return aRet;
}
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index e614d89..5501b02 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -228,9 +228,8 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if( rHint.ISA(SfxEventHint) &&
((SfxEventHint&) rHint).GetEventId() == SFX_EVENT_LOADFINISHED )
{
- // --> OD 2004-12-03 #i38126# - own action id
+ // #i38126# - own action id
nAction = 3;
- // <--
}
if( nAction )
@@ -247,9 +246,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
case 2:
pDoc->GetSysFldType( RES_FILENAMEFLD )->UpdateFlds();
break;
- // --> OD 2004-12-03 #i38126# - own action for event LOADFINISHED
+ // #i38126# - own action for event LOADFINISHED
// in order to avoid a modified document.
- // --> OD 2005-02-01 #i41679# - Also for the instance of <SwDoc>
+ // #i41679# - Also for the instance of <SwDoc>
// it has to be assured, that it's not modified.
// Perform the same as for action id 1, but disable <SetModified>.
case 3:
@@ -269,7 +268,6 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
EnableSetModified( TRUE );
}
break;
- // <--
}
if( pWrtShell )
@@ -318,12 +316,11 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
USHORT &rIdx3, // ""
USHORT &rRemovedIdx ) // if doubles are being deleted, Pos back
{
- // --> OD 2005-05-10 #i48949# - actions aren't undoable. Thus, allow no undo
+ // #i48949# - actions aren't undoable. Thus, allow no undo
// actions
// Note: The undo action stack is cleared at the end of this method.
bool bDoesUndo( GetDoc()->DoesUndo() );
GetDoc()->DoUndo( sal_False );
- // <--
BOOL bRet = FALSE;
@@ -511,14 +508,13 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
rIdx3,
rRemovedIdx);
- // --> OD 2005-05-10 #i48949# - actions aren't undoable and could have change
+ // #i48949# - actions aren't undoable and could have change
// the document node array. Thus, clear the undo action stack.
if ( bDoesUndo )
{
GetDoc()->DelAllUndoObj();
}
GetDoc()->DoUndo( bDoesUndo );
- // <--
return bRet;
}
@@ -1631,7 +1627,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
const String& rMedname = GetMedium()->GetName();
- // fix #51032#: The HTML template still has to be set
+ // The HTML template still has to be set
SetHTMLTemplate( *GetDoc() ); //Styles from HTML.vor
SfxViewShell* pViewShell = GetView() ? (SfxViewShell*)GetView()
@@ -1642,12 +1638,12 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
SubInitNew();
SfxMedium aMed( rStreamName, STREAM_READ, FALSE );
- // --> OD 2005-08-01 #i48748# - use class <SwReloadFromHtmlReader>, because
+ // #i48748# - use class <SwReloadFromHtmlReader>, because
// the base URL has to be set to the filename of the document <rMedname>
// and not to the base URL of the temporary file <aMed> in order to get
// the URLs of the linked graphics correctly resolved.
SwReloadFromHtmlReader aReader( aMed, rMedname, pDoc );
- // <--
+
aReader.Read( *ReadHTML );
const SwView* pCurrView = GetView();
@@ -1690,10 +1686,9 @@ void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView )
SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP );
}
- // --> FME 2005-03-16 #i44963# Good occasion to check if page sizes in
+ // #i44963# Good occasion to check if page sizes in
// page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
GetDoc()->CheckDefaultPageFmt();
- // <--
// Currently there can be only one view (layout) if the document is viewed in Web layout
// So if there are more views we are in print layout and for toggling to Web layout all other views must be closed
commit 79bd64012f8ad0ea3a6c4f584fd69c433cd2254d
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Tue Feb 22 11:42:19 2011 +0100
Translated comments from German to English
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index a62d51e..5a597ae 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -53,7 +53,7 @@ String STR_PAGE_COUNT_MACRO
Text [ en-US ] = "Changing the page count" ;
};
- // Image-Liste ----------------------------------------------------------------
+ // Image-list ----------------------------------------------------------------
// Don't use this image list for normal toolbar images. We have now our commandimagelist
// folder in default_images. This list is now only used for special toolboxes that are
// used in floating windows.
@@ -82,7 +82,7 @@ ImageList RID_DEFAULTIMAGELIST_LC
IMAGELIST_AND_COUNT
};
-// Vorlagen
+// Templates
#define STYLE_IMAGE_LISTEF \
MaskColor = IMAGE_MASK_COLOR ; \
IdList = \
@@ -169,10 +169,10 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
-// Default Bitmap fuer Toolbox
+// Default Bitmap for Toolbox
BITMAP BMP_FEHLT { FILE = "x.bmp" ; };
-// Bitmap fuer die NumerierungsVorlagen im Organizer
+// Bitmap for the NumberingTemplates in the Organizer
Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; };
String STR_ENV_TITLE
@@ -242,8 +242,8 @@ InfoBox MSG_ERROR_PASSWD
};
/*
- * auskommentiert, da die Toolbox z. Zt. nicht aus der Resource
- * geladen werden kann
+ * commented out, because the Toolbox can't be loaded from the resource
+ * at this time.
Window WIN_TOOLBOX {
"Bearbeitung von Text, Rahmen, Grafik, Tabellen oder "
"Numerierungen.";
@@ -267,7 +267,7 @@ String STR_DOC_STAT
};
// ----------------------------
- // Statusleisten-Ueberschriften
+ // Statusbar-titles
// ----------------------------
String STR_STATSTR_W4WREAD
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 3fb2824..80f0b6b 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <hintids.hxx>
-#include <cmdid.h> // Funktion-Ids
+#include <cmdid.h> // Function-Ids
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -58,8 +58,8 @@
#include <wrtsh.hxx>
#include <IDocumentDeviceAccess.hxx>
#include <uitool.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
-#include <fldbas.hxx> //fuer UpdateFields
+#include <initui.hxx> // for ::GetGlossaries()
+#include <fldbas.hxx> //for UpdateFields
#include <wview.hxx>
#include <cfgitems.hxx>
#include <prtopt.hxx>
@@ -73,7 +73,7 @@
#include <editeng/unolingu.hxx>
#include <globals.hrc>
-#include <globals.h> // globale Konstanten z.B.
+#include <globals.h> // e.g. global Constants
#include <svl/slstitm.hxx>
#include "swabstdlg.hxx"
#include <swwrtshitem.hxx>
@@ -87,27 +87,27 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId )
{
BOOL bTextDialog = (nId == SID_SW_EDITOPTIONS) ? TRUE : FALSE;
- // hier werden die Optionen fuer die Web- und den Textdialog zusmmengesetzt
+ // the options for the Web- and Textdialog are put together here
SwViewOption aViewOpt = *GetUsrPref(!bTextDialog);
SwMasterUsrPref* pPref = bTextDialog ? pUsrPref : pWebUsrPref;
- //kein MakeUsrPref, da hier nur die Optionen von Textdoks genommen werden duerfen
+ // no MakeUsrPref, because only options from textdoks can be used here
SwView* pAppView = GetView();
if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current())
pAppView = 0;
if(pAppView)
{
- // wenn Text dann nicht WebView und umgekehrt
+ // if Text then no WebView and vice versa
BOOL bWebView = 0 != PTR_CAST(SwWebView, pAppView);
if( (bWebView && !bTextDialog) ||(!bWebView && bTextDialog))
{
aViewOpt = *pAppView->GetWrtShell().GetViewOptions();
}
else
- pAppView = 0; // mit View kann hier nichts gewonnen werden
+ pAppView = 0; // with View, there's nothing to win here
}
/********************************************************************/
- /* Options/Edit */
+ /* Options/Edit */
/********************************************************************/
SfxItemSet* pRet = new SfxItemSet (GetPool(), FN_PARAM_DOCDISP, FN_PARAM_ELEM,
SID_PRINTPREVIEW, SID_PRINTPREVIEW,
@@ -272,7 +272,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
: NULL;
/*---------------------------------------------------------------------
- Seite Dokumentansicht auswerten
+ Interpret the page Documentview
-----------------------------------------------------------------------*/
if( SFX_ITEM_SET == rSet.GetItemState(
FN_PARAM_DOCDISP, FALSE, &pItem ))
@@ -301,7 +301,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
}
/*---------------------------------------------------------------------
- Elemente - Item auswerten
+ Elements - interpret Item
-----------------------------------------------------------------------*/
if( SFX_ITEM_SET == rSet.GetItemState(
@@ -363,7 +363,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
/*-----------------01.02.97 11.36-------------------
- Hintergrund nur im WebDialog
+ Background only in WebDialog
--------------------------------------------------*/
if(SFX_ITEM_SET == rSet.GetItemState(RES_BACKGROUND))
{
@@ -373,7 +373,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
}
/*--------------------------------------------------------------------
- Seite Rastereinstellungen auswerten
+ Interpret page Grid Settings
----------------------------------------------------------------------*/
if( SFX_ITEM_SET == rSet.GetItemState(
@@ -403,9 +403,9 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
}
}
- //--------------------------------------------------------------------------
- // Writer Drucker Zusatzeinstellungen auswerten
- //----------------------------------------------------------------------------
+ /*--------------------------------------------------------------------
+ Interpret Writer Printer Options
+ ----------------------------------------------------------------------*/
if( SFX_ITEM_SET == rSet.GetItemState(
FN_PARAM_ADDPRINTER, FALSE, &pItem ))
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 0037cb1..be6600a 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -68,11 +68,11 @@
#include <swwait.hxx>
#include <swprtopt.hxx>
#include <frmatr.hxx>
-#include <view.hxx> // fuer die aktuelle Sicht
+#include <view.hxx> // for the current view
#include <edtwin.hxx>
#include <PostItMgr.hxx>
-#include <wrtsh.hxx> // Verbindung zur Core
-#include <docsh.hxx> // Dokumenterzeugung
+#include <wrtsh.hxx> // connection to Core
+#include <docsh.hxx> // document creation
#include <basesh.hxx>
#include <viewopt.hxx>
#include <wdocsh.hxx>
@@ -98,7 +98,7 @@
#include <fldbas.hxx>
#include <docary.hxx>
// <--
-#include <swerror.h> // Fehlermeldungen
+#include <swerror.h> // Error messages
#include <helpid.h>
#include <cmdid.h>
#include <globals.hrc>
@@ -141,7 +141,7 @@ TYPEINIT2(SwDocShell, SfxObjectShell, SfxListener);
SFX_IMPL_OBJECTFACTORY(SwDocShell, SvGlobalName(SO3_SW_CLASSID), SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_HASMENU, "swriter" )
/*--------------------------------------------------------------------
- Beschreibung: Laden vorbereiten
+ Description: Prepare loading
--------------------------------------------------------------------*/
@@ -217,8 +217,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
OSL_ENSURE(pItem->IsA( TYPE(SfxStringItem) ), "Wrong parameter type");
comphelper::OStorageHelper::SetCommonStoragePassword( rMedium.GetStorage(), ((const SfxStringItem *)pItem)->GetValue() );
}
- // Fuer's Dokument-Einfuegen noch die FF-Version, wenn's der
- // eigene Filter ist.
+ // And for document-paste the FF-Version, when it's the own filter
OSL_ENSURE( /*pRead != ReadSw3 || */pRead != ReadXML || pFlt->GetVersion(),
"No FF version set in filter" );
}
@@ -247,7 +246,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
}
/*--------------------------------------------------------------------
- Beschreibung: Laden
+ Description: Loading
--------------------------------------------------------------------*/
BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium )
@@ -262,7 +261,7 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium )
SwWait aWait( *this, TRUE );
- // SfxProgress unterdruecken, wenn man Embedded ist
+ // Suppress SfxProgress, when we are Embedded
SW_MOD()->SetEmbeddedLoadSave(
SFX_CREATE_MODE_EMBEDDED == GetCreateMode() );
@@ -273,7 +272,7 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium )
ULONG nErr = pRdr->Read( *pRead );
- // Evtl. ein altes Doc weg
+ // Maybe put away one old Doc
if ( pDoc != pRdr->GetDoc() )
{
if( pDoc )
@@ -307,7 +306,7 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium )
}
/*--------------------------------------------------------------------
- Beschreibung: Sichern des Default-Formats, Stg vorhanden
+ Description: Saving the Default-Format, Stg present
--------------------------------------------------------------------*/
@@ -350,9 +349,9 @@ BOOL SwDocShell::Save()
break;
case SFX_CREATE_MODE_EMBEDDED:
- // SfxProgress unterdruecken, wenn man Embedded ist
+ // Suppress SfxProgress, if we are Embedded
SW_MOD()->SetEmbeddedLoadSave( TRUE );
- // kein break;
+ // no break;
case SFX_CREATE_MODE_STANDARD:
case SFX_CREATE_MODE_PREVIEW:
@@ -365,7 +364,7 @@ BOOL SwDocShell::Save()
pDoc->SetContainsMSVBasic( FALSE );
}
- // TabellenBox Edit beenden!
+ // End TableBox Edit!
if( pWrtShell )
pWrtShell->EndAllTblBoxEdit();
@@ -400,7 +399,7 @@ BOOL SwDocShell::Save()
}
/*--------------------------------------------------------------------
- Beschreibung: Sichern im Defaultformat
+ Description: Save using the Defaultformat
--------------------------------------------------------------------*/
@@ -483,18 +482,18 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
pDoc->SetContainsMSVBasic( FALSE );
}
- // TabellenBox Edit beenden!
+ // End TableBox Edit!
if( pWrtShell )
pWrtShell->EndAllTblBoxEdit();
- // Modified-Flag merken und erhalten ohne den Link zu Callen
- // (fuer OLE; nach Anweisung von MM)
+ // Remember and preserve Modified-Flag without calling the Link
+ // (for OLE; after Statement from MM)
BOOL bIsModified = pDoc->IsModified();
SwUndoNoModifiedPosition aOldPos = pDoc->getUndoNoModifiedPosition();
Link aOldOLELnk( pDoc->GetOle2Link() );
pDoc->SetOle2Link( Link() );
- // SfxProgress unterdruecken, wenn man Embedded ist
+ // Suppress SfxProgress when we are Embedded
SW_MOD()->SetEmbeddedLoadSave(
SFX_CREATE_MODE_EMBEDDED == GetCreateMode() );
@@ -529,11 +528,11 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
}
/*--------------------------------------------------------------------
- Beschreibung: Sichern aller Formate
+ Description: Save all Formats
--------------------------------------------------------------------*/
SwSrcView* lcl_GetSourceView( SwDocShell* pSh )
{
- // sind wir in der SourceView?
+ // are we in SourceView?
SfxViewFrame* pVFrame = SfxViewFrame::GetFirst( pSh );
SfxViewShell* pViewShell = pVFrame ? pVFrame->GetViewShell() : 0;
return PTR_CAST( SwSrcView, pViewShell);
@@ -587,7 +586,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
}
}
- // TabellenBox Edit beenden!
+ // End TableBox Edit!
if( pWrtShell )
pWrtShell->EndAllTblBoxEdit();
@@ -638,14 +637,14 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
pFlt->GetUserData().EqualsAscii( FILTER_XMLV ) ||
pFlt->GetUserData().EqualsAscii( FILTER_XMLVW ) ) )
{
- // eigenen Typ ermitteln
+ // determine the own Type
BYTE nMyType = 0;
if( ISA( SwWebDocShell) )
nMyType = 1;
else if( ISA( SwGlobalDocShell) )
nMyType = 2;
- // gewuenschten Typ ermitteln
+ // determine the desired Type
BYTE nSaveType = 0;
ULONG nSaveClipId = pFlt->GetFormat();
if( SOT_FORMATSTR_ID_STARWRITERWEB_8 == nSaveClipId ||
@@ -659,7 +658,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
SOT_FORMATSTR_ID_STARWRITERGLOB_40 == nSaveClipId )
nSaveType = 2;
- // Flags am Dokument entsprechend umsetzen
+ // Change Flags of the Document accordingly
BOOL bIsHTMLModeSave = GetDoc()->get(IDocumentSettingAccess::HTML_MODE);
BOOL bIsGlobalDocSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT);
BOOL bIsGlblDocSaveLinksSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS);
@@ -688,7 +687,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
}
}
- // Jetzt das Dokument normal speichern
+ // Now normally save the Document
BOOL bRet = SaveAs( rMedium );
if( nMyType != nSaveType )
@@ -739,15 +738,15 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
xWriter->SetAsciiOptions( aOpt );
}
- // SfxProgress unterdruecken, wenn man Embedded ist
+ // Suppress SfxProgress when we are Embedded
SW_MOD()->SetEmbeddedLoadSave(
SFX_CREATE_MODE_EMBEDDED == GetCreateMode());
- // Kontext aufspannen, um die Anzeige der Selektion zu unterbinden
+ // Span Context in order to suppress the Selection's View
ULONG nErrno;
String aFileName( rMedium.GetName() );
- //Keine View also das ganze Dokument!
+ // No View, so the whole Document!
if ( pWrtShell )
{
SwWait aWait( *this, TRUE );
@@ -758,8 +757,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
pWrtShell->Push();
SwWriter aWrt( rMedium, *pWrtShell, TRUE );
nErrno = aWrt.Write( xWriter, &aFileName );
- //JP 16.05.97: falls der SFX uns die View waehrend des speicherns
- // entzieht
+ //JP 16.05.97: In case the SFX revokes the View while saving
if( pWrtShell )
{
pWrtShell->Pop(FALSE);
@@ -770,7 +768,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
}
else
{
- // sind wir in der SourceView?
+ // are we in SourceView?
SwSrcView* pSrcView = ::lcl_GetSourceView( this );
if( pSrcView )
{
@@ -793,12 +791,12 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
}
/*--------------------------------------------------------------------
- Beschreibung: Haende weg
+ Description: Hands off
--------------------------------------------------------------------*/
/*--------------------------------------------------------------------
- Beschreibung: ??? noch nicht zu aktivieren, muss TRUE liefern
+ Description: ??? do not yet activate, must deliver TRUE
--------------------------------------------------------------------*/
@@ -808,7 +806,7 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xS
BOOL bRet = SfxObjectShell::SaveCompleted( xStor );
if( bRet )
{
- // erst hier entscheiden, ob das Speichern geklappt hat oder nicht
+ // Do not decide until here, whether Saving was successful or not
if( IsModified() )
pDoc->SetModified();
else
@@ -838,26 +836,26 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xS
}
/*--------------------------------------------------------------------
- Beschreibung: Draw()-Overload fuer OLE2 (Sfx)
+ Description: Draw()-Overload for OLE2 (Sfx)
--------------------------------------------------------------------*/
void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
USHORT nAspect )
{
- //fix #25341# Draw sollte das Modified nicht beeinflussen
+ //fix #25341# Draw should not affect the Modified
BOOL bResetModified;
if ( TRUE == (bResetModified = IsEnableSetModified()) )
EnableSetModified( FALSE );
- //sollte am Document ein JobSetup haengen, dann kopieren wir uns diesen,
- //um nach dem PrtOle2 diesen wieder am Doc zu verankern.
- //Einen leeren JobSetup setzen wir nicht ein, denn der wuerde nur zu
- //fragwuerdigem Ergebnis nach teurer Neuformatierung fuehren (Preview!)
+ // When there is a JobSetup connected to the Document, we copy it to
+ // reconnect it after PrtOle2. We don't use an empty JobSetup because
+ // that would only lead to questionable results after expensive
+ // reformatting (Preview!)
JobSetup *pOrig = 0;
if ( rSetup.GetPrinterName().Len() && ASPECT_THUMBNAIL != nAspect )
{
pOrig = const_cast<JobSetup*>(pDoc->getJobsetup());
- if( pOrig ) // dann kopieren wir uns den
+ if( pOrig ) // then we copy that
pOrig = new JobSetup( *pOrig );
pDoc->setJobsetup( rSetup );
}
@@ -901,7 +899,7 @@ void SwDocShell::SetVisArea( const Rectangle &rRect )
nMoveY = aRect.Top() < 0 ? -aRect.Top() : 0;
aRect.Move( nMoveX, nMoveY );
- //Ruft das SfxInPlaceObject::SetVisArea()!
+ // Calls SfxInPlaceObject::SetVisArea()!
pView->SetVisArea( aRect, TRUE );
}
else
@@ -913,7 +911,7 @@ Rectangle SwDocShell::GetVisArea( USHORT nAspect ) const
{
if ( nAspect == ASPECT_THUMBNAIL )
{
- //PreView: VisArea auf die erste Seite einstellen.
+ // PreView: set VisArea to the first page.
SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 1 );
SwCntntNode* pNd = pDoc->GetNodes().GoNext( &aIdx );
@@ -997,7 +995,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
if ( !bDisable )
{
SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this);
- while (pTmpFrm) // Preview suchen
+ while (pTmpFrm) // Look for Preview
{
if ( PTR_CAST(SwView, pTmpFrm->GetViewShell()) &&
((SwView*)pTmpFrm->GetViewShell())->GetWrtShell().getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE))
@@ -1089,15 +1087,15 @@ void SwDocShell::GetState(SfxItemSet& rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: OLE-Hdls
+ Description: OLE-Hdls
--------------------------------------------------------------------*/
IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p )
{
- // vom Doc wird der Status mitgegeben (siehe doc.cxx)
- // Bit 0: -> alter Zustand
- // Bit 1: -> neuer Zustand
+ // the Status is handed over from Doc (see doc.cxx)
+ // Bit 0: -> old state
+ // Bit 1: -> new state
long nStatus = (long)p;
if( IsEnableSetModified() )
SetModified( (nStatus & 2) ? TRUE : FALSE );
@@ -1105,7 +1103,7 @@ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p )
}
/*--------------------------------------------------------------------
- Beschreibung: Pool returnen Hier weil virtuelll
+ Description: return Pool here, because virtual
--------------------------------------------------------------------*/
@@ -1160,10 +1158,10 @@ void SwDocShell::LoadingFinished()
}
}
-// eine Uebertragung wird abgebrochen (wird aus dem SFX gerufen)
+// a Transfer is cancelled (is called from SFX)
void SwDocShell::CancelTransfers()
{
- // alle Links vom LinkManager Canceln
+ // Cancel all links from LinkManager
aFinishedTimer.Stop();
pDoc->GetLinkManager().CancelTransfers();
SfxObjectShell::CancelTransfers();
diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx
index 1fb22ee..a6beb59 100644
--- a/sw/source/ui/app/docshdrw.cxx
+++ b/sw/source/ui/app/docshdrw.cxx
@@ -43,7 +43,7 @@
using namespace ::com::sun::star;
/*--------------------------------------------------------------------
- Beschreibung: Document laden
+ Description: Load Document
--------------------------------------------------------------------*/
@@ -52,7 +52,7 @@ void SwDocShell::InitDraw()
SdrModel *pDrDoc = pDoc->GetDrawModel();
if( pDrDoc )
{
- // Listen, bzw. Tables im ItemSet der DocShell anlegen
+ // create Lists and Tables DocShell's ItemSet
PutItem( SvxGradientListItem( pDrDoc->GetGradientList(), SID_GRADIENT_LIST ) );
PutItem( SvxHatchListItem( pDrDoc->GetHatchList(), SID_HATCH_LIST ) );
PutItem( SvxBitmapListItem( pDrDoc->GetBitmapList(), SID_BITMAP_LIST ) );
More information about the Libreoffice-commits
mailing list