CWS-TOOLING: integrate CWS mba31issues01

2009-01-28 12:14:00 +0100 mba  r267052 : #i97267#: wrong license file
2009-01-28 11:52:05 +0100 mba  r267048 : #i97267#: add dependency to readlicense_oo as some dicts use the OOo license files
2009-01-26 15:47:05 +0100 mba  r266934 : correct mistake
2009-01-26 15:42:20 +0100 mba  r266933 : #i97403#: new english dictionaries
2009-01-26 15:40:20 +0100 mba  r266931 : #i97403#: new english dictionaries
2009-01-26 15:37:32 +0100 mba  r266930 : #i92532#: new dictionaries and hyphenation
2009-01-26 15:36:10 +0100 mba  r266929 : #i97403#: new canadian dictionaries; remove bogus dependencies
2009-01-26 15:34:38 +0100 mba  r266928 : #i97403#: new canadian dictionaries
2009-01-26 09:58:18 +0100 mba  r266907 : fixed warning
2009-01-26 09:53:09 +0100 mba  r266906 : fixed warning
2009-01-25 20:22:32 +0100 mba  r266892 : #i87495#: new property
2009-01-25 18:29:54 +0100 mba  r266891 : #i96422#: new serbian dictionary
2009-01-25 00:37:28 +0100 mba  r266886 : added include
2009-01-24 18:13:17 +0100 mba  r266884 : CWS-TOOLING: rebase CWS mba31issues01 to trunk@266428 (milestone: DEV300:m39)
2009-01-24 11:34:07 +0100 mba  r266869 : #i69705#: make nPageCnt a member
2009-01-24 11:30:44 +0100 mba  r266868 : #i97490#: harmonize treatment of different protocols in hyperlinks
2009-01-24 11:16:07 +0100 mba  r266867 : #i96422#: serbian dictionary
2009-01-21 17:29:33 +0100 mba  r266693 : #i94743#: wrong return value after importing meta data
2009-01-16 18:49:21 +0100 mba  r266451 : #i87495#: remove last change
2009-01-16 18:49:04 +0100 mba  r266450 : #i87495#: remove last change
2009-01-16 18:47:43 +0100 mba  r266448 : #i87495#: support for setting PaperBin via API
2009-01-16 18:36:10 +0100 mba  r266446 : #i87495#: support for setting PaperBin via API
2009-01-16 18:35:53 +0100 mba  r266445 : #i87495#: support for setting PaperBin via API
2009-01-16 18:34:56 +0100 mba  r266444 : #159083#: set additional printoptions before printing
2009-01-16 17:00:48 +0100 mba  r266437 : #159083#: always create printhelper
2009-01-16 15:39:41 +0100 mba  r266427 : prevent adding of OOo licence file
2009-01-15 14:47:08 +0100 mba  r266374 : #i84010#: check for missing clipboarddoc
2008-12-05 18:11:04 +0100 mba  r264913 : #i92871#: update of swedish dictionary
2008-12-05 18:08:41 +0100 mba  r264912 : #i92871#: update of swedish dictionary
2008-12-03 14:56:16 +0100 mba  r264788 : #i69705#: nPageCnt must be a member variable
2008-12-03 14:55:40 +0100 mba  r264787 : #i69705#: nPageCnt must be a member variable
2008-12-03 12:13:52 +0100 mba  r264765 : #i96422#: serbian dictionaries
2008-12-03 12:13:36 +0100 mba  r264764 : #i96422#: serbian dictionaries
2008-12-03 11:59:10 +0100 mba  r264763 : #i96422#: serbian dictionaries
2008-12-03 11:26:19 +0100 mba  r264757 : #i94562#: australian dictionary
2008-12-03 11:22:39 +0100 mba  r264756 : #i94562#: australian dictionary; #i88025#: canadian spell checking
2008-12-03 11:21:03 +0100 mba  r264755 : #i94562#: australian dictionary
2008-12-03 11:20:00 +0100 mba  r264754 : #i94562#: australian dictionary
2008-12-03 10:56:29 +0100 mba  r264751 : #i75458#: added optional service
2008-12-03 10:39:54 +0100 mba  r264750 : #i96058#: missing parenthesis

