diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:48:05 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:48:05 +0200 |
| commit | fdb19d3c0480a572803fc59808b9bf40e8758c7d (patch) | |
| tree | b4b37f5e9e3cb58ee08c824fedcdb1da2b8e7350 /starmath | |
| parent | Remove some extra #incude <tools/pstm.hxx> (diff) | |
| parent | Post-merge fix (diff) | |
| download | core-fdb19d3c0480a572803fc59808b9bf40e8758c7d.tar.gz core-fdb19d3c0480a572803fc59808b9bf40e8758c7d.zip | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
starmath/qa/cppunit/makefile.mk
sw/source/core/layout/fly.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/ui/inc/view.hxx
sw/source/ui/shells/grfsh.cxx
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/CppunitTest_starmath_qa_cppunit.mk | 2 | ||||
| -rw-r--r-- | starmath/source/accessibility.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 2d03bbb01a31..0f4606a2064e 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -97,10 +97,10 @@ $(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\ )) $(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\ + component/vcl/vcl \ configmgr \ i18npool \ mcnttype \ - vcl \ )) ifeq ($(strip $(OS)),WNT) diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 590d3fa5eb68..426d0a61c294 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -462,6 +462,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getCaretPosition() sal_Bool SAL_CALL SmGraphicAccessible::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { + SolarMutexGuard aGuard; xub_StrLen nIdx = (xub_StrLen) nIndex; String aTxt( GetAccessibleText_Impl() ); if (!(nIdx < aTxt.Len())) |