summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r--sw/source/core/unocore/unodraw.cxx10
-rw-r--r--sw/source/core/unocore/unomap.cxx10
-rw-r--r--sw/source/core/unocore/unosett.cxx3
-rw-r--r--sw/source/core/unocore/unotbl.cxx24
4 files changed, 25 insertions, 22 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index f6c6b7eeb663..af81b3550b14 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -842,8 +842,8 @@ SwFmDrawPage* SwXDrawPage::GetSvxPage()
SdrPage* pPage = pModel->GetPage( 0 );
{
- // waehrend des queryInterface braucht man ein Ref auf das
- // Objekt, sonst wird es geloescht.
+ // We need a Ref to the object during queryInterface or else
+ // it will be deleted
pDrawPage = new SwFmDrawPage(pPage);
uno::Reference< drawing::XDrawPage > xPage = pDrawPage;
uno::Any aAgg = xPage->queryInterface(cppu::UnoType<uno::XAggregation>::get());
@@ -856,7 +856,9 @@ SwFmDrawPage* SwXDrawPage::GetSvxPage()
return pDrawPage;
}
-// renamed and outlined to detect where it's called
+/**
+ * Renamed and outlined to detect where it's called
+ */
void SwXDrawPage::InvalidateSwDoc()
{
pDoc = 0;
@@ -1060,7 +1062,7 @@ uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) th
uno::Reference< beans::XPropertySet > xPrSet =
*(uno::Reference< beans::XPropertySet >*)aPSet.getValue();
uno::Reference< beans::XPropertySetInfo > xInfo = xPrSet->getPropertySetInfo();
- // PropertySetInfo verlaengern!
+ // Expand PropertySetInfo!
const uno::Sequence<beans::Property> aPropSeq = xInfo->getProperties();
aRet = new SfxExtItemPropertySetInfo( m_pPropertyMapEntries, aPropSeq );
}
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index c70c07577070..f17f5b17d664 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -897,7 +897,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ OUString(UNO_NAME_SHADOW_TRANSPARENCE), RES_SHADOW, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
{ OUString(UNO_NAME_SERVER_MAP), RES_URL, cppu::UnoType<bool>::get(), PROPERTY_NONE ,MID_URL_SERVERMAP },
{ OUString(UNO_NAME_SIZE_PROTECTED), RES_PROTECT, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_PROTECT_SIZE },
- //Surround bleibt, weil es mit der 5.1 ausgeliefert wurde, obwohl es mit text::WrapTextMode identisch ist
+ // We keep Surround, as we delivered it with 5.1, although it's identical to text::WrapTextMode
{ OUString(UNO_NAME_SURROUND), RES_SURROUND, cppu::UnoType<css::text::WrapTextMode>::get(), PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
{ OUString(UNO_NAME_TEXT_WRAP), RES_SURROUND, cppu::UnoType<css::text::WrapTextMode>::get(), PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
{ OUString(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_ANCHORONLY },
@@ -1266,7 +1266,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
{ //UUUU
- // evtl. completely remove SvxBrushItem stuff ()
+ // TODO: We should consider completely removing SvxBrushItem() stuff
// add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
// COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
COMMON_FRAME_PROPERTIES
@@ -1301,7 +1301,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aGraphicPropertyMap_Impl[] =
{ //UUUU
- // evtl. completely remove SvxBrushItem stuff ()
+ // TODO: We should consider completely removing SvxBrushItem() stuff
// add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
// COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
COMMON_FRAME_PROPERTIES
@@ -1345,7 +1345,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry const aEmbeddedPropertyMap_Impl[] =
{ //UUUU
- // evtl. completely remove SvxBrushItem stuff ()
+ // TODO: We should consider completely removing SvxBrushItem() stuff
// add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
// COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
COMMON_FRAME_PROPERTIES
@@ -1706,7 +1706,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
break;
case PROPERTY_MAP_TEXT_TABLE_CURSOR:
{
- // das PropertySet entspricht dem Range ohne Chart-Properties
+ // The PropertySet corresponds to the Range without Chart properties
static SfxItemPropertyMapEntry const aTableCursorPropertyMap_Impl [] =
{
COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 10693c005371..9e411bb9ea84 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1362,7 +1362,8 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
OUString CharStyleName;
if(pCharFmt)
CharStyleName = pCharFmt->GetName();
- //egal ob ein Style vorhanden ist oder nicht ueberschreibt der Array-Eintrag diesen String
+
+ // Whether or not a style is present: the array entry overwrites this string
if (!m_sNewCharStyleNames[nIndex].isEmpty() &&
!SwXNumberingRules::isInvalidStyle(m_sNewCharStyleNames[nIndex]))
{
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 5dc88b86e213..73ac3eef3619 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -920,7 +920,7 @@ OUString SwXCell::getFormula(void) throw( uno::RuntimeException, std::exception
return sRet;
}
-///@see sw_setValue (TODO: seems to be C&P programming here)
+///@see sw_setValue (TODO: seems to be copy and paste programming here)
void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -1745,7 +1745,7 @@ sal_Bool SwXTextTableCursor::mergeRange()
if(pUnoCrsr)
{
{
- // hier muessen die Actions aufgehoben werden
+ // The Actions need to be revoked here
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
@@ -2014,7 +2014,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
if(GetProperty(FN_TABLE_HEADLINE_REPEAT, 0xff, pRepHead ))
{
bool bVal = *(sal_Bool*)pRepHead->getValue();
- ((SwTable&)rTbl).SetRowsToRepeat( bVal ? 1 : 0 ); // TODO MULTIHEADER
+ ((SwTable&)rTbl).SetRowsToRepeat( bVal ? 1 : 0 ); // TODO: MULTIHEADER
}
const uno::Any* pBackColor = 0;
@@ -2314,7 +2314,7 @@ uno::Sequence< OUString > SwXTextTable::getCellNames(void) throw( uno::RuntimeEx
if(pFmt)
{
SwTable* pTable = SwTable::FindTable( pFmt );
- // exists at the table and at all boxes
+ // exists at the table and at all boxes
SwTableLines& rTblLines = pTable->GetTabLines();
std::vector<OUString*> aAllNames;
lcl_InspectLines(rTblLines, aAllNames);
@@ -4478,7 +4478,7 @@ void SwXCellRange::setData(const uno::Sequence< uno::Sequence< double > >& rData
}
}
-///@see SwXTextTable::getRowDescriptions (TODO: seems to be C&P programming here)
+///@see SwXTextTable::getRowDescriptions (TODO: seems to be copy and paste programming here)
uno::Sequence< OUString > SwXCellRange::getRowDescriptions(void)
throw( uno::RuntimeException, std::exception )
{
@@ -4519,7 +4519,7 @@ uno::Sequence< OUString > SwXCellRange::getRowDescriptions(void)
return aRet;
}
-///@see SwXTextTable::setRowDescriptions (TODO: seems to be C&P programming here)
+///@see SwXTextTable::setRowDescriptions (TODO: seems to be copy and paste programming here)
void SwXCellRange::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc)
throw( uno::RuntimeException, std::exception )
{
@@ -4554,7 +4554,7 @@ void SwXCellRange::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc)
}
}
-///@see SwXTextTable::setColumnDescriptions (TODO: seems to be C&P programming here)
+///@see SwXTextTable::setColumnDescriptions (TODO: seems to be copy and paste programming here)
uno::Sequence< OUString > SwXCellRange::getColumnDescriptions(void)
throw( uno::RuntimeException, std::exception )
{
@@ -4595,7 +4595,7 @@ uno::Sequence< OUString > SwXCellRange::getColumnDescriptions(void)
return aRet;
}
-///@see SwXTextTable::setColumnDescriptions (TODO: seems to be C&P programming here)
+///@see SwXTextTable::setColumnDescriptions (TODO: seems to be copy and paste programming here)
void SwXCellRange::setColumnDescriptions(const uno::Sequence< OUString >& ColumnDesc)
throw( uno::RuntimeException, std::exception )
{
@@ -4705,7 +4705,7 @@ void SwXCellRange::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
{
/*
* Not sure if this will cause a memory leak - this pTblCrsr
- * is deleted in SwDoc and GPFs here when deleted again
+ * is deleted in SwDoc and segfaults here when deleted again
* if(!aCursorDepend.GetRegisteredIn())
delete pTblCrsr;
*/
@@ -4764,7 +4764,7 @@ sal_Int32 SwXTableRows::getCount(void) throw( uno::RuntimeException, std::except
return nRet;
}
-///@see SwXCell::CreateXCell (TODO: seems to be C&P programming here)
+///@see SwXCell::CreateXCell (TODO: seems to be copy and paste programming here)
uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex)
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{
@@ -5027,7 +5027,7 @@ sal_Bool SwXTableColumns::hasElements(void) throw( uno::RuntimeException, std::e
return sal_True;
}
-///@see SwXTableRows::insertByIndex (TODO: seems to be C&P programming here)
+///@see SwXTableRows::insertByIndex (TODO: seems to be copy and paste programming here)
void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
throw (uno::RuntimeException, std::exception)
{
@@ -5082,7 +5082,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
}
}
-///@see SwXTableRows::removeByIndex (TODO: seems to be C&P programming here)
+///@see SwXTableRows::removeByIndex (TODO: seems to be copy and paste programming here)
void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
throw (uno::RuntimeException, std::exception)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 21:56:46 +0000