loplugin:unusedmethods sfx2
Change-Id: I98c455d89f76fbcacf74929a4e8775b4da697f62
Reviewed-on: https://gerrit.libreoffice.org/17069
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index 782c1b3..6d0303d 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -35,8 +35,6 @@ to get it to work :-)
TODO deal with calls to superclass/member constructors from other constructors, so
we can find unused constructors
TODO need to handle places where the code takes the address of a method, that needs to count
as a use-site.
TODO deal with free functions and static methods
TODO track instantiations of template class constructor methods
TODO track instantiation of overridden methods when a template class is instantiated
@@ -142,9 +140,12 @@ static std::set<std::string> traversedFunctionSet;
bool UnusedMethods::VisitCallExpr(CallExpr* expr)
{
if (ignoreLocation(expr)) {
// I don't use the normal ignoreLocation() here, because I __want__ to include files that are
// compiled in the $WORKDIR since they may refer to normal code
SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( expr->getLocStart() );
if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
return true;
}
FunctionDecl* calleeFunctionDecl = expr->getDirectCallee();
if (calleeFunctionDecl == nullptr) {
return true;
@@ -166,9 +167,12 @@ bool UnusedMethods::VisitCallExpr(CallExpr* expr)
bool UnusedMethods::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl )
{
if (ignoreLocation(functionDecl)) {
// I don't use the normal ignoreLocation() here, because I __want__ to include files that are
// compiled in the $WORKDIR since they may refer to normal code
SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( functionDecl->getLocStart() );
if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
return true;
}
functionDecl = functionDecl->getCanonicalDecl();
// ignore method overrides, since the call will show up as being directed to the root method
if (functionDecl->size_overridden_methods() != 0 || functionDecl->hasAttr<OverrideAttr>()) {
@@ -203,14 +207,17 @@ bool UnusedMethods::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl )
// this catches places that take the address of a method
bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
{
if (ignoreLocation(declRefExpr)) {
// I don't use the normal ignoreLocation() here, because I __want__ to include files that are
// compiled in the $WORKDIR since they may refer to normal code
SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( declRefExpr->getLocStart() );
if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
return true;
}
const Decl* functionDecl = declRefExpr->getDecl();
if (!isa<CXXMethodDecl>(functionDecl)) {
return true;
}
logCallToRootMethods(dyn_cast<CXXMethodDecl>(functionDecl));
logCallToRootMethods(dyn_cast<CXXMethodDecl>(functionDecl)->getCanonicalDecl());
return true;
}
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 197d7954..deb061e 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -984,12 +984,6 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( vcl::Window* pPa
return 0;
}
// dialogs that use SfxBindings
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* /*pParent*/, const SfxBindings&, sal_uInt32 )
{
return 0;
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
vcl::Window* pParent, const Reference< frame::XFrame >& rxFrame,
sal_uInt32 nResId, const OUString& rParameter )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index a987ab8..dd10939 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -503,7 +503,6 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
{
public:
virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE;
virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 773b5b9..b69e84a 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1311,13 +1311,6 @@ OUString ODatabaseModelImpl::getDocumentLocation() const
// this folder is considered to be secure. So, the document URL needs to be used to decide about the security.
}
Reference< XStorage > ODatabaseModelImpl::getZipStorageToSign()
{
// we do not support signing the scripting storages, so we're allowed to
// return <NULL/> here.
return Reference< XStorage >();
}
ODatabaseModelImpl::EmbeddedMacros ODatabaseModelImpl::determineEmbeddedMacros()
{
if ( !m_aEmbeddedMacros )
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index f1f2d8ac..e086715 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -471,7 +471,6 @@ public:
virtual sal_Int16 getCurrentMacroExecMode() const SAL_OVERRIDE;
virtual bool setCurrentMacroExecMode( sal_uInt16 ) SAL_OVERRIDE;
virtual OUString getDocumentLocation() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign() SAL_OVERRIDE;
virtual bool documentStorageHasMacros() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const SAL_OVERRIDE;
virtual SignatureState getScriptingSignatureState() SAL_OVERRIDE;
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 0b986c1..11a2244c 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -120,8 +120,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
DECL_DLLPRIVATE_LINK_TYPED( GlobalBasicErrorHdl_Impl, StarBASIC*, bool );
static SfxApplication* Create();
void SettingsChange( sal_uInt16, const AppSettings & );
void Quit();
void Deinitialize();
public:
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index fe0d3af..1cf9082 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -192,7 +192,6 @@ public:
SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; }
OKButton* GetOKButton() const { return pOKBtn; }
CancelButton* GetCancelButton() const { return pCancelBtn; }
protected:
GetTabPageRanges fnGetRanges;
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 164c1bd..2e97b10 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -153,7 +153,6 @@ public:
void SetState( const SfxItemSet &rSet );
void SetState( const SfxPoolItem &rItem );
void Invalidate( sal_uInt16 nId, bool bWithItem, bool bWithMsg=false);
void Invalidate( sal_uInt16 nId, bool bWithMsg);
bool IsInUpdate() const;
void SetVisibleState( sal_uInt16 nId, bool bShow );
@@ -180,7 +179,6 @@ public:
void SetActiveFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & rFrame );
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetActiveFrame() const;
// Reconfig
bool IsInRegistrations() const;
sal_uInt16 EnterRegistrations(const char *pFile = 0, int nLine = 0);
void LeaveRegistrations( sal_uInt16 nLevel = USHRT_MAX, const char *pFile = 0, int nLine = 0 );
void Register( SfxControllerItem& rBinding );
@@ -226,28 +224,7 @@ public:
inline bool SfxBindings::IsInRegistrations() const
/* [Description]
Determines whether the <SfxContollerItems> SfxBindings instance is
registered or unregistered, i.e. <SfxBindings::EnterRegistrations()>
calls that have not been closed by <SfxBindings::LeaveRegistrations()>.
[Return value]
int sal_True
The SfxBindings instance is currently in
Registration-Mode. No status updates .
int sal_False
The SfxBindings instance is the normal mode.
Status updates can be done.
*/
{
return 0 != nRegLevel;
}
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index e2a4c52..b91b9c7 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -180,14 +180,8 @@ public:
void SetAlignment(SfxChildAlignment eAlign);
Size GetSizePixel() const
{ return pWindow->GetSizePixel(); }
void SetPosSizePixel(const Point& rPoint, const Size& rSize)
{ pWindow->SetPosSizePixel(rPoint, rSize); }
Point GetPosPixel()
{ return pWindow->GetPosPixel(); }
virtual void Hide();
virtual void Show( ShowFlags nFlags );
SfxChildWindowFlags GetFlags() const
{ return GetInfo().nFlags; }
bool CanGetFocus() const;
sal_uInt16 GetPosition();
sal_uInt16 GetType()
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index a8b7d04..353c59a 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -108,13 +108,12 @@ public:
void setAutoloadEnabled(bool i_val) { m_isAutoloadEnabled = i_val; }
sal_Int32 getAutoloadDelay() const { return m_AutoloadDelay; }
void setAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; }
OUString getAutoloadURL() const { return m_AutoloadURL; }
OUString getAutoloadURL() const { return m_AutoloadURL; }
void setAutoloadURL(const OUString& i_val) { m_AutoloadURL = i_val; }
OUString getDefaultTarget() const { return m_DefaultTarget; }
OUString getDefaultTarget() const { return m_DefaultTarget; }
void setDefaultTarget(const OUString& i_val) { m_DefaultTarget = i_val; }
OUString getTemplateName() const { return m_TemplateName; }
void setTemplateName(const OUString& i_val) { m_TemplateName = i_val; }
OUString getAuthor() const { return m_Author; }
OUString getTemplateName() const { return m_TemplateName; }
OUString getAuthor() const { return m_Author; }
void setAuthor(const OUString& i_val) { m_Author = i_val; }
::com::sun::star::util::DateTime
@@ -298,37 +297,25 @@ public:
class CustomPropertiesDateField : public DateField
{
private:
CustomPropertyLine* m_pLine;
public:
::boost::optional<sal_Int16> m_TZ;
CustomPropertiesDateField(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine)
CustomPropertiesDateField(vcl::Window* pParent, WinBits nStyle)
: DateField(pParent, nStyle)
, m_pLine(pLine)
{
}
CustomPropertyLine* GetLine() const { return m_pLine; }
};
class CustomPropertiesTimeField : public TimeField
{
private:
CustomPropertyLine* m_pLine;
public:
bool m_isUTC;
CustomPropertiesTimeField(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine)
CustomPropertiesTimeField(vcl::Window* pParent, WinBits nStyle)
: TimeField(pParent, nStyle)
, m_pLine(pLine)
, m_isUTC(false)
{
}
CustomPropertyLine* GetLine() const { return m_pLine; }
};
class CustomPropertiesDurationField : public Edit
@@ -471,7 +458,6 @@ public:
GetCustomProperties() const;
void SetRemovedHdl( const Link<>& rLink ) { m_aRemovedHdl = rLink; }
void InitRemoveButton(const ScrollBar &rScrollBar);
void updateLineWidth();
};
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index df4ca5a..aa9949a 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -172,13 +172,11 @@ public:
sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 );
void HideUI( bool bHide = true );
void ShowObjectBar(sal_uInt16 nId, SfxShell *pShell=0) const;
sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const;
SfxItemState QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState );
SfxItemState QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny );
::com::sun::star::frame::XDispatch* GetDispatchInterface( const OUString& );
void SetDisableFlags( sal_uInt32 nFlags );
sal_uInt32 GetDisableFlags() const;
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 389829f..21568fe 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -169,7 +169,6 @@ public:
css::uno::Reference< css::embed::XStorage > GetOutputStorage();
void ResetError();
SAL_WARN_UNUSED_RESULT bool UsesCache() const;
void SetUsesCache( bool );
SAL_WARN_UNUSED_RESULT bool IsExpired() const;
void SetName( const OUString& rName, bool bSetOrigURL = false );
SAL_WARN_UNUSED_RESULT bool IsAllowedForExternalBrowser() const;
@@ -233,7 +232,6 @@ public:
SAL_DLLPRIVATE void SetLongName(const OUString &rName);
SAL_DLLPRIVATE const OUString & GetLongName() const;
SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( bool bSilent, bool bAllowRO = true );
SAL_DLLPRIVATE bool IsPreview_Impl();
SAL_DLLPRIVATE void ClearBackup_Impl();
SAL_DLLPRIVATE void Done_Impl( ErrCode );
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 3eef56a..19e6ec0 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -81,7 +81,6 @@ public:
bool IsAlienFormat() const { return bool(nFormatType & SfxFilterFlags::ALIEN); }
bool CanImport() const { return bool(nFormatType & SfxFilterFlags::IMPORT); }
bool CanExport() const { return bool(nFormatType & SfxFilterFlags::EXPORT); }
bool IsInternal() const { return bool(nFormatType & SfxFilterFlags::INTERNAL); }
SfxFilterFlags GetFilterFlags() const { return nFormatType; }
const OUString& GetFilterName() const { return maFilterName; }
const OUString& GetMimeType() const { return aMimeType; }
@@ -91,13 +90,11 @@ public:
SotClipboardFormatId GetFormat() const { return lFormat; }
const OUString& GetTypeName() const { return aTypeName; }
const OUString& GetUIName() const { return aUIName; }
sal_uInt16 GetDocIconId() const { return nDocIcon; }
const OUString& GetUserData() const { return aUserData; }
const OUString& GetDefaultTemplate() const { return aDefaultTemplate; }
void SetDefaultTemplate( const OUString& rStr ) { aDefaultTemplate = rStr; }
bool UsesStorage() const { return GetFormat() != SotClipboardFormatId::NONE; }
void SetURLPattern( const OUString& rStr );
OUString GetURLPattern() const { return aPattern; }
void SetUIName( const OUString& rName ) { aUIName = rName; }
void SetVersion( sal_uIntPtr nVersionP ) { nVersion = nVersionP; }
sal_uIntPtr GetVersion() const { return nVersion; }
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 0a36f7c..1933be7 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -52,8 +52,6 @@ private:
protected:
SfxChildAlignment CalcAlignment(const Point& rPos, Rectangle& rRect );
void CalcSplitPosition(const Point rPos, Rectangle& rRect,
SfxChildAlignment eAlign);
virtual Size CalcDockingSize(SfxChildAlignment);
virtual SfxChildAlignment
CheckAlignment(SfxChildAlignment,SfxChildAlignment);
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index f245962..54a477f 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -102,21 +102,6 @@ namespace sfx2
virtual OUString
getDocumentLocation() const = 0;
/** returns a zip-storage based on the last committed version of the document,
for readonly access
The storage is intended to be used for signing. An implementation is
allowed to return <NULL/> here if and only if the document
does not support signing the script storages.
@todo
UNOize this, too. Once we have a getDocumentModel, we should be able to
obtain the "last commit" storage via UNO API, provided it's an
XStorageBasedDocument.
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
getZipStorageToSign() = 0;
/** checks whether the document's storage contains sub storages with macros or scripts
A default implementation of this method will simply cann DocumentMacroMode::storageHasMacros
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index 0bbec08..f84848b 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -55,8 +55,6 @@ public:
SfxDocumentTemplates(const SfxDocumentTemplates &);
~SfxDocumentTemplates();
bool IsConstructed() { return pImp != NULL; }
const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &);
void ReInitFromComponent();
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index dbb0fa7..e3a01c8 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -84,27 +84,18 @@ public:
class SfxNamedHint : public SfxHint
{
OUString _aEventName;
SfxObjectShell* _pObjShell;
OUString _aArgs;
public:
SfxNamedHint( const OUString& rName,
const OUString& rArgs,
SfxObjectShell *pObj = 0 )
const OUString& rArgs )
: _aEventName( rName ),
_pObjShell( pObj),
_aArgs( rArgs )
{}
SfxNamedHint( const OUString& rName,
SfxObjectShell *pObj = 0 )
: _aEventName( rName ),
_pObjShell( pObj )
SfxNamedHint( const OUString& rName )
: _aEventName( rName )
{}
const OUString& GetArgs() const { return _aArgs;}
const OUString& GetName() const { return _aEventName; }
SfxObjectShell* GetObjShell() const { return _pObjShell; }
};
class Printer;
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 371c716..67eb07a 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -90,7 +90,6 @@ public:
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE;
const SfxEventNamesList& GetEvents() const { return aEventsList;}
void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; }
void AddEvent( const OUString&, const OUString&, sal_uInt16 );
};
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 91a8017..c44dcd2 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -52,7 +52,6 @@ public:
{ return new SfxRefItem( *this ); }
virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE
{ return static_cast<const SfxRefItem&>(rL).maRef == maRef; }
const tools::SvRef<SvRefBase>& GetValue() const { return maRef; }
};
class SfxFrameWindow
@@ -64,10 +63,6 @@ public:
{}
virtual ~SfxFrameWindow() {}
vcl::Window* GetWindow() const
{ return pWindow; }
void SetWindow( vcl::Window *pWin )
{ pWindow = pWin; }
};
typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 6c2512a..4db39d4 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -149,9 +149,6 @@ public:
SAL_DLLPRIVATE SfxFrame* GetContainingDocFrame_Impl( SfxFrame* pSelf );
void UpdateDescriptor( SfxObjectShell *pDoc );
void Resize();
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
GetComponent() const;
void ReleaseComponent();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
GetFrameInterface() const;
void Appear();
@@ -239,8 +236,6 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
bool FrameKilled() const { return &wFrame != pFrame; }
SfxFrame* GetFrame() const
{ return wFrame; }
};
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 3cac2f5..4ee235b 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -155,7 +155,6 @@ public:
bool IsSynchron() const { return bSynchron; }
void SetSynchron( bool bFlag ) { bSynchron = bFlag; }
bool IsUseCache() const { return bUseCache; }
void SetUseCache( bool bFlag ) { bUseCache = bFlag; }
void setStreamToLoadFrom(
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index db322d4..a934d50 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -47,10 +47,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
OUString GetComment() const
{ return aCommentText; }
void SetComment( const OUString& r )
{ aCommentText = r; }
OUString GetMethod() const
{ return aMethodName; }
void SetMethod( const OUString& r )
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index 3f6586f..e386423 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -62,7 +62,6 @@ public:
OUString GetTitle() const;
SfxVirtualMenu* GetPopupMenu() const;
virtual PopupMenu* GetPopup() const;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 40819b7..1ca0ed0 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -127,8 +127,6 @@ struct SfxType0
const TypeId& Type() const
{ return aTypeId; }
SfxPoolItem* CreateItem() const
{ return static_cast<SfxPoolItem*>(aTypeId()); }
};
#define SFX_DECL_TYPE(n) struct SfxType##n \
@@ -246,7 +244,6 @@ public:
SfxSlotKind GetKind() const;
sal_uInt16 GetSlotId() const;
sal_uIntPtr GetHelpId() const;
SfxSlotMode GetMode() const;
bool IsMode( SfxSlotMode nMode ) const;
sal_uInt16 GetGroupId() const;
@@ -278,15 +275,6 @@ inline sal_uInt16 SfxSlot::GetSlotId() const
return nSlotId;
}
// returns the help-id of the slot
inline sal_uIntPtr SfxSlot::GetHelpId() const
{
return nHelpId;
}
// returns a bitfield with flags
inline SfxSlotMode SfxSlot::GetMode() const
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index 2e3abdb..cd5e278 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -60,7 +60,6 @@ public:
const SfxSlot* FirstSlot();
const SfxSlot* NextSlot();
const SfxSlot* GetSlot( sal_uInt16 nId );
const SfxSlot* GetUnoSlot( sal_uInt16 nId );
const SfxSlot* GetUnoSlot( const OUString& rUnoName );
TypeId GetSlotType( sal_uInt16 nSlotId ) const;
};
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index ce8ab30..06b0c296 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -461,14 +461,12 @@ public:
// Transfer IFace
void AbortImport();
bool IsAbortingImport() const;
bool IsReloading() const;
void FinishedLoading( SfxLoadedFlags nWhich = SfxLoadedFlags::ALL );
void TemplateDisconnectionAfterLoad();
bool IsLoading() const;
bool IsLoadingFinished() const;
void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, bool bReload = true );
bool IsAutoLoadLocked() const;
void NotifyReloadAvailable();
// Misc
bool IsPreview() const;
@@ -498,10 +496,6 @@ public:
// Contents
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
void SetStyleSheetPool(SfxStyleSheetBasePool *pBasePool )
{
pStyleSheetPool = pBasePool;
}
virtual void LoadStyles(SfxObjectShell &rSource);
@@ -520,9 +514,6 @@ public:
virtual std::set<Color> GetDocColors();
void ReadNote( INote * );
void UpdateNote( INote * );
// Documents, for which to format the view size
virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE;
@@ -838,9 +829,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
SfxObjectShell* GetObjectShell() const
{ return pObjSh; }
};
#endif
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 0c91fab..30bb095 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -118,7 +118,6 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog
public:
virtual ~SfxAbstractDialogFactory(); // needed for export of vtable
static SfxAbstractDialogFactory* Create();
virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0;
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
vcl::Window* pParent,
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index 8425059..5ff4361 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -45,9 +45,6 @@ public:
SfxHelp();
virtual ~SfxHelp();
inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; }
inline void SetUser( const OUString& rUser ) { aUser = rUser; }
virtual OUString GetHelpText( const OUString&, const vcl::Window* pWindow ) SAL_OVERRIDE;
static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName );
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 5713452..b21943f 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -286,7 +286,6 @@ public:
Asynchronous ExecuteSlot for the RELOAD
*/
const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, bool bAsync );
sal_uIntPtr ExecuteSlot( sal_uInt16 nSlot, sal_uInt16 nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 );
inline SfxItemPool& GetPool() const;
inline void SetPool( SfxItemPool *pNewPool ) ;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 84e1a07..3fc2c41 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -145,21 +145,11 @@ public:
GetTabPageRanges pRangesFunc, // can be 0
bool bItemsOnDemand = false,
sal_uInt16 nPos = TAB_APPEND);
void AddTabPage( sal_uInt16 nId,
const Bitmap &rRiderBitmap,
CreateTabPage pCreateFunc, // != 0
GetTabPageRanges pRangesFunc, // can be 0
bool bItemsOnDemand = false,
sal_uInt16 nPos = TAB_APPEND);
void AddTabPage( sal_uInt16 nId,
const OUString &rRiderText,
bool bItemsOnDemand = false,
sal_uInt16 nPos = TAB_APPEND);
void AddTabPage( sal_uInt16 nId,
const Bitmap &rRiderBitmap,
bool bItemsOnDemand = false,
sal_uInt16 nPos = TAB_APPEND);
void RemoveTabPage( const OString& rName ); // Name of the label for the page in the notebook .ui
void RemoveTabPage( sal_uInt16 nId );
@@ -198,8 +188,6 @@ public:
PushButton& GetOKButton() { return *m_pOKBtn; }
const CancelButton& GetCancelButton() const { return *m_pCancelBtn; }
CancelButton& GetCancelButton() { return *m_pCancelBtn; }
const HelpButton& GetHelpButton() const { return *m_pHelpBtn; }
HelpButton& GetHelpButton() { return *m_pHelpBtn; }
const PushButton* GetUserButton() const { return m_pUserBtn; }
PushButton* GetUserButton() { return m_pUserBtn; }
@@ -212,7 +200,6 @@ public:
const SfxItemSet* GetExampleSet() const { return pExampleSet; }
SfxItemSet* GetExampleSet() { return pExampleSet; }
SfxViewFrame* GetViewFrame() const { return pFrame; }
void SetApplyHandler(const Link<>& _rHdl);
@@ -239,9 +226,7 @@ private:
protected:
SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet);
sal_uInt16 GetSlot( sal_uInt16 nWhich ) const
{ return pSet->GetPool()->GetSlotId( nWhich ); }
sal_uInt16 GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const
sal_uInt16 GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const
{ return pSet->GetPool()->GetWhich( nSlot, bDeep ); }
const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep = true );
SfxTabDialog* GetTabDialog() const;
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 4574fd1..ac87d6b 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -138,7 +138,6 @@ public:
virtual ~SfxPopupWindow();
virtual void dispose() SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
void StartCascading();
@@ -349,8 +348,6 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
virtual ~SfxAddonsToolBoxControl_Impl();
void RefreshMenuImages( Menu* pMenu );
};
#endif
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 26e3eb15..dc710cb 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -56,9 +56,6 @@ public:
SfxUnoControllerItem( SfxControllerItem*, SfxBindings&, const OUString& );
virtual ~SfxUnoControllerItem();
const ::com::sun::star::util::URL& GetCommand() const
{ return aCommand; }
// XStatusListener
virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index e1e831f..c89915b 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -160,8 +160,6 @@ public:
{ return GetFrame().GetTopFrame(); }
void GetTargetList( TargetList& rList ) const
{ GetFrame().GetTargetList( rList ); }
void CancelTransfers()
{ GetFrame().CancelTransfers(); }
void SetModalMode( bool );
bool IsInModalMode() const;
@@ -317,7 +315,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; }
};
#endif
diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx
index 3a8793f..aadd8bb 100644
--- a/include/svx/SmartTagCtl.hxx
+++ b/include/svx/SmartTagCtl.hxx
@@ -69,7 +69,6 @@ public:
SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& );
virtual ~SvxSmartTagsControl();
virtual PopupMenu* GetPopup() const SAL_OVERRIDE;
SFX_DECL_MENU_CONTROL();
};
diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx
index bc38265..4b671b1 100644
--- a/include/svx/fntctl.hxx
+++ b/include/svx/fntctl.hxx
@@ -46,8 +46,6 @@ public:
SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
virtual ~SvxFontMenuControl();
virtual PopupMenu* GetPopup() const SAL_OVERRIDE;
SFX_DECL_MENU_CONTROL();
};
diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx
index 1e514ea..c5ee10a 100644
--- a/include/svx/fntszctl.hxx
+++ b/include/svx/fntszctl.hxx
@@ -46,8 +46,6 @@ public:
SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
virtual ~SvxFontSizeMenuControl();
virtual PopupMenu* GetPopup() const SAL_OVERRIDE;
SFX_DECL_MENU_CONTROL();
};
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index f2d0da5..2c6b4e8 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -124,7 +124,6 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
};
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 2b76efc..696666b 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -423,7 +423,6 @@ public:
SdrModel* pModel,
const SdrObject* pObj = NULL,
bool bHasObj = true )=0;
virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0;
virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
const SdrView* pView,
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 79a6981..4280793 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -34,7 +34,6 @@ public:
BitSet();
BitSet( const BitSet& rOrig );
~BitSet();
sal_uInt16 Count() const;
BitSet& operator=( const BitSet& rOrig );
BitSet& operator=( sal_uInt16 nBit );
BitSet operator|( const BitSet& rSet ) const;
@@ -63,12 +62,6 @@ inline bool BitSet::operator!() const
return nCount == 0;
}
// returns the number of bits in the bitset
inline sal_uInt16 BitSet::Count() const
{
return nCount;
}
// creates the union of two bitset
inline BitSet BitSet::operator|( const BitSet& rSet ) const
{
diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx
index 9b64734..11b09e8 100644
--- a/sfx2/source/appl/childwinimpl.cxx
+++ b/sfx2/source/appl/childwinimpl.cxx
@@ -69,11 +69,6 @@ SfxChildWinFactArr_Impl::iterator SfxChildWinFactArr_Impl::begin()
return maData.begin();
}
SfxChildWinFactArr_Impl::const_iterator SfxChildWinFactArr_Impl::begin() const
{
return maData.begin();
}
SfxFrameArr_Impl::iterator SfxFrameArr_Impl::begin()
{
return maData.begin();
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index b4cd38f..94224fb 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -114,10 +114,8 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
static OUString GetUrlDescription( const OUString& aUrl );
void SetVeto( bool bVeto ) { m_bVeto = bVeto;}
bool GetVeto() { return m_bVeto; }
void StartFileDialog();
sfx2::FileDialogHelper* GetFileDialog() const { return m_pFileDlg; }
DECL_LINK(DialogClosedHdl_Impl, sfx2::FileDialogHelper*);
static bool IsQuickstarterInstalled();
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index eb65995..28ea2d0 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1392,8 +1392,8 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) :
m_aNameBox ( VclPtr<ComboBox>::Create(pParent, SfxResId( SFX_CB_PROPERTY_NAME )) ),
m_aTypeBox ( VclPtr<CustomPropertiesTypeBox>::Create(pParent, SfxResId( SFX_LB_PROPERTY_TYPE ), this) ),
m_aValueEdit ( VclPtr<CustomPropertiesEdit>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_LEFT, this ) ),
m_aDateField ( VclPtr<CustomPropertiesDateField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT, this ) ),
m_aTimeField ( VclPtr<CustomPropertiesTimeField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT, this ) ),
m_aDateField ( VclPtr<CustomPropertiesDateField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ),
m_aTimeField ( VclPtr<CustomPropertiesTimeField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ),
m_sDurationFormat( SfxResId( SFX_ST_DURATION_FORMAT ).toString() ),
m_aDurationField( VclPtr<CustomPropertiesDurationField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_READONLY, this ) ),
m_aEditButton ( VclPtr<CustomPropertiesEditButton>::Create(pParent, WB_TABSTOP, this) ),
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index e66d596..ff6099d 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1899,18 +1899,6 @@ OUString SfxObjectShell_Impl::getDocumentLocation() const
return sLocation;
}
uno::Reference< embed::XStorage > SfxObjectShell_Impl::getZipStorageToSign()
{
Reference < embed::XStorage > xStore;
SfxMedium* pMedium( rDocShell.GetMedium() );
OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getLastCommitDocumentStorage: no medium!" );
if ( pMedium )
xStore = pMedium->GetZipStorageToSign_Impl();
return xStore;
}
bool SfxObjectShell_Impl::documentStorageHasMacros() const
{
return ::sfx2::DocumentMacroMode::storageHasMacros( m_xDocStorage );
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index 8e0d5f8..a83be82 100644
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
@@ -91,10 +91,6 @@ public:
private:
void impl_releaseContainers();
bool impl_getContainer(
ContainerType _eType,
::com::sun::star::uno::Reference< ::com::sun::star::script::XStorageBasedLibraryContainer >& _out_rxContainer );
};
#endif // INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
diff --git a/sfx2/source/inc/childwinimpl.hxx b/sfx2/source/inc/childwinimpl.hxx
index 8a78dfc..e30f79f 100644
--- a/sfx2/source/inc/childwinimpl.hxx
+++ b/sfx2/source/inc/childwinimpl.hxx
@@ -54,7 +54,6 @@ public:
void erase( iterator it );
iterator begin();
const_iterator begin() const;
};
class SfxFrameArr_Impl
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 794af0b..c32d564 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -144,7 +144,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
virtual sal_Int16 getCurrentMacroExecMode() const SAL_OVERRIDE;
virtual bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ) SAL_OVERRIDE;
virtual OUString getDocumentLocation() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign() SAL_OVERRIDE;
virtual bool documentStorageHasMacros() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const SAL_OVERRIDE;
virtual SignatureState getScriptingSignatureState() SAL_OVERRIDE;
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 258f829..487142b 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -79,7 +79,6 @@ struct StringList_Impl : private Resource
: Resource( rErrIdP ), aResId(nId, *rErrIdP.GetResMgr()) {}
~StringList_Impl() { FreeResource(); }
OUString GetString() { return aResId.toString(); }
operator bool() { return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
};
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index c71c9c0..079eaf1 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -87,52 +87,24 @@ public:
void EnableItem( sal_uInt16 nItemId, bool bEnable );
void SetItemText( sal_uInt16 nItemId, const OUString& rText );
sal_uInt16 GetItemCount() const;
Menu* GetSVMenu() const { return pSVMenu;}
SfxMenuControl& operator[]( sal_uInt16 nPos ) const;
sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
SfxVirtualMenu* GetParentMenu() const { return pParent; }
void SetParentMenu( SfxVirtualMenu* pNewParent )
{ pParent = pNewParent; }
void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
bool IsFromResource() const
{ return bResCtor; }
void InitPopup(sal_uInt16 nPos, bool bOLE = true);
void InitializeHelp();
void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; }
ResMgr* GetResMgr() { return pResMgr; }
DECL_LINK( Select, Menu * );
};
// return the number of virtual items in this menu
inline sal_uInt16 SfxVirtualMenu::GetItemCount() const
{
return nCount;
}
inline SfxMenuControl& SfxVirtualMenu::operator[]( sal_uInt16 nPos ) const
{
return *(pItems+nPos);
}
// returns the item id at position nPos in the menu (or 0 if sep.)
inline sal_uInt16 SfxVirtualMenu::GetItemId( sal_uInt16 nPos ) const
{
return pItems ? pItems[nPos].GetId() : 0;
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 6fcc88e..e5e3648 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -166,8 +166,6 @@ struct SfxObjectBarList_Impl
SfxObjectBar_Impl operator[] ( sal_uInt16 n )
{ return aArr[n]; }
SfxObjectBar_Impl Actual()
{ return aArr[nAct]; }
};
#define SFX_SPLITWINDOWS_LEFT 0
@@ -292,7 +290,6 @@ public:
bool IsAutoHideMode( const SfxSplitWindow *pSplit );
void EndAutoShow_Impl( Point aPos );
void SetFullScreen_Impl( bool bSet ) { bIsFullScreen = bSet; }
bool IsFullScreen_Impl() const { return bIsFullScreen; }
// Methods for Objectbars
virtual void UpdateObjectBars_Impl();
@@ -302,8 +299,6 @@ public:
bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
bool IsVisible_Impl();
void MakeVisible_Impl( bool );
void SetObjectBarVisibility_Impl( sal_uInt16 nVis );
bool IsContainer_Impl() const;
void Lock_Impl( bool );
// Methods for ChildWindows
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index be6a260..1f9d232 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -291,14 +291,6 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
PopupMenu* SfxMenuControl::GetPopup () const
{
if (GetPopupMenu())
return static_cast<PopupMenu*>(GetPopupMenu()->GetSVMenu());
else
return 0;
}
SfxUnoMenuControl* SfxMenuControl::CreateControl( const OUString& rCmd,
sal_uInt16 nId, Menu& rMenu, const OUString& sItemText,
SfxBindings& rBindings, SfxVirtualMenu* pVirt)
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 17a5be0..99c466c 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1318,24 +1318,6 @@ void SfxPopupWindow::StartCascading()
VclPtr<SfxPopupWindow> SfxPopupWindow::Clone() const
/* [Description]
This method must be overridden to show this Popup also in the
Presentation-mode. It is called when a Show() would be meaningless
since the parent is no presentation window.
When create a new window the bew Top-Window will be used automatically,
so that the Parent becomes the presentation window and that the new
Popup therefore becomes visible.
*/
{
return 0;
}
void SfxPopupWindow::StateChanged(
sal_uInt16 /*nSID*/,
SfxItemState eState,
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 97b887f..baa04e2 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -196,10 +196,4 @@ SvxSmartTagsControl::~SvxSmartTagsControl()
PopupMenu* SvxSmartTagsControl::GetPopup() const
{
return mpMenu;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 3dd0995..197fe7b 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -152,18 +152,4 @@ SvxFontMenuControl::~SvxFontMenuControl()
delete pMenu;
}
/* [Beschreibung]
Gibt das Men"u zur"uck
*/
PopupMenu* SvxFontMenuControl::GetPopup() const
{
return pMenu;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index ae0c13c..7dcb0ef 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -188,15 +188,4 @@ SvxFontSizeMenuControl::~SvxFontSizeMenuControl()
/* [Beschreibung]
Gibt das Men"u zur"uck
*/
PopupMenu* SvxFontSizeMenuControl::GetPopup() const
{
return pMenu;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 0aac529..97cccc5 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -74,7 +74,6 @@ public:
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
void SetSelectedHdl( const Link<>& rLink ) { maSelectedLink = rLink; }
};
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index cbb84d2..96edbf0 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -54,7 +54,6 @@ private:
long nLine;
bool bInitialKeyInput;
bool m_bMod1;
ToolBox& rTbx;
Reference< XFrame > mxFrame;
OUString maCommand;
@@ -76,7 +75,6 @@ public:
TableWindow( sal_uInt16 nSlotId,
const OUString& rCmd,
const OUString& rText,
ToolBox& rParentTbx,
const Reference< XFrame >& rFrame );
virtual ~TableWindow();
virtual void dispose() SAL_OVERRIDE;
@@ -86,7 +84,6 @@ public:
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE;
virtual void PopupModeEnd() SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
private:
void Update( long nNewCol, long nNewLine );
@@ -108,14 +105,13 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl)
TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText,
ToolBox& rParentTbx, const Reference< XFrame >& rFrame )
const Reference< XFrame >& rFrame )
: SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) )
, aTableButton( VclPtr<PushButton>::Create(this) )
, nCol( 0 )
, nLine( 0 )
, bInitialKeyInput(false)
, m_bMod1(false)
, rTbx(rParentTbx)
, mxFrame( rFrame )
, maCommand( rCmd )
, mnTablePosX(2)
@@ -166,13 +162,6 @@ void TableWindow::dispose()
SfxPopupWindow::dispose();
}
VclPtr<SfxPopupWindow> TableWindow::Clone() const
{
return VclPtr<TableWindow>::Create( GetId(), maCommand, GetText(), rTbx, mxFrame );
}
void TableWindow::MouseMove( const MouseEvent& rMEvt )
{
SfxPopupWindow::MouseMove( rMEvt );
@@ -421,13 +410,12 @@ private:
long nTextHeight;
bool bInitialKeyInput;
bool m_bMod1;
ToolBox& rTbx;
Reference< XFrame > mxFrame;
OUString maCommand;
void UpdateSize_Impl( long nNewCol );
public:
ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString &rText, const Reference< XFrame >& rFrame );
void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -435,16 +423,14 @@ public:
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE;
virtual void PopupModeEnd() SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
};
ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, const Reference< XFrame >& rFrame ) :
SfxPopupWindow( nId, rFrame, WB_STDPOPUP ),
bInitialKeyInput(true),
m_bMod1(false),
rTbx(rParentTbx),
mxFrame(rFrame),
maCommand( rCmd )
{
@@ -477,13 +463,6 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri
VclPtr<SfxPopupWindow> ColumnsWindow::Clone() const
{
return VclPtr<ColumnsWindow>::Create( GetId(), maCommand, GetText(), rTbx, mxFrame );
}
void ColumnsWindow::MouseMove( const MouseEvent& rMEvt )
{
SfxPopupWindow::MouseMove( rMEvt );
@@ -737,7 +716,7 @@ VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow()
if ( bEnabled )
{
ToolBox& rTbx = GetToolBox();
VclPtr<TableWindow> pWin = VclPtr<TableWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), rTbx, m_xFrame );
VclPtr<TableWindow> pWin = VclPtr<TableWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), m_xFrame );
pWin->StartPopupMode( &rTbx, FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoKeyClose );
SetPopupWindow( pWin );
return pWin;
@@ -784,7 +763,7 @@ VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow()
ColumnsWindow* pWin = 0;
if(bEnabled)
{
pWin = VclPtr<ColumnsWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), GetToolBox(), m_xFrame );
pWin = VclPtr<ColumnsWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), m_xFrame );
pWin->StartPopupMode( &GetToolBox(),
FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoKeyClose );
SetPopupWindow( pWin );
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 4284a5f..820494c 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -66,7 +66,6 @@ public:
virtual void dispose() SAL_OVERRIDE;
// SfxPopupWindow
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
virtual void PopupModeEnd() SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
@@ -109,11 +108,6 @@ void SvxPopupWindowListBox::dispose()
SfxPopupWindow::dispose();
}
VclPtr<SfxPopupWindow> SvxPopupWindowListBox::Clone() const
{
return VclPtr<SvxPopupWindowListBox>::Create( GetId(), maCommandURL, nTbxId, rToolBox );
}
void SvxPopupWindowListBox::PopupModeEnd()
{
rToolBox.EndSelection();
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 903eca9..c764c67 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -320,13 +320,6 @@ void SvxLineEndWindow::implInit()
aLineEndSet->Show();
}
VclPtr<SfxPopupWindow> SvxLineEndWindow::Clone() const
{
return VclPtr<SvxLineEndWindow>::Create( GetId(), mxFrame, GetText() );
}
SvxLineEndWindow::~SvxLineEndWindow()
{
disposeOnce();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 65337b3..de0933b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -265,7 +265,6 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
};
@@ -287,7 +286,6 @@ public:
SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow );
virtual ~SvxLineWindow_Impl() { disposeOnce(); }
virtual void dispose() SAL_OVERRIDE { m_aLineStyleLb.disposeAndClear(); SfxPopupWindow::dispose(); }
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
};
class SvxStyleToolBoxControl;
@@ -1336,11 +1334,6 @@ void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt )
mpColorSet->KeyInput(rKEvt);
}
VclPtr<SfxPopupWindow> SvxColorWindow_Impl::Clone() const
{
return VclPtr<SvxColorWindow_Impl>::Create( maCommand, mrPaletteManager, mrBorderColorStatus, theSlotId, GetFrame(), GetText(), GetParent() );
}
IMPL_LINK(SvxColorWindow_Impl, SelectHdl, SvxColorValueSet*, pColorSet)
{
Color aColor = pColorSet->GetItemColor( pColorSet->GetSelectItemId() );
@@ -1623,12 +1616,6 @@ void SvxFrameWindow_Impl::dispose()
SfxPopupWindow::dispose();
}
VclPtr<SfxPopupWindow> SvxFrameWindow_Impl::Clone() const
{
//! HACK: How do I get the Paragraph mode?
return VclPtr<SvxFrameWindow_Impl>::Create( GetId(), GetFrame(), GetParent() );
}
vcl::Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow()
{
return aFrameSet.get();
@@ -1894,11 +1881,6 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame
m_aLineStyleLb->Show();
}
VclPtr<SfxPopupWindow> SvxLineWindow_Impl::Clone() const
{
return VclPtr<SvxLineWindow_Impl>::Create( GetId(), GetFrame(), GetParent() );
}
IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
{
SvxLineItem aLineItem( SID_FRAME_LINESTYLE );
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 31bf973..4ebe14f 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -129,7 +129,6 @@ public:
static OUString GetQuickHelpText(bool bNext);
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
void GrabFocus() { m_pToolBox->GrabFocus(); }
};
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 99d1cfd..8370f4f 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -373,11 +373,6 @@ void SwScrollNaviPopup::ApplyImageList()
}
}
VclPtr<SfxPopupWindow> SwScrollNaviPopup::Clone() const
{
return VclPtr<SwScrollNaviPopup>::Create( GetId(), GetFrame(), GetParent() );
}
IMPL_LINK_TYPED(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet, void)
{
sal_uInt16 nSet = pSet->GetCurItemId();
