summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--filter/inc/filter/msfilter/mstoolbar.hxx1
-rw-r--r--filter/inc/filter/msfilter/svxmsbas.hxx8
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx4
-rw-r--r--filter/source/msfilter/mstoolbar.cxx2
-rw-r--r--filter/source/msfilter/svdfppt.cxx2
-rw-r--r--filter/source/pdf/impdialog.hxx2
-rw-r--r--filter/source/pdf/pdfexport.cxx2
-rw-r--r--filter/source/pdf/pdfexport.hxx1
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx1
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
-rw-r--r--sc/source/filter/excel/expop2.cxx4
-rw-r--r--sd/source/filter/eppt/eppt.cxx2
12 files changed, 8 insertions, 23 deletions
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx
index 4137605c2d54..a1ae5075fdf3 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/filter/inc/filter/msfilter/mstoolbar.hxx
@@ -177,7 +177,6 @@ class MSFILTER_DLLPUBLIC TBCBitMap : public TBBase
friend class TBCBSpecific; // #FIXME hacky access, need to fix
sal_Int32 cbDIB;
Bitmap mBitMap;
- int size;
public:
TBCBitMap();
~TBCBitMap();
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index 84bab35a3835..352d3eac4922 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -60,10 +60,8 @@ typedef std::map< String, ObjIdToName > ControlAttributeInfo;
class MSFILTER_DLLPUBLIC SvxImportMSVBasic
{
public:
- SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot,
- sal_Bool bImportCode = sal_True, sal_Bool bCopyStorage = sal_True )
- : xRoot(&rRoot), rDocSh(rDocS),
- bImport(bImportCode), bCopy(bCopyStorage)
+ SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot )
+ : xRoot(&rRoot), rDocSh(rDocS)
{}
// only for the export - copy or delete the saved VBA-macro-storage
// form the ObjectShell
@@ -79,8 +77,6 @@ public:
private:
SotStorageRef xRoot;
SfxObjectShell &rDocSh;
- sal_Bool bImport;
- sal_Bool bCopy;
};
#endif
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 3efdacc8dc86..bf337c329965 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -93,13 +93,13 @@ private:
PictWriterAttrStackMember * pAttrStack;
// current attributes in the target-metafile and whether they are valid
- sal_Bool bDstBkPatVisible; sal_Bool bDstBkPatValid;
+ sal_Bool bDstBkPatValid;
sal_uInt8 nDstTxFace; sal_Bool bDstTxFaceValid;
RasterOp eDstTxMode; sal_Bool bDstTxModeValid;
sal_uInt16 nDstPnSize; sal_Bool bDstPnSizeValid;
RasterOp eDstPnMode; sal_Bool bDstPnModeValid;
PictPattern aDstPnPat; sal_Bool bDstPnPatValid;
- sal_Bool bDstFillPatVisible; sal_Bool bDstFillPatValid;
+ sal_Bool bDstFillPatValid;
sal_uInt16 nDstTxSize; sal_Bool bDstTxSizeValid;
Color aDstFgCol; sal_Bool bDstFgColValid;
Color aDstBkCol; sal_Bool bDstBkColValid;
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index cbd7d5a2a226..ae48fd679322 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -713,7 +713,7 @@ void TBCCDData::Print( FILE* fp)
indent_printf(fp," wstrEdit %s", rtl::OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
}
-TBCBitMap::TBCBitMap() : cbDIB( 0 ), size( 0 )
+TBCBitMap::TBCBitMap() : cbDIB( 0 )
{
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 2331468cc602..ff3d690f72f8 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2006,7 +2006,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
}
if ( i && bCopied )
{
- SvxImportMSVBasic aMSVBas( *pShell, *xDest, sal_True, sal_False );
+ SvxImportMSVBasic aMSVBas( *pShell, *xDest );
uno::Reference < embed::XStorage > xDoc( pShell->GetStorage() );
if ( xDoc.is() )
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 0a42cc917ed8..2d8f7ecad21a 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -419,8 +419,6 @@ class ImpPDFTabLinksPage : public SfxTabPage
RadioButton maRbOpnLnksBrowser;
sal_Bool mbOpnLnksBrowserUserState;
- long nWidth;
-
DECL_LINK( ClickRbOpnLnksDefaultHdl, void* );
DECL_LINK( ClickRbOpnLnksBrowserHdl, void* );
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index e85afdedb4b2..58e026ff5979 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -148,8 +148,6 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
mbCanCopyOrExtract ( sal_True ),
mbCanExtractForAccessibility( sal_True ),
- mnCachePatternId ( -1 ),
-
//--->i56629
mbExportRelativeFsysLinks ( sal_False ),
mnDefaultLinkAction ( 0 ),
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index 4c884ee5d568..b52de4ca544b 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -102,7 +102,6 @@ private:
sal_Bool mbCanExtractForAccessibility;
SvtGraphicFill maCacheFill;
- sal_Int32 mnCachePatternId;
//--->i56629
sal_Bool mbExportRelativeFsysLinks;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index a42a21805ee2..c0e6b47495e0 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -146,7 +146,6 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
XMLFilterTestDialog::XMLFilterTestDialog( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF ) :
ModalDialog( pParent, ResId( DLG_XML_FILTER_TEST_DIALOG, rResMgr ) ),
mxMSF( rxMSF ),
- mrResMgr( rResMgr ),
maFLExport( this, ResId( FL_EXPORT, rResMgr ) ),
maFTExportXSLT( this, ResId( FT_EXPORT_XSLT, rResMgr ) ),
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index a374ea1fbc9e..ef60d6d21563 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -69,8 +69,6 @@ private:
com::sun::star::uno::Reference< com::sun::star::document::XEventListener > mxGlobalEventListener;
com::sun::star::uno::WeakReference< com::sun::star::lang::XComponent > mxLastFocusModel;
- ResMgr& mrResMgr;
-
rtl::OUString maImportRecentFile;
rtl::OUString maExportRecentFile;
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index 2cea93688092..f3808786a6a9 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -77,18 +77,16 @@ FltError ExportBiff5::Write()
SotStorageRef xRootStrg = GetRootStorage();
OSL_ENSURE( xRootStrg.Is(), "ExportBiff5::Write - no root storage" );
- bool bWriteBasicCode = false;
bool bWriteBasicStrg = false;
if( GetBiff() == EXC_BIFF8 )
{
const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get();
- bWriteBasicCode = rFilterOpt.IsLoadExcelBasicCode();
bWriteBasicStrg = rFilterOpt.IsLoadExcelBasicStorage();
}
if( pDocShell && xRootStrg.Is() && bWriteBasicStrg )
{
- SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg, bWriteBasicCode, bWriteBasicStrg );
+ SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg );
sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT );
if( nErr != ERRCODE_NONE )
pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 65d3ff30a47e..de9a179896b9 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1499,7 +1499,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( const std::v
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
{
SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) );
- SvxImportMSVBasic aMSVBas( rDocShell, *xDest, sal_False, sal_False );
+ SvxImportMSVBasic aMSVBas( rDocShell, *xDest );
aMSVBas.SaveOrDelMSVBAStorage( sal_True, rtl::OUString( "_MS_VBA_Overhead" ) );
SvStorageRef xOverhead = xDest->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") );
generated by cgit (git 2.34.1) at 2025-02-23 00:22:53 +0000