Integrate OOO330_m2 into DEV300 (merge)

32 files changed, 229 insertions, 155 deletions

diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 2884e6179aaa..aca181916b47 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -258,6 +258,7 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
                 (*this) = getAny();
                 break;
             default:
+                (*this) = getAny();
                 OSL_ENSURE(0,"ORowSetValue:operator==(): UNSPUPPORTED TYPE!");
         }
     }
@@ -344,6 +345,19 @@ void ORowSetValue::free()
                 TRACE_FREE( Any )
                 m_aValue.m_pValue = NULL;
                 break;
+            case DataType::BIT:
+            case DataType::TINYINT:
+            case DataType::SMALLINT:
+            case DataType::BOOLEAN:
+                break;
+            default:
+                if ( m_aValue.m_pValue )
+                {
+                    delete (Any*)m_aValue.m_pValue;
+                    TRACE_FREE( Any )
+                    m_aValue.m_pValue = NULL;
+                }
+                break;
 
         }
         m_bNull = sal_True;
@@ -849,7 +863,9 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
             bRet = false;
             break;
         default:
+            bRet = false;
             OSL_ENSURE(0,"ORowSetValue::operator==(): UNSPUPPORTED TYPE!");
+            break;
     }
     return bRet;
 }
@@ -942,6 +958,8 @@ Any ORowSetValue::makeAny() const
                 break;
             default:
                 OSL_ENSURE(0,"ORowSetValue::makeAny(): UNSPUPPORTED TYPE!");
+                rValue = getAny();
+                break;
         }
     }
     return rValue;
@@ -1032,6 +1050,12 @@ Any ORowSetValue::makeAny() const
                     }
                 }
                 break;
+            default:
+                {
+                    Any aValue = getAny();
+                    aValue >>= aRet;
+                    break;
+                }
         }
     }
     return aRet;
@@ -1104,8 +1128,11 @@ sal_Bool ORowSetValue::getBool()    const
                 bRet = m_bSigned ? (m_aValue.m_nInt32 != 0) : (*static_cast<sal_Int64*>(m_aValue.m_pValue) != sal_Int64(0));
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aValue = getAny();
+                    aValue >>= bRet;
+                    break;
+                }
         }
     }
     return bRet;
@@ -1174,8 +1201,11 @@ sal_Int8 ORowSetValue::getInt8()    const
                     nRet = static_cast<sal_Int8>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aValue = getAny();
+                    aValue >>= nRet;
+                    break;
+                }
         }
     }
     return nRet;
@@ -1244,8 +1274,11 @@ sal_Int16 ORowSetValue::getInt16()  const
                     nRet = static_cast<sal_Int16>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aValue = getAny();
+                    aValue >>= nRet;
+                    break;
+                }
         }
     }
     return nRet;
@@ -1314,8 +1347,11 @@ sal_Int32 ORowSetValue::getInt32()  const
                     nRet = static_cast<sal_Int32>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aValue = getAny();
+                    aValue >>= nRet;
+                    break;
+                }
         }
     }
     return nRet;
@@ -1384,8 +1420,11 @@ sal_Int64 ORowSetValue::getLong()   const
                     nRet = *(sal_Int64*)m_aValue.m_pValue;
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aValue = getAny();
+                    aValue >>= nRet;
+                    break;
+                }
         }
     }
     return nRet;
@@ -1458,8 +1497,11 @@ float ORowSetValue::getFloat()  const
                     nRet = float(*(sal_Int64*)m_aValue.m_pValue);
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aValue = getAny();
+                    aValue >>= nRet;
+                    break;
+                }
         }
     }
     return nRet;
@@ -1534,8 +1576,11 @@ double ORowSetValue::getDouble()    const
                     nRet = double(*(sal_Int64*)m_aValue.m_pValue);
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aValue = getAny();
+                    aValue >>= nRet;
+                    break;
+                }
         }
     }
     return nRet;
@@ -1626,6 +1671,11 @@ void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype)
                 TRACE_ALLOC( sal_Int64 )
             }
             break;
