[Libreoffice-commits] core.git: 2 commits - connectivity/source vcl/source

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/ResultSet.cxx |    3 ---
 vcl/source/edit/texteng.cxx                    |    5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit f7e2f18e897198c5ee79d9825ac3b3ecbd2bd398
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat May 17 19:40:02 2014 +0200

    avoid segfault when nBrekPos is past the end
    
    Change-Id: Ieedc24c0443ba10d8277cd6327b3b735203e5d45

diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 2223ff0..b114ade 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1708,8 +1708,9 @@ void TextEngine::ImpBreakLine( sal_uLong nPara, TextLine* pLine, TETextPortion*,
     pLine->SetEnd( nBreakPos );
     sal_uInt16 nEndPortion = SplitTextPortion( nPara, nBreakPos );
 
-    bool bBlankSeparator = ( ( nBreakPos >= pLine->GetStart() ) &&
-                             ( pNode->GetText()[ nBreakPos ] == ' ' ) );
+    bool bBlankSeparator = ( nBreakPos >= pLine->GetStart() &&
+                             nBreakPos < pNode->GetText().getLength() &&
+                             pNode->GetText()[ nBreakPos ] == ' ' );
     if ( bBlankSeparator )
     {
         // generally suppress blanks at the end of line
commit fcf4b4c3ebc46de974d57bdf6211ccb084b0835d
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat May 17 19:35:34 2014 +0200

    remove wrongly added IsBookmarkable property
    
    Change-Id: I7bde1200dbe9da76e062f2783cc223a07084c6fd

diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 18f9a85..b247671 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -884,9 +884,6 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s
     pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
         PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0);
 
-    pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),
-        PROPERTY_ID_ISBOOKMARKABLE, ::getBooleanCppuType(), PropertyAttribute::READONLY);
-
     pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
         PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY);