[Libreoffice-commits] core.git: 2 commits - connectivity/source extras/source framework/inc include/formula include/ucbhelper offapi/com svx/source sw/source testtools/source
Julien Nabet
serval2412 at yahoo.fr
Mon Feb 10 06:58:32 PST 2014
connectivity/source/drivers/file/FConnection.cxx | 2 +-
connectivity/source/inc/java/tools.hxx | 2 +-
extras/source/labels/labels.xml | 2 +-
framework/inc/dispatch/closedispatcher.hxx | 2 +-
include/formula/compiler.hrc | 2 +-
include/ucbhelper/content.hxx | 4 ++--
offapi/com/sun/star/ucb/Content.idl | 2 +-
svx/source/unodraw/unoshape.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 4 ++--
sw/source/filter/ww8/wrtww8.cxx | 2 +-
sw/source/filter/ww8/ww8par.cxx | 2 +-
testtools/source/bridgetest/idl/bridgetest.idl | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 07d60f88f28d1f05c50458a66a24cefefa97a54a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon Feb 10 15:57:11 2014 +0100
Typo: adress -> address
Change-Id: I8b6c66b6919f84c36e43a716d4d62fea5cde6568
diff --git a/extras/source/labels/labels.xml b/extras/source/labels/labels.xml
index babc005..f886178 100644
--- a/extras/source/labels/labels.xml
+++ b/extras/source/labels/labels.xml
@@ -1588,7 +1588,7 @@ Avery J8950, L7950 - the labels are not aligned in a rectangular grid
<measure>S;10160;5700;9906;5700;467;600;2;5;21000;29700</measure>
</label>
<label id="L58">
- <name>L7651 Mini Adress</name>
+ <name>L7651 Mini Address</name>
<measure>S;4064;2117;3810;2117;467;1090;5;13;21000;29700</measure>
</label>
<label id="L59">
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index fff1ac4..bb7a965 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -281,7 +281,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
context where its dispatched. Sometimes the start frame of the dispatch
has to be closed itself (target=_self) ... sometimes it's parent frame
has to be closed - BUT(!) it means a parent frame containing a top level
- window. _top cant be used then for dispatch - because it adress TopFrames
+ window. _top cant be used then for dispatch - because it address TopFrames
not frames containg top level windows. So normaly _magic (which btw does not
exists at the moment .-) ) should be used. So we interpret target=<empty>
as _magic !
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 95abb545..1c03f6d 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -384,7 +384,7 @@
#define SC_OPCODE_ISPMT 386
#define SC_OPCODE_HYPERLINK 387
#define SC_OPCODE_INDIRECT_XL 388 /* See also INDIRECT for OOO variant */
-#define SC_OPCODE_ADDRESS_XL 389 /* See also ADRESS for OOO variant */
+#define SC_OPCODE_ADDRESS_XL 389 /* See also ADDRESS for OOO variant */
#define SC_OPCODE_GET_PIVOT_DATA 390
#define SC_OPCODE_EUROCONVERT 391
#define SC_OPCODE_NUMBERVALUE 392
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index f631e65..719c34e 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -375,7 +375,7 @@ OString MSWordStyles::GetStyleId(sal_uInt16 nId) const
static void impl_SkipOdd( ww::bytes* pO, sal_Size nTableStrmTell )
{
if ( ( nTableStrmTell + pO->size() ) & 1 ) // Start auf gerader
- pO->push_back( (sal_uInt8)0 ); // Adress
+ pO->push_back( (sal_uInt8)0 ); // Address
}
void WW8AttributeOutput::EndStyle()
@@ -664,7 +664,7 @@ void WW8AttributeOutput::StartStyles()
sal_uLong nCurPos = m_rWW8Export.pTableStrm->Tell();
if ( nCurPos & 1 ) // Start auf gerader
{
- m_rWW8Export.pTableStrm->WriteChar( (char)0 ); // Adress
+ m_rWW8Export.pTableStrm->WriteChar( (char)0 ); // Address
++nCurPos;
}
rFib.fcStshfOrig = rFib.fcStshf = nCurPos;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 43a1cfa..db97528 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1261,7 +1261,7 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc, bool bIsUnicode)
if ( !bIsUnicode )
{
- nStartFc <<= 1; // Adress * 2
+ nStartFc <<= 1; // Address * 2
nStartFc |= 0x40000000; // second last bit for non-Unicode
}
commit 65f620c99ae177efdf06993561ac019663ce74fd
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon Feb 10 15:23:52 2014 +0100
Typo: execption -> exception
Change-Id: Ib57e0cc39c27595490e29dec46cc6d33067c34b5
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 0523759..848873a 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -193,7 +193,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
throw SQLException();
}
}
- catch(Exception& e) // a execption is thrown when no file exists
+ catch(Exception& e) // a exception is thrown when no file exists
{
throwUrlNotValid(getURL(),e.Message);
}
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 7f1443e..211916c 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -68,7 +68,7 @@ namespace connectivity
@param pEnv
The native java env
@param _bClear
- <TRUE/> if the execption should be cleared
+ <TRUE/> if the exception should be cleared
@return
<TRUE/> if an exception is occurred
*/
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index 217cfcb..c0ac7bc 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -297,7 +297,7 @@ public:
* - com::sun::star::lang::IllegalArgumentException indicates,
* that the property value is not acceptable. For instance,
* setting an empty title may be illegal.
- * - Any other execption derived from
+ * - Any other exception derived from
* com::sun::star::uno::Exception indicates, that the value was
* not set successfully. For example, this can be a
* com::sun:star::ucb::InteractiveAugmentedIOException
@@ -360,7 +360,7 @@ public:
* - com::sun::star::lang::IllegalArgumentException indicates,
* that the property value is not acceptable. For instance,
* setting an empty title may be illegal.
- * - Any other execption derived from
+ * - Any other exception derived from
* com::sun::star::uno::Exception indicates, that the value was
* not set successfully. For example, this can be a
* com::sun:star::ucb::InteractiveAugmentedIOException
diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index 0789870..a2cedb2 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -150,7 +150,7 @@ published service Content
<li>com::sun::star::lang::IllegalArgumentException
indicates, that the property value is not acceptable. For instance,
setting an empty title may be illegal.</li>
- <li>Any other execption derived from com::sun::star::uno::Exception
+ <li>Any other exception derived from com::sun::star::uno::Exception
indicates, that the value was not set successfully. For example,
this can be a InteractiveAugmentedIOException
transporting the error code IOErrorCode::ACCESS_DENIED.</li>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index f31748b..031be92 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1875,7 +1875,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence
const uno::Any* pValues = aValues.getConstArray();
// make sure mbIsMultiPropertyCall and mpImpl->mpItemSet are
- // reseted even when an execption is thrown
+ // reseted even when an exception is thrown
const ::comphelper::ScopeGuard aGuard( boost::bind( &SvxShape::endSetPropertyValues, this ) );
mbIsMultiPropertyCall = true;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9e584e1..5ccd6bb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4387,7 +4387,7 @@ void wwSectionManager::InsertSegments()
bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disables this...
if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected())
{
- // here we have the special case that the whole document is protected, with the execption of this section.
+ // here we have the special case that the whole document is protected, with the exception of this section.
// I want to address this when I do the section rework, so for the moment we disable the overall protection then...
mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
}
diff --git a/testtools/source/bridgetest/idl/bridgetest.idl b/testtools/source/bridgetest/idl/bridgetest.idl
index a0376ec..c7abd54 100644
--- a/testtools/source/bridgetest/idl/bridgetest.idl
+++ b/testtools/source/bridgetest/idl/bridgetest.idl
@@ -399,7 +399,7 @@ interface XBridgeTest : XBridgeTestBase
/**
* Throws runtime exception.
* check remote bridges handle exceptions during oneway calls properly.
- * Note that on client side the execption may fly or not. When it flies, it should
+ * Note that on client side the exception may fly or not. When it flies, it should
* have the proper message and context.
***/
void raiseRuntimeExceptionOneway( [in] string Message,
More information about the Libreoffice-commits
mailing list