[Libreoffice-commits] core.git: accessibility/inc basctl/source basic/inc chart2/source comphelper/source connectivity/source cui/source dbaccess/source desktop/source extensions/source filter/source framework/inc framework/source helpcompiler/source i18npool/inc idl/inc include/basic include/helpcompiler include/oox include/svx include/toolkit include/vcl include/xmloff lotuswordpro/source oox/source reportdesign/source sal/qa sax/source sc/inc scripting/source sc/source sdext/source sd/source sfx2/inc sfx2/source starmath/inc svtools/source svx/source sw/inc sw/source ucb/source vbahelper/source vcl/generic vcl/inc vcl/unx writerfilter/source xmlhelp/source xmloff/inc xmloff/source
Stephan Bergmann
sbergman at redhat.com
Wed Oct 15 07:04:17 PDT 2014
accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx | 2 -
basctl/source/inc/managelang.hxx | 1
basic/inc/sbobjmod.hxx | 1
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 1
chart2/source/view/charttypes/GL3DBarChart.cxx | 1
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 1
comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 1
connectivity/source/drivers/mork/MQueryHelper.hxx | 1
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx | 2 -
connectivity/source/inc/mysql/YDriver.hxx | 1
cui/source/dialogs/SpellDialog.cxx | 1
cui/source/dialogs/colorpicker.cxx | 2 -
cui/source/inc/about.hxx | 1
cui/source/inc/autocdlg.hxx | 5 ----
cui/source/inc/cuitabarea.hxx | 1
cui/source/inc/optlingu.hxx | 1
cui/source/inc/page.hxx | 1
cui/source/tabpages/tpcolor.cxx | 1
dbaccess/source/core/api/RowSet.hxx | 1
dbaccess/source/filter/xml/xmlStyleImport.cxx | 1
dbaccess/source/filter/xml/xmlStyleImport.hxx | 2 -
dbaccess/source/ui/dlg/detailpages.hxx | 5 ----
dbaccess/source/ui/dlg/tablespage.hxx | 2 -
dbaccess/source/ui/inc/CollectionView.hxx | 2 -
dbaccess/source/ui/inc/brwctrlr.hxx | 2 -
dbaccess/source/ui/inc/opendoccontrols.hxx | 1
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 1
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 1
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 -
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 1
desktop/source/deployment/gui/license_dialog.hxx | 1
extensions/source/plugin/base/context.cxx | 8 +-----
filter/source/graphicfilter/eos2met/eos2met.cxx | 1
filter/source/xsltdialog/typedetectionimport.cxx | 4 ---
filter/source/xsltdialog/typedetectionimport.hxx | 4 ---
filter/source/xsltdialog/xmlfilterjar.cxx | 1
filter/source/xsltdialog/xmlfilterjar.hxx | 1
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 4 ---
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 4 ---
framework/inc/classes/fwktabwindow.hxx | 1
framework/inc/dispatch/startmoduledispatcher.hxx | 9 -------
framework/inc/xml/menudocumenthandler.hxx | 1
framework/source/accelerators/globalacceleratorconfiguration.cxx | 2 -
framework/source/dispatch/dispatchprovider.cxx | 2 -
framework/source/dispatch/startmoduledispatcher.cxx | 4 ---
framework/source/fwe/classes/addonsoptions.cxx | 7 -----
framework/source/services/tabwindowservice.cxx | 3 --
framework/source/uiconfiguration/globalsettings.cxx | 2 -
framework/source/uielement/uicommanddescription.cxx | 3 --
helpcompiler/source/HelpSearch.cxx | 3 --
i18npool/inc/indexentrysupplier.hxx | 1
idl/inc/database.hxx | 1
include/basic/modsizeexceeded.hxx | 1
include/helpcompiler/HelpSearch.hxx | 4 ---
include/oox/ppt/soundactioncontext.hxx | 2 -
include/svx/bmpmask.hxx | 1
include/svx/numvset.hxx | 1
include/svx/tbcontrl.hxx | 1
include/toolkit/controls/unocontrols.hxx | 1
include/vcl/edit.hxx | 1
include/xmloff/XMLTextMasterPageContext.hxx | 1
include/xmloff/xmlnume.hxx | 2 -
include/xmloff/xmlnumfi.hxx | 1
include/xmloff/xmlnumi.hxx | 1
lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 1
lotuswordpro/source/filter/lwptablelayout.hxx | 1
lotuswordpro/source/filter/xfilter/xfcell.hxx | 1
lotuswordpro/source/filter/xfilter/xfindex.hxx | 3 --
oox/source/ppt/timenodelistcontext.cxx | 2 -
reportdesign/source/filter/xml/xmlfilter.hxx | 1
sal/qa/osl/file/osl_File.cxx | 7 -----
sal/qa/rtl/uri/rtl_Uri.cxx | 1
sax/source/expatwrap/saxwriter.cxx | 4 ---
sc/inc/AccessibleFilterMenuItem.hxx | 1
sc/source/filter/excel/xiformula.cxx | 4 ---
sc/source/filter/excel/xilink.cxx | 2 -
sc/source/filter/inc/drawingmanager.hxx | 3 --
sc/source/filter/oox/worksheethelper.cxx | 2 -
sc/source/filter/xml/XMLEmptyContext.hxx | 2 -
sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx | 1
sc/source/ui/dbgui/dpgroupdlg.cxx | 1
sc/source/ui/dbgui/pfiltdlg.cxx | 1
sc/source/ui/inc/acredlin.hxx | 1
sc/source/ui/inc/dpgroupdlg.hxx | 1
sc/source/ui/inc/fuconpol.hxx | 2 -
sc/source/ui/inc/highred.hxx | 1
sc/source/ui/inc/pfiltdlg.hxx | 1
sc/source/ui/inc/scuiautofmt.hxx | 1
sc/source/ui/inc/simpref.hxx | 6 -----
sc/source/ui/inc/tabbgcolordlg.hxx | 1
sc/source/ui/miscdlgs/scuiautofmt.cxx | 1
sc/source/ui/miscdlgs/simpref.cxx | 4 ---
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 1
sc/source/ui/vba/vbaworkbooks.cxx | 5 +---
sc/source/ui/view/tabvwshc.cxx | 2 -
scripting/source/basprov/basprov.hxx | 1
sd/source/filter/html/htmlex.cxx | 2 -
sd/source/filter/html/htmlex.hxx | 2 -
sd/source/filter/html/sdhtmlfilter.cxx | 6 -----
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 1
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 1
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 1
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 1
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx | 1
sd/source/ui/table/TableDesignPane.cxx | 1
sd/source/ui/table/TableDesignPane.hxx | 1
sd/source/ui/view/DocumentRenderer.cxx | 1
sdext/source/presenter/PresenterFrameworkObserver.hxx | 1
sfx2/inc/srchdlg.hxx | 1
sfx2/source/appl/newhelp.hxx | 1
sfx2/source/sidebar/Deck.cxx | 2 -
sfx2/source/sidebar/Deck.hxx | 3 --
starmath/inc/dialog.hxx | 1
svtools/source/config/helpopt.cxx | 1
svx/source/inc/docrecovery.hxx | 1
svx/source/sidebar/area/AreaPropertyPanel.hxx | 1
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 12 ----------
sw/inc/expfld.hxx | 1
sw/source/core/inc/UndoTable.hxx | 1
sw/source/core/undo/untbl.cxx | 1
sw/source/filter/xml/xmlfmte.cxx | 4 ---
sw/source/filter/xml/xmltbli.cxx | 6 +----
sw/source/filter/xml/xmltbli.hxx | 5 ----
sw/source/ui/dbui/addresslistdialog.hxx | 1
sw/source/ui/dbui/mmoutputpage.hxx | 2 -
sw/source/ui/dbui/mmoutputtypepage.cxx | 2 -
sw/source/ui/index/cnttab.cxx | 8 ++----
sw/source/uibase/inc/frmpage.hxx | 1
ucb/source/ucp/ftp/ftpcontent.cxx | 3 --
ucb/source/ucp/ftp/ftpintreq.cxx | 3 --
ucb/source/ucp/ftp/ftpintreq.hxx | 4 ---
ucb/source/ucp/ftp/ftpurl.cxx | 3 --
ucb/source/ucp/ftp/ftpurl.hxx | 2 -
vbahelper/source/msforms/vbacombobox.hxx | 1
vbahelper/source/msforms/vbalistbox.hxx | 2 -
vbahelper/source/msforms/vbatogglebutton.hxx | 1
vcl/generic/print/prtsetup.cxx | 5 +---
vcl/generic/print/prtsetup.hxx | 6 -----
vcl/inc/helpwin.hxx | 1
vcl/unx/generic/dtrans/X11_transferable.hxx | 2 -
writerfilter/source/ooxml/Handler.hxx | 1
writerfilter/source/ooxml/OOXMLParserState.hxx | 1
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 3 --
xmloff/inc/XMLTextColumnsContext.hxx | 1
xmloff/inc/txtflde.hxx | 6 -----
xmloff/inc/txtfldi.hxx | 6 -----
xmloff/inc/txtvfldi.hxx | 10 --------
xmloff/source/chart/SchXMLChartContext.hxx | 1
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 2 -
xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx | 2 -
xmloff/source/chart/SchXMLSeries2Context.cxx | 2 -
xmloff/source/draw/sdpropls.cxx | 6 -----
xmloff/source/draw/sdpropls.hxx | 8 ------
xmloff/source/style/xmlnumi.cxx | 1
xmloff/source/text/XMLAutoTextEventExport.cxx | 3 --
xmloff/source/text/XMLAutoTextEventExport.hxx | 4 ---
xmloff/source/text/XMLChangedRegionImportContext.hxx | 2 -
xmloff/source/text/XMLIndexTOCContext.cxx | 1
xmloff/source/text/XMLIndexTOCContext.hxx | 1
xmloff/source/text/XMLIndexTOCSourceContext.hxx | 1
xmloff/source/text/XMLRedlineExport.cxx | 3 --
xmloff/source/text/XMLRedlineExport.hxx | 3 --
xmloff/source/text/XMLSectionExport.cxx | 2 -
xmloff/source/text/XMLSectionExport.hxx | 2 -
xmloff/source/text/XMLTextColumnsContext.cxx | 1
xmloff/source/text/XMLTextFrameContext.cxx | 2 -
xmloff/source/text/XMLTextMasterPageContext.cxx | 1
xmloff/source/text/txtflde.cxx | 6 -----
xmloff/source/text/txtfldi.cxx | 1
xmloff/source/text/txtparai.cxx | 3 --
xmloff/source/text/txtvfldi.cxx | 5 ----
171 files changed, 35 insertions(+), 359 deletions(-)
New commits:
commit ad9498f8b888f7851a8612b8d654a2bc89005925
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 15 15:58:56 2014 +0200
More -Werror,-Wunused-private-field
...detected with a modified trunk Clang with
> Index: lib/Sema/SemaDeclCXX.cpp
> ===================================================================
> --- lib/Sema/SemaDeclCXX.cpp (revision 219190)
> +++ lib/Sema/SemaDeclCXX.cpp (working copy)
> @@ -1917,9 +1917,10 @@
> const Type *T = FD.getType()->getBaseElementTypeUnsafe();
> // FIXME: Destruction of ObjC lifetime types has side-effects.
> if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl())
> - return !RD->isCompleteDefinition() ||
> - !RD->hasTrivialDefaultConstructor() ||
> - !RD->hasTrivialDestructor();
> + return !RD->hasAttr<WarnUnusedAttr>() &&
> + (!RD->isCompleteDefinition() ||
> + !RD->hasTrivialDefaultConstructor() ||
> + !RD->hasTrivialDestructor());
> return false;
> }
>
> @@ -3517,9 +3518,11 @@
> bool addFieldInitializer(CXXCtorInitializer *Init) {
> AllToInit.push_back(Init);
>
> +#if 0
> // Check whether this initializer makes the field "used".
> if (Init->getInit()->HasSideEffects(S.Context))
> S.UnusedPrivateFields.remove(Init->getAnyMember());
> +#endif
>
> return false;
> }
to warn about members of SAL_WARN_UNUSED-annotated class types, and warn about
initializations with side effects (cf.
<http://lists.cs.uiuc.edu/pipermail/cfe-dev/2014-October/039602.html>
"-Wunused-private-field distracted by side effects").
Change-Id: I3f3181c4eb8180ca28e1fa3dffc9dbe1002c6628
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
index 46d5a6d..0debdbb 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
@@ -85,8 +85,6 @@ namespace accessibility
virtual Rectangle implGetBoundingBox() SAL_OVERRIDE;
virtual Rectangle implGetBoundingBoxOnScreen() SAL_OVERRIDE;
- private:
- OUString m_sHeaderName;
};
}
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 1cc2db1..8b07b27 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -60,7 +60,6 @@ private:
boost::shared_ptr<LocalizationMgr> m_xLocalizationMgr;
OUString m_sDefLangStr;
- OUString m_sDeleteStr;
OUString m_sCreateLangStr;
void Init();
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 66ddc42..37f1b10 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -57,7 +57,6 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule
::rtl::Reference< FormObjEventListenerImpl > m_DialogListener;
css::uno::Reference<css::awt::XDialog> m_xDialog;
css::uno::Reference<css::frame::XModel> m_xModel;
- OUString sFormName;
bool mbInit;
//protected:
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index e6bebca..eb36310 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -127,7 +127,6 @@ private: //member
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
tAxisType m_eType;
- ::com::sun::star::uno::Any m_aTemporaryHelpStepValue;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisTitle;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xMajorGrid;
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index cd27384..7924e48 100755
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -233,7 +233,6 @@ private:
size_t mnStepsTotal;
TimeValue maClickFlyBackStartTime;
TimeValue maClickFlyBackEndTime;
- OUString maFPS;
glm::vec3 maTargetPosition;
glm::vec3 maTargetDirection;
};
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index d7c8fbd..cb79e94 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -93,7 +93,6 @@ static bool makeCanonicalFileURL( OUString & rURL )
OfficeInstallationDirectories::OfficeInstallationDirectories(
const uno::Reference< uno::XComponentContext > & xCtx )
: m_aOfficeBrandDirMacro( "$(brandbaseurl)" ),
- m_aOfficeBaseDirMacro( "$(baseinsturl)" ),
m_aUserDirMacro( "$(userdataurl)" ),
m_xCtx( xCtx ),
m_pOfficeBrandDir( 0 ),
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 4d0f4fe..fc9576d 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -87,7 +87,6 @@ private:
void initDirs();
OUString m_aOfficeBrandDirMacro;
- OUString m_aOfficeBaseDirMacro;
OUString m_aUserDirMacro;
com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext > m_xCtx;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 204fdb6..d2549c7 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -157,7 +157,6 @@ namespace connectivity
private:
typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap;
- mutable ::osl::Mutex m_aMutex;
FieldMap m_Fields;
public:
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
index 47e5f50..7addf98 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
@@ -50,8 +50,6 @@ namespace pq_sdbc_driver
{
::rtl::Reference< RefCountedMutex > m_refMutex;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_origin;
- OUString m_tableName;
- OUString m_schemaName;
ColumnMetaDataVector m_columnData;
sal_Int32 m_colCount;
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index dc69e9e..5499716 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -66,7 +66,6 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xODBCDriver;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
- OUString m_sOldDriverClass;
/** load the driver we want to delegate.
The <member>m_xODBCDriver</member> or <member>m_xDBCDriver</member> may be <NULL/> if the driver could not be loaded.
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a8a87d2..0254f1d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -99,7 +99,6 @@ class SpellUndoAction_Impl : public SfxUndoAction
long m_nOldErrorStart;
long m_nOldErrorEnd;
bool m_bIsErrorLanguageSelected;
- OUString m_sRuleId;
//undo of AddToDictionary
Reference<XDictionary> m_xDictionary;
OUString m_sAddedWord;
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 3b31d40..f52e724 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -970,7 +970,6 @@ public:
void setColorComponent( sal_uInt16 nComp, double dValue );
private:
- Color maPreviousColor;
sal_Int16 mnDialogMode;
ColorMode meMode;
@@ -1012,7 +1011,6 @@ private:
ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode )
: ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" )
-, maPreviousColor( nColor )
, mnDialogMode( nMode )
, meMode( DefaultMode )
, maSliderImage( FixedImage::loadThemeImage("res/colorslider.png") )
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 72c45c2..60f2657 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -42,7 +42,6 @@ private:
PushButton* m_pCreditsButton;
PushButton* m_pWebsiteButton;
- OUString aVersionData;
OUString m_aVersionTextStr;
OUString m_aVendorTextStr;
OUString m_aCopyrightTextStr;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 2ca4b4c..5fcf733 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -103,8 +103,6 @@ private:
OUString m_sURL;
OUString m_sNoDblSpaces;
OUString m_sDash;
- OUString m_sNonBrkSpace;
- OUString m_sFirst;
OUString m_sAccidentalCaps;
public:
@@ -134,14 +132,11 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
OUString sCptlSttSent;
OUString sUserStyle;
OUString sBullet;
- OUString sByInputBullet;
OUString sBoldUnder;
OUString sNoDblSpaces;
OUString sCorrectCapsLock;
OUString sDetectURL;
OUString sDash;
- OUString sNonBrkSpace;
- OUString sOrdinal;
OUString sRightMargin;
OUString sNum;
OUString sBorder;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 5bfbe3c..20d4ed2 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -640,7 +640,6 @@ class SvxColorTabPage : public SfxTabPage
private:
XPropertyListType meType;
- XOutdevItemPool* mpXPool;
Window *mpTopDlg;
CheckBox *m_pBoxEmbed;
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 0a91464..2856fec 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -107,7 +107,6 @@ private:
OUString sCapitalWords;
OUString sWordsWithDigits;
- OUString sCapitalization;
OUString sSpellSpecial;
OUString sSpellAuto;
OUString sGrammarAuto;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index d95220e..2009188 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -131,7 +131,6 @@ private:
long nLastTopMargin;
long nLastBottomMargin;
- Size aMaxSize;
bool bLandscape;
bool bBorderModified;
SvxModeType eMode;
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 58e8a1c..0040b68 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -303,7 +303,6 @@ struct SvxColorTabPageShadow
SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs)
, meType( XCOLOR_LIST )
- , mpXPool( (XOutdevItemPool*) rInAttrs.GetPool() )
, mpTopDlg( GetParentDialog() )
, pShadow ( new SvxColorTabPageShadow() )
, rOutAttrs ( rInAttrs )
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 67d9423..35baaf9 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -109,7 +109,6 @@ namespace dbaccess
OUString m_aGroupBy;
OUString m_aOrder;
OUString m_aActiveCommand;
- OUString m_aCursorName;
OUString m_aUpdateCatalogName; // is set by a query
OUString m_aUpdateSchemaName; // is set by a query
OUString m_aUpdateTableName; // is set by a query
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 1dab32f..1671f2f 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -54,7 +54,6 @@ OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
const Reference< XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle )
:XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle )
- ,sNumberFormat(OUString("NumberFormat"))
,pStyles(&rStyles)
,m_nNumberFormat(-1)
{
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index 1f9440c..f25f0dc 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -40,9 +40,7 @@ namespace dbaxml
{
OUString m_sDataStyleName;
OUString sPageStyle;
- const OUString sNumberFormat;
SvXMLStylesContext* pStyles;
- com::sun::star::uno::Any aConditionalFormat;
sal_Int32 m_nNumberFormat;
ODBFilter& GetOwnImport();
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 229b466..d702469 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -253,11 +253,6 @@ namespace dbaui
OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
OTextConnectionHelper* m_pTextConnectionHelper;
- private:
-
- OUString m_aFieldSeparatorList;
- OUString m_aTextSeparatorList;
- OUString m_aTextNone;
protected:
virtual ~OTextDetailsPage();
virtual bool prepareLeave() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index fe217b0..37db79c 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -42,8 +42,6 @@ namespace dbaui
OUString m_sCatalogSeparator;
bool m_bCatalogAtStart : 1;
- ::osl::Mutex m_aNotifierMutex;
-
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
m_xCurrentConnection; /// valid as long as the page is active
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator >
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 80dc9bb..704ea76 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -42,8 +42,6 @@ namespace dbaui
PushButton* m_pPB_OK;
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
- Size m_aDlgSize;
- Size m_a6Size;
bool m_bCreateForm;
DECL_LINK(Up_Click,void*);
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index f28f541..87c0fd3 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -96,8 +96,6 @@ namespace dbaui
TransferableClipboardListener*
m_pClipbordNotifier; // notifier for changes in the clipboard
- ::osl::Mutex m_aAsyncLoadSafety; // for multi-thread access to our members
-
OAsyncronousLink m_aAsyncGetCellFocus;
OAsyncronousLink m_aAsyncDisplayError;
::dbtools::SQLExceptionInfo m_aCurrentError;
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 24d475c..b51b6c6 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -53,7 +53,6 @@ namespace dbaui
typedef ::std::pair< OUString, OUString > StringPair;
typedef ::std::map< sal_uInt16, StringPair > MapIndexToStringPair;
- OUString m_sModule;
MapIndexToStringPair m_aURLs;
public:
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 8ed555e..45f0c7b 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -29,7 +29,6 @@ class ODBTypeWizDialogSetup
:public ODatabaseAdministrationDialog
,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialogSetup >
{
- OUString m_sExistingDocToOpen;
bool m_bOpenDatabase;
bool m_bStartTableWizard;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index dd93edb..0e20ee1 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -114,7 +114,6 @@ enum MENU_COMMAND
class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
{
- Size m_aOutputSize;
bool m_bInterfaceLocked;
PushButton *m_pOptionsBtn;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 36e40e1..b639b73 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -249,8 +249,6 @@ class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun::
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParent;
- OUString m_sInitialTitle;
-
public:
UpdateRequiredDialogService( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const & args,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xComponentContext );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 79be76e..a4bdef2 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -129,7 +129,6 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
long m_nStdHeight;
long m_nActiveHeight;
long m_nExtraHeight;
- Size m_aOutputSize;
Image m_aSharedImage;
Image m_aLockedImage;
Image m_aWarningImage;
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index bb67afea1..b63bd27 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -35,7 +35,6 @@ class LicenseDialog
css::uno::Reference<css::awt::XWindow> /* const */ m_parent;
OUString m_sExtensionName;
OUString /* const */ m_sLicenseText;
- OUString m_initialTitle;
sal_Int16 solar_execute();
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 7ab64f7..eaf5eab 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -63,14 +63,12 @@ private:
Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
FILE* fp;
Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin;
- OUString m_aMIMEType;
OUString m_aTarget;
OUString m_aFileName;
public:
FileSink( const Reference< ::com::sun::star::uno::XComponentContext > &,
const Reference< ::com::sun::star::plugin::XPlugin > & plugin,
- const OUString& mimetype,
const OUString& target,
const Reference< ::com::sun::star::io::XActiveDataSource > & source );
virtual ~FileSink();
@@ -259,21 +257,19 @@ void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugi
listener->disposing( ::com::sun::star::lang::EventObject() );
}
-void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source )
+void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString&, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source )
throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception )
{
- FileSink* pNewSink = new FileSink( m_xContext, plugin, mimetype, target, source );
+ FileSink* pNewSink = new FileSink( m_xContext, plugin, target, source );
pNewSink->acquire();
}
FileSink::FileSink( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext, const Reference< ::com::sun::star::plugin::XPlugin > & plugin,
- const OUString& mimetype,
const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) :
m_xContext( rxContext ),
m_xPlugin( plugin ),
- m_aMIMEType( mimetype ),
m_aTarget( target )
{
osl::FileBase::createTempFile( 0, 0, &m_aFileName );
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 33f5f51..b01a978 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -141,7 +141,6 @@ private:
METGDIStackMember* pGDIStack;
Color aMETColor;
Color aMETBackgroundColor;
- Color aMETPatternSymbol;
RasterOp eMETMix ;
long nMETStrokeLineWidth;
Size aMETChrCellSize;
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 89c0761..781641e 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -46,9 +46,7 @@ TypeDetectionImporter::TypeDetectionImporter()
sFilters( "Filters" ),
sTypes( "Types" ),
sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" ),
- sXSLTFilterService( "com.sun.star.documentconversion.XSLTFilter" ),
- sCdataAttribute( "CDATA" ),
- sWhiteSpace( " " )
+ sXSLTFilterService( "com.sun.star.documentconversion.XSLTFilter" )
{
}
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index 685a0a5..a755dbc 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -109,10 +109,6 @@ private:
const OUString sTypes;
const OUString sFilterAdaptorService;
const OUString sXSLTFilterService;
-
- const OUString sCdataAttribute;
- const OUString sWhiteSpace;
-
};
#endif
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 1b56bbd..a5956ce 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -66,7 +66,6 @@ XMLFilterJarHelper::XMLFilterJarHelper( const Reference< XComponentContext >& rx
sVndSunStarPackage( "vnd.sun.star.Package:" ),
sXSLTPath( "$(user)/xslt/" ),
sTemplatePath( "$(user)/template/" ),
- sPump( "com.sun.star.io.Pump" ),
sProgPath( "$(prog)/" )
{
SvtPathOptions aOptions;
diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx
index 689e747..49731b8 100644
--- a/filter/source/xsltdialog/xmlfilterjar.hxx
+++ b/filter/source/xsltdialog/xmlfilterjar.hxx
@@ -48,7 +48,6 @@ private:
OUString sVndSunStarPackage;
OUString sXSLTPath;
OUString sTemplatePath;
- OUString sPump;
OUString sProgPath;
};
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 1edc50f..d808621 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -37,10 +37,6 @@ using namespace ::com::sun::star::lang;
XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( vcl::Window* pParent) :
TabPage( pParent, "XmlFilterTabPageTransformation", "filter/ui/xmlfiltertabpagetransformation.ui" ),
- sHTTPSchema( "http://" ),
- sSHTTPSchema( "https://" ),
- sFILESchema( "file://" ),
- sFTPSchema( "ftp://" ),
sInstPath( "$(prog)/" )
{
get(m_pEDDocType,"doc");
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 5f09a33..01f36d5 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -59,10 +59,6 @@ private:
void SetURL( SvtURLBox *rURLBox, const OUString& rURL );
OUString GetURL( SvtURLBox* rURLBox );
- OUString sHTTPSchema;
- OUString sSHTTPSchema;
- OUString sFILESchema;
- OUString sFTPSchema;
OUString sInstPath;
};
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index d727db4..ebbac7f 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -53,7 +53,6 @@ class FwkTabPage : public TabPage
{
private:
OUString m_sPageURL;
- OUString m_sEventHdl;
css::uno::Reference< css::awt::XWindow > m_xPage;
css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl;
css::uno::Reference< css::awt::XContainerWindowProvider > m_xWinProvider;
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index beee640..979f794 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -62,9 +62,6 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2<
/** @short our "context" frame. */
css::uno::WeakReference< css::frame::XFrame > m_xOwner;
- /** @short the original queryDispatch() target. */
- OUString m_sDispatchTarget;
-
/** @short list of registered status listener */
osl::Mutex m_mutex;
ListenerHash m_lStatusListener;
@@ -83,13 +80,9 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2<
@param xFrame
the frame where the corresponding dispatch was started.
-
- @param sTarget
- the original target information used for the related queryDispatch() call.
*/
StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const OUString& sTarget);
+ const css::uno::Reference< css::frame::XFrame >& xFrame);
/** @short does nothing real. */
virtual ~StartModuleDispatcher();
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index c5af17c..2462bb2 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -93,7 +93,6 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
OUString m_aHelpURL;
OUString m_aCommandURL;
OUString m_aStyle;
- ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aItemProp;
};
class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 031d98c..cdf6057 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -84,8 +84,6 @@ public:
private:
- OUString m_sLocale;
-
/** helper to listen for configuration changes without ownership cycle problems */
css::uno::Reference< css::util::XChangesListener > m_xCfgListener;
};
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index e46d6fb..c1b8da3 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -594,7 +594,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
case E_STARTMODULEDISPATCHER :
{
- StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( m_xContext, xOwner, sTarget );
+ StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( m_xContext, xOwner );
xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
}
break;
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index ae87642..e0e1718 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -49,11 +49,9 @@ namespace framework{
namespace fpf = ::framework::pattern::frame;
StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const OUString& sTarget)
+ const css::uno::Reference< css::frame::XFrame >& xFrame)
: m_xContext (rxContext )
, m_xOwner (xFrame )
- , m_sDispatchTarget (sTarget )
, m_lStatusListener (m_mutex)
{
}
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 550112c..975a256 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -76,7 +76,6 @@ using namespace ::com::sun::star;
#define PROPERTYNAME_IMAGEBIGHC_URL OUString("ImageBigHCURL" )
#define IMAGES_NODENAME OUString("UserDefinedImages" )
-#define PRIVATE_IMAGE_URL OUString("private:image/" )
#define PROPERTYNAME_MERGEMENU_MERGEPOINT OUString("MergePoint" )
#define PROPERTYNAME_MERGEMENU_MERGECOMMAND OUString("MergeCommand" )
@@ -335,9 +334,7 @@ class AddonsOptions_Impl : public ConfigItem
OUString m_aPropMergeStatusbarNames[PROPERTYCOUNT_MERGE_STATUSBAR];
OUString m_aEmpty;
OUString m_aPathDelimiter;
- OUString m_aSeparator;
OUString m_aRootAddonPopupMenuURLPrexfix;
- OUString m_aPrivateImageURL;
Sequence< Sequence< PropertyValue > > m_aCachedMenuProperties;
Sequence< Sequence< PropertyValue > > m_aCachedMenuBarPartProperties;
AddonToolBars m_aCachedToolBarPartProperties;
@@ -366,9 +363,7 @@ AddonsOptions_Impl::AddonsOptions_Impl()
: ConfigItem( ROOTNODE_ADDONMENU ),
m_nRootAddonPopupMenuId( 0 ),
m_aPathDelimiter( PATHDELIMITER ),
- m_aSeparator( SEPARATOR_URL ),
- m_aRootAddonPopupMenuURLPrexfix( ADDONSPOPUPMENU_URL_PREFIX ),
- m_aPrivateImageURL( PRIVATE_IMAGE_URL )
+ m_aRootAddonPopupMenuURLPrexfix( ADDONSPOPUPMENU_URL_PREFIX )
{
// initialize array with fixed property names
m_aPropNames[ INDEX_URL ] = PROPERTYNAME_URL;
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 5f761a4..0fed811 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -172,9 +172,6 @@ private:
/// index of the current active page
::sal_Int32 m_nCurrentPageIndex;
-
- /// title of the tabcontrolled window
- OUString m_sTitle;
};
DEFINE_XINTERFACE_6 ( TabWindowService ,
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 56fab67..6ce4811 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -77,7 +77,6 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper2<
osl::Mutex m_mutex;
bool m_bDisposed : 1,
m_bConfigRead : 1;
- OUString m_aConfigSettingsAccess;
OUString m_aNodeRefStates;
OUString m_aPropStatesEnabled;
OUString m_aPropLocked;
@@ -89,7 +88,6 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper2<
GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :
m_bDisposed( false ),
m_bConfigRead( false ),
- m_aConfigSettingsAccess( GLOBALSETTINGS_ROOT_ACCESS ),
m_aNodeRefStates( GLOBALSETTINGS_NODEREF_STATES ),
m_aPropStatesEnabled( GLOBALSETTINGS_PROPERTY_STATESENABLED ),
m_aPropLocked( GLOBALSETTINGS_PROPERTY_LOCKED ),
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index f27ffdd..cafd7a4 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -155,9 +155,6 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
OUString m_aPropName;
OUString m_aPropPopup;
OUString m_aPropProperties;
- OUString m_aXMLFileFormatVersion;
- OUString m_aVersion;
- OUString m_aExtension;
OUString m_aPrivateResourceURL;
Reference< XNameAccess > m_xGenericUICommands;
Reference< XMultiServiceFactory > m_xConfigProvider;
diff --git a/helpcompiler/source/HelpSearch.cxx b/helpcompiler/source/HelpSearch.cxx
index f59dd6d..c5d1e4e 100644
--- a/helpcompiler/source/HelpSearch.cxx
+++ b/helpcompiler/source/HelpSearch.cxx
@@ -13,8 +13,7 @@
#include "LuceneHelper.hxx"
-HelpSearch::HelpSearch(OUString const &lang, OUString const &indexDir)
- : d_lang(lang)
+HelpSearch::HelpSearch(OUString const &indexDir)
{
OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(indexDir, ustrSystemPath);
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index d442c39..56f4fcc 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -86,7 +86,6 @@ public:
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
- OUString aServiceName;
com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( com::sun::star::uno::RuntimeException );
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 805285d..07de1c2 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -59,7 +59,6 @@ class SvIdlDataBase
OUString aExportFile;
sal_uInt32 nUniqueId;
sal_uInt32 nVerbosity;
- OUString aDataBaseFile;
SvPersistStream aPersStream;
StringList aIdFileList;
SvStringHashTable * pIdTable;
diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index fea636f..a94bcc3 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -43,7 +43,6 @@ class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com
// member
private:
- OUString m_sMods;
com::sun::star::uno::Any m_aRequest;
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > m_lContinuations;
com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > m_xAbort;
diff --git a/include/helpcompiler/HelpSearch.hxx b/include/helpcompiler/HelpSearch.hxx
index b177430..a1ce783 100644
--- a/include/helpcompiler/HelpSearch.hxx
+++ b/include/helpcompiler/HelpSearch.hxx
@@ -17,16 +17,14 @@
class L10N_DLLPUBLIC HelpSearch{
private:
- OUString d_lang;
OString d_indexDir;
public:
/**
- * @param lang Help files language.
* @param indexDir The directory where the index files are stored.
*/
- HelpSearch(OUString const &lang, OUString const &indexDir);
+ HelpSearch(OUString const &indexDir);
/**
* Query the index for a certain query string.
diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index 95d922b..7b72e03e 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -41,8 +41,6 @@ private:
bool mbHasStartSound;
bool mbLoopSound;
bool mbStopSound;
- OUString msEmbedded;
- OUString msLink;
OUString msSndName;
};
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 480e8e2..395f495 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -81,7 +81,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
friend class MaskData;
friend class MaskSet;
- Size aLastSize;
ToolBox aTbxPipette;
ColorWindow* pCtlPipette;
PushButton aBtnExec;
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index eefdcb9..ae5a402 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -90,7 +90,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
{
- OUString sBullets;
Timer aFormatTimer;
bool bGrfNotFound;
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 5b6a88f..36426da 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -185,7 +185,6 @@ private:
m_xBoundItems[MAX_FAMILIES];
SfxTemplateItem* pFamilyState[MAX_FAMILIES];
sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
- OUString aCurSel;
Impl* pImpl;
SVX_DLLPRIVATE void Update();
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 3f1e21e..60268c5 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -363,7 +363,6 @@ class UnoImageControlControl : public UnoImageControlControl_Base
{
private:
ActionListenerMultiplexer maActionListeners;
- OUString maActionCommand;
public:
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 58a49db..e61d31f 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -76,7 +76,6 @@ private:
OUString maPlaceholderText;
OUString maSaveValue;
OUString maUndoText;
- OUString maRedoText;
long mnXOffset;
Selection maSelection;
sal_uInt16 mnAlign;
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index 929873b..b562f65 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star {
class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext
{
const OUString sIsPhysical;
- const OUString sPageStyleLayout;
const OUString sFollowStyle;
OUString sFollow;
OUString sPageMasterName;
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index f98c7b9..8418ef2 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -40,8 +40,6 @@ class XMLTextListAutoStylePool;
class SvxXMLNumRuleExport
{
SvXMLExport& rExport;
- const OUString sCDATA;
- const OUString sWS;
const OUString sNumberingRules;
const OUString sIsPhysical;
const OUString sIsContinuousNumbering;
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 201c402..e3426ac 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -128,7 +128,6 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
OUString sFormatTitle;
// OUString sMapName;
OUString sCalendar;
- OUString sFormatString;
LanguageType nFormatLang;
com::sun::star::lang::Locale aLocale;
bool bAutoOrder;
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 304fadd..4e7bc15 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -34,7 +34,6 @@ class SvxXMLListStyleContext : public SvXMLStyleContext
{
const OUString sIsPhysical;
const OUString sNumberingRules;
- const OUString sName;
const OUString sIsContinuousNumbering;
::com::sun::star::uno::Reference <
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index 94622b2c..8b5b8ac 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -101,7 +101,6 @@ private:
typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair;
std::vector <OUString> m_vStyleNameList;
std::vector <OverridePair> m_vIDsPairList;
- OUString m_aCurrentStyleName;
LwpFoundry* m_pFoundry;
XFList* m_pBulletList;
bool m_bContinue;
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index 71ddcfd..97f8e6b 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -118,7 +118,6 @@ protected:
private:
//CColumnLayoutHead cColumnLayout;
LwpObjectID m_ColumnLayout;
- OUString m_FrameStyleName;
LwpCellLayout * m_pDefaultCellLayout;
OUString m_DefaultColumnStyleName;
OUString m_DefaultRowStyleName;
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index 8f62f08..9ae0010 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -164,7 +164,6 @@ private:
sal_Int32 m_nRepeated;
enumXFValueType m_eValueType;
OUString m_strValue;
- OUString m_strDisplay;
OUString m_strFormula;
bool m_bProtect;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index add2470..6d09ac5 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -128,8 +128,6 @@ private:
typedef std::pair<enumXFIndexTemplate, OUString> TOCTEMPLATE_ENTRY_TYPE;
std::vector<TOCTEMPLATE_ENTRY_TYPE> m_aEntries; // template entry + text style
std::map<sal_uInt16, OUString> m_aTextEntries;
-
- OUString m_strChapterTextStyle;
};
/**
@@ -171,7 +169,6 @@ public:
private:
enumXFIndex m_eType;
OUString m_strTitle;
- OUString m_strSectStyle;
bool m_bProtect;
bool m_bSeparator;
XFParagraph* m_pTitle;
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 5f3db9a..3a89ebc 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -885,8 +885,6 @@ namespace oox { namespace ppt {
}
private:
Any maProgress;
- OUString msFilter;
- OUString msPrList;
};
TimeNodeContext * TimeNodeContext::makeContext(
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 2347e0b..e5448f8 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -73,7 +73,6 @@ public:
private:
TGroupFunctionMap m_aFunctions;
- com::sun::star::uno::Any m_aViewSettings;
Reference< XComponent > m_xSrcDoc;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 557cfbd..fdf44a0 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -440,10 +440,6 @@ namespace osl_FileBase
class getAbsoluteFileURL:public CppUnit::TestFixture
{
- //::osl::FileBase aFileBase;
- ::rtl::OUString aResultURL1, aResultURL2, aResultURL3, aResultURL4, aResultURL5, aResultURL6;
- // ::osl::FileBase::RC nError;
-
public:
void check_getAbsoluteFileURL( rtl::OUString const& _suBaseURL, rtl::OString const& _sRelativeURL, ::osl::FileBase::RC _nAssumeError, rtl::OUString const& _suAssumeResultStr );
@@ -1313,7 +1309,6 @@ namespace osl_FileStatus
class isValid : public CppUnit::TestFixture
{
- ::rtl::OUString aUStr;
::osl::Directory *pDir;
::osl::DirectoryItem rItem_file, rItem_link;
@@ -1517,7 +1512,6 @@ namespace osl_FileStatus
class getFileType : public CppUnit::TestFixture
{
- ::rtl::OUString aUStr;
::osl::FileBase::RC nError1;
::osl::DirectoryItem m_aItem_1, m_aItem_2, m_aVolumeItem, m_aFifoItem;
@@ -1991,7 +1985,6 @@ namespace osl_FileStatus
class getFileURL : public CppUnit::TestFixture
{
- ::rtl::OUString aTypeURL;
::osl::FileBase::RC nError;
::osl::DirectoryItem rItem;
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 016bb2c..48d5ba3 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -32,7 +32,6 @@ namespace Stringtest
class Convert : public CppUnit::TestFixture
{
- rtl::OUString m_aStr;
public:
rtl::OString convertToOString(rtl::OUString const& _suStr)
{
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index b662916..978a009 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -874,8 +874,7 @@ class SAXWriter :
{
public:
SAXWriter()
- : m_seqStartElement()
- , m_pSaxWriterHelper(NULL)
+ : m_pSaxWriterHelper(NULL)
, m_bDocStarted(false)
, m_bIsCDATA(false)
, m_bForceLineBreak(false)
@@ -965,7 +964,6 @@ private:
sal_Int32 getIndentPrefixLength( sal_Int32 nFirstLineBreakOccurrence ) throw();
Reference< XOutputStream > m_out;
- Sequence < sal_Int8 > m_seqStartElement;
SaxWriterHelper* m_pSaxWriterHelper;
// Status information
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index b659b47..dc723e7 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -105,7 +105,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
ScMenuFloatingWindow* mpWindow;
- OUString maName;
size_t mnMenuPos;
bool mbEnabled;
};
diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx
index 865a783..81abb72 100644
--- a/sc/source/filter/excel/xiformula.cxx
+++ b/sc/source/filter/excel/xiformula.cxx
@@ -40,13 +40,11 @@ public:
private:
XclFunctionProvider maFuncProv; /// Excel function data provider.
- const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls.
};
XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) :
XclImpRoot( rRoot ),
- maFuncProv( rRoot ),
- meBiff( rRoot.GetBiff() )
+ maFuncProv( rRoot )
{
}
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index c2b2327..75bf324 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -130,8 +130,6 @@ private:
XclImpSupbookTabList maSupbTabList; /// All sheet names of the document.
XclImpExtNameList maExtNameList; /// All external names of the document.
OUString maXclUrl; /// URL of the external document (Excel mode).
- OUString maFilterName; /// Detected filer name.
- OUString maFilterOpt; /// Detected filer options.
XclSupbookType meType; /// Type of the supbook record.
sal_uInt16 mnSBTab; /// Current Excel sheet index from SUPBOOK for XCT/CRN records.
};
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 7c5868f..6ea03c9 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -134,9 +134,6 @@ protected:
private:
ShapeAnchor maAnchor; /// Position of the drawing object.
- OUString maObjName; /// Name of the object.
- OUString maMacroName; /// Name of an attached macro.
- OUString maHyperlink; /// On-click hyperlink URL.
sal_uInt16 mnObjId; /// The object identifier (unique per drawing).
sal_uInt16 mnObjType; /// The object type from OBJ record.
bool mbHidden; /// True = object is hidden.
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 69f018f..619d437 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -373,7 +373,6 @@ private:
typedef ::std::unique_ptr< BiffSheetDrawing > BiffSheetDrawingPtr;
const OUString maSheetCellRanges; /// Service name for a SheetCellRanges object.
- const OUString maUrlTextField; /// Service name for a URL text field.
const CellAddress& mrMaxApiPos; /// Reference to maximum Calc cell address from address converter.
CellRangeAddress maUsedArea; /// Used area of the sheet, and sheet index of the sheet.
ColumnModel maDefColModel; /// Default column formatting.
@@ -409,7 +408,6 @@ private:
WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
WorkbookHelper( rHelper ),
maSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ),
- maUrlTextField( "com.sun.star.text.TextField.URL" ),
mrMaxApiPos( rHelper.getAddressConverter().getMaxApiAddress() ),
maUsedArea( nSheet, SAL_MAX_INT32, SAL_MAX_INT32, -1, -1 ),
maSheetData( *this ),
diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx
index 6157f86..be0c9e9 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -25,8 +25,6 @@ class ScXMLImport;
class ScXMLEmptyContext : public SvXMLImportContext
{
- OUString sPrintRanges;
-
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index 0aa168e..c7d378d 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -44,7 +44,6 @@ ScAccessibleFilterMenuItem::ScAccessibleFilterMenuItem(
const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) :
ScAccessibleContextBase(rxParent, AccessibleRole::MENU_ITEM),
mpWindow(pWin),
- maName(rName),
mnMenuPos(nMenuPos),
mbEnabled(true)
{
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 77ae524..1749333 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -155,7 +155,6 @@ ScDPNumGroupDlg::ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo&
mpRbManEnd ( get<RadioButton> ("manual_end") ),
mpEdEnd ( get<ScDoubleField>( "edit_end") ),
mpEdBy ( get<ScDoubleField> ("edit_by") ),
- mpBtnOk ( get<OKButton> ("ok" ) ),
maStartHelper ( mpRbAutoStart, mpRbManStart, mpEdStart ),
maEndHelper ( mpRbAutoEnd, mpRbManEnd, mpEdEnd )
{
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index c5032bb..30823d4 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -45,7 +45,6 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgS
"modules/scalc/ui/pivotfilterdialog.ui" )
,
- aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ),
aStrNone ( SC_RESSTR(SCSTR_NONE) ),
aStrEmpty ( SC_RESSTR(SCSTR_FILTER_EMPTY) ),
aStrNotEmpty ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ),
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 93f1c4d..048e552 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -101,7 +101,6 @@ private:
ScViewData* pViewData;
ScDocument* pDoc;
ScRangeName aLocalRangeName;
- Selection theCurSel;
SvxTPFilter* pTPFilter;
SvxTPView* pTPView;
SvxRedlinTable* pTheView; // #i48648 now SvHeaderTabListBox
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 5317ada..3066f41 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -104,7 +104,6 @@ private:
RadioButton* mpRbManEnd;
ScDoubleField* mpEdEnd;
ScDoubleField* mpEdBy;
- OKButton* mpBtnOk;
ScDPNumGroupEditHelper maStartHelper;
ScDPNumGroupEditHelper maEndHelper;
};
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index aae5648..da876f2 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -25,8 +25,6 @@
/** Base class for all functions */
class FuConstPolygon : public FuConstruct
{
- Point aLastPos;
-
public:
FuConstPolygon(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView,
SdrModel* pDoc, SfxRequest& rReq);
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index dc07789..0b0039d 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -63,7 +63,6 @@ private:
ScViewData* pViewData;
ScDocument* pDoc;
ScRangeName aLocalRangeName;
- Selection theCurSel;
ScRangeList aRangeList;
ScChangeViewSettings aChangeViewSet;
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 7032928..55b3fa8 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -62,7 +62,6 @@ private:
CheckBox* m_pBtnRegExp;
CheckBox* m_pBtnUnique;
FixedText* m_pFtDbArea;
- const OUString aStrUndefined;
const OUString aStrNone;
const OUString aStrEmpty;
const OUString aStrNotEmpty;
diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx
index c8ad327..b0460bb 100644
--- a/sc/source/ui/inc/scuiautofmt.hxx
+++ b/sc/source/ui/inc/scuiautofmt.hxx
@@ -48,7 +48,6 @@ private:
OUString aStrTitle;
OUString aStrLabel;
OUString aStrClose;
- OUString aStrDelTitle;
OUString aStrDelMsg;
OUString aStrRename;
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 5a03ca5..a78a9e1 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -30,7 +30,6 @@
#include "anyrefdg.hxx"
#include "dbdata.hxx"
-class ScViewData;
class ScDocument;
class ScSimpleRefDlg: public ScAnyRefDlg
@@ -48,8 +47,6 @@ private:
OKButton* m_pBtnOk;
CancelButton* m_pBtnCancel;
- ScDocument* pDoc;
-
ScRange theCurArea;
bool bCloseFlag;
bool bAutoReOpen;
@@ -67,8 +64,7 @@ protected:
virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE;
public:
- ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent,
- ScViewData* ptrViewData );
+ ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent);
virtual ~ScSimpleRefDlg();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx
index 86d46e3..40dcca1 100644
--- a/sc/source/ui/inc/tabbgcolordlg.hxx
+++ b/sc/source/ui/inc/tabbgcolordlg.hxx
@@ -55,7 +55,6 @@ private:
OKButton* m_pBtnOk;
Color m_aTabBgColor;
const OUString m_aTabBgColorNoColorText;
- OString m_sHelpId;
void FillColorValueSets_Impl();
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index f622954..8734356 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -60,7 +60,6 @@ ScAutoFormatDlg::ScAutoFormatDlg(vcl::Window* pParent,
, aStrTitle(ScResId(STR_ADD_AUTOFORMAT_TITLE))
, aStrLabel(ScResId(STR_ADD_AUTOFORMAT_LABEL))
, aStrClose(ScResId(STR_BTN_AUTOFORMAT_CLOSE))
- , aStrDelTitle(ScResId(STR_DEL_AUTOFORMAT_TITLE))
, aStrDelMsg(ScResId(STR_DEL_AUTOFORMAT_MSG))
, aStrRename(ScResId(STR_RENAME_AUTOFORMAT_TITLE))
, pFormat(pAutoFormat)
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 6736f55..a150b86 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -34,12 +34,10 @@
| SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
-ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent,
- ScViewData* ptrViewData)
+ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent)
: ScAnyRefDlg(pB, pCW, pParent, "SimpleRefDialog", "modules/scalc/ui/simplerefdialog.ui")
,
- pDoc ( ptrViewData->GetDocument() ),
bAutoReOpen ( true ),
bCloseOnButtonUp( false ),
bSingleCell ( false ),
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index aaf122f..44e8503 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -43,7 +43,6 @@ ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle,
: ModalDialog(pParent, "TabColorDialog", "modules/scalc/ui/tabcolordialog.ui")
, m_aTabBgColor(rDefaultColor)
, m_aTabBgColorNoColorText(rTabBgColorNoColorText)
- , m_sHelpId(sHelpId)
{
get(m_pTabBgColorSet, "colorset");
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index cb052fb..98a3f74 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -82,9 +82,8 @@ getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe
class WorkBookEnumImpl : public EnumerationHelperImpl
{
- uno::Any m_aApplication;
public:
- WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {}
+ WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {}
virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE
{
@@ -111,7 +110,7 @@ ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException)
// safer to create an enumeration based on this objects state
// rather than one effectively based of the desktop component
uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
- return new WorkBookEnumImpl( mxParent, mxContext, xEnumerationAccess->createEnumeration(), Application() );
+ return new WorkBookEnumImpl( mxParent, mxContext, xEnumerationAccess->createEnumeration() );
}
uno::Any
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 04abff5..2285768 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -440,7 +440,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
ScViewData& rViewData = GetViewData();
rViewData.SetRefTabNo( rViewData.GetTabNo() );
- pResult = new ScSimpleRefDlg( pB, pCW, pParent, &rViewData );
+ pResult = new ScSimpleRefDlg( pB, pCW, pParent );
}
break;
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 14fa136..b798d55 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -61,7 +61,6 @@ namespace basprov
OUString m_sScriptingContext;
bool m_bIsAppScriptCtx;
bool m_bIsUserCtx;
- OUString m_sCtxLocation;
bool isLibraryShared(
const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& rxLibContainer,
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 389ca50..897f268 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -345,11 +345,9 @@ void lclAppendStyle(OUStringBuffer& aBuffer, const OUString& aTag, const OUStrin
HtmlExport::HtmlExport(
const OUString& aPath,
const Sequence< PropertyValue >& rParams,
- const OUString& rFilterOptions,
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell )
: maPath( aPath ),
- maFilterOptions( rFilterOptions ),
mpDoc(pExpDoc),
mpDocSh( pDocShell ),
meEC(NULL),
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index e5e18c0..bb633fb 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -85,7 +85,6 @@ class HtmlExport
std::vector< SdPage* > maNotesPages;
OUString maPath;
- OUString maFilterOptions;
SdDrawDocument* mpDoc;
::sd::DrawDocShell* mpDocSh;
@@ -230,7 +229,6 @@ class HtmlExport
public:
HtmlExport(const OUString& aPath,
const css::uno::Sequence<css::beans::PropertyValue>& rParams,
- const OUString& rFilterOptions,
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell);
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index 5243622..aab3d63 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -57,17 +57,13 @@ bool SdHTMLFilter::Export()
SfxItemSet *pSet = mrMedium.GetItemSet();
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aParams;
- OUString sFilterOptions;
const SfxPoolItem* pItem;
if ( pSet->GetItemState( SID_FILTER_DATA, false, &pItem ) == SfxItemState::SET )
((SfxUnoAnyItem*)pItem)->GetValue() >>= aParams;
- if (pSet->GetItemState(SID_FILE_FILTEROPTIONS, true, &pItem) == SfxItemState::SET)
- sFilterOptions = ((SfxStringItem*)pItem)->GetValue();
-
- HtmlExport aExport(mrMedium.GetName(), aParams, sFilterOptions, &mrDocument, &mrDocShell);
+ HtmlExport aExport(mrMedium.GetName(), aParams, &mrDocument, &mrDocShell);
return true;
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 0420b37..8c12d48 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -71,7 +71,6 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter)
mbIsMakeSelectionVisiblePending(true),
mnInsertionPosition(-1),
mnAnimationId(Animator::NotAnAnimationId),
- maRequestedTopLeft(),
mpPageInsertionListener(),
mpSelectionObserver(new SelectionObserver(rSlideSorter))
{
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index c9288c0..2af4e03 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -57,7 +57,6 @@ void SelectionObserver::Context::Abort(void)
SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
- mpDocument(mrSlideSorter.GetModel().GetDocument()),
mbIsOvservationActive(false),
maInsertedPages(),
maDeletedPages()
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index e546b20..5d5f235 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -132,7 +132,6 @@ private:
and left of the visible area to maRequestedTopLeft.
*/
Animator::AnimationId mnAnimationId;
- Point maRequestedTopLeft;
class PageInsertionListener;
::boost::scoped_ptr<PageInsertionListener> mpPageInsertionListener;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 8c01b47..30079a4 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -65,7 +65,6 @@ public:
private:
SlideSorter& mrSlideSorter;
- SdDrawDocument* mpDocument;
bool mbIsOvservationActive;
::std::vector<const SdPage*> maInsertedPages;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 054dbbd..de7d76f 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -84,7 +84,6 @@ private:
Bitmap maMouseOverFocusedBackground;
Bitmap maMouseOverSelectedBackground;
Bitmap maMouseOverSelectedAndFocusedBackground;
- Size maSize;
void PaintBackground (
PageObjectLayouter *pPageObjectLayouter,
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 629556d..5be0d54 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -91,7 +91,6 @@ static const OUString* getPropertyNames()
TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal )
: mrBase(rBase)
- , msTableTemplate("TableTemplate")
, mbModal(bModal)
, mbStyleSelected(false)
, mbOptionsChanged(false)
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 7175a7b..0fb256c 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -91,7 +91,6 @@ private:
private:
ViewShellBase& mrBase;
- const OUString msTableTemplate;
TableValueSet* m_pValueSet;
CheckBox* m_aCheckBoxes[CB_COUNT];
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 5af3c44..1da2754 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -353,7 +353,6 @@ namespace {
}
private:
- Any maDialog;
::std::vector<beans::PropertyValue> maProperties;
::std::vector<sal_Int32> maSlidesPerPage;
bool mbImpress;
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index f247640..c9df454 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -57,7 +57,6 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- OUString msEventType;
css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController;
Predicate maPredicate;
Action maAction;
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index f846a52..95b7a00 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -46,7 +46,6 @@ private:
Link m_aFindHdl;
Link m_aCloseHdl;
- OUString m_sToggleText;
OUString m_sConfigName;
OString m_sWinState;
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 46016d9..a910fd0 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -497,7 +497,6 @@ friend class SfxHelpIndexWindow_Impl;
bool bGrabFocusToToolBox;
Point aWinPos;
OUString sTitle;
- OUString sKeyword;
virtual void Resize() SAL_OVERRIDE;
virtual void Split() SAL_OVERRIDE;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index e5baf1c..f294a1a 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -47,8 +47,6 @@ Deck::Deck (
: Window(pParentWindow, 0),
msId(rDeckDescriptor.msId),
maIcon(),
- msIconURL(rDeckDescriptor.msIconURL),
- msHighContrastIconURL(rDeckDescriptor.msHighContrastIconURL),
mnMinimalWidth(0),
maPanels(),
mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, rCloserAction)),
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index c071f1d..b162a43 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -86,11 +86,8 @@ public:
};
private:
- const ::rtl::OUString msTitle;
const ::rtl::OUString msId;
Image maIcon;
- const ::rtl::OUString msIconURL;
- const ::rtl::OUString msHighContrastIconURL;
sal_Int32 mnMinimalWidth;
SharedPanelContainer maPanels;
::boost::scoped_ptr<DeckTitleBar> mpTitleBar;
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 9e12d97..0f8fd6b 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -289,7 +289,6 @@ class SmShowSymbolSet : public VclHBox
{
SmShowSymbolSetWindow aSymbolWindow;
ScrollBar aVScrollBar;
- Size aOutputSize;
public:
SmShowSymbolSet(vcl::Window *pParent);
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 9f13308..e0727ad 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -57,7 +57,6 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
typedef std::map <OUString, sal_Int32> MapString2Int;
MapString2Int aURLIgnoreCounters;
- ::osl::Mutex aIgnoreCounterSafety;
Sequence< OUString > GetPropertyNames();
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index bd5dbac..74946f1 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -402,7 +402,6 @@ class SaveProgressDialog : public ModalDialog
{
// member
private:
- OUString m_aProgrBaseTxt;
vcl::Window* m_pProgrParent;
// @short TODO
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index b0c2b0e..0d3540f 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -137,7 +137,6 @@ private:
Image maImgLinear;
Image maImgColor;
- OUString msHelpFillType;
OUString msHelpFillAttr;
AreaTransparencyGradientPopup maTrGrPopup;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index b5718ef..97fa3e2 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -125,18 +125,6 @@ private:
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
- // to remember original positions for restoring these for different layouts
- Point maFtWidthOrigPos;
- Point maMtrWidthOrigPos;
- Point maFtHeightOrigPos;
- Point maMtrHeightOrigPos;
- Point maCbxScaleOrigPos;
- Point maFtAngleOrigPos;
- Point maMtrAnglOrigPos;
- Point maFlipTbxOrigPos;
- Point maDialOrigPos;
- Point maFtFlipOrigPos;
-
/// bitfield
bool mbMtrPosXMirror : 1;
bool mbSizeProtected : 1;
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index ff324a8..ac04f54 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -212,7 +212,6 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
{
OUString sExpand;
OUString aPText;
- OUString aSeqText;
bool bInput;
sal_uInt16 nSeqNo;
sal_uInt16 nSubType;
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 256ed9e..8eb9ba3 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -106,7 +106,6 @@ class SwUndoTblToTxt : public SwUndo
SwTblToTxtSaves* pBoxSaves;
SwHistory* pHistory;
sal_uLong nSttNd, nEndNd;
- sal_uInt16 nAdjust;
sal_Unicode cTrenner;
sal_uInt16 nHdlnRpt;
bool bCheckNumFmt : 1;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 5172236..aafa683 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -402,7 +402,6 @@ SwUndoTblToTxt::SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh )
: SwUndo( UNDO_TABLETOTEXT ),
sTblNm( rTbl.GetFrmFmt()->GetName() ), pDDEFldType( 0 ), pHistory( 0 ),
nSttNd( 0 ), nEndNd( 0 ),
- nAdjust( static_cast<sal_uInt16>(rTbl.GetFrmFmt()->GetHoriOrient().GetHoriOrient()) ),
cTrenner( cCh ), nHdlnRpt( rTbl.GetRowsToRepeat() )
{
pTblSave = new _SaveTable( rTbl );
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index d13df37..6f92051 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -253,7 +253,6 @@ class SwXMLAutoStylePoolP : public SvXMLAutoStylePoolP
SvXMLExport& rExport;
const OUString sListStyleName;
const OUString sMasterPageName;
- const OUString sCDATA;
protected:
@@ -329,8 +328,7 @@ SwXMLAutoStylePoolP::SwXMLAutoStylePoolP(SvXMLExport& rExp ) :
SvXMLAutoStylePoolP( rExp ),
rExport( rExp ),
sListStyleName( GetXMLToken( XML_LIST_STYLE_NAME ) ),
- sMasterPageName( GetXMLToken( XML_MASTER_PAGE_NAME ) ),
- sCDATA( GetXMLToken( XML_CDATA ) )
+ sMasterPageName( GetXMLToken( XML_MASTER_PAGE_NAME ) )
{
}
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 3aa355b..fdc0bbc 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -643,7 +643,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
{
SwXMLTableContext *pTblContext =
new SwXMLTableContext( GetSwImport(), nPrefix, rLocalName,
- xAttrList, GetTable(), sXmlId );
+ xAttrList, GetTable() );
pContext = pTblContext;
if( GetTable()->IsValid() )
InsertContent( pTblContext );
@@ -1418,10 +1418,8 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > &,
- SwXMLTableContext *pTable,
- OUString const & i_rXmlId ) :
+ SwXMLTableContext *pTable ) :
XMLTextTableContext( rImport, nPrfx, rLName ),
- mXmlId( i_rXmlId ),
pColumnDefaultCellStyleNames( 0 ),
pRows( new SwXMLTableRows_Impl ),
pTableNode( pTable->pTableNode ),
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index c69fbf4..9aff5f9 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -50,8 +50,6 @@ class SwXMLTableContext : public XMLTextTableContext
{
OUString aStyleName;
OUString aDfltCellStyleName;
- /// NB: this contains the xml:id only if this table is a subtable!
- OUString mXmlId;
//! Holds basic information about a column's width.
struct ColumnWidthInfo {
@@ -142,8 +140,7 @@ public:
const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
- SwXMLTableContext *pTable,
- const OUString& i_rXmlId );
+ SwXMLTableContext *pTable );
virtual ~SwXMLTableContext();
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 3ffe536..50812ef 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -62,7 +62,6 @@ class SwAddressListDialog : public SfxModalDialog
OUString m_sTable;
OUString m_sConnecting;
- OUString m_sCreatedURL;
SvTreeListEntry* m_pCreatedDataSource;
bool m_bInSelectHdl;
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 42256f4..7355016 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -156,13 +156,11 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
OUString m_sContinue;
OUString m_sStop;
- OUString m_sSend;
OUString m_sTransferStatus;
OUString m_sErrorStatus;
OUString m_sSendingTo;
OUString m_sCompleted;
OUString m_sFailed;
- OUString m_sTerminateQuery;
bool m_bCancel;
bool m_bDesctructionEnabled;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 0fe5dae..9c849c0 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -236,13 +236,11 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem&
m_pClose(get<PushButton>("close")),
m_sContinue(SW_RES( ST_CONTINUE )),
m_sStop(m_pStop->GetText()),
- m_sSend(SW_RES(ST_SEND)),
m_sTransferStatus(m_pTransferStatus->GetText()),
m_sErrorStatus( m_pErrorStatus->GetText()),
m_sSendingTo( SW_RES(ST_SENDINGTO )),
m_sCompleted( SW_RES(ST_COMPLETED )),
m_sFailed( SW_RES(ST_FAILED )),
- m_sTerminateQuery( SW_RES( ST_TERMINATEQUERY )),
m_bCancel(false),
m_bDesctructionEnabled(false),
m_aImageList( SW_RES( ILIST ) ),
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 2ebdcee..9d26b38 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -191,14 +191,13 @@ class SwAutoMarkDlg_Impl : public ModalDialog
SwEntryBrowseBox* m_pEntriesBB;
OUString sAutoMarkURL;
- const OUString sAutoMarkType;
bool bCreateMode;
DECL_LINK(OkHdl, void *);
public:
SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL,
- const OUString& rAutoMarkType, bool bCreate);
+ bool bCreate);
virtual ~SwAutoMarkDlg_Impl();
};
@@ -1447,7 +1446,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
}
boost::scoped_ptr<SwAutoMarkDlg_Impl> pAutoMarkDlg(new SwAutoMarkDlg_Impl(
- m_pAutoMarkPB, sAutoMarkURL, sAutoMarkType, bNew ));
+ m_pAutoMarkPB, sAutoMarkURL, bNew ));
if( RET_OK != pAutoMarkDlg->Execute() && bNew )
sAutoMarkURL = sSaveAutoMarkURL;
@@ -4012,11 +4011,10 @@ bool SwEntryBrowseBox::IsModified()const
}
SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL,
- const OUString& rAutoMarkType, bool bCreate)
+ bool bCreate)
: ModalDialog(pParent, "CreateAutomarkDialog",
"modules/swriter/ui/createautomarkdialog.ui")
, sAutoMarkURL(rAutoMarkURL)
- , sAutoMarkType(rAutoMarkType)
, bCreateMode(bCreate)
{
get(m_pOKPB, "ok");
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 2d609bd..21d0573 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -106,7 +106,6 @@ class SwFrmPage: public SfxTabPage
sal_uInt16 nHtmlMode;
OString sDlgType;
Size aGrfSize;
- Size aWrap;
SwTwips nUpperBorder;
SwTwips nLowerBorder;
double fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 13c3fe2..d58ea9e 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -803,8 +803,7 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand,
ucbhelper::cancelCommandExecution(aAny,Env);
}
- XInteractionRequestImpl* p =
- new XInteractionRequestImpl(m_aFTPURL.child());
+ XInteractionRequestImpl* p = new XInteractionRequestImpl;
Reference<XInteractionRequest> req(p);
xInt->handle(req);
if(p->approved()) {
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index 59bc54c..55f51d3 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -62,10 +62,9 @@ void SAL_CALL XInteractionDisapproveImpl::select()
// XInteractionRequestImpl
-XInteractionRequestImpl::XInteractionRequestImpl(const OUString& aName)
+XInteractionRequestImpl::XInteractionRequestImpl()
: p1( new XInteractionApproveImpl )
, p2( new XInteractionDisapproveImpl )
- , m_aName(aName)
, m_aSeq( 2 )
{
m_aSeq[0] = Reference<XInteractionContinuation>(p1);
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 51d1177..80f9765 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -76,7 +76,7 @@ namespace ftp {
{
public:
- XInteractionRequestImpl(const OUString& aName);
+ XInteractionRequestImpl();
com::sun::star::uno::Any SAL_CALL getRequest( )
throw (css::uno::RuntimeException,
@@ -94,8 +94,6 @@ namespace ftp {
XInteractionApproveImpl* p1;
XInteractionDisapproveImpl* p2;
- OUString m_aName;
-
css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_aSeq;
};
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 1fb36be..7a2224d 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -114,8 +114,7 @@ extern "C" {
FTPURL::FTPURL(const FTPURL& r)
- : m_mutex(),
- m_pFCP(r.m_pFCP),
+ : m_pFCP(r.m_pFCP),
m_aUsername(r.m_aUsername),
m_bShowPassword(r.m_bShowPassword),
m_aHost(r.m_aHost),
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 3b83f6d..496c1768 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -142,8 +142,6 @@ namespace ftp {
private:
- osl::Mutex m_mutex;
-
FTPHandleProvider *m_pFCP;
mutable OUString m_aUsername;
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 9d12a3e..10a837f 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -36,7 +36,6 @@ class ScVbaComboBox : public ComboBoxImpl_BASE
{
std::unique_ptr< ListControlHelper > mpListHelper;
OUString sSourceName;
- OUString msDftPropName;
public:
ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index ed20cdb..1a6837e 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -34,8 +34,6 @@ class ScVbaListBox : public ListBoxImpl_BASE
,public PropListener
{
std::unique_ptr< ListControlHelper > mpListHelper;
- OUString sSourceName;
- OUString msDftPropName;
sal_Int16 m_nIndex;
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx
index 86edf7b..012f190 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -28,7 +28,6 @@ typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton,
class ScVbaToggleButton : public ToggleButtonImpl_BASE
{
- OUString msDftPropName;
public:
ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
virtual ~ScVbaToggleButton();
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 84a8b5b..561845e 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -71,10 +71,9 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
* RTSDialog
*/
-RTSDialog::RTSDialog(const PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent)
+RTSDialog::RTSDialog(const PrinterInfo& rJobData, vcl::Window* pParent)
: TabDialog(pParent, "PrinterPropertiesDialog", "vcl/ui/printerpropertiesdialog.ui")
, m_aJobData(rJobData)
- , m_aPrinter(rPrinter)
, m_pPaperPage(NULL)
, m_pDevicePage(NULL)
, m_aInvalidString(VclResId(SV_PRINT_INVALID_TXT))
@@ -474,7 +473,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
int SetupPrinterDriver(::psp::PrinterInfo& rJobData)
{
int nRet = 0;
- RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, NULL );
+ RTSDialog aDialog( rJobData, NULL );
if( aDialog.Execute() )
{
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 8f3d43d..08fb22d 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -43,7 +43,6 @@ class RTSDialog : public TabDialog
friend class RTSDevicePage;
::psp::PrinterInfo m_aJobData;
- OUString m_aPrinter;
// controls
TabControl* m_pTabControl;
@@ -63,7 +62,7 @@ class RTSDialog : public TabDialog
// helper functions
void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* );
public:
- RTSDialog(const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent = NULL);
+ RTSDialog(const ::psp::PrinterInfo& rJobData, vcl::Window* pParent = NULL);
virtual ~RTSDialog();
const ::psp::PrinterInfo& getSetup() const { return m_aJobData; }
@@ -98,9 +97,6 @@ class RTSDevicePage : public TabPage
{
RTSDialog* m_pParent;
- OUString m_aSpaceColor;
- OUString m_aSpaceGray;
-
ListBox* m_pPPDKeyBox;
ListBox* m_pPPDValueBox;
const psp::PPDValue* m_pCustomValue;
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 223d253..b6beda3 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -28,7 +28,6 @@
class HelpTextWindow : public FloatingWindow
{
private:
- Point maPos;
Rectangle maHelpArea; // If next Help for the same rectangle w/ same text, then keep window
Rectangle maTextRect; // For wrapped text in QuickHelp
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index d96fcbb..eeccaf0 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -31,8 +31,6 @@ namespace x11 {
class X11Transferable : public ::cppu::WeakImplHelper1 <
::com::sun::star::datatransfer::XTransferable >
{
- ::osl::Mutex m_aMutex;
-
SelectionManager& m_rManager;
Atom m_aSelection;
public:
diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx
index fae48e0..ba92f640 100644
--- a/writerfilter/source/ooxml/Handler.hxx
+++ b/writerfilter/source/ooxml/Handler.hxx
@@ -75,7 +75,6 @@ public:
class OOXMLCommentHandler : public Properties
{
OOXMLFastContextHandler * mpFastContext;
- OUString msStreamId;
public:
OOXMLCommentHandler(OOXMLFastContextHandler * pContext);
virtual ~OOXMLCommentHandler();
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 935ee52..89da788 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -53,7 +53,6 @@ class OOXMLParserState
unsigned int mnContexts;
unsigned int mnHandle;
OOXMLDocumentImpl* mpDocument;
- OUString msTarget;
OOXMLPropertySet::Pointer_t mpCharacterProps;
std::stack<OOXMLPropertySet::Pointer_t> mCellProps;
std::stack<OOXMLPropertySet::Pointer_t> mRowProps;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 685525d..825b1ee 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -161,7 +161,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
}
pQueryResultVector->reserve( hitCount );
- OUString aLang = m_aURLParameter.get_language();
const std::vector< OUString >& aListItem = queryList[i];
OUString aNewQueryStr = aListItem[0];
@@ -170,7 +169,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
try
{
- HelpSearch searcher(aLang, idxDir);
+ HelpSearch searcher(idxDir);
searcher.query(aNewQueryStr, bCaptionsOnly, aPathVector, aScoreVector);
}
catch (CLuceneError &e)
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 1677eea..9a10ac6 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -35,7 +35,6 @@ class XMLTextColumnsContext :public XMLElementPropertyContext
const OUString sSeparatorLineColor;
const OUString sSeparatorLineRelativeHeight;
const OUString sSeparatorLineVerticalAlignment;
- const OUString sIsAutomatic;
const OUString sAutomaticDistance;
const OUString sSeparatorLineStyle;
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 7dc0a1b..5061477 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -462,7 +462,6 @@ private:
const OUString sPropertyDataColumnName;
const OUString sPropertyDataCommandType;
const OUString sPropertyDataTableName;
- const OUString sPropertyDate;
const OUString sPropertyDateTime;
const OUString sPropertyDateTimeValue;
const OUString sPropertyDDECommandElement;
@@ -490,7 +489,6 @@ private:
const OUString sPropertyIsVisible;
const OUString sPropertyItems;
const OUString sPropertyLevel;
- const OUString sPropertyMacro;
const OUString sPropertyMeasureKind;
const OUString sPropertyName;
const OUString sPropertyNumberFormat;
@@ -498,12 +496,9 @@ private:
const OUString sPropertyNumberingType;
const OUString sPropertyOffset;
const OUString sPropertyOn;
- const OUString sPropertyPlaceholder;
const OUString sPropertyPlaceholderType;
const OUString sPropertyReferenceFieldPart;
const OUString sPropertyReferenceFieldSource;
- const OUString sPropertyReferenceFieldType;
- const OUString sPropertyRevision;
const OUString sPropertyScriptType;
const OUString sPropertySelectedItem;
const OUString sPropertySequenceNumber;
@@ -518,7 +513,6 @@ private:
const OUString sPropertyUserText;
const OUString sPropertyValue;
const OUString sPropertyVariableName;
- const OUString sPropertyVariableSubType;
const OUString sPropertyHelp;
const OUString sPropertyTooltip;
const OUString sPropertyTextRange;
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 66c2a1d..4023aac 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -110,8 +110,6 @@ enum XMLTextFieldAttrTokens
/// abstract class for text field import
class XMLTextFieldImportContext : public SvXMLImportContext
{
- const OUString sIsFixed;
-
// data members
OUStringBuffer sContentBuffer; /// collect character data
OUString sContent; /// character data after collection
@@ -191,7 +189,6 @@ class XMLSenderFieldImportContext : public XMLTextFieldImportContext
sal_Int16 nSubType; /// API subtype for ExtUser field
- const OUString sEmpty; /// empty string
const OUString sPropertyFixed;
const OUString sPropertyFieldSubType;
const OUString sPropertyContent;
@@ -260,8 +257,6 @@ protected:
class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext
{
- const OUString sEmpty; /// empty string
- const OUString sServiceJumpEdit;
const OUString sPropertyPlaceholderType;
const OUString sPropertyPlaceholder;
const OUString sPropertyHint;
@@ -966,7 +961,6 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext
const OUString sPropertyHint;
const OUString sPropertyMacroName;
const OUString sPropertyScriptURL;
- const OUString sPropertyLibraryName;
OUString sDescription;
SvXMLImportContextRef xEventContext;
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index c3bf5d1..c58f5f4 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -48,7 +48,6 @@ class XMLValueImportHelper
const OUString sPropertyContent;
const OUString sPropertyValue;
- const OUString sPropertyFormula;
const OUString sPropertyNumberFormat;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list