[ooo-build-commit] .: patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Tue Sep 28 08:19:46 PDT 2010
patches/dev300/cws-koheicopyborder-sc.diff | 578 ----------------------------
patches/dev300/cws-koheicopyborder-svx.diff | 29 -
2 files changed, 607 deletions(-)
New commits:
commit 74d3dbe25a22135592fc38bf102a0a4f08e40c69
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Tue Sep 28 11:19:15 2010 -0400
Removed; moved to the libreoffice repo.
diff --git a/patches/dev300/cws-koheicopyborder-sc.diff b/patches/dev300/cws-koheicopyborder-sc.diff
deleted file mode 100644
index e2ddd1c..0000000
--- a/patches/dev300/cws-koheicopyborder-sc.diff
+++ /dev/null
@@ -1,578 +0,0 @@
----
- sc/source/ui/app/inputhdl.cxx | 5 ++
- sc/source/ui/inc/gridwin.hxx | 3 +
- sc/source/ui/inc/overlayobject.hxx | 58 ++++++++++++++++++
- sc/source/ui/inc/tabview.hxx | 1 +
- sc/source/ui/inc/viewdata.hxx | 12 ++++
- sc/source/ui/view/cellsh1.cxx | 9 +++-
- sc/source/ui/view/gridwin.cxx | 114 ++++++++++++++++++++++++++++++++++-
- sc/source/ui/view/makefile.mk | 2 +
- sc/source/ui/view/overlayobject.cxx | 104 +++++++++++++++++++++++++++++++
- sc/source/ui/view/tabview2.cxx | 7 ++
- sc/source/ui/view/tabview3.cxx | 1 +
- sc/source/ui/view/viewdata.cxx | 1 +
- sc/source/ui/view/viewfunc.cxx | 4 +
- 13 files changed, 319 insertions(+), 2 deletions(-)
- create mode 100644 sc/source/ui/inc/overlayobject.hxx
- create mode 100644 sc/source/ui/view/overlayobject.cxx
-
-diff --git sc/source/ui/app/inputhdl.cxx sc/source/ui/app/inputhdl.cxx
-index 685ea39..c8a85e4 100644
---- sc/source/ui/app/inputhdl.cxx
-+++ sc/source/ui/app/inputhdl.cxx
-@@ -2084,6 +2084,7 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
-
- BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand ) // return TRUE = new view created
- {
-+ pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
- bInOwnChange = TRUE; // disable ModifyHdl (reset in DataChanged)
-
- if ( eMode == SC_INPUT_NONE )
-@@ -2304,6 +2305,10 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
- return;
- }
-
-+ if (eNewMode != SC_INPUT_NONE)
-+ // Disable paste mode when edit mode starts.
-+ pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
-+
- bInOwnChange = TRUE; // disable ModifyHdl (reset below)
-
- ScInputMode eOldMode = eMode;
-diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
-index 368db6b..64e21cf 100644
---- sc/source/ui/inc/gridwin.hxx
-+++ sc/source/ui/inc/gridwin.hxx
-@@ -108,6 +108,7 @@ private:
- // #114409#
- ::sdr::overlay::OverlayObjectList* mpOOCursors;
- ::sdr::overlay::OverlayObjectList* mpOOSelection;
-+ ::sdr::overlay::OverlayObjectList* mpOOSelectionBorder;
- ::sdr::overlay::OverlayObjectList* mpOOAutoFill;
- ::sdr::overlay::OverlayObjectList* mpOODragRect;
- ::sdr::overlay::OverlayObjectList* mpOOHeader;
-@@ -399,6 +400,8 @@ public:
- void CursorChanged();
- void DrawLayerCreated();
-
-+ void DeleteCopySourceOverlay();
-+ void UpdateCopySourceOverlay();
- void DeleteCursorOverlay();
- void UpdateCursorOverlay();
- void DeleteSelectionOverlay();
-diff --git sc/source/ui/inc/overlayobject.hxx sc/source/ui/inc/overlayobject.hxx
-new file mode 100644
-index 0000000..3d10407
---- /dev/null
-+++ sc/source/ui/inc/overlayobject.hxx
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * 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
-+ *
-+ * $RCSfile: gridwin.hxx,v $
-+ * $Revision: 1.30 $
-+ *
-+ * 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 __SC_OVERLAYOBJECT_HXX__
-+#define __SC_OVERLAYOBJECT_HXX__
-+
-+#include "svx/sdr/overlay/overlayobject.hxx"
-+
-+class OutputDevice;
-+class Window;
-+
-+class ScOverlayDashedBorder : public ::sdr::overlay::OverlayObject
-+{
-+public:
-+ ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor, Window* pWin);
-+ virtual ~ScOverlayDashedBorder();
-+
-+ virtual void Trigger(sal_uInt32 nTime);
-+
-+ virtual void stripeDefinitionHasChanged();
-+
-+protected:
-+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
-+
-+private:
-+ ::basegfx::B2DRange maRange;
-+ Window* mpParent;
-+ bool mbToggle;
-+};
-+
-+#endif
-diff --git sc/source/ui/inc/tabview.hxx sc/source/ui/inc/tabview.hxx
-index d97a600..ccf940b 100644
---- sc/source/ui/inc/tabview.hxx
-+++ sc/source/ui/inc/tabview.hxx
-@@ -437,6 +437,7 @@ public:
-
- void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress);
-
-+ void UpdateCopySourceOverlay();
- void UpdateSelectionOverlay();
- void UpdateShrinkOverlay();
- void UpdateAllOverlays();
-diff --git sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
-index e353681..2c86a47 100644
---- sc/source/ui/inc/viewdata.hxx
-+++ sc/source/ui/inc/viewdata.hxx
-@@ -86,6 +86,13 @@ enum ScMarkType
- #endif
- };
-
-+enum ScPasteFlags
-+{
-+ SC_PASTE_NONE = 0, // No flags specified
-+ SC_PASTE_MODE = 1, // Enable paste-mode
-+ SC_PASTE_BORDER = 2, // Show a border around the source cells
-+};
-+
- class ScDocShell;
- class ScDocument;
- class ScDBFunc;
-@@ -207,6 +214,8 @@ private:
- SCCOL nTabStartCol; // fuer Enter nach Tab
- ScRange aDelRange; // fuer AutoFill-Loeschen
-
-+ ScPasteFlags nPasteFlags;
-+
- ScSplitPos eEditActivePart; // the part that was active when edit mode was started
- BOOL bEditActive[4]; // aktiv?
- BOOL bActive; // aktives Fenster ?
-@@ -293,6 +302,8 @@ public:
- SCCOL GetFixPosX() const { return pThisTab->nFixPosX; }
- SCROW GetFixPosY() const { return pThisTab->nFixPosY; }
- BOOL IsPagebreakMode() const { return bPagebreak; }
-+ bool IsPasteMode() const { return nPasteFlags & SC_PASTE_MODE; }
-+ bool ShowPasteSource() const { return nPasteFlags & SC_PASTE_BORDER; }
-
- void SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
- void SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
-@@ -307,6 +318,7 @@ public:
- void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; }
- void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; }
- void SetPagebreakMode( BOOL bSet );
-+ void SetPasteMode ( ScPasteFlags nFlags ) { nPasteFlags = nFlags; }
-
- void SetZoomType( SvxZoomType eNew, BOOL bAll );
- void SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs );
-diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
-index 47951fc..d5841fa 100644
---- sc/source/ui/view/cellsh1.cxx
-+++ sc/source/ui/view/cellsh1.cxx
-@@ -1162,11 +1162,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
- // Clipboard
- //
-
-+
- case SID_COPY: // fuer Grafiken in DrawShell
- {
-- WaitObject aWait( GetViewData()->GetDialogParent() );
-+ ScViewData* pViewData = GetViewData();
-+ WaitObject aWait( pViewData->GetDialogParent() );
- pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE );
- rReq.Done();
-+ pViewData->SetPasteMode( (ScPasteFlags) (SC_PASTE_MODE | SC_PASTE_BORDER) );
-+ pTabViewShell->ShowCursor();
-+ pTabViewShell->UpdateCopySourceOverlay();
- }
- break;
-
-@@ -1175,6 +1180,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
- WaitObject aWait( GetViewData()->GetDialogParent() );
- pTabViewShell->CutToClip( NULL, TRUE );
- rReq.Done();
-+ GetViewData()->SetPasteMode( SC_PASTE_MODE );
-+ pTabViewShell->UpdateCopySourceOverlay();
- }
- break;
-
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index c0b9dd0..41cbc01 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -121,6 +121,9 @@
- #include "tabprotection.hxx"
- #include "postit.hxx"
- #include "dpcontrol.hxx"
-+#include "clipparam.hxx"
-+#include "cellsh.hxx"
-+#include "overlayobject.hxx"
- #include "cellsuno.hxx"
-
- #include "drawview.hxx"
-@@ -374,6 +377,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
- DragSourceHelper( this ),
- mpOOCursors( NULL ),
- mpOOSelection( NULL ),
-+ mpOOSelectionBorder( NULL ),
- mpOOAutoFill( NULL ),
- mpOODragRect( NULL ),
- mpOOHeader( NULL ),
-@@ -2964,12 +2968,30 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX,
- }
- }
-
-+static void ClearSingleSelection( ScViewData* pViewData )
-+{
-+ SCCOL nX;
-+ SCROW nY;
-+ ScTransferObj* pTransObj = ScTransferObj::GetOwnClipboard(
-+ pViewData->GetActiveWin() );
-+ if (!pTransObj)
-+ return;
-+
-+ ScDocument* pClipDoc = pTransObj->GetDocument();
-+ pClipDoc->GetClipArea( nX, nY, TRUE );
-+ if (nX == 0 && nY == 0)
-+ {
-+ ScTabView* pView = pViewData->GetView();
-+ pView->Unmark();
-+ }
-+}
-+
- void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
- {
- // #96965# Cursor control for ref input dialog
-+ const KeyCode& rKeyCode = rKEvt.GetKeyCode();
- if( SC_MOD()->IsRefDialogOpen() )
- {
-- const KeyCode& rKeyCode = rKEvt.GetKeyCode();
- if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
- {
- SC_MOD()->EndReference();
-@@ -2984,9 +3006,35 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
- return;
- }
- }
-+ else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
-+ {
-+ ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
-+
-+ ScCellShell::PasteFromClipboard( pViewData, pTabViewShell, FALSE );
-+ ClearSingleSelection( pViewData );
-+
-+ uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard =
-+ TransferableHelper::GetSystemClipboard();
-+ if (xSystemClipboard.is())
-+ {
-+ xSystemClipboard->setContents(
-+ uno::Reference<datatransfer::XTransferable>(),
-+ uno::Reference<datatransfer::clipboard::XClipboardOwner>());
-+ }
-+
-+ // hide the border around the copy source
-+ pViewData->SetPasteMode( SC_PASTE_NONE );
-+ UpdateCopySourceOverlay();
-+ return;
-+ }
- // wenn semi-Modeless-SfxChildWindow-Dialog oben, keine KeyInputs:
- else if( !pViewData->IsAnyFillMode() )
- {
-+ if (rKeyCode.GetCode() == KEY_ESCAPE)
-+ {
-+ pViewData->SetPasteMode( SC_PASTE_NONE );
-+ UpdateCopySourceOverlay();
-+ }
- // query for existing note marker before calling ViewShell's keyboard handling
- // which may remove the marker
- BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );
-@@ -5067,6 +5115,7 @@ void ScGridWindow::CursorChanged()
- void ScGridWindow::ImpCreateOverlayObjects()
- {
- UpdateCursorOverlay();
-+ UpdateCopySourceOverlay();
- UpdateSelectionOverlay();
- UpdateAutoFillOverlay();
- UpdateDragRectOverlay();
-@@ -5078,6 +5127,7 @@ void ScGridWindow::ImpCreateOverlayObjects()
- void ScGridWindow::ImpDestroyOverlayObjects()
- {
- DeleteCursorOverlay();
-+ DeleteCopySourceOverlay();
- DeleteSelectionOverlay();
- DeleteAutoFillOverlay();
- DeleteDragRectOverlay();
-@@ -5098,6 +5148,68 @@ void ScGridWindow::DeleteCursorOverlay()
- DELETEZ( mpOOCursors );
- }
-
-+void ScGridWindow::DeleteCopySourceOverlay()
-+{
-+ DELETEZ( mpOOSelectionBorder );
-+}
-+
-+void ScGridWindow::UpdateCopySourceOverlay()
-+{
-+ MapMode aDrawMode = GetDrawMapMode();
-+ MapMode aOldMode = GetMapMode();
-+ if ( aOldMode != aDrawMode )
-+ SetMapMode( aDrawMode );
-+
-+ DeleteCopySourceOverlay();
-+
-+ if (!pViewData->ShowPasteSource())
-+ return;
-+ ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
-+ if (!pOverlayManager)
-+ return;
-+ ScTransferObj* pTransObj = ScTransferObj::GetOwnClipboard( pViewData->GetActiveWin() );
-+ if (!pTransObj)
-+ return;
-+ ScDocument* pClipDoc = pTransObj->GetDocument();
-+ if (!pClipDoc)
-+ return;
-+
-+ SCTAB nCurTab = pViewData->GetCurPos().Tab();
-+
-+ ScClipParam& rClipParam = pClipDoc->GetClipParam();
-+ mpOOSelectionBorder = new ::sdr::overlay::OverlayObjectList;
-+ for (ScRange* p = rClipParam.maRanges.First(); p; p = rClipParam.maRanges.Next())
-+ {
-+ if (p->aStart.Tab() != nCurTab)
-+ continue;
-+
-+ SCCOL nClipStartX = p->aStart.Col();
-+ SCROW nClipStartY = p->aStart.Row();
-+ SCCOL nClipEndX = p->aEnd.Col();
-+ SCROW nClipEndY = p->aEnd.Row();
-+
-+ Point aClipStartScrPos = pViewData->GetScrPos( nClipStartX, nClipStartY, eWhich );
-+ Point aClipEndScrPos = pViewData->GetScrPos( nClipEndX + 1, nClipEndY + 1, eWhich );
-+ aClipStartScrPos -= Point(1, 1);
-+ long nSizeXPix = aClipEndScrPos.X() - aClipStartScrPos.X();
-+ long nSizeYPix = aClipEndScrPos.Y() - aClipStartScrPos.Y();
-+
-+ Rectangle aRect( aClipStartScrPos, Size(nSizeXPix, nSizeYPix) );
-+
-+
-+ Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor();
-+
-+ Rectangle aLogic = PixelToLogic(aRect, aDrawMode);
-+ ::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), aLogic.Right(), aLogic.Bottom());
-+ ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight, this);
-+ pOverlayManager->add(*pDashedBorder);
-+ mpOOSelectionBorder->append(*pDashedBorder);
-+ }
-+
-+ if ( aOldMode != aDrawMode )
-+ SetMapMode( aOldMode );
-+}
-+
- void ScGridWindow::UpdateCursorOverlay()
- {
- MapMode aDrawMode = GetDrawMapMode();
-diff --git sc/source/ui/view/makefile.mk sc/source/ui/view/makefile.mk
-index feeacc8..129f4a7 100644
---- sc/source/ui/view/makefile.mk
-+++ sc/source/ui/view/makefile.mk
-@@ -94,6 +94,7 @@ SLOFILES = \
- $(SLO)$/output.obj \
- $(SLO)$/output2.obj \
- $(SLO)$/output3.obj \
-+ $(SLO)$/overlayobject.obj \
- $(SLO)$/gridmerg.obj \
- $(SLO)$/invmerge.obj \
- $(SLO)$/cellmergeoption.obj \
-@@ -147,6 +148,7 @@ EXCEPTIONSFILES= \
- $(SLO)$/gridwin.obj \
- $(SLO)$/invmerge.obj \
- $(SLO)$/output2.obj \
-+ $(SLO)$/overlayobject.obj \
- $(SLO)$/pfuncache.obj \
- $(SLO)$/spelldialog.obj \
- $(SLO)$/cellsh1.obj \
-diff --git sc/source/ui/view/overlayobject.cxx sc/source/ui/view/overlayobject.cxx
-new file mode 100644
-index 0000000..7f44f45
---- /dev/null
-+++ sc/source/ui/view/overlayobject.cxx
-@@ -0,0 +1,104 @@
-+/*************************************************************************
-+ *
-+ * 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
-+ *
-+ * $RCSfile: gridwin.hxx,v $
-+ * $Revision: 1.30 $
-+ *
-+ * 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.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+#include "overlayobject.hxx"
-+#include "vcl/outdev.hxx"
-+#include "vcl/lineinfo.hxx"
-+#include "vcl/salbtype.hxx"
-+#include "vcl/window.hxx"
-+#include "tools/fract.hxx"
-+#include "basegfx/range/b2drange.hxx"
-+#include "basegfx/polygon/b2dpolygon.hxx"
-+#include "basegfx/polygon/b2dpolygontools.hxx"
-+#include "svx/sdr/overlay/overlaymanager.hxx"
-+#include "drawinglayer/primitive2d/baseprimitive2d.hxx"
-+#include "drawinglayer/primitive2d/polypolygonprimitive2d.hxx"
-+
-+using ::sdr::overlay::OverlayObject;
-+using ::sdr::overlay::OverlayManager;
-+using ::drawinglayer::primitive2d::Primitive2DSequence;
-+
-+#define DASH_UPDATE_INTERVAL 180 // in msec
-+
-+ScOverlayDashedBorder::ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor, Window* pWin) :
-+ OverlayObject(rColor),
-+ mpParent(pWin),
-+ mbToggle(true)
-+{
-+ mbAllowsAnimation = true;
-+ maRange = rRange;
-+}
-+
-+ScOverlayDashedBorder::~ScOverlayDashedBorder()
-+{
-+}
-+
-+void ScOverlayDashedBorder::Trigger(sal_uInt32 nTime)
-+{
-+ OverlayManager* pMgr = getOverlayManager();
-+ if (pMgr)
-+ {
-+ SetTime(nTime + DASH_UPDATE_INTERVAL);
-+ mbToggle = !mbToggle;
-+ pMgr->InsertEvent(this);
-+ objectChange();
-+ }
-+}
-+
-+void ScOverlayDashedBorder::stripeDefinitionHasChanged()
-+{
-+ objectChange();
-+}
-+
-+Primitive2DSequence ScOverlayDashedBorder::createOverlayObjectPrimitive2DSequence()
-+{
-+ using ::basegfx::B2DPolygon;
-+ using ::basegfx::B2DPolyPolygon;
-+
-+ OverlayManager* pMgr = getOverlayManager();
-+ if (!pMgr)
-+ return Primitive2DSequence();
-+
-+ basegfx::BColor aColorA = pMgr->getStripeColorA().getBColor();
-+ basegfx::BColor aColorB = pMgr->getStripeColorB().getBColor();
-+ if (!mbToggle)
-+ ::std::swap(aColorA, aColorB);
-+
-+ const basegfx::B2DPolygon aPoly = basegfx::tools::createPolygonFromRect(maRange);
-+ B2DPolyPolygon aPolygon(aPoly);
-+ const drawinglayer::primitive2d::Primitive2DReference aReference(
-+ new drawinglayer::primitive2d::PolyPolygonMarkerPrimitive2D(
-+ aPolygon, aColorA, aColorB, pMgr->getStripeLengthPixel()));
-+
-+ return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
-+}
-diff --git sc/source/ui/view/tabview2.cxx sc/source/ui/view/tabview2.cxx
-index 27c0f7d..fa99268 100644
---- sc/source/ui/view/tabview2.cxx
-+++ sc/source/ui/view/tabview2.cxx
-@@ -703,6 +703,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
- ExpandBlock(nAreaX, nAreaY, eMode);
- }
-
-+void ScTabView::UpdateCopySourceOverlay()
-+{
-+ for (sal_uInt8 i = 0; i < 4; ++i)
-+ if (pGridWin[i] && pGridWin[i]->IsVisible())
-+ pGridWin[i]->UpdateCopySourceOverlay();
-+}
-+
- void ScTabView::UpdateSelectionOverlay()
- {
- for (USHORT i=0; i<4; i++)
-diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index 47797e7..806db79 100644
---- sc/source/ui/view/tabview3.cxx
-+++ sc/source/ui/view/tabview3.cxx
-@@ -1810,6 +1810,7 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
-
- pGridWin[i]->DeleteCursorOverlay();
- pGridWin[i]->DeleteAutoFillOverlay();
-+ pGridWin[i]->DeleteCopySourceOverlay();
-
- // flush OverlayManager before changing MapMode to text edit
- pGridWin[i]->flushOverlayManager();
-diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
-index 7f55a1a..012a1e0 100644
---- sc/source/ui/view/viewdata.cxx
-+++ sc/source/ui/view/viewdata.cxx
-@@ -311,6 +311,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
- eRefType ( SC_REFTYPE_NONE ),
- nTabNo ( 0 ),
- nRefTabNo ( 0 ),
-+ nPasteFlags ( SC_PASTE_NONE ),
- eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
- bActive ( TRUE ), //! wie initialisieren?
- bIsRefMode ( FALSE ),
-diff --git sc/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
-index 93c0cca..e1d2a3b 100644
---- sc/source/ui/view/viewfunc.cxx
-+++ sc/source/ui/view/viewfunc.cxx
-@@ -1894,6 +1894,10 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
-
- void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
- {
-+ ScViewData* pViewData = GetViewData();
-+ pViewData->SetPasteMode( SC_PASTE_NONE );
-+ pViewData->GetViewShell()->UpdateCopySourceOverlay();
-+
- // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- BOOL bOnlyNotBecauseOfMatrix;
- BOOL bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
---
-1.7.0.1
-
diff --git a/patches/dev300/cws-koheicopyborder-svx.diff b/patches/dev300/cws-koheicopyborder-svx.diff
deleted file mode 100644
index 833d96a..0000000
--- a/patches/dev300/cws-koheicopyborder-svx.diff
+++ /dev/null
@@ -1,29 +0,0 @@
----
- svx/inc/svx/sdr/animation/scheduler.hxx | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git svx/inc/svx/sdr/animation/scheduler.hxx svx/inc/svx/sdr/animation/scheduler.hxx
-index a1b167c..5b03e1d 100644
---- svx/inc/svx/sdr/animation/scheduler.hxx
-+++ svx/inc/svx/sdr/animation/scheduler.hxx
-@@ -58,7 +58,7 @@ namespace sdr
-
- // get/set time
- sal_uInt32 GetTime() const;
-- void SetTime(sal_uInt32 nNew);
-+ void SVX_DLLPUBLIC SetTime(sal_uInt32 nNew);
-
- // execute event
- virtual void Trigger(sal_uInt32 nTime) = 0;
-@@ -142,7 +142,7 @@ namespace sdr
- void checkTimeout();
-
- // insert/remove events, wrapper to EventList methods
-- void InsertEvent(Event* pNew);
-+ void SVX_DLLPUBLIC InsertEvent(Event* pNew);
- void RemoveEvent(Event* pOld);
-
- // get/set pause
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list