cws tl79: merge with DEV300_m83

23 files changed, 64 insertions, 97 deletions

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index c3d485142a..651d07cf0a 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -234,7 +234,9 @@ class SwPostItMgr: public SfxListener
             void Delete(String aAuthor);
             void Delete();
 
+#if 0            
             void Hide( SwPostItField* pPostItField );
+#endif
             void Hide( const String& rAuthor );
             void Hide();
             void Show();
@@ -274,7 +276,6 @@ class SwPostItMgr: public SfxListener
             Color			GetColorLight(sal_uInt16 aAuthorIndex);
             Color           GetColorAnchor(sal_uInt16 aAuthorIndex);
 
-            bool				ShowPreview(const SwField* pFld,SwFmtFld*& pFmtFld) const;
 
             void				RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;}
             OutlinerParaObject* IsAnswer() {return mpAnswer;}
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 41decf8024..c1005dc63d 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -146,6 +146,8 @@ class SwSidebarWin : public Window
         void            SetFollow( bool bIsFollow) { mbIsFollow = bIsFollow; };
         virtual bool    CalcFollow() = 0;
 
+#if 0
+#endif
 
         sal_Int32		GetMetaHeight();
         sal_Int32		GetMinimumSizeWithMeta();
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 68950ce9e0..ac2ae3f607 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -165,13 +165,6 @@ public:
     }
 
     /**
-       Returns the first child of this node.
-
-       @return the child
-    */
-    SwNumberTreeNode* GetFirstChild() const;
-
-    /**
        Returns number of this node.
 
        @param bValidate     validate the number?
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 0483a643c6..894d622cad 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -717,7 +717,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
  --------------------------------------------------------------------*/
 
 #define FN_LINE_NUMBERING_DLG   	(FN_EXTRA + 2 )   /* Zeilennumerierung */
-#define FN_THESAURUS_DLG			(FN_EXTRA + 3 )   /* Thesaurus */
 #define FN_HYPHENATE_OPT_DLG		(FN_EXTRA + 5 )   /* Silbentrennung */
 #define FN_ADD_UNKNOWN				(FN_EXTRA + 6 )   /* Woerter lernen */
 #define FN_DICTIONARY_DLG			(FN_EXTRA + 8 )   /* Woerterbuecher */
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index d8683707b7..951f673646 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -27,6 +27,8 @@
 #ifndef _CRSRSH_HXX
 #define _CRSRSH_HXX
 
+#include <com/sun/star/i18n/WordType.hpp>
+
 #include <tools/string.hxx>
 #include <tools/link.hxx>
 #include <tools/rtti.hxx>
@@ -746,11 +748,12 @@ public:
     BOOL GoStartSentence();
     BOOL GoEndSentence();
     BOOL SelectWord( const Point* pPt = 0 );
+    BOOL ExpandToSentenceBorders();
 
     // Position vom akt. Cursor erfragen
-    BOOL IsStartWord()const;
-    BOOL IsEndWord() const;
-    BOOL IsInWord() const;
+    BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const;
+    BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+    BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
     BOOL IsStartSentence() const;
     BOOL IsEndSentence() const;
     BOOL IsSttPara() const;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 4725aa0424..ab413e18fd 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -716,6 +716,7 @@ private:
      bool DeleteAndJoinImpl(SwPaM&, const bool);
      bool DeleteAndJoinWithRedlineImpl(SwPaM&, const bool unused = false);
      bool DeleteRangeImpl(SwPaM&, const bool unused = false);
+     bool DeleteRangeImplImpl(SwPaM &);
      bool ReplaceRangeImpl(SwPaM&, String const&, const bool);
 
 public:
@@ -2130,7 +2131,7 @@ public:
 
     ::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
     ::sw::MetaFieldManager & GetMetaFieldManager();
-    SwDoc* CreateCopy() const;
+    SfxObjectShell* CreateCopy(bool bCallInitNew) const;
 };
 
 
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index b423351723..8e5980e244 100644..100755
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -43,10 +43,8 @@
 #define STR_PRIVATEOLE 	   			(RC_DOCHDL_BEGIN + 10)
 #define STR_DDEFORMAT               (RC_DOCHDL_BEGIN + 11)
 
-#define BMP_SW_TEAM_MUGSHOT			(RC_DOCHDL_BEGIN + 12)
-#define STR_SW_TEAM_NAMES			(RC_DOCHDL_BEGIN + 13)
 