5 files changed, 16 insertions, 20 deletions

diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index b634fbe08b..a884943554 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -3254,6 +3254,9 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
     // erst den SelectionType erfragen, dann Action-Klammerung !!!!
     // (sonst wird nicht in eine TabellenSelektion gepastet!!!)
     ASSERT( !rShell.ActionPend(), "Paste darf nie eine Actionklammerung haben" );
+    if ( !pClpDocFac )
+        return sal_False; // the return value of the SwFEShell::Paste also is BOOL!
+
     const int nSelection = rShell.GetSelectionType();
 
     // #111827#
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 1597c977e0..77077c1f41 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -93,7 +93,7 @@ struct SwConversionArgs;
 class Graphic;
 class GraphicFilter;
 class SwPostItMgr;
-    
+
 namespace com{ namespace sun { namespace star {
     namespace view{ class XSelectionSupplier; }
 }}}
@@ -251,6 +251,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 
     String			aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
 
+    USHORT          nPageCnt;
+
     // Aktueller Drawmode
     USHORT			nDrawSfxId;
     String          sDrawCustom; //some drawing types are marked with strings!
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 5b56af43e6..fd4ce212aa 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -832,6 +832,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     pFormatClipboard(new SwFormatClipboard()),
     mpPostItMgr(0),
     nSelectionType( INT_MAX ),
+    nPageCnt(0),
     nDrawSfxId( USHRT_MAX ),
     nFormSfxId( USHRT_MAX ),
     nLastPasteDestination( 0xFFFF ),
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index e8175e90f3..7d3c85bb2b 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -165,10 +165,6 @@
 #include <svx/ofaitem.hxx>
 #include <unomid.h>
 
-
-//Damit die Seitenanzeige in der Statusleiste nicht unnoetig erfolgt.
-static String sLstPg;
-static USHORT nPageCnt = 0;
 const char __FAR_DATA sStatusDelim[] = " : ";
 const char __FAR_DATA sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei
 
@@ -1190,15 +1186,10 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
 void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr)
 {
     String sTemp(GetPageStr( nPhyNum, nVirtNum, rPgStr ));
-    if ( sLstPg != sTemp )
-    {
-        sLstPg = sTemp;
-        const SfxStringItem aTmp( FN_STAT_PAGE,
-                                 sLstPg);
-        SfxBindings &rBnd = GetViewFrame()->GetBindings();
-        rBnd.SetState( aTmp );
-        rBnd.Update( FN_STAT_PAGE );
-    }
+    const SfxStringItem aTmp( FN_STAT_PAGE, sTemp );
+    SfxBindings &rBnd = GetViewFrame()->GetBindings();
+    rBnd.SetState( aTmp );
+    rBnd.Update( FN_STAT_PAGE );
 }
 
 /*--------------------------------------------------------------------
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 769ac9e39b..3c6d793843 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -319,7 +319,7 @@ void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar )
     SwEditWin::ClearTip();
 
     if ( bOuterResize && !bInOuterResizePixel && !bInInnerResizePixel)
-            OuterResizePixel( Point(), 
+            OuterResizePixel( Point(),
                 GetViewFrame()->GetWindow().GetOutputSizePixel() );
 }
 
@@ -739,8 +739,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
 //				S F X_BINDINGS().Update(FN_STAT_PAGE);
 
             //QuickHelp:
-            USHORT nPageCnt = pWrtShell->GetPageCnt();
-            if( nPageCnt > 1 && Help::IsQuickHelpEnabled() )
+            if( pWrtShell->GetPageCnt() > 1 && Help::IsQuickHelpEnabled() )
             {
                 if( !nPgNum || nPgNum != nPhNum )
                 {
@@ -814,7 +813,7 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
  --------------------------------------------------------------------*/
 
 void SwView::CalcVisArea( const Size &rOutPixel )
-{	
+{
     Point aTopLeft;
     Rectangle aRect( aTopLeft, rOutPixel );
     aTopLeft = GetEditWin().PixelToLogic( aTopLeft );