+            default:
+                {
+                    m_aValue.m_pValue = new Any(_rVal);
+                    break;
+                }
     }
     m_eTypeKind = _nDatatype;
 }
@@ -1692,7 +1742,11 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
                 aSeq = *static_cast< Sequence<sal_Int8>*>(m_aValue.m_pValue);
                 break;
             default:
-                ;
+                {
+                    Any aValue = getAny();
+                    aValue >>= aSeq;
+                    break;
+                }
         }
     }
     return aSeq;
@@ -1734,8 +1788,11 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
                 }
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aAnyValue = getAny();
+                    aAnyValue >>= aValue;
+                    break;
+                }
         }
     }
     return aValue;
@@ -1776,8 +1833,11 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
                 aValue = *static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue);
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aAnyValue = getAny();
+                    aAnyValue >>= aValue;
+                    break;
+                }
         }
     }
     return aValue;
@@ -1826,8 +1886,11 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
                 aValue = *static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue);
                 break;
             default:
-                OSL_ENSURE(0,"Illegal conversion!");
-                break;
+                {
+                    Any aAnyValue = getAny();
+                    aAnyValue >>= aValue;
+                    break;
+                }
         }
     }
     return aValue;
@@ -2094,7 +2157,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const
         break;
     default:
         OSL_ENSURE( false, "ORowSetValue::fill: unsupported type!" );
-        bReadData = false;
+        (*this) = _rValueSource.getObject();
         break;
     }
     if ( bReadData && _bNullable && _rValueSource.wasNull() )
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index c71d620d527c..0c5db12c3355 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -692,6 +692,10 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
 
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
+ //   ::osl::MutexGuard aGuard( m_aMutex );
+    //checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ //   if ( getResultSetConcurrency() == ResultSetConcurrency::READ_ONLY )
+ //       throw SQLException();
 }
 // -------------------------------------------------------------------------
 
@@ -977,7 +981,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro
 sal_Int32 OResultSet::getResultSetConcurrency() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    sal_Int32 nValue=0;
+    sal_Int32 nValue=ResultSetConcurrency::READ_ONLY;
     LockTypeEnum eRet;
     if(!SUCCEEDED(m_pRecordSet->get_LockType(&eRet)))
     {
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8544e4affda7..157d1f7b68fa 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2607,7 +2607,7 @@ void ODbaseTable::throwInvalidDbaseFormat()
     // no dbase file
 
     const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
-                STR_SQL_NAME_ERROR,
+                STR_INVALID_DBASE_FILE,
                 "$filename$", getEntry(m_pConnection,m_Name)
              ) );
     ::dbtools::throwGenericSQLException( sError, *this );
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 265084be697f..421225b34935 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1200,7 +1200,9 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
                 break;
         }
 
