[Libreoffice-commits] core.git: sc/source sw/inc
dennisroczek
dennisroczek at libreoffice.org
Wed Mar 22 11:30:28 UTC 2017
sc/source/ui/view/tabview3.cxx | 35 +++++++++++-----------
sw/inc/doc.hxx | 63 ++++++++++++++++++-----------------------
2 files changed, 46 insertions(+), 52 deletions(-)
New commits:
commit b49b79ae27911f88032efe97b46ee2fc3b747d30
Author: dennisroczek <dennisroczek at libreoffice.org>
Date: Mon Mar 13 12:12:16 2017 +0000
fix typo: bee --> be or been
* Removed old comment cruft
* clean up some indentation
Change-Id: I0ddbd66aec0f27d7563dc4c2cfa2e095a48cda46
Reviewed-on: https://gerrit.libreoffice.org/35134
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 6904b23baccb..9b03379f4cc2 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -322,9 +322,9 @@ void ScTabView::InvalidateAttribs()
rBindings.Invalidate( SID_NUMBER_TIME );
}
-// SetCursor - Cursor, set, draw, update InputWin
-// or send reference
-// without optimising due to BugId 29307
+// SetCursor - Cursor, set, draw, update InputWin
+// or send reference
+// Optimising breaks the funtionality
void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew )
{
@@ -1735,7 +1735,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
if ( nTab != aViewData.GetTabNo() || bNew )
{
- // FormShell would like to bee informed before the switch
+ // FormShell would like to be informed before the switch
FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell();
if (pFormSh)
{
@@ -2108,7 +2108,7 @@ void ScTabView::KillEditView( bool bNoPaint )
}
}
- // #108931#; notify accessibility before all things happen
+ // notify accessibility before all things happen
if (bNotifyAcc && aViewData.GetViewShell()->HasAccessibilityObjects())
aViewData.GetViewShell()->BroadcastAccessibility(SfxHint(SfxHintId::ScAccLeaveEditMode));
@@ -2415,7 +2415,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
}
}
-// for chart data selection
+// for chart data selection
void ScTabView::AddHighlightRange( const ScRange& rRange, const Color& rColor )
{
@@ -2686,7 +2686,7 @@ void ScTabView::ActivateView( bool bActivate, bool bFirst )
if (!bRefMode)
{
- // pass view to GetInputHdl, this view may not be current anymore
+ // pass view to GetInputHdl, this view may not be current anymore
ScInputHandler* pHdl = SC_MOD()->GetInputHdl(aViewData.GetViewShell());
if (pHdl)
pHdl->EnterHandler();
@@ -2731,8 +2731,7 @@ void ScTabView::ActivateView( bool bActivate, bool bFirst )
}
// do not call GrabFocus from here!
// if the document is processed, then Sfx calls GrabFocus in the window of the shell.
- // if it is a mail body for instance, then it can't get the focus (Bug #43638#)
-
+ // if it is a mail body for instance, then it can't get the focus
UpdateInputContext();
}
else
@@ -2780,7 +2779,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
if ( bCapture || pGridWin[eWhich]->IsMouseCaptured() )
{
// tracking instead of CaptureMouse, so it can be cancelled cleanly
- // (SelectionEngine calls CaptureMouse for SetWindow)
+ // (SelectionEngine calls CaptureMouse for SetWindow)
//! someday SelectionEngine itself should call StartTracking!?!
pGridWin[eWhich]->ReleaseMouse();
pGridWin[eWhich]->StartTracking();
@@ -2812,15 +2811,15 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
SfxInPlaceClient* pClient = aViewData.GetViewShell()->GetIPClient();
bool bOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
- // don't switch ViewShell's active window during RefInput, because the focus
- // might change, and subsequent SetReference calls wouldn't find the right EditView
+ // don't switch ViewShell's active window during RefInput, because the focus
+ // might change, and subsequent SetReference calls wouldn't find the right EditView
if ( !bRefMode && !bOleActive )
aViewData.GetViewShell()->SetWindow( pGridWin[eWhich] );
if ( bFocus && !aViewData.IsAnyFillMode() && !bRefMode )
{
// GrabFocus only if previously the other GridWindow had the focus
- // (for instance due to search and replace)
+ // (for instance due to search and replace)
pGridWin[eWhich]->GrabFocus();
}
@@ -2847,7 +2846,7 @@ void ScTabView::UpdateInputContext()
pTabControl->UpdateInputContext();
}
-// GetGridWidth - width of an output range (for ViewData)
+// GetGridWidth - width of an output range (for ViewData)
long ScTabView::GetGridWidth( ScHSplitPos eWhich )
{
@@ -2858,7 +2857,7 @@ long ScTabView::GetGridWidth( ScHSplitPos eWhich )
return 0;
}
-// GetGridHeight - height of an output range (for ViewData)
+// GetGridHeight - height of an output range (for ViewData)
long ScTabView::GetGridHeight( ScVSplitPos eWhich )
{
@@ -2906,7 +2905,7 @@ void ScTabView::ZoomChanged()
HideNoteMarker();
- // AW: To not change too much, use pWin here
+ // To not change too much, use pWin here
ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()].get();
if ( pWin && aViewData.HasEditView( aViewData.GetActivePart() ) )
@@ -2914,8 +2913,8 @@ void ScTabView::ZoomChanged()
// flush OverlayManager before changing the MapMode
pWin->flushOverlayManager();
- // make sure the EditView's position and size are updated
- // with the right (logic, not drawing) MapMode
+ // make sure the EditView's position and size are updated
+ // with the right (logic, not drawing) MapMode
pWin->SetMapMode( aViewData.GetLogicMode() );
UpdateEditView();
}
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e2d2c1751010..cf7b340bcda4 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -246,7 +246,7 @@ class SW_DLLPUBLIC SwDoc :
/* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
*/
- Idle maOLEModifiedIdle; //< Timer for update modified OLE-Objects
+ Idle maOLEModifiedIdle; //< Timer for update modified OLE-Objects
SwDBData maDBData; //< database descriptor
OUString msTOIAutoMarkURL; //< URL of table of index AutoMark file
std::vector<OUString> m_PatternNames; //< Array for names of document-templates
@@ -277,25 +277,24 @@ class SW_DLLPUBLIC SwDoc :
// Pointer
SwFrameFormat *mpDfltFrameFormat; //< Default formats.
- SwFrameFormat *mpEmptyPageFormat; //< Format for the default empty page
- SwFrameFormat *mpColumnContFormat; //< Format for column container
+ SwFrameFormat *mpEmptyPageFormat; //< Format for the default empty page
+ SwFrameFormat *mpColumnContFormat; //< Format for column container
SwCharFormat *mpDfltCharFormat;
- SwTextFormatColl *mpDfltTextFormatColl; //< Defaultformatcollections
+ SwTextFormatColl *mpDfltTextFormatColl; //< Defaultformatcollections
SwGrfFormatColl *mpDfltGrfFormatColl;
- SwFrameFormats *mpFrameFormatTable; //< Format table
+ SwFrameFormats *mpFrameFormatTable; //< Format table
SwCharFormats *mpCharFormatTable;
SwFrameFormats *mpSpzFrameFormatTable;
SwSectionFormats *mpSectionFormatTable;
- SwFrameFormats *mpTableFrameFormatTable; //< For tables
+ SwFrameFormats *mpTableFrameFormatTable; //< For tables
SwTextFormatColls *mpTextFormatCollTable; //< FormatCollections
SwGrfFormatColls *mpGrfFormatCollTable;
- SwTOXTypes *mpTOXTypes; //< Tables/indices
- SwDefTOXBase_Impl * mpDefTOXBases; //< defaults of SwTOXBase's
+ SwTOXTypes *mpTOXTypes; //< Tables/indices
+ SwDefTOXBase_Impl * mpDefTOXBases; //< defaults of SwTOXBase's
- SwDBManager *mpDBManager; /**< Pointer to the DBManager for
- evaluation of DB-fields. */
+ SwDBManager *mpDBManager; //< Pointer to the DBManager for evaluation of DB-fields.
SwNumRule *mpOutlineRule;
SwFootnoteInfo *mpFootnoteInfo;
@@ -303,27 +302,27 @@ class SW_DLLPUBLIC SwDoc :
SwLineNumberInfo*mpLineNumberInfo;
SwFootnoteIdxs *mpFootnoteIdxs;
- SwDocShell *mpDocShell; //< Ptr to SfxDocShell of Doc.
- SfxObjectShellLock mxTmpDocShell; //< A temporary shell that is used to copy OLE-Nodes
+ SwDocShell *mpDocShell; //< Ptr to SfxDocShell of Doc.
+ SfxObjectShellLock mxTmpDocShell; //< A temporary shell that is used to copy OLE-Nodes
- SwAutoCorrExceptWord *mpACEWord; /**< For the automated takeover of
- auto-corrected words that are "re-corrected". */
- SwURLStateChanged *mpURLStateChgd; //< SfxClient for changes in INetHistory
- SvNumberFormatter *mpNumberFormatter;//< NumFormatter for tables / fields
+ SwAutoCorrExceptWord *mpACEWord; /**< For the automated takeover of
+ auto-corrected words that are "re-corrected". */
+ SwURLStateChanged *mpURLStateChgd; //< SfxClient for changes in INetHistory
+ SvNumberFormatter *mpNumberFormatter; //< NumFormatter for tables / fields
- mutable SwNumRuleTable *mpNumRuleTable; //< List of all named NumRules.
+ mutable SwNumRuleTable *mpNumRuleTable; //< List of all named NumRules.
// Hash map to find numrules by name
mutable std::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap;
- SwPagePreviewPrtData *mpPgPViewPrtData; //< Indenting / spacing for printing of page view.
+ SwPagePreviewPrtData *mpPgPViewPrtData; //< Indenting / spacing for printing of page view.
SwPaM *mpExtInputRing;
- IStyleAccess *mpStyleAccess; //< handling of automatic styles
- SwLayoutCache *mpLayoutCache; /**< Layout cache to read and save with the
- document for a faster formatting */
+ IStyleAccess *mpStyleAccess; //< handling of automatic styles
+ SwLayoutCache *mpLayoutCache; /**< Layout cache to read and save with the
+ document for a faster formatting */
- IGrammarContact *mpGrammarContact; //< for grammar checking in paragraphs during editing
+ IGrammarContact *mpGrammarContact; //< for grammar checking in paragraphs during editing
// table of forbidden characters of this document
rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenCharsTable;
@@ -354,16 +353,14 @@ private:
bool mbInXMLImport : 1; //< TRUE: During xml import, attribute portion building is not necessary.
bool mbUpdateTOX : 1; //< TRUE: After loading document, update TOX.
bool mbInLoadAsynchron : 1; //< TRUE: Document is in the process of being loaded asynchronously.
- bool mbIsAutoFormatRedline : 1; //< TRUE: Redlines are recorded by Autoformat.
- bool mbOLEPrtNotifyPending : 1; /**< TRUE: Printer has changed. At creation of
- View
+ bool mbIsAutoFormatRedline : 1; //< TRUE: Redlines are recorded by Autoformat.
+ bool mbOLEPrtNotifyPending : 1; /**< TRUE: Printer has changed. At creation of View
notification of OLE-Objects PrtOLENotify() is required. */
bool mbAllOLENotify : 1; //< True: Notification of all objects is required.
- bool mbInsOnlyTextGlssry : 1; //< True: insert 'only text' glossary into doc
+ bool mbInsOnlyTextGlssry : 1; //< True: insert 'only text' glossary into doc
bool mbContains_MSVBasic : 1; //< True: MS-VBasic exist is in our storage
bool mbClipBoard : 1; //< TRUE: this document represents the clipboard
- bool mbColumnSelection : 1; /**< TRUE: this content has bee created by a column selection
- (clipboard docs only) */
+ bool mbColumnSelection : 1; //< TRUE: this content has been created by a column selection (clipboard docs only)
bool mbIsPrepareSelAll : 1;
#ifdef DBG_UTIL
@@ -440,7 +437,7 @@ private:
public:
enum DocumentType {
DOCTYPE_NATIVE,
- DOCTYPE_MSWORD //This doc model comes from MS Word
+ DOCTYPE_MSWORD // This doc model comes from MS Word
};
DocumentType meDocType;
DocumentType GetDocumentType(){ return meDocType; }
@@ -584,7 +581,7 @@ public:
// OLE ???
bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; }
inline void SetOLEPrtNotifyPending( bool bSet = true );
- void PrtOLENotify( bool bAll ); //All or only marked
+ void PrtOLENotify( bool bAll ); // All or only marked
#ifdef DBG_UTIL
bool InXMLExport() const { return mbXMLExport; }
@@ -862,7 +859,6 @@ public:
void ReplaceCompatibilityOptions( const SwDoc& rSource );
/** Replace all user defined document properties with xSourceDocProps.
-
Convenince function used by ReplaceDocumentProperties to skip some UNO calls.
*/
void ReplaceUserDefinedDocumentProperties( const css::uno::Reference< css::document::XDocumentProperties >& xSourceDocProps );
@@ -933,9 +929,8 @@ public:
void BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamily,
SfxHintId nOp);
- /** The html import sometimes overwrites the
- page sizes set in the page descriptions. This function is used to
- correct this. */
+ /** The html import sometimes overwrites the page sizes set in
+ the page descriptions. This function is used to correct this. */
void CheckDefaultPageFormat();
// Methods for tables/indices
More information about the Libreoffice-commits
mailing list