-#define DOCHDL_ACT_END              STR_SW_TEAM_NAMES
+#define DOCHDL_ACT_END              STR_DDEFORMAT
 
 #if DOCHDL_ACT_END > RC_DOCHDL_END
 #error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index e27024585f..b5c4a23922 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -201,6 +201,7 @@ public:
 
     // change text to Upper/Lower/Hiragana/Katagana/...
     void TransliterateText( sal_uInt32 nType );
+    void TransliterateText( const String& rModuleName );
 
     // count words in current selection
     void CountWords( SwDocStat& rStat ) const;
@@ -744,9 +745,14 @@ public:
     bool SpellSentence(::svx::SpellPortions& rToFill, bool bIsGrammarCheck );
     // make SpellIter start with the current sentence when called next time
     void PutSpellingToSentenceStart();
+    // moves the continuation position to the end of the currently checked sentence
+    void MoveContinuationPosToEndOfCheckedSentence();
     //applies a changed sentence
-    void ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions, bool bIsGrammarCheck);
+    void ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions, bool bRecheck);
 
+
+    // check SwSpellIter data to see if the last sentence got grammar checked
+    bool HasLastSentenceGotGrammarChecked() const;
     // Is text conversion active somewhere else?
     BOOL HasConvIter() const;
     // Is hyphenation active somewhere else?
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 88b6712612..90785a008c 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -63,6 +63,11 @@ class SwFrmFmt;
 struct SwSortOptions;
 class SdrMarkList;
 
+namespace svx
+{
+    class ISdrObjectFilter;
+}
+
 
 // return values for GetFrmType() und GetSelFrmType().
 //! values can be combined via logival or
@@ -464,6 +469,7 @@ public:
     BOOL GetObjAttr( SfxItemSet &rSet ) const;
     BOOL SetObjAttr( const SfxItemSet &rSet );
 
+    const SdrObject* GetBestObject( BOOL bNext, USHORT eType = GOTOOBJ_DRAW_ANY, BOOL bFlat = TRUE, const ::svx::ISdrObjectFilter* pFilter = NULL );
     BOOL GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY);
 
     //Setzen vom DragMode (z.B. Rotate), tut nix bei Rahmenselektion.
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index e7bea38aae..500a4f1b80 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -305,12 +305,17 @@ inline void SwFieldType::UpdateFlds() const
 
 class SW_DLLPUBLIC SwField
 {
+private:
+    mutable String      m_Cache; /// #i85766# cached expansion (for clipboard)
     USHORT				nLang;	// Immer ueber SetLanguage aendern!
     BOOL                bIsAutomaticLanguage;
     sal_uInt32			nFormat;
 
     SwFieldType* 		pType;
 
+    virtual String		Expand() const = 0;
+    virtual SwField* 	Copy() const = 0;
+
 protected:
     void				SetFormat(sal_uInt32 nSet) {nFormat = nSet;}
 
@@ -325,12 +330,16 @@ public:
     // neuen Typ setzen (wird fuer das Kopieren zwischen Dokumenten benutzt)
     virtual SwFieldType* ChgTyp( SwFieldType* );
 
-    // Expandierung fuer die Anzeige
-    virtual String		Expand() const = 0;
+    /** expand the field.
+        @param  bInClipboard    field is in clipboard document?
+        @return     the generated text (suitable for display)
+      */
+    String              ExpandField(bool const bInClipboard) const;
 
     // liefert den Namen oder den Inhalt
     virtual	String		GetCntnt(BOOL bName = FALSE) const;
-    virtual SwField* 	Copy() const = 0;
+
+    SwField *           CopyField() const;
 
     // ResId
     USHORT              Which() const
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 6b5544a9ae..4c3918a7e1 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -267,6 +267,7 @@ class SwHTMLTableLayout
 
     DECL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void* );
 
