diff options
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/AccessibleContextBase.hxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleCsvControl.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 10 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleText.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/inc/csvcontrol.hxx | 59 | ||||
-rw-r--r-- | sc/source/ui/inc/csvgrid.hxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/docfunc.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/inc/fieldwnd.hxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/inputwin.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/inc/olinewin.hxx | 24 | ||||
-rw-r--r-- | sc/source/ui/inc/output.hxx | 11 | ||||
-rw-r--r-- | sc/source/ui/inc/preview.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/inc/pvlaydlg.hxx | 9 | ||||
-rw-r--r-- | sc/source/ui/inc/tabview.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/tphf.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 6 |
19 files changed, 125 insertions, 77 deletions
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 4f162cb22036..054ccdbf2791 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleContextBase.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: sab $ $Date: 2002-12-04 15:39:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -397,8 +397,8 @@ private: */ ::rtl::OUString msName; - /// List of property change listeners. - cppu::OInterfaceContainerHelper* mpEventListeners; + /// client id in the AccessibleEventNotifier queue + sal_uInt32 mnClientId; /** This is the role of this object. */ diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index e92214255b86..0e6082a513e5 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleCsvControl.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2002-11-05 07:56:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -265,7 +265,7 @@ public: /** Returns the count of characters. */ virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException ); - /** Returns the character index at the specified screen coordinate. */ + /** Returns the character index at the specified coordinate (object's coordinate system). */ virtual sal_Int32 SAL_CALL getIndexAtPoint( const AwtPoint& rPoint ) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 1faa0472e54f..03042792bde2 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleDocumentPagePreview.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2002-05-24 15:22:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,10 +161,12 @@ protected: createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); +public: // needed in ScShapeChilds /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); +protected: /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 1d4454fff5a8..68ed80616543 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessiblePreviewHeaderCell.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2002-08-01 12:45:28 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,7 @@ #endif class ScPreviewShell; +class ScPreviewTableInfo; class accessibility::AccessibleTextHelper; typedef cppu::ImplHelper1< ::drafts::com::sun::star::accessibility::XAccessibleValue> @@ -98,7 +99,7 @@ public: ::drafts::com::sun::star::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const ScAddress& rCellPos, sal_Bool bIsColHdr, sal_Bool bIsRowHdr, - sal_Int32 nIndex, const Rectangle& rPosition ); + sal_Int32 nIndex ); protected: virtual ~ScAccessiblePreviewHeaderCell(); @@ -179,13 +180,14 @@ private: ScAddress maCellPos; sal_Bool mbColumnHeader; sal_Bool mbRowHeader; - Rectangle maPosition; + mutable ScPreviewTableInfo* mpTableInfo; sal_Bool IsDefunc( const com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); + void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 58bf0f9c98ad..853d5c55e2bd 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleText.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: sab $ $Date: 2002-10-01 16:47:28 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,6 +86,7 @@ class ScPreviewViewForwarder; class ScEditViewForwarder; class ScPreviewShell; class EditTextObject; +class ScCsvViewForwarder; // ============================================================================ @@ -359,7 +360,7 @@ class ScAccessibleCsvTextData : public ScAccessibleTextData { private: typedef ::std::auto_ptr< SvxTextForwarder > TextForwarderPtr; - typedef ::std::auto_ptr< SvxViewForwarder > ViewForwarderPtr; + typedef ::std::auto_ptr< ScCsvViewForwarder > ViewForwarderPtr; Window* mpWindow; EditEngine* mpEditEngine; diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 67e997657a99..35947de23a96 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -2,9 +2,9 @@ * * $RCSfile: csvcontrol.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dr $ $Date: 2002-08-16 13:00:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,21 +155,21 @@ enum ScMoveMode /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; -const ScCsvDiff CSV_DIFF_EQUAL = 0x00000000; -const ScCsvDiff CSV_DIFF_POSCOUNT = 0x00000001; -const ScCsvDiff CSV_DIFF_POSOFFSET = 0x00000002; -const ScCsvDiff CSV_DIFF_OFFSETX = 0x00000004; -const ScCsvDiff CSV_DIFF_CHARWIDTH = 0x00000008; -const ScCsvDiff CSV_DIFF_LINECOUNT = 0x00000010; -const ScCsvDiff CSV_DIFF_LINEOFFSET = 0x00000020; -const ScCsvDiff CSV_DIFF_OFFSETY = 0x00000040; -const ScCsvDiff CSV_DIFF_LINEHEIGHT = 0x00000080; -const ScCsvDiff CSV_DIFF_RULERCURSOR = 0x00000100; -const ScCsvDiff CSV_DIFF_GRIDCURSOR = 0x00000200; +const ScCsvDiff CSV_DIFF_EQUAL = 0x00000000; +const ScCsvDiff CSV_DIFF_POSCOUNT = 0x00000001; +const ScCsvDiff CSV_DIFF_POSOFFSET = 0x00000002; +const ScCsvDiff CSV_DIFF_HDRWIDTH = 0x00000004; +const ScCsvDiff CSV_DIFF_CHARWIDTH = 0x00000008; +const ScCsvDiff CSV_DIFF_LINECOUNT = 0x00000010; +const ScCsvDiff CSV_DIFF_LINEOFFSET = 0x00000020; +const ScCsvDiff CSV_DIFF_HDRHEIGHT = 0x00000040; +const ScCsvDiff CSV_DIFF_LINEHEIGHT = 0x00000080; +const ScCsvDiff CSV_DIFF_RULERCURSOR = 0x00000100; +const ScCsvDiff CSV_DIFF_GRIDCURSOR = 0x00000200; -const ScCsvDiff CSV_DIFF_HORIZONTAL = CSV_DIFF_POSCOUNT | CSV_DIFF_POSOFFSET | CSV_DIFF_OFFSETX | CSV_DIFF_CHARWIDTH; -const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFSET | CSV_DIFF_OFFSETY | CSV_DIFF_LINEHEIGHT; -const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; +const ScCsvDiff CSV_DIFF_HORIZONTAL = CSV_DIFF_POSCOUNT | CSV_DIFF_POSOFFSET | CSV_DIFF_HDRWIDTH | CSV_DIFF_CHARWIDTH; +const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFSET | CSV_DIFF_HDRHEIGHT | CSV_DIFF_LINEHEIGHT; +const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; // ---------------------------------------------------------------------------- @@ -183,7 +183,7 @@ struct ScCsvLayoutData sal_Int32 mnPosOffset; /// Horizontal scroll offset. sal_Int32 mnWinWidth; /// Width of ruler and data grid. - sal_Int32 mnOffsetX; /// X coordinate of first visible position. + sal_Int32 mnHdrWidth; /// Width of the header column. sal_Int32 mnCharWidth; /// Pixel width of one character. // vertical settings @@ -191,14 +191,15 @@ struct ScCsvLayoutData sal_Int32 mnLineOffset; /// Index of first visible line (0-based). sal_Int32 mnWinHeight; /// Height of entire data grid (incl. header). - sal_Int32 mnOffsetY; /// Y coordinate of first visible line. - sal_Int32 mnLineHeight; /// Height of one line. + sal_Int32 mnHdrHeight; /// Height of the header line. + sal_Int32 mnLineHeight; /// Height of a data line. // cursor settings sal_Int32 mnPosCursor; /// Position of ruler cursor. sal_Int32 mnColCursor; /// Position of grid column cursor. mutable sal_Int32 mnNoRepaint; /// >0 = no repaint. + bool mbAppRTL; /// true = application in RTL mode. explicit ScCsvLayoutData(); @@ -234,13 +235,13 @@ enum ScCsvCmdType // modify horizontal dimensions CSVCMD_SETPOSCOUNT, /// Change position/column count. [character count] CSVCMD_SETPOSOFFSET, /// Change position offset (scroll pos). [position] - CSVCMD_SETOFFSETX, /// Change X coordinate of first visible position. [X in pixel] + CSVCMD_SETHDRWIDTH, /// Change width of the header column. [width in pixel] CSVCMD_SETCHARWIDTH, /// Change character pixel width. [width in pixel] // modify vertical dimensions CSVCMD_SETLINECOUNT, /// Change number of data lines. [line count] CSVCMD_SETLINEOFFSET, /// Change first visible line. [line index] - CSVCMD_SETOFFSETY, /// Change Y coordinate of first visible line. [Y in pixel] + CSVCMD_SETHDRHEIGHT, /// Change height of top header line. [height in pixel] CSVCMD_SETLINEHEIGHT, /// Change data line pixel height. [height in pixel} // cursors/positions @@ -379,6 +380,8 @@ public: /** Returns a reference to the current layout data. */ inline const ScCsvLayoutData& GetLayoutData() const { return mrData; } + /** Returns true, if the Right-to-Left layout mode is active. */ + inline bool IsRTL() const { return mrData.mbAppRTL; } /** Returns the number of available positions. */ inline sal_Int32 GetPosCount() const { return mrData.mnPosCount; } @@ -396,10 +399,16 @@ public: /** Returns true, if nPos is an allowed AND visible split position. */ bool IsVisibleSplitPos( sal_Int32 nPos ) const; - /** Returns X coordinate of first visible position. */ - inline sal_Int32 GetOffsetX() const { return mrData.mnOffsetX; } + /** Returns the width of the header column. */ + inline sal_Int32 GetHdrWidth() const { return mrData.mnHdrWidth; } /** Returns the width of one character column. */ inline sal_Int32 GetCharWidth() const { return mrData.mnCharWidth; } + /** Returns the start position of the header column. */ + sal_Int32 GetHdrX() const; + /** Returns the X position of the first pixel of the data area. */ + sal_Int32 GetFirstX() const; + /** Returns the X position of the last pixel of the data area. */ + sal_Int32 GetLastX() const; /** Returns output X coordinate of the specified position. */ sal_Int32 GetX( sal_Int32 nPos ) const; /** Returns position from output coordinate. */ @@ -421,8 +430,8 @@ public: /** Returns true, if nLine is a valid and visible line index. */ bool IsVisibleLine( sal_Int32 nLine ) const; - /** Returns Y coordinate of first visible line. */ - inline sal_Int32 GetOffsetY() const { return mrData.mnOffsetY; } + /** Returns the height of the header line. */ + inline sal_Int32 GetHdrHeight() const { return mrData.mnHdrHeight; } /** Returns the height of one line. */ inline sal_Int32 GetLineHeight() const { return mrData.mnLineHeight; } /** Returns output Y coordinate of the specified line. */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 4871a3c069ba..b5d05c245f77 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -2,9 +2,9 @@ * * $RCSfile: csvgrid.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dr $ $Date: 2002-08-16 15:36:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ // ---------------------------------------------------------------------------- -namespace svx { class ColorConfig; } +namespace svtools { class ColorConfig; } class EditEngine; class ScEditEngineDefaulter; class ScAsciiOptions; @@ -148,7 +148,7 @@ private: VirtualDevice maGridDev; /// Data grid with selection and cursor. PopupMenu maPopup; /// Popup menu for column types. - ::svx::ColorConfig& mrColorConfig; /// Application color configuration. + ::svtools::ColorConfig& mrColorConfig; /// Application color configuration. Color maBackColor; /// Cell background color. Color maGridColor; /// Table grid color. Color maGridPBColor; /// Grid color for "first imported line" delimiter. diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 0e6f9eadf929..430c14e4b400 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: docfunc.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2002-10-22 13:29:36 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,7 @@ private: USHORT nPosX, USHORT nPosY, USHORT nTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2, BOOL& rCancel, BOOL bApi ); + void NotifyInputHandler( const ScAddress& rPos ); public: ScDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {} diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index 48dc45c76f3d..8e540dde1402 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fieldwnd.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2002-11-05 07:55:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,10 +112,12 @@ private: ScDPFieldType eType; /// Type of this area. Color aFaceColor; /// Color for dialog background. Color aWinColor; /// Color for window background. - Color aTextColor; /// Color for text output. + Color aTextColor; /// Color for text in buttons. + Color aWinTextColor; /// Color for text in field windows. long nFieldSize; /// Maximum count of fields. long nFieldCount; /// Count of existing fields. long nFieldSelected; /// Currently selected field. + bool mbAppRTL; /// true = Application in RTL display mode. com::sun::star::uno::WeakReference< ::drafts::com::sun::star::accessibility::XAccessible > xAccessible; ScAccessibleDataPilotControl* pAccessible; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index ee667fcaf3f0..905178b9c0ee 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inputwin.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: sab $ $Date: 2002-11-19 15:05:53 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,6 +146,7 @@ private: ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt EditView* pEditView; ScAccessibleEditLineTextData* pAccTextData; + BOOL bIsRTL; BOOL bIsInsertMode; BOOL bFormulaMode; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index b0eeecba6258..1c19586812fa 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: olinewin.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dr $ $Date: 2002-09-18 13:59:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,10 +86,15 @@ private: ScViewData& mrViewData; /// View data containing the document. ScSplitPos meWhich; /// Which area in split window. bool mbHoriz; /// true = Horizontal orientation. + bool mbAppRTL; /// true = Application in RTL display mode. + bool mbMirrorHdr; /// true = Header at end of the window (bottom or right). ImageList* mpSymbols; /// Symbols for buttons. Color maLineColor; /// Line color for expanded groups. - sal_Int32 mnHeaderSize; /// Width or height of header area. + sal_Int32 mnHeaderSize; /// Size of the header area in entry direction. + sal_Int32 mnHeaderPos; /// Position of the header area in entry direction. + sal_Int32 mnMainFirstPos; /// First position of main area in entry direction. + sal_Int32 mnMainLastPos; /// Last position of main area in entry direction. sal_uInt16 mnMTLevel; /// Mouse tracking: Level of active button. sal_uInt16 mnMTEntry; /// Mouse tracking: Entry index of active button. @@ -194,12 +199,23 @@ private: /** Collapses the specified entry (does nothing with header entries). */ void DoCollapse( sal_uInt16 nLevel, sal_uInt16 nEntry ) const; + /** Returns true, if the focused button is visible in the window. */ + bool IsFocusButtonVisible() const; + /** Calculates index of next/previous focus button in the current level (no paint). + @param bFindVisible true = repeats until a visible button has been found. @return true = focus wrapped from end to start or vice versa. */ - bool ImplMoveFocusByEntry( bool bForward ); + bool ImplMoveFocusByEntry( bool bForward, bool bFindVisible ); /** Calculates position of focus button in next/previous level (no paint). @return true = focus wrapped from end to start or vice versa. */ bool ImplMoveFocusByLevel( bool bForward ); + /** Calculates position of focus button in tab order. + @param bFindVisible true = repeats until a visible button has been found. + @return true = focus wrapped from end to start or vice versa. */ + bool ImplMoveFocusByTabOrder( bool bForward, bool bFindVisible ); + + /** If the focused entry is invisible, tries to move to visible position. */ + void ImplMoveFocusToVisible( bool bForward ); /** Focuses next/previous button in the current level. */ void MoveFocusByEntry( bool bForward ); diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 1d1b8835a719..d1c79f382263 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -2,9 +2,9 @@ * * $RCSfile: output.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2002-11-12 09:21:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,6 +170,7 @@ private: BOOL bAnyRotated; // intern BOOL bAnyClipped; // intern BOOL bTabProtected; + BYTE nTabTextDirection; // EEHorizontalTextDirection values // private Methoden @@ -180,6 +181,9 @@ private: BOOL IsEmptyCellText( RowInfo* pThisRowInfo, USHORT nX, USHORT nY ); void GetVisibleCell( USHORT nCol, USHORT nRow, USHORT nTab, ScBaseCell*& rpCell ); + BOOL IsAvailable( USHORT nX, USHORT nY ); + long GetAvailableWidth( USHORT nX, USHORT nY, long nNeeded ); + void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); @@ -187,6 +191,8 @@ private: double GetStretch(); + void DrawRotatedFrame( const Color* pForceColor ); // pixel + public: ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, RowInfo* pNewRowInfo, USHORT nNewCount, @@ -232,7 +238,6 @@ public: void DrawEdit(BOOL bPixelToLogic); void FindRotated(); - void DrawRotatedFrame(); // Pixel void DrawRotated(BOOL bPixelToLogic); // logisch void DrawClear(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index b32e940803e1..53dba57e003c 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: preview.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2002-09-02 14:34:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,6 +160,8 @@ public: DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* ); static void StaticInvalidate(); + + FmFormView* GetDrawView() { return pDrawView; } }; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index a139d641f15b..c1840ca13591 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: prevwsh.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: nn $ $Date: 2002-02-27 19:34:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,7 @@ class ScPreviewShell: public SfxViewShell Window* pCorner; String aSourceData; // ViewData + BYTE nSourceDesignMode; // form design mode from TabView SvxZoomType eZoom; SfxBroadcaster* pAccessibilityBroadcaster; @@ -150,6 +151,7 @@ public: void FillFieldData( ScHeaderFieldData& rData ); const String& GetSourceData() const { return aSourceData; } + BYTE GetSourceDesignMode() const { return nSourceDesignMode; } virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ); @@ -168,6 +170,7 @@ public: const ScPreviewLocationData& GetLocationData(); ScDocument* GetDocument(); + ScPreview* GetPreview() { return pPreview; } }; diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index bbf64819b7da..1c4a92d683ea 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pvlaydlg.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dr $ $Date: 2002-10-21 17:48:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,11 +140,14 @@ public: PointerStyle NotifyMouseButtonDown( ScDPFieldType eType, long nFieldIndex ); void NotifyMouseButtonUp ( const Point& rAt ); PointerStyle NotifyMouseMove ( const Point& rAt ); - void NotifyFieldFocus ( ScDPFieldType eType, BOOL bActive ); + void NotifyFieldFocus ( ScDPFieldType eType, BOOL bGotFocus ); void NotifyMoveField ( ScDPFieldType eToType ); void NotifyRemoveField ( ScDPFieldType eType, long nFieldIndex ); BOOL NotifyMoveSlider ( USHORT nKeyCode ); // return TRUE, if position changed +protected: + virtual void Deactivate(); + private: FixedLine aFlLayout; FixedText aFtCol; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index a824b1ca987d..a6b80d410ded 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: nn $ $Date: 2002-11-28 14:58:45 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,6 +105,7 @@ struct ChartSelectionInfo; class SdrHdlList; #define SPLIT_HANDLE_SIZE 3 +#define SC_FORCEMODE_NONE 0xff // --------------------------------------------------------------------------- // Hilfs - Fenster @@ -235,7 +236,7 @@ protected: void DrawEnableAnim(BOOL bSet); void DrawShowMarkHdl(BOOL bShow); - void MakeDrawView(); + void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); void HideNoteMarker(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 8a581cf73bdc..6c35a90b8dd9 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: sab $ $Date: 2002-10-18 12:29:38 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,7 +213,7 @@ private: private: - void Construct(); + void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); void SetMySubShell( SfxShell* pShell ); SfxShell* GetMySubShell() const; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 120427a83a21..cfb6d97528c8 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tphf.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:01 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6843d2438a8a..e8eb14c46c52 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewdata.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sab $ $Date: 2002-10-18 12:29:36 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -405,7 +405,7 @@ public: { return pEditView[eWhich]; } void EditGrowX(); - void EditGrowY(); + void EditGrowY( BOOL bInitial = FALSE ); USHORT GetEditViewCol() const { return nEditCol; } USHORT GetEditViewRow() const { return nEditRow; } |