[Libreoffice-commits] core.git: 5 commits - sw/source
Philipp Riemer
ruderphilipp at gmail.com
Sun Jul 13 09:07:34 PDT 2014
sw/source/core/doc/docredln.cxx | 46 ++++++++++++-------------
sw/source/core/fields/docufld.cxx | 10 ++---
sw/source/core/fields/expfld.cxx | 8 ++--
sw/source/core/fields/reffld.cxx | 5 +-
sw/source/core/inc/frmtool.hxx | 2 -
sw/source/core/layout/frmtool.cxx | 4 +-
sw/source/core/unocore/XMLRangeHelper.cxx | 3 -
sw/source/core/unocore/XMLRangeHelper.hxx | 3 -
sw/source/core/unocore/unobkm.cxx | 6 ---
sw/source/core/unocore/unochart.cxx | 17 ++++-----
sw/source/core/unocore/unocoll.cxx | 14 +------
sw/source/core/unocore/unocrsrhelper.cxx | 11 +-----
sw/source/core/unocore/unodraw.cxx | 22 ++++++------
sw/source/core/unocore/unofield.cxx | 42 ++++++++++-------------
sw/source/core/unocore/unoframe.cxx | 54 ++++--------------------------
sw/source/core/unocore/unoftn.cxx | 2 -
sw/source/core/unocore/unoidx.cxx | 9 ++---
sw/source/core/unocore/unoobj.cxx | 4 --
sw/source/core/unocore/unoobj2.cxx | 1
sw/source/core/unocore/unoparagraph.cxx | 5 --
sw/source/core/unocore/unoredline.cxx | 2 -
sw/source/core/unocore/unorefmk.cxx | 2 -
sw/source/core/unocore/unosect.cxx | 2 -
sw/source/core/unocore/unostyle.cxx | 16 ++++----
sw/source/core/unocore/unotbl.cxx | 7 +--
sw/source/core/unocore/unotext.cxx | 10 ++---
26 files changed, 112 insertions(+), 195 deletions(-)
New commits:
commit 303df30fe93044c36c993e84170f70ec4b3d4d48
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Jul 13 18:04:48 2014 +0200
fix merge peculiarities
Change-Id: I8f01f16c52624611ac19dbd040ba0389ceccece2
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 2a0d527..a05c41f 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1928,7 +1928,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
else
pDoc->InsertPoolItem(aPam, aFmt, nInsertFlags);
- SwTxtAttr* pTxtAttr = aPam.GetNode()->GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
+ SwTxtAttr* pTxtAttr = aPam.GetNode().GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
// What about updating the fields? (see fldmgr.cxx)
if (pTxtAttr)
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 8f48a107..90c5e05 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2708,7 +2708,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
{
eAnchorId = ((const SwFmtAnchor*)pItem)->GetAnchorId();
if( FLY_AT_FLY == eAnchorId &&
- !aPam.GetNode()->FindFlyStartNode())
+ !aPam.GetNode().FindFlyStartNode())
{
// framebound only where a frame exists
SwFmtAnchor aAnchor(FLY_AT_PARA);
commit a6fe53dc789aa183327e1a94170520699a802e98
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Jul 13 14:37:21 2014 +0200
remove code that was commented out more than three years ago
Change-Id: I8bc53b5d940be73d8b4142a72fb247c4e3af2e17
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index 9549df2..ad50e95 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -278,8 +278,6 @@ bool lcl_getCellRangeAddressFromXMLString(
} // anonymous namespace
-//namespace chart
-//{
namespace XMLRangeHelper
{
@@ -386,6 +384,5 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
}
} // namespace XMLRangeHelper
-//} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx
index 8182f26..f28dc1b 100644
--- a/sw/source/core/unocore/XMLRangeHelper.hxx
+++ b/sw/source/core/unocore/XMLRangeHelper.hxx
@@ -27,8 +27,6 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-//namespace chart
-//{
namespace XMLRangeHelper
{
@@ -63,7 +61,6 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString );
OUString getXMLStringFromCellRange( const CellRange & rRange );
} // namespace XMLRangeHelper
-//} // namespace chart
// INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
#endif
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 9b08e0e..1120ef0 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -155,12 +155,6 @@ uno::Reference<text::XTextContent> SwXBookmark::CreateXBookmark(
uno::Reference<text::XTextContent> xBookmark(pMarkBase->GetXBookmark());
if (!xBookmark.is())
{
- // FIXME: These belong in XTextFieldsSupplier
- //if (dynamic_cast< ::sw::mark::TextFieldmark* >(&rBkmk))
- // pXBkmk = new SwXFieldmark(false, &rBkmk, pDoc);
- //else if (dynamic_cast< ::sw::mark::CheckboxFieldmark* >(&rBkmk))
- // pXBkmk = new SwXFieldmark(true, &rBkmk, pDoc);
- //else
OSL_ENSURE(
dynamic_cast< ::sw::mark::IBookmark* >(&rBookmark) || IDocumentMarkAccess::GetType(rBookmark) == IDocumentMarkAccess::ANNOTATIONMARK,
"<SwXBookmark::GetObject(..)>"
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 070de39..4718c47 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -49,7 +49,6 @@
using namespace ::com::sun::star;
-//static
void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc )
{
if (!pDoc)
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 942a638..25fc8b1 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -593,7 +593,6 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
xProjProv = new SwVbaProjectNameProvider;
pDoc->SetVBATemplateToProjectCache( xProjProv );
}
- //xRet = (cppu::OWeakObject*)xProjProv;
xRet = xProjProv;
}
#endif
@@ -709,11 +708,6 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
xRet = (cppu::OWeakObject*)pNewStyle;
}
break;
-// SW_SERVICE_DUMMY_5
-// SW_SERVICE_DUMMY_6
-// SW_SERVICE_DUMMY_7
-// SW_SERVICE_DUMMY_8
-// SW_SERVICE_DUMMY_9
case SW_SERVICE_FIELDTYPE_DATETIME:
case SW_SERVICE_FIELDTYPE_USER:
case SW_SERVICE_FIELDTYPE_SET_EXP:
@@ -1084,7 +1078,6 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
if(pFmts->empty())
return;
// #i104937#
-// const SwFrmFmt* const pFmtsEnd = (*pFmts)[pFmts->Count()];
const size_t nSize = pFmts->size();
::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin());
// #i104937#
@@ -1093,7 +1086,6 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
std::set<SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
for( size_t i = 0; i < nSize; ++i )
-// for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt)
{
// #i104937#
pFmt = (*pFmts)[i];
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 8c5c937..8f34ce4 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -304,8 +304,6 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
, const SwTxtNode* pNode )
{
PropertyState eNewState = PropertyState_DIRECT_VALUE;
-// PropertyState_DEFAULT_VALUE
-// PropertyState_AMBIGUOUS_VALUE
bool bDone = true;
switch(rEntry.nWID)
{
@@ -427,7 +425,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
{
*pAny <<= pTxtNd->GetListId();
}
- else /*if(rEntry.nWID == UNO_NAME_PARA_IS_NUMBERING_RESTART)*/
+ else
{
sal_Bool bIsRestart = pTxtNd->IsListRestart();
pAny->setValue(&bIsRestart, ::getBooleanCppuType());
@@ -450,7 +448,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
{
*pAny <<= OUString();
}
- else /*if(rEntry.nWID == UNO_NAME_PARA_IS_NUMBERING_RESTART)*/
+ else
*pAny <<= false;
}
}
@@ -860,10 +858,9 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
// no start of a new list
pDoc->SetNumRule( rPam, *pRule, false );
}
- // #i103817#
- // outline numbering
else
{
+ // #i103817#
// outline numbering
UnoActionContext aAction(pDoc);
SwNumRule* pRule = pDoc->GetOutlineNumRule();
@@ -912,7 +909,6 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
switch(rEntry.nWID)
{
case FN_UNO_PARA_STYLE :
-// lcl_SetTxtFmtColl(aValue, pUnoCrsr);
break;
case FN_UNO_PAGE_STYLE :
break;
@@ -937,7 +933,6 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
case FN_UNO_NUM_LEVEL :
break;
case FN_UNO_NUM_RULES:
-// lcl_setNumberingProperty(aValue, pUnoCrsr);
break;
case FN_UNO_CHARFMT_SEQUENCE:
{
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index e1e89f9..d72ddc8 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -781,7 +781,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference<
SwDrawContact* pContact = pDoc->GroupSelection( *pPage->GetDrawView() );
pDoc->ChgAnchor(
pPage->GetDrawView()->GetMarkedObjectList(),
- FLY_AT_PARA/*int eAnchorId*/,
+ FLY_AT_PARA,
true, false );
pPage->GetDrawView()->UnmarkAll();
@@ -815,7 +815,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
pDoc->UnGroupSelection( *pPage->GetDrawView() );
pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkedObjectList(),
- FLY_AT_PARA/*int eAnchorId*/,
+ FLY_AT_PARA,
true, false );
pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
pPage->RemovePageView();
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 4f5425e4..2a0d527 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1828,7 +1828,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
sal_uInt16 nSubType = DS_PAGE;
switch (m_pImpl->m_nServiceId)
{
-// case SW_SERVICE_FIELDTYPE_PAGE_COUNT : break;
case SW_SERVICE_FIELDTYPE_PARAGRAPH_COUNT : nSubType = DS_PARA; break;
case SW_SERVICE_FIELDTYPE_WORD_COUNT : nSubType = DS_WORD; break;
case SW_SERVICE_FIELDTYPE_CHARACTER_COUNT : nSubType = DS_CHAR; break;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index f42d845..8f48a107 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1553,7 +1553,6 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
if(pIdx)
{
SwNodeIndex aIdx(*pIdx, 1);
-// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
if(!pGrfNode)
{
@@ -2080,19 +2079,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
aAny <<= OUString(SwStyleNameMapper::GetProgName(pFmt->DerivedFrom()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_FRMFMT ) );
}
// #i73249#
- // Attribute AlternativeText was never published.
- // Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
-// else if(eType != FLYCNTTYPE_FRM &&
-// FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID)
-// {
-// const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
-// if(pIdx)
-// {
-// SwNodeIndex aIdx(*pIdx, 1);
-// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-// aAny <<= OUString(pNoTxt->GetAlternateText());
-// }
-// }
else if( FN_UNO_TITLE == pEntry->nWID )
{
SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
@@ -2116,8 +2102,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
{
SwNodeIndex aIdx(*pIdx, 1);
// --> OD #i85105#
-// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-// Size aActSize = ((SwGrfNode*)pNoTxt)->GetTwipSize();
Size aActSize;
{
SwGrfNode* pGrfNode = dynamic_cast<SwGrfNode*>(aIdx.GetNode().GetNoTxtNode());
@@ -2493,19 +2477,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
}
}
// #i73249#
- // Attribute AlternativeText was never published.
- // Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
-// else if( eType != FLYCNTTYPE_FRM && FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID )
-// {
-// const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
-// if(pIdx)
-// {
-// SwNodeIndex aIdx(*pIdx, 1);
-// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-// pNoTxt->SetAlternateText(aEmptyOUStr);
-// }
-// }
- // New attribute Title
else if( FN_UNO_TITLE == pEntry->nWID )
{
SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
@@ -2906,10 +2877,6 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
}
if ( xIPObj.is() )
{
- //TODO/LATER: MISCSTATUS_RESIZEONPRINTERCHANGE
- //if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xIPObj->GetMiscStatus() && pDoc->getPrinter( false ) )
- // xIPObj->OnDocumentPrinterChanged( pDoc->getPrinter( false ) );
-
UnoActionContext aAction(pDoc);
pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
if(!bSizeFound)
@@ -3271,11 +3238,6 @@ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void)
::std::auto_ptr<SwUnoCrsr> pUnoCursor(
GetDoc()->CreateUnoCrsr(aPos, false));
pUnoCursor->Move(fnMoveForward, fnGoNode);
-// // no Cursor in protected sections
-// SwCrsrSaveState aSave( *pUnoCrsr );
-// if(pUnoCrsr->IsInProtectTable(true) ||
-// pUnoCrsr->IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ))
-// throw uno::RuntimeException() );
aRef = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_FRAME);
}
return aRef;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index f615e97..411fdda 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -500,7 +500,6 @@ throw (uno::RuntimeException, std::exception)
sal_uInt16 nObjectType = SW_SERVICE_TYPE_INDEX;
switch (m_pImpl->m_eTOXType)
{
-// case TOX_INDEX: break;
case TOX_USER: nObjectType = SW_SERVICE_USER_INDEX;
break;
case TOX_CONTENT: nObjectType = SW_SERVICE_CONTENT_INDEX;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index e1c99dc..be5ca9f 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -620,9 +620,6 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional)
{
static const sal_uLong nMaxLookup = 1000;
SwFmtColl *pFmt = 0;
-
-// if ( GetCrsrCnt() > nMaxLookup )
-// return 0;
bool bError = false;
SwPaM *pTmpCrsr = &rPaM;
do
@@ -2725,7 +2722,6 @@ bool SwUnoCursorHelper::ConvertSortProperties(
for (sal_Int32 n = 0; n < rDescriptor.getLength(); ++n)
{
uno::Any aValue( pProperties[n].Value );
-// String sPropName = pProperties[n].Name;
const OUString& rPropName = pProperties[n].Name;
// old and new sortdescriptor
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index dc8d636..bbc0474 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -800,9 +800,6 @@ throw (uno::RuntimeException)
rTxtNode, &pAttrSet, *pEntry, bAttrSetFetched );
rResult.State = eState;
-// if (bDirectValuesOnly && PropertyState_DIRECT_VALUE != eState)
-// rResult.Result = beans::TolerantPropertySetResultType::NO_DIRECT_VALUE;
-// else
rResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_FAILURE;
if (!bDirectValuesOnly ||
(beans::PropertyState_DIRECT_VALUE == eState))
@@ -940,7 +937,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
static beans::PropertyState lcl_SwXParagraph_getPropertyState(
- // SwUnoCrsr& rUnoCrsr,
const SwTxtNode& rTxtNode,
const SwAttrSet** ppSet,
const SfxItemPropertySimpleEntry& rEntry,
@@ -1182,7 +1178,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
pTemp->SetMark();
*pTemp->GetPoint() = aEnd;
- //pTemp->Exchange();
SwUnoCursorHelper::SelectPam(*pTemp, true);
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index acc576d..89b662d 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -1432,7 +1432,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
pStates[i] = beans::PropertyState_DIRECT_VALUE;
}
}
- else //if(RES_BACKGROUND == pEntry->nWID)
+ else
{
if (!m_pImpl->m_pProps->m_pBrushItem.get())
{
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 4a3a717..adca875 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1337,7 +1337,7 @@ SwXText::Impl::finishOrAppendParagraph(
aEx.Message = sMessage;
throw aEx;
}
- else // if(bRuntimeException)
+ else
{
uno::RuntimeException aEx;
aEx.Message = sMessage;
@@ -1384,8 +1384,6 @@ SwXText::insertTextPortion(
OUString sMessage;
m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
-// SwPaM aPam(*pStartNode->EndOfSectionNode());
- //aPam.Move( fnMoveBackward, fnGoNode );
SwUnoCrsr *const pCursor = pTextCursor->GetCursor();
m_pImpl->m_pDoc->DontExpandFmt( *pCursor->Start() );
@@ -1426,7 +1424,7 @@ SwXText::insertTextPortion(
aEx.Message = sMessage;
throw aEx;
}
- else //if(bRuntimeException)
+ else
{
uno::RuntimeException aEx;
aEx.Message = sMessage;
@@ -1771,7 +1769,7 @@ SwXText::convertToTextFrame(
aEx.Message = sMessage;
throw aEx;
}
- else //if(bRuntimeException)
+ else
{
uno::RuntimeException aEx;
aEx.Message = sMessage;
commit 21eb2f36ff9e223318d72b952eacaf419a722ce1
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Jul 13 14:34:24 2014 +0200
fix existing comments
Change-Id: I718576c05ee3c621f2544cb1dcd6f0d7d1cc87c9
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index c836247..1372efb 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -158,7 +158,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout,
const SwPosition *pPos = 0,
const bool bCalcFrm = false );
-// Should extra data (reline stroke, line numbers) be painted?
+// Should extra data (redline stroke, line numbers) be painted?
bool IsExtraData( const SwDoc *pDoc );
// #i11760# - method declaration <CalcCntnt(..)>
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 17e4173..070de39 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2568,9 +2568,9 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
if (!pCNd)
pCNd = GetFrmFmt()->GetDoc()->GetNodes().GoNext( &aIdx );
// and then one can e.g. create a SwPosition:
- SwPosition aNewPos( *pCNd ); // new position to beused with cursor
+ SwPosition aNewPos( *pCNd ); // new position to be used with cursor
- // if the mark is to be changed make sure there is one...
+ // if the mark is to be changed, make sure there is one
if (pMarkStartNode == rBox.GetSttNd() && !pTblCrsr->HasMark())
pTblCrsr->SetMark();
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 539d9d4..f42d845 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2178,7 +2178,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
uno::Reference < frame::XModel > xModel( xComp, uno::UNO_QUERY );
if ( FN_EMBEDDED_OBJECT == pEntry->nWID )
{
- // ensure the
+ // when exposing the EmbeddedObject, ensure it has a client site
OSL_ENSURE( pDoc->GetDocShell(), "no doc shell => no client site" );
if ( pDoc->GetDocShell() )
pDoc->GetDocShell()->GetIPClient( svt::EmbeddedObjectRef( xIP, embed::Aspects::MSOLE_CONTENT ) );
commit 92d82e0f4be53023e74f556aa3caf5c61427bc97
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Jul 13 14:32:09 2014 +0200
normalize comments
Change-Id: I13986c75d28d01f6afa193ea963b23f8dba703e8
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index d3fae50..c5d1186 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -190,7 +190,7 @@ void SwDoc::SetRedlineMode( RedlineMode_t eMode )
SetModified();
}
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwDoc::IsRedlineOn() const
@@ -1295,7 +1295,7 @@ void SwDoc::CompressRedlines()
}
_CHECK_REDLINE( this )
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwDoc::SplitRedline( const SwPaM& rRange )
@@ -1359,7 +1359,7 @@ bool SwDoc::SplitRedline( const SwPaM& rRange )
}
return bChg;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwDoc::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo,
@@ -1476,7 +1476,7 @@ bool SwDoc::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo,
return bChg;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwDoc::DeleteRedline( const SwStartNode& rNode, bool bSaveInUndo,
@@ -1505,7 +1505,7 @@ sal_uInt16 SwDoc::GetRedlinePos( const SwNode& rNd, sal_uInt16 nType ) const
}
return USHRT_MAX;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
@@ -1517,7 +1517,7 @@ bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTab
if (bSaveInUndo && pDoc->GetIDocumentUndoRedo().DoesUndo())
{
- // To-Do - Add 'Undo' support for deleting 'Table Cell' redlines
+ // #TODO - Add 'Undo' support for deleting 'Table Cell' redlines
/*
SwUndoRedline* pUndo = new SwUndoRedline( UNDO_REDLINE, rRange );
if( pUndo->GetRedlSaveCount() )
@@ -1591,7 +1591,7 @@ bool SwExtraRedlineTbl::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& r
if (bSaveInUndo && pDoc->GetIDocumentUndoRedo().DoesUndo())
{
- // To-Do - Add 'Undo' support for deleting 'Table Cell' redlines
+ // #TODO - Add 'Undo' support for deleting 'Table Cell' redlines
/*
SwUndoRedline* pUndo = new SwUndoRedline( UNDO_REDLINE, rRange );
if( pUndo->GetRedlSaveCount() )
@@ -1638,7 +1638,7 @@ bool SwExtraRedlineTbl::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& r
if (bSaveInUndo && pDoc->GetIDocumentUndoRedo().DoesUndo())
{
- // To-Do - Add 'Undo' support for deleting 'Table Cell' redlines
+ // #TODO - Add 'Undo' support for deleting 'Table Cell' redlines
/*
SwUndoRedline* pUndo = new SwUndoRedline( UNDO_REDLINE, rRange );
if( pUndo->GetRedlSaveCount() )
@@ -1743,7 +1743,7 @@ const SwRangeRedline* SwDoc::GetRedline( const SwPosition& rPos,
*pFndPos = nU;
return 0;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
typedef bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos,
@@ -2260,7 +2260,7 @@ bool SwDoc::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
}
return bRet;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2306,7 +2306,7 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
}
return nRet != 0;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwDoc::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2374,7 +2374,7 @@ bool SwDoc::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
}
return bRet;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2421,7 +2421,7 @@ bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete )
return nRet != 0;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
const SwRangeRedline* SwDoc::SelNextRedline( SwPaM& rPam ) const
@@ -2540,7 +2540,7 @@ const SwRangeRedline* SwDoc::SelNextRedline( SwPaM& rPam ) const
return pFnd;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
const SwRangeRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const
@@ -2661,7 +2661,7 @@ const SwRangeRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const
return pFnd;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
// Set comment at the Redline
@@ -2691,7 +2691,7 @@ bool SwDoc::SetRedlineComment( const SwPaM& rPaM, const OUString& rS )
return bRet;
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
// Create a new author if necessary
@@ -2716,7 +2716,7 @@ void SwDoc::UpdateRedlineAttr()
pRedl->InvalidateRange();
}
- // To-Do - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTbl' also ?
}
/// Set comment text for the Redline, which is inserted later on via
@@ -4145,7 +4145,7 @@ bool SwDoc::AppendTableRowRedline( SwTableRowRedline* pNewRedl, bool bCallDelete
{
(void)bCallDelete;
- // TO-DO - equivelant for 'SwTableRowRedline'
+ // #TODO - equivelant for 'SwTableRowRedline'
bool bMerged = false;
/*
_CHECK_REDLINE( this )
@@ -4153,7 +4153,7 @@ bool SwDoc::AppendTableRowRedline( SwTableRowRedline* pNewRedl, bool bCallDelete
if (IsRedlineOn() && !IsShowOriginal(meRedlineMode))
{
- // TO-DO - equivelant for 'SwTableRowRedline'
+ // #TODO - equivelant for 'SwTableRowRedline'
/*
pNewRedl->InvalidateRange();
*/
@@ -4178,7 +4178,7 @@ bool SwDoc::AppendTableRowRedline( SwTableRowRedline* pNewRedl, bool bCallDelete
delete pNewRedl, pNewRedl = 0;
*/
}
- // TO-DO - equivelant for 'SwTableRowRedline'
+ // #TODO - equivelant for 'SwTableRowRedline'
/*
_CHECK_REDLINE( this )
*/
@@ -4200,7 +4200,7 @@ bool SwDoc::AppendTableCellRedline( SwTableCellRedline* pNewRedl, bool bCallDele
{
(void)bCallDelete;
- // TO-DO - equivelant for 'SwTableCellRedline'
+ // #TODO - equivelant for 'SwTableCellRedline'
bool bMerged = false;
/*
_CHECK_REDLINE( this )
@@ -4208,7 +4208,7 @@ bool SwDoc::AppendTableCellRedline( SwTableCellRedline* pNewRedl, bool bCallDele
if (IsRedlineOn() && !IsShowOriginal(meRedlineMode))
{
- // TO-DO - equivelant for 'SwTableCellRedline'
+ // #TODO - equivelant for 'SwTableCellRedline'
/*
pNewRedl->InvalidateRange();
*/
@@ -4233,7 +4233,7 @@ bool SwDoc::AppendTableCellRedline( SwTableCellRedline* pNewRedl, bool bCallDele
delete pNewRedl, pNewRedl = 0;
*/
}
- // TO-DO - equivelant for 'SwTableCellRedline'
+ // #TODO - equivelant for 'SwTableCellRedline'
/*
_CHECK_REDLINE( this )
*/
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 558582c..17e4173 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2574,7 +2574,7 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
if (pMarkStartNode == rBox.GetSttNd() && !pTblCrsr->HasMark())
pTblCrsr->SetMark();
- // set cursor to new position...
+ // set cursor to new position
SwPosition *pPos = (pPointStartNode == rBox.GetSttNd()) ?
pTblCrsr->GetPoint() : pTblCrsr->GetMark();
if (pPos)
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 7bba797..942a638 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -99,7 +99,7 @@ public:
OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE
{
- // not implemented...
+ // #FIXME not implemented...
return OUString();
}
@@ -167,7 +167,7 @@ public:
{
}
}
- // Probably should throw here ( if !bMatched )
+ // #TODO Probably should throw here ( if !bMatched )
return sCodeName;
}
};
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 9013b12..b7b7d93 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3071,7 +3071,7 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault( )
{
pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(m_sStyleName);
- OSL_ENSURE(pBase, "where is the style, you fiend!?");
+ OSL_ENSURE(pBase, "Where is the style?");
if(pBase)
{
commit 6fe539ceeeb38d44c880ba09287820e69e2c4d34
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Jul 13 14:28:55 2014 +0200
fdo#39468: Translate German comments in sw/source/core/
Change-Id: Ib48b281feccd4684571768ca2be6ecca23afbf55
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index bd64283..d03730a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -586,7 +586,7 @@ SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument)
OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
{
- OSL_ENSURE( nFmt < FF_END, "Expand: kein guelt. Fmt!" );
+ OSL_ENSURE( nFmt < FF_END, "Expand: no valid Fmt!" );
OUString aRet;
SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -604,7 +604,7 @@ OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
{
if( FF_UI_RANGE == nFmt )
{
- // fuers besorgen vom RegionNamen !!
+ // for getting region names!
SfxDocumentTemplates aFac;
aFac.Construct();
OUString sTmp;
@@ -747,7 +747,7 @@ OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
nFmt = (sal_uInt32)nNumberingType;
break;
default:
- OSL_FAIL( "SwDocStatFieldType::Expand: unbekannter SubType" );
+ OSL_FAIL( "SwDocStatFieldType::Expand: unknown SubType" );
}
if( nVal <= SHRT_MAX )
@@ -879,7 +879,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
sal_uInt16 nExtSub = nSub & 0xff00;
- nSub &= 0xff; // ExtendedSubTypes nicht beachten
+ nSub &= 0xff; // do not consider extended SubTypes
OUString aStr;
switch(nSub)
@@ -1346,7 +1346,7 @@ OUString SwHiddenTxtField::Expand() const
/// get current field value and cache it
void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
{
- OSL_ENSURE(pDoc, "Wo ist das Dokument Seniore");
+ OSL_ENSURE(pDoc, "got no document");
if( TYP_CONDTXTFLD == nSubType )
{
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 4526226..0d2afb7 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -142,7 +142,7 @@ SwTxtNode* GetFirstTxtNode( const SwDoc& rDoc, SwPosition& rPos,
while( 0 != (pCNd = rNodes.GoNext( &rPos.nNode ) ) &&
0 == ( pTxtNode = pCNd->GetTxtNode() ) )
;
- OSL_ENSURE( pTxtNode, "Where is the 1.TextNode" );
+ OSL_ENSURE( pTxtNode, "Where is the 1. TextNode?" );
rPos.nContent.Assign( pTxtNode, 0 );
}
else if ( !pCFrm->IsValid() )
@@ -169,9 +169,9 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
{
if( pLayout->IsFlyFrm() )
{
- // hole das FlyFormat
+ // get the FlyFormat
SwFrmFmt* pFlyFmt = ((SwFlyFrm*)pLayout)->GetFmt();
- OSL_ENSURE( pFlyFmt, "kein FlyFormat gefunden, wo steht das Feld" );
+ OSL_ENSURE( pFlyFmt, "Could not find FlyFormat, where is the field?" );
const SwFmtAnchor &rAnchor = pFlyFmt->GetAnchor();
@@ -243,7 +243,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
else
{
Point aPt( pLayout->Frm().Pos() );
- aPt.Y()++; // aus dem Header raus
+ aPt.Y()++; // get out of the header
pCntFrm = pPgFrm->GetCntntPos( aPt, false, true, false );
pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt );
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 18b85c5..c62db3d 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -357,8 +357,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
case REF_BOOKMARK:
nStart = nNumStart;
- // Text steht ueber verschiedene Nodes verteilt.
- // Gesamten Text oder nur bis zum Ende vom Node?
+ // text is spread across multiple nodes - get whole text or only until end of node?
nEnd = nNumEnd<0 ? nLen : nNumEnd;
break;
@@ -369,7 +368,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
case REF_FOOTNOTE:
case REF_ENDNOTE:
- // die Nummer oder den NumString besorgen
+ // get number or numString
for( unsigned i = 0; i < pDoc->GetFtnIdxs().size(); ++i )
{
SwTxtFtn* const pFtnIdx = pDoc->GetFtnIdxs()[i];
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index f3cd126..60658bf 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3073,12 +3073,12 @@ bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
}
/// provides the area of a frame in that no Fly from another area can overlap
-const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp )
+const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalContextType )
{
const sal_uInt16 nTyp = FRM_ROOT | FRM_HEADER | FRM_FOOTER | FRM_FTNCONT |
FRM_FTN | FRM_FLY |
FRM_TAB | FRM_ROW | FRM_CELL |
- nAdditionalKontextTyp;
+ nAdditionalContextType;
do
{ if ( pFrm->GetType() & nTyp )
break;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 3d52078..558582c 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2559,15 +2559,15 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
if (pNewBox) // set new position (cell range) to use
{
- // So erh lt man den ersten Inhaltsnode in einer gegebenen Zelle:
- // Zun chst einen SwNodeIndex auf den Node hinter dem SwStartNode der Box...
+ // This is how you get the first content node of a row:
+ // First get a SwNodeIndex pointing to the node after SwStartNode of the box...
SwNodeIndex aIdx( *pNewBox->GetSttNd(), +1 );
- // Dies kann ein SwCntntNode sein, kann aber auch ein Tabellen oder Sectionnode sein,
- // deshalb das GoNext;
+ // This can be a SwCntntNode, but might also be a table or section node,
+ // therefore call GoNext
SwCntntNode *pCNd = aIdx.GetNode().GetCntntNode();
if (!pCNd)
pCNd = GetFrmFmt()->GetDoc()->GetNodes().GoNext( &aIdx );
- //und damit kann man z.B. eine SwPosition erzeugen:
+ // and then one can e.g. create a SwPosition:
SwPosition aNewPos( *pCNd ); // new position to beused with cursor
// if the mark is to be changed make sure there is one...
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index c6a351d..7bba797 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1547,7 +1547,7 @@ sal_Bool SwXTextSections::hasByName(const OUString& rName)
}
else
{
- //Sonderbehandlung der dbg_ - Methoden
+ // special handling for dbg_ methods
if( !rName.startsWith("dbg_"))
throw uno::RuntimeException();
}
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 473aa36..e1e89f9 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -297,7 +297,7 @@ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj
SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape )
throw (uno::RuntimeException, std::exception)
{
- //TODO: stimmt das so - kann die Methode weg?
+ //FIXME: just a redirect call - can this method be deleted?
return SvxFmDrawPage::_CreateSdrObject( xShape );
}
@@ -604,11 +604,11 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
uno::Reference< uno::XAggregation > xAgg = pShape->GetAggregationInterface();
- OSL_ENSURE(pSvxShape, "warum gibt es hier kein SvxShape?");
- //diese Position ist auf jeden Fall in 1/100 mm
+ OSL_ENSURE(pSvxShape, "Why is here no SvxShape?");
+ // this position is definitely in 1/100 mm
awt::Point aMM100Pos(pSvxShape->getPosition());
- //jetzt noch die Properties aus dem SwShapeDescriptor_Impl auswerten
+ // now evaluate the properties of SwShapeDescriptor_Impl
SwShapeDescriptor_Impl* pDesc = pShape->GetDescImpl();
SfxItemSet aSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -619,7 +619,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
{
if(pDesc->GetSurround())
aSet.Put( *pDesc->GetSurround());
- //die Items sind schon in Twip gesetzt
+ // all items are already in Twip
if(pDesc->GetLRSpace())
{
aSet.Put(*pDesc->GetLRSpace());
@@ -755,9 +755,9 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference<
{
SwFmDrawPage* pPage = GetSvxPage();
- if(pPage)//kann das auch Null sein?
+ if(pPage) //TODO: can this be Null?
{
- //markieren und MarkList zurueckgeben
+ // mark and return MarkList
const SdrMarkList& rMarkList = pPage->PreGroup(xShapes);
if ( rMarkList.GetMarkCount() > 1 )
{
@@ -807,7 +807,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
if(xPageAgg.is())
{
SwFmDrawPage* pPage = GetSvxPage();
- if(pPage)//kann das auch Null sein?
+ if(pPage) //TODO: can this be Null?
{
pPage->PreUnGroup(xShapeGroup);
UnoActionContext aContext(pDoc);
@@ -1075,7 +1075,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
throw beans::PropertyVetoException ("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- //mit Layout kann der Anker umgesetzt werden, ohne dass sich die Position aendert
+ // with the layout it is possible to move the anchor without changing the position
if(pFmt)
{
SwAttrSet aSet(pFmt->GetAttrSet());
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index a27eadd..4f5425e4 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -850,7 +850,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
else
{
- //TODO: Properties fuer die uebrigen Feldtypen einbauen
+ //TODO: add properties for the other field types
const sal_uInt16 nMId = GetFieldTypeMId( rPropertyName, *pType );
if (USHRT_MAX == nMId)
{
@@ -979,7 +979,7 @@ throw (uno::RuntimeException, std::exception)
nTypeIdx = i;
}
- // zuerst alle Felder loeschen
+ // first delete all fields
SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
SwFmtFld* pFld = aIter.First();
while(pFld)
@@ -991,7 +991,7 @@ throw (uno::RuntimeException, std::exception)
}
pFld = aIter.Next();
}
- // dann den FieldType loeschen
+ // then delete FieldType
m_pImpl->m_pDoc->RemoveFldType(nTypeIdx);
}
@@ -1311,12 +1311,12 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
}
SwDoc* pDoc = pRange ? (SwDoc*)pRange->GetDoc() : pCursor ? (SwDoc*)pCursor->GetDoc() : 0;
- //wurde ein FieldMaster attached, dann ist das Dokument schon festgelegt!
+ // if a FieldMaster was attached, then the document is already fixed!
if (!pDoc || (m_pImpl->m_pDoc && m_pImpl->m_pDoc != pDoc))
throw lang::IllegalArgumentException();
SwUnoInternalPaM aPam(*pDoc);
- //das muss jetzt sal_True liefern
+ // this now needs to return TRUE
::sw::XTextRangeToSwPaM(aPam, xTextRange);
SwField* pFld = 0;
switch (m_pImpl->m_nServiceId)
@@ -1768,7 +1768,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
m_pImpl->m_pProps->sPar1, nSubType,
m_pImpl->m_pProps->nFormat);
pFld = pGEField;
- //TODO: SubType auswerten!
+ //TODO: evaluate SubType!
if (!m_pImpl->m_pProps->sPar4.isEmpty())
pGEField->ChgExpStr(m_pImpl->m_pProps->sPar4);
// #i82544#
@@ -1929,9 +1929,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
else
pDoc->InsertPoolItem(aPam, aFmt, nInsertFlags);
- SwTxtAttr* pTxtAttr = aPam.GetNode().GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
+ SwTxtAttr* pTxtAttr = aPam.GetNode()->GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
- // was passiert mit dem Update der Felder ? (siehe fldmgr.cxx)
+ // What about updating the fields? (see fldmgr.cxx)
if (pTxtAttr)
{
const SwFmtFld& rFld = pTxtAttr->GetFmtFld();
@@ -2085,7 +2085,7 @@ SwXTextField::getPropertySetInfo()
throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- //kein static
+ // no static
uno::Reference< beans::XPropertySetInfo > aRef;
if (m_pImpl->m_nServiceId == USHRT_MAX)
{
@@ -2342,11 +2342,9 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
nHiddenStart, nHiddenEnd );
}
- // !bFrame && !bHidden: aller Wahrscheinlichkeit handelt es
- // sich um ein Feld in einem unbenutzten Seitenstyle
+ // !bFrame && !bHidden: most probably a field in an unused page style
- // bHidden: Feld ist versteckt
- // FME: Problem: Verstecktes Feld in unbenutzter Seitenvorlage =>
+ // FME: Problem: hidden field in unused page template =>
// bIsFieldUsed = true
// bIsFieldDisplayed = false
bIsFieldUsed = bFrame || bHidden;
@@ -2594,7 +2592,7 @@ void SwXTextField::Impl::Modify(
break;
case RES_FMT_CHG:
- // wurden wir an das neue umgehaengt und wird das alte geloscht?
+ // Am I re-attached to a new one and will the old one be deleted?
if( ((SwFmtChg*)pNew)->pChangedFmt == GetRegisteredIn() &&
((SwFmtChg*)pOld)->pChangedFmt->IsFmtInDTOR() )
Invalidate();
@@ -2644,16 +2642,15 @@ SwXTextFieldMasters::~SwXTextFieldMasters()
}
/*
- Iteration ueber nicht-Standard Feldtypen
+ Iteration over non-standard field types
USER/SETEXP/DDE/DATABASE
- Der Name ist demnach:
- "com.sun.star.text.fieldmaster.User" + <Feltypname>
- "com.sun.star.text.fieldmaster.DDE" + <Feltypname>
- "com.sun.star.text.fieldmaster.SetExpression" + <Feltypname>
- "com.sun.star.text.fieldmaster.DataBase" + <Feltypname>
-
- Falls wir grosszuegig werden wollen, dann koennte man com.sun.star.text
- auch optional weglassen
+ Thus the names are:
+ "com.sun.star.text.fieldmaster.User" + <field type name>
+ "com.sun.star.text.fieldmaster.DDE" + <field type name>
+ "com.sun.star.text.fieldmaster.SetExpression" + <field type name>
+ "com.sun.star.text.fieldmaster.DataBase" + <field type name>
+
+ If too much, maybe one could leave out the "com.sun.star.text".
*/
static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName )
{
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index b263682..539d9d4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -186,7 +186,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
}
bool bRet = true;
- //Anker kommt auf jeden Fall in den Set
+ // always add an anchor to the set
SwFmtAnchor aAnchor ( static_cast < const SwFmtAnchor & > ( rFromSet.Get ( RES_ANCHOR ) ) );
{
const ::uno::Any* pAnchorPgNo;
@@ -2690,7 +2690,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
if(pDoc)
{
SwUnoInternalPaM aIntPam(*pDoc);
- //das muss jetzt true liefern
+ // this now needs to return TRUE
::sw::XTextRangeToSwPaM(aIntPam, xTextRange);
SwNode& rNode = pDoc->GetNodes().GetEndOfContent();
@@ -2719,11 +2719,11 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
//UUUU set correct parent to get the XFILL_NONE FillStyle as needed
aFrmSet.SetParent(&pDoc->GetDfltFrmFmt()->GetAttrSet());
- //jetzt muessen die passenden Items in den Set
+ // no the related items need to be added to the set
bool bSizeFound;
if(!pProps->AnyToItemSet( pDoc, aFrmSet, aGrSet, bSizeFound))
throw lang::IllegalArgumentException();
- //der TextRange wird einzeln behandelt
+ // a TextRange is handled separately
*aPam.GetPoint() = *aIntPam.GetPoint();
if(aIntPam.HasMark())
{
@@ -2737,9 +2737,9 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
{
eAnchorId = ((const SwFmtAnchor*)pItem)->GetAnchorId();
if( FLY_AT_FLY == eAnchorId &&
- !aPam.GetNode().FindFlyStartNode())
+ !aPam.GetNode()->FindFlyStartNode())
{
- //rahmengebunden geht nur dort, wo ein Rahmen ist!
+ // framebound only where a frame exists
SwFmtAnchor aAnchor(FLY_AT_PARA);
aFrmSet.Put(aAnchor);
}
@@ -2799,7 +2799,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
if(!m_sName.isEmpty())
pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, m_sName);
}
- //den SwXText wecken
+ // wake up the SwXTextFrame
((SwXTextFrame*)this)->SetDoc( bIsDescriptor ? m_pDoc : GetFrmFmt()->GetDoc() );
}
else if( eType == FLYCNTTYPE_GRF)
@@ -3034,7 +3034,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
}
else
throw lang::IllegalArgumentException();
- //setzt das Flag zurueck und loescht den Descriptor-Pointer
+ // reset the flag and delete Descriptor pointer
ResetDescriptor();
}
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index bca83ba..e082e5c 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -306,7 +306,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
}
SwUnoInternalPaM aPam(*pNewDoc);
- //das muss jetzt sal_True liefern
+ // this now needs to return TRUE
::sw::XTextRangeToSwPaM(aPam, xTextRange);
UnoActionContext aCont(pNewDoc);
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 888dfb6..f615e97 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1333,7 +1333,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
}
SwUnoInternalPaM aPam(*pDoc);
- //das muss jetzt sal_True liefern
+ // this now needs to return TRUE
::sw::XTextRangeToSwPaM(aPam, xTextRange);
const SwTOXBase* pOld = pDoc->GetCurTOX( *aPam.Start() );
@@ -1855,7 +1855,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
}
SwUnoInternalPaM aPam(*pDoc);
- //which must now return sal_True
+ // this now needs to return TRUE
::sw::XTextRangeToSwPaM(aPam, xTextRange);
SwTOXMark aMark (pTOXType);
if (!m_pImpl->m_sAltText.isEmpty())
@@ -1937,8 +1937,8 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
rPam.DeleteMark();
bMark = false;
}
- // Marks ohne Alternativtext ohne selektierten Text koennen nicht eingefuegt werden,
- // deshalb hier ein Leerzeichen - ob das die ideale Loesung ist?
+ // Marks without alternative text and without selected text cannot be inserted,
+ // thus use a space - is this really the ideal solution?
if (!bMark && rMark.GetAlternativeText().isEmpty())
{
rMark.SetAlternativeText( OUString(' ') );
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 3f6734e..1c350b6 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -222,7 +222,6 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
0 != (pAnchorPos = rAnchor.GetCntntAnchor()) &&
pAnchorPos->nNode == rIdx )
{
- //jetzt einen SwDepend anlegen und in das Array einfuegen
SwDepend* pNewDepend = new SwDepend( &rClnt, (SwFrmFmt*)pFmt);
// OD 2004-05-07 #i28701# - determine insert position for
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 5093f6c..69434d0 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -590,7 +590,7 @@ uno::Reference< text::XTextCursor > SwXRedline::createTextCursor(void) throw( u
SwUnoCrsr *const pUnoCrsr = pXCursor->GetCursor();
pUnoCrsr->Move(fnMoveForward, fnGoNode);
- //steht hier eine Tabelle?
+ // is here a table?
SwTableNode* pTblNode = pUnoCrsr->GetNode().FindTableNode();
SwCntntNode* pCont = 0;
while( pTblNode )
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 617ad1a..aec2d1f 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -296,7 +296,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
}
SwUnoInternalPaM aPam(*pDocument);
- //das muss jetzt sal_True liefern
+ // this now needs to return TRUE
::sw::XTextRangeToSwPaM(aPam, xTextRange);
m_pImpl->InsertRefMark(aPam, dynamic_cast<SwXTextCursor*>(pCursor));
m_pImpl->m_bIsDescriptor = false;
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 8e75c49..9013b12 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -192,7 +192,7 @@ uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name)
uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
-// der Index kommt aus const unsigned short aStyleByIndex[] =
+// the index comes from const unsigned short aStyleByIndex[] = ...
uno::Any aRet;
if(!IsValid())
throw uno::RuntimeException();
@@ -845,7 +845,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen
#if OSL_DEBUG_LEVEL > 1
(void)rNewBase;
#endif
- //so, jetzt sollten noch die Properties des Descriptors angewandt werden
+ // after all, we still need to apply the properties of the descriptor
pNewStyle->ApplyDescriptorProperties();
}
else
@@ -864,7 +864,7 @@ void SwXStyleFamily::replaceByName(const OUString& rName, const uno::Any& rEleme
{
pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(rName);
- //Ersetzung geht nur fuer benutzerdefinierte Styles
+ // replacements only for userdefined styles
if(!pBase)
throw container::NoSuchElementException();
if(!pBase->IsUserDefined())
@@ -1811,7 +1811,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
bDone = true;
break;
}
- case FN_UNO_NUM_RULES: //Sonderbehandlung fuer das SvxNumRuleItem:
+ case FN_UNO_NUM_RULES: // special handling for a SvxNumRuleItem:
{
if(aValue.getValueType() == cppu::UnoType<container::XIndexReplace>::get())
{
@@ -1869,7 +1869,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
aFmt.SetCharFmt( pCharFmt );
}
- //jetzt nochmal fuer Fonts
+ // same for fonts:
if (!pBulletFontNames[i].isEmpty() &&
!SwXNumberingRules::isInvalidStyle(pBulletFontNames[i]) &&
(!pFmt->GetBulletFont() || pFmt->GetBulletFont()->GetName() != pBulletFontNames[i]) )
@@ -2358,10 +2358,10 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
bDone = true;
break;
}
- case FN_UNO_NUM_RULES: //Sonderbehandlung fuer das SvxNumRuleItem:
+ case FN_UNO_NUM_RULES: // special handling for a SvxNumRuleItem:
{
const SwNumRule* pRule = rBase.getNewBase()->GetNumRule();
- OSL_ENSURE(pRule, "Wo ist die NumRule?");
+ OSL_ENSURE(pRule, "Where is the NumRule?");
uno::Reference< container::XIndexReplace > xRules = new SwXNumberingRules(*pRule, pDoc);
aRet.setValue(&xRules, cppu::UnoType<container::XIndexReplace>::get());
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index fe5fb6d..daf1076 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1775,7 +1775,7 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
if(pUnoCrsr)
{
{
- // hier muessen die Actions aufgehoben werden
+ // here, all actions need to be revoked
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
@@ -1893,7 +1893,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
}
break;
case RES_BOXATR_FORMAT:
- //GetAttr fuer Tabellenselektion am Doc fehlt noch
+ // TODO: GetAttr for table selections in a Doc is missing
OSL_FAIL("not implemented");
break;
case FN_UNO_PARA_STYLE:
@@ -1912,7 +1912,6 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
RES_CHRATR_BEGIN, RES_FRMATR_END -1,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0L);
- // erstmal die Attribute des Cursors
SwUnoCursorHelper::GetCrsrAttr(rTblCrsr.GetSelRing(),
aSet);
m_pPropSet->getPropertyValue(*pEntry, aSet, aRet);
@@ -2344,7 +2343,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex
if(pDoc && nRows && nColumns)
{
SwUnoInternalPaM aPam(*pDoc);
- //das muss jetzt sal_True liefern
+ // this now needs to return TRUE
::sw::XTextRangeToSwPaM(aPam, xTextRange);
{
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index e6bf230..4a3a717 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -475,7 +475,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
SwCursor aCrsr(*aTmp.GetPoint(),0,false);
SwUnoCursorHelper::SelectPam(aCrsr, true);
aCrsr.Left(1, CRSR_SKIP_CHARS, false, false);
- //hier muss der uebergebene PaM umgesetzt werden:
+ // here, the PaM needs to be moved:
if (pRange)
{
pRange->SetPositions(aCrsr);
More information about the Libreoffice-commits
mailing list