cui/source/tabpages/grfpage.cxx | 5 +++-- sc/inc/document.hxx | 6 +++--- sc/source/core/data/documen2.cxx | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit b15010fdfafeae9a6b22998852f0dafd8bf0d3ce Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon Jan 10 17:23:50 2022 +0900 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Jan 10 13:51:47 2022 +0100 sc: fix typo Change-Id: If9a8f7265c17dafa99b51fe6266d935afedfa394 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128207 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 07f488df346d..fa13b7b890e4 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -558,7 +558,7 @@ private: bool mbEmbedFontScriptAsian : 1; bool mbEmbedFontScriptComplex : 1; - sal_Int32 mnImagenPreferredDPI; + sal_Int32 mnImagePreferredDPI; std::unique_ptr<sc::IconSetBitmapMap> m_pIconSetBitmapMap; @@ -585,8 +585,8 @@ public: void SetEmbedFontScriptAsian(bool bUse) { mbEmbedFontScriptAsian = bUse; } void SetEmbedFontScriptComplex(bool bUse) { mbEmbedFontScriptComplex = bUse; } - void SetImagePreferredDPI(sal_Int32 nValue) { mnImagenPreferredDPI = nValue; } - sal_Int32 GetImagePreferredDPI() { return mnImagenPreferredDPI; } + void SetImagePreferredDPI(sal_Int32 nValue) { mnImagePreferredDPI = nValue; } + sal_Int32 GetImagePreferredDPI() { return mnImagePreferredDPI; } SC_DLLPUBLIC sal_uLong GetCellCount() const; // all cells SC_DLLPUBLIC sal_uLong GetFormulaGroupCount() const; // all cells diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 48bd7737dcfe..67f6e9d7ca41 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -177,7 +177,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : mbEmbedFontScriptLatin(true), mbEmbedFontScriptAsian(true), mbEmbedFontScriptComplex(true), - mnImagenPreferredDPI(0), + mnImagePreferredDPI(0), mbTrackFormulasPending(false), mbFinalTrackFormulas(false), mbDocShellRecalc(false), commit 1126212885ee2d1ba0fd5e48bdb5f6e9d99e0302 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon Jan 10 17:20:43 2022 +0900 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Jan 10 13:51:26 2022 +0100 cui: no need to fetch the property from the map twice Change-Id: I7597c352b2ae166657f1e431e3405fc690520afa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128206 Tested-by: Tomaž Vajngerl <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 9fd58548516e..f18b2aa006fd 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -290,8 +290,9 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) #endif auto& aProperties = getAdditionalProperties(); - if (aProperties.find("PreferredDPI") != aProperties.end()) - m_aPreferredDPI = aProperties.at("PreferredDPI").get<sal_Int32>(); + auto aIterator = aProperties.find("PreferredDPI"); + if (aIterator != aProperties.end()) + m_aPreferredDPI = aIterator->second.get<sal_Int32>(); bSetOrigSize = false;
