[Libreoffice-commits] core.git: extensions/source include/xmloff xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Apr 12 18:29:37 UTC 2021
extensions/source/update/check/updatecheck.hxx | 1 -
include/xmloff/shapeimport.hxx | 2 --
include/xmloff/xmlnumfi.hxx | 1 -
xmloff/source/draw/ximp3dscene.cxx | 6 +-----
xmloff/source/style/xmlnumfi.cxx | 5 -----
5 files changed, 1 insertion(+), 14 deletions(-)
New commits:
commit 4627cac8e55e0789c23841c95d333815d4b44a09
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Apr 12 14:35:41 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Apr 12 20:28:54 2021 +0200
loplugin:unusedfields
Change-Id: Ifb8ff48a05f37c0593bf619d7c774a26cb2655e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113987
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index b7c0ba8d2c5f..546616f574dd 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -164,7 +164,6 @@ private:
mutable std::recursive_mutex m_aMutex;
WorkerThread *m_pThread;
osl::Condition m_aCondition;
- osl::Condition m_NotInWaitState;
UpdateInfo m_aUpdateInfo;
OUString m_aImageName;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 5fa670a35445..51bc59a25d1f 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -93,8 +93,6 @@ protected:
::basegfx::B3DVector maVPN;
::basegfx::B3DVector maVUP;
bool mbVRPUsed;
- bool mbVPNUsed;
- bool mbVUPUsed;
public:
SdXML3DSceneAttributesHelper( SvXMLImport& rImporter );
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 84c6113ab80e..0f6384f3b785 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -148,7 +148,6 @@ private:
OUStringBuffer aFormatCode{64};
OUStringBuffer aConditions{32};
bool bHasLongDoW;
- bool bHasEra;
bool bHasDateTime;
bool bRemoveAfterUse;
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index f6533a670bad..c1519346db88 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -198,9 +198,7 @@ SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImport
maVRP(0.0, 0.0, 1.0),
maVPN(0.0, 0.0, 1.0),
maVUP(0.0, 1.0, 0.0),
- mbVRPUsed(false),
- mbVPNUsed(false),
- mbVUPUsed(false)
+ mbVRPUsed(false)
{
}
@@ -251,7 +249,6 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( const sax_fastparser::
if(aNewVec != maVPN)
{
maVPN = aNewVec;
- mbVPNUsed = true;
}
return;
}
@@ -263,7 +260,6 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( const sax_fastparser::
if(aNewVec != maVUP)
{
maVUP = aNewVec;
- mbVUPUsed = true;
}
return;
}
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 3928b6788af1..824a05c68e9a 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1134,7 +1134,6 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
bAutoInt( false ),
bHasExtraText( false ),
bHasLongDoW( false ),
- bHasEra( false ),
bHasDateTime( false ),
bRemoveAfterUse( false ),
eDateDOW( XML_DEA_NONE ),
@@ -1271,7 +1270,6 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
bAutoInt( false ),
bHasExtraText( false ),
bHasLongDoW( false ),
- bHasEra( false ),
bHasDateTime( false ),
bRemoveAfterUse( false ),
eDateDOW( XML_DEA_NONE ),
@@ -1872,9 +1870,6 @@ void SvXMLNumFormatContext::AddNfKeyword( sal_uInt16 nIndex )
if (!pFormatter)
return;
- if ( nIndex == NF_KEY_G || nIndex == NF_KEY_GG || nIndex == NF_KEY_GGG )
- bHasEra = true;
-
if ( nIndex == NF_KEY_NNNN )
{
nIndex = NF_KEY_NNN;
More information about the Libreoffice-commits
mailing list