mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More -Werror,-Wunused-private-field

Browse Source 
...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
This commit is contained in:
Stephan Bergmann 2014-10-15 15:58:56 +02:00
parent eea16cb3e6
commit ad9498f8b8
171 changed files with 35 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
View File

@ -85,8 +85,6 @@ namespace accessibility
virtual Rectangle implGetBoundingBox() SAL_OVERRIDE;
virtual Rectangle implGetBoundingBoxOnScreen() SAL_OVERRIDE;
private:
OUString m_sHeaderName;
};
}

1
basctl/source/inc/managelang.hxx
View File

@ -60,7 +60,6 @@ private:
boost::shared_ptr<LocalizationMgr> m_xLocalizationMgr;
OUString m_sDefLangStr;
OUString m_sDeleteStr;
OUString m_sCreateLangStr;
void Init();

1
basic/inc/sbobjmod.hxx
View File

@ -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:

1
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
View File

@ -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;

1
chart2/source/view/charttypes/GL3DBarChart.cxx
View File

@ -233,7 +233,6 @@ private:
size_t mnStepsTotal;
TimeValue maClickFlyBackStartTime;
TimeValue maClickFlyBackEndTime;
OUString maFPS;
glm::vec3 maTargetPosition;
glm::vec3 maTargetDirection;
};

1
comphelper/source/officeinstdir/officeinstallationdirectories.cxx
View File

@ -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 ),

1
comphelper/source/officeinstdir/officeinstallationdirectories.hxx
View File

@ -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;

1
connectivity/source/drivers/mork/MQueryHelper.hxx
View File

@ -157,7 +157,6 @@ namespace connectivity
private:
typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap;
mutable ::osl::Mutex m_aMutex;
FieldMap m_Fields;
public:

2
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
View File

@ -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;

1
connectivity/source/inc/mysql/YDriver.hxx
View File

@ -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.

1
cui/source/dialogs/SpellDialog.cxx
View File

@ -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;

2
cui/source/dialogs/colorpicker.cxx
View File

@ -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") )

1
cui/source/inc/about.hxx
View File

@ -42,7 +42,6 @@ private:
PushButton* m_pCreditsButton;
PushButton* m_pWebsiteButton;
OUString aVersionData;
OUString m_aVersionTextStr;
OUString m_aVendorTextStr;
OUString m_aCopyrightTextStr;

5
cui/source/inc/autocdlg.hxx
View File

@ -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;

1
cui/source/inc/cuitabarea.hxx
View File

@ -640,7 +640,6 @@ class SvxColorTabPage : public SfxTabPage
private:
XPropertyListType meType;
XOutdevItemPool* mpXPool;
Window *mpTopDlg;
CheckBox *m_pBoxEmbed;

1
cui/source/inc/optlingu.hxx
View File

@ -107,7 +107,6 @@ private:
OUString sCapitalWords;
OUString sWordsWithDigits;
OUString sCapitalization;
OUString sSpellSpecial;
OUString sSpellAuto;
OUString sGrammarAuto;

1
cui/source/inc/page.hxx
View File

@ -131,7 +131,6 @@ private:
long nLastTopMargin;
long nLastBottomMargin;
Size aMaxSize;
bool bLandscape;
bool bBorderModified;
SvxModeType eMode;

1
cui/source/tabpages/tpcolor.cxx
View File

@ -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 )

1
dbaccess/source/core/api/RowSet.hxx
View File

@ -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

1
dbaccess/source/filter/xml/xmlStyleImport.cxx
View File

@ -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)
{

2
dbaccess/source/filter/xml/xmlStyleImport.hxx
View File

@ -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();

5
dbaccess/source/ui/dlg/detailpages.hxx
View File

@ -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;

2
dbaccess/source/ui/dlg/tablespage.hxx
View File

@ -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 >

2
dbaccess/source/ui/inc/CollectionView.hxx
View File

@ -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*);

2
dbaccess/source/ui/inc/brwctrlr.hxx
View File

@ -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;

1
dbaccess/source/ui/inc/opendoccontrols.hxx
View File

@ -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:

1
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
View File

@ -29,7 +29,6 @@ class ODBTypeWizDialogSetup
:public ODatabaseAdministrationDialog
,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialogSetup >
{
OUString m_sExistingDocToOpen;
bool m_bOpenDatabase;
bool m_bStartTableWizard;

1
desktop/source/deployment/gui/dp_gui_dialog2.cxx
View File

@ -114,7 +114,6 @@ enum MENU_COMMAND
class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
{
Size m_aOutputSize;
bool m_bInterfaceLocked;
PushButton *m_pOptionsBtn;

2
desktop/source/deployment/gui/dp_gui_dialog2.hxx
View File

@ -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 );

1
desktop/source/deployment/gui/dp_gui_extlistbox.hxx
View File

@ -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;

1
desktop/source/deployment/gui/license_dialog.hxx
View File

@ -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();

8
extensions/source/plugin/base/context.cxx
View File

@ -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 );

