hwpfilter/source/hwpreader.cxx | 3 ---
sw/source/core/inc/unoport.hxx | 4 ++--
sw/source/filter/html/parcss1.cxx | 8 ++++----
sw/source/filter/html/swhtml.hxx | 2 +-
vcl/unx/gtk/a11y/atkutil.cxx | 14 +++++++-------
5 files changed, 14 insertions(+), 17 deletions(-)
New commits:
commit 6a9f06e7ca9ba1ea9ebf8ecb013c6f63c4d7419c
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 12 15:53:06 2017 +0200
sw: fix typos in URLs
Change-Id: I51adbc08515352242b3e5b5f9eee071aee5a3951
diff --git a/sw/source/filter/html/parcss1.cxx
b/sw/source/filter/html/parcss1.cxx
index 3285d0828bd9..c22f8412e140 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -93,8 +93,8 @@ sal_Unicode CSS1Parser::GetNextChar()
// This function implements the scanner described in
-// http://www.w3.orh/pub/WWW/TR/WD-css1.html
-// resp. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
+// http://www.w3.org/pub/WWW/TR/WD-css1.html
+// resp. http://www.w3.org/pub/WWW/TR/WD-css1-960220.html
// for CSS1. It's a direct implementation of the
// described Lex grammar.
@@ -651,8 +651,8 @@ CSS1Token CSS1Parser::GetNextToken()
// These functions implement the parser described in
-// http://www.w3.orh/pub/WWW/TR/WD-css1.html
-// resp. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
+// http://www.w3.org/pub/WWW/TR/WD-css1.html
+// resp. http://www.w3.org/pub/WWW/TR/WD-css1-960220.html
// for CSS1. It's a direct implementation of the
// described Lex grammar.
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 6250184f683b..6276bb9dd7ab 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -466,7 +466,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
bool m_bChkJumpMark : 1; // maybe jump to predetermined mark
bool m_bUpdateDocStat : 1;
bool m_bFixSelectWidth : 1; // Set new width of select?
- bool m_bFixSelectHeight : 1; // Set new width of select?
+ bool m_bFixSelectHeight : 1; // Set new height of select?
bool m_bTextArea : 1;
// 24
bool m_bSelect : 1;
commit fa73f774019e1c5a8e062d6fc1cf35a43e1a847c
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 12 14:15:21 2017 +0200
hwpfilter: remove write-only variable
Change-Id: I03e29b1a3761fcafc70168b04d788dbf3e1584eb
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index b4bf35ec96e4..9d5a331be14b 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3676,7 +3676,6 @@ void HwpReader::makeFormula(TxtBox * hbox)
{
char mybuf[3000];
HWPPara* pPar;
- CharShape *cshape = nullptr;
int n, c, res;
hchar dest[3];
@@ -3688,8 +3687,6 @@ void HwpReader::makeFormula(TxtBox * hbox)
for( n = 0; n < pPar->nch && pPar->hhstr[n]->hh;
n += pPar->hhstr[n]->WSize() )
{
- if (!cshape)
- cshape = pPar->GetCharShape(n);
if (l >= sizeof(mybuf)-7)
break;
res = hcharconv(pPar->hhstr[n]->hh, dest, UNICODE);
commit b6a4b9264c098218a3f59a0e37504b33a7281e60
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 11 22:22:31 2017 +0200
fix typo @trhows
Change-Id: Ia57df88476b3dad0ed140d4f33a2cb813274376e
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 539d6b9a5e7e..ad16fbd3f5af 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -126,13 +126,13 @@ protected:
/// @throws css::beans::PropertyVetoException
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::WrappedTargetException
- /// @trhows css::uno::RuntimeException
+ /// @throws css::uno::RuntimeException
void SAL_CALL SetPropertyValues_Impl(
const css::uno::Sequence< OUString >& aPropertyNames,
const css::uno::Sequence< css::uno::Any >& aValues );
/// @throws css::beans::UnknownPropertyException
/// @throws css::lang::WrappedTargetException
- /// @trhows css::uno::RuntimeException
+ /// @throws css::uno::RuntimeException
css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl(
const css::uno::Sequence< OUString >& aPropertyNames );
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 0523311d4228..984f0531f702 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -133,20 +133,20 @@ class DocumentFocusListener :
std::set< uno::Reference< uno::XInterface > > m_aRefList;
public:
- /// @trhows lang::IndexOutOfBoundsException
+ /// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void attachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible
);
- /// @trhows lang::IndexOutOfBoundsException
+ /// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void attachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible,
const uno::Reference< accessibility::XAccessibleContext >& xContext
);
- /// @trhows lang::IndexOutOfBoundsException
+ /// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void attachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible,
@@ -154,20 +154,20 @@ public:
const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
);
- /// @trhows lang::IndexOutOfBoundsException
+ /// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void detachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible
);
- /// @trhows lang::IndexOutOfBoundsException
+ /// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void detachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible,
const uno::Reference< accessibility::XAccessibleContext >& xContext
);
- /// @trhows lang::IndexOutOfBoundsException
+ /// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void detachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible,
@@ -175,7 +175,7 @@ public:
const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
);
- /// @trhows lang::IndexOutOfBoundsException
+ /// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
static uno::Reference< accessibility::XAccessible > getAccessible(const
lang::EventObject& aEvent );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
