This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5ff86c373e misc: fix typos; souce -> source (#507)
5ff86c373e is described below
commit 5ff86c373e050985902bb66fb34662d4d4f150f7
Author: John Bampton <[email protected]>
AuthorDate: Fri Oct 16 04:34:57 2026 +1000
misc: fix typos; souce -> source (#507)
* misc: fix typos; souce -> source
* Regenerate codespell.txt ignored words list
---
.github/linters/codespell.txt | 2 --
.../java/com/sun/star/comp/sdbc/JavaSQLConnection.java | 6 +++---
main/migrationanalysis/src/driver_docs/allstrings.ulf | 4 ++--
main/svx/source/fmcomp/fmgridcl.cxx | 18 +++++++++---------
main/svx/source/form/fmobj.cxx | 8 ++++----
main/vbahelper/source/msforms/vbacontrol.cxx | 4 ++--
main/vbahelper/source/msforms/vbacontrol.hxx | 2 +-
.../com/sun/star/wizards/table/TableWizard.java | 2 +-
main/writerfilter/source/ooxml/model.xml | 2 +-
.../source/fvt/uno/sc/data/StandardFilterOption.java | 6 +++---
.../source/fvt/uno/sc/sheet/SheetBasicTest.java | 8 ++++----
11 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/.github/linters/codespell.txt b/.github/linters/codespell.txt
index f58fa4b006..0626ae4787 100644
--- a/.github/linters/codespell.txt
+++ b/.github/linters/codespell.txt
@@ -2113,7 +2113,6 @@ repesented
repesents
repetive
replased
-reportresouces
repositry
repostories
repraesentation
@@ -2368,7 +2367,6 @@ somes
somme
sortings
sortlst
-souce
spaning
speacial
specialy
diff --git
a/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLConnection.java
b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLConnection.java
index 7535cb6f67..39538857e4 100644
---
a/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLConnection.java
+++
b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLConnection.java
@@ -470,11 +470,11 @@ public class JavaSQLConnection extends ComponentBase
}
}
- private static String getDriverLoadErrorMessage(SharedResources
sharedResouces, String driverClass, String driverClassPath) {
- String error1 = sharedResouces.getResourceStringWithSubstitution(
+ private static String getDriverLoadErrorMessage(SharedResources
sharedResources, String driverClass, String driverClassPath) {
+ String error1 = sharedResources.getResourceStringWithSubstitution(
Resources.STR_NO_CLASSNAME, "$classname$", driverClass);
if (!driverClassPath.isEmpty()) {
- String error2 = sharedResouces.getResourceStringWithSubstitution(
+ String error2 = sharedResources.getResourceStringWithSubstitution(
Resources.STR_NO_CLASSNAME_PATH, "$classpath$",
driverClassPath);
error1 += error2;
}
diff --git a/main/migrationanalysis/src/driver_docs/allstrings.ulf
b/main/migrationanalysis/src/driver_docs/allstrings.ulf
index 028cdd1417..7c2dea4269 100644
--- a/main/migrationanalysis/src/driver_docs/allstrings.ulf
+++ b/main/migrationanalysis/src/driver_docs/allstrings.ulf
@@ -938,7 +938,7 @@ en-US = "Cost: In simple cases cut and paste to new sheet.
3 - 5 min. May exist
en-US = "Cost = 0. No work around."
[RID_RESXLS_COST_COST_EMBED_CHART]
-en-US = "Variations in cost can range from 0 - 30 mins. Cost caused by uneven
data souce, external data source, unsupported chart types, floating legend
position."
+en-US = "Variations in cost can range from 0 - 30 mins. Cost caused by uneven
data source, external data source, unsupported chart types, floating legend
position."
[RID_RESXLS_COST_COST_ERROR_TYPE]
en-US = "Fix up cost can vary depending on the context in which this is used.
Cost 3 - 5"
@@ -963,7 +963,7 @@ en-US = "Cost per Issue or Factor (min)"
en-US = "Cost = 0. Calc does not support dynamically created charts. No
workaround."
[RID_RESXLS_COST_COST_SHEET_CHART]
-en-US = "Variations in cost can range from 0 - 30 mins. Cost caused by uneven
data souce, external data source, unsupported chart types, floating legend
position."
+en-US = "Variations in cost can range from 0 - 30 mins. Cost caused by uneven
data source, external data source, unsupported chart types, floating legend
position."
[RID_RESXLS_COST_Cost_variations_occur_because_of_the_use_of_macros_with_controls]
en-US = "Cost variations occur because of the use of macros with controls."
diff --git a/main/svx/source/fmcomp/fmgridcl.cxx
b/main/svx/source/fmcomp/fmgridcl.cxx
index 61b10cd1d9..bc9877e732 100644
--- a/main/svx/source/fmcomp/fmgridcl.cxx
+++ b/main/svx/source/fmcomp/fmgridcl.cxx
@@ -262,7 +262,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent&
_rEvt )
}
// extract the descriptor
- ::rtl::OUString sDatasouce, sCommand,
sFieldName,sDatabaseLocation,sConnnectionResource;
+ ::rtl::OUString sDatasource, sCommand,
sFieldName,sDatabaseLocation,sConnnectionResource;
sal_Int32 nCommandType = CommandType::COMMAND;
Reference< XPreparedStatement > xStatement;
Reference< XResultSet > xResultSet;
@@ -270,7 +270,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent&
_rEvt )
Reference< XConnection > xConnection;
ODataAccessDescriptor aColumn =
OColumnTransferable::extractColumnDescriptor(aDroppedData);
- if (aColumn.has(daDataSource)) aColumn[daDataSource] >>= sDatasouce;
+ if (aColumn.has(daDataSource)) aColumn[daDataSource] >>= sDatasource;
if (aColumn.has(daDatabaseLocation)) aColumn[daDatabaseLocation]
>>= sDatabaseLocation;
if (aColumn.has(daConnectionResource)) aColumn[daConnectionResource]
>>= sConnnectionResource;
if (aColumn.has(daCommand)) aColumn[daCommand] >>=
sCommand;
@@ -281,7 +281,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent&
_rEvt )
if ( !sFieldName.getLength()
|| !sCommand.getLength()
- || ( !sDatasouce.getLength()
+ || ( !sDatasource.getLength()
&& !sDatabaseLocation.getLength()
&& !xConnection.is()
)
@@ -298,11 +298,11 @@ sal_Int8 FmGridHeader::ExecuteDrop( const
ExecuteDropEvent& _rEvt )
{ // the transferable did not contain the connection ->
build an own one
try
{
- ::rtl::OUString sSignificantSource( sDatasouce.getLength() ?
sDatasouce : sDatabaseLocation );
+ ::rtl::OUString sSignificantSource( sDatasource.getLength() ?
sDatasource : sDatabaseLocation );
xConnection =
OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource,
::rtl::OUString(),::rtl::OUString(),static_cast<FmGridControl*>(GetParent())->getServiceManager());
}
catch(NoSuchElementException&)
- { // allowed, means sDatasouce isn't a valid data
source name ....
+ { // allowed, means sDatasource isn't a valid
data source name ....
}
catch(Exception&)
{
@@ -399,8 +399,8 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*,
/*NOTINTERESTEDIN*/ )
Reference< XPropertySet > xField;
Reference< XConnection > xConnection;
- ::rtl::OUString sDatasouce = m_pImpl->aDropData.getDataSource();
- if ( !sDatasouce.getLength() &&
m_pImpl->aDropData.has(daConnectionResource) )
+ ::rtl::OUString sDatasource = m_pImpl->aDropData.getDataSource();
+ if ( !sDatasource.getLength() &&
m_pImpl->aDropData.has(daConnectionResource) )
m_pImpl->aDropData[daConnectionResource] >>= sURL;
m_pImpl->aDropData[daCommand] >>= sCommand;
m_pImpl->aDropData[daCommandType] >>= nCommandType;
@@ -613,8 +613,8 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*,
/*NOTINTERESTEDIN*/ )
{
if
(!::comphelper::getString(xForm->getPropertyValue(FM_PROP_DATASOURCE)).getLength())
{
- if ( sDatasouce.getLength() )
-
xForm->setPropertyValue(FM_PROP_DATASOURCE, makeAny(sDatasouce));
+ if ( sDatasource.getLength() )
+
xForm->setPropertyValue(FM_PROP_DATASOURCE, makeAny(sDatasource));
else
xForm->setPropertyValue(FM_PROP_URL,
makeAny(sURL));
}
diff --git a/main/svx/source/form/fmobj.cxx b/main/svx/source/form/fmobj.cxx
index e27d470f9e..d0b9bb3774 100644
--- a/main/svx/source/form/fmobj.cxx
+++ b/main/svx/source/form/fmobj.cxx
@@ -470,14 +470,14 @@ namespace
//------------------------------------------------------------------
Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface
> & _rSourceContainer, const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer > _rTopLevelDestContainer)
{
- Reference< XInterface > xTopLevelSouce;
- String sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer,
xTopLevelSouce);
- if (!xTopLevelSouce.is())
+ Reference< XInterface > xTopLevelSource;
+ String sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer,
xTopLevelSource);
+ if (!xTopLevelSource.is())
// something went wrong, maybe _rSourceContainer isn't part of
a valid forms hierarchy
return Reference< XInterface > ();
Reference< XIndexContainer > xDestContainer(_rTopLevelDestContainer);
- Reference< XIndexContainer > xSourceContainer(xTopLevelSouce,
UNO_QUERY);
+ Reference< XIndexContainer > xSourceContainer(xTopLevelSource,
UNO_QUERY);
DBG_ASSERT(xSourceContainer.is(), "FmFormObj::ensureModelEnv : the top
level source is invalid !");
for (xub_StrLen i=0; i<sAccessPath.GetTokenCount('\\'); ++i)
diff --git a/main/vbahelper/source/msforms/vbacontrol.cxx
b/main/vbahelper/source/msforms/vbacontrol.cxx
index 309486652c..a17fb96947 100644
--- a/main/vbahelper/source/msforms/vbacontrol.cxx
+++ b/main/vbahelper/source/msforms/vbacontrol.cxx
@@ -116,7 +116,7 @@ ScVbaControlListener::disposing( const lang::EventObject& )
{
if( pControl )
{
- pControl->removeResouce();
+ pControl->removeResource();
pControl = NULL;
}
}
@@ -155,7 +155,7 @@ ScVbaControl::setGeometryHelper(
AbstractGeometryAttributes* pHelper )
mpGeometryHelper.reset( pHelper );
}
-void ScVbaControl::removeResouce()
+void ScVbaControl::removeResource()
{
uno::Reference< lang::XComponent > xComponent( m_xControl,
uno::UNO_QUERY_THROW );
xComponent->removeEventListener( m_xEventListener );
diff --git a/main/vbahelper/source/msforms/vbacontrol.hxx
b/main/vbahelper/source/msforms/vbacontrol.hxx
index 3e42d2ab0e..ca046fea59 100644
--- a/main/vbahelper/source/msforms/vbacontrol.hxx
+++ b/main/vbahelper/source/msforms/vbacontrol.hxx
@@ -92,7 +92,7 @@ public:
virtual sal_Int32 SAL_CALL getTabIndex();
virtual void SAL_CALL setTabIndex( sal_Int32 nTabIndex );
//remove resource because ooo.vba.excel.XControl is a wrapper of
com.sun.star.drawing.XControlShape
- virtual void removeResouce();
+ virtual void removeResource();
//XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/main/wizards/com/sun/star/wizards/table/TableWizard.java
b/main/wizards/com/sun/star/wizards/table/TableWizard.java
index dd02ff1ebe..ba840ab706 100644
--- a/main/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/main/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -83,7 +83,7 @@ public class TableWizard extends DatabaseObjectWizard
implements XTextListener,
});
drawNaviBar();
fielditems = new Hashtable();
- //TODO if reportResouces cannot be gotten dispose officedocument
+ //TODO if reportResources cannot be gotten dispose officedocument
if (getTableResources())
{
setRightPaneHeaders(m_oResource, UIConsts.RID_TABLE + 8, 4);
diff --git a/main/writerfilter/source/ooxml/model.xml
b/main/writerfilter/source/ooxml/model.xml
index dee1b7ca11..b70cf54673 100644
--- a/main/writerfilter/source/ooxml/model.xml
+++ b/main/writerfilter/source/ooxml/model.xml
@@ -18312,7 +18312,7 @@
<value>text</value>
<!-- E-Mail Program Data Source -->
<value>email</value>
- <!-- Native Data Souce -->
+ <!-- Native Data Source -->
<value>native</value>
<!-- Legacy Document Format Data Source -->
<value>legacy</value>
diff --git a/test/testuno/source/fvt/uno/sc/data/StandardFilterOption.java
b/test/testuno/source/fvt/uno/sc/data/StandardFilterOption.java
index 6bd265096c..9ffa59c75b 100644
--- a/test/testuno/source/fvt/uno/sc/data/StandardFilterOption.java
+++ b/test/testuno/source/fvt/uno/sc/data/StandardFilterOption.java
@@ -290,7 +290,7 @@ public class StandardFilterOption {
XCellRange xdataRange =
UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
XSpreadsheet currentSheet = SCUtil.getCurrentSheet(scDocument);
// Get the value before filter
- String[][] souce = SCUtil.getTextFromCellRange(currentSheet, 0,
0, 5, 5);
+ String[][] source = SCUtil.getTextFromCellRange(currentSheet,
0, 0, 5, 5);
// Copy to cell position
XCell cell = currentSheet.getCellByPosition(7, 7);
@@ -324,7 +324,7 @@ public class StandardFilterOption {
// Get the data after filter
String[][] dataafterFilter =
SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 5);
- assertArrayEquals(souce, dataafterFilter);
+ assertArrayEquals(source, dataafterFilter);
// Get the copyto filter result, verify it
ColRowRange = UnoRuntime.queryInterface(XColumnRowRange.class,
xdataRange.getCellRangeByName("H8:M10"));
@@ -360,7 +360,7 @@ public class StandardFilterOption {
// Get the data after filter
currentSheet = SCUtil.getCurrentSheet(scDocument);
dataafterFilter = SCUtil.getTextFromCellRange(currentSheet, 0,
0, 5, 5);
- assertArrayEquals(souce, dataafterFilter);
+ assertArrayEquals(source, dataafterFilter);
// Get the copyto filter result, verify it
ColRowRange = UnoRuntime.queryInterface(XColumnRowRange.class,
xdataRange.getCellRangeByName("H8:M10"));
diff --git a/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
b/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
index 56715596ba..dd3fd237df 100644
--- a/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
+++ b/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
@@ -124,19 +124,19 @@ public class SheetBasicTest {
public void copypastesheet() throws Exception {
// Insert some value into cells
scDocument = SCUtil.getSCDocument(scComponent);
- String souceSheetName = "sourcesheet";
- SCUtil.setSCSheetNameByIndex(scDocument, (short) 0,
souceSheetName);
+ String sourceSheetName = "sourcesheet";
+ SCUtil.setSCSheetNameByIndex(scDocument, (short) 0,
sourceSheetName);
String[][] stringValues = { { "", "Jan", "Feb", "Mar", "Apr",
"Mai" },
{ "Profit", "12.3", "43.2", "5.1", "76", "56.8"
},
{ "Rival in business", "12.2", "12.6", "17.7",
"20.4", "100" }, };
XSpreadsheet sourceSpreadSheet =
SCUtil.getSCSheetByName(scDocument,
- souceSheetName);
+ sourceSheetName);
// input strings into sheet1
SCUtil.setTextToCellRange(sourceSpreadSheet, 0, 0,
stringValues);
// copy the sheet from sourcesheet to copysheet
String newcopysheet = "copysheet";
XSpreadsheets spreadsheets = scDocument.getSheets();
- spreadsheets.copyByName(souceSheetName, newcopysheet, (short)
2);
+ spreadsheets.copyByName(sourceSheetName, newcopysheet, (short)
2);
// Save and reload document
SCUtil.saveFileAs(scComponent, "TestCopysheet", "xls");