+    static USHORT GetBrowseWidthByVisArea( const SwDoc& rDoc );
 public:
 
     SwHTMLTableLayout( const SwTable *pSwTbl,
@@ -348,7 +349,6 @@ public:
     // oder eine ViewShell vorhanden ist. Sonst wird 0 zurueckgegeben.
     // (Wird vom HTML-Filter benoetigt, da der nicht an das Layout kommt.)
     static USHORT GetBrowseWidth( const SwDoc& rDoc );
-    static USHORT GetBrowseWidthByVisArea( const SwDoc& rDoc );
 
     // Ermitteln der verfuegbaren Breite uber den Tabellen-Frame
     USHORT GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const;
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index f288a8b5ce..c63efbe3dc 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _NDTXT_HXX
-#define _NDTXT_HXX
+#ifndef SW_NDTXT_HXX
+#define SW_NDTXT_HXX
 
 #include <cppuhelper/weakref.hxx>
 
@@ -133,6 +133,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     // pointer to the list, to whose the text node is added to
     SwList* mpList;
     // <--
+    /// #i111677# cached expansion (for clipboard)
+    ::std::auto_ptr< ::rtl::OUString > m_pNumStringCache;
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextContent> m_wXParagraph;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 8495ddd9f3..5f27eabcc4 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -728,7 +728,7 @@
 #include "editeng/eeitem.hxx"
 #include "filter/msfilter/escherex.hxx"
 #include "svx/extrusionbar.hxx"
-#include "svx/extrusioncontrols.hxx"
+#include "svx/extrusioncolorcontrol.hxx"
 #include "svx/fillctrl.hxx"
 #include "svx/flagsdef.hxx"
 #include "editeng/flstitem.hxx"
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 560cdd143a..31df018985 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -78,7 +78,6 @@ namespace SwPostItHelper
     };
 
     SwLayoutStatus getLayoutInfos( std::vector< SwLayoutInfo >&, SwPosition& );
-    SwLayoutStatus getLayoutInfos( std::vector< SwLayoutInfo >&, SwTxtFld* );
     long getLayoutHeight( const SwRootFrm* pRoot );
     void setSidebarChanged( SwRootFrm* pRoot, bool bBrowseMode );
     unsigned long getPageInfo( SwRect& rPageFrm, const SwRootFrm* , const Point& );
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index a21d6cbf59..b9920b70b4 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -26,7 +26,9 @@
  ************************************************************************/
 #ifndef _SWCRSR_HXX
 #define _SWCRSR_HXX
+
 #include <com/sun/star/i18n/WordType.hpp>
+
 #include <pam.hxx>
 #include <tblsel.hxx>
 #include <cshtyp.hxx>
@@ -129,10 +131,10 @@ public:
                 const SfxItemSet* rReplSet = 0 );
 
     // UI versions
-    BOOL IsStartWord() const;
-    BOOL IsEndWord() const;
+    BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+    BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+    BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
     BOOL IsStartEndSentence( bool bEnd ) const;
-    BOOL IsInWord() const;
     BOOL GoStartWord();
     BOOL GoEndWord();
     BOOL GoNextWord();
@@ -162,6 +164,7 @@ public:
     BOOL GoEndSentence(){return GoSentence(END_SENT);}
     BOOL GoPrevSentence(){return GoSentence(PREV_SENT);}
     BOOL GoStartSentence(){return GoSentence(START_SENT);}
+    BOOL ExpandToSentenceBorders();
 
     virtual BOOL LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode,
         BOOL bAllowVisual, BOOL bSkipHidden, BOOL bInsertCrsr );
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index e94ba5c5e8..ee78d93e53 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -31,7 +31,7 @@
 
 class SwDoc;
 
-class SwTableFmt : public SwFrmFmt
+class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt
 {
     friend class SwDoc;
 
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index f9918e2c90..6ba1e25966 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -41,7 +41,8 @@ class SwTxtFld : public SwTxtAttr
     SwTxtNode * m_pTxtNode;
 
 public:
-    SwTxtFld( SwFmtFld& rAttr, xub_StrLen nStart );
+    SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStart,
+            bool const bInClipboard);
     virtual ~SwTxtFld();
 
     void CopyFld( SwTxtFld *pDest ) const;
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index e7fee60630..31051450e9 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -49,7 +49,7 @@ public:
     inline SwNodeIndex *GetStartNode() const { return m_pStartNode; }
     void SetStartNode( const SwNodeIndex *pNode, BOOL bDelNodes = TRUE );
     void SetNumber( const USHORT nNumber, const String* = 0 );
-    void CopyFtn( SwTxtFtn *pDest ) const;
+    void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const;
 
     // get and set TxtNode pointer
     inline const SwTxtNode& GetTxtNode() const;
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 22baea043f..0fe4953bba 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -392,7 +392,6 @@ public:
      */
     virtual SwRewriter GetRewriter() const;
 
