CWS-TOOLING: integrate CWS sw31bf02

2009-01-26 08:39:59 +0100 fme  r266900 : #i93190# placeholder field should be checked in IsEqualsFlags as well
2009-01-21 17:32:32 +0100 ama  r266695 : CWS-TOOLING: rebase CWS sw31bf02 to trunk@266428 (milestone: DEV300:m39)
2009-01-19 09:26:02 +0100 ama  r266475 : Fix #i96109#: Bracket mismatch
2009-01-19 09:08:47 +0100 ama  r266473 : Fix #i96391#: Wrong default parameter
2009-01-19 09:07:13 +0100 ama  r266472 : Fix #i96112#: Bracket mismatch
2009-01-19 08:51:42 +0100 ama  r266471 : Fix #i96113#: Bracket mismatch
2009-01-16 15:07:01 +0100 ama  r266421 : Fix #i93105#: export 0x14
2009-01-16 09:07:02 +0100 ama  r266400 : Fix #i96111#: Wrong condition
2009-01-16 08:49:47 +0100 ama  r266399 : Fix #i99110#: Wrong condition
2009-01-12 15:54:46 +0100 ama  r266164 : Fix #i17949#: Ctrl+A if document starts with a section
2009-01-09 15:39:44 +0100 ama  r266091 : Fix #i93144#: Crash during update of TOC
2009-01-09 14:40:20 +0100 ama  r266086 : Fix #i90072#: Shorten undo strings
2008-12-10 16:34:57 +0100 fme  r265203 : #i73332# Crash with section endnotes
2008-12-10 15:04:29 +0100 fme  r265194 : #i93190# Omit painting of placeholder fields during pdf export
2008-12-09 16:46:54 +0100 fme  r265115 : #i96167# haggi - reset view options before disposing view
2008-12-09 16:17:13 +0100 fme  r265114 : #i96167# Added missing word coun invalidation on splitting node in second half
2008-12-09 15:49:19 +0100 fme  r265108 : #i91740# Write actual text only for hyphen portions
2008-12-09 14:52:13 +0100 fme  r265090 : #91483# Disable some Insert menu entries in case cursor is located in hidden text

1 files changed, 12 insertions, 2 deletions

diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 43ee928fd08e..9479350620b3 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2463,6 +2463,7 @@ Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName
 class SwViewOptionAdjust_Impl
 {
     bool m_bSwitchOff_IsFldName;
+    bool m_bSwitchOff_PlaceHolderView;
     bool m_bSwitchOff_HiddenChar;
     bool m_bSwitchOff_HiddenParagraphs;
     bool m_bSwitchOff_IsShowHiddenField;
@@ -2483,6 +2484,8 @@ SwViewOptionAdjust_Impl::SwViewOptionAdjust_Impl(SwWrtShell& rSh) :
     const SwViewOption* pCurrentViewOptions = m_rShell.GetViewOptions();
     m_bSwitchOff_IsFldName = pCurrentViewOptions->IsFldName() && m_rShell.IsAnyFieldInDoc();
     bool bApplyViewOptions = m_bSwitchOff_IsFldName;
+    //switch off painting of placeholder fields
+    m_bSwitchOff_PlaceHolderView = pCurrentViewOptions->IsShowPlaceHolderFields();
     //switch off display of hidden characters if on and hidden characters are in use
     m_bSwitchOff_HiddenChar = pCurrentViewOptions->IsShowHiddenChar() && m_rShell.GetDoc()->ContainsHiddenChars();
     //switch off display of hidden paragraphs if on and hidden paragraphs are in use
@@ -2501,7 +2504,7 @@ SwViewOptionAdjust_Impl::SwViewOptionAdjust_Impl(SwWrtShell& rSh) :
             m_bSwitchOff_IsShowHiddenField = false;
     }
 
-
+    bApplyViewOptions |= m_bSwitchOff_PlaceHolderView;
     bApplyViewOptions |= m_bSwitchOff_HiddenChar;
     bApplyViewOptions |= m_bSwitchOff_HiddenParagraphs;
     bApplyViewOptions |= m_bSwitchOff_IsShowHiddenField;
@@ -2510,6 +2513,8 @@ SwViewOptionAdjust_Impl::SwViewOptionAdjust_Impl(SwWrtShell& rSh) :
         m_pViewOption = new SwViewOption(*m_rShell.GetViewOptions());
         if(m_bSwitchOff_IsFldName)
             m_pViewOption->SetFldName(FALSE);
+        if(m_bSwitchOff_PlaceHolderView)
+            m_pViewOption->SetShowPlaceHolderFields(FALSE);
         if(m_bSwitchOff_HiddenChar)
             m_pViewOption->SetShowHiddenChar(FALSE);
         if(m_bSwitchOff_HiddenParagraphs)
@@ -2528,6 +2533,8 @@ SwViewOptionAdjust_Impl::~SwViewOptionAdjust_Impl()
     {
         if(m_bSwitchOff_IsFldName)
             m_pViewOption->SetFldName(TRUE);
+        if(m_bSwitchOff_PlaceHolderView)
+            m_pViewOption->SetShowPlaceHolderFields(TRUE);
         if(m_bSwitchOff_HiddenChar)
             m_pViewOption->SetShowHiddenChar(TRUE);
         if(m_bSwitchOff_HiddenParagraphs)
@@ -2817,12 +2824,15 @@ void SAL_CALL SwXTextDocument::render(
         // <--
 
         pVwSh->SetPDFExportOption( sal_False );
+        // #i96167# haggai: delete pViewOptionsAdjust here because it makes use
+        // of the shell, which might get destroyed in lcl_DisposeView!
+        delete pViewOptionAdjust;
+
         if( bLastPage && m_pHiddenViewFrame)
         {
             lcl_DisposeView( m_pHiddenViewFrame, pDocShell );
             m_pHiddenViewFrame = 0;
         }
-        delete pViewOptionAdjust;
     }
 }
 /* -----------------------------03.10.04 -------------------------------------