[ooo-build-commit] Branch 'ooo/master' - 2 commits - sw/inc sw/sdi sw/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Jul 16 19:51:14 PDT 2009


 sw/inc/cmdid.h                   |    1 -
 sw/sdi/_annotsh.sdi              |    2 +-
 sw/sdi/_basesh.sdi               |    7 +++++++
 sw/sdi/swslots.src               |    4 ++++
 sw/source/core/layout/tabfrm.cxx |    4 +++-
 sw/source/ui/dochdl/swdtflvr.cxx |    9 +++++++++
 sw/source/ui/inc/hidfunc.h       |    1 +
 sw/source/ui/inc/swdtflvr.hxx    |    1 +
 sw/source/ui/shells/basesh.cxx   |   38 ++++++++++++++++++++++++++++++++++++++
 sw/source/ui/uiview/view.cxx     |    1 +
 10 files changed, 65 insertions(+), 3 deletions(-)

New commits:
commit 7ea4d7257935dbe500c922c46bde58af290d6f2c
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Jul 16 16:59:45 2009 +0000

    CWS-TOOLING: integrate CWS mav53_DEV300
    2009-06-29 13:42:56 +0200 hbrinkm  r273471 : #i101593# switched off optimization in table layout, that caused frames to be layouted incorrectly
    2009-06-25 12:29:11 +0200 cd  r273376 : #i101774# Don't rely on initialize call for VistaFilePicker
    2009-06-25 11:48:33 +0200 tl  r273373 : #i101420# Gnome accessibility fix
    2009-06-24 18:16:49 +0200 od  r273361 : #i97309 method <XMLTextParagraphExport::exportListChange(..)>
    	- export text:start-value at correct list item.
    2009-06-23 14:11:44 +0200 b_michaelsen  r273281 : #i103032#: cutting of URL-parameters for usage tracking
    2009-06-22 11:49:12 +0200 b_michaelsen  r273207 : #i102805#: Added usage tracking to SfxToolboxControl
    2009-06-22 11:46:00 +0200 b_michaelsen  r273205 : whitespace fixes
    2009-06-05 14:21:12 +0200 mav  r272683 : #i101741# check the file date only in document file locking context

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index f0f531c..6f6759f 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2146,7 +2146,9 @@ void SwTabFrm::MakeAll()
 
         if ( !bValidSize || !bValidPrtArea )
         {
-            const BOOL bOptLower = (Frm().*fnRect->fnGetHeight)() == 0;
+            // HB #i101593# no optimization as it leeds to not layouting certain nested tables
+            // const BOOL bOptLower = (Frm().*fnRect->fnGetHeight)() == 0;
+            const BOOL bOptLower = FALSE; 
 
             const long nOldPrtWidth = (Prt().*fnRect->fnGetWidth)();
             const long nOldFrmWidth = (Frm().*fnRect->fnGetWidth)();
commit feb5b878ad29e806397143bdb0a1b0ce36cbe802
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Jul 16 15:07:54 2009 +0000

    CWS-TOOLING: integrate CWS mox01
    2009-07-07 09:26:41 +0200 hde  r273770 : added testcase tShortcutPasteUnformattedText
    2009-07-07 09:26:04 +0200 hde  r273769 : added testcase tShortcutPasteUnformattedText
    2009-06-26 17:27:39 +0200 mba  r273431 : #i17563#: moved slot to sfx2
    2009-06-26 17:26:40 +0200 mba  r273430 : #i17563#: moved slot to sfx2
    2009-06-24 21:16:18 +0200 mox  r273365 : Update UI strings to follow the Uppercase All Convention.
    2009-06-13 23:26:58 +0200 mox  r272958 : CWS-TOOLING: rebase CWS mox01 to trunk at 272827 (milestone: DEV300:m50)
    2009-04-04 14:26:36 +0200 mox  r270524 : Fix bugs to make shortcut work
    2009-04-04 12:38:36 +0200 mox  r270523 : Command definition for shortcut
    2009-04-04 08:56:29 +0200 mox  r270522 : Revert changes of menu item
    2009-04-04 08:28:46 +0200 mox  r270521 : Revert changes
    2009-03-02 20:41:11 +0100 mox  r268690 : Menu item and shortcut key for Paste and Match Style
    2009-03-02 20:40:45 +0100 mox  r268689 : Menu item and shortcut key for Paste and Match Style

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 08baf50..64c3c67 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -155,7 +155,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_PASTE				(FN_EDIT + 13)	  /* Einfuegen */
 #define FN_PASTESPECIAL 		(FN_EDIT + 14)	  /* Verknuepfung einfuegen */
 #define FN_PASTESPECIAL_DLG 	(FN_EDIT + 15)	  /* Verknuepfung einfuegen */
-
 #define FN_NUMBER_BULLETS		(FN_EDIT + 21)	  /* Bullets */
 #define FN_REPEAT				(FN_EDIT + 22)	  /* Letzten Befehl wiederholen */
 #define FN_EDIT_IDX_ENTRY_DLG	(FN_EDIT + 23)	  /* Index-Entry bearbeiten */
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index fac321c..6291061 100755
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -117,7 +117,7 @@ interface _Annotation
         ExecMethod = ExecClpbrd ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
-    
+
     SID_CLIPBOARD_FORMAT_ITEMS  // status(final|play)
     [
         StateMethod = StateClpbrd ;
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index d088592..e7c156e 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -120,6 +120,13 @@ interface BaseTextSelection
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
+    SID_PASTE_UNFORMATTED  // status(final|play)
+    [
+        ExecMethod = ExecClpbrd ;
+        StateMethod = StateClpbrd ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
     FN_PASTESPECIAL  // status(final|play)
     [
         ExecMethod = ExecClpbrd ;
diff --git a/sw/sdi/swslots.src b/sw/sdi/swslots.src
index a510963..c5c6122 100644
--- a/sw/sdi/swslots.src
+++ b/sw/sdi/swslots.src
@@ -850,6 +850,10 @@ SfxSlotInfo FN_PASTESPECIAL
 {
     Slotname [ en-US ] = "Paste Special";
 };
+SfxSlotInfo FN_PASTEUNFORMATTED
+{
+    Slotname [ en-US ] = "Paste Unformatted Text";
+};
 SfxSlotInfo FN_POSTIT
 {
     Slotname [ en-US ] = "Insert Note";
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index a7413d3..c3e1f23 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -2898,6 +2898,15 @@ static USHORT aPasteSpecialIds[] =
     0
 };
 
+
+int SwTransferable::PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& rData )
+{
+    // Plain text == unformatted
+    return SwTransferable::PasteFormat( rSh, rData, SOT_FORMAT_STRING );
+}
+
+// -----------------------------------------------------------------------
+
 int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData, ULONG& rFormatUsed )
 {
     int nRet = 0;
diff --git a/sw/source/ui/inc/hidfunc.h b/sw/source/ui/inc/hidfunc.h
index 0ad47ca..ce3943e 100644
--- a/sw/source/ui/inc/hidfunc.h
+++ b/sw/source/ui/inc/hidfunc.h
@@ -209,6 +209,7 @@
 #define HID_SET_STANDARD_FONTS	1442
 #define HID_COPY	1102
 #define HID_PASTE	1113
+#define HID_PASTEUNFORMATTED	1115
 #define HID_PASTESPECIAL	1114
 #define HID_CUT	1103
 #define HID_FLIP_HORZ_GRAFIC	1425
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index 7b7692b..f92cf66 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -193,6 +193,7 @@ public:
 
     static BOOL IsPasteSpecial( const SwWrtShell& rWrtShell,
                                 const TransferableDataHelper& );
+    static int PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& );
     static int PasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, ULONG& rFormatUsed );
     static int PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData,
                              ULONG nFormat );
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 28142c9..cb69690 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -370,6 +370,41 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
             }
             break;
 
+        case SID_PASTE_UNFORMATTED:
+            {
+                TransferableDataHelper aDataHelper(
+                    TransferableDataHelper::CreateFromSystemClipboard(
+                        &rSh.GetView().GetEditWin()) );
+                if( aDataHelper.GetXTransferable().is() &&
+                    SwTransferable::IsPaste( rSh, aDataHelper ))
+                {
+                    // temp. Variablen, da die Shell nach dem Paste schon
+                    // zerstoert sein kann
+                    SwView* pView = &rView;
+                    rReq.Ignore();
+                    bIgnore = sal_True;
+                    int nRet = SwTransferable::PasteUnformatted( rSh, aDataHelper );
+                    if(nRet)// && rReq.IsRecording() )
+                    {
+                        SfxViewFrame* pViewFrame = pView->GetViewFrame();
+                        uno::Reference< frame::XDispatchRecorder > xRecorder =
+                            pViewFrame->GetBindings().GetRecorder();
+                        if(xRecorder.is()) {
+                            SfxRequest aReq( pViewFrame, SID_CLIPBOARD_FORMAT_ITEMS );
+                            aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, SOT_FORMAT_STRING ) );
+                            aReq.Done();
+                        }
+                    }
+                    
+                    if (rSh.IsFrmSelected() || rSh.IsObjSelected())
+                        rSh.EnterSelFrmMode();
+                    pView->AttrChangedNotify( &rSh );
+                }
+                else
+                    return;
+            }
+            break;
+            
         case FN_PASTESPECIAL:
             {
                 TransferableDataHelper aDataHelper(
@@ -448,7 +483,10 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
 
         case FN_PASTESPECIAL:
             if( !GetView().IsPasteSpecialAllowed() )
+            {
                 rSet.DisableItem( FN_PASTESPECIAL );
+                rSet.DisableItem( SID_PASTE_UNFORMATTED );
+            }
             break;
 
         case SID_CLIPBOARD_FORMAT_ITEMS:
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 8641418..1b5b100 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -672,6 +672,7 @@ void SwView::_CheckReadonlyState()
             SID_DELETE, 				FN_BACKSPACE,				FN_SHIFT_BACKSPACE,
             SID_UNDO,
             SID_REDO,					SID_REPEAT,					SID_PASTE,
+            SID_PASTE_UNFORMATTED,
             FN_PASTESPECIAL,			SID_SBA_BRW_INSERT,
             SID_BACKGROUND_COLOR,       FN_INSERT_BOOKMARK,
             SID_CHARMAP,				FN_INSERT_SOFT_HYPHEN,


More information about the ooo-build-commit mailing list