Fix typos
Change-Id: Ieb4e85c582ae37b6d83411b5e76303453bf8ea35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210570 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
committed by
Julien Nabet
parent
8ee79ac196
commit
a486bdeef2
@@ -108,7 +108,7 @@ ScMacroFunction::ScMacroFunction(const ScInterpreter& rInterpreter, const OUStri
|
||||
maMacroStr = pObject->GetName() + "." + mpModule->GetName() + "." + mpMethod->GetName();
|
||||
if (pRoot && bUseVBAObjects)
|
||||
{
|
||||
// just here to make sure the VBA objects when we run the macro during ODF import
|
||||
// just here to make sure the VBA objects are initialized when we run the macro during ODF import
|
||||
pRoot->getVBAGlobals();
|
||||
}
|
||||
if (pObject->GetParent())
|
||||
|
||||
@@ -1511,7 +1511,7 @@ void ScDBData::RefreshTableColumnNames( ScDocument* pDoc )
|
||||
}
|
||||
|
||||
// Never leave us with empty names, try to remember previous name that
|
||||
// might had been used to compile formulas, but only if same number of
|
||||
// might have been used to compile formulas, but only if same number of
|
||||
// columns and no duplicates.
|
||||
if (bHaveEmpty && aNewNames.size() == maTableColumnNames.size())
|
||||
{
|
||||
@@ -1703,11 +1703,11 @@ OUString ScDBData::GetStringFromSubTotalFunc(ScSubTotalFunc eFunc)
|
||||
else if (eFunc == SUBTOTAL_FUNC_CNT2)
|
||||
return u"count"_ustr;
|
||||
else if (eFunc == SUBTOTAL_FUNC_PROD)
|
||||
return u"custom"_ustr; // ooxml not support in Total row
|
||||
return u"custom"_ustr; // ooxml not supported in Total row
|
||||
else if (eFunc == SUBTOTAL_FUNC_AVE)
|
||||
return u"average"_ustr;
|
||||
else if (eFunc == SUBTOTAL_FUNC_MED)
|
||||
return u"custom"_ustr; // ooxml not support in Total row
|
||||
return u"custom"_ustr; // ooxml not supported in Total row
|
||||
else if (eFunc == SUBTOTAL_FUNC_MAX)
|
||||
return u"max"_ustr;
|
||||
else if (eFunc == SUBTOTAL_FUNC_MIN)
|
||||
@@ -1715,7 +1715,7 @@ OUString ScDBData::GetStringFromSubTotalFunc(ScSubTotalFunc eFunc)
|
||||
else if (eFunc == SUBTOTAL_FUNC_STD)
|
||||
return u"stdDev"_ustr;
|
||||
else if (eFunc == SUBTOTAL_FUNC_STDP)
|
||||
return u"custom"_ustr; // ooxml not support in Total row
|
||||
return u"custom"_ustr; // ooxml not supported in Total row
|
||||
else if (eFunc == SUBTOTAL_FUNC_VAR)
|
||||
return u"var"_ustr;
|
||||
else
|
||||
@@ -1929,7 +1929,7 @@ void ScDBCollection::NamedDBs::initInserted( ScDBData* p )
|
||||
if (mrDoc.IsClipOrUndo())
|
||||
return;
|
||||
|
||||
p->StartTableColumnNamesListener(); // needs the container be set already
|
||||
p->StartTableColumnNamesListener(); // needs the container to be set already
|
||||
if (!p->AreTableColumnNamesDirty())
|
||||
return;
|
||||
|
||||
|
||||
@@ -216,7 +216,7 @@ void XclExpTables::SaveTableXml( XclExpXmlStream& rStrm, const Entry& rEntry )
|
||||
});
|
||||
bool bExportTotals = rData.HasHeader() && rData.HasTotals() && !bAnyColumnHasUndescribedContent;
|
||||
|
||||
// if the Total row have ever been showed it will be true
|
||||
// if the Total row has ever been shown it will be true
|
||||
bool hasAnySetValue = bExportTotals;
|
||||
|
||||
pTableStrm->startElement( XML_table,
|
||||
@@ -264,7 +264,7 @@ void XclExpTables::SaveTableXml( XclExpXmlStream& rStrm, const Entry& rEntry )
|
||||
const std::vector< TableColumnModel >& rTableColumnModel = rData.GetTableColumnModel();
|
||||
if (!rColNames.empty())
|
||||
{
|
||||
// rColNames and aTotalValues size should always be equal
|
||||
// rColNames and aTotalValues sizes should always be equal
|
||||
assert((rColNames.size() == aTotalValues.size()) &&
|
||||
"XclExpTables::SaveTableXml - mismatch between column names and total values");
|
||||
|
||||
|
||||
@@ -99,14 +99,14 @@ XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) :
|
||||
// Don't use the system HelpBack and HelpText colours as it causes problems
|
||||
// with modern gnome. This is because mnNoteText and mnNoteBack are used
|
||||
// when colour indices ( instead of real colours ) are specified.
|
||||
// Note: That this it is not an unusual scenario that we get the Note
|
||||
// Note: it is not an unusual scenario that we get the Note
|
||||
// background specified as a real colour and the text specified as a
|
||||
// colour index. That means the text colour would be picked from
|
||||
// the system where the note background would be picked from a real colour.
|
||||
// Previously the note text colour was picked from the system tooltip
|
||||
// text colour, on modern gnome(e.g. 3) that tends to be 'white' with the
|
||||
// default theme.
|
||||
// Using the Libreoffice defaults ( instead of system specific colours
|
||||
// Using the LibreOffice defaults ( instead of system specific colours
|
||||
// ) lessens the chance of the one colour being an unsuitable combination
|
||||
// because by default the note text is black and the note background is
|
||||
// a light yellow colour ( very similar to Excel's normal defaults )
|
||||
|
||||
@@ -1230,7 +1230,7 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
|
||||
NextRow( pInfo );
|
||||
}
|
||||
else
|
||||
{ // It start's in this cell or next to each other
|
||||
{ // It starts in this cell or next to each other
|
||||
bTabInTabCell = false;
|
||||
nColCntStart = nColCnt;
|
||||
nColOffset = nTmpColOffset;
|
||||
|
||||
@@ -161,7 +161,7 @@ private:
|
||||
sal_uInt16 mnRecId; /// Record identifier for the IMGDATA record.
|
||||
};
|
||||
|
||||
/** Helper class for form controls to manage spreadsheet links . */
|
||||
/** Helper class for form controls to manage spreadsheet links. */
|
||||
class XclExpControlHelper : protected XclExpRoot
|
||||
{
|
||||
public:
|
||||
@@ -276,7 +276,7 @@ private:
|
||||
void WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId );
|
||||
/** Writes the ftSbs sub structure containing scrollbar data. */
|
||||
void WriteSbs( XclExpStream& rStrm );
|
||||
/** Writes an anchor, if empty calculates one form XShape */
|
||||
/** Writes an anchor, if empty calculates one from XShape */
|
||||
void WriteAnchor( const sax_fastparser::FSHelperPtr& rTarget, bool bIsDrawing ) const;
|
||||
/** Writes the label's run properties, the DrawingML half of the label font. */
|
||||
void WriteLabelFont(const sax_fastparser::FSHelperPtr& rTarget) const;
|
||||
@@ -422,7 +422,7 @@ public:
|
||||
virtual ~XclExpObjectManager() override;
|
||||
|
||||
/** Creates a new DFF client anchor object. Caller takes ownership! May be
|
||||
overwritten in derived classes. */
|
||||
overwritten in derived classes. */
|
||||
virtual XclExpDffAnchorBase* CreateDffAnchor() const;
|
||||
|
||||
/** Creates and returns the MSODRAWINGGROUP record containing global DFF
|
||||
|
||||
@@ -787,7 +787,7 @@ public:
|
||||
|
||||
/** Sets a data point or series format (CHDATAFORMAT group) for this series. */
|
||||
void SetDataFormat( const XclImpChDataFormatRef& xDataFmt );
|
||||
/** Sets a label text (CHTEXT group) attached to a series or data point. */
|
||||
/** Sets a label text (CHTEXT group) attached to a series or data point. */
|
||||
void SetDataLabel(const XclImpChTextRef& xLabel);
|
||||
/** Adds error bar settings from the passed series to the own series. */
|
||||
void AddChildSeries( const XclImpChSeries& rSeries );
|
||||
|
||||
@@ -2127,7 +2127,7 @@ void Xf::importXf( const AttributeList& rAttribs, bool bCellXf )
|
||||
{
|
||||
maModel.mbCellXf = bCellXf;
|
||||
// tdf#70565 Set proper default value to "0" of xfId attribute
|
||||
// When xfId is not exist during .xlsx import
|
||||
// When xfId does not exist during .xlsx import
|
||||
// it must have values set to "0".
|
||||
// This doesn't impact spreadsheets created with MS Excel,
|
||||
// as xfId attribute is always created during export to .xlsx
|
||||
|
||||
@@ -169,8 +169,8 @@ bool TableColumns::finalizeImport( ScDBData* pDBData, bool bQueryTable )
|
||||
pDBData->SetTableColumnNames( std::move(aNames) );
|
||||
|
||||
// If table type is "queryTable" and `removeDataOnSave` attribute is set to true,
|
||||
// Excel removes table data from sheet including headers
|
||||
// We don't support Power Query connections, fill table headers in the sheet with table data.
|
||||
// Excel removes table data from sheet, including headers.
|
||||
// We don't support Power Query connections, so fill table headers in the sheet with table data.
|
||||
if (bQueryTable && pDBData->HasHeader())
|
||||
{
|
||||
ScRange aRange;
|
||||
|
||||
@@ -159,7 +159,7 @@ public:
|
||||
Reference< XStyle > getStyleObject( const OUString& rStyleName, bool bPageStyle ) const;
|
||||
/** Creates and returns a defined name on-the-fly in the Calc document. */
|
||||
WorkbookHelper::RangeDataRet createNamedRangeObject(OUString& orName, sal_Int32 nIndex, sal_Int32 nNameFlags);
|
||||
/** Creates and returns a defined name on the-fly in the correct Calc sheet. */
|
||||
/** Creates and returns a defined name on-the-fly in the correct Calc sheet. */
|
||||
WorkbookHelper::RangeDataRet createLocalNamedRangeObject(OUString& orName, sal_Int32 nIndex, sal_Int32 nNameFlags, sal_Int32 nTab);
|
||||
/** Creates and returns a database range on-the-fly in the Calc document. */
|
||||
rtl::Reference<ScDatabaseRangeObj> createDatabaseRangeObject( OUString& orName, const ScRange& rRangeAddr );
|
||||
|
||||
@@ -605,7 +605,7 @@ void ScOrcusFactory::pushMatrixFormulaToken(const ScAddress& rPos, const OUStrin
|
||||
void ScOrcusFactory::pushFormulaResult(const ScAddress& rPos, double fValue)
|
||||
{
|
||||
// Formula result is expected to be pushed immediately following the
|
||||
// formula token it belongs.
|
||||
// formula token it belongs to.
|
||||
if (maCellStoreTokens.empty())
|
||||
return;
|
||||
|
||||
@@ -631,7 +631,7 @@ void ScOrcusFactory::pushFormulaResult(const ScAddress& rPos, double fValue)
|
||||
void ScOrcusFactory::pushFormulaResult(const ScAddress& rPos, const OUString& rValue)
|
||||
{
|
||||
// Formula result is expected to be pushed immediately following the
|
||||
// formula token it belongs.
|
||||
// formula token it belongs to.
|
||||
if (maCellStoreTokens.empty())
|
||||
return;
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ void SAL_CALL ScAccessiblePageHeaderArea::disposing()
|
||||
|
||||
void ScAccessiblePageHeaderArea::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
|
||||
{
|
||||
// only notify if child exist, otherwise it is not necessary
|
||||
// only notify if children exist, otherwise it is not necessary
|
||||
if (rHint.GetId() == SfxHintId::ScAccVisAreaChanged)
|
||||
{
|
||||
if (mpTextHelper)
|
||||
|
||||
@@ -106,7 +106,7 @@ ScIndexHint::~ScIndexHint()
|
||||
}
|
||||
|
||||
/**
|
||||
* Create new EditView for Cursorposition
|
||||
* Create new EditView for cursor position
|
||||
*/
|
||||
ScEditViewHint::ScEditViewHint( ScEditEngineDefaulter& rEngine, const ScAddress& rCurPos ) :
|
||||
SfxHint(SfxHintId::ScEditView),
|
||||
@@ -252,7 +252,7 @@ bool ScSubTotalItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */
|
||||
}
|
||||
|
||||
/**
|
||||
* Transporter for the UserLIst dialog
|
||||
* Transporter for the UserList dialog
|
||||
*/
|
||||
ScUserListItem::ScUserListItem( sal_uInt16 nWhichP )
|
||||
: SfxPoolItem ( nWhichP )
|
||||
|
||||
@@ -864,7 +864,7 @@ namespace
|
||||
/*
|
||||
* in case marked members are to be included, we include
|
||||
* them at the end because we can see in the functions which call
|
||||
* this function that the marked members will be disabled anyways
|
||||
* this function that the marked members will be disabled anyway
|
||||
* if lock is checked.
|
||||
*/
|
||||
if (!bIncludeMarkedMembers || (!rMembers[i].mbMarked && !rMembers[i].mbHiddenByOtherFilter))
|
||||
|
||||
@@ -279,7 +279,7 @@ IMPL_LINK(ScSpecialFilterDlg, EndDlgHdl, weld::Button&, rBtn, void)
|
||||
{
|
||||
/*
|
||||
* All edit fields contain valid areas. Now try to create
|
||||
* a ScQueryParam from the filter area:
|
||||
* an ScQueryParam from the filter area:
|
||||
*/
|
||||
|
||||
ScRefFlags nResult = theFilterArea.Parse(theAreaStr, m_rDoc, eConv);
|
||||
|
||||
@@ -75,7 +75,7 @@ IMPL_LINK(ScSortWarningDlg, BtnHdl, weld::Button&, rBtn, void)
|
||||
{
|
||||
m_xDialog->response(BTN_EXTEND_RANGE);
|
||||
}
|
||||
else if(&rBtn == m_xBtnCurSort.get())
|
||||
else if (&rBtn == m_xBtnCurSort.get())
|
||||
{
|
||||
m_xDialog->response(BTN_CURRENT_SELECTION);
|
||||
}
|
||||
|
||||
@@ -248,7 +248,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter,
|
||||
|
||||
SfxMedium* pMed = ScDocumentLoader::CreateMedium( aNewUrl, pFilter, aOptions);
|
||||
|
||||
// aRef->DoClose() will be closed explicitly, but it is still more safe to use SfxObjectShellLock here
|
||||
// aRef->DoClose() will be closed explicitly, but it is still safer to use SfxObjectShellLock here
|
||||
rtl::Reference<ScDocShell> pSrcShell = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT | SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS);
|
||||
pSrcShell->DoLoad(pMed);
|
||||
|
||||
|
||||
@@ -177,7 +177,7 @@ public:
|
||||
|
||||
if (pCell->IsValue())
|
||||
{
|
||||
// Turn this into value cell.
|
||||
// Turn this into a value cell.
|
||||
mpDoc->SetValue(aPos, pCell->GetValue());
|
||||
}
|
||||
else
|
||||
|
||||
@@ -118,7 +118,7 @@ ScImportExport::ScImportExport( ScDocument& r )
|
||||
pExtOptions = nullptr;
|
||||
}
|
||||
|
||||
// Insert am current cell without range(es)
|
||||
// Insert at current cell without range(es)
|
||||
ScImportExport::ScImportExport( ScDocument& r, const ScAddress& rPt )
|
||||
: pDocSh( r.GetDocumentShell() ), rDoc( r ),
|
||||
aRange( rPt ),
|
||||
|
||||
@@ -210,7 +210,7 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
|
||||
// don't access DocShell anymore for EndListening etc.
|
||||
}
|
||||
}
|
||||
else if (dynamic_cast<const SfxApplication*>( &rBC) != nullptr)
|
||||
else if (dynamic_cast<const SfxApplication*>(&rBC) != nullptr)
|
||||
{
|
||||
if ( !aItemStr.isEmpty() && rHint.GetId() == SfxHintId::ScAreasChanged )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user