[Libreoffice-commits] core.git: chart2/qa dbaccess/source include/o3tl include/svtools sax/source sc/source sw/source wizards/com
jan iversen
jani at libreoffice.org
Wed Feb 22 08:47:09 UTC 2017
chart2/qa/extras/chart2dump/chart2dump.cxx | 4 ++--
chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt | 2 +-
dbaccess/source/ui/querydesign/TableWindow.cxx | 2 +-
include/o3tl/strong_int.hxx | 4 ++--
include/svtools/parhtml.hxx | 2 +-
sax/source/fastparser/fastparser.cxx | 2 +-
sc/source/ui/unoobj/docuno.cxx | 2 +-
sw/source/filter/html/htmlfldw.cxx | 2 +-
sw/source/filter/html/htmltab.cxx | 6 +++---
sw/source/filter/ww8/wrtww8.hxx | 2 +-
wizards/com/sun/star/wizards/agenda/TopicsControl.py | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit ab92c84dfe600f320f37b6126cab11385a6fbdd1
Author: jan iversen <jani at libreoffice.org>
Date: Wed Feb 22 08:46:08 2017 +0000
Revert "Fix typos"
This reverts commit ffd7f8fcfc2b551509e9cb31c0920e0f64292ea7.
Caused some problems, need to be broken down.
Change-Id: Iee816a266c32e7cebe623d36300c13d079e77c52
Reviewed-on: https://gerrit.libreoffice.org/34534
Reviewed-by: jan iversen <jani at libreoffice.org>
Tested-by: jan iversen <jani at libreoffice.org>
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index cba4fbb..3b80bcc 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -199,9 +199,9 @@ protected:
bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, const OUString& sCheck, const double fEPS, OUString& rExpectedTranform)
{
- rExpectedTranform = readExpected(sCheck); // Reference transformation string
+ rExpectedTranform = readExpected(sCheck); // Reference transfromation string
- // Convert string back to a transformation;
+ // Covnert string back to a transformation;
drawing::HomogenMatrix3 aExpectedTransform;
aExpectedTransform.Line1.Column1 = rExpectedTranform.getToken(0, ';').toDouble();
aExpectedTransform.Line1.Column2 = rExpectedTranform.getToken(1, ';').toDouble();
diff --git a/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt b/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt
index 28a125d..e955f80 100755
--- a/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt
+++ b/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt
@@ -1,5 +1,5 @@
// sChartTitle
-Annual Revenue
+Annaul Revenue
// sChartType
com.sun.star.chart2.ColumnChartType
// sXAxisTitle
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index aad254b..dfc7842 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -476,7 +476,7 @@ void OTableWindow::SetBoldTitle( bool bBold )
void OTableWindow::GetFocus()
{
Window::GetFocus();
- // we have to forward the focus to our listbox to enable keystrokes
+ // we have to forward the focus to our listbox to enable keystokes
if(m_xListBox)
m_xListBox->GrabFocus();
}
diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx
index 7c5ac40..7f24714 100644
--- a/include/o3tl/strong_int.hxx
+++ b/include/o3tl/strong_int.hxx
@@ -33,8 +33,8 @@ namespace o3tl
/// typedef o3tl::strong_int<unsigned, MyIntTag> MyInt;
///
/// \param UNDERLYING_TYPE the underlying scalar type
-/// \param PHANTOM_TYPE a type tag, used to distinguish this instantiation of the template
-/// from other instantiations with the same UNDERLYING_TYPE.
+/// \param PHANTOM_TYPE a type tag, used to distinguish this instantion of the template
+/// from other instantiantions with the same UNDERLYING_TYPE.
///
template <typename UNDERLYING_TYPE, typename PHANTOM_TYPE>
struct strong_int
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 07f2d5b..f481066 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -234,7 +234,7 @@ public:
// remove a comment around the content of <SCRIPT> or <STYLE>
// In case of 'bFull', the whole line behind a "<!--" might
- // be deleted (for JavaScript)
+ // be deleted (for JavaSript)
static void RemoveSGMLComment( OUString &rString, bool bFull );
static bool InternalImgToPrivateURL( OUString& rURL );
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 66df920..1b0ad53 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -980,7 +980,7 @@ bool FastSaxParserImpl::consume(EventList *pEventList)
return false;
case EXCEPTION:
rEntity.throwException( mxDocumentLocator, false );
- SAL_FALLTHROUGH; // avoid unreachable code warning with some compilers
+ SAL_FALLTHROUGH; // avoid unreachable code warning with some comilers
default:
assert(false);
return false;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 4e96fa3..848fb26 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -4069,7 +4069,7 @@ ScAnnotationsObj::~ScAnnotationsObj()
void ScAnnotationsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! adjust nTab when updating references!!!
+ //! adjust nTab when updatig references!!!
if ( rHint.GetId() == SfxHintId::Dying )
{
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 8304223..30c822f 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -521,7 +521,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
aContents = pField->GetPar2();
// sonst ist es der Script-Inhalt selbst. Da nur noh JavaScript
- // in Feldern landet, muss es sich um JavaScript handeln ...:)
+ // in Feldern landet, muss es sich um JavaSrript handeln ...:)
HTMLOutFuncs::OutScript( rWrt.Strm(), rWrt.GetBaseURL(), aContents, rType, JAVASCRIPT,
aURL, nullptr, nullptr, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters );
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index c8bec40..e3d7f98 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1615,7 +1615,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
}
else if( !m_pLineFrameFormatNoHeight )
{
- // else, we'll have to remove the height from the attribute and remember the format
+ // else, we'll have to remove the height from the attribute and remember the formatx
m_pLineFrameFormatNoHeight = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
ResetLineFrameFormatAttrs( m_pLineFrameFormatNoHeight );
@@ -2334,7 +2334,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
// Step 1: needed layout structures are created (including tables in tables)
CreateLayoutInfo();
- // Step 2: the minimal and maximal column width is calculated
+ // Step 2: the mininal and maximal column width is calculated
// (including tables in tables). Since we don't have boxes yet,
// we'll work on the start nodes
m_pLayoutInfo->AutoLayoutPass1();
@@ -3920,7 +3920,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
return;
}
- // If the content of the cell was empty, we need to create an empty content
+ // If the content of the cell was empty, we need to create an epty content
// We also create an empty content if the cell ended with a table and had no
// COL tags. Otherwise, it was probably exported by us and we don't
// want to have an additional paragraph
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index c602873..10ccb85 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1445,7 +1445,7 @@ public:
// Only character attributes are considered; paragraph attributes do not need this treatment.
// The paragraph and text attributes of the Writer are passed, and
// Where() returns the next position where the attributes change.
-// IsTextAttr() tells if, at the position returned by Where(), there is
+// IsTextAtr() tells if, at the position returned by Where(), there is
// an attribute without end and with \xff in the text.
// Using OutAttr(), the attributes on the passed SwPos are returned.
class SwWW8AttrIter : public MSWordAttrIter
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
index 82e7077..149faba 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
@@ -57,7 +57,7 @@ This control relays on the ControlScroller control which uses the following
Data model:<br/>
1. It uses a vector, whose members are arrays of PropertyValue.<br/>
2. Each array represents a row.<br/>
-(Note: the Name and Value memebers of the PropertyValue object are being used)
+(Note: the Name and Value memebrs of the PropertyValue object are being used)
3. Each property Value represents a value
for a single control with the following rules:<br/>
3. a. the Value of the property is used for as value
More information about the Libreoffice-commits
mailing list