Kaydet (Commit) de34ef76 authored tarafından Matthias Freund's avatar Matthias Freund Kaydeden (comit) Miklos Vajna

fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 2)

Translations and cleanups.

Change-Id: I1894cf896ebfcbbad16323f620c0e986670279d1
Reviewed-on: https://gerrit.libreoffice.org/4192Reviewed-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
Tested-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
üst 92207231
...@@ -41,10 +41,8 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) : ...@@ -41,10 +41,8 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) :
SwScrollbar::~SwScrollbar() {} SwScrollbar::~SwScrollbar() {}
/*------------------------------------------------------------------------ // Will be called after a change of the document size
Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den // to refresh the range of the scrollbars.
Range des Scrollbars neu einzustellen.
------------------------------------------------------------------------*/
void SwScrollbar::DocSzChgd( const Size &rSize ) void SwScrollbar::DocSzChgd( const Size &rSize )
{ {
...@@ -55,11 +53,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize ) ...@@ -55,11 +53,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize )
SetPageSize( nVisSize * 77 / 100 ); SetPageSize( nVisSize * 77 / 100 );
} }
/*------------------------------------------------------------------------ // Will be called after a change of the visible view section.
Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes
gerufen.
------------------------------------------------------------------------*/
void SwScrollbar::ViewPortChgd( const Rectangle &rRect ) void SwScrollbar::ViewPortChgd( const Rectangle &rRect )
{ {
...@@ -104,11 +98,11 @@ void SwScrollbar::SetAuto(sal_Bool bSet) ...@@ -104,11 +98,11 @@ void SwScrollbar::SetAuto(sal_Bool bSet)
{ {
bAuto = bSet; bAuto = bSet;
// automatisch versteckt - dann anzeigen // hide autmatically - automatisch versteckt - then show
if(!bAuto && bVisible && !ScrollBar::IsVisible()) if(!bAuto && bVisible && !ScrollBar::IsVisible())
ExtendedShow(sal_True); ExtendedShow(sal_True);
else if(bAuto) else if(bAuto)
AutoShow(); // oder automatisch verstecken AutoShow(); // or hide automatically
} }
} }
......
...@@ -102,7 +102,7 @@ using ::com::sun::star::util::SearchOptions; ...@@ -102,7 +102,7 @@ using ::com::sun::star::util::SearchOptions;
#define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL)) #define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL))
// Druckraender -> wie Basic - Ide // Printing margins -> like Basic - Ide
#define LMARGPRN 1700 #define LMARGPRN 1700
#define RMARGPRN 900 #define RMARGPRN 900
#define TMARGPRN 2000 #define TMARGPRN 2000
...@@ -143,7 +143,7 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1 ...@@ -143,7 +143,7 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1
long nFontHeight = rOutDev.GetTextHeight(); long nFontHeight = rOutDev.GetTextHeight();
// 1.Border => Strich, 2+3 Border = Freiraum. // 1.Border => Line, 2+3 Border = Space.
long nYTop = TMARGPRN-3*nBorder-nFontHeight; long nYTop = TMARGPRN-3*nBorder-nFontHeight;
long nXLeft = nLeftMargin-nBorder; long nXLeft = nLeftMargin-nBorder;
...@@ -202,14 +202,14 @@ static void lcl_ConvertTabsToSpaces( String& rLine ) ...@@ -202,14 +202,14 @@ static void lcl_ConvertTabsToSpaces( String& rLine )
{ {
if ( rLine.GetChar(nPos) == '\t' ) if ( rLine.GetChar(nPos) == '\t' )
{ {
// Nicht 4 Blanks, sondern an 4er TabPos: // Not 4 blanks, but on 4th TabPos:
OUStringBuffer aBlanker; OUStringBuffer aBlanker;
comphelper::string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) ), ' '); comphelper::string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) ), ' ');
rLine.Erase( nPos, 1 ); rLine.Erase( nPos, 1 );
rLine.Insert(aBlanker.makeStringAndClear(), nPos); rLine.Insert(aBlanker.makeStringAndClear(), nPos);
nMax = rLine.Len(); nMax = rLine.Len();
} }
nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt... nPos++; // Not optimally, if tab, but not wrong...
} }
} }
} }
...@@ -227,7 +227,7 @@ SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) : ...@@ -227,7 +227,7 @@ SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
SwSrcView::~SwSrcView() SwSrcView::~SwSrcView()
{ {
SwDocShell* pDocShell = GetDocShell(); SwDocShell* pDocShell = GetDocShell();
OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?"); OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Why no WebDocShell?");
const TextSelection& rSel = aEditWin.GetTextView()->GetSelection(); const TextSelection& rSel = aEditWin.GetTextView()->GetSelection();
((SwWebDocShell*)pDocShell)->SetSourcePara( static_cast< sal_uInt16 >( rSel.GetStart().GetPara() ) ); ((SwWebDocShell*)pDocShell)->SetSourcePara( static_cast< sal_uInt16 >( rSel.GetStart().GetPara() ) );
...@@ -256,8 +256,8 @@ void SwSrcView::Init() ...@@ -256,8 +256,8 @@ void SwSrcView::Init()
SetName(OUString("Source")); SetName(OUString("Source"));
SetWindow( &aEditWin ); SetWindow( &aEditWin );
SwDocShell* pDocShell = GetDocShell(); SwDocShell* pDocShell = GetDocShell();
// wird das Doc noch geladen, dann muss die DocShell das Load // If the doc is still loading, then the DocShell must fire up
// anwerfen, wenn das Laden abgeschlossen ist // the Load if the loading is completed.
if(!pDocShell->IsLoading()) if(!pDocShell->IsLoading())
Load(pDocShell); Load(pDocShell);
else else
...@@ -364,7 +364,7 @@ void SwSrcView::Execute(SfxRequest& rReq) ...@@ -364,7 +364,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
const SfxItemSet* pTmpArgs = rReq.GetArgs(); const SfxItemSet* pTmpArgs = rReq.GetArgs();
sal_uInt16 nWhich = pTmpArgs->GetWhichByPos( 0 ); sal_uInt16 nWhich = pTmpArgs->GetWhichByPos( 0 );
OSL_ENSURE( nWhich, "Wich fuer SearchItem ?" ); OSL_ENSURE( nWhich, "Which for SearchItem ?" );
const SfxPoolItem& rItem = pTmpArgs->Get( nWhich ); const SfxPoolItem& rItem = pTmpArgs->Get( nWhich );
SetSearchItem( (const SvxSearchItem&)rItem); SetSearchItem( (const SvxSearchItem&)rItem);
StartSearchAndReplace( (const SvxSearchItem&)rItem, sal_False, rReq.IsAPI() ); StartSearchAndReplace( (const SvxSearchItem&)rItem, sal_False, rReq.IsAPI() );
...@@ -679,7 +679,7 @@ sal_Int32 SwSrcView::PrintSource( ...@@ -679,7 +679,7 @@ sal_Int32 SwSrcView::PrintSource(
if (!pOutDev || nPage <= 0) if (!pOutDev || nPage <= 0)
return 0; return 0;
//! this a lgorithm for printing the n-th page is very poor since it //! This logarithm for printing the n-th page is very poor since it
//! needs to go over the text of all previous pages to get to the correct one. //! needs to go over the text of all previous pages to get to the correct one.
//! But since HTML source code is expected to be just a small number of pages //! But since HTML source code is expected to be just a small number of pages
//! even this poor algorithm should be enough... //! even this poor algorithm should be enough...
...@@ -704,7 +704,7 @@ sal_Int32 SwSrcView::PrintSource( ...@@ -704,7 +704,7 @@ sal_Int32 SwSrcView::PrintSource(
aPaperSz.Width() -= (LMARGPRN + RMARGPRN); aPaperSz.Width() -= (LMARGPRN + RMARGPRN);
aPaperSz.Height() -= (TMARGPRN + BMARGPRN); aPaperSz.Height() -= (TMARGPRN + BMARGPRN);
// nLinepPage stimmt nicht, wenn Zeilen umgebrochen werden muessen... // nLinepPage is not true, if lines have to be wrapped...
sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height() / nLineHeight); sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height() / nLineHeight);
sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pOutDev->GetTextWidth(OUString('X'))); sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pOutDev->GetTextWidth(OUString('X')));
sal_uInt16 nParas = static_cast< sal_uInt16 >( pTextEngine->GetParagraphCount() ); sal_uInt16 nParas = static_cast< sal_uInt16 >( pTextEngine->GetParagraphCount() );
...@@ -712,7 +712,7 @@ sal_Int32 SwSrcView::PrintSource( ...@@ -712,7 +712,7 @@ sal_Int32 SwSrcView::PrintSource(
sal_uInt16 nPages = (sal_uInt16) (nParas / nLinespPage + 1 ); sal_uInt16 nPages = (sal_uInt16) (nParas / nLinespPage + 1 );
sal_uInt16 nCurPage = 1; sal_uInt16 nCurPage = 1;
// Header drucken... // Print header...
if (!bCalcNumPagesOnly && nPage == nCurPage) if (!bCalcNumPagesOnly && nPage == nCurPage)
lcl_PrintHeader( *pOutDev, nPages, nCurPage, aTitle ); lcl_PrintHeader( *pOutDev, nPages, nCurPage, aTitle );
const Point aStartPos( LMARGPRN, TMARGPRN ); const Point aStartPos( LMARGPRN, TMARGPRN );
...@@ -757,7 +757,7 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) ...@@ -757,7 +757,7 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
) )
) )
{ {
// Broadcast kommt nur einmal! // Broadcast only comes once!
const SwDocShell* pDocSh = GetDocShell(); const SwDocShell* pDocSh = GetDocShell();
const sal_Bool bReadonly = pDocSh->IsReadOnly(); const sal_Bool bReadonly = pDocSh->IsReadOnly();
aEditWin.SetReadonly(bReadonly); aEditWin.SetReadonly(bReadonly);
...@@ -849,10 +849,10 @@ void SwSrcView::Load(SwDocShell* pDocShell) ...@@ -849,10 +849,10 @@ void SwSrcView::Load(SwDocShell* pDocShell)
eLoadEncoding = eDestEnc; eLoadEncoding = eDestEnc;
if(bDocModified) if(bDocModified)
pDocShell->SetModified();// das Flag wird zwischendurch zurueckgesetzt pDocShell->SetModified();// The flag will be reset in between times.
// AutoLoad abschalten // Disable AutoLoad
pDocShell->SetAutoLoad(INetURLObject(), 0, sal_False); pDocShell->SetAutoLoad(INetURLObject(), 0, sal_False);
OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?"); OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Why no WebDocShell?");
sal_uInt16 nLine = ((SwWebDocShell*)pDocShell)->GetSourcePara(); sal_uInt16 nLine = ((SwWebDocShell*)pDocShell)->GetSourcePara();
aEditWin.SetStartLine(nLine); aEditWin.SetStartLine(nLine);
aEditWin.GetTextEngine()->ResetUndo(); aEditWin.GetTextEngine()->ResetUndo();
......
...@@ -41,14 +41,13 @@ SwOleClient::SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObj ...@@ -41,14 +41,13 @@ SwOleClient::SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObj
void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect ) void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect )
{ {
//Der Server moechte die Clientgrosse verandern. // The server wants to change the client size.
//Wir stecken die Wunschgroesse in die Core. Die Attribute des Rahmens // We put the desired size in the core. The attributes of the frame
//werden auf den Wunschwert eingestellt. Dieser Wert wird also auch an // are set to the desired value. This value will be passed on to the
//den InPlaceClient weitergegeben. // InPlaceClient.
//Die Core aktzeptiert bzw. formatiert die eingestellten Werte nicht // The core accepts or formats the adjusted values ​​not necessarily.
//zwangslaeufig. Wenn der Ole-Frm formatiert wurde wird das CalcAndSetScale() // If the Ole-Frm is formatted, then the CalcAndSetScale() of the WrtShell
//der WrtShell gerufen. Dort wird ggf. die Scalierung des SwOleClient // will be called. There the scaling of the SwOleClient is set if necessary.
//eingestellt.
SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell(); SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell();
...@@ -101,16 +100,17 @@ void SwOleClient::ViewChanged() ...@@ -101,16 +100,17 @@ void SwOleClient::ViewChanged()
{ {
// the iconified object seems not to need such a scaling handling // the iconified object seems not to need such a scaling handling
// since the replacement image and the size a completely controlled by the container // since the replacement image and the size a completely controlled by the container
// TODO/LATER: when the icon exchange is implemented the scaling handling might be required again here // TODO/LATER: when the icon exchange is implemented the scaling handling
// might be required again here
return; return;
} }
SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell(); SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell();
//Einstellen der Groesse des Objektes in der Core. Die Scalierung muss // Adjust the size of the object in the core. The Scaling must
//beruecksichtigt werden. Rueckwirkung auf das Objekt werden von // be considered. Repercussions on the object are considered by
//CalcAndSetScale() der WrtShell beruecksichtig, wenn die Groesse/Pos des // CalcAndSetScale() of the WrtShell if the size / position of
//Rahmens in der Core sich veraendert. // the frame in the core changes.
// TODO/LEAN: getMapUnit can switch object to running state // TODO/LEAN: getMapUnit can switch object to running state
awt::Size aSz; awt::Size aSz;
...@@ -130,8 +130,8 @@ void SwOleClient::ViewChanged() ...@@ -130,8 +130,8 @@ void SwOleClient::ViewChanged()
Size aVisSize( aSz.Width, aSz.Height ); Size aVisSize( aSz.Width, aSz.Height );
// solange keine vernuenftige Size vom Object kommt, // As long as from the object comes no reasonable size
// kann nichts skaliert werden // nothing can be scaled.
if( !aVisSize.Width() || !aVisSize.Height() ) if( !aVisSize.Width() || !aVisSize.Height() )
return; return;
...@@ -146,7 +146,7 @@ void SwOleClient::ViewChanged() ...@@ -146,7 +146,7 @@ void SwOleClient::ViewChanged()
aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight(); aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight();
SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize ); SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize );
rSh.LockView( sal_True ); //Scrollen im EndAction verhindern rSh.LockView( sal_True ); // Prevent scrolling in the EndAction
rSh.StartAllAction(); rSh.StartAllAction();
rSh.RequestObjectResize( aRect, GetObject() ); rSh.RequestObjectResize( aRect, GetObject() );
rSh.EndAllAction(); rSh.EndAllAction();
......
This diff is collapsed.
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
#include "rcid.hrc" #include "rcid.hrc"
// BTN ------------------------------------------------------------------- // BTN
#define BTN_PAGEDOWN (RC_VIEW_BEGIN) #define BTN_PAGEDOWN (RC_VIEW_BEGIN)
#define BTN_PAGEUP (RC_VIEW_BEGIN + 1) #define BTN_PAGEUP (RC_VIEW_BEGIN + 1)
// STR ------------------------------------------------------------------- // STR
#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3) #define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3)
#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4) #define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4)
...@@ -58,18 +58,18 @@ ...@@ -58,18 +58,18 @@
#define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33) #define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33)
#define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34) #define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34)
// MSG ------------------------------------------------------------------- // MSG
#define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN) #define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN)
#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5) #define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5)
#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6) #define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6)
// DLG ------------------------------------------------------------------- // DLG
#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN) #define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN)
// Ueberlaufpruefung ----------------------------------------------------- // Overflow checking
#define VIEW_ACT_END STR_EDIT_FOOTNOTE #define VIEW_ACT_END STR_EDIT_FOOTNOTE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment