compilerplugins/clang/compat.hxx | 4 ++--
sc/source/ui/navipi/navipi.cxx | 2 +-
sfx2/source/control/request.cxx | 2 +-
sfx2/source/control/shell.cxx | 4 ++--
sw/inc/dialog.hrc | 8 ++++----
sw/inc/fesh.hxx | 2 +-
sw/source/filter/ww8/ww8atr.cxx | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 26b52972a8ab15049e63a2518ff8e10d6288d074
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
Date: Sat Jul 15 10:19:32 2017 +0200
Fix typos
Change-Id: I9d2c641b485c32ddccf0bfaaed1d0796572d1d33
Reviewed-on: https://gerrit.libreoffice.org/39477
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 060bf4cf2317..990f0ac78c26 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -224,8 +224,8 @@ inline llvm::StringRef getImmediateMacroNameForDiagnostics(
using namespace clang;
// Verbatim copy from Clang's lib/Lex/Lexer.cpp:
- assert(Loc.isMacroID() && "Only reasonble to call this on macros");
- // Walk past macro argument expanions.
+ assert(Loc.isMacroID() && "Only reasonable to call this on macros");
+ // Walk past macro argument expansion.
while (SM.isMacroArgExpansion(Loc))
Loc = SM.getImmediateExpansionRange(Loc).first;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 340674c3d0be..650854ec8c2f 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -703,7 +703,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW
nRowNo )
bUnmark = !pViewData->GetMarkData().IsCellMarked( nColNo, nRowNo );
SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
- SfxBoolItem aUnmarkItem( FN_PARAM_1, bUnmark ); // cancel
selektion
+ SfxBoolItem aUnmarkItem( FN_PARAM_1, bUnmark ); // cancel
selection
rBindings.GetDispatcher()->ExecuteList(SID_CURRENTCELL,
SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 8abb7c313eed..e65d1f466752 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -447,7 +447,7 @@ void SfxRequest::Done
[Note]
- 'Done ()' is not called, for example when a dialoge started by the function
+ 'Done ()' is not called, for example when a dialog started by the function
was canceled by the user or if the execution could not be performed due to
a wrong context (without use of separate <SfxShell>s). 'Done ()' will be
launched, when executing the function led to a regular error
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 5bf5b0c413a6..317fa2ff5834 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -354,7 +354,7 @@ void SfxShell::Activate
FALSE
the <SfxViewFrame>, on which SfxDispatcher
the SfxShell instance is located, was
- activated. (for example by a closing dialoge) */
+ activated. (for example by a closing dialog) */
)
{
BroadcastContextForActivation(true);
@@ -371,7 +371,7 @@ void SfxShell::Deactivate
FALSE
the <SfxViewFrame>, on which SfxDispatcher
the SfxShell instance is located, was
- deactivated. (for example by a dialoge) */
+ deactivated. (for example by a dialog) */
)
{
BroadcastContextForActivation(false);
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 8304950d3695..8da271a33bc3 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -22,16 +22,16 @@
#include "rcid.hrc"
-// Dialoge ******************************************************************
+// Dialogs
#define STR_QUERY_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11)
#define STR_SPELLING_COMPLETED (RC_DIALOG_BEGIN + 12)
-// Strings ******************************************************************
+// Strings
#define STR_CLOSELINKMSG (RC_DIALOG_BEGIN + 3)
-// Bereiche *****************************************************************
+// Bereiche
#define RC_REGIONSW_BEGIN (RC_DIALOG_BEGIN + 60)
// RC_REGIONSW_END (RC_DIALOG_BEGIN + 79)
@@ -42,7 +42,7 @@
#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90)
#define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91)
#define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92)
-// Ueberlaufpruefung ********************************************************
+// Ueberlaufpruefung
#define DIALOG_ACT_END RC_MACASSGN_END
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index cb7d75a1b827..cd4b562bd7da 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -305,7 +305,7 @@ public:
Although (0,TRUE) is kind of a standard, the parameters are not defaulted
here
in order to force more conscious use especially of bStopAtFly. */
FrameTypeFlags GetFrameType( const Point *pPt, bool bStopAtFly ) const;
- FrameTypeFlags GetSelFrameType() const; //Selektion (Drawing)
+ FrameTypeFlags GetSelFrameType() const; //Selection (Drawing)
/** check whether selected frame contains a control;
* companion method to GetSelFrameType, used for preventing
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 18a9915626db..2350dc65091d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4247,7 +4247,7 @@ void AttributeOutputBase::FormatColumns( const
SwFormatCol& rCol )
short nDiff = nColWidth -
rCol.CalcPrtColWidth( n, (sal_uInt16)nPageSize );
- if ( nDiff > 10 || nDiff < -10 ) // Toleranz: 10 tw
+ if ( nDiff > 10 || nDiff < -10 ) // Tolerance: 10 tw
{
bEven = false;
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