-        if (m_nRowPos == 0)
+        if ( m_nRowPos < 0 )
+            goto Error;
+        else if (m_nRowPos == 0)
         {
             // COUNT(*) in Ergebnisrow packen
             // (muss die erste und einzige Variable in der Row sein)
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index eff2464ce533..70be592405eb 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -159,7 +159,10 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
             (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
         {
             bNumeric = FALSE;
-            nStartPosFirstLine2 = nStartPosFirstLine;
+            if ( m_cStringDelimiter != '\0' )
+                aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+            else
+                nStartPosFirstLine2 = nStartPosFirstLine;
         }
         else
         {
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 1452df992a74..e7fab6acb6c0 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -234,7 +234,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
     if ( xIn.is() )
     {
         jsize nLen = env->GetArrayLength(buffer);
-        if ( nLen < len )
+        if ( nLen < len || len <= 0 )
         {
             ThrowException( env,
                     "java/io/IOException",
@@ -439,21 +439,17 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst
         if ( xOut.is() )
         {
             jbyte *buf = env->GetByteArrayElements(buffer,NULL);
-#ifdef HSQLDB_DBG
-            OSL_ENSURE(len <= env->GetArrayLength(buffer),"Length is greater than the buffer!");
-#endif
-
             if (JNI_FALSE != env->ExceptionCheck())
             {
                 env->ExceptionClear();
                 OSL_ENSURE(0,"ExceptionClear");
             }
             OSL_ENSURE(buf,"buf is NULL");
-            if ( buf )
+            if ( buf && len > 0 && len <= env->GetArrayLength(buffer))
             {
                 Sequence< ::sal_Int8 > aData(buf + off,len);
-                xOut->writeBytes(aData);
                 env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT);
+                xOut->writeBytes(aData);
 #ifdef HSQLDB_DBG
                 if ( logger )
                     logger->write( aData.getConstArray(), len );
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index afb4d0da2640..57ed88b1dda8 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -61,14 +61,15 @@ namespace connectivity
         {
             try
             {
-               m_xStream.clear();
-            m_xSeek.clear();
+                m_xStream.clear();
+                m_xSeek.clear();
                 if ( m_xInputStream.is() )
                 {
                     m_xInputStream->closeInput();
-                m_xInputStream.clear();
+                    m_xInputStream.clear();
                 }
-                if ( m_xOutputStream.is() )
+                // this is done implicity by the closing of the input stream
+                else if ( m_xOutputStream.is() )
                 {
                     m_xOutputStream->closeOutput();
                     try
@@ -83,11 +84,12 @@ namespace connectivity
                         OSL_UNUSED( e );
                         OSL_ENSURE(0,"Could not dispose OutputStream");
                     }
-                m_xOutputStream.clear();
+                    m_xOutputStream.clear();
                 }
             }
-            catch(Exception& )
+            catch(Exception& ex)
             {
+                OSL_UNUSED( ex );
                 OSL_ENSURE(0,"Exception catched!");
             }
         }
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 2df75283a14b..fd52f3092c0e 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -49,20 +49,3 @@ jclass java_lang_Boolean::getMyClass() const
 {
     return st_getMyClass();
 }
-
-java_lang_Boolean::java_lang_Boolean( sal_Bool _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
-    SDBThreadAttach t;
-    // Java-Call fuer den Konstruktor absetzen
-    // temporaere Variable initialisieren
-    static const char * cSignature = "(Z)V";
-    jobject tempObj;
-    static jmethodID mID(NULL);
-    obtainMethodId(t.pEnv, "<init>",cSignature, mID);
-    tempObj = t.pEnv->NewObject( getMyClass(), mID, _par0 );
-    saveRef( t.pEnv, tempObj );
-    t.pEnv->DeleteLocalRef( tempObj );
-    // und aufraeumen
-}
-
-
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 4866781d23dd..4f5670ace8aa 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -166,14 +166,6 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj )
 }
 
 
-java_lang_Class * java_lang_Object::getClass()
-{
-    SDBThreadAttach t;
-    static jmethodID mID(NULL);
-    jobject out = callObjectMethod(t.pEnv,"getClass","()Ljava/lang/Class;", mID);
-    return out ? new java_lang_Class( t.pEnv, out ) : NULL;
-}
-
 ::rtl::OUString java_lang_Object::toString() const
 {
     static jmethodID mID(NULL);
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index e6102fc3a471..f32b0cce4325 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -52,26 +52,6 @@ jclass java_lang_String::st_getMyClass()
 }
 
 //--------------------------------------------------------------------------
-java_lang_String::java_lang_String( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
-    SDBThreadAttach t;
-    if( !t.pEnv )
-        return;
-    jvalue args[1];
-    // Parameter konvertieren
-    args[0].l = convertwchar_tToJavaString(t.pEnv,_par0);
-    // Java-Call fuer den Konstruktor absetzen
-    // temporaere Variable initialisieren
-    static const char * cSignature = "(Ljava/lang/String;)V";
-    jobject tempObj;
-    static jmethodID mID(NULL);
-    obtainMethodId(t.pEnv, "<init>",cSignature, mID);
-    tempObj = t.pEnv->NewObjectA( getMyClass(), mID, args );
-    saveRef( t.pEnv, tempObj );
-    t.pEnv->DeleteLocalRef( tempObj );
-    t.pEnv->DeleteLocalRef((jstring)args[0].l);
-}
-//--------------------------------------------------------------------------
 java_lang_String::operator ::rtl::OUString()
 {
     SDBThreadAttach t;
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index f1f8081d9780..35655f8c1934 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -44,7 +44,6 @@ namespace connectivity
         // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
         java_lang_Boolean( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
 
-        java_lang_Boolean( sal_Bool _par0 );
         static jclass st_getMyClass();
     };
 }
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index f0bacc2ee840..c00c5e67e06d 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -118,8 +118,6 @@ namespace connectivity
         void clearObject(JNIEnv& rEnv);
         void clearObject();
 
-        java_lang_Class *   getClass();
-
         virtual ::rtl::OUString toString() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xFactory; }
 
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 64584dab5e76..3e4bfd6c1399 100644
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
@@ -42,7 +42,6 @@ namespace connectivity
         // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
         java_lang_String( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
 
-        java_lang_String( const ::rtl::OUString& _par0 );
         operator ::rtl::OUString();
 
         static jclass st_getMyClass();
diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk
index 63f123fcc608..11d736448d44 100644
--- a/desktop/test/deployment/boxt/makefile.mk
+++ b/desktop/test/deployment/boxt/makefile.mk
@@ -33,11 +33,9 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 .INCLUDE: rtlbootstrap.mk
+.INCLUDE: versionlist.mk
 
-#TODO: The underlying OOo base version needed here is currently only available
-# as instsetoo_native/util/openoffice.lst OOOBASEVERSION, so hard-coding it here
-# for now (see issue 110653):
-my_version = 3.3
+my_version = $(OOOBASEVERSIONMAJOR).$(OOOBASEVERSIONMINOR)
 
 DLLPRE =
 
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
index f149ec6474e7..8bc39767f04a 100644
--- a/desktop/util/ooverinfo2.rc
+++ b/desktop/util/ooverinfo2.rc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,26 +25,26 @@
  *
  *************************************************************************/
 
-#define VERSION			3
-#define SUBVERSION		2
-//#define VERVARIANT		0
+#define VERSION         3
+#define SUBVERSION      3
+//#define VERVARIANT    0
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT		0
-//#define VER_BETA		6
-#define VER_FINAL		0
+//#define VER_CONCEPT   0
+//#define VER_BETA      6
+#define VER_FINAL       0
 
-#define VER_DAY			1
-#define VER_MONTH		9
-#define VER_YEAR		2009
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
 
 // -----------------------------------------------------------------------
 
 // -----------------------------------------------------------------------
-// 				language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 642b5e0d9f17..664512df414e 100755
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1044,7 +1044,8 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
     {
         PopupMenu aPopupMenu( EditResId( RID_MENU_SPELL ) );
         PopupMenu *pAutoMenu = aPopupMenu.GetPopupMenu( MN_AUTOCORR );
-        PopupMenu *pInsertMenu = aPopupMenu.GetPopupMenu( MN_INSERT );
+        PopupMenu *pInsertMenu = aPopupMenu.GetPopupMenu( MN_INSERT );  // add word to user-dictionaries
+        pInsertMenu->SetMenuFlags( MENU_FLAG_NOAUTOMNEMONICS );         //! necessary to retrieve the correct dictionary names later
 
         EditPaM aPaM2( aPaM );
         aPaM2.GetIndex()++;
@@ -1261,7 +1262,12 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
         }
         else if ( nId >= MN_DICTSTART )
         {
-            Reference< XDictionary >  xDic( pDic[nId - MN_DICTSTART], UNO_QUERY );
+            String aDicName ( pInsertMenu->GetItemText(nId) );
+
+            uno::Reference< linguistic2::XDictionary >      xDic;
+            if (xDicList.is())
+                xDic = xDicList->getDictionaryByName( aDicName );
+
             if (xDic.is())
                 xDic->add( aSelected, sal_False, String() );
             // save modified user-dictionary if it is persistent
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 778942730e71..148ca08816ae 100755
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4209,18 +4209,8 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
                     DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!");
                 }
 
-#if 0
+                // old code restored see #i112788 (which leaves #i74188 unfixed again)
                 long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos );
-#else
-                // #i74188# (positioning the cursor after deleting components of combined indic characters)
-                SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() );
-                SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont );
-                aTmpFont.SetPhysFont( GetRefDevice() );
-                ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
-                String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1);
-                long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
-                    sSegment, 0, nPos+1, NULL ).Width();
-#endif
 
                 if ( !pPortion->IsRightToLeft() )
                 {
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index e95ce560023b..ae92fd1a01b8 100644..100755
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -1197,7 +1197,10 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
 
         // add new dictionary to list
         if (xTmp.is())
+        {
             xTmpDicList->addDictionary( xTmp );
+            xTmp->setActive( sal_True );
+        }
         xDic = uno::Reference< XDictionary > ( xTmp, UNO_QUERY );
     }
 #if OSL_DEBUG_LEVEL > 1
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 70448e5bbf89..479827565775 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2133,9 +2133,6 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Sentence case</value>
                 </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
             </node>
             <node oor:name=".uno:ChangeCaseToLower" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
