[Libreoffice-commits] core.git: 8 commits - cli_ure/source connectivity/source dbaccess/source drawinglayer/source extensions/source filter/source framework/inc framework/source i18npool/source include/drawinglayer include/editeng include/o3tl include/sot include/svl include/svx include/unotools include/vcl linguistic/source lotuswordpro/source reportdesign/inc rsc/inc sax/test sd/source sfx2/source svtools/source svx/source sw/source tubes/source unoxml/test vcl/coretext vcl/source vcl/unx vcl/win xmloff/inc
Philipp Riemer
ruderphilipp at gmail.com
Sat Aug 31 13:42:19 PDT 2013
cli_ure/source/uno_bridge/cli_data.cxx | 28 -
connectivity/source/commontools/dbtools.cxx | 116 +---
connectivity/source/drivers/ado/APreparedStatement.cxx | 79 ---
dbaccess/source/ui/querydesign/querycontroller.cxx | 12
dbaccess/source/ui/tabledesign/TEditControl.hxx | 59 +-
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 3
drawinglayer/source/processor2d/vclprocessor2d.cxx | 21
extensions/source/abpilot/admininvokationimpl.hxx | 15
extensions/source/ole/unoobjw.cxx | 38 -
filter/source/msfilter/util.cxx | 1
framework/inc/helper/oframes.hxx | 46 -
framework/inc/interaction/quietinteraction.hxx | 8
framework/source/fwi/classes/protocolhandlercache.cxx | 16
framework/source/uiconfiguration/imagemanagerimpl.hxx | 4
framework/source/uielement/statusbarmanager.cxx | 1
i18npool/source/transliteration/transliteration_body.cxx | 9
include/drawinglayer/processor3d/zbufferprocessor3d.hxx | 27 -
include/editeng/boxitem.hxx | 11
include/o3tl/lazy_update.hxx | 11
include/sot/exchange.hxx | 47 -
include/svl/filerec.hxx | 206 +-------
include/svl/itempool.hxx | 18
include/svx/svdobj.hxx | 38 -
include/unotools/bootstrap.hxx | 6
include/vcl/textview.hxx | 16
linguistic/source/misc.cxx | 40 -
lotuswordpro/source/filter/lwpnumericfmt.hxx | 12
reportdesign/inc/RptModel.hxx | 12
rsc/inc/rsckey.hxx | 3
sax/test/sax/testsax.cxx | 81 ---
sd/source/core/drawdoc.cxx | 20
sd/source/ui/view/outlview.cxx | 39 -
sfx2/source/view/viewprn.cxx | 33 -
svtools/source/control/fmtfield.cxx | 115 ----
svx/source/fmcomp/fmgridcl.cxx | 61 --
svx/source/fmcomp/gridctrl.cxx | 355 ++++---------
svx/source/svdraw/svdibrow.cxx | 13
svx/source/svdraw/svdopath.cxx | 35 -
svx/source/unodraw/unopage.cxx | 48 -
sw/source/core/txtnode/swfont.cxx | 64 --
sw/source/core/txtnode/txtedt.cxx | 82 +--
sw/source/filter/html/htmlform.cxx | 12
sw/source/filter/html/parcss1.hxx | 177 +++---
sw/source/filter/ww8/ww8scan.hxx | 384 ++++++---------
sw/source/filter/ww8/ww8toolbar.cxx | 18
sw/source/filter/ww8/ww8toolbar.hxx | 43 +
sw/source/ui/shells/grfsh.cxx | 30 -
sw/source/ui/uiview/swcli.cxx | 2
sw/source/ui/uiview/viewtab.cxx | 10
tubes/source/manager.cxx | 11
unoxml/test/domtest.cxx | 6
vcl/coretext/ctlayout.cxx | 27 -
vcl/source/app/svapp.cxx | 217 --------
vcl/source/filter/sgvmain.hxx | 18
vcl/source/gdi/pdfwriter_impl.cxx | 160 ++----
vcl/unx/generic/app/keysymnames.cxx | 1
vcl/win/source/gdi/salprn.cxx | 89 ---
xmloff/inc/txtfldi.hxx | 146 -----
58 files changed, 862 insertions(+), 2338 deletions(-)
New commits:
commit 7bd0adc64b96d523b62ce9dda9e34aedff6b33d4
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Aug 31 22:40:00 2013 +0200
fix indentation
Change-Id: Iea68e50e9f91c3fa2467201247bd1aaf4e943cf0
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 1165667..ce8e8dd 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 1f9b310..e25b638 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 206c2a0..21b3952 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 3d69079..cd1fefe 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;
commit fe8e41928d3a1f2394d26c45ad9577c1c2d93135
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Aug 31 22:37:30 2013 +0200
fdo#39468: Translate German comments
Change-Id: I9ccb6453fbebf03d44d3f5b385fa5a49579da873
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 2679fdf..1165667 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -66,7 +66,8 @@ namespace dbaui
sal_Bool bSaveOnMove;
sal_Bool bReadOnly;
- // Hilfsklasse
+
+ // helper class
class ClipboardInvalidator
{
private:
@@ -98,8 +99,8 @@ namespace dbaui
virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
virtual void CellModified();
- virtual sal_Bool SaveModified(); // wird aufgerufen vor einem Zellenwechsel
- // return sal_False, verhindert Zellenwechsel
+ virtual sal_Bool SaveModified(); // is called before changing a cell (false prevents change)
+
virtual void Undo();
virtual void Redo();
virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const;
@@ -132,8 +133,8 @@ namespace dbaui
sal_Bool SaveCurRow();
void SwitchType( const TOTypeInfoSP& _pType );
+ /// force displaying of the given row
void DisplayData( long nRow, sal_Bool bGrabFocus = sal_True );
- // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist)
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 );
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 67fa57d..e7aa7aa 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -56,7 +56,7 @@ sal_Bool OTableFieldControl::IsReadOnly()
sal_Bool bRead(GetCtrl()->IsReadOnly());
if( !bRead )
{
- // Die Spalten einer ::com::sun::star::sdbcx::View konnen nicht verindert werden
+ // The columns of a ::com::sun::star::sdbcx::View could not be locked
Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable();
if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == OUString("VIEW"))
bRead = sal_True;
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index bdc2899..e4df9f9 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -57,11 +57,10 @@ typedef ::std::list< DataFlavorEx > DataFlavorEx
SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector,
sal_uLong nId );
-// - Vordefinierte Formate -
+// - predefined formats -
+// Do NOT change the order of these values as the implementation depends on them!
-// Die Reihenfolge und die Werte d?rfen nicht ge?ndert werden,
-// da die Implementation sich darauf verl??t.
-// Standard-Formate fuer die es auch Copy/Paste-Methoden gibt
+// stardard formats for that Copy/Paste methods exist
#define FORMAT_STRING 1
#define FORMAT_BITMAP 2
#define FORMAT_GDIMETAFILE 3
@@ -69,10 +68,10 @@ SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVec
#define FORMAT_FILE 5
#define FORMAT_FILE_LIST 6
-// Weitere Standardformate (diese gehen nur ueber CopyData/PasteData)
+// further formats (only via CopyData/PasteData)
#define FORMAT_RTF 10
-// Source-Options
+// source options
#define EXCHG_SOURCE_MOVEABLE ((sal_uInt16)0x0001)
#define EXCHG_SOURCE_COPYABLE ((sal_uInt16)0x0002)
#define EXCHG_SOURCE_LINKABLE ((sal_uInt16)0x0004)
@@ -81,7 +80,7 @@ SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVec
#define EXCHG_SOURCE_ALL ((sal_uInt16)0x001F)
#define EXCHG_SOURCE_DEF_COPYABLE ((sal_uInt16)0x0020)
-// Aktionen
+// actions
#define EXCHG_ACTION_MASK ((sal_uInt16)0x00FF)
#define EXCHG_INOUT_ACTION_NONE ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE)
#define EXCHG_IN_ACTION_DEFAULT EXCHG_INOUT_ACTION_NONE
@@ -123,7 +122,7 @@ SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVec
#define EXCHG_OUT_ACTION_FLAG_FILL ((sal_uInt16)0x1000)
#define EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL ((sal_uInt16)0x2000)
-// Ziele
+// destinations
#define EXCHG_DEST_DOC_OLEOBJ 1
#define EXCHG_DEST_CHARTDOC_OLEOBJ 2
#define EXCHG_DEST_DOC_TEXTFRAME 3
@@ -158,10 +157,8 @@ public:
static bool IsInternal( const SvGlobalName& );
static sal_uLong GetFormatIdFromMimeType( const OUString& rMimeType );
- // bestimme die SotFormatStringId von dem registrierten Format
- //JP 12.11.98: diese 3 Methoden sind ab sofort ueberfluessig, da
- // die ClipboardIds statisch sind und aequivalent zur
- // SotFormatStringId ist!
+ // determine the SotFormatStringId for the registered format
+//FIXME JP 12.11.98: this three methods are obsolete as all ClipboardIds are static and equvialent to the SotFormatStringIds!
static SotFormatStringId GetFormatStringId( sal_uLong nFormat )
{ return nFormat; }
static SotFormatStringId GetFormatStringId( const OUString& rName )
@@ -173,15 +170,15 @@ public:
static sal_uInt16 GetExchangeAction(
// XTransferable
const DataFlavorExVector& rDataFlavorExVector,
- // Ziel der Aktion (EXCHG_DEST_*)
+ // destination of an action (EXCHG_DEST_*)
sal_uInt16 nDestination,
- // Aktionen, die Quelle unterstuetzt (EXCHG_SOURCE_...)
+ // action for a source (EXCHG_SOURCE_...)
sal_uInt16 nSourceOptions,
- // vom Anwender gewaehlte Aktion (EXCHG_IN_*, EXCHG_INOUT_*)
+ // user action (EXCHG_IN_*, EXCHG_INOUT_*)
sal_uInt16 nUserAction,
- // In:- Out: Zu benutzendes Format
+ // In:- Out: format to use
sal_uLong& rFormat,
- // In:- Out: Default-Action (EXCHG_IN_*, EXCHG_INOUT_*)
+ // In:- Out: default action (EXCHG_IN_*, EXCHG_INOUT_*)
sal_uInt16& rDefaultAction,
// In:- optional - check only for this specific format
sal_uLong nOnlyTestFormat = 0,
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 1749424..233ff2e 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -545,8 +545,7 @@ void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel)
SpinField::SetText(rNew, aSel);
}
- m_bValueDirty = sal_True;
- // muss nicht stimmen, aber sicherheitshalber ...
+ m_bValueDirty = sal_True; // not always necessary, but better re-evaluate for safety reasons
}
long FormattedField::PreNotify(NotifyEvent& rNEvt)
@@ -565,14 +564,15 @@ void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey)
sal_Bool bNeedFormatter = (m_pFormatter == NULL) && (nFormatKey != 0);
if (bNeedFormatter)
{
- ImplGetFormatter(); // damit wird ein Standard-Formatter angelegt
+ ImplGetFormatter(); // this creates a standard formatter
+ // It might happen that the standard formatter makes no sense here, but it takes a default
+ // format. Thus, it is possible to set one of the other standard keys (which are spanning
+ // across multiple formatters).
m_nFormatKey = nFormatKey;
- // kann sein, dass das in dem Standard-Formatter keinen Sinn macht, aber der nimmt dann ein Default-Format an.
- // Auf diese Weise kann ich einfach einen der - formatteruebergreifended gleichen - Standard-Keys setzen.
+ // When calling SetFormatKey without a formatter, the key must be one of the standard values
+ // that is available for all formatters (and, thus, also in this new one).
DBG_ASSERT(m_pFormatter->GetEntry(nFormatKey) != NULL, "FormattedField::ImplSetFormatKey : invalid format key !");
- // Wenn SetFormatKey aufgerufen wird, ohne dass ein Formatter existiert, muss der Key einer der Standard-Werte
- // sein, der in allen Formattern (also auch in meinem neu angelegten) vorhanden ist.
}
}
@@ -611,11 +611,11 @@ void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bReset
sal_uInt32 nDestKey = pFormatter->TestNewString(sOldFormat);
if (nDestKey == NUMBERFORMAT_ENTRY_NOT_FOUND)
{
- // die Sprache des neuen Formatters
+ // language of the new formatter
const SvNumberformat* pDefaultEntry = pFormatter->GetEntry(0);
LanguageType aNewLang = pDefaultEntry ? pDefaultEntry->GetLanguage() : LANGUAGE_DONTKNOW;
- // den alten Format-String in die neue Sprache konvertieren
+ // convert the old format string into the new language
sal_Int32 nCheckPos;
short nType;
pFormatter->PutandConvertEntry(sOldFormat, nCheckPos, nType, nDestKey, aOldLang, aNewLang);
@@ -863,7 +863,7 @@ void FormattedField::SetMinValue(double dMin)
m_dMinValue = dMin;
m_bHasMin = sal_True;
- // fuer die Ueberpruefung des aktuellen Wertes an der neuen Grenze -> ImplSetValue
+ // for checking the current value at the new border -> ImplSetValue
ReFormat();
}
@@ -874,7 +874,7 @@ void FormattedField::SetMaxValue(double dMax)
m_dMaxValue = dMax;
m_bHasMax = sal_True;
- // fuer die Ueberpruefung des aktuellen Wertes an der neuen Grenze -> ImplSetValue
+ // for checking the current value at the new border -> ImplSetValue
ReFormat();
}
@@ -915,10 +915,10 @@ void FormattedField::ImplSetValue(double dVal, sal_Bool bForce)
OUString sNewText;
if (ImplGetFormatter()->IsTextFormat(m_nFormatKey))
{
- // zuerst die Zahl als String im Standard-Format
+ // first convert the number as string in standard format
OUString sTemp;
ImplGetFormatter()->GetOutputString(dVal, 0, sTemp, &m_pLastOutputColor);
- // dann den String entsprechend dem Text-Format
+ // than encode the string in the corresponding text format
{
ImplGetFormatter()->GetOutputString(sTemp, m_nFormatKey, sNewText, &m_pLastOutputColor);
}
@@ -955,13 +955,13 @@ sal_Bool FormattedField::ImplGetValue(double& dNewVal)
DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplGetValue : can't give you a current value without a formatter !");
- sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat veraendert den FormatKey ...
+ sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat changes the FormatKey!
if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber)
- // damit wir in einem als Text formatierten Feld trotzdem eine Eingabe wie '1,1' erkennen ...
+ // for detection of values like "1,1" in fields that are formated as text
nFormatKey = 0;
- // Sonderbehandlung fuer %-Formatierung
+ // special treatment for percentage formatting
if (ImplGetFormatter()->GetType(m_nFormatKey) == NUMBERFORMAT_PERCENT)
{
// the language of our format
@@ -973,8 +973,7 @@ sal_Bool FormattedField::ImplGetValue(double& dNewVal)
double dTemp;
if (m_pFormatter->IsNumberFormat(sText, nTempFormat, dTemp) &&
NUMBERFORMAT_NUMBER == m_pFormatter->GetType(nTempFormat))
- // der String entspricht einer Number-Formatierung, hat also nur kein %
- // -> append it
+ // the string is equivalent to a number formatted one (has no % sign) -> append it
sText += "%";
// (with this, a input of '3' becomes '3%', which then by the formatter is translated
// into 0.03. Without this, the formatter would give us the double 3 for an input '3',
@@ -1015,8 +1014,8 @@ double FormattedField::GetValue()
void FormattedField::Up()
{
DBG_CHKTHIS(FormattedField, NULL);
+ // setValue handles under- and overflows (min/max) automatically
SetValue(GetValue() + m_dSpinSize);
- // das setValue handelt Bereichsueberschreitungen (min/max) automatisch
SetModifyFlag();
Modify();
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 110a87c..4869e16 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -415,8 +415,8 @@ namespace
sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
{
- // Positionierung der Controls
- // Basisgroessen ermitteln
+ // positioning of the controls
+ // calculate base size
Rectangle aRect(((DbGridControl*)GetParent())->GetControlArea());
const long nH = aRect.GetSize().Height();
Size aBorder = LogicToPixel(Size(2, 2),MAP_APPFONT);
@@ -424,7 +424,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
sal_uInt16 nX = 1;
sal_uInt16 nY = 0;
- // Ist der Font des Edits groesser als das Feld?
+ // Is the font of this edit larger than the field?
if (m_aAbsolute.GetTextHeight() > nH)
{
Font aApplFont (m_aAbsolute.GetFont());
@@ -438,7 +438,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
m_aRecordCount.SetControlFont( aApplFont );
}
- // Controls Groessen und Positionen setzen
+ // set size and position of the control
OUString aText = m_aRecordText.GetText();
long nTextWidth = m_aRecordText.GetTextWidth(aText);
m_aRecordText.SetPosPixel(Point(nX,nY));
@@ -525,7 +525,7 @@ void DbGridControl::NavigationBar::InvalidateAll(sal_Int32 nCurrentPos, sal_Bool
sal_Int32 nAdjustedRowCount = pParent->GetRowCount() - ((pParent->GetOptions() & DbGridControl::OPT_INSERT) ? 2 : 1);
- // Wann muss alles invalidiert werden
+ // check if everything needs to be invalidated
bAll = bAll || m_nCurrentPos <= 0;
bAll = bAll || nCurrentPos <= 0;
bAll = bAll || m_nCurrentPos >= nAdjustedRowCount;
@@ -538,7 +538,7 @@ void DbGridControl::NavigationBar::InvalidateAll(sal_Int32 nCurrentPos, sal_Bool
while (ControlMap[i])
SetState(ControlMap[i++]);
}
- else // befindet sich in der Mitte
+ else // is in the center
{
m_nCurrentPos = nCurrentPos;
SetState(NavigationBar::RECORD_COUNT);
@@ -914,9 +914,7 @@ DbGridControl::DbGridControl(
void DbGridControl::InsertHandleColumn()
{
- // Handle Column einfuegen
- // Da die BrowseBox ohne handleColums Paintprobleme hat
- // wird diese versteckt
+ // BrowseBox has problems when painting without a handleColumn (hide it here)
if (HasHandle())
BrowseBox::InsertHandleColumn(GetDefaultColumnWidth(String()));
else
@@ -1078,7 +1076,7 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat )
void DbGridControl::RemoveRows(sal_Bool bNewCursor)
{
- // Hat sich der DatenCursor verandert ?
+ // Did the data cursor change?
if (!bNewCursor)
{
DELETEZ(m_pSeekCursor);
@@ -1101,8 +1099,8 @@ void DbGridControl::RemoveRows()
if (IsEditing())
DeactivateCell();
- // alle Columns deinitialisieren
- // existieren Spalten, dann alle Controller freigeben
+ // de-initialize all columns
+ // if there are columns, free all controllers
for (size_t i = 0; i < m_aColumns.size(); i++)
m_aColumns[ i ]->Clear();
@@ -1113,14 +1111,14 @@ void DbGridControl::RemoveRows()
m_nCurrentPos = m_nSeekPos = m_nTotalCount = -1;
m_nOptions = OPT_READONLY;
- // Anzahl Saetze im Browser auf 0 zuruecksetzen
+ // reset number of sentences to zero in the browser
DbGridControl_Base::RemoveRows();
m_aBar.InvalidateAll(m_nCurrentPos, sal_True);
}
void DbGridControl::ArrangeControls(sal_uInt16& nX, sal_uInt16 nY)
{
- // Positionierung der Controls
+ // positioning of the controls
if (m_bNavigationBar)
{
nX = m_aBar.GetDefaultWidth();
@@ -1134,8 +1132,7 @@ void DbGridControl::EnableHandle(sal_Bool bEnable)
if (m_bHandle == bEnable)
return;
- // HandleColumn wird nur ausgeblendet,
- // da es sonst etliche Probleme mit dem Zeichnen gibt
+ // HandleColumn is only hidden because there are a lot of problems while painting otherwise
RemoveColumn( HandleColumnId );
m_bHandle = bEnable;
InsertHandleColumn();
@@ -1191,7 +1188,7 @@ void DbGridControl::EnableNavigationBar(sal_Bool bEnable)
if ( adjustModeForScrollbars( m_nMode, m_bNavigationBar, m_bHideScrollbars ) )
SetMode( m_nMode );
- // liefert die Groesse der Reserved ControlArea
+ // get size of the reserved ControlArea
Point aPoint = GetControlArea().TopLeft();
sal_uInt16 nX = (sal_uInt16)aPoint.X();
@@ -1222,7 +1219,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt)
Reference< XPropertySet > xDataSourceSet = m_pDataCursor->getPropertySet();
if (xDataSourceSet.is())
{
- // feststellen welche Updatem??glichkeiten bestehen
+ // check what kind of options are available
sal_Int32 nPrivileges = 0;
xDataSourceSet->getPropertyValue(FM_PROP_PRIVILEGES) >>= nPrivileges;
if ((nPrivileges & Privilege::INSERT) == 0)
@@ -1365,7 +1362,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
return;
}
- // Hat sich der DatenCursor verandert ?
+ // did the data cursor change?
sal_uInt16 nCurPos = GetColumnPos(GetCurColumnId());
SetUpdateMode(sal_False);
@@ -1443,7 +1440,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
Reference< XPropertySet > xSet(_xCursor, UNO_QUERY);
if (xSet.is())
{
- // feststellen welche Updatemoeglichkeiten bestehen
+ // check what kind of options are available
sal_Int32 nConcurrency = ResultSetConcurrency::READ_ONLY;
xSet->getPropertyValue(FM_PROP_RESULTSET_CONCURRENCY) >>= nConcurrency;
@@ -1478,7 +1475,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
}
else
{
- // Duerfen Updates gemacht werden, kein Focus-RechtEck
+ // updates are allowed -> no focus rectangle
if ( m_nOptions & OPT_UPDATE )
m_nMode |= BROWSER_HIDECURSOR;
}
@@ -1543,7 +1540,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
}
}
- // Zur alten Spalte gehen
+ // go to the old column
if (nCurPos == BROWSER_INVALIDID || nCurPos >= ColCount())
nCurPos = 0;
@@ -1564,7 +1561,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
if (m_nMode != nOldMode)
SetMode(m_nMode);
- // beim Resizen wird RecalcRows gerufen
+ // RecalcRows was already called while resizing
if (!IsResizing() && GetRowCount())
RecalcRows(GetTopRow(), GetVisibleRows(), sal_True);
@@ -1776,7 +1773,7 @@ sal_Bool DbGridControl::SeekRow(long nRow)
return m_nSeekPos >= 0;
}
-// Wird aufgerufen, wenn die dargestellte Datenmenge sich aendert
+// Is called whenever the visible amount of data changes
void DbGridControl::VisibleRowsChanged( long nNewTopRow, sal_uInt16 nLinesOnScreen )
{
RecalcRows(nNewTopRow, nLinesOnScreen , sal_False);
@@ -1792,39 +1789,39 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_B
return;
}
- // ignore any updates implicit made
+ // ignore any implicitly made updates
bool bDisablePaint = !bUpdateCursor && IsPaintEnabled();
if (bDisablePaint)
EnablePaint(sal_False);
- // Cache an den sichtbaren Bereich anpassen
+ // adjust cache to the visible area
Reference< XPropertySet > xSet = m_pSeekCursor->getPropertySet();
sal_Int32 nCacheSize = 0;
xSet->getPropertyValue(FM_PROP_FETCHSIZE) >>= nCacheSize;
bool bCacheAligned = false;
- // Nach der Initialisierung (m_nSeekPos < 0) keine Cursorbewegung, da bereits auf den ersten
- // Satz positioniert
+ // no further cursor movements after initializing (m_nSeekPos < 0) because it is already
+ // positioned on the first sentence
long nDelta = nNewTopRow - GetTopRow();
- // Limit fuer relative Positionierung
+ // limit for relative positioning
long nLimit = (nCacheSize) ? nCacheSize / 2 : 0;
- // mehr Zeilen auf dem Bildschirm als im Cache
+ // more lines on screen than in cache
if (nLimit < nLinesOnScreen)
{
Any aCacheSize;
aCacheSize <<= sal_Int32(nLinesOnScreen*2);
xSet->setPropertyValue(FM_PROP_FETCHSIZE, aCacheSize);
- // jetzt auf alle Faelle den Cursor anpassen
+ // here we need to update the cursor for sure
bUpdateCursor = sal_True;
bCacheAligned = true;
nLimit = nLinesOnScreen;
}
- // Im folgenden werden die Positionierungen so vorgenommen, dass sichergestellt ist
- // dass ausreichend Zeilen im DatenCache vorhanden sind
+ // In the following, all positionings are done as it is
+ // ensured that there are enough lines in the data cache
- // Fenster geht nach unten, weniger als zwei Fenster Differenz
- // oder Cache angepasst und noch kein Rowcount
+ // window goes downwards with less than two windows difference or
+ // the cache was updated and no rowcount yet
if (nDelta < nLimit && (nDelta > 0
|| (bCacheAligned && m_nTotalCount < 0)) )
SeekCursor(nNewTopRow + nLinesOnScreen - 1, sal_False);
@@ -1885,36 +1882,34 @@ void DbGridControl::AdjustRows()
Reference< XPropertySet > xSet = m_pDataCursor->getPropertySet();
- // Aktualisieren des RecordCounts
+ // refresh RecordCount
sal_Int32 nRecordCount = 0;
xSet->getPropertyValue(FM_PROP_ROWCOUNT) >>= nRecordCount;
if (!m_bRecordCountFinal)
m_bRecordCountFinal = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ROWCOUNTFINAL));
- // hat sich die aktuelle Anzahl Rows veraendert
- // hierbei muss auch beruecksichtigt werden,
- // das eine zusaetzliche Zeile zum einfuegen von Datensaetzen vorhanden sein kann
+ // Did the number of rows change?
+ // Here we need to consider that there might be an additional row for adding new data sets
- // zusaetzliche AppendRow fuers einfuegen
+ // add additional AppendRow for insertion
if (m_nOptions & OPT_INSERT)
++nRecordCount;
- // wird gerade eingefuegt, dann gehoert die gerade hinzuzufuegende
- // Zeile nicht zum RecordCount und die Appendrow ebenfalls nicht
+ // If there is currently an insertion, so do not consider this added row in RecordCount or Appendrow
if (!IsUpdating() && m_bRecordCountFinal && IsModified() && m_xCurrentRow != m_xEmptyRow &&
m_xCurrentRow->IsNew())
++nRecordCount;
- // das ist mit !m_bUpdating abgesichert : innerhalb von SaveRow (m_bUpdating == sal_True) wuerde sonst der Datensatz, den ich editiere
- // (und den SaveRow gerade angefuegt hat, wodurch diese Methode hier getriggert wurde), doppelt zaehlen : einmal ist er schon
- // in dem normalen RecordCount drin, zum zweiten wuerde er hier gezaehlt werden (60787 - FS)
+ // ensured with !m_bUpdating: otherwise the edited data set (that SaveRow added and why this
+ // method was called) would be called twice (if m_bUpdating == sal_True): once in RecordCount
+ // and a second time here (60787 - FS)
if (nRecordCount != GetRowCount())
{
long nDelta = GetRowCount() - (long)nRecordCount;
- if (nDelta > 0) // zuviele
+ if (nDelta > 0) // too many
{
RowRemoved(GetRowCount() - nDelta, nDelta, sal_False);
- // es sind Zeilen weggefallen, dann ab der aktuellen Position neu zeichen
+ // some rows are gone, thus, repaint starting at the current position
Invalidate();
sal_Int32 nNewPos = AlignSeekCursor();
@@ -1929,7 +1924,7 @@ void DbGridControl::AdjustRows()
RecalcRows(GetTopRow(), GetVisibleRows(), sal_True);
m_aBar.InvalidateAll(m_nCurrentPos, sal_True);
}
- else // zuwenig
+ else // too few
RowInserted(GetRowCount(), -nDelta, sal_True);
}
@@ -2020,7 +2015,7 @@ sal_Bool DbGridControl::SetCurrent(long nNewRow)
try
{
- // Abgleichen der Positionen
+ // compare positions
if (SeekCursor(nNewRow))
{
if (IsFilterRow(nNewRow)) // special mode for filtering
@@ -2101,7 +2096,7 @@ void DbGridControl::CursorMoved()
{
DBG_CHKTHIS( DbGridControl, NULL );
- // CursorBewegung durch loeschen oder einfuegen von Zeilen
+ // cursor movement due to deletion or insertion of rows
if (m_pDataCursor && m_nCurrentPos != GetCurRow())
{
DeactivateCell(sal_True);
@@ -2151,8 +2146,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
{
SAL_INFO("svx.fmcomp", "DbGridControl::AdjustDataSource");
SolarMutexGuard aGuard;
- // wird die aktuelle Zeile gerade neu bestimmt,
- // wird kein abgleich vorgenommen
+ // If the current row is recalculated at the moment, do not adjust
if (bFull)
m_xCurrentRow = NULL;
@@ -2183,16 +2177,16 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
}
}
- // weg von der Row des DatenCursors
+ // away from the data cursor's row
if (m_xPaintRow == m_xCurrentRow)
m_xPaintRow = m_xSeekRow;
- // keine aktuelle Zeile dann komplett anpassen
+ // not up-to-date row, thus, adjust completely
if (!m_xCurrentRow)
AdjustRows();
sal_Int32 nNewPos = AlignSeekCursor();
- if (nNewPos < 0) // keine Position gefunden
+ if (nNewPos < 0)// could not find any position
return;
m_bInAdjustDataSource = sal_True;
@@ -2202,10 +2196,10 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
DbGridControl_Base::GoToRow(nNewPos);
if (!m_xCurrentRow.Is())
- // das tritt zum Beispiel auf, wenn man die n (n>1) letzten Datensaetze geloescht hat, waehrend der Cursor auf dem letzten
- // steht : AdjustRows entfernt dann zwei Zeilen aus der BrowseBox, wodurch diese ihre CurrentRow um zwei nach unten
- // korrigiert, so dass dann das GoToRow in's Leere laeuft (da wir uns ja angeblich schon an der richtigen Position
- // befinden)
+ // Happens e.g. when deleting the n last datasets (n>1) while the cursor was positioned
+ // on the last one. In this case, AdjustRows deletes two rows from BrowseBox, by what
+ // CurrentRow is corrected to point two rows down, so that GoToRow will point into
+ // emptiness (since we are - purportedly - at the correct position)
SetCurrent(nNewPos);
}
else
@@ -2215,7 +2209,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
}
m_bInAdjustDataSource = sal_False;
- // Wird der DatenCursor von aussen bewegt, wird die selektion aufgehoben
+ // if the data cursor was moved from outside, this section is voided
SetNoSelection();
m_aBar.InvalidateAll(m_nCurrentPos, m_xCurrentRow.Is());
}
@@ -2223,14 +2217,14 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
sal_Int32 DbGridControl::AlignSeekCursor()
{
DBG_CHKTHIS( DbGridControl, NULL );
- // Positioniert den SeekCursor auf den DatenCursor, Daten werden nicht uebertragen
+ // position SeekCursor onto the data cursor, no data transmission
if (!m_pSeekCursor)
return -1;
Reference< XPropertySet > xSet = m_pDataCursor->getPropertySet();
- // jetzt den seekcursor an den DatenCursor angleichen
+ // now align the seek cursor and the data cursor
if (::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISNEW)))
m_nSeekPos = GetRowCount() - 1;
else
@@ -2256,12 +2250,12 @@ sal_Int32 DbGridControl::AlignSeekCursor()
{
m_pSeekCursor->moveToBookmark(m_pDataCursor->getBookmark());
if (!CompareBookmark(m_pDataCursor->getBookmark(), m_pSeekCursor->getBookmark()))
- // dummerweise kann das moveToBookmark indirekt dazu fuehren, dass der Seek-Cursor wieder neu positoniert wird (wenn
- // naemlich das mit all seinen zu feuernden Events relativ komplexe moveToBookmark irgendwo ein Update ausloest),
- // also muss ich es nochmal versuchen
+ // unfortunately, moveToBookmark might lead to a re-positioning of the seek
+ // cursor (if the complex moveToBookmark with all its events fires an update
+ // somewhere) -> retry
m_pSeekCursor->moveToBookmark(m_pDataCursor->getBookmark());
- // Nicht dass das jetzt nicht auch schief gegangen sein koennte, aber es ist zumindest unwahrscheinlicher geworden.
- // Und die Alternative waere eine Schleife so lange bis es stimmt, und das kann auch nicht die Loesung sein
+ // Now there is still the chance of a failure but it is less likely.
+ // The alternative would be an loop until everything is fine - no good solution...
m_nSeekPos = m_pSeekCursor->getRow() - 1;
}
}
@@ -2275,7 +2269,7 @@ sal_Int32 DbGridControl::AlignSeekCursor()
sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute)
{
DBG_CHKTHIS( DbGridControl, NULL );
- // Positioniert den SeekCursor, Daten werden nicht uebertragen
+ // position SeekCursor onto the data cursor, no data transmission
// additions for the filtermode
if (IsFilterRow(nRow))
@@ -2287,22 +2281,20 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute)
if (!m_pSeekCursor)
return sal_False;
- // Befinden wir uns gerade beim Einfuegen
+ // is this an insertion?
if (IsValid(m_xCurrentRow) && m_xCurrentRow->IsNew() &&
nRow >= m_nCurrentPos)
{
- // dann darf auf alle Faelle nicht weiter nach unten gescrollt werden
- // da der letzte Datensatz bereits erreicht wurde!
+ // if so, scrolling down must be prevented as this is already the last data set!
if (nRow == m_nCurrentPos)
{
- // auf die aktuelle Zeile bewegt, dann muss kein abgleich gemacht werden, wenn
- // gerade ein Datensatz eingefuegt wird
+ // no adjustment necessary
m_nSeekPos = nRow;
}
- else if (IsInsertionRow(nRow)) // Leerzeile zum Einfuegen von Datensaetzen
+ else if (IsInsertionRow(nRow)) // blank row for data insertion
m_nSeekPos = nRow;
}
- else if (IsInsertionRow(nRow)) // Leerzeile zum Einfuegen von Datensaetzen
+ else if (IsInsertionRow(nRow)) // blank row for data insertion
m_nSeekPos = nRow;
else if ((-1 == nRow) && (GetRowCount() == ((m_nOptions & OPT_INSERT) ? 1 : 0)) && m_pSeekCursor->isAfterLast())
m_nSeekPos = nRow;
@@ -2336,7 +2328,7 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute)
}
else
{
- if (nSteps > 0) // auf den letzten benoetigten Datensatz positionieren
+ if (nSteps > 0) // position onto the last needed data set
{
if (m_pSeekCursor->isAfterLast())
bSuccess = sal_False;
@@ -2395,7 +2387,7 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute)
{
OSL_FAIL("DbGridControl::SeekCursor : failed ...");
DBG_UNHANDLED_EXCEPTION();
- m_nSeekPos = -1; // kein Datensatz mehr vorhanden
+ m_nSeekPos = -1; // no further data set available
}
}
return m_nSeekPos == nRow;
@@ -2412,7 +2404,7 @@ void DbGridControl::MoveToLast()
if (!m_pSeekCursor)
return;
- if (m_nTotalCount < 0) // RecordCount steht noch nicht fest
+ if (m_nTotalCount < 0) // no RecordCount, yet
{
try
{
@@ -2429,7 +2421,7 @@ void DbGridControl::MoveToLast()
}
}
- // auf den letzen Datensatz positionieren, nicht auf die Leerzeile
+ // position onto the last data set not on a blank row
if (m_nOptions & OPT_INSERT)
{
if ((GetRowCount() - 1) > 0)
@@ -2522,7 +2514,7 @@ void DbGridControl::AppendNew()
if (!m_pSeekCursor || !(m_nOptions & OPT_INSERT))
return;
- if (m_nTotalCount < 0) // RecordCount steht noch nicht fest
+ if (m_nTotalCount < 0) // no RecordCount, yet
{
try
{
@@ -2549,7 +2541,7 @@ void DbGridControl::SetDesignMode(sal_Bool bMode)
{
if (IsDesignMode() != bMode)
{
- // Enable/Disable f"ur den Designmode anpassen damit die Headerbar konfigurierbar bleibt
+ // adjust Enable/Disable for design mode so that the headerbar remains configurable
if (bMode)
{
if (!IsEnabled())
@@ -2560,7 +2552,7 @@ void DbGridControl::SetDesignMode(sal_Bool bMode)
}
else
{
- // komplett disablen
+ // disable completely
if (!GetDataWindow().IsEnabled())
Disable();
}
@@ -2583,7 +2575,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
{
SetUpdateMode(sal_False);
- // es gibt kein Cursor mehr
+ // there is no cursor anymore
if (IsEditing())
DeactivateCell();
RemoveRows(sal_False);
@@ -2619,7 +2611,7 @@ OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
OUString DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGridRowRef& _rRow) const
{
- // Ausgabe des Textes fuer eine Zelle
+ // text output for a single row
OUString aText;
if ( pColumn && IsValid(_rRow) )
aText = pColumn->GetCellText(_rRow, m_xFormatter);
@@ -2635,13 +2627,13 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
return GetDataWindow().GetTextWidth(GetCurrentRowCellText(pColumn,m_xPaintRow));
}
else
- return 30; //xxxx
+ return 30; // FIXME magic number for defaul cell width
}
void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMenu)
{
sal_Bool bDelete = (m_nOptions & OPT_DELETE) && GetSelectRowCount() && !IsCurrentAppending();
- // ist nur die Leerzeile selektiert, dann nicht loeschen
+ // if only a blank row is selected than do not delete
bDelete = bDelete && !((m_nOptions & OPT_INSERT) && GetSelectRowCount() == 1 && IsRowSelected(GetRowCount() - 1));
rMenu.EnableItem(SID_FM_DELETEROWS, bDelete);
@@ -2878,12 +2870,11 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
pReturn = &pColumn->GetController();
if (pReturn)
{
- // wenn es eine Edit-Zeile ist, kann ich ihr das forced read-only mitgeben
+ // if it is an edit row, it is possible to give it a forced read-only property
if (!pReturn->ISA(EditCellController) && !pReturn->ISA(SpinCellController))
- // ich konnte den Controller in forceROController nicht auf ReadOnly setzen
+ // controller could not be set to read-only in forceROController
if (!bInsert && !bUpdate)
- // ich bin nur hier, da m_bForceROController gesetzt war
- // -> lieber kein Controller als einer ohne RO
+ // better use no controller than one without read-only
pReturn = NULL;
}
}
@@ -2922,16 +2913,16 @@ void DbGridControl::CellModified()
if (!IsFilterMode() && IsValid(m_xCurrentRow) && !m_xCurrentRow->IsModified())
{
- // Einschalten des Editiermodus
- // Datensatz soll eingefuegt werden
+ // enable edit mode
+ // a data set should be inserted
if (m_xCurrentRow->IsNew())
{
m_xCurrentRow->SetStatus(GRS_MODIFIED);
SAL_INFO("svx.fmcomp", "current row is new, new state: MODIFIED");
- // wenn noch keine Zeile hinzugefuegt wurde, dann neue hinzunehmen
+ // if no row was added yet, do it now
if (m_nCurrentPos == GetRowCount() - 1)
{
- // RowCount um einen erhoehen
+ // increment RowCount
RowInserted(GetRowCount(), 1, sal_True);
InvalidateStatusCell(m_nCurrentPos);
m_aBar.InvalidateAll(m_nCurrentPos);
@@ -2988,7 +2979,7 @@ void DbGridControl::Undo()
try
{
- // Editieren abbrechen
+ // cancel editing
Reference< XResultSetUpdate > xUpdateCursor((Reference< XInterface >)*m_pDataCursor, UNO_QUERY);
// no effects if we're not updating currently
if (bAppending)
@@ -3093,8 +3084,8 @@ sal_Bool DbGridControl::SaveModified()
if (!IsValid(m_xCurrentRow))
return sal_True;
- // Uebernimmt die Dateneingabe fuer das Feld
- // Hat es aenderungen im aktuellen Eingabefeld gegeben ?
+ // accept input for this field
+ // Where there changes at the current input field?
if (!DbGridControl_Base::IsModified())
return sal_True;
@@ -3138,10 +3129,10 @@ sal_Bool DbGridControl::SaveModified()
sal_Bool DbGridControl::SaveRow()
{
SAL_INFO("svx.fmcomp", "DbGridControl::SaveRow");
- // gueltige Zeile
+ // valid row
if (!IsValid(m_xCurrentRow) || !IsModified())
return sal_True;
- // Wert des Controllers noch nicht gespeichert
+ // value of the controller was not saved, yet
else if (Controller().Is() && Controller()->IsModified())
{
if (!SaveModified())
@@ -3210,7 +3201,7 @@ sal_Bool DbGridControl::SaveRow()
long DbGridControl::PreNotify(NotifyEvent& rEvt)
{
- // keine Events der Navbar behandeln
+ // do not handle events of the Navbar
if (m_aBar.IsWindowOrChild(rEvt.GetWindow()))
return BrowseBox::PreNotify(rEvt);
@@ -3257,7 +3248,7 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt)
return 1;
}
}
- } // kein break!
+ } // no break!
default:
return DbGridControl_Base::PreNotify(rEvt);
}
@@ -3266,12 +3257,12 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt)
sal_Bool DbGridControl::IsTabAllowed(sal_Bool bRight) const
{
if (bRight)
- // Tab nur wenn nicht auf der letzten Zelle
+ // Tab only if not on the _last_ row
return GetCurRow() < (GetRowCount() - 1) || !m_bRecordCountFinal ||
GetViewColumnPos(GetCurColumnId()) < (GetViewColCount() - 1);
else
{
- // Tab nur wenn nicht auf der ersten Zelle
+ // Tab only if not on the _first_ row
return GetCurRow() > 0 || (GetCurColumnId() && GetViewColumnPos(GetCurColumnId()) > 0);
}
}
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index 36a7860..d326d86 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -20,7 +20,7 @@
#ifndef _PARCSS1_HXX
#define _PARCSS1_HXX
-// Die Tokens des CSS1-Parsers
+// tokens of the CSS1 parser
enum CSS1Token
{
CSS1_NULL,
@@ -30,8 +30,8 @@ enum CSS1Token
CSS1_STRING,
CSS1_NUMBER,
CSS1_PERCENTAGE,
- CSS1_LENGTH, // eine absolute Groesse in 1/100 MM
- CSS1_PIXLENGTH, // eine Pixel-Groesse
+ CSS1_LENGTH, // absolute length in 1/100 MM
+ CSS1_PIXLENGTH, // length in pixels
CSS1_EMS,
CSS1_EMX,
CSS1_HEXCOLOR,
@@ -57,7 +57,6 @@ enum CSS1Token
CSS1_RGB
};
-// die Zustaende des Parsers
enum CSS1ParserState
{
CSS1_PAR_ACCEPTED = 0,
@@ -75,21 +74,22 @@ enum CSS1SelectorType
CSS1_SELTYPE_PAGE // Feature: PrintExt
};
-// Die folegende Klasse beschreibt einen Simple-Selector, also
-// - einen HTML-Element-Namen
-// - einen HTML-Element-Namen mit Klasse (durch '.' getrennt)
-// - eine Klasse (ohne Punkt)
-// - eine mit ID=xxx gesetzte ID aus einem HTML-Dokument
-// oder
-// - ein Pseudo-Element
-//
-// Die Simple-Sektoren werden in einer Liste zu vollstaendigen
-// Selektoren verkettet
+/** A simple selector
+ *
+ * This class represents a simple selector, e.g.
+ * - a HTML element name
+ * - a HTML element name with a class (separated by a dot)
+ * - a class (without a dot)
+ * - an ID (set with ID=xxx)
+ * - a pseudo element
+ *
+ * These simple selectors are chained in a list to complete selectors
+ */
class CSS1Selector
{
- CSS1SelectorType eType; // Art des Selektors
- OUString aSelector; // der Selektor selbst
- CSS1Selector *pNext; // die naechste Komponente
+ CSS1SelectorType eType; // the type
+ OUString aSelector; // the selector itself
+ CSS1Selector *pNext; // the following component
public:
CSS1Selector( CSS1SelectorType eTyp, const OUString &rSel )
@@ -105,22 +105,20 @@ public:
const CSS1Selector *GetNext() const { return pNext; }
};
-// Die folegende Klasse beschreibt einen Teil-Ausdruck einer
-// CSS1-Deklaration sie besteht aus
-//
-// - dem Typ des Ausdrucks (entspricht dem Token)
-// - dem eigentlichen Wert als String und ggf. double
-// der double-Wert enthaelt das Vorzeichen fuer NUMBER und LENGTH
-// - und dem Operator, mit dem er mit dem *Vorganger*-Ausdruck
-// verknuepft ist.
-//
+/** a subexpression of a CSS1 declaration
+ *
+ * It contains
+ * - the type of this expression (= token)
+ * - the value as string (and/or double, with algebraic sign for NUMBER and LENGTH)
+ * - the operator with that it is connected with the *predecessor* expression
+ */
struct CSS1Expression
{
- sal_Unicode cOp; // Art der Verkuepfung mit dem Vorgaenger
- CSS1Token eType; // der Typ des Wertes
- OUString aValue; // und sein Wert als String
- double nValue; // und als Zahl (TWIPs fuer LENGTH)
- CSS1Expression *pNext; // die naechste Komponente
+ sal_Unicode cOp; // type of the link with its predecessor
+ CSS1Token eType; // type of the expression
+ OUString aValue; // value as string
+ double nValue; // value as number (TWIPs for LENGTH)
+ CSS1Expression *pNext; // the following component
public:
CSS1Expression( CSS1Token eTyp, const OUString &rVal,
@@ -163,58 +161,58 @@ inline sal_Int32 CSS1Expression::GetSLength() const
return (sal_Int32)(nValue + (nValue < 0. ? -.5 : .5 ));
}
-// Diese Klasse parst den Inhalt eines Style-Elements oder eine Style-Option
-// und bereitet ihn ein wenig auf.
-//
-// Das Ergebnis des Parsers wird durch die Mehtoden SelectorParsed()
-// und DeclarationParsed() an abgeleitete Parser uebergeben. Bsp:
-//
-// H1, H2 { font-weight: bold; text-align: right }
-// | | | |
-// | | | DeclP( 'text-align', 'right' )
-// | | DeclP( 'font-weight', 'bold' )
-// | SelP( 'H2', sal_False )
-// SelP( 'H1', sal_True )
-//
+/** Parser of a style element/option
+ *
+ * This class parses the content of a style element or a style option and preprocesses it.
+ *
+ * The result of the parser is forwarded to derived parsers by the methods SelectorParsed()
+ * and DeclarationParsed(). Example:
+ * H1, H2 { font-weight: bold; text-align: right }
+ * | | | |
+ * | | | DeclP( 'text-align', 'right' )
+ * | | DeclP( 'font-weight', 'bold' )
+ * | SelP( 'H2', sal_False )
+ * SelP( 'H1', sal_True )
+ */
class CSS1Parser
{
- sal_Bool bWhiteSpace : 1; // White-Space gelesen?
- sal_Bool bEOF : 1; // Ende des "Files" ?
+ sal_Bool bWhiteSpace : 1; // read a whitespace?
+ sal_Bool bEOF : 1; // is end of "file"?
- sal_Unicode cNextCh; // naechstes Zeichen
+ sal_Unicode cNextCh; // next character
- sal_Int32 nInPos; // aktuelle Position im Input-String
+ sal_Int32 nInPos; // current position in the input string
- sal_uInt32 nlLineNr; // akt. Zeilen Nummer
- sal_uInt32 nlLinePos; // akt. Spalten Nummer
+ sal_uInt32 nlLineNr; // current row number
+ sal_uInt32 nlLinePos; // current column number
- double nValue; // der Wert des Tokens als Zahl
+ double nValue; // value of the token as number
- CSS1ParserState eState; // der akteulle Zustand der Parsers
- CSS1Token nToken; // das aktuelle Token
+ CSS1ParserState eState; // current state of the parser
+ CSS1Token nToken; // the current token
- OUString aIn; // der zu parsende String
- OUString aToken; // das Token als String
+ OUString aIn; // the string to parse
+ OUString aToken; // token as string
- // Parsen vorbereiten
+ /// prepare parsing
void InitRead( const OUString& rIn );
- // das naechste Zeichen holen
+ /// @returns the next character to parse
sal_Unicode GetNextChar();
- // das naechste Token holen
+ /// @returns the next token to parse
CSS1Token GetNextToken();
- // arbeitet der Parser noch?
+ /// Is the parser still working?
sal_Bool IsParserWorking() const { return CSS1_PAR_WORKING == eState; }
sal_Bool IsEOF() const { return bEOF; }
sal_uInt32 IncLineNr() { return ++nlLineNr; }
sal_uInt32 IncLinePos() { return ++nlLinePos; }
- inline sal_uInt32 SetLinePos( sal_uInt32 nlPos ); // inline unten
+ inline sal_uInt32 SetLinePos( sal_uInt32 nlPos ); // inline declaration below
- // Parsen von Teilen der Grammatik
+ // parse parts of the grammar
void ParseRule();
CSS1Selector *ParseSelector();
CSS1Expression *ParseDeclaration( OUString& rProperty );
@@ -222,25 +220,40 @@ class CSS1Parser
protected:
void ParseStyleSheet();
- // Den Inhalt eines HTML-Style-Elements parsen.
- // Fuer jeden Selektor und jede Deklaration wird
- // SelectorParsed() bzw. DeclarationParsed() aufgerufen.
+ /** parse the content of a HTML style element
+ *
+ * For each selector and each declaration the methods SelectorParsed()
+ * or DeclarationParsed() need to be called afterwards
+ *
+ * @param rIn the style element as string
+ * @return true if ???
+ */
sal_Bool ParseStyleSheet( const OUString& rIn );
- // Den Inhalt einer HTML-Style-Option parsen.
- // Fuer jede Deklaration wird DeclarationParsed() aufgerufen.
+ /** parse the content of a HTML style option
+ *
+ * For each selector and each declaration the methods SelectorParsed()
+ * or DeclarationParsed() need to be called afterwards.
+ *
+ * @param rIn the style option as string
+ * @return true if ???
+ */
sal_Bool ParseStyleOption( const OUString& rIn );
- // Diese Methode wird aufgerufen, wenn ein Selektor geparsed wurde
- // Wenn 'bFirst' gesetzt ist, beginnt mit dem Selektor eine neue
- // Deklaration. Wird sal_True zurueckgegeben, wird der Selektor
- // geloscht, sonst nicht.
- // Die Implementierung dieser Methode gibt nur sal_True zuruck.
+ /** Called after a selector was parsed.
+ *
+ * @param pSelector The selector that was parsed
+ * @param bFirst if true, a new declaration starts with this selector
+ * @return If true, the selector will be deleted. (Returns always true?)
+ */
virtual bool SelectorParsed( CSS1Selector* pSelector, bool bFirst );
- // Diese Methode wird fuer jede geparsete Property aufgerufen. Wird
- // sal_True zurueckgegeben wird der Selektor geloscht, sonst nicht.
- // Die Implementierung dieser Methode gibt nur sal_True zuruck.
+ /** Called after a declaration or property was parsed
+ *
+ * @param rProperty The declaration/property
+ * @param pExpr ???
+ * @return If true, the declaration will be deleted. (Returns always true?)
+ */
virtual sal_Bool DeclarationParsed( const OUString& rProperty,
const CSS1Expression *pExpr );
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index fb9d299d..217dca8 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1331,7 +1331,7 @@ BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ )
do
{
- // Messages verarbeiten
+ // process messages
MSG aMsg;
if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) )
{
commit f212aa9f84246f9bc1feb3b169885c5e717a10cd
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Aug 31 22:30:22 2013 +0200
fix existing comments
Change-Id: I06dca63053dae5d3dceb49bf67adb0c100b56e8b
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 76739d6..d6b7000 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -62,13 +62,13 @@ inline auto_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32 nSize )
System::Object^ Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription *pTD) const
{
System::Object^ retVal= nullptr;
-// get oid
+ // get oid
rtl_uString * pOid = 0;
(*m_uno_env->getObjectIdentifier)( m_uno_env, &pOid, pUnoI );
OSL_ASSERT( 0 != pOid );
OUString oid(pOid, SAL_NO_ACQUIRE);
- //see if the interface was already mapped
+ // see if the interface was already mapped
System::Type^ ifaceType= mapUnoType(reinterpret_cast<typelib_TypeDescription*>(pTD));
System::String^ sOid= mapUnoString(oid.pData);
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index bce93978..189bc53 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -865,7 +865,7 @@ void OQueryController::impl_initialize()
OUString sCommand;
m_nCommandType = CommandType::QUERY;
- // . reading parameters:
+ // reading parameters:
// legacy parameters first (later overwritten by regular parameters)
OUString sIndependentSQLCommand;
@@ -936,7 +936,7 @@ void OQueryController::impl_initialize()
m_bGraphicalDesign = false;
}
- // . initial design
+ // initial design
bool bForceInitialDesign = false;
Sequence< PropertyValue > aCurrentQueryDesignProps;
aCurrentQueryDesignProps = rArguments.getOrDefault( "CurrentQueryDesign", aCurrentQueryDesignProps );
@@ -1119,7 +1119,7 @@ void OQueryController::setQueryComposer()
sal_Bool OQueryController::Construct(Window* pParent)
{
- // TODO: we have to check if we should create the text- or the design- view
+ // TODO: we have to check if we should create the text view or the design view
setView( * new OQueryContainerWindow( pParent, *this, getORB() ) );
diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 347996d..c42d184 100644
--- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
@@ -47,8 +47,7 @@ namespace drawinglayer
{
namespace processor3d
{
- /** ZBufferProcessor3D class
-
+ /**
This 3D renderer derived from DefaultProcessor3D renders all feeded primitives to a 2D
raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle
transparent content.
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 5147b4c..8c71619 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -61,7 +61,7 @@ public:
virtual void SetChanged(sal_Bool bFlg = sal_True);
virtual SdrPage* AllocPage(bool bMasterPage);
virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
- /** returns the numbering type that is used to format page fields in drawing shapes */
+ /** @returns the numbering type that is used to format page fields in drawing shapes */
virtual SvxNumType GetPageNumType() const;
OXUndoEnvironment& GetUndoEnv();
@@ -75,8 +75,8 @@ public:
/** returns the page which belongs to a section
*
- * \param _xSection
- * \return The page or <NULL/> when no page could be found.
+ * @param _xSection
+ * @return The page or <NULL/> when no page could be found.
*/
OReportPage* getPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index a7368e1..1749424 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -660,7 +660,7 @@ sal_Bool FormattedField::SetFormat(const OUString& rFormatString, LanguageType e
sal_Bool FormattedField::GetThousandsSep() const
{
DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey),
- "FormattedField::GetThousandsSep : your'e sure what your'e doing when setting the precision of a text format ?");
+ "FormattedField::GetThousandsSep : Are you sure what you are doing when setting the precision of a text format?");
bool bThousand, IsRed;
sal_uInt16 nPrecision, nAnzLeading;
@@ -672,7 +672,7 @@ sal_Bool FormattedField::GetThousandsSep() const
void FormattedField::SetThousandsSep(sal_Bool _bUseSeparator)
{
DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey),
- "FormattedField::SetThousandsSep : your'e sure what your'e doing when setting the precision of a text format ?");
+ "FormattedField::SetThousandsSep : Are you sure what you are doing when setting the precision of a text format?");
// get the current settings
bool bThousand, IsRed;
@@ -701,7 +701,7 @@ void FormattedField::SetThousandsSep(sal_Bool _bUseSeparator)
sal_uInt16 FormattedField::GetDecimalDigits() const
{
DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey),
- "FormattedField::GetDecimalDigits : your'e sure what your'e doing when setting the precision of a text format ?");
+ "FormattedField::GetDecimalDigits : Are you sure what you are doing when setting the precision of a text format?");
bool bThousand, IsRed;
sal_uInt16 nPrecision, nAnzLeading;
@@ -713,7 +713,7 @@ sal_uInt16 FormattedField::GetDecimalDigits() const
void FormattedField::SetDecimalDigits(sal_uInt16 _nPrecision)
{
DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey),
- "FormattedField::SetDecimalDigits : your'e sure what your'e doing when setting the precision of a text format ?");
+ "FormattedField::SetDecimalDigits : Are you sure what you are doing when setting the precision of a text format?");
// get the current settings
bool bThousand, IsRed;
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 4806a91..110a87c 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2662,7 +2662,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe
switch (nExecutionResult)
{
case SID_FM_DELETEROWS:
- // delete asynchron
+ // delete asynchronously
if (m_nDeleteEvent)
Application::RemoveUserEvent(m_nDeleteEvent);
m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete));
@@ -3012,7 +3012,7 @@ void DbGridControl::Undo()
m_xCurrentRow = m_xDataRow;
if (bAppending && (DbGridControl_Base::IsModified() || bDirty))
- // remove the row
+ // remove the row
if (m_nCurrentPos == GetRowCount() - 2)
{ // maybe we already removed it (in resetCurrentRow, called if the above moveToInsertRow
// caused our data source form to be reset - which should be the usual case ....)
@@ -3057,7 +3057,7 @@ void DbGridControl::resetCurrentRow()
m_xCurrentRow = m_xDataRow;
}
- RowModified(GetCurRow()); // will update the current controller if affected
+ RowModified(GetCurRow()); // will update the current controller if affected
}
void DbGridControl::RowModified( long nRow, sal_uInt16 /*nColId*/ )
@@ -3250,7 +3250,7 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt)
{
if ((m_nOptions & OPT_DELETE) && GetSelectRowCount())
{
- // delete asynchron
+ // delete asynchronously
if (m_nDeleteEvent)
Application::RemoveUserEvent(m_nDeleteEvent);
m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete));
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index e2f3bae..6f08a45 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1532,7 +1532,7 @@ SwUnderlineFont::~SwUnderlineFont()
delete pFnt;
}
-//Helper for filters to find true lineheight of a font
+/// Helper for filters to find true lineheight of a font
long AttrSetToLineHeight( const IDocumentSettingAccess& rIDocumentSettingAccess,
const SwAttrSet &rSet,
const OutputDevice &rOut, sal_Int16 nScript)
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 0f5dd17..dcb2b72 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -137,7 +137,7 @@ lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText,
return nNumOfMaskedRedlines;
}
-/*
+/**
* Used for spell checking. Deleted redlines and hidden characters are masked
*/
static sal_uInt16
@@ -172,7 +172,7 @@ lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText,
return nRedlinesMasked + nHiddenCharsMasked;
}
-/*
+/**
* Used for spell checking. Calculates a rectangle for repaint.
*/
static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, xub_StrLen nChgStart, xub_StrLen nChgEnd )
@@ -293,10 +293,9 @@ static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, xub_StrLen nChgStart,
return aRect;
}
-/*
+/**
* Used for automatic styles. Used during RstAttr.
*/
-
static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
const SfxItemSet* pSet1,
sal_uInt16 nWhichId,
@@ -347,13 +346,9 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
return bRet;
}
-/*
- * void SwTxtNode::RstAttr(const SwIndex &rIdx, sal_uInt16 nLen)
+/** Delete all attributes
*
- * Deletes all attributes, starting at position rIdx, for length nLen.
- */
-
-/* 5 cases:
+ * 5 cases:
* 1) The attribute is completely in the deletion range:
* -> delete it
* 2) The end of the attribute is in the deletion range:
@@ -366,6 +361,12 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
* -> insert new attribute from end of deletion range to old end
* 5) The attribute is outside the deletion range
* -> nothing to do
+ *
+ * @param rIdx starting position
+ * @param nLen length of the deletion
+ * @param nthat ???
+ * @param pSet ???
+ * @param bInclRefToxMark ???
*/
void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich,
const SfxItemSet* pSet, sal_Bool bInclRefToxMark )
@@ -388,7 +389,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich,
const bool bNoLen = !nMin;
- // We have to remember the "new" attributes, which have
+ // We have to remember the "new" attributes, that have
// been introduced by splitting surrounding attributes (case 4).
// They may not be forgotten inside the "Forget" function
//std::vector< const SwTxtAttr* > aNewAttributes;
@@ -1097,7 +1098,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
SwLanguageIterator aIter( *this, nBegin );
// Implicit changes require setting new attributes, which in turn destroys
- // the attribute sequence on which aIter iterates. We store the necessary
+ // the attribute sequence on that aIter iterates. We store the necessary
// coordinates and apply those changes after iterating through the text.
typedef std::pair<xub_StrLen, xub_StrLen> ImplicitChangesRange;
std::vector<ImplicitChangesRange> aImplicitChanges;
@@ -1111,7 +1112,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
xub_StrLen nChPos = aIter.GetChgPos();
// the position at the end of the paragraph returns -1
- // which becomes 65535 when converted to xub_StrLen,
+ // that becomes 65535 when converted to xub_StrLen,
// and thus must be cut to the end of the actual string.
if (nChPos == (xub_StrLen) -1)
{
@@ -1368,14 +1369,12 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV
Function scans words in current text and checks them in the
smarttag libraries. If the check returns true to bounds of the
- recognized words are stored into a list which is used later for drawing
+ recognized words are stored into a list that is used later for drawing
the underline.
- @param SwCntntNode* pActNode
-
- @param xub_StrLen nActPos
-
- @return SwRect: Repaint area
+ @param pActNode ???
+ @param nActPos ???
+ @return SwRect Repaint area
*/
SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ )
{
@@ -1619,12 +1618,12 @@ void SwTxtNode::TransliterateText(
// proper thing to do.
const sal_Int16 nWordType = WordType::ANYWORD_IGNOREWHITESPACES;
- //! In order to have less trouble with changing text size, e.g. because
- //! of ligatures or German small sz being resolved, we need to process
- //! the text replacements from end to start.
- //! This way the offsets for the yet to be changed words will be
- //! left unchanged by the already replaced text.
- //! For this we temporarily save the changes to be done in this vector
+ // In order to have less trouble with changing text size, e.g. because
+ // of ligatures or German small sz being resolved, we need to process
+ // the text replacements from end to start.
+ // This way the offsets for the yet to be changed words will be
+ // left unchanged by the already replaced text.
+ // For this we temporarily save the changes to be done in this vector
std::vector< swTransliterationChgData > aChanges;
swTransliterationChgData aChgData;
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index 8497051..36a7860 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -49,9 +49,7 @@ enum CSS1Token
CSS1_HASH,
CSS1_IMPORT_SYM,
-// Feature: PrintExt
- CSS1_PAGE_SYM,
-// /Feature: PrintExt
+ CSS1_PAGE_SYM, // Feature: PrintExt
CSS1_IMPORTANT_SYM,
@@ -74,10 +72,7 @@ enum CSS1SelectorType
CSS1_SELTYPE_CLASS,
CSS1_SELTYPE_ID,
CSS1_SELTYPE_PSEUDO,
-// Feature: PrintExt
- CSS1_SELTYPE_PAGE
-// /Feature: PrintExt
-
+ CSS1_SELTYPE_PAGE // Feature: PrintExt
};
// Die folegende Klasse beschreibt einen Simple-Selector, also
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 301dfa8..3d69079 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1074,16 +1074,16 @@ public:
sal_uInt16 csw; // Count of fields in the array of "shorts"
// Marke: "rgsw" Beginning of the array of shorts
- sal_uInt16 wMagicCreated; // unique number Identifying the File's creator
- // 0x6A62 is the creator ID for Word and is reserved.
- // Other creators should choose a different value.
- sal_uInt16 wMagicRevised; // identifies the File's last modifier
- sal_uInt16 wMagicCreatedPrivate; // private data
- sal_uInt16 wMagicRevisedPrivate; // private data
+ sal_uInt16 wMagicCreated; // unique number Identifying the File's creator
+ // 0x6A62 is the creator ID for Word and is reserved.
+ // Other creators should choose a different value.
+ sal_uInt16 wMagicRevised; // identifies the File's last modifier
+ sal_uInt16 wMagicCreatedPrivate; // private data
+ sal_uInt16 wMagicRevisedPrivate; // private data
- sal_Int16 lidFE; // Language id if document was written by Far East version
- // of Word (i.e. FIB.fFarEast is on)
- sal_uInt16 clw; // Number of fields in the array of longs
+ sal_Int16 lidFE; // Language id if document was written by Far East version
+ // of Word (i.e. FIB.fFarEast is on)
+ sal_uInt16 clw; // Number of fields in the array of longs
// Ende des Einschubs fuer WW8 *******************************************
@@ -1101,37 +1101,27 @@ public:
WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream
// Einschub fuer WW8 *****************************************************
- sal_Int32 pnFbpChpFirst; // when there was insufficient memory for Word to expand
- // the PLCFbte at save time, the PLCFbte is written
- // to the file in a linked list of 512-byte pieces
- // starting with this pn.
- /*
- // folgende Felder existieren zwar so in der Datei,
- // wir benutzen jedoch unten deklarierte General-Variablen
- // fuer Ver67 und Ver8 gemeinsam.
- sal_Int32 pnChpFirst; // the page number of the lowest numbered page in the
- // document that records CHPX FKP information
- sal_Int32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex
- // files if the number of entries in the PLCFbteChpx
- // is less than this, the PLCFbteChpx is incomplete.
- */
- sal_Int32 pnFbpPapFirst; // when there was insufficient memory for Word to expand
- // the PLCFbte at save time, the PLCFbte is written to
- // the file in a linked list of 512-byte pieces
- // starting with this pn
-
- sal_Int32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand
- // the PLCFbte at save time, the PLCFbte is written to
- // the file in a linked list of 512-byte pieces
- // starting with this pn
- sal_Int32 pnLvcFirst; // the page number of the lowest numbered page in the
- // document that records LVC FKP information
- sal_Int32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex
- // files if the number of entries in the PLCFbtePapx is
- // less than this, the PLCFbtePapx is incomplete.
+ sal_Int32 pnFbpChpFirst; // when there was insufficient memory for Word to expand
+ // the PLCFbte at save time, the PLCFbte is written
+ // to the file in a linked list of 512-byte pieces
+ // starting with this pn.
+ sal_Int32 pnFbpPapFirst; // when there was insufficient memory for Word to expand
+ // the PLCFbte at save time, the PLCFbte is written to
+ // the file in a linked list of 512-byte pieces
+ // starting with this pn
+
+ sal_Int32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand
+ // the PLCFbte at save time, the PLCFbte is written to
+ // the file in a linked list of 512-byte pieces
+ // starting with this pn
+ sal_Int32 pnLvcFirst; // the page number of the lowest numbered page in the
+ // document that records LVC FKP information
+ sal_Int32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex
+ // files if the number of entries in the PLCFbtePapx is
+ // less than this, the PLCFbtePapx is incomplete.
sal_Int32 fcIslandFirst; // ?
sal_Int32 fcIslandLim; // ?
- sal_uInt16 cfclcb; // Number of fields in the array of FC/LCB pairs.
+ sal_uInt16 cfclcb; // Number of fields in the array of FC/LCB pairs.
// Ende des Einschubs fuer WW8 *******************************************
@@ -1538,28 +1528,28 @@ public:
sal_uInt16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages
sal_uInt16 copts_fExpShRtn : 1; // when 1, expand character spaces on the line ending SHIFT+RETURN // #i56856#
- sal_Int16 dxaTab; // 720 twips default tab width
+ sal_Int16 dxaTab; // 720 twips - default tab width
sal_uInt16 wSpare; //
- sal_uInt16 dxaHotZ; // width of hyphenation hot zone measured in twips
+ sal_uInt16 dxaHotZ; // width of hyphenation hot zone measured in twips
sal_uInt16 cConsecHypLim; // number of lines allowed to have consecutive hyphens
- sal_uInt16 wSpare2; // reserved
- sal_Int32 dttmCreated; // DTTM date and time document was created
- sal_Int32 dttmRevised; // DTTM date and time document was last revised
- sal_Int32 dttmLastPrint; // DTTM date and time document was last printed
- sal_Int16 nRevision; // number of times document has been revised since its creation
- sal_Int32 tmEdited; // time document was last edited
- sal_Int32 cWords; // count of words tallied by last Word Count execution
- sal_Int32 cCh; // count of characters tallied by last Word Count execution
- sal_Int16 cPg; // count of pages tallied by last Word Count execution
- sal_Int32 cParas; // count of paragraphs tallied by last Word Count execution
+ sal_uInt16 wSpare2; // reserved
+ sal_Int32 dttmCreated; // DTTM date and time document was created
+ sal_Int32 dttmRevised; // DTTM date and time document was last revised
+ sal_Int32 dttmLastPrint; // DTTM date and time document was last printed
+ sal_Int16 nRevision; // number of times document has been revised since its creation
+ sal_Int32 tmEdited; // time document was last edited
+ sal_Int32 cWords; // count of words tallied by last Word Count execution
+ sal_Int32 cCh; // count of characters tallied by last Word Count execution
+ sal_Int16 cPg; // count of pages tallied by last Word Count execution
+ sal_Int32 cParas; // count of paragraphs tallied by last Word Count execution
sal_uInt16 rncEdn : 2; // restart endnote number code: 0 don't restart endnote numbering, 1 section, 2 page
sal_uInt16 nEdn : 14; // beginning endnote number
- sal_uInt16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document
+ sal_uInt16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document
sal_uInt16 fPrintFormData : 1; // only print data inside of form fields
sal_uInt16 fSaveFormData : 1; // only save document data that is inside of a form field.
sal_uInt16 fShadeFormData : 1; // shade form fields
- sal_uInt16 : 2; // reserved
+ sal_uInt16 : 2; // reserved
sal_uInt16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count
sal_Int32 cLines; // count of lines tallied by last Word Count operation
sal_Int32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index a24bae4..9e2c764 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -295,12 +295,12 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aSet.Put(SfxFrameItem( SID_DOCFRAME, &GetView().GetViewFrame()->GetTopFrame()));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet fail!");
+ OSL_ENSURE(pFact, "no dialog factory!");
SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog("PictureDialog",
GetView().GetViewFrame(),
GetView().GetWindow(),
aSet, false);
- OSL_ENSURE(pDlg, "Dialogdiet fail!");
+ OSL_ENSURE(pDlg, "no tab dialog!");
if (nSlot == FN_DRAW_WRAP_DLG)
pDlg->SetCurPageId("wrap");
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index 817c660..3ee05fe 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/ui/uiview/swcli.cxx
@@ -123,7 +123,6 @@ void SwOleClient::ViewChanged()
}
catch (const uno::Exception&)
{
- // this is an error
OSL_FAIL( "Something goes wrong on requesting object size!\n" );
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index bd282b9..57237b7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1992,7 +1992,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt
{
const sal_Unicode* pStr = rInString.getStr();
sal_Int32 nLen = rInString.getLength();
-//prepare a unicode string, encrypt it
+ //prepare a unicode string, encrypt it
if( checkEncryptionBufferSize( nLen*2 ) )
{
enableStringEncryption( nInObjectNumber );
@@ -2000,7 +2000,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt
sal_Int32 nChars = 2;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list