Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/linters/codespell.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2113,7 +2113,6 @@ repesented
repesents
repetive
replased
reportresouces
repositry
repostories
repraesentation
Expand Down Expand Up @@ -2368,7 +2367,6 @@ somes
somme
sortings
sortlst
souce
spaning
speacial
specialy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -470,11 +470,11 @@ private void setSystemProperties(NamedValue[] properties) {
}
}

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;
}
Expand Down
4 changes: 2 additions & 2 deletions main/migrationanalysis/src/driver_docs/allstrings.ulf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand Down
18 changes: 9 additions & 9 deletions main/svx/source/fmcomp/fmgridcl.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ 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;
Reference< XPropertySet > xField;
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;
Expand All @@ -281,7 +281,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )

if ( !sFieldName.getLength()
|| !sCommand.getLength()
|| ( !sDatasouce.getLength()
|| ( !sDatasource.getLength()
&& !sDatabaseLocation.getLength()
&& !xConnection.is()
)
Expand All @@ -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&)
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand Down
8 changes: 4 additions & 4 deletions main/svx/source/form/fmobj.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions main/vbahelper/source/msforms/vbacontrol.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ ScVbaControlListener::disposing( const lang::EventObject& )
{
if( pControl )
{
pControl->removeResouce();
pControl->removeResource();
pControl = NULL;
}
}
Expand Down Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion main/vbahelper/source/msforms/vbacontrol.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion main/wizards/com/sun/star/wizards/table/TableWizard.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public TableWizard( XMultiServiceFactory xMSF, PropertyValue[] i_wizardContext )
});
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);
Expand Down
2 changes: 1 addition & 1 deletion main/writerfilter/source/ooxml/model.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions test/testuno/source/fvt/uno/sc/data/StandardFilterOption.java
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public void testStandardFilterOptionCopyOutput() throws Exception {
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);
Expand Down Expand Up @@ -324,7 +324,7 @@ public void testStandardFilterOptionCopyOutput() throws Exception {

// 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"));
Expand Down Expand Up @@ -360,7 +360,7 @@ public void testStandardFilterOptionCopyOutput() throws Exception {
// 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"));
Expand Down
8 changes: 4 additions & 4 deletions test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,19 @@ public void insertRenameDeleteSheet() throws Exception {
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");
Expand Down