sw/source/ui/uiview/viewprt.cxx | 30 ++++++-----------
sw/source/ui/uiview/viewsrch.cxx | 68 +++++++++++++++------------------------
sw/source/ui/uiview/viewstat.cxx | 5 +-
3 files changed, 41 insertions(+), 62 deletions(-)
New commits:
commit b4f480ce9bb093835c093f72bf02e22686f95997
Author: Matthias Freund <matti...@yahoo.de>
Date: Fri Jul 12 21:58:55 2013 +0200
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 5)
Change-Id: Ib4dcbce29ef5772a9405db838d904c405c0249e0
Reviewed-on: https://gerrit.libreoffice.org/4874
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index ad8c608..a1712a7 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -66,9 +66,8 @@
using namespace ::com::sun::star;
-/*--------------------------------------------------------------------
- Beschreibung: Drucker an Sfx uebergeben
- --------------------------------------------------------------------*/
+// Hand over the printer to Sfx
+
SfxPrinter* SwView::GetPrinter( sal_Bool bCreate )
{
const IDocumentDeviceAccess* pIDDA =
GetWrtShell().getIDocumentDeviceAccess();
@@ -82,16 +81,15 @@ SfxPrinter* SwView::GetPrinter( sal_Bool bCreate )
return pPrt;
}
-/*--------------------------------------------------------------------
- Beschreibung: Druckerwechsel weitermelden
- --------------------------------------------------------------------*/
+// Propagate printer change
+
void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, sal_Bool bWeb
)
{
SwPrintOptions* pOpt = SW_MOD()->GetPrtOptions(bWeb);
if( !pOpt)
return;
- // Applikationseigene Druckoptionen aus SfxPrinter auslesen
+ // Reading Application own printing options from SfxPrinter
const SfxItemSet& rSet = pNew->GetOptions();
const SwAddPrinterItem* pAddPrinterAttr;
@@ -146,18 +144,16 @@ bool SwView::HasPrintOptionsPage() const
return true;
}
-/*--------------------------------------------------------------------
- Beschreibung: TabPage fuer applikationsspezifische Druckoptionen
- --------------------------------------------------------------------*/
+// TabPage for application-specific print options
+
SfxTabPage* SwView::CreatePrintOptionsPage(Window* pParent,
const SfxItemSet& rSet)
{
return ::CreatePrintOptionsPage( pParent, rSet, sal_False );
}
-/*--------------------------------------------------------------------
- Beschreibung: Print-Dispatcher
- --------------------------------------------------------------------*/
+// Print dispatcher
+
void SwView::ExecutePrint(SfxRequest& rReq)
{
sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
@@ -247,10 +243,8 @@ void SwView::ExecutePrint(SfxRequest& rReq)
}
}
-/*--------------------------------------------------------------------
- Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und
- SwPagePreview
- --------------------------------------------------------------------*/
+// Create page printer/additions for SwView and SwPagePreview
+
SfxTabPage* CreatePrintOptionsPage( Window *pParent,
const SfxItemSet &rOptions, sal_Bool bPreview )
{
@@ -283,7 +277,7 @@ void SetAppPrintOptions( ViewShell* pSh, sal_Bool bWeb )
if( pIDDA->getPrinter( false ) )
{
- // Applikationseigene Druckoptionen in SfxPrinter schiessen
+ // Close application own printing options in SfxPrinter.
SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData);
SfxItemSet aSet( pSh->GetAttrPool(),
FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 4b67059..e89b7ea 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -47,7 +47,7 @@
#include <workctrl.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // for Undo-Ids
#include <uitool.hxx>
#include <cmdid.h>
#include <docsh.hxx>
@@ -65,9 +65,7 @@ using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-/*--------------------------------------------------------------------
- Beschreibung: Search Parameter
- --------------------------------------------------------------------*/
+//Search Parameter
struct SwSearchOptions
{
@@ -77,7 +75,6 @@ struct SwSearchOptions
SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward );
};
-
inline Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg )
{
Window* pWin;
@@ -128,7 +125,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
m_pWrtShell->LeaveBlockMode();
switch (nSlot)
{
- // erstmal Nichts tun
+ // for now do nothing
case SID_SEARCH_ITEM:
{
delete m_pSrchItem;
@@ -144,7 +141,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
case FID_SEARCH_OFF:
if(pArgs)
{
- // Dialog abmelden
+ // Unregister dialog
delete m_pSrchItem;
m_pSrchItem = (SvxSearchItem*) pArgs->Get(SID_SEARCH_ITEM).Clone();
@@ -154,7 +151,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
if ( pWrp )
{
m_pSrchDlg = static_cast <SvxSearchDialog*> (pWrp->getDialog
());
- // die Search / Replace -Items merken wir uns
+ // We will remember the search-/replace items.
const SearchAttrItemList* pList =
m_pSrchDlg->GetSearchItemList();
if( pList && pList->Count() )
m_pSrchList = new SearchAttrItemList( *pList );
@@ -202,7 +199,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
}
else
{
- // SearchItem aus Request besorgen
+ // Get SearchItem from request
OSL_ENSURE(pArgs, "Args missing");
if ( pArgs )
{
@@ -237,19 +234,16 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
case SVX_SEARCHCMD_REPLACE:
{
- // 1) Selektion ersetzen (nicht. wenn nur Attribute ersetzt
- // werden sollen)
-//JP 27.04.95: warum ?
-// was ist, wenn man das gefundene nur attributieren will??
+ // 1) Replace selection (Not if only attributes should be
replaced)
+//JP 27.04.95: Why ?
+// what if you only want to assign attributes to the found??
sal_uInt16 nCmd = SVX_SEARCHCMD_FIND;
if( !m_pSrchItem->GetReplaceString().isEmpty() ||
!m_pReplList )
{
- // Verhindern, dass - falls der Suchstring im
- // Ersetzungsstring enthalten ist - der ersetzte String
- // noch einmal gefunden wird.
-
+ // Prevent, that the replaced string will be found
again
+ // if the replacement string is containing the search
string.
sal_Bool bBack = m_pSrchItem->GetBackward();
if (bBack)
m_pWrtShell->Push();
@@ -273,7 +267,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
else if( m_pReplList )
nCmd = SVX_SEARCHCMD_REPLACE;
- // 2) Weiter suchen (ohne zu ersetzen!)
+ // 2) Search further (without replacing!)
sal_uInt16 nOldCmd = m_pSrchItem->GetCommand();
m_pSrchItem->SetCommand( nCmd );
@@ -439,9 +433,8 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
{
SwSearchOptions aOpts( m_pWrtShell, m_pSrchItem->GetBackward() );
- // Startposition der Suche fuer WrapAround merken
- // Start- / EndAction wegen vielleicht bestehender Selektionen
- // aus 'Suche alle'
+ // Remember starting position of the search for wraparound
+ // Start- / EndAction perhaps because existing selections of 'search
all'
m_pWrtShell->StartAllAction();
m_pWrtShell->Push();
@@ -451,8 +444,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
// selected regions as the cursor doesn't mark the selection in that case.)
m_pWrtShell->GetCrsr()->Normalize( m_pSrchItem->GetBackward() );
- // falls in selektierten Bereichen gesucht werden soll, duerfen sie
- // nicht aufgehoben werden
+ // If you want to search in selected areas, they must not be
unselected.
if (!m_pSrchItem->GetSelection())
m_pWrtShell->KillSelection(0, false);
@@ -472,9 +464,8 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
}
delete pWait, pWait = 0;
- // Suchen in den Sonderbereichen, wenn keine
- // Suche in Selektionen vorliegt. Bei Suche in Selektionen
- // wird ohnehin in diesen Sonderbereichen gesucht
+ // Search in the specialized areas when no search is present in
selections.
+ // When searching selections will already searched in these special
areas.
bool bHasSrchInOther = m_bExtra;
if (!m_pSrchItem->GetSelection() && !m_bExtra )
{
@@ -495,7 +486,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
SvxSearchDialogWrapper *pWrp =
(SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nId);
m_pSrchDlg = pWrp ? static_cast <SvxSearchDialog*> (pWrp->getDialog ()) :
0;
- // falls Startposition am Dokumentende / -anfang
+ // If starting position is at the end or beginning of the document.
if (aOpts.bDontWrap)
{
m_pWrtShell->EndAllAction();
@@ -508,7 +499,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
return sal_False;
}
m_pWrtShell->EndAllAction();
- // noch mal mit WrapAround versuchen?
+ // Try again with WrapAround?
if( bApi || RET_NO == QueryBox( GetParentWindow( m_pSrchDlg ),
SW_RES( DOCPOS_START == aOpts.eEnd
@@ -560,8 +551,7 @@ sal_Bool SwView::SearchAll(sal_uInt16* pFound)
if (!m_pSrchItem->GetSelection())
{
- // bestehende Selektionen aufheben,
- // wenn nicht in selektierten Bereichen gesucht werden soll
+ // Cancel existing selections, if should not be sought in selected
areas.
m_pWrtShell->KillSelection(0, false);
if( DOCPOS_START == aOpts.eEnd )
@@ -586,7 +576,7 @@ void SwView::Replace()
m_pWrtShell->StartAllAction();
- if( m_pSrchItem->GetPattern() ) // Vorlagen?
+ if( m_pSrchItem->GetPattern() ) // Templates?
{
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, m_pSrchItem->GetSearchString());
@@ -674,8 +664,6 @@ void SwView::Replace()
m_pWrtShell->EndAllAction();
}
-
-
SwSearchOptions::SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward )
{
eStart = DOCPOS_CURR;
@@ -716,7 +704,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions&
rOptions )
{
m_pSrchList->Get( aSrchSet );
- /* -- Seitenumbruch mit Seitenvorlage */
+ // -- Page break with page template
::SfxToSwPageDescAttr( *m_pWrtShell, aSrchSet );
}
@@ -727,11 +715,11 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions&
rOptions )
aSearchAttrRange );
m_pReplList->Get( *pReplSet );
- /* -- Seitenumbruch mit Seitenvorlage */
+ // -- Page break with page template
::SfxToSwPageDescAttr( *m_pWrtShell, *pReplSet );
- if( !pReplSet->Count() ) // schade, die Attribute
- DELETEZ( pReplSet ); // kennen wir nicht
+ if( !pReplSet->Count() ) // too bad, we don't know
+ DELETEZ( pReplSet ); // the attributes
}
//
@@ -756,7 +744,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions&
rOptions )
}
else if( m_pSrchItem->GetPattern() )
{
- // Suchen (und ersetzen) von Vorlagen
+ // Searching (and replacing) templates
const String sRplStr( m_pSrchItem->GetReplaceString() );
nFound = m_pWrtShell->SearchTempl( m_pSrchItem->GetSearchString(),
rOptions.eStart,
@@ -766,7 +754,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions&
rOptions )
}
else
{
- // Normale Suche
+ // Normal search
nFound = m_pWrtShell->SearchPattern(aSearchOpt,
m_pSrchItem->GetNotes(),
rOptions.eStart,
rOptions.eEnd,
@@ -837,6 +825,4 @@ void SwView::StateSearch(SfxItemSet &rSet)
}
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index 91a3d4d..47c6a5f 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -82,7 +82,7 @@ void SwView::GetState(SfxItemSet &rSet)
case FN_INSERT_CAPTION:
{
- // Captions gibt's fuer Grafiken, OLE-Objekte, Rahmen und
Tabellen
+ // There are captions for graphics, OLE objects, frames and
tables
if( !bGetFrmType )
eFrmType = m_pWrtShell->GetFrmType(0,sal_True),
bGetFrmType = sal_True;
if (! ( ((eFrmType & FRMTYPE_FLY_ANY) && m_nSelectionType !=
nsSelectionType::SEL_DRW_TXT)||
@@ -148,8 +148,7 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case SID_UNDO:
{
- // die muss noch nicht vorhanden sein
- // also lasse sie mal anlegen:
+ // which must not be present, so let them create:
if( !m_pShell )
SelectShell();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
