Integrate OOO330_m2 into DEV300 (merge)

6 files changed, 27 insertions, 13 deletions

diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 620fe0b00b63..39eb365b549c 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -921,7 +921,6 @@
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
 #include "vcl/imagebtn.hxx"
-#include "vcl/imgcons.hxx"
 #include "vcl/inputctx.hxx"
 #include "vcl/jobset.hxx"
 #include "vcl/keycod.hxx"
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index dca350cab72a..5431de73cd6a 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -29,6 +29,7 @@
 #include "precompiled_sw.hxx"
 
 
+#include <tools/urlobj.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <unotools/transliterationwrapper.hxx>
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index c7527b372554..0ae80fb5306f 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -335,8 +335,14 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
     // bei dem LineLayout ist allerdings alles anders...
     if( pPor == pCurr )
     {
-        if( pCurr->GetPortion() )
+        if ( pCurr->GetPortion() )
+        {
             pPor = pCurr->GetPortion();
+        }
+
+        // --> OD 2010-07-07 #i112181#
+        rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() );
+        // <--
     }
     else
     {
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index bb1567d978f6..3067de67ce97 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -32,7 +32,6 @@
 #include <hintids.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/imgcons.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/htmlkywd.hxx>
@@ -68,6 +67,7 @@
 #include <com/sun/star/awt/XTextLayoutConstrains.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/XImageConsumer.hpp>
+#include <com/sun/star/awt/ImageStatus.hpp>
 #include <com/sun/star/form/XImageProducerSupplier.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <doc.hxx>
@@ -599,7 +599,7 @@ void SwHTMLImageWatcher::complete( sal_Int32 Status,
         const uno::Reference< awt::XImageProducer >& )
     throw( uno::RuntimeException )
 {
-    if( IMAGEERROR == Status || IMAGEABORTED == Status )
+    if( awt::ImageStatus::IMAGESTATUS_ERROR == Status || awt::ImageStatus::IMAGESTATUS_ABORTED == Status )
     {
         // uns selbst abmelden und loeschen
         clear();
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index e2e59e17831e..7b5741316cbb 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2261,7 +2261,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
 
 
                 BOOL bIsAutoCorrectChar =  SvxAutoCorrect::IsAutoCorrectChar( aCh );
-                BOOL bRunNext = pACorr->HasRunNext();
+                BOOL bRunNext = pACorr && pACorr->HasRunNext();
                 if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) &&
                         pACfg->IsAutoFmtByInput() &&
                     (( pACorr->IsAutoCorrFlag( ChgWeightUnderl ) &&
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 934cfc19e22b..0c7d7909ad7a 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -398,7 +398,9 @@ bGrammarResults(false)
 {
     DBG_ASSERT(xSpellAlt.is(), "no spelling alternatives available");
 
-    CreateAutoMnemonics();
+//    CreateAutoMnemonics();
+    SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+
     nCheckedLanguage = LANGUAGE_NONE;
     if (xSpellAlt.is())
     {
@@ -471,7 +473,8 @@ bGrammarResults(false)
     }
 
     pMenu = GetPopupMenu(MN_ADD_TO_DIC);
-    pMenu->CreateAutoMnemonics();
+//    pMenu->CreateAutoMnemonics();
+    pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);     //! necessary to retrieve the correct dictionary name in 'Execute' below
     bEnable = FALSE;    // enable MN_ADD_TO_DIC?
     uno::Reference< linguistic2::XDictionaryList >    xDicList( SvxGetDictionaryList() );
     if (xDicList.is())
@@ -572,7 +575,6 @@ bGrammarResults(false)
     //////////////////////////////////////////////////////////////////////////////////
 
     RemoveDisabledEntries( TRUE, TRUE );
-    SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
 }
 
 /*--------------------------------------------------------------------------
@@ -599,7 +601,8 @@ aInfo16( SW_RES(IMG_INFO_16) )
     InsertItem( MN_SHORT_COMMENT, aMessageText, MIB_NOSELECT, nPos++ );
     SetItemImage( MN_SHORT_COMMENT, aInfo16 );
 
-    CreateAutoMnemonics();
+//    CreateAutoMnemonics();
+    SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
 
     InsertSeparator( nPos++ );
     sal_Int32 nStringCount = aSuggestions.getLength();
@@ -705,7 +708,6 @@ aInfo16( SW_RES(IMG_INFO_16) )
     //////////////////////////////////////////////////////////////////////////////////
 
     RemoveDisabledEntries( TRUE, TRUE );
-    SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
 }
 
 /*--------------------------------------------------------------------------
@@ -821,12 +823,18 @@ void SwSpellPopup::Execute( USHORT nId )
     else if (MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END)
     {
             OUString aWord( xSpellAlt->getWord() );
-            USHORT nDicIdx = nId - MN_DICTIONARIES_START;
             DBG_ASSERT( nDicIdx < aDics.getLength(), "dictionary index out of range" );
 
-            if (nDicIdx < aDics.getLength())
+            PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC);
+            String aDicName ( pMenu->GetItemText(nId) );
+
+            uno::Reference< linguistic2::XDictionary >      xDic;
+            uno::Reference< linguistic2::XDictionaryList >  xDicList( SvxGetDictionaryList() );
+            if (xDicList.is())
+                xDic = xDicList->getDictionaryByName( aDicName );
+
+            if (xDic.is())
             {
-                uno::Reference< linguistic2::XDictionary > xDic = aDics.getConstArray()[nDicIdx];
                 INT16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, FALSE, aEmptyStr, LANGUAGE_NONE );
                 // save modified user-dictionary if it is persistent
                 uno::Reference< frame::XStorable >  xSavDic( xDic, uno::UNO_QUERY );