[Libreoffice-commits] core.git: 2 commits - basic/source i18npool/source lotuswordpro/inc offapi/com oox/source qadevOOo/tests sw/qa sw/source vbahelper/source
basic/source/runtime/runtime.cxx |2 +-
i18npool/source/breakiterator/data/README |4 ++--
lotuswordpro/inc/lwpobjhdr.hxx|2 +-
offapi/com/sun/star/drawing/XControlShape.idl |2 +-
offapi/com/sun/star/frame/XTitle.idl |2 +-
offapi/com/sun/star/text/WritingMode2.idl |2 +-
offapi/com/sun/star/ucb/XSourceInitialization.idl |2 +-
oox/source/crypto/AgileEngine.cxx |2 +-
qadevOOo/tests/java/ifc/view/_XPrintable.java |2 +-
sw/qa/extras/uiwriter/uiwriter.cxx|2 +-
sw/source/filter/ww8/wrtww8.hxx |4 ++--
sw/source/ui/table/instable.cxx |2 +-
vbahelper/source/vbahelper/vbaapplicationbase.cxx |2 +-
13 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit ea96a4815e456295ca7454475e54cd8b0ba5c388
Author: Andrea Gelmini
AuthorDate: Mon Jul 23 16:24:56 2018 +0200
Commit: Julien Nabet
CommitDate: Mon Jul 23 23:40:22 2018 +0200
Fix typos
Change-Id: If6e6df9ac592c77f19e381e50b7eb26fbf429f61
Reviewed-on: https://gerrit.libreoffice.org/57831
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 9f242dab4ba8..99612cbee157 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1818,7 +1818,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal,
SbxVariableRef& refVar, b
// LHS try determine if a default prop exists
// again like in StepPUT (see there too ) we are tweaking the
// heuristics again for when to assign an object reference or
-// use default memebers if they exists
+// use default members if they exist
// #FIXME we really need to get to the bottom of this mess
bool bObjAssign = false;
if ( refVar->GetType() == SbxOBJECT )
diff --git a/i18npool/source/breakiterator/data/README
b/i18npool/source/breakiterator/data/README
index 63f25a1ccd07..6246b80ae77f 100644
--- a/i18npool/source/breakiterator/data/README
+++ b/i18npool/source/breakiterator/data/README
@@ -441,7 +441,7 @@ Author: Oliver Bolte
Date: Tue Jan 11 10:18:37 2005 +
INTEGRATION: CWS i18n15 (1.16.4); FILE MERGED
-2004/10/07 18:19:11 khong 1.16.4.1: #i33756# update Hangarian breakiterator
+2004/10/07 18:19:11 khong 1.16.4.1: #i33756# update Hungarian breakiterator
commit d2a6a31e6981800c2a920f8c6ff901c341a0466e
Author: Kurt Zenker
@@ -509,7 +509,7 @@ Date: Wed Mar 17 08:02:01 2004 +
INTEGRATION: CWS i18n11 (1.12.14); FILE MERGED
2004/02/10 14:21:13 er 1.12.14.3: RESYNC: (1.12-1.13); FILE MERGED
-2004/02/05 16:45:30 khong 1.12.14.2: #i24850# fix the problem in
previousCharBlock, when target char block is in poistion 1
+2004/02/05 16:45:30 khong 1.12.14.2: #i24850# fix the problem in
previousCharBlock, when target char block is in position 1
2004/02/04 02:13:48 khong 1.12.14.1: #i24098# check boundary condition for
Sentence, Script, CharBlock breakiterator
commit 4da98b648497af30de0fcf1a16e649ce18b0564f
diff --git a/lotuswordpro/inc/lwpobjhdr.hxx b/lotuswordpro/inc/lwpobjhdr.hxx
index 7c270aff5d34..12c4169bf8e8 100644
--- a/lotuswordpro/inc/lwpobjhdr.hxx
+++ b/lotuswordpro/inc/lwpobjhdr.hxx
@@ -76,7 +76,7 @@ private:
sal_uInt32 m_nSize; //Data size
bool m_bCompressed;
-//localize the following memebers to save memory
+//localize the following members to save memory
//sal_uInt8 m_nFlagBits;
//sal_uInt32 m_nVersionID;
//sal_uInt32 m_nRefCount;
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index dbbacfa82639..6513d71bf006 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -6368,7 +6368,7 @@ void SwUiWriterTest::testFontEmbedding()
xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
CPPUNIT_ASSERT(aTempFile.IsValid());
-// Check setting - No font enbedding should be enabled
+// Check setting - No font embedding should be enabled
pXmlDoc = parseExportInternal(aTempFile.GetURL(),"settings.xml");
CPPUNIT_ASSERT(pXmlDoc);
assertXPathContent(pXmlDoc, aSettingsBaseXpath +
"/config:config-item[@config:name='EmbedFonts']", "false");
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a60b21f12c86..df66ce5f37aa 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -708,7 +708,7 @@ public:
/// Setter for pISet.
void SetCurItemSet( const SfxItemSet* pS ) { m_pISet = pS; }
-/// Remember some of the memebers so that we can recurse in WriteText().
+/// Remember some of the members so that we can recurse in WriteText().
virtual void SaveData( sal_uLong nStt, sal_uLong nEnd );
/// Restore what was
[Libreoffice-commits] core.git: 2 commits - basic/source i18npool/source
basic/source/inc/namecont.hxx | 11 +
basic/source/uno/namecont.cxx | 29 +-
i18npool/source/collator/collator_unicode.cxx |5
3 files changed, 36 insertions(+), 9 deletions(-)
New commits:
commit 414540aecae90774e12390cfcf8f0a37e10684b4
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 12:35:11 2014 +0100
allow build with icu 4.2
Change-Id: I4bbcff7963520426d4c04e15d2239431aff65b56
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 2960f03..d0aef3f 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -333,6 +333,10 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
if (func funclen) {
const sal_uInt8* ruleImage=func();
size_t ruleImageSize = funclen();
+
+#if (U_ICU_VERSION_MAJOR_NUM == 4) (U_ICU_VERSION_MINOR_NUM = 2)
+uca_base = new RuleBasedCollator(static_castUChar*(NULL),
status);
+#else
// Not only changed ICU 53.1 the API behavior that a negative
// length (ruleImageSize) now leads to failure, but also that
// the base RuleBasedCollator passed as uca_base here needs to
@@ -344,6 +348,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
// NULL (default) locale does not.
uca_base =
static_castRuleBasedCollator*(icu::Collator::createInstance(
icu::Locale::getRoot(), status));
+#endif
if (! U_SUCCESS(status)) throw RuntimeException();
collator = new RuleBasedCollator(
reinterpret_castconst uint8_t*(ruleImage),
ruleImageSize, uca_base, status);
commit c80be30203b842c7b6d3145200b120cefb452cb8
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 14:30:18 2014 +0100
coverity#706241 Uncaught exception
we've already checked to see if the element exists, so
we know that its not there.
Change-Id: I538c0d48a883d478e4c748d222b21958d083c049
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 6355549..bcbd245 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -96,6 +96,17 @@ public:
void setEventSource( ::com::sun::star::uno::XInterface* pxEventSource )
{ mpxEventSource = pxEventSource; }
+void insertCheck(const OUString aName, const css::uno::Any aElement)
+throw (css::lang::IllegalArgumentException,
+ css::container::ElementExistException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception);
+
+void insertNoCheck(const OUString aName, const css::uno::Any aElement)
+throw (css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception);
+
// Methods XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( )
throw(::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index de2b91a..ac35350 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -186,21 +186,25 @@ void NameContainer::replaceByName( const OUString aName,
const Any aElement )
}
}
-
-// Methods XNameContainer
-void NameContainer::insertByName( const OUString aName, const Any aElement )
+void NameContainer::insertCheck(const OUString aName, const Any aElement)
throw(IllegalArgumentException, ElementExistException,
WrappedTargetException, RuntimeException, std::exception)
{
+NameContainerNameMap::iterator aIt = mHashMap.find(aName);
+if( aIt != mHashMap.end() )
+{
+throw ElementExistException();
+}
+insertNoCheck(aName, aElement);
+}
+
+void NameContainer::insertNoCheck(const OUString aName, const Any aElement)
+throw(IllegalArgumentException, WrappedTargetException, RuntimeException,
std::exception)
+{
Type aAnyType = aElement.getValueType();
if( mType != aAnyType )
{
throw IllegalArgumentException();
}
-NameContainerNameMap::iterator aIt = mHashMap.find( aName );
-if( aIt != mHashMap.end() )
-{
-throw ElementExistException();
-}
sal_Int32 nCount = mNames.getLength();
mNames.realloc( nCount + 1 );
@@ -236,6 +240,13 @@ void NameContainer::insertByName( const OUString aName,
const Any aElement )
}
}
+// Methods XNameContainer
+void NameContainer::insertByName( const OUString aName, const Any aElement )
+throw(IllegalArgumentException, ElementExistException,
WrappedTargetException, RuntimeException, std::exception)
+{
+insertCheck(aName, aElement);
+}
+
