Skip to content

C
core
Kaydet (Commit) f9334da9 authored tarafından Albert Thuswaldner's avatar Albert Thuswaldner Kaydeden (comit) Eike Rathke
Dosyalara gözat
Seçenekler

tdf#39468 translated german comments in tabvwsh4.cxx 

Change-Id: I18b1c0384d996fc9a8637c86a439185ae3964fd0
Reviewed-on: https://gerrit.libreoffice.org/19416Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
üst 20538f23
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 91 deletions
sc/source/ui/view/tabvwsh4.cxx
Dosyayı görüntüle @ f9334da9
...@@ -106,27 +106,27 @@ void ScTabViewShell::Activate(bool bMDI) ...@@ -106,27 +106,27 @@ void ScTabViewShell::Activate(bool bMDI)
{ {
SfxViewShell::Activate(bMDI); SfxViewShell::Activate(bMDI);
bIsActive = true; bIsActive = true;
// hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird! // here no GrabFocus, otherwise there will be problems when something is edited inplace!
if ( bMDI ) if ( bMDI )
{ {
// fuer Eingabezeile (ClearCache) // for input row (ClearCache)
ScModule* pScMod = SC_MOD(); ScModule* pScMod = SC_MOD();
pScMod->ViewShellChanged(); pScMod->ViewShellChanged();
ActivateView( true, bFirstActivate ); ActivateView( true, bFirstActivate );
// AutoCorrect umsetzen, falls der Writer seins neu angelegt hat // update AutoCorrect, if Writer has newly created this
UpdateDrawTextOutliner(); UpdateDrawTextOutliner();
// RegisterNewTargetNames gibts nicht mehr // RegisterNewTargetNames does not exist anymore
SfxViewFrame* pThisFrame = GetViewFrame(); SfxViewFrame* pThisFrame = GetViewFrame();
if ( pInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) ) if ( pInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) )
{ {
// eigentlich nur beim Reload (letzte Version) noetig: // actually only required for Reload (last version):
// Das InputWindow bleibt stehen, aber die View mitsamt InputHandler wird // The InputWindow remains, but the View along with the InputHandler is newly created,
// neu angelegt, darum muss der InputHandler am InputWindow gesetzt werden. // that is why the InputHandler must be set at the InputWindow.
SfxChildWindow* pChild = pThisFrame->GetChildWindow(FID_INPUTLINE_STATUS); SfxChildWindow* pChild = pThisFrame->GetChildWindow(FID_INPUTLINE_STATUS);
if (pChild) if (pChild)
{ {
...@@ -182,7 +182,7 @@ void ScTabViewShell::Activate(bool bMDI) ...@@ -182,7 +182,7 @@ void ScTabViewShell::Activate(bool bMDI)
pHdl->SetRefScale( GetViewData().GetZoomX(), GetViewData().GetZoomY() ); pHdl->SetRefScale( GetViewData().GetZoomX(), GetViewData().GetZoomY() );
} }
// Aenderungs-Dialog aktualisieren // update change dialog
if ( pThisFrame->HasChildWindow(FID_CHG_ACCEPT) ) if ( pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
{ {
...@@ -212,10 +212,6 @@ void ScTabViewShell::Activate(bool bMDI) ...@@ -212,10 +212,6 @@ void ScTabViewShell::Activate(bool bMDI)
// don't call CheckSelectionTransfer here - activating a view should not change the // don't call CheckSelectionTransfer here - activating a view should not change the
// primary selection (may be happening just because the mouse was moved over the window) // primary selection (may be happening just because the mouse was moved over the window)
// Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip),
// muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2
// beim Umschalten zwischen Dokumenten)
ContextChangeEventMultiplexer::NotifyContextChange( ContextChangeEventMultiplexer::NotifyContextChange(
GetController(), GetController(),
::sfx2::sidebar::EnumContext::Context_Default); ::sfx2::sidebar::EnumContext::Context_Default);
...@@ -252,7 +248,7 @@ void ScTabViewShell::Deactivate(bool bMDI) ...@@ -252,7 +248,7 @@ void ScTabViewShell::Deactivate(bool bMDI)
GetViewData().GetDocShell()->UpdateOle(&GetViewData(), true); GetViewData().GetDocShell()->UpdateOle(&GetViewData(), true);
if ( pHdl ) if ( pHdl )
pHdl->NotifyChange( NULL, true ); // Timer-verzoegert wg. Dokumentwechsel pHdl->NotifyChange( NULL, true ); // timer-delayed due to document switching
if (pScActiveViewShell == this) if (pScActiveViewShell == this)
pScActiveViewShell = NULL; pScActiveViewShell = NULL;
...@@ -261,17 +257,17 @@ void ScTabViewShell::Deactivate(bool bMDI) ...@@ -261,17 +257,17 @@ void ScTabViewShell::Deactivate(bool bMDI)
} }
else else
{ {
HideNoteMarker(); // Notiz-Anzeige HideNoteMarker(); // note marker
if ( pHdl ) if ( pHdl )
pHdl->HideTip(); // Formel-AutoEingabe-Tip abschalten pHdl->HideTip(); // Hide formula auto input tip
} }
} }
void ScTabViewShell::SetActive() void ScTabViewShell::SetActive()
{ {
// Die Sfx-View moechte sich gerne selbst aktivieren, weil dabei noch // SFX-View would like to activate itself, since then magical things would happen
// magische Dinge geschehen (z.B. stuerzt sonst evtl. der Gestalter ab) // (eg else the designer may crash)
ActiveGrabFocus(); ActiveGrabFocus();
} }
...@@ -309,8 +305,8 @@ bool ScTabViewShell::PrepareClose(bool bUI) ...@@ -309,8 +305,8 @@ bool ScTabViewShell::PrepareClose(bool bUI)
return SfxViewShell::PrepareClose(bUI); return SfxViewShell::PrepareClose(bUI);
} }
// Zoom fuer In-Place berechnen // calculate zoom for in-place
// aus Verhaeltnis von VisArea und Fenstergroesse des GridWin // from the ratio of VisArea and window size of GridWin
void ScTabViewShell::UpdateOleZoom() void ScTabViewShell::UpdateOleZoom()
{ {
...@@ -370,9 +366,9 @@ void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) ...@@ -370,9 +366,9 @@ void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize )
aNewSize.Height() += aBorder.Top() + aBorder.Bottom(); aNewSize.Height() += aBorder.Top() + aBorder.Bottom();
} }
DoResize( rOfs, aNewSize, true ); // rSize = Groesse von gridwin DoResize( rOfs, aNewSize, true ); // rSize = size of gridwin
UpdateOleZoom(); // Zoom fuer In-Place berechnen UpdateOleZoom(); // calculate zoom for in-place
GetViewData().GetDocShell()->SetDocumentModified(); GetViewData().GetDocShell()->SetDocumentModified();
} }
...@@ -383,17 +379,17 @@ void ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &rSize ) ...@@ -383,17 +379,17 @@ void ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &rSize )
GetBorderSize( aBorder, rSize ); GetBorderSize( aBorder, rSize );
SetBorderPixel( aBorder ); SetBorderPixel( aBorder );
DoResize( rOfs, rSize ); // Position und Groesse von tabview wie uebergeben DoResize( rOfs, rSize ); // position and size of tabview as passed
// ForceMove als Ersatz fuer den Sfx-Move-Mechanismus // ForceMove as replacement for Sfx-Move mechanism
// (aWinPos muss aktuell gehalten werden, damit ForceMove beim Ole-Deaktivieren klappt) // (aWinPos must be kept current, so that ForceMove works for Ole deactivation)
ForceMove(); ForceMove();
} }
void ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) void ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY )
{ {
// fuer OLE... // for OLE...
Fraction aFrac20( 1,5 ); Fraction aFrac20( 1,5 );
Fraction aFrac400( 4,1 ); Fraction aFrac400( 4,1 );
...@@ -421,7 +417,7 @@ void ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoo ...@@ -421,7 +417,7 @@ void ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoo
void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const
{ {
// auf ganze Zellen anpassen (in 1/100 mm) // adjust to entire cells (in 1/100 mm)
Size aPixelSize = rRect.GetSize(); Size aPixelSize = rRect.GetSize();
vcl::Window* pWin = const_cast<ScTabViewShell*>(this)->GetActiveWin(); vcl::Window* pWin = const_cast<ScTabViewShell*>(this)->GetActiveWin();
...@@ -461,8 +457,8 @@ void ScTabViewShell::Move() ...@@ -461,8 +457,8 @@ void ScTabViewShell::Move()
void ScTabViewShell::ShowCursor(bool /* bOn */) void ScTabViewShell::ShowCursor(bool /* bOn */)
{ {
/*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. /*!!! ShowCursor is not called as a pair as in gridwin.
Der CursorLockCount am Gridwin muss hier direkt auf 0 gesetzt werden here the CursorLockCount for Gridwin must be set directly to 0
if (bOn) if (bOn)
ShowAllCursors(); ShowAllCursors();
...@@ -507,10 +503,10 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper ...@@ -507,10 +503,10 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper
vcl::Window* pNewWin = GetActiveWin(); vcl::Window* pNewWin = GetActiveWin();
if (pNewWin && pNewWin != pOldWin) if (pNewWin && pNewWin != pOldWin)
{ {
SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? SetWindow( pNewWin ); //! is this ViewShell always active???
if (bFocus) if (bFocus)
pNewWin->GrabFocus(); pNewWin->GrabFocus();
WindowChanged(); // Drawing-Layer (z.B. #56771#) WindowChanged(); // drawing layer (for instance #56771#)
} }
if (GetViewData().GetHSplitMode() == SC_SPLIT_FIX || if (GetViewData().GetHSplitMode() == SC_SPLIT_FIX ||
...@@ -542,10 +538,10 @@ void ScTabViewShell::DoReadUserData( const OUString& rData ) ...@@ -542,10 +538,10 @@ void ScTabViewShell::DoReadUserData( const OUString& rData )
vcl::Window* pNewWin = GetActiveWin(); vcl::Window* pNewWin = GetActiveWin();
if (pNewWin && pNewWin != pOldWin) if (pNewWin && pNewWin != pOldWin)
{ {
SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? SetWindow( pNewWin ); //! is this ViewShell always active???
if (bFocus) if (bFocus)
pNewWin->GrabFocus(); pNewWin->GrabFocus();
WindowChanged(); // Drawing-Layer (z.B. #56771#) WindowChanged(); // drawing layer (for instance #56771#)
} }
if (GetViewData().GetHSplitMode() == SC_SPLIT_FIX || if (GetViewData().GetHSplitMode() == SC_SPLIT_FIX ||
...@@ -633,12 +629,12 @@ void ScTabViewShell::SetDrawShell( bool bActive ) ...@@ -633,12 +629,12 @@ void ScTabViewShell::SetDrawShell( bool bActive )
if ( !bActive ) if ( !bActive )
{ {
ResetDrawDragMode(); // Mirror / Rotate aus ResetDrawDragMode(); // switch off Mirror / Rotate
if (bWasDraw && (GetViewData().GetHSplitMode() == SC_SPLIT_FIX || if (bWasDraw && (GetViewData().GetHSplitMode() == SC_SPLIT_FIX ||
GetViewData().GetVSplitMode() == SC_SPLIT_FIX)) GetViewData().GetVSplitMode() == SC_SPLIT_FIX))
{ {
// Aktiven Teil an Cursor anpassen, etc. // adjust active part to cursor, etc.
MoveCursorAbs( GetViewData().GetCurX(), GetViewData().GetCurY(), MoveCursorAbs( GetViewData().GetCurX(), GetViewData().GetCurY(),
SC_FOLLOW_NONE, false, false, true ); SC_FOLLOW_NONE, false, false, true );
} }
...@@ -770,7 +766,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce) ...@@ -770,7 +766,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce)
if(bDontSwitch) return; if(bDontSwitch) return;
if(!pCellShell) //Wird eh immer gebraucht. if(!pCellShell) // is anyway always used
{ {
pCellShell = new ScCellShell( &GetViewData() ); pCellShell = new ScCellShell( &GetViewData() );
pCellShell->SetRepeatTarget( &aTarget ); pCellShell->SetRepeatTarget( &aTarget );
...@@ -936,7 +932,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce) ...@@ -936,7 +932,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce)
if ( !pAuditingShell ) if ( !pAuditingShell )
{ {
pDocSh->MakeDrawLayer(); // die Wartezeit lieber jetzt als beim Klick pDocSh->MakeDrawLayer(); // the waiting time rather now as on the click
pAuditingShell = new ScAuditingShell( &GetViewData() ); pAuditingShell = new ScAuditingShell( &GetViewData() );
pAuditingShell->SetRepeatTarget( &aTarget ); pAuditingShell->SetRepeatTarget( &aTarget );
...@@ -946,7 +942,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce) ...@@ -946,7 +942,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce)
} }
break; break;
default: default:
OSL_FAIL("Falsche Shell angefordert"); OSL_FAIL("wrong shell requested");
break; break;
} }
...@@ -979,12 +975,12 @@ IMPL_LINK_NOARG_TYPED(ScTabViewShell, FormControlActivated, LinkParamNone*, void ...@@ -979,12 +975,12 @@ IMPL_LINK_NOARG_TYPED(ScTabViewShell, FormControlActivated, LinkParamNone*, void
SetFormShellAtTop( true ); SetFormShellAtTop( true );
} }
// GetMySubShell / SetMySubShell: altes Verhalten simulieren, // GetMySubShell / SetMySubShell: simulate old behavior,
// dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) // so that there is only one SubShell (only whithin the 5 own SubShells)
SfxShell* ScTabViewShell::GetMySubShell() const SfxShell* ScTabViewShell::GetMySubShell() const
{ {
// GetSubShell() war frueher const, und GetSubShell(sal_uInt16) sollte es auch sein... // GetSubShell() was const before, and GetSubShell(sal_uInt16) should also be const...
sal_uInt16 nPos = 0; sal_uInt16 nPos = 0;
SfxShell* pSub = const_cast<ScTabViewShell*>(this)->GetSubShell(nPos); SfxShell* pSub = const_cast<ScTabViewShell*>(this)->GetSubShell(nPos);
...@@ -994,11 +990,11 @@ SfxShell* ScTabViewShell::GetMySubShell() const ...@@ -994,11 +990,11 @@ SfxShell* ScTabViewShell::GetMySubShell() const
pSub == pPivotShell || pSub == pAuditingShell || pSub == pDrawFormShell || pSub == pPivotShell || pSub == pAuditingShell || pSub == pDrawFormShell ||
pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell || pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell ||
pSub == pGraphicShell || pSub == pMediaShell || pSub == pPageBreakShell) pSub == pGraphicShell || pSub == pMediaShell || pSub == pPageBreakShell)
return pSub; // gefunden return pSub; // found
pSub = const_cast<ScTabViewShell*>(this)->GetSubShell(++nPos); pSub = const_cast<ScTabViewShell*>(this)->GetSubShell(++nPos);
} }
return NULL; // keine von meinen dabei return NULL; // none from mine present
} }
bool ScTabViewShell::IsDrawTextShell() const bool ScTabViewShell::IsDrawTextShell() const
...@@ -1013,7 +1009,7 @@ bool ScTabViewShell::IsAuditShell() const ...@@ -1013,7 +1009,7 @@ bool ScTabViewShell::IsAuditShell() const
void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr ) void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr )
{ {
// Default: Undo-Manager der DocShell // Default: undo manager for DocShell
if (!pNewUndoMgr) if (!pNewUndoMgr)
pNewUndoMgr = GetViewData().GetDocShell()->GetUndoManager(); pNewUndoMgr = GetViewData().GetDocShell()->GetUndoManager();
...@@ -1029,7 +1025,7 @@ void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr ) ...@@ -1029,7 +1025,7 @@ void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr )
} }
else else
{ {
OSL_FAIL("SetDrawTextUndo ohne DrawTextShell"); OSL_FAIL("SetDrawTextUndo without DrawTextShell");
} }
} }
...@@ -1040,7 +1036,7 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell() ...@@ -1040,7 +1036,7 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell()
SfxPrinter* ScTabViewShell::GetPrinter( bool bCreate ) SfxPrinter* ScTabViewShell::GetPrinter( bool bCreate )
{ {
// Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) // printer is always present (is created for the FontList already on start-up)
return GetViewData().GetDocShell()->GetPrinter(bCreate); return GetViewData().GetDocShell()->GetPrinter(bCreate);
} }
...@@ -1186,11 +1182,11 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1186,11 +1182,11 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
bool bAlt = aCode.IsMod2(); bool bAlt = aCode.IsMod2();
sal_uInt16 nCode = aCode.GetCode(); sal_uInt16 nCode = aCode.GetCode();
bool bUsed = false; bool bUsed = false;
bool bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles bool bInPlace = pScMod->IsEditMode(); // Editengine gets all
bool bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace bool bAnyEdit = pScMod->IsInputMode(); // only characters & backspace
bool bDraw = IsDrawTextEdit(); bool bDraw = IsDrawTextEdit();
HideNoteMarker(); // Notiz-Anzeige HideNoteMarker(); // note marker
// don't do extra HideCursor/ShowCursor calls if EnterHandler will switch to a different sheet // don't do extra HideCursor/ShowCursor calls if EnterHandler will switch to a different sheet
bool bOnRefSheet = ( GetViewData().GetRefTabNo() == GetViewData().GetTabNo() ); bool bOnRefSheet = ( GetViewData().GetRefTabNo() == GetViewData().GetTabNo() );
...@@ -1205,7 +1201,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1205,7 +1201,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
if( bInPlace ) if( bInPlace )
{ {
bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe bUsed = pScMod->InputKeyEvent( rKEvt ); // input
if( !bUsed ) if( !bUsed )
bUsed = SfxViewShell::KeyInput( rKEvt ); // accelerators bUsed = SfxViewShell::KeyInput( rKEvt ); // accelerators
} }
...@@ -1226,35 +1222,35 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1226,35 +1222,35 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
bIsType = bControl && !bAlt; // Control, Shift-Control-Return bIsType = bControl && !bAlt; // Control, Shift-Control-Return
if ( !bIsType && nModi == 0 ) if ( !bIsType && nModi == 0 )
{ {
// Will der InputHandler auch ein einfaches Return? // Does the Input Handler also want a simple Return?
ScInputHandler* pHdl = pScMod->GetInputHdl(this); ScInputHandler* pHdl = pScMod->GetInputHdl(this);
bIsType = pHdl && pHdl->TakesReturn(); bIsType = pHdl && pHdl->TakesReturn();
} }
break; break;
case KEY_SPACE: case KEY_SPACE:
bIsType = !bControl && !bAlt; // ohne Modifier oder Shift-Space bIsType = !bControl && !bAlt; // without modifier or Shift-Space
break; break;
case KEY_ESCAPE: case KEY_ESCAPE:
bIsType = (nModi == 0); // nur ohne Modifier bIsType = (nModi == 0); // only without modifier
break; break;
default: default:
bIsType = true; bIsType = true;
} }
if( bIsType ) if( bIsType )
bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe bUsed = pScMod->InputKeyEvent( rKEvt ); // input
if( !bUsed ) if( !bUsed )
bUsed = SfxViewShell::KeyInput( rKEvt ); // accelerators bUsed = SfxViewShell::KeyInput( rKEvt ); // accelerators
if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // input once again afterwards
bUsed = pScMod->InputKeyEvent( rKEvt ); bUsed = pScMod->InputKeyEvent( rKEvt );
} }
else else
{ {
// Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung // special case: copy/cut for multiselect -> error message
// (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt) // (Slot is disabled, so SfxViewShell::KeyInput would be swallowed without a comment)
KeyFuncType eFunc = aCode.GetFunction(); KeyFuncType eFunc = aCode.GetFunction();
if ( eFunc == KeyFuncType::CUT ) if ( eFunc == KeyFuncType::CUT )
{ {
...@@ -1276,7 +1272,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1276,7 +1272,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
bool bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KeyFuncType::DONTKNOW ); bool bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KeyFuncType::DONTKNOW );
if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent ) if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent )
bUsed = pScMod->InputKeyEvent( rKEvt, true ); // Eingabe bUsed = pScMod->InputKeyEvent( rKEvt, true ); // input
} }
if (!bInPlace && !bUsed && !bDraw) if (!bInPlace && !bUsed && !bDraw)
...@@ -1288,8 +1284,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1288,8 +1284,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
bool bNormal = !bControl && !bAlt; bool bNormal = !bControl && !bAlt;
if ( !bAnyEdit && bNormal ) if ( !bAnyEdit && bNormal )
{ {
// je nach Optionen mit Enter in den Edit-Modus schalten // Depending on options, Enter switches to edit mode.
const ScInputOptions& rOpt = pScMod->GetInputOptions(); const ScInputOptions& rOpt = pScMod->GetInputOptions();
if ( rOpt.GetEnterEdit() ) if ( rOpt.GetEnterEdit() )
{ {
...@@ -1298,7 +1293,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1298,7 +1293,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
} }
} }
bool bEditReturn = bControl && !bShift; // An Edit-Engine weiter bool bEditReturn = bControl && !bShift; // pass on to edit engine
if ( !bUsed && !bEditReturn ) if ( !bUsed && !bEditReturn )
{ {
if ( bOnRefSheet ) if ( bOnRefSheet )
...@@ -1326,9 +1321,8 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1326,9 +1321,8 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
if ( bOnRefSheet ) if ( bOnRefSheet )
ShowAllCursors(); ShowAllCursors();
// hier kein UpdateInputHandler, weil bei Referenzeingabe auf ein // here no UpdateInputHandler, since during reference input on another
// anderes Dokument diese ViewShell nicht die ist, auf der eingegeben // document this ViewShell is not the one that is used for input.
// wird!
bUsed = true; bUsed = true;
} }
...@@ -1337,7 +1331,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ...@@ -1337,7 +1331,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
} }
} }
// Alt-Cursortasten hart codiert, weil Alt nicht konfigurierbar ist // hard-code Alt-Cursor key, since Alt is not configurable
if ( !bUsed && bAlt && !bControl ) if ( !bUsed && bAlt && !bControl )
{ {
...@@ -1444,7 +1438,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode ) ...@@ -1444,7 +1438,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode )
EnableAutoSpell(rDoc.GetDocOptions().IsAutoSpell()); EnableAutoSpell(rDoc.GetDocOptions().IsAutoSpell());
SetName(OUString("View")); // fuer SBX SetName(OUString("View")); // for SBX
Color aColBlack( COL_BLACK ); Color aColBlack( COL_BLACK );
SetPool( &SC_MOD()->GetPool() ); SetPool( &SC_MOD()->GetPool() );
SetWindow( GetActiveWin() ); SetWindow( GetActiveWin() );
...@@ -1478,46 +1472,45 @@ void ScTabViewShell::Construct( TriState nForceDesignMode ) ...@@ -1478,46 +1472,45 @@ void ScTabViewShell::Construct( TriState nForceDesignMode )
if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace
{ {
pDocSh->SetInplace( true ); // schon so initialisiert pDocSh->SetInplace( true ); // already initiated like this
if (rDoc.IsEmbedded()) if (rDoc.IsEmbedded())
rDoc.ResetEmbedded(); // keine blaue Markierung rDoc.ResetEmbedded(); // no blue mark
} }
else if ( bFirstView ) else if ( bFirstView )
{ {
pDocSh->SetInplace( false ); pDocSh->SetInplace( false );
GetViewData().RefreshZoom(); // recalculate PPT GetViewData().RefreshZoom(); // recalculate PPT
if (!rDoc.IsEmbedded()) if (!rDoc.IsEmbedded())
rDoc.SetEmbedded( rDoc.GetVisibleTab(), aVisArea ); // VisArea markieren rDoc.SetEmbedded( rDoc.GetVisibleTab(), aVisArea ); // mark VisArea
} }
} }
// ViewInputHandler // ViewInputHandler
// jeder Task hat neuerdings sein eigenes InputWindow, // Each task now has its own InputWindow,
// darum muesste eigentlich entweder jeder Task seinen InputHandler bekommen, // therefore either should each task get its own InputHandler,
// oder das InputWindow muesste sich beim App-InputHandler anmelden, wenn der // or the InputWindow should create its own InputHandler
// Task aktiv wird, oder das InputWindow muesste sich den InputHandler selbst // (then always search via InputWindow and only if not found
// anlegen (dann immer ueber das InputWindow suchen, und nur wenn das nicht da // use the InputHandler of the App).
// ist, den InputHandler von der App nehmen). // As an intermediate solution each View gets its own InputHandler,
// Als Sofortloesung bekommt erstmal jede View ihren Inputhandler, das gibt // which only yields problems if two Views are in one task window.
// nur noch Probleme, wenn zwei Views in einem Task-Fenster sind.
pInputHandler = new ScInputHandler; pInputHandler = new ScInputHandler;
// Alte Version: // old version:
// if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE oder Plug-In // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE or Plug-In
// pInputHandler = new ScInputHandler; // pInputHandler = new ScInputHandler;
// FormShell vor MakeDrawView anlegen, damit die DrawView auf jeden Fall // create FormShell before MakeDrawView, so that DrawView can be registered at the
// an der FormShell angemeldet werden kann // FormShell in every case
// Gepusht wird die FormShell im ersten Activate // the FormShell is pushed in the first activate
pFormShell = new FmFormShell(this); pFormShell = new FmFormShell(this);
pFormShell->SetControlActivationHandler( LINK( this, ScTabViewShell, FormControlActivated ) ); pFormShell->SetControlActivationHandler( LINK( this, ScTabViewShell, FormControlActivated ) );
// DrawView darf nicht im TabView - ctor angelegt werden, // DrawView must not be created in TabView - ctor,
// wenn die ViewShell noch nicht kostruiert ist... // if the ViewShell is not yet constructed...
if (rDoc.GetDrawLayer()) if (rDoc.GetDrawLayer())
MakeDrawView( nForceDesignMode ); MakeDrawView( nForceDesignMode );
ViewOptionsHasChanged(false); // legt auch evtl. DrawView an ViewOptionsHasChanged(false); // possibly also creates DrawView
::svl::IUndoManager* pMgr = pDocSh->GetUndoManager(); ::svl::IUndoManager* pMgr = pDocSh->GetUndoManager();
SetUndoManager( pMgr ); SetUndoManager( pMgr );
...@@ -1554,7 +1547,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode ) ...@@ -1554,7 +1547,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode )
// ReadExtOptions is now in Activate // ReadExtOptions is now in Activate
// Link-Update nicht verschachteln // link update no nesting
if ( pDocSh->GetCreateMode() != SfxObjectCreateMode::INTERNAL && if ( pDocSh->GetCreateMode() != SfxObjectCreateMode::INTERNAL &&
pDocSh->IsUpdateEnabled() ) // #105575#; update only in the first creation of the ViewShell pDocSh->IsUpdateEnabled() ) // #105575#; update only in the first creation of the ViewShell
{ {
...@@ -1586,7 +1579,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode ) ...@@ -1586,7 +1579,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode )
} }
} }
bool bReImport = false; // importierte Daten aktualisieren bool bReImport = false; // update imported data
ScDBCollection* pDBColl = rDoc.GetDBCollection(); ScDBCollection* pDBColl = rDoc.GetDBCollection();
if ( pDBColl ) if ( pDBColl )
{ {
...@@ -1735,12 +1728,11 @@ ScTabViewShell::~ScTabViewShell() ...@@ -1735,12 +1728,11 @@ ScTabViewShell::~ScTabViewShell()
SC_MOD()->ViewShellGone(this); SC_MOD()->ViewShellGone(this);
RemoveSubShell(); // alle RemoveSubShell(); // all
SetWindow(0); SetWindow(0);
// alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird // all to NULL, in case the TabView-dtor tries to access them
//! (soll eigentlich nicht !??!?!) //! (should not really! ??!?!)
if (pInputHandler) if (pInputHandler)
pInputHandler->SetDocumentDisposing(true); pInputHandler->SetDocumentDisposing(true);
...@@ -1800,7 +1792,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) ...@@ -1800,7 +1792,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
rData.nPageNo = 1; rData.nPageNo = 1;
rData.nTotalPages = 99; rData.nTotalPages = 99;
// eNumType kennt der Dialog selber // eNumType is known by the dialog
} }
bool ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const bool ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const
......
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