You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/08/30 17:00:37 UTC
(openoffice) branch AOO42X updated: Replace 2do -> TODO, minor cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 888f552b4a Replace 2do -> TODO, minor cleanup
888f552b4a is described below
commit 888f552b4a6ca8324a48ef4c05980d0811ff5beb
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Aug 30 18:56:01 2025 +0200
Replace 2do -> TODO, minor cleanup
(cherry picked from commit 5cd1c82638b65a86a575c9871d07bec79d4064b8)
---
main/dbaccess/source/ui/misc/HtmlReader.cxx | 2 +-
main/filter/source/msfilter/eschesdo.cxx | 4 ++--
main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 16 ++++++++--------
main/formula/source/core/api/token.cxx | 2 +-
.../complex/path_substitution/PathSubstitutionTest.java | 4 ++--
.../runner/convwatch/GraphicalTestArguments.java | 2 +-
.../runner/stats/ComplexDataBaseOutProducer.java | 2 +-
main/qadevOOo/runner/util/utils.java | 8 ++++----
.../tests/java/ifc/document/_XViewDataSupplier.java | 2 +-
.../tests/java/ifc/sheet/_XDocumentAuditing.java | 2 +-
main/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java | 2 +-
.../java/mod/_fwk/ModuleUIConfigurationManager.java | 2 +-
.../tests/java/mod/_fwk/UIConfigurationManager.java | 2 +-
main/sc/source/core/data/table3.cxx | 2 +-
main/sc/source/core/tool/chartarr.cxx | 2 +-
main/sc/source/core/tool/chartlis.cxx | 2 +-
main/sc/source/core/tool/chartpos.cxx | 8 ++++----
main/sc/source/core/tool/chgtrack.cxx | 6 +++---
main/sc/source/core/tool/interpr1.cxx | 8 ++++----
main/sc/source/filter/html/htmlpars.cxx | 10 +++++-----
main/sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2 +-
main/sc/source/filter/xcl97/xcl97rec.cxx | 2 +-
main/sc/source/ui/view/viewfunc.cxx | 2 +-
.../tdoc/CheckTransientDocumentsContentProvider.java | 5 +++++
.../tdoc/CheckTransientDocumentsDocumentContent.java | 2 +-
main/vcl/qa/complex/memCheck/CheckMemoryUsage.java | 2 +-
26 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/main/dbaccess/source/ui/misc/HtmlReader.cxx b/main/dbaccess/source/ui/misc/HtmlReader.cxx
index ea65fc52c9..f6a3686962 100644
--- a/main/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/main/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -441,7 +441,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption* pOption )
{
if ( rOptVal.Search('*') != STRING_NOTFOUND )
{ // relativ zu was?!?
-//2do: ColArray aller relativen Werte sammeln und dann MakeCol
+// TODO: ColArray aller relativen Werte sammeln und dann MakeCol
return 0;
}
else
diff --git a/main/filter/source/msfilter/eschesdo.cxx b/main/filter/source/msfilter/eschesdo.cxx
index 5669884586..53440a9aa1 100644
--- a/main/filter/source/msfilter/eschesdo.cxx
+++ b/main/filter/source/msfilter/eschesdo.cxx
@@ -664,7 +664,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
}
else
{
- //2do: could be made an option in HostAppData whether OLE object should be written or not
+ // TODO: could be made an option in HostAppData whether OLE object should be written or not
sal_Bool bAppOLE = sal_True;
ADD_SHAPE( ESCHER_ShpInst_PictureFrame,
0xa00 | (bAppOLE ? SHAPEFLAG_OLESHAPE : 0) );
@@ -779,7 +779,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj,
sal_Int32 nAngle = rObj.GetAngle();
if( rObj.GetType().EqualsAscii( "drawing.Line" ))
{
-//2do: this does not work right
+// TODO: this does not work right
double fDist = hypot( rObj.GetRect().GetWidth(),
rObj.GetRect().GetHeight() );
rObj.SetRect( Rectangle( rTextRefPoint,
diff --git a/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index b5d0f05e3c..52df44e4bb 100644
--- a/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/main/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -346,7 +346,7 @@
A surrounding 'div' element taking over the image style solves that problem, but the div is invalid as child of a paragraph
Therefore the paragraph has to be exchanged with a HTML div element
-->
- <!-- 2DO page alignment fix - PART1 -->
+ <!-- TODO page alignment fix - PART1 -->
<xsl:variable name="childText"><xsl:apply-templates mode="getAllTextChildren"/></xsl:variable>
<xsl:choose>
<xsl:when test="name() = 'text:p' and not(*) and (normalize-space($childText) = '')">
@@ -390,7 +390,7 @@
<xsl:with-param name="globalData" select="$globalData" />
<xsl:with-param name="previousFrameWidths" select="0"/>
<xsl:with-param name="previousFrameHeights" select="0"/>
- <!-- 2DO for me (Svante) - Not used, uncertain 4now..
+ <!-- TODO for me (Svante) - Not used, uncertain for now..
<xsl:with-param name="pageMarginLeft">
<xsl:call-template name="getPageMarginLeft"/>
</xsl:with-param>-->
@@ -419,7 +419,7 @@
<xsl:variable name="paragraphName" select="@text:style-name" />
<xsl:variable name="imageParagraphStyle" select="$globalData/all-styles/style[@style:name = $paragraphName]/final-properties"/>
<!-- Only the left margin of the first paragraph of a list item will be added to the margin of the complete list (all levels)-->
-<!-- 2DO: left-margin in order with bidirectional -->
+<!-- TODO: left-margin in order with bidirectional -->
<xsl:choose>
<xsl:when test="contains($imageParagraphStyle, 'margin-left:')">
<xsl:call-template name="convert2cm">
@@ -479,7 +479,7 @@
<xsl:param name="parentMarginLeft" />
<xsl:param name="pageMarginLeft" />
-<!-- 2DO: EXCHANGE FOLLOWING SIBLING BY VARIABLE -->
+<!-- TODO: EXCHANGE FOLLOWING SIBLING BY VARIABLE -->
<xsl:variable name="followingSiblingNode" select="following-sibling::node()[1]"/>
@@ -1078,7 +1078,7 @@
<!-- MIB -->
<xsl:text> padding:0; </xsl:text>
<xsl:if test="@text:anchor-type!='as-char'">
- <!-- all images float (CSS float reltaive) with a left position calculated by svg:x - parentMarginLeft - previousFrameWidths -->
+ <!-- all images float (CSS float relative) with a left position calculated by svg:x - parentMarginLeft - previousFrameWidths -->
<xsl:text> float:left; position:relative; left:</xsl:text>
<xsl:value-of select="$leftPosition"/>
<xsl:text>cm; </xsl:text>
@@ -1985,7 +1985,7 @@
</xsl:if>
<xsl:attribute name="style">
<xsl:text>display:block;float:</xsl:text>
- <!-- 2DO: Svante - copy this functionality for other used margin:left (in western country 'left') -->
+ <!-- TODO: Svante - copy this functionality for other used margin:left (in western country 'left') -->
<xsl:call-template name="getOppositeWritingDirection">
<xsl:with-param name="globalData" select="$globalData"/>
<xsl:with-param name="paraStyleName" select="descendant-or-self::*/@text:style-name"/>
@@ -2226,7 +2226,7 @@
<xsl:choose>
<!-- if it has content the counting is ended -->
<xsl:when test="*[name() = 'text:h' or name() = 'text:p'] or $isListHeader">
- <!-- 2DO: Perhaps the children still have to be processed -->
+ <!-- TODO: Perhaps the children still have to be processed -->
<xsl:value-of select="$itemNumber + $pseudoLevel"/>
</xsl:when>
<xsl:otherwise>
@@ -2481,7 +2481,7 @@
<xsl:param name="listStyleName"/>
<xsl:param name="minLabelWidth"/>
- <!-- 2DO page alignment fix - PART1 -->
+ <!-- TODO page alignment fix - PART1 -->
<!-- xhtml:p may only contain inline elements.
If there is one frame beyond, div must be used! -->
diff --git a/main/formula/source/core/api/token.cxx b/main/formula/source/core/api/token.cxx
index 902bf9da2a..2be3942015 100644
--- a/main/formula/source/core/api/token.cxx
+++ b/main/formula/source/core/api/token.cxx
@@ -112,7 +112,7 @@ sal_uInt8 FormulaToken::GetParamCount() const
eOp != ocIf && eOp != ocChose && eOp != ocPercentSign )
return 0; // parameters and specials
// ocIf and ocChose not for FAP, have cByte then
-//2do: sal_Bool parameter whether FAP or not?
+// TODO: sal_Bool parameter whether FAP or not?
else if ( GetByte() )
return GetByte(); // all functions, also ocExternal and ocMacro
else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
diff --git a/main/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/main/framework/qa/complex/path_substitution/PathSubstitutionTest.java
index 5834605d22..e75781024b 100644
--- a/main/framework/qa/complex/path_substitution/PathSubstitutionTest.java
+++ b/main/framework/qa/complex/path_substitution/PathSubstitutionTest.java
@@ -118,7 +118,7 @@ public class PathSubstitutionTest
System.out.println("Substitute '" + substString + "'");
String newValue = oObj.substituteVariables(substString, true);
System.out.println("Return value '" + newValue + "'");
- // 2do: better check for correct substitution
+ // TODO: better check for correct substitution
assertTrue("Did not substitute '"
+ substString + "' to '" + newValue
+ "' correctly:", newValue.startsWith(substVal));
@@ -132,7 +132,7 @@ public class PathSubstitutionTest
System.out.println("Substitute backwards '" + substString + "'");
newValue = oObj.reSubstituteVariables(substString);
System.out.println("Return value '" + newValue + "'");
- // 2do: better check for correct substitution
+ // TODO: better check for correct substitution
assertTrue("Did not reSubstitute '"
+ substString + "' to '" + newValue
+ "' correctly:", checkResubstitute(newValue, var));
diff --git a/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 0fdf442d37..a33646ec8a 100644
--- a/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/main/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -64,7 +64,7 @@ import com.sun.star.uno.UnoRuntime;
public class GraphicalTestArguments
{
/**
- 2DO:
+ TODO:
Possible reference types are currently
// ooo
// pdf
diff --git a/main/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java b/main/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java
index 61cec84671..af376c08c5 100644
--- a/main/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java
+++ b/main/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java
@@ -61,7 +61,7 @@ public class ComplexDataBaseOutProducer extends DataBaseOutProducer {
String testLanguage = testBase.substring(0,sep);
testBase = testBase.substring(sep+1);
- // 2do fallback?
+ // TODO fallback?
// if (os == null || os.equals(""))
// os = System.getProperty("os.name");
String descriptionString = testLanguage+":"+ os +":"+testBase+":"+apiVersion;
diff --git a/main/qadevOOo/runner/util/utils.java b/main/qadevOOo/runner/util/utils.java
index ad7ec2ce14..6b15071521 100644
--- a/main/qadevOOo/runner/util/utils.java
+++ b/main/qadevOOo/runner/util/utils.java
@@ -428,7 +428,7 @@ public class utils {
sysDir += "/";
}
- // remove leading '/' and replace others with '\' on windows machines
+ // remove leading '/' and replace others with '\' on Windows machines
if (sysDir.indexOf(":") != -1) {
sysDir = sysDir.substring(1);
sysDir = sysDir.replace('/', '\\');
@@ -453,7 +453,7 @@ public class utils {
sysDir = fileURL.substring("file://".length());
}
- // remove leading '/' and replace others with '\' on windows machines
+ // remove leading '/' and replace others with '\' on Windows machines
if (sysDir.indexOf(":") != -1) {
sysDir = sysDir.substring(1);
sysDir = sysDir.replace('/', '\\');
@@ -779,7 +779,7 @@ public class utils {
StringTokenizer commandTokens = new StringTokenizer(appExecCommand, " \t");
String officeExecutable = "";
String officeExecCommand = "soffice";
- // is there a 'soffice' in the command? 2do: eliminate case sensitivity on windows
+ // is there a 'soffice' in the command? TODO: eliminate case sensitivity on Windows
int index = -1;
while (commandTokens.hasMoreTokens() && index == -1) {
officeExecutable += commandTokens.nextToken() + " ";
@@ -799,7 +799,7 @@ public class utils {
} else {
// is it an office installation?
f = new File(officeExecutable);
- // one try for windows platform can't be wrong...
+ // one try for Windows platform can't be wrong...
if (!f.exists() || !f.isFile()) {
f = new File(officeExecutable + ".exe");
}
diff --git a/main/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java b/main/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java
index 0da92dcafc..9d8e367f59 100644
--- a/main/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java
+++ b/main/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java
@@ -58,7 +58,7 @@ public class _XViewDataSupplier extends MultiMethodTest {
tRes.tested("setViewData()", Status.skipped(true));
}
else {
- // 2do: provide an own implementation of the XIndexAccess to set.
+ // TODO: provide an own implementation of the XIndexAccess to set.
// this will work without "setViewData()", it just checks that a
// setViewData can be done.
oObj.setViewData(xAccess);
diff --git a/main/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/main/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
index 881ed8bf1a..50c2895207 100644
--- a/main/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
+++ b/main/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
@@ -182,7 +182,7 @@ public class _XDocumentAuditing extends MultiMethodTest {
/**
* Check if the amount of shapes is the right one after displaying that stuff
- * 2do improve this: check that the shapes are the correct ones -> convwatch
+ * TODO improve this: check that the shapes are the correct ones -> convwatch
* @desiredValue That's the amount of shapes that have to be here.
* @return True, if the actual count of shapes is the same
*/
diff --git a/main/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/main/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
index 4c349bad21..3338e9dc6e 100644
--- a/main/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
+++ b/main/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
@@ -174,7 +174,7 @@ public class _XSheetAuditing extends MultiMethodTest {
/**
* Check if the amount of shapes is the right one after displaying that stuff
- * 2do improve this: check that the shapes are the correct ones -> convwatch
+ * TODO improve this: check that the shapes are the correct ones -> convwatch
* @desiredValue That's the amount of shapes that have to be here.
* @return True, if the actual count of shapes is the same
*/
diff --git a/main/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/main/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
index 6662a4497b..411a0006ee 100644
--- a/main/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
+++ b/main/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
@@ -141,7 +141,7 @@ public class ModuleUIConfigurationManager extends TestCase {
tEnv.addObjRelation("XInitialization.args", initProps);
// the short cut manager service name
- // 2do: correct the service name when it's no longer in
+ // TODO: correct the service name when it's no longer in
tEnv.addObjRelation("XConfigurationManager.ShortCutManager",
"com.sun.star.ui.ModuleAcceleratorConfiguration");
diff --git a/main/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/main/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
index 1cdd131984..bd9ed8db77 100644
--- a/main/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
+++ b/main/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
@@ -108,7 +108,7 @@ public class UIConfigurationManager extends TestCase {
new ConfigurationListener(log, xManager, xMSF));
// the short cut manager service name
- // 2do: correct the service name when it's no longer in
+ // TODO: correct the service name when it's no longer in
tEnv.addObjRelation("XConfigurationManager.ShortCutManager",
"com.sun.star.ui.DocumentAcceleratorConfiguration");
return tEnv;
diff --git a/main/sc/source/core/data/table3.cxx b/main/sc/source/core/data/table3.cxx
index 2ac4771502..604557fea9 100644
--- a/main/sc/source/core/data/table3.cxx
+++ b/main/sc/source/core/data/table3.cxx
@@ -141,7 +141,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
ScColumn* pCol = &aCol[nCol];
for ( SCROW nRow = nInd1; nRow <= nInd2; nRow++ )
{
-//2do: FillSortInfo an ScColumn und Array abklappern statt Search in GetCell
+// TODO: FillSortInfo an ScColumn und Array abklappern statt Search in GetCell
ScSortInfo* pInfo = pArray->Get( nSort, nRow );
pInfo->pCell = pCol->GetCell( nRow );
pInfo->nOrg = nRow;
diff --git a/main/sc/source/core/tool/chartarr.cxx b/main/sc/source/core/tool/chartarr.cxx
index 599128b826..d0ff0c6f9a 100644
--- a/main/sc/source/core/tool/chartarr.cxx
+++ b/main/sc/source/core/tool/chartarr.cxx
@@ -476,7 +476,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
}
}
-//2do: Beschriftung bei Luecken
+// TODO: Beschriftung bei Lücken
//
// Spalten-Header
diff --git a/main/sc/source/core/tool/chartlis.cxx b/main/sc/source/core/tool/chartlis.cxx
index 412de123dd..31e5dd01a2 100644
--- a/main/sc/source/core/tool/chartlis.cxx
+++ b/main/sc/source/core/tool/chartlis.cxx
@@ -41,7 +41,7 @@ using ::std::auto_ptr;
using ::std::unary_function;
using ::std::for_each;
-//2do: DocOption TimeOut?
+//TODO: DocOption TimeOut?
//#define SC_CHARTTIMEOUT 1000 // eine Sekunde keine Aenderung/KeyEvent
// Update chart listeners quickly, to get a similar behavior to loaded charts
diff --git a/main/sc/source/core/tool/chartpos.cxx b/main/sc/source/core/tool/chartpos.cxx
index f56bb6a193..ebc7d6058b 100644
--- a/main/sc/source/core/tool/chartpos.cxx
+++ b/main/sc/source/core/tool/chartpos.cxx
@@ -174,13 +174,13 @@ void ScChartPositioner::GlueState()
return;
}
sal_uLong nCR = (sal_uLong)nC * nR;
-//2do:
+// TODO:
/*
- Erstmal simpel ohne Bitmaskiererei, maximal koennten so 8MB alloziert
+ Erstmal simpel ohne Bitmaskiererei, maximal könnten so 8MB alloziert
werden (256 Cols mal 32000 Rows), das liesse sich mit 2 Bit je Eintrag
auf 2MB reduzieren, andererseits ist es so schneller.
- Weitere Platz-Optimierung waere, in dem Array nur die wirklich benutzten
- Zeilen/Spalten abzulegen, wuerde aber ein weiteres durchlaufen der
+ Weitere Platz-Optimierung wäre, in dem Array nur die wirklich benutzten
+ Zeilen/Spalten abzulegen, würde aber ein weiteres durchlaufen der
RangeList und indirekten Zugriff auf das Array bedeuten.
*/
const sal_uInt8 nHole = 0;
diff --git a/main/sc/source/core/tool/chgtrack.cxx b/main/sc/source/core/tool/chgtrack.cxx
index 6054623eaa..5ee0fad73e 100644
--- a/main/sc/source/core/tool/chgtrack.cxx
+++ b/main/sc/source/core/tool/chgtrack.cxx
@@ -1144,7 +1144,7 @@ sal_Bool ScChangeActionDel::Reject( ScDocument* pDoc )
break;
case SC_CAT_DELETE_TABS :
{
-//2do: Tabellennamen merken?
+// TODO: Tabellennamen merken?
String aName;
pDoc->CreateValidTabName( aName );
if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != sal_False )
@@ -2160,7 +2160,7 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack,
{ //! HACK!
//! UpdateReference kann nicht mit Positionen ausserhalb des
//! Dokuments umgehen, deswegen alles auf #REF! setzen
-//2do: make it possible! das bedeutet grossen Umbau von ScAddress etc.!
+// TODO: make it possible! das bedeutet grossen Umbau von ScAddress etc.!
const ScBigAddress& rPos = aBigRange.aStart;
if ( bOldFormula )
{
@@ -2592,7 +2592,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
{ // ganze Zeilen und/oder Tabellen
if ( nRow1 == 0 && nRow2 == MAXROW )
{ // ganze Tabellen
-//2do: geht nicht auch komplette Tabelle als ganzes?
+// TODO: geht nicht auch komplette Tabelle als ganzes?
ScRange aRange( 0, 0, nTab, 0, MAXROW, nTab );
for ( SCCOL nCol = nCol1; nCol <= nCol2; nCol++ )
{ // spaltenweise ist weniger als zeilenweise
diff --git a/main/sc/source/core/tool/interpr1.cxx b/main/sc/source/core/tool/interpr1.cxx
index fc6cf664cf..74ee0b8a94 100644
--- a/main/sc/source/core/tool/interpr1.cxx
+++ b/main/sc/source/core/tool/interpr1.cxx
@@ -2815,7 +2815,7 @@ void ScInterpreter::ScUpper()
void ScInterpreter::ScPropper()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPropper" );
-//2do: what to do with I18N-CJK ?!?
+// TODO: what to do with I18N-CJK ?!?
String aStr( GetString() );
const xub_StrLen nLen = aStr.Len();
// #i82487# don't try to write to empty string's BufferAccess
@@ -2993,7 +2993,7 @@ void ScInterpreter::ScValue()
}
-//2do: this should be a proper unicode string method
+// TODO: this should be a proper unicode string method
inline sal_Bool lcl_ScInterpreter_IsPrintable( sal_Unicode c )
{
return 0x20 <= c && c != 0x7f;
@@ -3015,7 +3015,7 @@ void ScInterpreter::ScClean()
void ScInterpreter::ScCode()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCode" );
-//2do: make it full range unicode?
+// TODO: make it full range unicode?
const String& rStr = GetString();
PushInt( (sal_uChar) ByteString::ConvertFromUnicode( rStr.GetChar(0), gsl_getSystemTextEncoding() ) );
}
@@ -3024,7 +3024,7 @@ void ScInterpreter::ScCode()
void ScInterpreter::ScChar()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScChar" );
-//2do: make it full range unicode?
+// TODO: make it full range unicode?
double fVal = GetDouble();
if (fVal < 0.0 || fVal >= 256.0)
PushIllegalArgument();
diff --git a/main/sc/source/filter/html/htmlpars.cxx b/main/sc/source/filter/html/htmlpars.cxx
index cd19e0091c..07bf823a24 100644
--- a/main/sc/source/filter/html/htmlpars.cxx
+++ b/main/sc/source/filter/html/htmlpars.cxx
@@ -481,7 +481,7 @@ void ScHTMLLayoutParser::Adjust()
pE->nColOverlap = (nPos > pE->nCol ? nPos - pE->nCol : 1);
else
{
-//2do: das muss nicht korrekt sein, ist aber..
+// TODO: das muss nicht korrekt sein, ist aber..
pE->nColOverlap = 1;
}
xLockedList->Join( ScRange( pE->nCol, pE->nRow, 0,
@@ -1212,7 +1212,7 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
pTab1->Insert( nRowKey, (void*) nRowsPerRow1 );
else if ( nRowsPerRow1 > nR )
pTab1->Replace( nRowKey, (void*) nRowsPerRow1 );
- //2do: wie geht das noch besser?
+ // TODO: wie geht das noch besser?
else if ( nRowsPerRow1 < nR && nRowSpan == 1
&& nTable == nMaxTable )
{ // Platz uebrig, evtl. besser mergen
@@ -1438,7 +1438,7 @@ sal_uInt16 ScHTMLLayoutParser::GetWidthPixel( const HTMLOption* pOption )
{
if ( rOptVal.Search('*') != STRING_NOTFOUND )
{ // relativ zu was?!?
-//2do: ColArray aller relativen Werte sammeln und dann MakeCol
+// TODO: ColArray aller relativen Werte sammeln und dann MakeCol
return 0;
}
else
@@ -1632,7 +1632,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
break;
case HTML_BIGPRINT_ON :
{
-//2do: aktuelle Fontgroesse merken und einen groesser
+// TODO: aktuelle Fontgroesse merken und einen groesser
if ( IsAtBeginningOfText( pInfo ) )
pActEntry->aItemSet.Put( SvxFontHeightItem(
maFontHeights[3], 100, ATTR_FONT_HEIGHT ) );
@@ -1640,7 +1640,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
break;
case HTML_SMALLPRINT_ON :
{
-//2do: aktuelle Fontgroesse merken und einen kleiner
+// TODO: aktuelle Fontgroesse merken und einen kleiner
if ( IsAtBeginningOfText( pInfo ) )
pActEntry->aItemSet.Put( SvxFontHeightItem(
maFontHeights[0], 100, ATTR_FONT_HEIGHT ) );
diff --git a/main/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/main/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index f151f1f6f4..ffaa28029f 100644
--- a/main/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/main/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -190,7 +190,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres
// create a memory stream and copy the formula to be able to read simultaneously
// the formula and the additional 3D tab ref data following the formula
// here we have to simulate an Excel record to be able to use an XclImpStream...
- // 2do: remove the stream member from formula converter and add it as a parameter
+ // TODO: remove the stream member from formula converter and add it as a parameter
// to the Convert() routine (to prevent the construction/destruction of the
// converter in each formula)
SvMemoryStream aMemStrm;
diff --git a/main/sc/source/filter/xcl97/xcl97rec.cxx b/main/sc/source/filter/xcl97/xcl97rec.cxx
index 9ec51d62d3..ad14230d77 100644
--- a/main/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/main/sc/source/filter/xcl97/xcl97rec.cxx
@@ -188,7 +188,7 @@ void XclObj::ImplWriteAnchor( const XclExpRoot& /*rRoot*/, const SdrObject* pSdr
void XclObj::SetEscherShapeType( sal_uInt16 nType )
{
-//2do: what about the other defined ot... types?
+// TODO: what about the other defined ot... types?
switch ( nType )
{
case ESCHER_ShpInst_Line :
diff --git a/main/sc/source/ui/view/viewfunc.cxx b/main/sc/source/ui/view/viewfunc.cxx
index bccbbcf87a..0d53e5d2e8 100644
--- a/main/sc/source/ui/view/viewfunc.cxx
+++ b/main/sc/source/ui/view/viewfunc.cxx
@@ -462,7 +462,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
ScAddress aPos( nCol, nRow, i );
ScCompiler aComp( pDoc, aPos);
aComp.SetGrammar(pDoc->GetGrammar());
-//2do: AutoCorrection via CalcOptions abschaltbar machen
+// TODO: AutoCorrection via CalcOptions abschaltbar machen
aComp.SetAutoCorrection( sal_True );
if ( rString.GetChar(0) == '+' || rString.GetChar(0) == '-' )
{
diff --git a/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
index 1c7a4b977e..f2d0fa84ff 100644
--- a/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
+++ b/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
@@ -134,8 +134,13 @@ public class CheckTransientDocumentsContentProvider {
String identifier = xContentAccess.queryContentIdentifierString();
System.out.println("Identifier of row " + xResultSet.getRow() + ": " + identifier);
}
+<<<<<<< HEAD
// some feeble test: if the amount >2, we're ok.
// 2do: check better
+=======
+ // some feeble test: if the amount >2, we're ok.
+ // TODO: check better
+>>>>>>> 5cd1c82638 (Replace 2do -> TODO, minor cleanup)
assertTrue("Did only find " + countContentIdentifiers + " open documents." +
" Should have been at least 3.", countContentIdentifiers>2);
}
diff --git a/main/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/main/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
index a1993ea07e..de4897b468 100644
--- a/main/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
+++ b/main/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
@@ -154,7 +154,7 @@ public class CheckTransientDocumentsDocumentContent {
titleSetCommand.Argument = titleProp;
xFolderCommandProcessor.execute(titleSetCommand, 0, null);
- // 2do: check all this stuff!
+ // TODO: check all this stuff!
// commit changes
/* InsertCommandArgument insertArgs = new InsertCommandArgument();
insertArgs.Data = null;
diff --git a/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 435233bd6c..cd1a25ee6b 100644
--- a/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -179,7 +179,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
sDocTypeExportFilter = new String[v.size()][2];
for (int i = 0; i < v.size(); i++)
{
- // 2do: error routine for wrong given params
+ // TODO: error routine for wrong given params
final String sVContent = v.get(i);
StringTokenizer t = new StringTokenizer(sVContent, ",");
final String sExt = t.nextToken();