Kaydet (Commit) 25d571ff authored tarafından Stefan Knorr (astron)'s avatar Stefan Knorr (astron)

svtools/source/contnr: translate comments

üst 0e5430ae
...@@ -142,8 +142,8 @@ namespace svt ...@@ -142,8 +142,8 @@ namespace svt
//==================================================================== //====================================================================
enum EnumerationResult enum EnumerationResult
{ {
SUCCESS, /// the enumration was successfull SUCCESS, /// the enumeration was successful
ERROR, /// the enumration was unsuccessfull ERROR, /// the enumeration was unsuccessful
RUNNING /// the enumeration is still running, and the maximum wait time has passed RUNNING /// the enumeration is still running, and the maximum wait time has passed
}; };
......
...@@ -1340,7 +1340,7 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const ...@@ -1340,7 +1340,7 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const
} }
catch( Exception const & ) catch( Exception const & )
{ {
// perhaps an unkown url protocol (e.g. "private:newdoc") // perhaps an unknown url protocol (e.g. "private:newdoc")
} }
return bRet; return bRet;
...@@ -2274,7 +2274,6 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList ) ...@@ -2274,7 +2274,6 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
// get the title // get the title
pEntry->SetNewTitle( aValue.getToken( 0, '\t', nIndex ) ); pEntry->SetNewTitle( aValue.getToken( 0, '\t', nIndex ) );
aDisplayText = pEntry->GetTitle(); aDisplayText = pEntry->GetTitle();
// #83004# --------------------
ReplaceTabWithString( aDisplayText ); ReplaceTabWithString( aDisplayText );
aDisplayText += aTab; aDisplayText += aTab;
...@@ -2410,7 +2409,7 @@ sal_Bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl ...@@ -2410,7 +2409,7 @@ sal_Bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl
switch ( gnColumn ) switch ( gnColumn )
{ {
case COLUMN_TITLE: case COLUMN_TITLE:
// compare case insensitiv first // compare case insensitive first
nComp = pCollatorWrapper->compareString( aOne->GetLowerTitle(), aTwo->GetLowerTitle() ); nComp = pCollatorWrapper->compareString( aOne->GetLowerTitle(), aTwo->GetLowerTitle() );
if ( nComp == 0 ) if ( nComp == 0 )
...@@ -2552,7 +2551,6 @@ String SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& r ...@@ -2552,7 +2551,6 @@ String SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& r
// title, type, size, date // title, type, size, date
aValue = pData->GetTitle(); aValue = pData->GetTitle();
// #83004# --------------------
ReplaceTabWithString( aValue ); ReplaceTabWithString( aValue );
aValue += aTab; aValue += aTab;
aValue += pData->maType; aValue += pData->maType;
...@@ -2641,7 +2639,7 @@ namespace svtools { ...@@ -2641,7 +2639,7 @@ namespace svtools {
QueryDeleteDlg_Impl::QueryDeleteDlg_Impl QueryDeleteDlg_Impl::QueryDeleteDlg_Impl
( (
Window* pParent, Window* pParent,
const String& rName // Eintragsname const String& rName // entry name
) : ) :
ModalDialog( pParent, SvtResId( DLG_SVT_QUERYDELETE ) ), ModalDialog( pParent, SvtResId( DLG_SVT_QUERYDELETE ) ),
...@@ -2663,7 +2661,7 @@ QueryDeleteDlg_Impl::QueryDeleteDlg_Impl ...@@ -2663,7 +2661,7 @@ QueryDeleteDlg_Impl::QueryDeleteDlg_Impl
_aAllButton.SetClickHdl( aLink ); _aAllButton.SetClickHdl( aLink );
_aNoButton.SetClickHdl( aLink ); _aNoButton.SetClickHdl( aLink );
// Anzeige der spezifizierten Texte // display specified texts
WinBits nTmpStyle = _aEntry.GetStyle(); WinBits nTmpStyle = _aEntry.GetStyle();
nTmpStyle |= WB_PATHELLIPSIS; nTmpStyle |= WB_PATHELLIPSIS;
......
...@@ -56,7 +56,7 @@ class IcnGridMap_Impl; ...@@ -56,7 +56,7 @@ class IcnGridMap_Impl;
#define F_VER_SBARSIZE_WITH_HBAR 0x0001 #define F_VER_SBARSIZE_WITH_HBAR 0x0001
#define F_HOR_SBARSIZE_WITH_VBAR 0x0002 #define F_HOR_SBARSIZE_WITH_VBAR 0x0002
#define F_PAINTED 0x0004 // sal_True nach erstem Paint #define F_PAINTED 0x0004 // sal_True after first paint
#define F_ADD_MODE 0x0008 #define F_ADD_MODE 0x0008
#define F_SELECTING_RECT 0x0020 #define F_SELECTING_RECT 0x0020
#define F_DOWN_CTRL 0x0080 #define F_DOWN_CTRL 0x0080
...@@ -67,20 +67,20 @@ class IcnGridMap_Impl; ...@@ -67,20 +67,20 @@ class IcnGridMap_Impl;
#define F_CLEARING_SELECTION 0x2000 #define F_CLEARING_SELECTION 0x2000
#define F_ARRANGING 0x4000 #define F_ARRANGING 0x4000
// alle Angaben in Pixel // unit = pixels
// Abstaende von Fensterraendern // distances from window borders
#define LROFFS_WINBORDER 4 #define LROFFS_WINBORDER 4
#define TBOFFS_WINBORDER 4 #define TBOFFS_WINBORDER 4
// fuer das Bounding-Rectangle // for the bounding rectangle
#define LROFFS_BOUND 2 #define LROFFS_BOUND 2
#define TBOFFS_BOUND 2 #define TBOFFS_BOUND 2
// Abstand Fokusrechteck - Icon // distance focus rectangle to icon
#define LROFFS_ICON 2 #define LROFFS_ICON 2
#define TBOFFS_ICON 2 #define TBOFFS_ICON 2
// Abstaende Icon - Text // distance icon to text
#define HOR_DIST_BMP_STRING 3 #define HOR_DIST_BMP_STRING 3
#define VER_DIST_BMP_STRING 3 #define VER_DIST_BMP_STRING 3
// Breitenoffset Highlight-Rect bei Text // width offset of highlight rectangle for Text
#define LROFFS_TEXT 2 #define LROFFS_TEXT 2
#define DEFAULT_MAX_VIRT_WIDTH 200 #define DEFAULT_MAX_VIRT_WIDTH 200
...@@ -172,7 +172,7 @@ class SvxIconChoiceCtrl_Impl ...@@ -172,7 +172,7 @@ class SvxIconChoiceCtrl_Impl
ScrollBarBox aScrBarBox; ScrollBarBox aScrBarBox;
Rectangle aCurSelectionRect; Rectangle aCurSelectionRect;
SvPtrarr aSelectedRectList; SvPtrarr aSelectedRectList;
Timer aEditTimer; // fuer Inplace-Editieren Timer aEditTimer; // for editing in place
Timer aAutoArrangeTimer; Timer aAutoArrangeTimer;
Timer aDocRectChangedTimer; Timer aDocRectChangedTimer;
Timer aVisRectChangedTimer; Timer aVisRectChangedTimer;
...@@ -188,20 +188,20 @@ class SvxIconChoiceCtrl_Impl ...@@ -188,20 +188,20 @@ class SvxIconChoiceCtrl_Impl
SvtIconChoiceCtrl* pView; SvtIconChoiceCtrl* pView;
IcnCursor_Impl* pImpCursor; IcnCursor_Impl* pImpCursor;
IcnGridMap_Impl* pGridMap; IcnGridMap_Impl* pGridMap;
long nMaxVirtWidth; // max. Breite aVirtOutputSize bei ALIGN_TOP long nMaxVirtWidth; // max. width aVirtOutputSize for ALIGN_TOP
long nMaxVirtHeight; // max. Hoehe aVirtOutputSize bei ALIGN_LEFT long nMaxVirtHeight; // max. height aVirtOutputSize for ALIGN_LEFT
SvxIconChoiceCtrlEntryList_impl* pZOrderList; SvxIconChoiceCtrlEntryList_impl* pZOrderList;
SvPtrarr* pColumns; SvPtrarr* pColumns;
IcnViewEdit_Impl* pEdit; IcnViewEdit_Impl* pEdit;
WinBits nWinBits; WinBits nWinBits;
long nMaxBoundHeight; // Hoehe des hoechsten BoundRects long nMaxBoundHeight; // height of highest BoundRects
sal_uInt16 nFlags; sal_uInt16 nFlags;
sal_uInt16 nCurTextDrawFlags; sal_uInt16 nCurTextDrawFlags;
sal_uLong nUserEventAdjustScrBars; sal_uLong nUserEventAdjustScrBars;
sal_uLong nUserEventShowCursor; sal_uLong nUserEventShowCursor;
SvxIconChoiceCtrlEntry* pCurHighlightFrame; SvxIconChoiceCtrlEntry* pCurHighlightFrame;
sal_Bool bHighlightFramePressed; sal_Bool bHighlightFramePressed;
SvxIconChoiceCtrlEntry* pHead; // Eintrag oben links SvxIconChoiceCtrlEntry* pHead; // top left entry
SvxIconChoiceCtrlEntry* pCursor; SvxIconChoiceCtrlEntry* pCursor;
SvxIconChoiceCtrlEntry* pPrevDropTarget; SvxIconChoiceCtrlEntry* pPrevDropTarget;
SvxIconChoiceCtrlEntry* pHdlEntry; SvxIconChoiceCtrlEntry* pHdlEntry;
...@@ -210,7 +210,7 @@ class SvxIconChoiceCtrl_Impl ...@@ -210,7 +210,7 @@ class SvxIconChoiceCtrl_Impl
VirtualDevice* pDDBufDev; VirtualDevice* pDDBufDev;
VirtualDevice* pDDTempDev; VirtualDevice* pDDTempDev;
VirtualDevice* pEntryPaintDev; VirtualDevice* pEntryPaintDev;
SvxIconChoiceCtrlEntry* pAnchor; // fuer Selektion SvxIconChoiceCtrlEntry* pAnchor; // for selection
LocalFocus aFocus; // Data for focusrect LocalFocus aFocus; // Data for focusrect
::svt::AccessibleFactoryAccess aAccFactory; ::svt::AccessibleFactoryAccess aAccFactory;
...@@ -289,7 +289,7 @@ class SvxIconChoiceCtrl_Impl ...@@ -289,7 +289,7 @@ class SvxIconChoiceCtrl_Impl
void ClipAtVirtOutRect( Rectangle& rRect ) const; void ClipAtVirtOutRect( Rectangle& rRect ) const;
void AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCtrlEntry* pStart=0 ); void AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCtrlEntry* pStart=0 );
Point AdjustAtGrid( Point AdjustAtGrid(
const Rectangle& rCenterRect, // "Schwerpunkt" des Objekts (typ. Bmp-Rect) const Rectangle& rCenterRect, // balance point of object (typically Bmp-Rect)
const Rectangle& rBoundRect const Rectangle& rBoundRect
) const; ) const;
sal_uLong GetPredecessorGrid( const Point& rDocPos) const; sal_uLong GetPredecessorGrid( const Point& rDocPos) const;
...@@ -397,7 +397,7 @@ public: ...@@ -397,7 +397,7 @@ public:
SvxIconChoiceCtrlEntry* GetCurEntry() const { return pCursor; } SvxIconChoiceCtrlEntry* GetCurEntry() const { return pCursor; }
void SetCursor( void SetCursor(
SvxIconChoiceCtrlEntry*, SvxIconChoiceCtrlEntry*,
// sal_True == bei Single-Selection die Sel. mitfuehren // sal_True == carry selection when single-selecting
sal_Bool bSyncSingleSelection = sal_True, sal_Bool bSyncSingleSelection = sal_True,
sal_Bool bShowFocusAsync = sal_False sal_Bool bShowFocusAsync = sal_False
); );
...@@ -431,7 +431,7 @@ public: ...@@ -431,7 +431,7 @@ public:
const Point& rPos, const Point& rPos,
const Size& rBoundingSize const Size& rBoundingSize
); );
// berechnet alle ungueltigen BoundRects neu // recalculates all invalid BoundRects
void RecalcAllBoundingRectsSmart(); void RecalcAllBoundingRectsSmart();
const Rectangle& GetEntryBoundRect( SvxIconChoiceCtrlEntry* ); const Rectangle& GetEntryBoundRect( SvxIconChoiceCtrlEntry* );
void InvalidateBoundingRect( Rectangle& rRect ) void InvalidateBoundingRect( Rectangle& rRect )
...@@ -461,9 +461,9 @@ public: ...@@ -461,9 +461,9 @@ public:
::vcl::ControlLayoutData* _pLayoutData = NULL ::vcl::ControlLayoutData* _pLayoutData = NULL
); );
// berechnet alle BoundingRects neu, wenn bMustRecalcBoundingRects == sal_True // recalculates all BoundingRects if bMustRecalcBoundingRects == sal_True
void CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); } void CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); }
// berechnet alle invalidierten BoundingRects neu // recalculates all invalidated BoundingRects
void ShowTargetEmphasis( SvxIconChoiceCtrlEntry* pEntry, sal_Bool bShow ); void ShowTargetEmphasis( SvxIconChoiceCtrlEntry* pEntry, sal_Bool bShow );
void Command( const CommandEvent& rCEvt ); void Command( const CommandEvent& rCEvt );
void ToTop( SvxIconChoiceCtrlEntry* ); void ToTop( SvxIconChoiceCtrlEntry* );
...@@ -536,7 +536,7 @@ public: ...@@ -536,7 +536,7 @@ public:
sal_Bool ArePredecessorsSet() const { return (sal_Bool)(pHead != 0); } sal_Bool ArePredecessorsSet() const { return (sal_Bool)(pHead != 0); }
SvxIconChoiceCtrlEntry* GetPredecessorHead() const { return pHead; } SvxIconChoiceCtrlEntry* GetPredecessorHead() const { return pHead; }
void SetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry* pPredecessor); void SetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry* pPredecessor);
// liefert gueltige Ergebnisse nur im AutoArrange-Modus! // only delivers valid results when in AutoArrange mode!
SvxIconChoiceCtrlEntry* FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, const Point& ); SvxIconChoiceCtrlEntry* FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, const Point& );
void SetPositionMode( SvxIconChoiceCtrlPositionMode ); void SetPositionMode( SvxIconChoiceCtrlPositionMode );
...@@ -608,15 +608,14 @@ public: ...@@ -608,15 +608,14 @@ public:
~IcnCursor_Impl(); ~IcnCursor_Impl();
void Clear(); void Clear();
// fuer Cursortravelling usw. // for Cursortravelling etc.
SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, sal_Bool bRight ); SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, sal_Bool bRight );
SvxIconChoiceCtrlEntry* GoUpDown( SvxIconChoiceCtrlEntry*, sal_Bool bDown ); SvxIconChoiceCtrlEntry* GoUpDown( SvxIconChoiceCtrlEntry*, sal_Bool bDown );
SvxIconChoiceCtrlEntry* GoPageUpDown( SvxIconChoiceCtrlEntry*, sal_Bool bDown ); SvxIconChoiceCtrlEntry* GoPageUpDown( SvxIconChoiceCtrlEntry*, sal_Bool bDown );
// Erzeugt fuer jede Zeile (Hoehe=nGridDY) eine nach BoundRect.Left() // Creates a list of entries for every row (height = nGridDY) sorted by
// sortierte Liste der Eintraege, die in ihr stehen. Eine Liste kann // BoundRect.Left(). A list may be empty. The lists become the property of
// leer sein. Die Listen gehen in das Eigentum des Rufenden ueber und // the caller and have to be deleted with DestroyGridAdjustData.
// muessen mit DestroyGridAdjustData geloescht werden
void CreateGridAjustData( SvPtrarr& pLists, SvxIconChoiceCtrlEntry* pRow=0); void CreateGridAjustData( SvPtrarr& pLists, SvxIconChoiceCtrlEntry* pRow=0);
static void DestroyGridAdjustData( SvPtrarr& rLists ); static void DestroyGridAdjustData( SvPtrarr& rLists );
}; };
......
...@@ -92,7 +92,7 @@ void IcnCursor_Impl::ImplCreate() ...@@ -92,7 +92,7 @@ void IcnCursor_Impl::ImplCreate()
short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / nDeltaHeight ); short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / nDeltaHeight );
short nX = (short)( ((rRect.Left()+rRect.Right())/2) / nDeltaWidth ); short nX = (short)( ((rRect.Left()+rRect.Right())/2) / nDeltaWidth );
// Rundungsfehler abfangen // capture rounding errors
if( nY >= nRows ) if( nY >= nRows )
nY = sal::static_int_cast< short >(nRows - 1); nY = sal::static_int_cast< short >(nRows - 1);
if( nX >= nCols ) if( nX >= nCols )
...@@ -279,20 +279,20 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchRow(sal_uInt16 nRow,sal_uInt16 nLe ...@@ -279,20 +279,20 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchRow(sal_uInt16 nRow,sal_uInt16 nLe
/* /*
Sucht ab dem uebergebenen Eintrag den naechsten rechts- bzw. Searches, starting from the passed value, the next entry to the left/to the
linksstehenden. Suchverfahren am Beispiel bRight = sal_True: right. Example for bRight = sal_True:
c c
b c b c
a b c a b c
S 1 1 1 ====> Suchrichtung S 1 1 1 ====> search direction
a b c a b c
b c b c
c c
S : Startposition S : starting position
1 : erstes Suchrechteck 1 : first searched rectangle
a,b,c : 2., 3., 4. Suchrechteck a,b,c : 2nd, 3rd, 4th searched rectangle
*/ */
SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCtrlEntry, sal_Bool bRight ) SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCtrlEntry, sal_Bool bRight )
...@@ -304,7 +304,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCt ...@@ -304,7 +304,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCt
sal_uInt16 nX = pCtrlEntry->nX; sal_uInt16 nX = pCtrlEntry->nX;
DBG_ASSERT(nY< nRows,"GoLeftRight:Bad column"); DBG_ASSERT(nY< nRows,"GoLeftRight:Bad column");
DBG_ASSERT(nX< nCols,"GoLeftRight:Bad row"); DBG_ASSERT(nX< nCols,"GoLeftRight:Bad row");
// Nachbar auf gleicher Zeile ? // neighbor in same row?
if( bRight ) if( bRight )
pResult = SearchRow( pResult = SearchRow(
nY, nX, sal::static_int_cast< sal_uInt16 >(nCols-1), nX, sal_True, sal_True ); nY, nX, sal::static_int_cast< sal_uInt16 >(nCols-1), nX, sal_True, sal_True );
...@@ -423,7 +423,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoUpDown( SvxIconChoiceCtrlEntry* pCtrlE ...@@ -423,7 +423,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoUpDown( SvxIconChoiceCtrlEntry* pCtrlE
DBG_ASSERT(nY<nRows,"GoUpDown:Bad column"); DBG_ASSERT(nY<nRows,"GoUpDown:Bad column");
DBG_ASSERT(nX<nCols,"GoUpDown:Bad row"); DBG_ASSERT(nX<nCols,"GoUpDown:Bad row");
// Nachbar in gleicher Spalte ? // neighbor in same column?
if( bDown ) if( bDown )
pResult = SearchCol( pResult = SearchCol(
nX, nY, sal::static_int_cast< sal_uInt16 >(nRows-1), nY, sal_True, sal_True ); nX, nY, sal::static_int_cast< sal_uInt16 >(nRows-1), nY, sal_True, sal_True );
...@@ -493,7 +493,7 @@ void IcnCursor_Impl::CreateGridAjustData( SvPtrarr& rLists, SvxIconChoiceCtrlEnt ...@@ -493,7 +493,7 @@ void IcnCursor_Impl::CreateGridAjustData( SvPtrarr& rLists, SvxIconChoiceCtrlEnt
if( !pRefEntry ) if( !pRefEntry )
{ {
sal_uInt16 nGridRows = (sal_uInt16)(pView->aVirtOutputSize.Height() / pView->nGridDY); sal_uInt16 nGridRows = (sal_uInt16)(pView->aVirtOutputSize.Height() / pView->nGridDY);
nGridRows++; // wg. Abrundung! nGridRows++; // because we round down later!
if( !nGridRows ) if( !nGridRows )
return; return;
...@@ -514,8 +514,8 @@ void IcnCursor_Impl::CreateGridAjustData( SvPtrarr& rLists, SvxIconChoiceCtrlEnt ...@@ -514,8 +514,8 @@ void IcnCursor_Impl::CreateGridAjustData( SvPtrarr& rLists, SvxIconChoiceCtrlEnt
} }
else else
{ {
// Aufbau eines hor. "Schlauchs" auf der RefEntry-Zeile // build a horizontal "tube" in the RefEntry line
// UEBERLEGEN: BoundingRect nehmen wg. Ueberlappungen??? // STOP AND THINK: maybe use bounding rectangle because of overlaps?
Rectangle rRefRect( pView->CalcBmpRect( pRefEntry ) ); Rectangle rRefRect( pView->CalcBmpRect( pRefEntry ) );
//const Rectangle& rRefRect = pView->GetEntryBoundRect( pRefEntry ); //const Rectangle& rRefRect = pView->GetEntryBoundRect( pRefEntry );
short nRefRow = (short)( ((rRefRect.Top()+rRefRect.Bottom())/2) / pView->nGridDY ); short nRefRow = (short)( ((rRefRect.Top()+rRefRect.Bottom())/2) / pView->nGridDY );
...@@ -723,9 +723,9 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( sal_Bool bOccupyFound ) ...@@ -723,9 +723,9 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( sal_Bool bOccupyFound )
} }
} }
// ein Eintrag belegt nur das unter seinem Zentrum liegende GridRect // An entry only means that there's a GridRect lying under its center. This
// diese Variante ist bedeutend schneller als die Belegung ueber das // variant is much faster than allocating via the bounding rectangle but can
// Bounding-Rect, kann aber zu kleinen Ueberlappungen fuehren // lead to small overlaps.
void IcnGridMap_Impl::OccupyGrids( const SvxIconChoiceCtrlEntry* pEntry, sal_Bool bOccupy ) void IcnGridMap_Impl::OccupyGrids( const SvxIconChoiceCtrlEntry* pEntry, sal_Bool bOccupy )
{ {
if( !_pGridMap || !_pView->IsBoundingRectValid( pEntry->aRect )) if( !_pGridMap || !_pView->IsBoundingRectValid( pEntry->aRect ))
...@@ -776,8 +776,8 @@ void IcnGridMap_Impl::OutputSizeChanged() ...@@ -776,8 +776,8 @@ void IcnGridMap_Impl::OutputSizeChanged()
} }
} }
// Independendly of the views alignment (TOP or LEFT) the gridmap // Independently of the view's alignment (TOP or LEFT), the gridmap
// should contain the data in a continues region, to make it possible // should contain the data in a continuous region, to make it possible
// to copy the whole block if the gridmap needs to be expanded. // to copy the whole block if the gridmap needs to be expanded.
void IcnGridMap_Impl::GetGridCoord( GridId nId, sal_uInt16& rGridX, sal_uInt16& rGridY ) void IcnGridMap_Impl::GetGridCoord( GridId nId, sal_uInt16& rGridX, sal_uInt16& rGridY )
{ {
......
...@@ -75,7 +75,7 @@ SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtr ...@@ -75,7 +75,7 @@ SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtr
SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) : SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) :
// WB_CLIPCHILDREN an, da ScrollBars auf dem Fenster liegen! // WB_CLIPCHILDREN on, as ScrollBars lie on the window!
Control( pParent, nWinStyle | WB_CLIPCHILDREN ), Control( pParent, nWinStyle | WB_CLIPCHILDREN ),
_pCurKeyEvent ( NULL ), _pCurKeyEvent ( NULL ),
...@@ -339,7 +339,7 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt ) ...@@ -339,7 +339,7 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
} }
sal_Bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt ) sal_Bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
{ {
// unter OS/2 bekommen wir auch beim Editieren Key-Up/Down // under OS/2, we get key up/down even while editing
if( IsEntryEditing() ) if( IsEntryEditing() )
return sal_True; return sal_True;
_pCurKeyEvent = (KeyEvent*)&rKEvt; _pCurKeyEvent = (KeyEvent*)&rKEvt;
...@@ -395,7 +395,7 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) ...@@ -395,7 +395,7 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper )
else else
{ {
Wallpaper aBackground( rPaper ); Wallpaper aBackground( rPaper );
// HACK, da Hintergrund sonst transparent sein koennte // HACK, as background might be transparent!
if( !aBackground.IsBitmap() ) if( !aBackground.IsBitmap() )
aBackground.SetStyle( WALLPAPER_TILE ); aBackground.SetStyle( WALLPAPER_TILE );
...@@ -423,8 +423,8 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) ...@@ -423,8 +423,8 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper )
Control::SetBackground( aBackground ); Control::SetBackground( aBackground );
} }
// bei hart attributierter Textfarbe keine 'Automatik', die eine // If text colors are attributed "hard," don't use automatism to select
// lesbare Textfarbe einstellt. // a readable text color.
Font aFont( GetFont() ); Font aFont( GetFont() );
aFont.SetColor( rStyleSettings.GetFieldTextColor() ); aFont.SetColor( rStyleSettings.GetFieldTextColor() );
SetFont( aFont ); SetFont( aFont );
......
...@@ -478,7 +478,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo ...@@ -478,7 +478,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo
if( bNativeOK ) if( bNativeOK )
{ {
Size aContentSize( aNativeContent.GetSize() ); Size aContentSize( aNativeContent.GetSize() );
// leave a little space around the box image (looks better // leave a little space around the box image (looks better)
if( aContentSize.Height() + 2 > io_rSize.Height() ) if( aContentSize.Height() + 2 > io_rSize.Height() )
io_rSize.Height() = aContentSize.Height() + 2; io_rSize.Height() = aContentSize.Height() + 2;
} }
......
...@@ -40,7 +40,7 @@ using namespace ::com::sun::star::accessibility; ...@@ -40,7 +40,7 @@ using namespace ::com::sun::star::accessibility;
#define MYTABMASK \ #define MYTABMASK \
( SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC ) ( SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC )
// SvTreeListBox-Callback // SvTreeListBox callback
void SvTabListBox::SetTabs() void SvTabListBox::SetTabs()
{ {
...@@ -49,16 +49,16 @@ void SvTabListBox::SetTabs() ...@@ -49,16 +49,16 @@ void SvTabListBox::SetTabs()
{ {
DBG_ASSERT(pTabList,"TabList ?"); DBG_ASSERT(pTabList,"TabList ?");
// die TreeListBox hat jetzt ihre Tabulatoren in die Liste eingefuegt. // The tree listbox has now inserted its tabs into the list. Now we
// jetzt plustern wir die Liste mit zusaetzlichen Tabulatoren auf, // fluff up the list with additional tabs and adjust the rightmost tab
// und passen den ganz rechten Tab der Treelistbox an. // of the tree listbox.
// den ganz rechten Tab nehmen // Picking the rightmost tab.
// HACK fuer den Explorer! Wenn der ViewParent != 0 ist, dann wird // HACK for the explorer! If ViewParent != 0, the first tab of the tree
// der erste Tab der TreeListBox von der TreelistBox berechnet! // listbox is calculated by the tre listbox itself! This behavior is
// Dies wird fuer ButtonsOnRoot benoetigt, da der Explorer nicht // necessary for ButtonsOnRoot, as the explorer does not know in this
// weiss, welchen zusaetzlichen Offset er in diesem Modus auf // case, which additional offset it need to add to the tabs in this mode
// den Tabulator addieren muss. Die TreeListBox weiss es! // -- the tree listbox knows that, though!
/* /*
if( !pViewParent ) if( !pViewParent )
{ {
...@@ -69,7 +69,7 @@ void SvTabListBox::SetTabs() ...@@ -69,7 +69,7 @@ void SvTabListBox::SetTabs()
} }
*/ */
// alle anderen Tabs an Liste haengen // append all other tabs to the list
for( sal_uInt16 nCurTab = 1; nCurTab < nTabCount; nCurTab++ ) for( sal_uInt16 nCurTab = 1; nCurTab < nTabCount; nCurTab++ )
{ {
SvLBoxTab* pTab = pTabList+nCurTab; SvLBoxTab* pTab = pTabList+nCurTab;
...@@ -112,7 +112,7 @@ SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits ) ...@@ -112,7 +112,7 @@ SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits )
pTabList = 0; pTabList = 0;
nTabCount = 0; nTabCount = 0;
pViewParent = 0; pViewParent = 0;
SetHighlightRange(); // ueber volle Breite selektieren SetHighlightRange(); // select full width
} }
SvTabListBox::SvTabListBox( Window* pParent, const ResId& rResId ) SvTabListBox::SvTabListBox( Window* pParent, const ResId& rResId )
...@@ -127,7 +127,7 @@ SvTabListBox::SvTabListBox( Window* pParent, const ResId& rResId ) ...@@ -127,7 +127,7 @@ SvTabListBox::SvTabListBox( Window* pParent, const ResId& rResId )
SvTabListBox::~SvTabListBox() SvTabListBox::~SvTabListBox()
{ {
// array-delete // delete array
delete [] pTabList; delete [] pTabList;
#ifdef DBG_UTIL #ifdef DBG_UTIL
pTabList = 0; pTabList = 0;
...@@ -341,7 +341,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal ...@@ -341,7 +341,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal
if( pCurToken ) if( pCurToken )
aTemp = XubString( pCurToken, nCurTokenLen ); aTemp = XubString( pCurToken, nCurTokenLen );
else else
aTemp.Erase(); // alle Spalten ohne Token loeschen aTemp.Erase(); // delete all columns without a token
((SvLBoxString*)pStr)->SetText( pEntry, aTemp ); ((SvLBoxString*)pStr)->SetText( pEntry, aTemp );
pCurToken = pNextToken; pCurToken = pNextToken;
pNextToken = GetToken( pCurToken, nCurTokenLen ); pNextToken = GetToken( pCurToken, nCurTokenLen );
...@@ -435,7 +435,7 @@ const xub_Unicode* SvTabListBox::GetToken( const xub_Unicode* pPtr, sal_uInt16& ...@@ -435,7 +435,7 @@ const xub_Unicode* SvTabListBox::GetToken( const xub_Unicode* pPtr, sal_uInt16&
c = *pPtr; c = *pPtr;
} }
if( c ) if( c )
pPtr++; // Tab ueberspringen pPtr++; // skip tab
else else
pPtr = 0; pPtr = 0;
rLen = nLen; rLen = nLen;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment