[Libreoffice-commits] core.git: hwpfilter/source include/sfx2 nlpsolver/ThirdParty qadevOOo/tests sal/osl sc/inc sc/qa sc/source sd/source svtools/source sw/source vcl/inc vcl/source vcl/unx
Julien Nabet
serval2412 at yahoo.fr
Fri Feb 3 21:56:27 UTC 2017
hwpfilter/source/hbox.cxx | 2 +-
hwpfilter/source/hbox.h | 2 +-
hwpfilter/source/hwpread.cxx | 2 +-
include/sfx2/thumbnailview.hxx | 2 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java | 2 +-
qadevOOo/tests/java/ifc/frame/_XFrameLoader.java | 2 +-
sal/osl/unx/nlsupport.cxx | 2 +-
sc/inc/document.hxx | 2 +-
sc/inc/forbiuno.hxx | 2 +-
sc/qa/unit/subsequent_filters-test.cxx | 2 +-
sc/source/filter/oox/workbookfragment.cxx | 2 +-
sc/source/ui/view/drawview.cxx | 2 +-
sc/source/ui/view/tabvwsh3.cxx | 2 +-
sd/source/ui/inc/unomodel.hxx | 2 +-
sd/source/ui/unoidl/unomodel.cxx | 4 ++--
svtools/source/svrtf/parrtf.cxx | 2 +-
sw/source/filter/ww8/docxsdrexport.cxx | 2 +-
vcl/inc/svdata.hxx | 2 +-
vcl/source/control/edit.cxx | 10 +++++-----
vcl/source/control/field.cxx | 2 +-
vcl/source/control/spinfld.cxx | 2 +-
vcl/source/window/menubarwindow.cxx | 2 +-
vcl/unx/kde/salnativewidgets-kde.cxx | 4 ++--
vcl/unx/kde4/KDESalFrame.cxx | 2 +-
24 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 092adc4991eb143bc279a4bb61da27f70c73413e
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Fri Feb 3 22:42:56 2017 +0100
Typos
Change-Id: Ic54695e86b4b462419fa7d5ded7b1ddb19ee8ed5
Reviewed-on: https://gerrit.libreoffice.org/33904
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index c3587f4..950fc91 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -474,7 +474,7 @@ hchar_string MailMerge::GetString()
}
-// character compositon(23)
+// character composition(23)
// hyphen(24)
// toc mark(25)
// index mark(26)
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 310984c..78325a5 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -844,7 +844,7 @@ struct MailMerge: public HBox
virtual hchar_string GetString() override;
};
-// char compositon(23)
+// char composition(23)
/**
* The compose struct displays characters at position. The maximum character count for composition is three.
* @short Composition several characters
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 5616258..aefb97a 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -726,7 +726,7 @@ bool MailMerge::Read(HWPFile & hwpf)
return !hwpf.State();
}
-// char compositon(23)
+// char composition(23)
Compose::Compose()
: HBox(CH_COMPOSE)
, dummy(0)
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 175c2ea..9a4d220 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -314,7 +314,7 @@ protected:
Color maFillColor; ///< Background color of the thumbnail view widget.
Color maTextColor; ///< Text color.
Color maHighlightColor; ///< Color of the highlight (background) of the hovered item.
- Color maHighlightTextColor; ///< Color of the text for the higlighted item.
+ Color maHighlightTextColor; ///< Color of the text for the highlighted item.
Color maSelectHighlightColor; ///< Color of the highlight (background) of the selected and hovered item.
Color maSelectHighlightTextColor; ///< Color of the text of the selected and hovered item.
double mfHighlightTransparence; ///< Transparence of the highlight.
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
index b7b055a..bc5c20f 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
@@ -97,7 +97,7 @@ public abstract class ProblemEncoder {
point.setObjectiveValue(tempResponseSet[0]);
}
- //calcuate each response, must be implemented
+ //calculate each response, must be implemented
abstract protected double calcTargetAt(int index, double[] VX);
// calculate all the responses VY[] based on given point VX[]
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
index 1626f10..6cc1def 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
@@ -65,7 +65,7 @@ public class _XFrameLoader extends MultiMethodTest {
private PropertyValue[] args = new PropertyValue[0] ;
/**
- * Implemetation of load listener which geristers all its calls.
+ * Implementation of load listener which geristers all its calls.
*/
protected static class TestListener implements XLoadEventListener {
public boolean finished = false ;
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index b2afcfd..97c6c62 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -826,7 +826,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
/* use iso language code to determine the charset */
if( nullptr == language )
{
- /* iso lang codes have 2 charaters */
+ /* iso lang codes have 2 characters */
locale_buf[2] = '\0';
language = pair_search( locale_buf, iso_language_list, SAL_N_ELEMENTS( iso_language_list ) );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ee50a0a..da2a982 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1427,7 +1427,7 @@ public:
void CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCTAB nTab, ScDocument* pClipDoc);
- bool InitColumnBlockPosition( sc::ColumnBlockPosition& rBlokPos, SCTAB nTab, SCCOL nCol );
+ bool InitColumnBlockPosition( sc::ColumnBlockPosition& rBlockPos, SCTAB nTab, SCCOL nCol );
void DeleteBeforeCopyFromClip(
sc::CopyFromClipContext& rCxt, const ScMarkData& rMark, sc::ColumnSpanSet& rBroadcastSpans );
diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx
index 4f237b9..890620c 100644
--- a/sc/inc/forbiuno.hxx
+++ b/sc/inc/forbiuno.hxx
@@ -25,7 +25,7 @@
class ScDocShell;
-// object to set forbidden charaters to document
+// object to set forbidden characters to document
class ScForbiddenCharsObj : public SvxUnoForbiddenCharsTable, public SfxListener
{
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 76def6f..bbbe00e 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -3093,7 +3093,7 @@ void ScFiltersTest::testMiscRowHeights()
{
/* Checks that a document saved to ods with default rows does indeed
have default row heights ( there was a problem where the optimal
- height was being calcuated after import if no hard height )
+ height was being calculated after import if no hard height )
*/
{ "alldefaultheights.", FORMAT_ODS, -1, SAL_N_ELEMENTS(DfltRowData), DfltRowData },
/* Checks the imported height of some multiline input, additionally checks
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 6799f1c..300b567 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -395,7 +395,7 @@ void WorkbookFragment::finalizeImport()
OSL_ENSURE( !aFragmentPath.isEmpty(), "WorkbookFragment::finalizeImport - cannot access sheet fragment" );
if( !aFragmentPath.isEmpty() )
{
- // leave space for formula processing ( calcuate the segments as
+ // leave space for formula processing ( calculate the segments as
// if there is an extra sheet )
double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - ( nWorksheet - 1) );
ISegmentProgressBarRef xSheetSegment = getProgressBar().createSegment( fSegmentLength );
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 03e5746..43b5661 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -915,7 +915,7 @@ void ScDrawView::MarkDropObj( SdrObject* pObj )
}
// In order to counteract the effects of rounding due to the nature of how the
-// grid positions are calcuated and drawn we calculate the offset needed at the
+// grid positions are calculated and drawn we calculate the offset needed at the
// current zoom to be applied to an SrdObject when it is drawn in order to make
// sure that it's position relative to the nearest cell anchor doesn't change.
// Of course not all shape(s)/control(s) are cell anchored, if the
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 8ee29b9..a8f0776 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -1018,7 +1018,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case SID_CREATE_SW_DRAWVIEW:
- // is called by Forms, when the DrawView has to be crated with all
+ // is called by Forms, when the DrawView has to be created with all
// the extras
if (!GetScDrawView())
{
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 01af055..9132662 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -109,7 +109,7 @@ private:
css::uno::WeakReference< css::container::XNameContainer > mxCustomPresentationAccess;
css::uno::WeakReference< css::container::XNameAccess > mxStyleFamilies;
css::uno::WeakReference< css::presentation::XPresentation > mxPresentation;
- css::uno::WeakReference< css::i18n::XForbiddenCharacters > mxForbidenCharacters;
+ css::uno::WeakReference< css::i18n::XForbiddenCharacters > mxForbiddenCharacters;
css::uno::Reference< css::container::XNameAccess > mxLinks;
css::uno::Reference< css::uno::XInterface > mxDashTable;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 082d6ec..a3b9b34 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2580,10 +2580,10 @@ Pointer SdXImpressDocument::getPointer()
uno::Reference< i18n::XForbiddenCharacters > SdXImpressDocument::getForbiddenCharsTable()
{
- uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters);
+ uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbiddenCharacters);
if( !xForb.is() )
- mxForbidenCharacters = xForb = new SdUnoForbiddenCharsTable( mpDoc );
+ mxForbiddenCharacters = xForb = new SdUnoForbiddenCharsTable( mpDoc );
return xForb;
}
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 602ef7e..d65868c 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -60,7 +60,7 @@ int SvRTFParser::GetNextToken_()
{
case '\\':
{
- // control charaters
+ // control characters
nNextCh = GetNextChar();
switch( nNextCh )
{
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 43a05d2..f3c1ee8 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -477,7 +477,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons
m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_positionH, XML_relativeFrom, relativeFromH, FSEND);
/**
* Sizes of integral types
- * climits header defines constants with the limits of integral types for the specific system and compiler implemetation used.
+ * climits header defines constants with the limits of integral types for the specific system and compiler implementation used.
* Use of this might cause platform dependent problem like posOffset exceed the limit.
**/
const sal_Int64 MAX_INTEGER_VALUE = SAL_MAX_INT32;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 48d6ec9..1a03164 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -252,7 +252,7 @@ struct ImplSVNWFData
int mnMenuFormatBorderX = 0; // horizontal inner popup menu border
int mnMenuFormatBorderY = 0; // vertical inner popup menu border
int mnMenuSeparatorBorderX = 0; // gap at each side of separator
- ::Color maMenuBarHighlightTextColor = Color( COL_TRANSPARENT ); // override higlight text color
+ ::Color maMenuBarHighlightTextColor = Color( COL_TRANSPARENT ); // override highlight text color
// in menubar if not transparent
bool mbMenuBarDockingAreaCommonBG = false; // e.g. WinXP default theme
bool mbDockingAreaSeparateTB = false; // individual toolbar backgrounds
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index b3a581e..63e9a70 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -549,8 +549,8 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const Rectangle& rRec
{
// save graphics state
rRenderContext.Push();
- // first calculate higlighted and non highlighted clip regions
- vcl::Region aHiglightClipRegion;
+ // first calculate highlighted and non highlighted clip regions
+ vcl::Region aHighlightClipRegion;
vcl::Region aNormalClipRegion;
Selection aTmpSel(maSelection);
aTmpSel.Justify();
@@ -573,7 +573,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const Rectangle& rRec
}
if (bHighlight)
- aHiglightClipRegion.Union(aRect);
+ aHighlightClipRegion.Union(aRect);
else
aNormalClipRegion.Union(aRect);
}
@@ -601,7 +601,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const Rectangle& rRec
rRenderContext.DrawText(aPos, aText, 0, nLen);
// draw highlighted text
- rRenderContext.SetClipRegion(aHiglightClipRegion);
+ rRenderContext.SetClipRegion(aHighlightClipRegion);
rRenderContext.SetTextColor(rStyleSettings.GetHighlightTextColor());
rRenderContext.SetTextFillColor(rStyleSettings.GetHighlightColor());
rRenderContext.DrawText(aPos, aText, 0, nLen);
@@ -625,7 +625,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const Rectangle& rRec
{
rRenderContext.SetTextColor(rStyleSettings.GetHighlightTextColor());
rRenderContext.SetTextFillColor(rStyleSettings.GetHighlightColor());
- aRegion = aHiglightClipRegion;
+ aRegion = aHighlightClipRegion;
}
for(int i = 0; i < mpIMEInfos->nLen; )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 50c83c1..d0fc826 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -184,7 +184,7 @@ bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue,
bNegative = true;
}
- // remove all unwanted charaters
+ // remove all unwanted characters
// For whole number
for (sal_Int32 i=0; i < aStr1.getLength(); )
{
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 2acd8fe..c561cbb 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -630,7 +630,7 @@ void SpinField::ImplCalcButtonAreas(OutputDevice* pDev, const Size& rOutSz, Rect
else
rDDArea.SetEmpty();
- // calcuate sizes according to the height
+ // calculate sizes according to the height
if (GetStyle() & WB_SPIN)
{
long nBottom1 = aSize.Height()/2;
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index f922901..be3ab27 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -732,7 +732,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
// handling gtk like (aka mbOpenMenuOnF10)
// do not highlight an item when opening a sub menu
- // unless there already was a higlighted sub menu item
+ // unless there already was a highlighted sub menu item
bool bWasHighlight = false;
if( pActivePopup )
{
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index dc3cd61..b4d15c8 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1956,7 +1956,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetMenuBarColor( aMenuBack );
aStyleSettings.SetMenuHighlightColor( toColor ( qMenuCG.highlight() ) );
- // Menu items higlight text color, theme specific
+ // Menu items highlight text color, theme specific
if ( QApplication::style().inherits( "HighContrastStyle" ) ||
QApplication::style().inherits( "KeramikStyle" ) ||
QApplication::style().inherits( QWindowsStyle_String ) ||
@@ -1968,7 +1968,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
else
aStyleSettings.SetMenuHighlightTextColor( aMenuFore );
- // set special menubar higlight text color
+ // set special menubar highlight text color
if ( QApplication::style().inherits( "HighContrastStyle" ) )
ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = toColor( qMenuCG.highlightedText() );
else
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 43dcb35..26f0e59 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -307,7 +307,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetMenuHighlightColor( toColor ( qMenuCG.color( QPalette::Highlight ) ) );
style.SetMenuHighlightTextColor( toColor ( qMenuCG.color( QPalette::HighlightedText ) ) );
- // set special menubar higlight text color
+ // set special menubar highlight text color
if ( QApplication::style()->inherits( "HighContrastStyle" ) )
ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = toColor( qMenuCG.color( QPalette::HighlightedText ) );
else
More information about the Libreoffice-commits
mailing list