Kaydet (Commit) 7c2697eb authored tarafından Philipp Weissenbacher's avatar Philipp Weissenbacher Kaydeden (comit) Thomas Arnhold

Translate German comments, fix some ws

Change-Id: I3bc8d82c5689b8a2da1374e42dd70191e2fe8ef3
Reviewed-on: https://gerrit.libreoffice.org/11099Reviewed-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Tested-by: 's avatarThomas Arnhold <thomas@arnhold.org>
üst 30ae83c2
...@@ -889,15 +889,15 @@ static void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) ...@@ -889,15 +889,15 @@ static void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource )
rMergeSet.InvalidateItem( nId ); rMergeSet.InvalidateItem( nId );
} }
} }
else if ( eOldState == SFX_ITEM_SET ) // Item gesetzt else if ( eOldState == SFX_ITEM_SET ) // Item set
{ {
SfxItemState eNewState = rSource.GetItemState( nId, true, &pNewItem ); SfxItemState eNewState = rSource.GetItemState( nId, true, &pNewItem );
if ( eNewState == SFX_ITEM_SET ) if ( eNewState == SFX_ITEM_SET )
{ {
if ( pNewItem != pOldItem ) // beide gepuhlt if ( pNewItem != pOldItem ) // Both pulled
rMergeSet.InvalidateItem( nId ); rMergeSet.InvalidateItem( nId );
} }
else // Default else // Default
{ {
if ( *pOldItem != rSource.GetPool()->GetDefaultItem(nId) ) if ( *pOldItem != rSource.GetPool()->GetDefaultItem(nId) )
rMergeSet.InvalidateItem( nId ); rMergeSet.InvalidateItem( nId );
...@@ -923,7 +923,6 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, ...@@ -923,7 +923,6 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow,
do do
{ {
// similar patterns must not be repeated // similar patterns must not be repeated
const ScPatternAttr* pPattern = pData[nPos].pPattern; const ScPatternAttr* pPattern = pData[nPos].pPattern;
if ( pPattern != rState.pOld1 && pPattern != rState.pOld2 ) if ( pPattern != rState.pOld1 && pPattern != rState.pOld2 )
{ {
...@@ -1357,7 +1356,9 @@ bool ScAttrArray::IsMerged( SCROW nRow ) const ...@@ -1357,7 +1356,9 @@ bool ScAttrArray::IsMerged( SCROW nRow ) const
return rItem.IsMerged(); return rItem.IsMerged();
} }
// Area around any given summaries expand and adapt any MergeFlag (bRefresh) /**
* Area around any given summaries expand and adapt any MergeFlag (bRefresh)
*/
bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
SCCOL& rPaintCol, SCROW& rPaintRow, SCCOL& rPaintCol, SCROW& rPaintRow,
bool bRefresh ) bool bRefresh )
...@@ -1445,7 +1446,6 @@ bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) ...@@ -1445,7 +1446,6 @@ bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
SCROW nMergeEndRow = nThisEnd + nCountY - 1; SCROW nMergeEndRow = nThisEnd + nCountY - 1;
// ApplyAttr for areas // ApplyAttr for areas
for (SCROW nThisRow = nThisStart; nThisRow <= nThisEnd; nThisRow++) for (SCROW nThisRow = nThisStart; nThisRow <= nThisEnd; nThisRow++)
pDocument->ApplyAttr( nThisCol, nThisRow, nTab, *pAttr ); pDocument->ApplyAttr( nThisCol, nThisRow, nTab, *pAttr );
...@@ -1469,8 +1469,9 @@ bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) ...@@ -1469,8 +1469,9 @@ bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
return bFound; return bFound;
} }
// Remove field, but leave MergeFlags /**
* Remove field, but leave MergeFlags
*/
void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow) void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow)
{ {
SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), true ); SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), true );
...@@ -1492,7 +1493,7 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, ...@@ -1492,7 +1493,7 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
while ( nThisRow <= nEndRow ) while ( nThisRow <= nEndRow )
{ {
pOldPattern = pData[nIndex].pPattern; pOldPattern = pData[nIndex].pPattern;
if (pOldPattern != pWantedPattern) //! else-Zweig ? if (pOldPattern != pWantedPattern) // FIXME: else-branch?
{ {
if (nThisRow < nStartRow) nThisRow = nStartRow; if (nThisRow < nStartRow) nThisRow = nStartRow;
nRow = pData[nIndex].nRow; nRow = pData[nIndex].nRow;
...@@ -1652,7 +1653,7 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement ...@@ -1652,7 +1653,7 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement
((const SvxHorJustifyItem*)pItem)->GetValue() != SVX_HOR_JUSTIFY_RIGHT )); ((const SvxHorJustifyItem*)pItem)->GetValue() != SVX_HOR_JUSTIFY_RIGHT ));
sal_uInt16 nOldValue = ((const SfxUInt16Item&)rOldSet.Get( ATTR_INDENT )).GetValue(); sal_uInt16 nOldValue = ((const SfxUInt16Item&)rOldSet.Get( ATTR_INDENT )).GetValue();
sal_uInt16 nNewValue = nOldValue; sal_uInt16 nNewValue = nOldValue;
//to keep Increment indent from running outside the cell1659 // To keep Increment indent from running outside the cell1659
long nColWidth = (long)pDocument->GetColWidth(nCol,nTab); long nColWidth = (long)pDocument->GetColWidth(nCol,nTab);
if ( bIncrement ) if ( bIncrement )
{ {
...@@ -2184,8 +2185,9 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) ...@@ -2184,8 +2185,9 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow)
} }
} }
// move within a document /**
* Move within a document
*/
void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray) void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray)
{ {
SCROW nStart = nStartRow; SCROW nStart = nStartRow;
...@@ -2202,8 +2204,9 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray ...@@ -2202,8 +2204,9 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray
DeleteArea(nStartRow, nEndRow); DeleteArea(nStartRow, nEndRow);
} }
// copy between documents (Clipboard) /**
* Copy between documents (Clipboard)
*/
void ScAttrArray::CopyArea( void ScAttrArray::CopyArea(
SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, sal_Int16 nStripFlags) const SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, sal_Int16 nStripFlags) const
{ {
...@@ -2267,9 +2270,10 @@ void ScAttrArray::CopyArea( ...@@ -2267,9 +2270,10 @@ void ScAttrArray::CopyArea(
} }
} }
// leave flags /**
// summarized with CopyArea * Leave flags
* summarized with CopyArea
*/
void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray ) void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray )
{ {
nStartRow -= nDy; // Source nStartRow -= nDy; // Source
......
...@@ -51,8 +51,9 @@ TYPEINIT1(ScDoubleItem, SfxPoolItem); ...@@ -51,8 +51,9 @@ TYPEINIT1(ScDoubleItem, SfxPoolItem);
TYPEINIT1(ScPageScaleToItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem);
TYPEINIT1(ScCondFormatItem, SfxPoolItem); TYPEINIT1(ScCondFormatItem, SfxPoolItem);
// General Help Function /**
* General Help Function
*/
bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxBorderLine* pOther ) bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxBorderLine* pOther )
{ {
...@@ -76,15 +77,16 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB ...@@ -76,15 +77,16 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB
return false; return false;
else else
{ {
return true; //! ??? return true; // FIXME: What is this?
} }
} }
} }
// Item - Implementierungen /** Item - Implementations */
// Merge
/**
* Merge
*/
ScMergeAttr::ScMergeAttr(): ScMergeAttr::ScMergeAttr():
SfxPoolItem(ATTR_MERGE), SfxPoolItem(ATTR_MERGE),
nColMerge(0), nColMerge(0),
...@@ -140,8 +142,9 @@ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) con ...@@ -140,8 +142,9 @@ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) con
return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow)); return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow));
} }
// MergeFlag /**
* MergeFlag
*/
ScMergeFlagAttr::ScMergeFlagAttr(): ScMergeFlagAttr::ScMergeFlagAttr():
SfxInt16Item(ATTR_MERGE_FLAG, 0) SfxInt16Item(ATTR_MERGE_FLAG, 0)
{ {
...@@ -166,8 +169,9 @@ bool ScMergeFlagAttr::HasPivotPopupButton() const ...@@ -166,8 +169,9 @@ bool ScMergeFlagAttr::HasPivotPopupButton() const
return (GetValue() & SC_MF_BUTTON_POPUP) != 0; return (GetValue() & SC_MF_BUTTON_POPUP) != 0;
} }
// Protection /**
* Protection
*/
ScProtectionAttr::ScProtectionAttr(): ScProtectionAttr::ScProtectionAttr():
SfxPoolItem(ATTR_PROTECTION), SfxPoolItem(ATTR_PROTECTION),
bProtection(true), bProtection(true),
...@@ -384,8 +388,9 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint) ...@@ -384,8 +388,9 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint)
return true; return true;
} }
// ScRangeItem - Tabellenbereich /**
* ScRangeItem - Table range
*/
bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const
{ {
OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" );
...@@ -431,8 +436,9 @@ bool ScRangeItem::GetPresentation ...@@ -431,8 +436,9 @@ bool ScRangeItem::GetPresentation
return true; return true;
} }
// ScTableListItem - List from Tables (-numbers) /**
* ScTableListItem - List from Tables (-numbers)
*/
ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) ScTableListItem::ScTableListItem( const ScTableListItem& rCpy )
: SfxPoolItem ( rCpy.Which() ), : SfxPoolItem ( rCpy.Which() ),
nCount ( rCpy.nCount ) nCount ( rCpy.nCount )
...@@ -536,8 +542,9 @@ bool ScTableListItem::GetPresentation ...@@ -536,8 +542,9 @@ bool ScTableListItem::GetPresentation
return false; return false;
} }
// ScPageHFItem - Dates from the Head and Foot lines /**
* ScPageHFItem - Dates from the Head and Foot lines
*/
ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP )
: SfxPoolItem ( nWhichP ), : SfxPoolItem ( nWhichP ),
pLeftArea ( NULL ), pLeftArea ( NULL ),
...@@ -649,7 +656,6 @@ SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const ...@@ -649,7 +656,6 @@ SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const
static void lcl_SetSpace( OUString& rStr, const ESelection& rSel ) static void lcl_SetSpace( OUString& rStr, const ESelection& rSel )
{ {
// Text replaced by a space to ensure they are positions: // Text replaced by a space to ensure they are positions:
sal_Int32 nLen = rSel.nEndPos-rSel.nStartPos; sal_Int32 nLen = rSel.nEndPos-rSel.nStartPos;
rStr = rStr.replaceAt( rSel.nStartPos, nLen, " " ); rStr = rStr.replaceAt( rSel.nStartPos, nLen, " " );
} }
...@@ -717,10 +723,9 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const ...@@ -717,10 +723,9 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
pCenter == NULL || pCenter->GetParagraphCount() == 0 || pCenter == NULL || pCenter->GetParagraphCount() == 0 ||
pRight == NULL || pRight->GetParagraphCount() == 0 ) pRight == NULL || pRight->GetParagraphCount() == 0 )
{ {
// If successfully loaded, each object contains at least one paragraph. // If successfully loaded, each object contains at least one paragraph.
// Excel import in 5.1 created broken TextObjects (#67442#) that are // Excel import in 5.1 created broken TextObjects (#67442#) that are
// corrected here to avoid saving wrong files again (#90487#). // corrected here to avoid saving wrong files again (#90487#).
ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), true ); ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), true );
if ( pLeft == NULL || pLeft->GetParagraphCount() == 0 ) if ( pLeft == NULL || pLeft->GetParagraphCount() == 0 )
{ {
...@@ -739,7 +744,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const ...@@ -739,7 +744,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
} }
} }
if ( nVer < 1 ) //old field command conversions if ( nVer < 1 ) // old field command conversions
{ {
sal_uInt16 i; sal_uInt16 i;
const OUString& rDel = ScGlobal::GetRscString( STR_HFCMD_DELIMITER ); const OUString& rDel = ScGlobal::GetRscString( STR_HFCMD_DELIMITER );
...@@ -775,9 +780,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const ...@@ -775,9 +780,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
pRight = aEngine.CreateTextObject(); pRight = aEngine.CreateTextObject();
} }
} }
else if ( nVer < 2 ) else if ( nVer < 2 ) {} // nothing to do: SvxFileField is not exchanged for SvxExtFileField
{ // not to do, SvxFileField is not exchanged for SvxExtFileField
}
ScPageHFItem* pItem = new ScPageHFItem( Which() ); ScPageHFItem* pItem = new ScPageHFItem( Which() );
pItem->SetArea( pLeft, SC_HF_LEFTAREA ); pItem->SetArea( pLeft, SC_HF_LEFTAREA );
...@@ -817,8 +820,9 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) ...@@ -817,8 +820,9 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea )
} }
} }
// ScViewObjectModeItem - Display Mode of View Objects /**
* ScViewObjectModeItem - Display Mode of View Objects
*/
ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP ) ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP )
: SfxEnumItem( nWhichP, VOBJ_MODE_SHOW ) : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW )
{ {
...@@ -863,11 +867,10 @@ bool ScViewObjectModeItem::GetPresentation ...@@ -863,11 +867,10 @@ bool ScViewObjectModeItem::GetPresentation
break; break;
default: default:
ePres = SFX_ITEM_PRESENTATION_NAMELESS;//this always goes! ePres = SFX_ITEM_PRESENTATION_NAMELESS; // Default setting!
break; break;
} }
/* !!! fall-through !!! */ /* !!! fall-through !!! */
case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_NAMELESS:
rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue()); rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue());
return true; return true;
...@@ -923,8 +926,9 @@ SfxPoolItem* ScViewObjectModeItem::Create( ...@@ -923,8 +926,9 @@ SfxPoolItem* ScViewObjectModeItem::Create(
} }
} }
// double /**
* Double
*/
ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal )
: SfxPoolItem ( nWhichP ), : SfxPoolItem ( nWhichP ),
nValue ( nVal ) nValue ( nVal )
......
This diff is collapsed.
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