[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/build-fix.diff         |   51 ----------------------------------
 patches/dev300/sc-paste-on-enter.diff |   51 ----------------------------------
 2 files changed, 102 deletions(-)

New commits:
commit f5d6bb6d28ea032cb74a5752ea5bac4c1282571b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Sep 11 01:58:07 2009 -0400

    Moved build fix to the correct patch.
    
    * patches/dev300/build-fix.diff:
    * patches/dev300/sc-paste-on-enter.diff:

diff --git a/patches/dev300/build-fix.diff b/patches/dev300/build-fix.diff
index 2a1c67f..3f06200 100644
--- a/patches/dev300/build-fix.diff
+++ b/patches/dev300/build-fix.diff
@@ -17,57 +17,6 @@ diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
 index d6fdb75..57c4740 100644
 --- sc/source/ui/view/cellsh1.cxx
 +++ sc/source/ui/view/cellsh1.cxx
-@@ -2205,50 +2205,6 @@ IMPL_LINK( ScCellShell, DialogClosed, AbstractScLinkedAreaDlg*, EMPTYARG )
-     return 0;
- }
- 
--void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog )
--{
--    Window* pWin = pViewData->GetActiveWin();
--    ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
--    ScDocument* pThisDoc = pViewData->GetDocument();
--    ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( pViewData->GetCurX(),
--                         pViewData->GetCurY(), pViewData->GetTabNo() );
--    if ( pOwnClip && pDPObj )
--    {
--        // paste from Calc into DataPilot table: sort (similar to drag & drop)
--
--        ScDocument* pClipDoc = pOwnClip->GetDocument();
--        SCTAB nSourceTab = pOwnClip->GetVisibleTab();
--
--        SCCOL nClipStartX;
--        SCROW nClipStartY;
--        SCCOL nClipEndX;
--        SCROW nClipEndY;
--        pClipDoc->GetClipStart( nClipStartX, nClipStartY );
--        pClipDoc->GetClipArea( nClipEndX, nClipEndY, TRUE );
--        nClipEndX = nClipEndX + nClipStartX;
--        nClipEndY = nClipEndY + nClipStartY;   // GetClipArea returns the difference
--
--        ScRange aSource( nClipStartX, nClipStartY, nSourceTab, nClipEndX, nClipEndY, nSourceTab );
--        BOOL bDone = pTabViewShell->DataPilotMove( aSource, pViewData->GetCurPos() );
--        if ( !bDone )
--            pTabViewShell->ErrorMessage( STR_ERR_DATAPILOT_INPUT );
--    }
--    else
--    {
--        // normal paste
--        WaitObject aWait( pViewData->GetDialogParent() );
--        if (!pOwnClip)
--            pTabViewShell->PasteFromSystem();
--        else
--        {
--            pTabViewShell->PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
--                    PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
--                    bShowDialog );		// allow warning dialog
--        }
--    }
--    pTabViewShell->CellContentChanged();		// => PasteFromSystem() ???
--}
--
- void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog )
- {
-     Window* pWin = pViewData->GetActiveWin();
 diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
 index 07d5d14..7a13b81 100644
 --- sc/source/ui/view/gridwin.cxx
diff --git a/patches/dev300/sc-paste-on-enter.diff b/patches/dev300/sc-paste-on-enter.diff
index 6eed7f5..295a7fd 100644
--- a/patches/dev300/sc-paste-on-enter.diff
+++ b/patches/dev300/sc-paste-on-enter.diff
@@ -75,57 +75,6 @@ index ba66243..0cd4007 100644
              }
              break;
  
-@@ -2195,6 +2198,50 @@ IMPL_LINK( ScCellShell, DialogClosed, AbstractScLinkedAreaDlg*, EMPTYARG )
-     return 0;
- }
- 
-+void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog )
-+{
-+    Window* pWin = pViewData->GetActiveWin();
-+    ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
-+    ScDocument* pThisDoc = pViewData->GetDocument();
-+    ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( pViewData->GetCurX(),
-+                         pViewData->GetCurY(), pViewData->GetTabNo() );
-+    if ( pOwnClip && pDPObj )
-+    {
-+        // paste from Calc into DataPilot table: sort (similar to drag & drop)
-+
-+        ScDocument* pClipDoc = pOwnClip->GetDocument();
-+        SCTAB nSourceTab = pOwnClip->GetVisibleTab();
-+
-+        SCCOL nClipStartX;
-+        SCROW nClipStartY;
-+        SCCOL nClipEndX;
-+        SCROW nClipEndY;
-+        pClipDoc->GetClipStart( nClipStartX, nClipStartY );
-+        pClipDoc->GetClipArea( nClipEndX, nClipEndY, TRUE );
-+        nClipEndX = nClipEndX + nClipStartX;
-+        nClipEndY = nClipEndY + nClipStartY;   // GetClipArea returns the difference
-+
-+        ScRange aSource( nClipStartX, nClipStartY, nSourceTab, nClipEndX, nClipEndY, nSourceTab );
-+        BOOL bDone = pTabViewShell->DataPilotMove( aSource, pViewData->GetCurPos() );
-+        if ( !bDone )
-+            pTabViewShell->ErrorMessage( STR_ERR_DATAPILOT_INPUT );
-+    }
-+    else
-+    {
-+        // normal paste
-+        WaitObject aWait( pViewData->GetDialogParent() );
-+        if (!pOwnClip)
-+            pTabViewShell->PasteFromSystem();
-+        else
-+        {
-+            pTabViewShell->PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
-+                    PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
-+                    bShowDialog );		// allow warning dialog
-+        }
-+    }
-+    pTabViewShell->CellContentChanged();		// => PasteFromSystem() ???
-+}
-+
- void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog )
- {
-     Window* pWin = pViewData->GetActiveWin();
 diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
 index 6fc33d5..6e0280a 100644
 --- sc/source/ui/view/gridwin.cxx