@@ -2157,17 +2154,11 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Capitalize Every Word</value>
                 </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
             </node>
             <node oor:name=".uno:ChangeCaseToToggleCase" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~tOGGLE cASE</value>
                 </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
             </node>
             <node oor:name=".uno:ChangeCaseToHalfWidth" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 30e07779457b..0efd9712f11d 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -57,7 +57,7 @@ $(MISC)$/readme_text.xsl : virtual
 
 $(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
     @@-$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $@ \
+    $(XSLTPROC) --nonet --novalid -o $@ \
     --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
     --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
     ..$/readme.xsl	$(MERGEDXRM)
@@ -67,7 +67,7 @@ $(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
 
 $(MISC)$/$(GUI)$/$(eq,$(GUI),OS2 readme README)_%.html : 'virtual'
     @@-$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $@ \
+    $(XSLTPROC) --nonet --novalid -o $@ \
     --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
     --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
     ..$/readme.xsl	$(MERGEDXRM)
@@ -75,7 +75,7 @@ $(MISC)$/$(GUI)$/$(eq,$(GUI),OS2 readme README)_%.html : 'virtual'
 # no percent-rule to avoid ambiguous inference chains for README_<lang>.html 
 $(SYSTEXTDOCS) : $(MISC)$/readme_text.xsl
     @@-$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $@ \
+    $(XSLTPROC) --nonet --novalid -o $@ \
     --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
     --stringparam cp1 $(CPUNAME)	--stringparam type text	--stringparam lang1 $(@:b:s/readme_//:s/README_//) \
     $<	$(MERGEDXRM)
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index aa6c6cfb966a..0fc0778c71d9 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -766,6 +766,31 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
         return xDialog;
     }
 
+    Reference < XDialog > DialogProviderImpl::createDialogWithArguments(
+        const ::rtl::OUString& URL, const Sequence< NamedValue >& Arguments )
+            throw (IllegalArgumentException, RuntimeException)
+    {
+        ::comphelper::NamedValueCollection aArguments( Arguments );
+
+        Reference< XWindowPeer > xParentPeer;
+        if ( aArguments.has( "ParentWindow" ) )
+        {
+            const Any aParentWindow( aArguments.get( "ParentWindow" ) );
+            if ( !( aParentWindow >>= xParentPeer ) )
+            {
+                const Reference< XControl > xParentControl( aParentWindow, UNO_QUERY );
+                if ( xParentControl.is() )
+                    xParentPeer = xParentControl->getPeer();
+            }
+        }
+
+        const Reference< XInterface > xHandler( aArguments.get( "EventHandler" ), UNO_QUERY );
+
+        Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParentPeer, true );
+        Reference< XDialog > xDialog( xControl, UNO_QUERY );
+        return xDialog;
+    }
+
     Reference< XWindow > DialogProviderImpl::createContainerWindow(
         const ::rtl::OUString& URL, const ::rtl::OUString& WindowType,
         const Reference< XWindowPeer >& xParent, const Reference< XInterface >& xHandler )
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index f55239ff13e8..bc15831d2ff1 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -138,6 +138,11 @@ namespace dlgprov
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler )
             throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