1
filter/source/graphicfilter/eos2met/eos2met.cxx
View File

@ -141,7 +141,6 @@ private:
METGDIStackMember* pGDIStack;
Color aMETColor;
Color aMETBackgroundColor;
Color aMETPatternSymbol;
RasterOp eMETMix ;
long nMETStrokeLineWidth;
Size aMETChrCellSize;

4
filter/source/xsltdialog/typedetectionimport.cxx
View File

@ -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" )
{
}

4
filter/source/xsltdialog/typedetectionimport.hxx
View File

@ -109,10 +109,6 @@ private:
const OUString sTypes;
const OUString sFilterAdaptorService;
const OUString sXSLTFilterService;
const OUString sCdataAttribute;
const OUString sWhiteSpace;
};
#endif

1
filter/source/xsltdialog/xmlfilterjar.cxx
View File

@ -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;

1
filter/source/xsltdialog/xmlfilterjar.hxx
View File

@ -48,7 +48,6 @@ private:
OUString sVndSunStarPackage;
OUString sXSLTPath;
OUString sTemplatePath;
OUString sPump;
OUString sProgPath;
};

4
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
View File

@ -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");

4
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
View File

@ -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;
};

1
framework/inc/classes/fwktabwindow.hxx
View File

@ -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;

9
framework/inc/dispatch/startmoduledispatcher.hxx
View File

@ -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();

1
framework/inc/xml/menudocumenthandler.hxx
View File

@ -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

2
framework/source/accelerators/globalacceleratorconfiguration.cxx
View File

@ -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;
};

2
framework/source/dispatch/dispatchprovider.cxx
View File

@ -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;

4
framework/source/dispatch/startmoduledispatcher.cxx
View File

@ -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)
{
}

7
framework/source/fwe/classes/addonsoptions.cxx
View File

@ -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;

3
framework/source/services/tabwindowservice.cxx
View File

@ -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 ,

2
framework/source/uiconfiguration/globalsettings.cxx
View File

@ -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 ),

3
framework/source/uielement/uicommanddescription.cxx
View File

@ -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;

3
helpcompiler/source/HelpSearch.cxx
View File

@ -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);

1
i18npool/inc/indexentrysupplier.hxx
View File

@ -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 );

1
idl/inc/database.hxx
View File

@ -59,7 +59,6 @@ class SvIdlDataBase
OUString aExportFile;
sal_uInt32 nUniqueId;
sal_uInt32 nVerbosity;
OUString aDataBaseFile;
SvPersistStream aPersStream;
StringList aIdFileList;
SvStringHashTable * pIdTable;

1
include/basic/modsizeexceeded.hxx
View File

@ -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;

4
include/helpcompiler/HelpSearch.hxx
View File

@ -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.

2
include/oox/ppt/soundactioncontext.hxx
View File

@ -41,8 +41,6 @@ private:
bool mbHasStartSound;
bool mbLoopSound;
bool mbStopSound;
OUString msEmbedded;
OUString msLink;
OUString msSndName;
};

1
include/svx/bmpmask.hxx
View File

@ -81,7 +81,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
friend class MaskData;
friend class MaskSet;
Size aLastSize;
ToolBox aTbxPipette;
ColorWindow* pCtlPipette;
PushButton aBtnExec;

1
include/svx/numvset.hxx
View File

@ -90,7 +90,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
{
OUString sBullets;
Timer aFormatTimer;
bool bGrfNotFound;

1
include/svx/tbcontrl.hxx
View File

@ -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();

1
include/toolkit/controls/unocontrols.hxx
View File

@ -363,7 +363,6 @@ class UnoImageControlControl : public UnoImageControlControl_Base
{
private:
ActionListenerMultiplexer maActionListeners;
OUString maActionCommand;
public:

1
include/vcl/edit.hxx
View File

@ -76,7 +76,6 @@ private:
OUString maPlaceholderText;
OUString maSaveValue;
OUString maUndoText;
OUString maRedoText;
long mnXOffset;
Selection maSelection;
sal_uInt16 mnAlign;

1
include/xmloff/XMLTextMasterPageContext.hxx
View File

@ -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;

2
include/xmloff/xmlnume.hxx
View File

@ -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;

1
include/xmloff/xmlnumfi.hxx
View File

@ -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;

1
include/xmloff/xmlnumi.hxx
View File

@ -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 <

1
lotuswordpro/source/filter/lwpbulletstylemgr.hxx
View File

@ -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;

1
lotuswordpro/source/filter/lwptablelayout.hxx
View File

@ -118,7 +118,6 @@ protected:
private:
//CColumnLayoutHead cColumnLayout;
LwpObjectID m_ColumnLayout;
OUString m_FrameStyleName;
LwpCellLayout * m_pDefaultCellLayout;
OUString m_DefaultColumnStyleName;
OUString m_DefaultRowStyleName;

1
lotuswordpro/source/filter/xfilter/xfcell.hxx
View File

@ -164,7 +164,6 @@ private:
sal_Int32 m_nRepeated;
enumXFValueType m_eValueType;
OUString m_strValue;
OUString m_strDisplay;
OUString m_strFormula;
bool m_bProtect;
};

3
lotuswordpro/source/filter/xfilter/xfindex.hxx
View File

@ -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;

2
oox/source/ppt/timenodelistcontext.cxx
View File

@ -885,8 +885,6 @@ namespace oox { namespace ppt {
}
private:
Any maProgress;
OUString msFilter;
OUString msPrList;
};
TimeNodeContext * TimeNodeContext::makeContext(

1
reportdesign/source/filter/xml/xmlfilter.hxx
View File

@ -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;

7
sal/qa/osl/file/osl_File.cxx
View File

@ -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;

1
sal/qa/rtl/uri/rtl_Uri.cxx
View File

@ -32,7 +32,6 @@ namespace Stringtest
class Convert : public CppUnit::TestFixture
{
rtl::OUString m_aStr;
public:
rtl::OString convertToOString(rtl::OUString const& _suStr)
{

4
sax/source/expatwrap/saxwriter.cxx
View File

@ -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

1
sc/inc/AccessibleFilterMenuItem.hxx
View File

@ -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;
};

4
sc/source/filter/excel/xiformula.cxx
View File

@ -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 )
{
}

2
sc/source/filter/excel/xilink.cxx
View File

@ -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.
};

3
sc/source/filter/inc/drawingmanager.hxx
View File

@ -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.

2
sc/source/filter/oox/worksheethelper.cxx
View File

@ -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 ),

