diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-09-28 11:13:12 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-09-28 11:13:12 -0400 |
| commit | be2150398ce765b87d44ada8a13c09345be52e22 (patch) | |
| tree | 646b2e1cc0131ebe396249ed1c0322d6e727c5cd /sc/source/ui/inc | |
| parent | f2ab6ab8380f520ede5a46bfe5cf014dad97f05a (diff) | |
Port cws-koheicopyborder-sc.diff from ooo-build.
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabview.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index a2283bf2b7de..9843878032c0 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/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 a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 80fb979d539c..5f16bbe009fa 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -435,6 +435,7 @@ public: void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress); + void UpdateCopySourceOverlay(); void UpdateSelectionOverlay(); void UpdateShrinkOverlay(); void UpdateAllOverlays(); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 5d1a60a214c6..ebd2ea85d457 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/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; @@ -209,6 +216,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 ? @@ -295,6 +304,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 ); @@ -309,6 +320,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 ); |