Merge remote branch 'origin/libreoffice-3-3'

Conflicts:
sw/source/core/crsr/bookmrk.cxx
sw/source/core/doc/doc.cxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/ui/dbui/mmoutputpage.cxx

6 files changed, 6 insertions, 12 deletions

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index d37643a9f08d..8518c1972182 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -333,9 +333,8 @@ namespace sw { namespace mark
     }
     void CheckboxFieldmark::SetChecked(bool checked)
     {
-        bool bOld( IsChecked() );
         (*GetParameters())[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_RESULT))] = makeAny(checked);
-        if ( bOld != checked )
+        if ( IsChecked() != checked )
         {
             // mark document as modified
             SwDoc *const pDoc( GetMarkPos().GetDoc() );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 8089cc79d21c..324282558507 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1330,11 +1330,8 @@ void SwDoc::CalculatePagesForPrinting(
 
     // get PageRange value to use
     OUString aPageRange;
-    if (bIsPDFExport)
-    {
-        aPageRange = rOptions.getStringValue( "PageRange", OUString() );
-    }
-    else
+    // #i116085# - adjusting fix for i113919
+    if ( !bIsPDFExport )
     {
         // PageContent :
         // 0 -> print all pages (default if aPageRange is empty)
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index addb3ed1c5b7..1663d5c2a5b3 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -602,9 +602,10 @@ const SfxPoolItem* SwWW8AttrIter::HasTextItem( USHORT nWhich ) const
 {
     const SfxPoolItem* pRet = 0;
     const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
-    xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top();
-    if (pTxtAttrs)
+
+    if (pTxtAttrs && m_rExport.m_aCurrentCharPropStarts.size())
     {
+        xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top();
         for (USHORT i = 0; i < pTxtAttrs->Count(); ++i)
         {
             const SwTxtAttr* pHt = (*pTxtAttrs)[i];
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 4e90101c0625..cc8b013959c5 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -448,7 +448,6 @@
       <menu:menuitem menu:id=".uno:ExtendedHelp"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 4e90101c0625..cc8b013959c5 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -448,7 +448,6 @@
       <menu:menuitem menu:id=".uno:ExtendedHelp"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 14e758ef99e0..32df4479b188 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -449,7 +449,6 @@
       <menu:menuitem menu:id=".uno:ExtendedHelp"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>