[Libreoffice-commits] core.git: 4 commits - writerfilter/source xmlhelp/source xmloff/inc xmloff/source xmlsecurity/source
Noel Grandin
noel at peralex.com
Tue Nov 24 00:09:58 PST 2015
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 133 ++++++++---------
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2
writerfilter/source/dmapper/FontTable.hxx | 14 -
writerfilter/source/dmapper/GraphicImport.cxx | 14 -
writerfilter/source/dmapper/SettingsTable.cxx | 32 ----
writerfilter/source/dmapper/SettingsTable.hxx | 2
writerfilter/source/dmapper/TDefTableHandler.hxx | 2
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 1
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2
xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 2
xmlhelp/source/cxxhelp/provider/content.cxx | 10 -
xmlhelp/source/cxxhelp/provider/content.hxx | 9 -
xmlhelp/source/cxxhelp/provider/databases.hxx | 1
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 2
xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 2
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 3
xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx | 1
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 3
xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx | 1
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 9 -
xmlhelp/source/cxxhelp/qe/DocGenerator.cxx | 1
xmloff/inc/txtfldi.hxx | 3
xmloff/source/core/xmlexp.cxx | 3
xmloff/source/draw/XMLImageMapContext.cxx | 2
xmloff/source/draw/animationimport.cxx | 5
xmloff/source/draw/animimp.cxx | 2
xmloff/source/draw/ximpshap.cxx | 1
xmloff/source/draw/ximpshap.hxx | 1
xmloff/source/draw/ximpshow.cxx | 7
xmloff/source/text/XMLIndexTemplateContext.cxx | 1
xmloff/source/text/XMLIndexTemplateContext.hxx | 1
xmloff/source/xforms/xformsexport.cxx | 5
xmlsecurity/source/dialogs/certificateviewer.cxx | 1
xmlsecurity/source/helper/xsecctl.hxx | 6
35 files changed, 83 insertions(+), 203 deletions(-)
New commits:
commit 145a9954116b14a417fd403a13536883dbd5c96e
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 24 09:19:25 2015 +0200
loplugin:unusedfields in xmlsecurity/
Change-Id: I11bb62b0c90de361b7cd06608e77483786750ebb
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 1d81da2..e6d4fef 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -331,7 +331,6 @@ IMPL_LINK_NOARG_TYPED(CertificateViewerDetailsTP, ElementSelectHdl, SvTreeListBo
struct CertPath_UserData
{
css::uno::Reference< css::security::XCertificate > mxCert;
- OUString maStatus;
bool mbValid;
CertPath_UserData( css::uno::Reference< css::security::XCertificate > xCert, bool bValid):
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 1eb0033..f354bbb 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -303,12 +303,6 @@ private:
bool m_bIsSAXEventKeeperSticky;
/*
- * fast property vector
- */
- std::vector< sal_Int32 > m_vFastPropertyIndexs;
- std::vector< com::sun::star::uno::Any > m_vFastPropertyValues;
-
- /*
* error message pointer
*/
const char *m_pErrorMessage;
commit e0bf7914b45c4236a9266295df915a9079d9ff00
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 24 09:17:04 2015 +0200
loplugin:unusedfields in xmloff/
Change-Id: I1fb9cb1bc04fb0886d6080f62899a04e8fd4429e
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 2baa311..e9436c4 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1389,10 +1389,7 @@ public:
class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
{
- OUString sName;
::com::sun::star::uno::Any aValue;
- const OUString sPropertyName;
- const OUString sPropertyValue;
public:
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 1da587b..737e7d1 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -257,9 +257,6 @@ public:
SvtSaveOptions maSaveOptions;
- /// relative path of stream in package, e.g. "someobject/content.xml"
- OUString mStreamPath;
-
/// name of stream in package, e.g., "content.xml"
OUString mStreamName;
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 2a4dc6d..7c31337 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -104,7 +104,6 @@ protected:
const OUString sCenter;
const OUString sTitle;
const OUString sDescription;
- const OUString sImageMap;
const OUString sIsActive;
const OUString sName;
const OUString sPolygon;
@@ -170,7 +169,6 @@ XMLImageMapObjectContext::XMLImageMapObjectContext(
sCenter("Center"),
sTitle("Title"),
sDescription("Description"),
- sImageMap("ImageMap"),
sIsActive("IsActive"),
sName("Name"),
sPolygon("Polygon"),
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 9d374e3..f7c5e72 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -124,15 +124,12 @@ public:
Any convertTiming( const OUString& rValue );
static Sequence< double > convertKeyTimes( const OUString& rValue );
static Sequence< TimeFilterPair > convertTimeFilter( const OUString& rValue );
-
- const OUString mastrHSL;
};
AnimationsImportHelperImpl::AnimationsImportHelperImpl( SvXMLImport& rImport )
: mrImport( rImport ),
mpAnimationNodeTokenMap( nullptr ),
- mpAnimationNodeAttributeTokenMap( nullptr ),
- mastrHSL( "hsl" )
+ mpAnimationNodeAttributeTokenMap( nullptr )
{
}
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 3ce0856..1aae82c 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -326,7 +326,6 @@ public:
OUString msDimPrev;
OUString msEffect;
OUString msPlayFull;
- OUString msPresOrder;
OUString msSound;
OUString msSoundOn;
OUString msSpeed;
@@ -341,7 +340,6 @@ public:
msDimPrev( "DimPrevious" ),
msEffect( "Effect" ),
msPlayFull( "PlayFull" ),
- msPresOrder( "PresentationOrder" ),
msSound( "Sound" ),
msSoundOn( "SoundOn" ),
msSpeed( "Speed" ),
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 41704fa..91af3ee 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -148,7 +148,6 @@ SdXMLShapeContext::SdXMLShapeContext(
, mxAttrList(xAttrList)
, mbListContextPushed( false )
, mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID)
- , mnClass(0)
, mbIsPlaceholder(false)
, mbClearDefaultAttributes( true )
, mbIsUserTransformed(false)
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index e2f6b9b..2e11cf1 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -60,7 +60,6 @@ protected:
bool mbListContextPushed;
sal_uInt16 mnStyleFamily;
- sal_uInt16 mnClass;
bool mbIsPlaceholder;
bool mbClearDefaultAttributes;
bool mbIsUserTransformed;
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index baa9eb0..0b5efd5 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -54,17 +54,12 @@ public:
Reference< XPropertySet > mxPresProps;
Reference< XNameAccess > mxPages;
OUString maCustomShowName;
- SdXMLImport& mrImport;
-
- explicit ShowsImpImpl( SdXMLImport& rImport )
- : mrImport( rImport )
- {}
};
SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
: SvXMLImportContext(rImport, nPrfx, rLocalName),
- mpImpl(new ShowsImpImpl( rImport ) )
+ mpImpl(new ShowsImpImpl )
{
Reference< XCustomPresentationSupplier > xShowsSupplier( rImport.GetModel(), UNO_QUERY );
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index e4bce4d..0e47d86 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -102,7 +102,6 @@ XMLIndexTemplateContext::XMLIndexTemplateContext(
, sChapterLevel("ChapterLevel") //#i53420
, sLevelFormat("LevelFormat")
-, sParaStyleLevel("ParaStyleLevel")
{
DBG_ASSERT( ((XML_TOKEN_INVALID != eLevelAttrName) && (nullptr != pLevelNameMap))
|| ((XML_TOKEN_INVALID == eLevelAttrName) && (nullptr == pLevelNameMap)),
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index 01ae06e..31b7f69 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -109,7 +109,6 @@ public:
const OUString sChapterLevel;//i53420
const OUString sLevelFormat;
- const OUString sParaStyleLevel;
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 5ae21ee..af419af 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -114,7 +114,6 @@ typedef OUString (*convert_t)( const Any& );
typedef struct
{
const sal_Char* pPropertyName;
- sal_uInt16 nPropertyNameLength;
sal_uInt16 nNamespace;
sal_uInt16 nToken;
convert_t aConverter;
@@ -123,8 +122,8 @@ static void lcl_export( const Reference<XPropertySet>& rPropertySet,
SvXMLExport& rExport,
const ExportTable* pTable );
-#define TABLE_ENTRY(NAME,NAMESPACE,TOKEN,CONVERTER) { NAME,sizeof(NAME)-1,XML_NAMESPACE_##NAMESPACE,xmloff::token::XML_##TOKEN, CONVERTER }
-#define TABLE_END { nullptr, 0, 0, 0, nullptr }
+#define TABLE_ENTRY(NAME,NAMESPACE,TOKEN,CONVERTER) { NAME,XML_NAMESPACE_##NAMESPACE,xmloff::token::XML_##TOKEN, CONVERTER }
+#define TABLE_END { nullptr, 0, 0, nullptr }
// any conversion functions
OUString xforms_string( const Any& );
commit 22c59683144171cc96c71f00c24dbf540681c2ee
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 24 09:09:07 2015 +0200
loplugin:unusedfields in xmlhelp/
Change-Id: I1db28ad3670c166201050a4e19a50ec13a82fa76
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 2863693..c0aa93c 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -35,8 +35,6 @@ namespace xmlsearch {
private:
static RoleFiller roleFiller_;
-
- std::vector< RoleFiller* > fillers_;
};
}
}
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 24019cd..a1411b1 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -168,7 +168,6 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< ucb::XContentProvider > m_xProvider;
- sal_Int32 m_nOpenMode;
uno::Sequence< beans::Property > m_seq;
uno::Sequence< ucb::NumberedSortingInfo > m_seqSort;
URLParameter m_aURLParameter;
@@ -179,14 +178,12 @@ public:
ResultSetForRootFactory(
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< ucb::XContentProvider >& xProvider,
- sal_Int32 nOpenMode,
const uno::Sequence< beans::Property >& seq,
const uno::Sequence< ucb::NumberedSortingInfo >& seqSort,
const URLParameter& rURLParameter,
Databases* pDatabases )
: m_xContext( xContext ),
m_xProvider( xProvider ),
- m_nOpenMode( nOpenMode ),
m_seq( seq ),
m_seqSort( seqSort ),
m_aURLParameter( rURLParameter ),
@@ -198,7 +195,6 @@ public:
{
return new ResultSetForRoot( m_xContext,
m_xProvider,
- m_nOpenMode,
m_seq,
m_seqSort,
m_aURLParameter,
@@ -213,7 +209,6 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< ucb::XContentProvider > m_xProvider;
- sal_Int32 m_nOpenMode;
uno::Sequence< beans::Property > m_seq;
uno::Sequence< ucb::NumberedSortingInfo > m_seqSort;
URLParameter m_aURLParameter;
@@ -224,14 +219,12 @@ public:
ResultSetForQueryFactory(
const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< ucb::XContentProvider >& xProvider,
- sal_Int32 nOpenMode,
const uno::Sequence< beans::Property >& seq,
const uno::Sequence< ucb::NumberedSortingInfo >& seqSort,
const URLParameter& rURLParameter,
Databases* pDatabases )
: m_xContext( rxContext ),
m_xProvider( xProvider ),
- m_nOpenMode( nOpenMode ),
m_seq( seq ),
m_seqSort( seqSort ),
m_aURLParameter( rURLParameter ),
@@ -243,7 +236,6 @@ public:
{
return new ResultSetForQuery( m_xContext,
m_xProvider,
- m_nOpenMode,
m_seq,
m_seqSort,
m_aURLParameter,
@@ -352,7 +344,6 @@ uno::Any SAL_CALL Content::execute(
new ResultSetForRootFactory(
m_xContext,
m_xProvider.get(),
- aOpenCommand.Mode,
aOpenCommand.Properties,
aOpenCommand.SortingInfo,
m_aURLParameter,
@@ -370,7 +361,6 @@ uno::Any SAL_CALL Content::execute(
new ResultSetForQueryFactory(
m_xContext,
m_xProvider.get(),
- aOpenCommand.Mode,
aOpenCommand.Properties,
aOpenCommand.SortingInfo,
m_aURLParameter,
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 1124e49..9a43c30 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -39,14 +39,6 @@ namespace chelp
class Databases;
- struct ContentProperties
- {
- OUString aTitle; // Title
- OUString aContentType; // ContentType
-
- ContentProperties() {}
- };
-
class Content : public ::ucbhelper::ContentImplHelper
{
public:
@@ -106,7 +98,6 @@ namespace chelp
// private members;
- ContentProperties m_aProps;
URLParameter m_aURLParameter;
Databases* m_pDatabases;
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 527f086..2c65ded 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -358,7 +358,6 @@ namespace chelp {
Databases& m_rDatabases;
IteratorState m_eState;
- OUString m_aExtensionPath;
OUString m_aInitialModule;
OUString m_aLanguage;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 773236b..d014aa3 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -33,14 +33,12 @@ using namespace com::sun::star;
ResultSetBase::ResultSetBase( const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< ucb::XContentProvider >& xProvider,
- sal_Int32 nOpenMode,
const uno::Sequence< beans::Property >& seq,
const uno::Sequence< ucb::NumberedSortingInfo >& seqSort )
: m_xContext( rxContext ),
m_xProvider( xProvider ),
m_nRow( -1 ),
m_nWasNull( true ),
- m_nOpenMode( nOpenMode ),
m_bRowCountFinal( true ),
m_sProperty( seq ),
m_sSortingInfo( seqSort ),
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index ce2c167..b577fc5 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -52,7 +52,6 @@ namespace chelp {
ResultSetBase( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider,
- sal_Int32 nOpenMode,
const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort );
@@ -537,7 +536,6 @@ namespace chelp {
com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider;
sal_Int32 m_nRow;
bool m_nWasNull;
- sal_Int32 m_nOpenMode;
bool m_bRowCountFinal;
typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 92c94e0..0999298 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -81,12 +81,11 @@ struct HitItem
ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< XContentProvider >& xProvider,
- sal_Int32 nOpenMode,
const uno::Sequence< beans::Property >& seq,
const uno::Sequence< NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases )
- : ResultSetBase( rxContext,xProvider,nOpenMode,seq,seqSort ),
+ : ResultSetBase( rxContext,xProvider,seq,seqSort ),
m_aURLParameter( aURLParameter )
{
Reference< XExtendedTransliteration > xTrans = Transliteration::create( rxContext );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index de09a91..d161e98 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -38,7 +38,6 @@ namespace chelp {
ResultSetForQuery( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext,
const com::sun::star::uno::Reference<com::sun::star::ucb::XContentProvider>& xProvider,
- sal_Int32 nOpenMode,
const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 614e4b5..15d568a 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -32,12 +32,11 @@ using namespace com::sun::star::ucb;
ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< XContentProvider >& xProvider,
- sal_Int32 nOpenMode,
const uno::Sequence< beans::Property >& seq,
const uno::Sequence< NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases )
- : ResultSetBase( rxContext, xProvider,nOpenMode,seq,seqSort ),
+ : ResultSetBase( rxContext, xProvider,seq,seqSort ),
m_aURLParameter( aURLParameter ),
m_pDatabases( pDatabases )
{
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
index 829815a..5058b9e 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
@@ -38,7 +38,6 @@ namespace chelp {
ResultSetForRoot( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider,
- sal_Int32 nOpenMode,
const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index ff4c9e2..bc57921 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -593,16 +593,13 @@ bool URLParameter::query()
struct UserData {
- UserData( InputStreamTransformer* pTransformer,
- URLParameter* pInitial,
+ UserData( URLParameter* pInitial,
Databases* pDatabases )
- : m_pTransformer( pTransformer ),
- m_pDatabases( pDatabases ),
+ : m_pDatabases( pDatabases ),
m_pInitial( pInitial )
{
}
- InputStreamTransformer* m_pTransformer;
Databases* m_pDatabases;
URLParameter* m_pInitial;
};
@@ -787,7 +784,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
}
else
{
- UserData userData( this,urlParam,pDatabases );
+ UserData userData( urlParam,pDatabases );
// Uses the implementation detail, that OString::getStr returns a zero terminated character-array
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index c82ac71..f6e9dfb 100644
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
@@ -29,7 +29,6 @@ RoleFiller RoleFiller::roleFiller_;
RoleFiller::RoleFiller()
- : fillers_( 0 )
{
}
commit 52cd3fb5475e17ac4c66953ed62b8bfdd1a5f578
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 24 09:03:21 2015 +0200
loplugin:unusedfields in writerfilter/
Change-Id: I32348ef0aed955ab799ba90a59f4b511becb67e8
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6ec67c4..ef126b8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -152,9 +152,8 @@ void lcl_handleTextField( const uno::Reference< beans::XPropertySet >& rxFieldPr
struct FieldConversion
{
- OUString sWordCommand;
+ OUString sWordCommand;
const sal_Char* cFieldServiceName;
- const sal_Char* cFieldMasterServiceName;
FieldId eFieldId;
};
@@ -2776,68 +2775,68 @@ if(!bFilled)
{
// {OUString("ADDRESSBLOCK"), "", "", FIELD_ADDRESSBLOCK },
// {OUString("ADVANCE"), "", "", FIELD_ADVANCE },
- {OUString("ASK"), "SetExpression", "SetExpression", FIELD_ASK },
- {OUString("AUTONUM"), "SetExpression", "SetExpression", FIELD_AUTONUM },
- {OUString("AUTONUMLGL"), "SetExpression", "SetExpression", FIELD_AUTONUMLGL },
- {OUString("AUTONUMOUT"), "SetExpression", "SetExpression", FIELD_AUTONUMOUT },
- {OUString("AUTHOR"), "DocInfo.CreateAuthor", "", FIELD_AUTHOR },
- {OUString("DATE"), "DateTime", "", FIELD_DATE },
- {OUString("COMMENTS"), "DocInfo.Description", "", FIELD_COMMENTS },
- {OUString("CREATEDATE"), "DocInfo.CreateDateTime", "", FIELD_CREATEDATE },
- {OUString("DOCPROPERTY"), "", "", FIELD_DOCPROPERTY },
- {OUString("DOCVARIABLE"), "User", "", FIELD_DOCVARIABLE },
- {OUString("EDITTIME"), "DocInfo.EditTime", "", FIELD_EDITTIME },
- {OUString("EQ"), "", "", FIELD_EQ },
- {OUString("FILLIN"), "Input", "", FIELD_FILLIN },
- {OUString("FILENAME"), "FileName", "", FIELD_FILENAME },
-// {OUString("FILESIZE"), "", "", FIELD_FILESIZE },
-// {OUString("FORMULA"), "", "", FIELD_FORMULA },
- {OUString("FORMCHECKBOX"), "", "", FIELD_FORMCHECKBOX},
- {OUString("FORMDROPDOWN"), "DropDown", "", FIELD_FORMDROPDOWN},
- {OUString("FORMTEXT"), "Input", "", FIELD_FORMTEXT},
-// {OUString("GOTOBUTTON"), "", "", FIELD_GOTOBUTTON },
- {OUString("HYPERLINK"), "", "", FIELD_HYPERLINK },
- {OUString("IF"), "ConditionalText", "", FIELD_IF },
-// {OUString("INFO"), "","", FIELD_INFO },
-// {OUString("INCLUDEPICTURE"), "", "", FIELD_INCLUDEPICTURE},
- {OUString("KEYWORDS"), "DocInfo.KeyWords", "", FIELD_KEYWORDS },
- {OUString("LASTSAVEDBY"), "DocInfo.ChangeAuthor", "", FIELD_LASTSAVEDBY },
- {OUString("MACROBUTTON"), "Macro", "", FIELD_MACROBUTTON },
- {OUString("MERGEFIELD"), "Database", "Database", FIELD_MERGEFIELD},
- {OUString("MERGEREC"), "DatabaseNumberOfSet", "", FIELD_MERGEREC },
-// {OUString("MERGESEQ"), "", "", FIELD_MERGESEQ },
- {OUString("NEXT"), "DatabaseNextSet", "", FIELD_NEXT },
- {OUString("NEXTIF"), "DatabaseNextSet", "", FIELD_NEXTIF },
- {OUString("PAGE"), "PageNumber", "", FIELD_PAGE },
- {OUString("PAGEREF"), "GetReference", "", FIELD_PAGEREF },
- {OUString("REF"), "GetReference", "", FIELD_REF },
- {OUString("REVNUM"), "DocInfo.Revision", "", FIELD_REVNUM },
- {OUString("SAVEDATE"), "DocInfo.Change", "", FIELD_SAVEDATE },
-// {OUString("SECTION"), "", "", FIELD_SECTION },
-// {OUString("SECTIONPAGES"), "", "", FIELD_SECTIONPAGES },
- {OUString("SEQ"), "SetExpression", "SetExpression", FIELD_SEQ },
-// {OUString("SET"), "","", FIELD_SET },
-// {OUString("SKIPIF"),"", "", FIELD_SKIPIF },
-// {OUString("STYLEREF"),"", "", FIELD_STYLEREF },
- {OUString("SUBJECT"), "DocInfo.Subject", "", FIELD_SUBJECT },
-// {OUString("SYMBOL"),"", "", FIELD_SYMBOL },
- {OUString("TEMPLATE"), "TemplateName", "", FIELD_TEMPLATE},
- {OUString("TIME"), "DateTime", "", FIELD_TIME },
- {OUString("TITLE"), "DocInfo.Title", "", FIELD_TITLE },
- {OUString("USERINITIALS"), "Author", "", FIELD_USERINITIALS },
-// {OUString("USERADDRESS"), "", "", FIELD_USERADDRESS },
- {OUString("USERNAME"), "Author", "", FIELD_USERNAME },
-
-
- {OUString("TOC"), "com.sun.star.text.ContentIndex", "", FIELD_TOC},
- {OUString("TC"), "com.sun.star.text.ContentIndexMark", "", FIELD_TC},
- {OUString("NUMCHARS"), "CharacterCount", "", FIELD_NUMCHARS},
- {OUString("NUMWORDS"), "WordCount", "", FIELD_NUMWORDS},
- {OUString("NUMPAGES"), "PageCount", "", FIELD_NUMPAGES},
- {OUString("INDEX"), "com.sun.star.text.DocumentIndex", "", FIELD_INDEX},
- {OUString("XE"), "com.sun.star.text.DocumentIndexMark", "", FIELD_XE},
- {OUString("BIBLIOGRAPHY"), "com.sun.star.text.Bibliography", "", FIELD_BIBLIOGRAPHY},
- {OUString("CITATION"), "com.sun.star.text.TextField.Bibliography", "", FIELD_CITATION},
+ {OUString("ASK"), "SetExpression", FIELD_ASK },
+ {OUString("AUTONUM"), "SetExpression", FIELD_AUTONUM },
+ {OUString("AUTONUMLGL"), "SetExpression", FIELD_AUTONUMLGL },
+ {OUString("AUTONUMOUT"), "SetExpression", FIELD_AUTONUMOUT },
+ {OUString("AUTHOR"), "DocInfo.CreateAuthor", FIELD_AUTHOR },
+ {OUString("DATE"), "DateTime", FIELD_DATE },
+ {OUString("COMMENTS"), "DocInfo.Description", FIELD_COMMENTS },
+ {OUString("CREATEDATE"), "DocInfo.CreateDateTime", FIELD_CREATEDATE },
+ {OUString("DOCPROPERTY"), "", FIELD_DOCPROPERTY },
+ {OUString("DOCVARIABLE"), "User", FIELD_DOCVARIABLE },
+ {OUString("EDITTIME"), "DocInfo.EditTime", FIELD_EDITTIME },
+ {OUString("EQ"), "", FIELD_EQ },
+ {OUString("FILLIN"), "Input", FIELD_FILLIN },
+ {OUString("FILENAME"), "FileName", FIELD_FILENAME },
+// {OUString("FILESIZE"), "", FIELD_FILESIZE },
+// {OUString("FORMULA"), "", FIELD_FORMULA },
+ {OUString("FORMCHECKBOX"), "", FIELD_FORMCHECKBOX},
+ {OUString("FORMDROPDOWN"), "DropDown", FIELD_FORMDROPDOWN},
+ {OUString("FORMTEXT"), "Input", FIELD_FORMTEXT},
+// {OUString("GOTOBUTTON"), "", FIELD_GOTOBUTTON },
+ {OUString("HYPERLINK"), "", FIELD_HYPERLINK },
+ {OUString("IF"), "ConditionalText", FIELD_IF },
+// {OUString("INFO"), "",FIELD_INFO },
+// {OUString("INCLUDEPICTURE"), "", FIELD_INCLUDEPICTURE},
+ {OUString("KEYWORDS"), "DocInfo.KeyWords", FIELD_KEYWORDS },
+ {OUString("LASTSAVEDBY"), "DocInfo.ChangeAuthor", FIELD_LASTSAVEDBY },
+ {OUString("MACROBUTTON"), "Macro", FIELD_MACROBUTTON },
+ {OUString("MERGEFIELD"), "Database", FIELD_MERGEFIELD},
+ {OUString("MERGEREC"), "DatabaseNumberOfSet", FIELD_MERGEREC },
+// {OUString("MERGESEQ"), "", FIELD_MERGESEQ },
+ {OUString("NEXT"), "DatabaseNextSet", FIELD_NEXT },
+ {OUString("NEXTIF"), "DatabaseNextSet", FIELD_NEXTIF },
+ {OUString("PAGE"), "PageNumber", FIELD_PAGE },
+ {OUString("PAGEREF"), "GetReference", FIELD_PAGEREF },
+ {OUString("REF"), "GetReference", FIELD_REF },
+ {OUString("REVNUM"), "DocInfo.Revision", FIELD_REVNUM },
+ {OUString("SAVEDATE"), "DocInfo.Change", FIELD_SAVEDATE },
+// {OUString("SECTION"), "", FIELD_SECTION },
+// {OUString("SECTIONPAGES"), "", FIELD_SECTIONPAGES },
+ {OUString("SEQ"), "SetExpression", FIELD_SEQ },
+// {OUString("SET"), FIELD_SET },
+// {OUString("SKIPIF"),"", FIELD_SKIPIF },
+// {OUString("STYLEREF"),"", FIELD_STYLEREF },
+ {OUString("SUBJECT"), "DocInfo.Subject", FIELD_SUBJECT },
+// {OUString("SYMBOL"),"", FIELD_SYMBOL },
+ {OUString("TEMPLATE"), "TemplateName", FIELD_TEMPLATE},
+ {OUString("TIME"), "DateTime", FIELD_TIME },
+ {OUString("TITLE"), "DocInfo.Title", FIELD_TITLE },
+ {OUString("USERINITIALS"), "Author", FIELD_USERINITIALS },
+// {OUString("USERADDRESS"), "", FIELD_USERADDRESS },
+ {OUString("USERNAME"), "Author", FIELD_USERNAME },
+
+
+ {OUString("TOC"), "com.sun.star.text.ContentIndex", FIELD_TOC},
+ {OUString("TC"), "com.sun.star.text.ContentIndexMark", FIELD_TC},
+ {OUString("NUMCHARS"), "CharacterCount", FIELD_NUMCHARS},
+ {OUString("NUMWORDS"), "WordCount", FIELD_NUMWORDS},
+ {OUString("NUMPAGES"), "PageCount", FIELD_NUMPAGES},
+ {OUString("INDEX"), "com.sun.star.text.DocumentIndex", FIELD_INDEX},
+ {OUString("XE"), "com.sun.star.text.DocumentIndexMark", FIELD_XE},
+ {OUString("BIBLIOGRAPHY"), "com.sun.star.text.Bibliography", FIELD_BIBLIOGRAPHY},
+ {OUString("CITATION"), "com.sun.star.text.TextField.Bibliography", FIELD_CITATION},
// {OUString(""), "", "", FIELD_},
@@ -2866,9 +2865,9 @@ const FieldConversionMap_t & lcl_GetEnhancedFieldConversion()
{
static const FieldConversion aEnhancedFields[] =
{
- {OUString("FORMCHECKBOX"), "FormFieldmark", "", FIELD_FORMCHECKBOX},
- {OUString("FORMDROPDOWN"), "FormFieldmark", "", FIELD_FORMDROPDOWN},
- {OUString("FORMTEXT"), "Fieldmark", "", FIELD_FORMTEXT},
+ {OUString("FORMCHECKBOX"), "FormFieldmark", FIELD_FORMCHECKBOX},
+ {OUString("FORMDROPDOWN"), "FormFieldmark", FIELD_FORMDROPDOWN},
+ {OUString("FORMTEXT"), "Fieldmark", FIELD_FORMTEXT},
};
size_t nConversions = SAL_N_ELEMENTS(aEnhancedFields);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 2d0d60a..be6bb26 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -591,7 +591,7 @@ public:
SettingsTablePtr GetSettingsTable()
{
if( !m_pSettingsTable )
- m_pSettingsTable.reset( new SettingsTable( m_rDMapper, m_xTextFactory ) );
+ m_pSettingsTable.reset( new SettingsTable( m_xTextFactory ) );
return m_pSettingsTable;
}
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index ff41693..32ead88 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -34,22 +34,12 @@ struct FontEntry
{
typedef std::shared_ptr<FontEntry> Pointer_t;
- OUString sFontName;
- OUString sFontName1;
- bool bTrueType;
+ OUString sFontName;
sal_Int16 nPitchRequest;
sal_Int32 nTextEncoding;
- sal_Int32 nFontFamilyId;
- sal_Int32 nBaseWeight;
- sal_Int32 nAltFontIndex;
- OUString sFontSignature;
FontEntry() :
- bTrueType(false),
nPitchRequest( 0 ),
- nTextEncoding( RTL_TEXTENCODING_DONTKNOW ),
- nFontFamilyId( 0 ),
- nBaseWeight( 0 ),
- nAltFontIndex( 0 )
+ nTextEncoding( RTL_TEXTENCODING_DONTKNOW )
{}
};
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index c5adee7..a9d3225 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -196,12 +196,9 @@ public:
GraphicImportType eGraphicImportType;
DomainMapper& rDomainMapper;
- sal_Int32 nHoriScaling;
- sal_Int32 nVertScaling;
sal_Int32 nLeftPosition;
sal_Int32 nTopPosition;
sal_Int32 nRightPosition;
- sal_Int32 nBottomPosition;
bool bUseSimplePos;
sal_Int32 zOrder;
@@ -217,7 +214,6 @@ public:
bool bContour;
bool bContourOutside;
WrapPolygon::Pointer_t mpWrapPolygon;
- bool bIgnoreWRK;
sal_Int32 nLeftMargin;
sal_Int32 nRightMargin;
@@ -241,11 +237,8 @@ public:
GraphicBorderLine aBorders[4];
sal_Int32 nCurrentBorderLine;
- sal_Int32 nDffType;
bool bIsGraphic;
bool bIsBitmap;
- bool bIsTiff;
- sal_Int32 nBitsPerPixel;
bool bHoriFlip;
bool bVertFlip;
@@ -275,12 +268,9 @@ public:
,bYSizeValid(false)
,eGraphicImportType( eImportType )
,rDomainMapper( rDMapper )
- ,nHoriScaling(0)
- ,nVertScaling(0)
,nLeftPosition(0)
,nTopPosition(0)
,nRightPosition(0)
- ,nBottomPosition(0)
,bUseSimplePos(false)
,zOrder(-1)
,nHoriOrient( text::HoriOrientation::NONE )
@@ -293,7 +283,6 @@ public:
,bOpaque( true )
,bContour(false)
,bContourOutside(true)
- ,bIgnoreWRK(true)
,nLeftMargin(319)
,nRightMargin(319)
,nTopMargin(0)
@@ -309,11 +298,8 @@ public:
,nFillColor( 0xffffffff )
,eColorMode( drawing::ColorMode_STANDARD )
,nCurrentBorderLine(BORDER_TOP)
- ,nDffType( 0 )
,bIsGraphic(false)
,bIsBitmap(false)
- ,bIsTiff(false)
- ,nBitsPerPixel(0)
,bHoriFlip(false)
,bVertFlip(false)
,bSizeProtected(false)
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 4023d2f..6aae48d 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -41,7 +41,6 @@ namespace dmapper
struct SettingsTable_Impl
{
- DomainMapper& m_rDMapper;
const uno::Reference< lang::XMultiServiceFactory > m_xTextFactory;
OUString m_sCharacterSpacing;
@@ -54,21 +53,6 @@ struct SettingsTable_Impl
bool m_bNoPunctuationKerning;
bool m_doNotIncludeSubdocsInStats; // Do Not Include Content in Text Boxes, Footnotes, and Endnotes in Document Statistics)
bool m_bRecordChanges;
- int m_nEdit;
- bool m_bFormatting;
- bool m_bEnforcement;
- int m_nCryptProviderType;
- int m_nCryptAlgorithmClass;
- int m_nCryptAlgorithmType;
- OUString m_sCryptAlgorithmSid;
- int m_nCryptSpinCount;
- OUString m_sCryptProvider;
- OUString m_sAlgIdExt;
- OUString m_sAlgIdExtSource;
- OUString m_sCryptProviderTypeExt;
- OUString m_sCryptProviderTypeExtSource;
- OUString m_sHash;
- OUString m_sSalt;
bool m_bLinkStyles;
sal_Int16 m_nZoomFactor;
Id m_nView;
@@ -87,21 +71,13 @@ struct SettingsTable_Impl
std::vector<beans::PropertyValue> m_aCompatSettings;
uno::Sequence<beans::PropertyValue> m_pCurrentCompatSetting;
- SettingsTable_Impl( DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > & xTextFactory ) :
- m_rDMapper( rDMapper )
- , m_xTextFactory( xTextFactory )
+ SettingsTable_Impl( const uno::Reference< lang::XMultiServiceFactory > & xTextFactory ) :
+ m_xTextFactory( xTextFactory )
, m_nDefaultTabStop( 720 ) //default is 1/2 in
, m_nHyphenationZone(0)
, m_bNoPunctuationKerning(false)
, m_doNotIncludeSubdocsInStats(false)
, m_bRecordChanges(false)
- , m_nEdit(NS_ooxml::LN_Value_doc_ST_DocProtect_none)
- , m_bFormatting(false)
- , m_bEnforcement(false)
- , m_nCryptProviderType(NS_ooxml::LN_Value_doc_ST_CryptProv_rsaAES)
- , m_nCryptAlgorithmClass(NS_ooxml::LN_Value_doc_ST_AlgClass_hash)
- , m_nCryptAlgorithmType(NS_ooxml::LN_Value_doc_ST_AlgType_typeAny)
- , m_nCryptSpinCount(0)
, m_bLinkStyles(false)
, m_nZoomFactor(0)
, m_nView(0)
@@ -121,10 +97,10 @@ struct SettingsTable_Impl
};
-SettingsTable::SettingsTable(DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > & xTextFactory)
+SettingsTable::SettingsTable(const uno::Reference< lang::XMultiServiceFactory > & xTextFactory)
: LoggedProperties("SettingsTable")
, LoggedTable("SettingsTable")
-, m_pImpl( new SettingsTable_Impl(rDMapper, xTextFactory) )
+, m_pImpl( new SettingsTable_Impl(xTextFactory) )
{
}
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index da22eac..5a0d688 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -45,7 +45,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable
std::unique_ptr<SettingsTable_Impl> m_pImpl;
public:
- SettingsTable(DomainMapper& rDMapper, const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory);
+ SettingsTable(const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory);
virtual ~SettingsTable();
//returns default TabStop in 1/100th mm
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index d4b0db1..e92ec26 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -50,8 +50,6 @@ private:
std::vector<css::table::BorderLine2> m_aBottomBorderLines;
std::vector<css::table::BorderLine2> m_aInsideHBorderLines;
std::vector<css::table::BorderLine2> m_aInsideVBorderLines;
- std::vector<css::table::BorderLine2> m_aTl2brBorderLines;
- std::vector<css::table::BorderLine2> m_aTr2blBorderLines;
//values of the current border
sal_Int32 m_nLineWidth;
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index 1532f7f..55a823a 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -37,7 +37,6 @@ class DomainMapper;
class TablePropertiesHandler
{
private:
- std::vector< PropertyMapPtr > m_rPropertiesStack;
PropertyMapPtr m_pCurrentProperties;
std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag;
TableManager* m_pTableManager;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index d43c88d..f808bc5 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -67,7 +67,6 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
mnToken(oox::XML_TOKEN_COUNT),
mpStream(nullptr),
mnTableDepth(0),
- mnInstanceNumber(mnInstanceCount),
inPositionV(false),
m_xContext(context),
m_bDiscardChildren(false),
@@ -90,7 +89,6 @@ OOXMLFastContextHandler::OOXMLFastContextHandler(OOXMLFastContextHandler * pCont
mnToken(oox::XML_TOKEN_COUNT),
mpStream(pContext->mpStream),
mnTableDepth(pContext->mnTableDepth),
- mnInstanceNumber(mnInstanceCount),
inPositionV(pContext->inPositionV),
m_xContext(pContext->m_xContext),
m_bDiscardChildren(pContext->m_bDiscardChildren),
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index cecd52a..2436bcc 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -227,8 +227,6 @@ protected:
css::uno::Reference< css::uno::XComponentContext > getComponentContext() { return m_xContext;}
- sal_uInt32 mnInstanceNumber;
-
bool inPositionV;
private:
More information about the Libreoffice-commits
mailing list