2
sc/source/filter/xml/XMLEmptyContext.hxx
View File

@ -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(); }

1
sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
View File

@ -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)
{

1
sc/source/ui/dbgui/dpgroupdlg.cxx
View File

@ -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 )
{

1
sc/source/ui/dbgui/pfiltdlg.cxx
View File

@ -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) ),

1
sc/source/ui/inc/acredlin.hxx
View File

@ -101,7 +101,6 @@ private:
ScViewData* pViewData;
ScDocument* pDoc;
ScRangeName aLocalRangeName;
Selection theCurSel;
SvxTPFilter* pTPFilter;
SvxTPView* pTPView;
SvxRedlinTable* pTheView; // #i48648 now SvHeaderTabListBox

1
sc/source/ui/inc/dpgroupdlg.hxx
View File

@ -104,7 +104,6 @@ private:
RadioButton* mpRbManEnd;
ScDoubleField* mpEdEnd;
ScDoubleField* mpEdBy;
OKButton* mpBtnOk;
ScDPNumGroupEditHelper maStartHelper;
ScDPNumGroupEditHelper maEndHelper;
};

2
sc/source/ui/inc/fuconpol.hxx
View File

@ -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);

1
sc/source/ui/inc/highred.hxx
View File

@ -63,7 +63,6 @@ private:
ScViewData* pViewData;
ScDocument* pDoc;
ScRangeName aLocalRangeName;
Selection theCurSel;
ScRangeList aRangeList;
ScChangeViewSettings aChangeViewSet;

1
sc/source/ui/inc/pfiltdlg.hxx
View File

@ -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;

1
sc/source/ui/inc/scuiautofmt.hxx
View File

@ -48,7 +48,6 @@ private:
OUString aStrTitle;
OUString aStrLabel;
OUString aStrClose;
OUString aStrDelTitle;
OUString aStrDelMsg;
OUString aStrRename;

6
sc/source/ui/inc/simpref.hxx
View File

@ -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;

1
sc/source/ui/inc/tabbgcolordlg.hxx
View File

@ -55,7 +55,6 @@ private:
OKButton* m_pBtnOk;
Color m_aTabBgColor;
const OUString m_aTabBgColorNoColorText;
OString m_sHelpId;
void FillColorValueSets_Impl();

1
sc/source/ui/miscdlgs/scuiautofmt.cxx
View File

@ -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)

4
sc/source/ui/miscdlgs/simpref.cxx
View File

@ -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 ),

1
sc/source/ui/miscdlgs/tabbgcolordlg.cxx
View File

@ -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");

5
sc/source/ui/vba/vbaworkbooks.cxx
View File

@ -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

2
sc/source/ui/view/tabvwshc.cxx
View File

@ -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;

1
scripting/source/basprov/basprov.hxx
View File

@ -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,

2
sd/source/filter/html/htmlex.cxx
View File

@ -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),

2
sd/source/filter/html/htmlex.hxx
View File

@ -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);

6
sd/source/filter/html/sdhtmlfilter.cxx
View File

@ -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;
}

1
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
View File

@ -71,7 +71,6 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter)
mbIsMakeSelectionVisiblePending(true),
mnInsertionPosition(-1),
mnAnimationId(Animator::NotAnAnimationId),
maRequestedTopLeft(),
mpPageInsertionListener(),
mpSelectionObserver(new SelectionObserver(rSlideSorter))
{

Some files were not shown because too many files have changed in this diff Show More