+        virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithArguments(
+            const ::rtl::OUString& URL,
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
+            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createContainerWindow(
             const ::rtl::OUString& URL, const ::rtl::OUString& WindowType,
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 55c204f87dbf..6592a59d1843 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -153,8 +153,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
 
 				if len(textbody):
 					mimeEncoding = re.sub("charset=.*", "charset=UTF-8", flavor.MimeType)
-			        if mimeEncoding.find('charset=UTF-8') == -1:
-			        	mimeEncoding = mimeEncoding + "; charset=UTF-8"
+					if mimeEncoding.find('charset=UTF-8') == -1:
+						mimeEncoding = mimeEncoding + "; charset=UTF-8"
 					textmsg['Content-Type'] = mimeEncoding
 					textmsg['MIME-Version'] = '1.0'
 					textmsg.set_payload(textbody)
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index b264a5b47861..bc765b95340c 100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -578,6 +578,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
     return 0;
 }
 
+
 void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow )
 {
     PopupMenu *pSVMenu = new PopupMenu( rResId );
@@ -622,6 +623,12 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
         SfxPopupMenuManager aPop( pSVMenu, pFrame->GetBindings() );
         aPop.RemoveDisabledEntries();
         aPop.Execute( rPoint, pWindow );
+
+        // #i112646 avoid crash when context menu is closed.
+        // the (manually inserted) sub-menu needs to be destroyed before
+        // aPop gets destroyed.
+        delete pThesSubMenu;
+        pThesSubMenu = 0;
     }
 
     delete pThesSubMenu;
