diff options
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.hxx | 43 | ||||
-rw-r--r-- | include/vcl/textview.hxx | 14 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 26 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 204 |
4 files changed, 146 insertions, 141 deletions
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 1165667235dc..ce8e8ddce6d3 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -71,7 +71,7 @@ namespace dbaui class ClipboardInvalidator { private: - AutoTimer m_aInvalidateTimer; + AutoTimer m_aInvalidateTimer; OTableEditorCtrl* m_pOwner; public: @@ -84,7 +84,7 @@ namespace dbaui friend class OTableEditorCtrl::ClipboardInvalidator; - ClipboardInvalidator m_aInvalidate; + ClipboardInvalidator m_aInvalidate; protected: virtual void Command( const CommandEvent& rEvt ); @@ -115,40 +115,45 @@ namespace dbaui virtual sal_Bool IsInsertNewAllowed( long nRow ); virtual sal_Bool IsDeleteAllowed( long nRow ); - void ClearModified(); + void ClearModified(); - void SetPrimaryKey( sal_Bool bSet ); - sal_Bool IsPrimaryKey(); + void SetPrimaryKey( sal_Bool bSet ); + sal_Bool IsPrimaryKey(); DECL_LINK(ControlPreNotifyHdl, NotifyEvent*); public: OTableEditorCtrl(Window* pParentWin); - virtual ~OTableEditorCtrl(); - virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); - virtual void UpdateAll(); + virtual ~OTableEditorCtrl(); + virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); + virtual void UpdateAll(); SfxUndoManager& GetUndoManager() const; - void SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); } - sal_Bool SaveCurRow(); - void SwitchType( const TOTypeInfoSP& _pType ); + void SetDescrWin( OTableFieldDescWin* pWin ) + { + pDescrWin = pWin; + if (pDescrWin && pActRow) + pDescrWin->DisplayData(pActRow->GetActFieldDescr()); + } + sal_Bool SaveCurRow(); + void SwitchType( const TOTypeInfoSP& _pType ); /// force displaying of the given row - void DisplayData( long nRow, sal_Bool bGrabFocus = sal_True ); + void DisplayData( long nRow, sal_Bool bGrabFocus = sal_True ); - virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ); - virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rSaveData ); + virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ); + virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rSaveData ); virtual ::com::sun::star::uno::Any GetCellData( long nRow, sal_uInt16 nColId ); - virtual void SetControlText( long nRow, sal_uInt16 nColId, const String& rText ); - virtual String GetControlText( long nRow, sal_uInt16 nColId ); + virtual void SetControlText( long nRow, sal_uInt16 nColId, const String& rText ); + virtual String GetControlText( long nRow, sal_uInt16 nColId ); virtual OTableDesignView* GetView() const; ::std::vector< ::boost::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; } ::boost::shared_ptr<OTableRow> GetActRow(){ return pActRow; } - void CellModified( long nRow, sal_uInt16 nColId ); - void SetReadOnly( sal_Bool bRead=sal_True ); + void CellModified( long nRow, sal_uInt16 nColId ); + void SetReadOnly( sal_Bool bRead=sal_True ); virtual void Init(); virtual void DeactivateCell(sal_Bool bUpdate = sal_True); @@ -160,7 +165,7 @@ namespace dbaui OFieldDescription* GetFieldDescr( long nRow ); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); // IClipboardTest virtual sal_Bool isCutAllowed() { return IsCutAllowed(); } diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 1f9b310c176e..e25b6381c9b2 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -127,7 +127,7 @@ public: void InsertText( const OUString& rNew, sal_Bool bSelect = sal_False ); - sal_Bool KeyInput( const KeyEvent& rKeyEvent ); + sal_Bool KeyInput( const KeyEvent& rKeyEvent ); void Paint( const Rectangle& rRect ); void MouseButtonUp( const MouseEvent& rMouseEvent ); void MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -144,7 +144,7 @@ public: void Undo(); void Redo(); - sal_Bool Read( SvStream& rInput ); + sal_Bool Read( SvStream& rInput ); void SetStartDocPos( const Point& rPos ); const Point& GetStartDocPos() const; @@ -153,18 +153,18 @@ public: Point GetWindowPos( const Point& rDocPos ) const; void SetInsertMode( sal_Bool bInsert ); - sal_Bool IsInsertMode() const; + sal_Bool IsInsertMode() const; void SetAutoIndentMode( sal_Bool bAutoIndent ); void SetReadOnly( sal_Bool bReadOnly ); - sal_Bool IsReadOnly() const; + sal_Bool IsReadOnly() const; void SetAutoScroll( sal_Bool bAutoScroll ); - sal_Bool IsAutoScroll() const; + sal_Bool IsAutoScroll() const; - sal_Bool SetCursorAtPoint( const Point& rPointPixel ); - sal_Bool IsSelectionAtPoint( const Point& rPointPixel ); + sal_Bool SetCursorAtPoint( const Point& rPointPixel ); + sal_Bool IsSelectionAtPoint( const Point& rPointPixel ); void SetPaintSelection( sal_Bool bPaint); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 206c2a0584d3..21b395211699 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -78,28 +78,28 @@ struct ImpSdrPathDragData : public SdrDragStatUserData XPolygon aXP; // section of the original polygon bool bValid; // FALSE = too few points bool bClosed; // closed object? - sal_uInt16 nPoly; // number of the polygon in the PolyPolygon - sal_uInt16 nPnt; // number of point in the above polygon - sal_uInt16 nPntAnz; // number of points of the polygon - sal_uInt16 nPntMax; // maximum index + sal_uInt16 nPoly; // number of the polygon in the PolyPolygon + sal_uInt16 nPnt; // number of point in the above polygon + sal_uInt16 nPntAnz; // number of points of the polygon + sal_uInt16 nPntMax; // maximum index bool bBegPnt; // dragged point is first point of a Polyline bool bEndPnt; // dragged point is finishing point of a Polyline - sal_uInt16 nPrevPnt; // index of previous point - sal_uInt16 nNextPnt; // index of next point + sal_uInt16 nPrevPnt; // index of previous point + sal_uInt16 nNextPnt; // index of next point bool bPrevIsBegPnt; // previous point is first point of a Polyline bool bNextIsEndPnt; // next point is first point of a Polyline - sal_uInt16 nPrevPrevPnt; // index of point before previous point - sal_uInt16 nNextNextPnt; // index of point after next point + sal_uInt16 nPrevPrevPnt; // index of point before previous point + sal_uInt16 nNextNextPnt; // index of point after next point bool bControl; // point is a control point bool bIsPrevControl; // point is a control point before a support point bool bIsNextControl; // point is a control point after a support point bool bPrevIsControl; // if nPnt is a support point: a control point comes before bool bNextIsControl; // if nPnt is a support point: a control point comes after - sal_uInt16 nPrevPrevPnt0; - sal_uInt16 nPrevPnt0; - sal_uInt16 nPnt0; - sal_uInt16 nNextPnt0; - sal_uInt16 nNextNextPnt0; + sal_uInt16 nPrevPrevPnt0; + sal_uInt16 nPrevPnt0; + sal_uInt16 nPnt0; + sal_uInt16 nNextPnt0; + sal_uInt16 nNextNextPnt0; bool bEliminate; // delete point? (is set by MovDrag) bool mbMultiPointDrag; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 3d690792a361..cd1fefe85445 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1569,64 +1569,64 @@ public: /* bei nFib >= 103 gehts weiter: */ - sal_uInt32 fNoTabForInd :1; // see above in compatability options - sal_uInt32 fNoSpaceRaiseLower :1; // see above - sal_uInt32 fSupressSpbfAfterPageBreak :1; // see above - sal_uInt32 fWrapTrailSpaces :1; // see above - sal_uInt32 fMapPrintTextColor :1; // see above - sal_uInt32 fNoColumnBalance :1; // see above - sal_uInt32 fConvMailMergeEsc :1; // see above - sal_uInt32 fSupressTopSpacing :1; // see above - sal_uInt32 fOrigWordTableRules :1; // see above - sal_uInt32 fTransparentMetafiles :1; // see above - sal_uInt32 fShowBreaksInFrames :1; // see above - sal_uInt32 fSwapBordersFacingPgs :1; // see above - sal_uInt32 fCompatabilityOptions_Unknown1_13 :1; // #i78591# - sal_uInt32 fExpShRtn :1; // #i78591# and #i56856# - sal_uInt32 fCompatabilityOptions_Unknown1_15 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_16 :1; // #i78591# - sal_uInt32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top - // of page like MacWord 5.x - sal_uInt32 fTruncDxaExpand :1; // Expand/Condense by whole number of points - sal_uInt32 fPrintBodyBeforeHdr :1; // Print body text before header/footer - sal_uInt32 fNoLeading :1; // Don't add extra spacebetween rows of text - sal_uInt32 fCompatabilityOptions_Unknown1_21 :1; // #i78591# - sal_uInt32 fMWSmallCaps : 1; // Use larger small caps like MacWord 5.x - sal_uInt32 fCompatabilityOptions_Unknown1_23 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_24 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_25 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_26 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_27 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_28 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_29 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_30 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown1_31 :1; // #i78591# - sal_uInt32 fUsePrinterMetrics : 1; //The magic option + sal_uInt32 fNoTabForInd : 1; // see above in compatability options + sal_uInt32 fNoSpaceRaiseLower : 1; // see above + sal_uInt32 fSupressSpbfAfterPageBreak : 1; // see above + sal_uInt32 fWrapTrailSpaces : 1; // see above + sal_uInt32 fMapPrintTextColor : 1; // see above + sal_uInt32 fNoColumnBalance : 1; // see above + sal_uInt32 fConvMailMergeEsc : 1; // see above + sal_uInt32 fSupressTopSpacing : 1; // see above + sal_uInt32 fOrigWordTableRules : 1; // see above + sal_uInt32 fTransparentMetafiles : 1; // see above + sal_uInt32 fShowBreaksInFrames : 1; // see above + sal_uInt32 fSwapBordersFacingPgs : 1; // see above + sal_uInt32 fCompatabilityOptions_Unknown1_13 : 1; // #i78591# + sal_uInt32 fExpShRtn : 1; // #i78591# and #i56856# + sal_uInt32 fCompatabilityOptions_Unknown1_15 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_16 : 1; // #i78591# + sal_uInt32 fSuppressTopSpacingMac5 : 1; // Suppress extra line spacing at top + // of page like MacWord 5.x + sal_uInt32 fTruncDxaExpand : 1; // Expand/Condense by whole number of points + sal_uInt32 fPrintBodyBeforeHdr : 1; // Print body text before header/footer + sal_uInt32 fNoLeading : 1; // Don't add extra spacebetween rows of text + sal_uInt32 fCompatabilityOptions_Unknown1_21 : 1; // #i78591# + sal_uInt32 fMWSmallCaps : 1; // Use larger small caps like MacWord 5.x + sal_uInt32 fCompatabilityOptions_Unknown1_23 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_24 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_25 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_26 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_27 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_28 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_29 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_30 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_31 : 1; // #i78591# + sal_uInt32 fUsePrinterMetrics : 1; //The magic option // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! /* bei nFib > 105 gehts weiter: */ - sal_Int16 adt; // Autoformat Document Type: - // 0 for normal. - // 1 for letter, and - // 2 for email. - WW8DopTypography doptypography; // see WW8STRUC.HXX - WW8_DOGRID dogrid; // see WW8STRUC.HXX - sal_uInt16 :1; // reserved - sal_uInt16 lvl :4; // Which outline levels are showing in outline view - sal_uInt16 :4; // reserved - sal_uInt16 fHtmlDoc :1; // This file is based upon an HTML file - sal_uInt16 :1; // reserved - sal_uInt16 fSnapBorder :1; // Snap table and page borders to page border - sal_uInt16 fIncludeHeader :1; // Place header inside page border - sal_uInt16 fIncludeFooter :1; // Place footer inside page border - sal_uInt16 fForcePageSizePag :1; // Are we in online view - sal_uInt16 fMinFontSizePag :1; // Are we auto-promoting fonts to >= hpsZoonFontPag? - sal_uInt16 fHaveVersions :1; // versioning is turned on - sal_uInt16 fAutoVersion :1; // autoversioning is enabled - sal_uInt16 : 14; // reserved + sal_Int16 adt; // Autoformat Document Type: + // 0 for normal. + // 1 for letter, and + // 2 for email. + WW8DopTypography doptypography; // see WW8STRUC.HXX + WW8_DOGRID dogrid; // see WW8STRUC.HXX + sal_uInt16 : 1; // reserved + sal_uInt16 lvl : 4; // Which outline levels are showing in outline view + sal_uInt16 : 4; // reserved + sal_uInt16 fHtmlDoc : 1; // This file is based upon an HTML file + sal_uInt16 : 1; // reserved + sal_uInt16 fSnapBorder : 1; // Snap table and page borders to page border + sal_uInt16 fIncludeHeader : 1; // Place header inside page border + sal_uInt16 fIncludeFooter : 1; // Place footer inside page border + sal_uInt16 fForcePageSizePag : 1; // Are we in online view + sal_uInt16 fMinFontSizePag : 1; // Are we auto-promoting fonts to >= hpsZoonFontPag? + sal_uInt16 fHaveVersions : 1; // versioning is turned on + sal_uInt16 fAutoVersion : 1; // autoversioning is enabled + sal_uInt16 : 14; // reserved // Skip 12 Bytes here: ASUMI sal_Int32 cChWS; sal_Int32 cChWSFtnEdn; @@ -1640,56 +1640,56 @@ public: sal_Int16 hpsZoonFontPag; sal_Int16 dywDispPag; - sal_uInt32 fCompatabilityOptions_Unknown2_1 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_2 :1; // #i78591# - sal_uInt32 fDontUseHTMLAutoSpacing:1; - sal_uInt32 fCompatabilityOptions_Unknown2_4 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_5 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_6 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_7 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_8 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_9 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_10 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_11 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_12 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_13 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_14 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_15 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_16 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_17 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_18 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_19 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_20 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_21 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_22 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_23 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_24 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_25 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_26 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_27 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_28 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_29 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_30 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_31 :1; // #i78591# - sal_uInt32 fCompatabilityOptions_Unknown2_32 :1; // #i78591# - - sal_uInt16 fUnknown3:15; - sal_uInt16 fUseBackGroundInAllmodes:1; - - sal_uInt16 fDoNotEmbedSystemFont:1; - sal_uInt16 fWordCompat:1; - sal_uInt16 fLiveRecover:1; - sal_uInt16 fEmbedFactoids:1; - sal_uInt16 fFactoidXML:1; - sal_uInt16 fFactoidAllDone:1; - sal_uInt16 fFolioPrint:1; - sal_uInt16 fReverseFolio:1; - sal_uInt16 iTextLineEnding:3; - sal_uInt16 fHideFcc:1; - sal_uInt16 fAcetateShowMarkup:1; - sal_uInt16 fAcetateShowAtn:1; - sal_uInt16 fAcetateShowInsDel:1; - sal_uInt16 fAcetateShowProps:1; + sal_uInt32 fCompatabilityOptions_Unknown2_1 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_2 : 1; // #i78591# + sal_uInt32 fDontUseHTMLAutoSpacing : 1; + sal_uInt32 fCompatabilityOptions_Unknown2_4 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_5 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_6 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_7 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_8 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_9 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_10 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_11 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_12 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_13 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_14 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_15 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_16 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_17 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_18 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_19 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_20 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_21 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_22 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_23 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_24 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_25 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_26 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_27 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_28 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_29 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_30 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_31 : 1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_32 : 1; // #i78591# + + sal_uInt16 fUnknown3 : 15; + sal_uInt16 fUseBackGroundInAllmodes : 1; + + sal_uInt16 fDoNotEmbedSystemFont : 1; + sal_uInt16 fWordCompat : 1; + sal_uInt16 fLiveRecover : 1; + sal_uInt16 fEmbedFactoids : 1; + sal_uInt16 fFactoidXML : 1; + sal_uInt16 fFactoidAllDone : 1; + sal_uInt16 fFolioPrint : 1; + sal_uInt16 fReverseFolio : 1; + sal_uInt16 iTextLineEnding : 3; + sal_uInt16 fHideFcc : 1; + sal_uInt16 fAcetateShowMarkup : 1; + sal_uInt16 fAcetateShowAtn : 1; + sal_uInt16 fAcetateShowInsDel : 1; + sal_uInt16 fAcetateShowProps : 1; // 2. Initialisier-Dummy: sal_uInt8 nDataEnd; |