-    BOOL CanGrouping( const SwPosition&, sal_Unicode cIns );
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert)
 };
@@ -549,7 +548,6 @@ public:
     ULONG GetEndNode() const		{ return nEndNode; }
     ULONG GetDestSttNode() const 	{ return nDestSttNode; }
     xub_StrLen GetDestSttCntnt() const	{ return nDestSttCntnt; }
-    void AddTblMrgFlyHstry( SwHistory& rHstr );
 
     void SetMoveRedlines( bool b )       { bMoveRedlines = b; }
 
@@ -1107,14 +1105,6 @@ public:
 };
 
 
-class SwUndoDelBookmark : public SwUndoBookmark
-{
-public:
-    SwUndoDelBookmark( const ::sw::mark::IMark& );
-    virtual void Undo( SwUndoIter& );
-    virtual void Redo( SwUndoIter& );
-};
-
 class SwUndoInsBookmark : public SwUndoBookmark
 {
 public:
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 823e81f1ae..1a43f3307a 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -41,7 +41,7 @@ class ViewShell;
 class SwDocShell;
 namespace svtools{ class ColorConfig;}
 
-#define VIEWOPT_1_IDLE 			0x00000001L
+//#define VIEWOPT_1_IDLE             0x00000001L  no longer used, see new member 'bIdle'
 #define VIEWOPT_1_TAB           0x00000002L
 #define VIEWOPT_1_BLANK         0x00000004L
 #define VIEWOPT_1_HARDBLANK     0x00000008L
@@ -164,6 +164,7 @@ protected:
     BOOL            bBookview : 1;      // view mode for page preview
     BOOL            mbViewLayoutBookMode : 1; // book view mode for edit view
     sal_Bool        bShowPlaceHolderFields : 1; //only used in printing!
+    mutable bool    bIdle;
 
     // Maszstab
     USHORT 			nZoom;		   	 	// Angaben in Prozent
@@ -202,9 +203,14 @@ public:
 ----------------------------------------------------------------------------*/
 
     inline BOOL IsIdle() const
-        { return nCoreOptions & VIEWOPT_1_IDLE ? TRUE : FALSE; }
-    inline void SetIdle( BOOL b )
-        { (b != 0) ? (nCoreOptions |= VIEWOPT_1_IDLE ) : ( nCoreOptions &= ~VIEWOPT_1_IDLE); }
+        { return bIdle; }
+
+    // logically this is a const function since it does not modify the viewoptions
+    // but only effects idle formatting. Of course that member is already implement
+    // in the wrong place here... Also currently there are many const modifying casts in the code
+    // just to call this function on otherwise const objects. Thus declaring it as const now.
+    inline void SetIdle( BOOL b ) const
+        { bIdle = b; }
 
     inline BOOL IsTab(BOOL bHard = FALSE) const
                     {   return !bReadonly && (nCoreOptions & VIEWOPT_1_TAB) &&
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 0744eb53ee..c89351b614 100755..100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -395,9 +395,6 @@ public:
     // compatible behaviour of tabs
     void SetTabCompat( bool bNew );
 
-    //#i24363# tab stops relative to indent
-    void SetTabsRelativeToIndent( bool bNew );
-
     // font metric attribute "External Leading" should be considered
     void SetAddExtLeading( bool bNew );
 
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 90165b6025..4b80c8ca42 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -92,8 +92,6 @@ class SwSelPaintRects : public SwRects
     // die Shell
     const SwCrsrShell* pCShell;
 
-    void Paint( const SwRect& rRect );
-
     virtual void Paint( const Rectangle& rRect );
     virtual void FillRects() = 0;
 
diff --git a/sw/inc/warnpassword.hxx b/sw/inc/warnpassword.hxx
deleted file mode 100644
index 2b541a14d6..0000000000
--- a/sw/inc/warnpassword.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SW_WARNPASSWORD_HXX
-#define SW_WARNPASSWORD_HXX
-
-
-
-class SfxMedium; 
-/** Static API helper functions. */
-class SwWarnPassword 
-{
-public:
-    /** Opens a query warning dialog. 
-     @descr Pop up Query on export  with a choice of yes/no if a 
-     an encrypted password is imported.
-     @return true if yes and false if no. default to true.
-   */
-    static bool        WarningOnPassword( SfxMedium& rMedium );
-};
-
-
-#endif