@@ -631,3 +638,4 @@ Menu* SfxPopupMenuManager::GetSVMenu()
 {
     return (Menu*) GetMenu()->GetSVMenu();
 }
+
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index d99ad8733e03..d43512ac791d 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -280,10 +280,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewI
         aLoadArgs = aArgs.getPropertyValues();
 
         // load the doc into that frame
-        ::rtl::OUString sLoaderURL( rDoc.GetModel()->getURL() );
-        if ( sLoaderURL.getLength() == 0 )
-            sLoaderURL = rDoc.GetFactory().GetFactoryURL();
-
+        ::rtl::OUString sLoaderURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) );
         Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW );
         xLoader->loadComponentFromURL(
             sLoaderURL,
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index 612f2ab927ec..3a31c3d11206 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
@@ -35,6 +35,7 @@
 // predeclarations
 class SdrObject;
 class SfxItemSet;
+class SdrPageProperties;
 
 namespace sdr
 {
@@ -89,6 +90,8 @@ namespace sdr
         // operators
         sal_Bool operator==(const MasterPageDescriptor& rCandidate) const;
         sal_Bool operator!=(const MasterPageDescriptor& rCandidate) const;
+
+        const SdrPageProperties* getCorrectSdrPageProperties() const;
     };
 } // end of namespace sdr
 
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index c601fddef181..784598d7d544 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -448,6 +448,7 @@ private:
 public:
     SdrPageProperties& getSdrPageProperties() { return *mpSdrPageProperties; }
     const SdrPageProperties& getSdrPageProperties() const { return *mpSdrPageProperties; }
+    const SdrPageProperties* getCorrectSdrPageProperties() const;
 
 protected:
     // new MasterPageDescriptorVector
diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index cbe9c4a9c615..6ca5f1c4d172 100644
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
@@ -62,23 +62,7 @@ namespace sdr
         {
             drawinglayer::primitive2d::Primitive2DSequence xRetval;
             drawinglayer::attribute::SdrFillAttribute aFill;
-            const SdrPage* pCorrectPage = &GetMasterPageDescriptor().GetOwnerPage();
-            const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties();
-
-            if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
-            {
-                pCorrectPage = &GetMasterPageDescriptor().GetUsedPage();
-                pCorrectProperties = &pCorrectPage->getSdrPageProperties();
-            }
-
-            if(pCorrectPage->IsMasterPage() && !pCorrectProperties->GetStyleSheet())
-            {
-                // #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets,
-                // else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all
-                // MasterPages should have a StyleSheet excactly for this reason, but historically
-                // e.g. the Notes MasterPage has no StyleSheet set (and there maybe others).
-                pCorrectProperties = 0;
-            }
+            const SdrPageProperties* pCorrectProperties = GetMasterPageDescriptor().getCorrectSdrPageProperties();
 
             if(pCorrectProperties)
             {
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index 67b2de8b693c..eb757a8ee41c 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -113,6 +113,29 @@ namespace sdr
             || &maUsedPage != &rCandidate.maUsedPage
             || maVisibleLayers != rCandidate.maVisibleLayers);
     }
+
+    const SdrPageProperties* MasterPageDescriptor::getCorrectSdrPageProperties() const
+    {
+        const SdrPage* pCorrectPage = &GetOwnerPage();
+        const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties();
+
+        if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
+        {
+            pCorrectPage = &GetUsedPage();
+            pCorrectProperties = &pCorrectPage->getSdrPageProperties();
+        }
+
+        if(pCorrectPage->IsMasterPage() && !pCorrectProperties->GetStyleSheet())
+        {
+            // #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets,
+            // else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all
+            // MasterPages should have a StyleSheet excactly for this reason, but historically
+            // e.g. the Notes MasterPage has no StyleSheet set (and there maybe others).
+            pCorrectProperties = 0;
+        }
+
+        return pCorrectProperties;
+    }
 } // end of namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 8da0b248f38b..592f41543132 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1979,6 +1979,18 @@ void SdrPage::ReplaceCommentByIndex(sal_uInt32 nIndex, const sdr::Comment& rNew)
     }
 }
 
+const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const
+{
+    if(mpMasterPageDescriptor)
+    {
+        return mpMasterPageDescriptor->getCorrectSdrPageProperties();
+    }
+    else
+    {
+        return &getSdrPageProperties();
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // use new redirector instead of pPaintProc
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index b80be1076b7e..c58e86f77fc3 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -634,10 +634,16 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
     {
         if( rSettings.mbExportOnlyBackground )
         {
-            pTempBackgroundShape = new SdrRectObj(Rectangle(Point(0,0), pPage->GetSize()));
-            pTempBackgroundShape->SetMergedItemSet(pPage->getSdrPageProperties().GetItemSet());
-            pTempBackgroundShape->SetMergedItem(XLineStyleItem(XLINE_NONE));
-            aShapes.push_back(pTempBackgroundShape);
+            const SdrPageProperties* pCorrectProperties = pPage->getCorrectSdrPageProperties();
+
+            if(pCorrectProperties)
+            {
+                pTempBackgroundShape = new SdrRectObj(Rectangle(Point(0,0), pPage->GetSize()));
+                pTempBackgroundShape->SetMergedItemSet(pCorrectProperties->GetItemSet());
+                pTempBackgroundShape->SetMergedItem(XLineStyleItem(XLINE_NONE));
+                pTempBackgroundShape->NbcSetStyleSheet(pCorrectProperties->GetStyleSheet(), true);
+                aShapes.push_back(pTempBackgroundShape);
+            }
         }
         else
         {
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 9d7856348516..98255edf68d0 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -708,6 +708,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest
             case '8' :
             case '9' :
             case '.' :
+            case '-' :
             {
                 com::sun::star::drawing::EnhancedCustomShapeParameterPair aPair;
                 if ( GetNextParameter( aPair.First, nIndex, rValue ) &&