Skip to content

C
core
Kaydet (Commit) 639fe001 authored tarafından Philipp Weissenbacher's avatar Philipp Weissenbacher Kaydeden (comit) Miklos Vajna
Dosyalara gözat
Seçenekler

Translate German comments, cleanup whitespace 

Change-Id: I4cea9568c5f24340c6bdac387efe8e94f8edb95a
Reviewed-on: https://gerrit.libreoffice.org/1568Reviewed-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
Tested-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
üst 0b8352aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 111 deletions
sw/source/ui/dochdl/swdtflvr.cxx
Dosyayı görüntüle @ 639fe001
......@@ -583,7 +583,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
{
case SWTRANSFER_OBJECTTYPE_DRAWMODEL:
{
// dont change the sequence of commands
// don't change the sequence of commands
SdrModel *pModel = (SdrModel*)pObject;
xStream->SetBufferSize( 16348 );
......@@ -822,7 +822,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
pTmpDoc->LockExpFlds(); // Never update fields - leave text as is
lclOverWriteDoc(*pWrtShell, *pTmpDoc);
{
......@@ -843,7 +843,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
pMarkAccess->deleteMark(*ppMark);
}
// a new one was created in CORE (OLE-Objekte copied!)
// a new one was created in CORE (OLE objects copied!)
aDocShellRef = pTmpDoc->GetTmpDocShell();
if( aDocShellRef.Is() )
SwTransferable::InitOle( aDocShellRef, *pTmpDoc );
......@@ -2407,7 +2407,7 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
sFileURL, aEmptyStr );
if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
{
// and then pull up the insert-region-dialog by PostUser event
// and then pull up the insert-region-dialog by PostUser event
SwSectionData * pSect = new SwSectionData(
FILE_LINK_SECTION,
rSh.GetDoc()->GetUniqueSectionName() );
......@@ -3053,7 +3053,7 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
{
// first, ask for the SelectionType, then action-bracketing !!!!
// (otherwise it's not pasted into a TableSelection!!!)
OSL_ENSURE( !rShell.ActionPend(), "Paste darf nie eine Actionklammerung haben" );
OSL_ENSURE( !rShell.ActionPend(), "Paste must never have an ActionPend" );
if ( !pClpDocFac )
return sal_False; // the return value of the SwFEShell::Paste also is sal_Bool!
......@@ -3092,7 +3092,7 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
// in the buffer, word in this context means 'something with spaces at beginning
// and end'. In this case we definitely want these spaces to be inserted here.
bInWrd = rShell.IsInWrd();
bEndWrd = rShell.IsEndWrd();
bEndWrd = rShell.IsEndWrd();
bSmart = bInWrd || bEndWrd;
if( bSmart )
{
......
sw/source/ui/docvw/edtdd.cxx
Dosyayı görüntüle @ 639fe001
......@@ -77,7 +77,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
if( rSh.GetDrawView()->Command( aDragEvent, this ) )
{
rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
return; // Event von der SdrView ausgewertet
return; // Event evaluated by SdrView
}
}
......@@ -218,13 +218,13 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
}
// There's a special treatment for file lists with a single
// element, that depends on the actual content of the
// Transferable to be accessible. Since the transferable
// may only be accessed after the drop has been accepted
// (according to KA due to Java D&D), we'll have to
// reevaluate the drop action once more _with_ the
// Transferable.
// There's a special treatment for file lists with a single
// element, that depends on the actual content of the
// Transferable to be accessible. Since the transferable
// may only be accessed after the drop has been accepted
// (according to KA due to Java D&D), we'll have to
// reevaluate the drop action once more _with_ the
// Transferable.
sal_uInt16 nEventAction;
sal_Int8 nUserOpt = rEvt.mbDefault ? EXCHG_IN_ACTION_DEFAULT
: rEvt.mnAction;
......@@ -415,8 +415,8 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
}
else if( rEvt.mbDefault )
{
// internal Drag&Drop: within same Doc a Move
// otherwise a Copy - Task 54974
// internal Drag&Drop: within same Doc a Move
// otherwise a Copy - Task 54974
nEventAction = pSrcSh->GetDoc() == rSh.GetDoc()
? DND_ACTION_MOVE
: DND_ACTION_COPY;
......
sw/source/ui/docvw/edtwin.cxx
Dosyayı görüntüle @ 639fe001
This diff is collapsed.
sw/source/ui/inc/pview.hxx
Dosyayı görüntüle @ 639fe001
......@@ -39,10 +39,9 @@ class SwRect;
class DataChangedEvent;
class CommandEvent;
class SvtAccessibilityOptions;
// OD 12.12.2002 #103492#
class SwPagePreviewLayout;
// OD 24.03.2003 #108282# - delete member <mnVirtPage> and its accessor.
// Delete member <mnVirtPage> and its accessor
class SwPagePreViewWin : public Window
{
ViewShell* mpViewShell;
......@@ -51,10 +50,8 @@ class SwPagePreViewWin : public Window
Size maPxWinSize;
Fraction maScale;
SwPagePreView& mrView;
// OD 02.12.2002 #103492#
bool mbCalcScaleForPreviewLayout;
Rectangle maPaintedPreviewDocRect;
// OD 12.12.2002 #103492#
SwPagePreviewLayout* mpPgPrevwLayout;
void SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol );
......@@ -87,26 +84,18 @@ public:
/** get selected page number of document preview
OD 13.12.2002 #103492#
@author OD
@return selected page number
*/
sal_uInt16 SelectedPage() const;
/** set selected page number in document preview
OD 13.12.2002 #103492#
@author OD
@param _nSelectedPageNum
input parameter - physical page number of page that will be the selected one.
*/
void SetSelectedPage( sal_uInt16 _nSelectedPageNum );
//JP 19.08.98: bei Einspaltigkeit gibt es keine 0. Seite!
// If we only have one column we do not have a oth page
sal_uInt16 GetDefSttPage() const { return 1 == mnCol ? 1 : 0; }
void CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol );
......@@ -114,24 +103,20 @@ public:
const Size& GetWinSize() const { return maPxWinSize; }
void SetWinSize( const Size& rNewSize );
// OD 18.12.2002 #103492# - add <MV_SELPAGE>, <MV_SCROLL>
// Add <MV_SELPAGE>, <MV_SCROLL>
enum MoveMode{ MV_CALC, MV_PAGE_UP, MV_PAGE_DOWN, MV_DOC_STT, MV_DOC_END,
MV_SELPAGE, MV_SCROLL, MV_NEWWINSIZE };
int MovePage( int eMoveMode );
// erzeuge den String fuer die StatusLeiste
// Create the status bar's string
OUString GetStatusStr( sal_uInt16 nPageCount ) const;
void RepaintCoreRect( const SwRect& rRect );
/** method to adjust preview to a new zoom factor
OD 02.12.2002 #103492#
/** Method to adjust preview to a new zoom factor
paint of preview is prepared for a new zoom factor
OD 24.09.2003 #i19975# - zoom type has also been considered.
Zoom type has also been considered.
Thus, add new parameter <_eZoomType>
@author OD
*/
void AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor,
const SvxZoomType _eZoomType );
......@@ -143,12 +128,7 @@ public:
void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0);
/** method to enable/disable book preview
OD 2004-03-05 #i18143#
@author OD
/** Method to enable/disable book preview
@param _bBookPreview
input parameter - boolean indicating, if book preview mode has to
switch on <sal_True> or of <sal_False>
......@@ -162,9 +142,9 @@ public:
CreateAccessible();
};
/*--------------------------------------------------------------------
Description: view of a document
--------------------------------------------------------------------*/
/**
* View of a document
*/
class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
{
// ViewWindow and handle to core
......@@ -194,8 +174,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
sal_uInt16 mnPageCount;
sal_Bool bNormalPrint;
// OD 09.01.2003 #106334#
// new members to reset design mode at draw view for form shell on switching
// New members to reset design mode at draw view for form shell on switching
// back from writer page preview to normal view.
sal_Bool mbResetFormDesignMode:1;
sal_Bool mbFormDesignModeToReset:1;
......@@ -218,9 +197,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
/** help method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN
OD 04.03.2003 #107369#
/** Helper method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN
@param _bPgUp
input parameter - boolean that indicates, if FN_PAGE_UP or FN_PAGE_DOWN
......@@ -228,8 +205,6 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
@param _pReq
optional input parameter - pointer to the <SfxRequest> instance, if existing.
@author OD
*/
SW_DLLPRIVATE void _ExecPgUpAndPgDown( const bool _bPgUp,
SfxRequest* _pReq = 0 );
......@@ -279,17 +254,17 @@ public:
sal_uInt16 GetNewPage() const {return nNewPage;}
void SetNewPage(sal_uInt16 nSet) {nNewPage = nSet;}
// handler
// Handler
void Execute(SfxRequest&);
void GetState(SfxItemSet&);
void StateUndo(SfxItemSet&);
SwDocShell* GetDocShell();
//apply Accessiblity options
// apply Accessiblity options
void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions);
// OD 09.01.2003 #106334# - inline method to request values of new members
// Inline method to request values of new members
// <mbResetFormDesignMode> and <mbFormDesignModeToReset>
inline sal_Bool ResetFormDesignMode() const
{
......@@ -301,14 +276,11 @@ public:
return mbFormDesignModeToReset;
}
/** adjust position of vertical scrollbar
/** Adjust position of vertical scrollbar
OD 19.02.2003 #107369
Currently used, if the complete preview layout rows fit into to the given
window, if a new page is selected and this page is visible.
@author OD
@param _nNewThumbPos
input parameter - new position, which will be assigned to the vertical
scrollbar.
......
sw/source/ui/inc/uitool.hxx
Dosyayı görüntüle @ 639fe001
......@@ -73,7 +73,7 @@ SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, sal
//inserts a string sorted into a ListBox,
SW_DLLPUBLIC sal_uInt16 InsertStringSorted(const String& rEntry, ListBox& rToFill, sal_uInt16 nOffset);
// Tabellenbreite und Ausrichtung ermitteln
// Get table width and alignement
SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
SwWrtShell* pSh );
......
sw/source/ui/ribbar/conform.cxx
Dosyayı görüntüle @ 639fe001
......@@ -29,26 +29,18 @@
extern bool bNoInterrupt; // in mainwn.cxx
/*************************************************************************
|*
|* Konstruktor
|*
\************************************************************************/
/**
* Ctor
*/
ConstFormControl::ConstFormControl(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
SwDrawBase(pWrtShell, pEditWin, pSwView)
{
m_bInsForm = sal_True;
}
/*************************************************************************
|*
|* MouseButtonDown-event
|*
\************************************************************************/
/**
* MouseButtonDown event
*/
sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
{
sal_Bool bReturn = sal_False;
......@@ -72,7 +64,7 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = pSdrView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
// Nur neues Objekt, wenn nicht im Basismode (bzw reinem Selektionsmode)
// Only new object; if not in base mode (or pure selection mode)
if (rMEvt.IsLeft() && !m_pWin->IsDrawAction() &&
(eHit == SDRHIT_UNMARKEDOBJECT || eHit == SDRHIT_NONE || m_pSh->IsDrawCreate()))
{
......@@ -93,13 +85,9 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
return (bReturn);
}
/*************************************************************************
|*
|* Function aktivieren
|*
\************************************************************************/
/**
* Activate
*/
void ConstFormControl::Activate(const sal_uInt16 nSlotId)
{
m_pWin->SetSdrDrawMode( static_cast<SdrObjKind>(nSlotId) );
......
sw/source/ui/ribbar/conrect.cxx
Dosyayı görüntüle @ 639fe001
......@@ -37,12 +37,9 @@
#include <conrect.hxx>
/*************************************************************************
|*
|* Konstruktor
|*
\************************************************************************/
/**
* Ctor
*/
ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin,
SwView* pSwView )
: SwDrawBase( pWrtShell, pEditWin, pSwView ),
......@@ -52,12 +49,9 @@ ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin,
{
}
/*************************************************************************
|*
|* MouseButtonDown-event
|*
\************************************************************************/
/**
* MouseButtonDown event
*/
sal_Bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
{
sal_Bool bReturn;
......@@ -75,12 +69,9 @@ sal_Bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
return (bReturn);
}
/*************************************************************************
|*
|* MouseButtonUp-event
|*
\************************************************************************/
/**
* MouseButtonUp event
*/
sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
sal_Bool bRet = SwDrawBase::MouseButtonUp(rMEvt);
......@@ -99,7 +90,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
if( pObj )
{
// die fuer das Scrollen benoetigten Attribute setzen
// Set the attributes needed for scrolling
SfxItemSet aItemSet( pSdrView->GetModel()->GetItemPool(),
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
......@@ -116,7 +107,6 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
}
else if(mbVertical && pObj && pObj->ISA(SdrTextObj))
{
// #93382#
SdrTextObj* pText = (SdrTextObj*)pObj;
SfxItemSet aSet(pSdrView->GetModel()->GetItemPool());
......@@ -134,7 +124,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
SdrPageView* pPV = pSdrView->GetSdrPageView();
m_pView->BeginTextEdit( pObj, pPV, m_pWin, sal_True );
}
m_pView->LeaveDrawCreate(); // In Selektionsmode wechseln
m_pView->LeaveDrawCreate(); // Switch to selection mode
m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW);
break;
......@@ -156,12 +146,9 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
return bRet;
}
/*************************************************************************
|*
|* Function aktivieren
|*
\************************************************************************/
/**
* Activate
*/
void ConstRectangle::Activate(const sal_uInt16 nSlotId)
{
bMarquee = bCapVertical = sal_False;
......@@ -187,7 +174,6 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
break;
case SID_DRAW_TEXT_VERTICAL:
// #93382#
mbVertical = sal_True;
m_pWin->SetSdrDrawMode(OBJ_TEXT);
break;
......
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