Kaydet (Commit) d5630adf authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:checkunusedparams in various

Change-Id: I4f54940a9ebdcd47776b2a5f7bae6e49b633ee44
Reviewed-on: https://gerrit.libreoffice.org/40706Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 70d0425d
...@@ -403,7 +403,8 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { ...@@ -403,7 +403,8 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
return true; return true;
// used in template magic // used in template magic
if (fqn == "MtfRenderer::MtfRenderer" || fqn == "shell::sessioninstall::SyncDbusSessionHelper::SyncDbusSessionHelper" if (fqn == "MtfRenderer::MtfRenderer" || fqn == "shell::sessioninstall::SyncDbusSessionHelper::SyncDbusSessionHelper"
|| fqn == "dp_gui::LicenseDialog::LicenseDialog") || fqn == "dp_gui::LicenseDialog::LicenseDialog"
|| fqn == "(anonymous namespace)::OGLTransitionFactoryImpl::OGLTransitionFactoryImpl")
return true; return true;
// FIXME // FIXME
if (fqn == "GtkSalDisplay::filterGdkEvent" || fqn == "SvXMLEmbeddedObjectHelper::ImplReadObject" if (fqn == "GtkSalDisplay::filterGdkEvent" || fqn == "SvXMLEmbeddedObjectHelper::ImplReadObject"
......
...@@ -115,10 +115,8 @@ void RptMLMasterStylesContext_Impl::EndElement() ...@@ -115,10 +115,8 @@ void RptMLMasterStylesContext_Impl::EndElement()
ErrCode ReadThroughComponent( ErrCode ReadThroughComponent(
const uno::Reference<XInputStream>& xInputStream, const uno::Reference<XInputStream>& xInputStream,
const uno::Reference<XComponent>& xModelComponent, const uno::Reference<XComponent>& xModelComponent,
const sal_Char* /*pStreamName*/,
const uno::Reference<XComponentContext> & rContext, const uno::Reference<XComponentContext> & rContext,
const uno::Reference< XDocumentHandler >& _xFilter, const uno::Reference< XDocumentHandler >& _xFilter )
bool /*bEncrypted*/ )
{ {
OSL_ENSURE(xInputStream.is(), "input stream missing"); OSL_ENSURE(xInputStream.is(), "input stream missing");
OSL_ENSURE(xModelComponent.is(), "document missing"); OSL_ENSURE(xModelComponent.is(), "document missing");
...@@ -255,10 +253,8 @@ ErrCode ReadThroughComponent( ...@@ -255,10 +253,8 @@ ErrCode ReadThroughComponent(
// read from the stream // read from the stream
return ReadThroughComponent( xInputStream return ReadThroughComponent( xInputStream
,xModelComponent ,xModelComponent
,pStreamName
,rxContext ,rxContext
,xDocHandler ,xDocHandler );
,bEncrypted );
} }
// TODO/LATER: better error handling // TODO/LATER: better error handling
...@@ -642,7 +638,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, ...@@ -642,7 +638,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
break; break;
case XML_TOK_DOC_META: case XML_TOK_DOC_META:
GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
pContext = CreateMetaContext( rLocalName,xAttrList ); pContext = CreateMetaContext( rLocalName );
break; break;
default: default:
break; break;
...@@ -983,7 +979,7 @@ void ORptFilter::insertFunction(const css::uno::Reference< css::report::XFunctio ...@@ -983,7 +979,7 @@ void ORptFilter::insertFunction(const css::uno::Reference< css::report::XFunctio
m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction)); m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction));
} }
SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&) SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName)
{ {
SvXMLImportContext* pContext = nullptr; SvXMLImportContext* pContext = nullptr;
......
...@@ -96,8 +96,7 @@ private: ...@@ -96,8 +96,7 @@ private:
SvXMLImportContext* CreateStylesContext(const OUString& rLocalName, SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle ); const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
SvXMLImportContext* CreateMetaContext(const OUString& rLocalName, SvXMLImportContext* CreateMetaContext(const OUString& rLocalName);
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName, SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
protected: protected:
......
...@@ -989,7 +989,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer ...@@ -989,7 +989,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
case css::presentation::EffectNodeType::TIMING_ROOT : nPPTNodeType = DFF_ANIM_NODE_TYPE_TIMING_ROOT; break; case css::presentation::EffectNodeType::TIMING_ROOT : nPPTNodeType = DFF_ANIM_NODE_TYPE_TIMING_ROOT; break;
case css::presentation::EffectNodeType::INTERACTIVE_SEQUENCE: nPPTNodeType = DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ; break; case css::presentation::EffectNodeType::INTERACTIVE_SEQUENCE: nPPTNodeType = DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ; break;
} }
exportAnimPropertyuInt32( rStrm, DFF_ANIM_NODE_TYPE, nPPTNodeType, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_NODE_TYPE, nPPTNodeType );
} }
} }
sal_uInt32 nPresetId = 0; sal_uInt32 nPresetId = 0;
...@@ -1036,11 +1036,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer ...@@ -1036,11 +1036,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
} }
} }
if ( bPresetId ) if ( bPresetId )
exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_ID, nPresetId, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_ID, nPresetId );
if ( bPresetSubType ) if ( bPresetSubType )
exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_SUB_TYPE, nPresetSubType, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_SUB_TYPE, nPresetSubType );
if ( bPresetClass ) if ( bPresetClass )
exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_CLASS, nPresetClass, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_CLASS, nPresetClass );
if ( pAny[ DFF_ANIM_ID ] ) if ( pAny[ DFF_ANIM_ID ] )
{ {
...@@ -1058,7 +1058,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer ...@@ -1058,7 +1058,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
{ {
sal_Int32 nRunTimeContext = 0; sal_Int32 nRunTimeContext = 0;
if ( *pAny[ DFF_ANIM_RUNTIMECONTEXT ] >>= nRunTimeContext ) if ( *pAny[ DFF_ANIM_RUNTIMECONTEXT ] >>= nRunTimeContext )
exportAnimPropertyuInt32( rStrm, DFF_ANIM_RUNTIMECONTEXT, nRunTimeContext, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_RUNTIMECONTEXT, nRunTimeContext );
} }
if ( pAny[ DFF_ANIM_PATH_EDIT_MODE ] ) if ( pAny[ DFF_ANIM_PATH_EDIT_MODE ] )
{ {
...@@ -1072,7 +1072,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer ...@@ -1072,7 +1072,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
{ {
bool bDirection = !xColor->getDirection(); bool bDirection = !xColor->getDirection();
exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection ? 1 : 0, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection ? 1 : 0 );
} }
} }
...@@ -1080,14 +1080,14 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer ...@@ -1080,14 +1080,14 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
{ {
sal_Int32 nOverride = 0; sal_Int32 nOverride = 0;
if ( *pAny[ DFF_ANIM_OVERRIDE ] >>= nOverride ) if ( *pAny[ DFF_ANIM_OVERRIDE ] >>= nOverride )
exportAnimPropertyuInt32( rStrm, DFF_ANIM_OVERRIDE, nOverride, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_OVERRIDE, nOverride );
} }
if ( pAny[ DFF_ANIM_MASTERREL ] ) if ( pAny[ DFF_ANIM_MASTERREL ] )
{ {
sal_Int32 nMasterRel = 0; sal_Int32 nMasterRel = 0;
if ( *pAny[ DFF_ANIM_MASTERREL ] >>= nMasterRel ) if ( *pAny[ DFF_ANIM_MASTERREL ] >>= nMasterRel )
exportAnimPropertyuInt32( rStrm, DFF_ANIM_MASTERREL, nMasterRel, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, DFF_ANIM_MASTERREL, nMasterRel );
} }
/* todo /* todo
...@@ -1130,7 +1130,7 @@ bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nP ...@@ -1130,7 +1130,7 @@ bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nP
sal_Int32 nVal = 0; sal_Int32 nVal = 0;
if ( rAny >>= nVal ) if ( rAny >>= nVal )
{ {
exportAnimPropertyuInt32( rStrm, nPropertyId, nVal, eTranslateMode ); exportAnimPropertyuInt32( rStrm, nPropertyId, nVal );
bRet = true; bRet = true;
} }
} }
...@@ -1198,7 +1198,7 @@ void AnimationExporter::exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt ...@@ -1198,7 +1198,7 @@ void AnimationExporter::exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt
.WriteFloat( fFloat ); .WriteFloat( fFloat );
} }
void AnimationExporter::exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode ) void AnimationExporter::exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal )
{ {
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId ); EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId );
rStrm.WriteUChar( DFF_ANIM_PROP_TYPE_INT32 ) rStrm.WriteUChar( DFF_ANIM_PROP_TYPE_INT32 )
...@@ -1690,11 +1690,11 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X ...@@ -1690,11 +1690,11 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
if( nAfterEffectType != AFTEREFFECT_NONE ) if( nAfterEffectType != AFTEREFFECT_NONE )
{ {
EscherExContainer aAnimPropertySet( rStrm, DFF_msofbtAnimPropertySet ); EscherExContainer aAnimPropertySet( rStrm, DFF_msofbtAnimPropertySet );
exportAnimPropertyuInt32( rStrm, 6, 1, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, 6, 1 );
if( nAfterEffectType == AFTEREFFECT_COLOR ) if( nAfterEffectType == AFTEREFFECT_COLOR )
{ {
exportAnimPropertyuInt32( rStrm, 4, 0, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, 4, 0 );
exportAnimPropertyuInt32( rStrm, 5, 0, TRANSLATE_NONE ); exportAnimPropertyuInt32( rStrm, 5, 0 );
} }
} }
exportAnimateTargetElement( rStrm, aTarget.hasValue() ? aTarget : xAnimate->getTarget(), false ); exportAnimateTargetElement( rStrm, aTarget.hasValue() ? aTarget : xAnimate->getTarget(), false );
......
...@@ -72,7 +72,7 @@ class AnimationExporter ...@@ -72,7 +72,7 @@ class AnimationExporter
static bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const css::uno::Any& rAny, const TranslateMode eTranslateMode ); static bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const css::uno::Any& rAny, const TranslateMode eTranslateMode );
static void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ); static void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode );
static void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal ); static void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal );
static void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); static void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal );
static void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal ); static void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal );
/** if available exportAnimPropertySet /** if available exportAnimPropertySet
......
...@@ -132,7 +132,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange ( ...@@ -132,7 +132,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
// resource managed by this ResourceManager accordingly. // resource managed by this ResourceManager accordingly.
HandleMainViewSwitch( HandleMainViewSwitch(
rEvent.ResourceId->getResourceURL(), rEvent.ResourceId->getResourceURL(),
rEvent.Configuration,
true); true);
} }
} }
...@@ -150,7 +149,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange ( ...@@ -150,7 +149,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
{ {
HandleMainViewSwitch( HandleMainViewSwitch(
OUString(), OUString(),
rEvent.Configuration,
false); false);
} }
else if (rEvent.ResourceId->compareTo(mxResourceId) == 0) else if (rEvent.ResourceId->compareTo(mxResourceId) == 0)
...@@ -166,7 +164,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange ( ...@@ -166,7 +164,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
void ResourceManager::HandleMainViewSwitch ( void ResourceManager::HandleMainViewSwitch (
const OUString& rsViewURL, const OUString& rsViewURL,
const Reference<XConfiguration>& /*rxConfiguration*/,
const bool bIsActivated) const bool bIsActivated)
{ {
if (bIsActivated) if (bIsActivated)
......
...@@ -86,7 +86,6 @@ private: ...@@ -86,7 +86,6 @@ private:
void HandleMainViewSwitch ( void HandleMainViewSwitch (
const OUString& rsViewURL, const OUString& rsViewURL,
const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration,
const bool bIsActivated); const bool bIsActivated);
void HandleResourceRequest( void HandleResourceRequest(
bool bActivation, bool bActivation,
......
...@@ -49,8 +49,7 @@ static Reference<lang::XEventListener> mxControllerDisposeListener; ...@@ -49,8 +49,7 @@ static Reference<lang::XEventListener> mxControllerDisposeListener;
//----- PanelFactory -------------------------------------------------------- //----- PanelFactory --------------------------------------------------------
PanelFactory::PanelFactory( PanelFactory::PanelFactory()
const css::uno::Reference<css::uno::XComponentContext>& /*rxContext*/)
: PanelFactoryInterfaceBase(m_aMutex) : PanelFactoryInterfaceBase(m_aMutex)
{ {
} }
...@@ -144,10 +143,10 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( ...@@ -144,10 +143,10 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(css::uno::XComponentContext* context, org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(css::uno::XComponentContext* /*context*/,
css::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new sd::sidebar::PanelFactory(context)); return cppu::acquire(new sd::sidebar::PanelFactory);
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -46,7 +46,7 @@ class PanelFactory ...@@ -46,7 +46,7 @@ class PanelFactory
public PanelFactoryInterfaceBase public PanelFactoryInterfaceBase
{ {
public: public:
explicit PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext); explicit PanelFactory ();
virtual ~PanelFactory() override; virtual ~PanelFactory() override;
PanelFactory(const PanelFactory&) = delete; PanelFactory(const PanelFactory&) = delete;
PanelFactory& operator=(const PanelFactory&) = delete; PanelFactory& operator=(const PanelFactory&) = delete;
......
...@@ -223,7 +223,6 @@ class PresenterTheme::Theme ...@@ -223,7 +223,6 @@ class PresenterTheme::Theme
{ {
public: public:
Theme ( Theme (
const OUString& rsName,
const Reference<container::XHierarchicalNameAccess>& rThemeRoot, const Reference<container::XHierarchicalNameAccess>& rThemeRoot,
const OUString& rsNodeName); const OUString& rsNodeName);
...@@ -572,7 +571,6 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize ( ...@@ -572,7 +571,6 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize (
//===== Theme ================================================================= //===== Theme =================================================================
PresenterTheme::Theme::Theme ( PresenterTheme::Theme::Theme (
const OUString& /*rsName*/,
const Reference<container::XHierarchicalNameAccess>& rxThemeRoot, const Reference<container::XHierarchicalNameAccess>& rxThemeRoot,
const OUString& rsNodeName) const OUString& rsNodeName)
: msConfigurationNodeName(rsNodeName), : msConfigurationNodeName(rsNodeName),
...@@ -785,7 +783,7 @@ std::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme ( ...@@ -785,7 +783,7 @@ std::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
>>= sThemeName; >>= sThemeName;
if (sThemeName == sCurrentThemeName) if (sThemeName == sCurrentThemeName)
{ {
pTheme.reset(new PresenterTheme::Theme(sThemeName,xTheme,rsKey)); pTheme.reset(new PresenterTheme::Theme(xTheme,rsKey));
break; break;
} }
} }
......
...@@ -99,129 +99,67 @@ public: ...@@ -99,129 +99,67 @@ public:
const css::uno::Reference < const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList) override; css::xml::sax::XAttributeList> &xAttrList) override;
SvXMLImportContext *CreateRowContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateRowContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateEncloseContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateEncloseContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateFracContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateFracContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateNumberContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateNumberContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTextContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateTextContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateAnnotationContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateAnnotationContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateStringContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateStringContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateIdentifierContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateIdentifierContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateOperatorContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateOperatorContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSpaceContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateSpaceContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSqrtContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateSqrtContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateRootContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateRootContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateStyleContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateStyleContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreatePaddedContext(sal_uInt16 nPrefix, SvXMLImportContext *CreatePaddedContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreatePhantomContext(sal_uInt16 nPrefix, SvXMLImportContext *CreatePhantomContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateFencedContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateFencedContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateErrorContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateErrorContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSubContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateSubContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSupContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateSupContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSubSupContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateSubSupContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateUnderContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateUnderContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateOverContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateOverContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateUnderOverContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateUnderOverContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateMultiScriptsContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateMultiScriptsContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateNoneContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateNoneContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreatePrescriptsContext(sal_uInt16 nPrefix, SvXMLImportContext *CreatePrescriptsContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTableContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateTableContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTableRowContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateTableRowContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTableCellContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateTableCellContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateAlignGroupContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateAlignGroupContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateActionContext(sal_uInt16 nPrefix, SvXMLImportContext *CreateActionContext(sal_uInt16 nPrefix,
const OUString &rLocalName, const OUString &rLocalName);
const css::uno::Reference <
css::xml::sax::XAttributeList> &xAttrList);
const SvXMLTokenMap &GetPresLayoutElemTokenMap(); const SvXMLTokenMap &GetPresLayoutElemTokenMap();
const SvXMLTokenMap &GetPresLayoutAttrTokenMap(); const SvXMLTokenMap &GetPresLayoutAttrTokenMap();
......
...@@ -226,8 +226,7 @@ private: ...@@ -226,8 +226,7 @@ private:
cairo_t *cr, cairo_t *cr,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
ControlType nType, ControlType nType,
ControlPart nPart, ControlPart nPart);
const ImplControlValue& aValue);
static void PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context, static void PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
bool bIsCheck, bool bInMenu); bool bIsCheck, bool bInMenu);
...@@ -303,7 +302,6 @@ protected: ...@@ -303,7 +302,6 @@ protected:
const std::list< tools::Rectangle >& aClip, const std::list< tools::Rectangle >& aClip,
ControlState nState, ControlState nState,
const ImplControlValue& aValue, const ImplControlValue& aValue,
const OUString& rCaption,
ControlCacheKey& rControlCacheKey); ControlCacheKey& rControlCacheKey);
bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, bool NWPaintGTKArrow( GdkDrawable* gdkDrawable,
...@@ -342,21 +340,18 @@ protected: ...@@ -342,21 +340,18 @@ protected:
bool NWPaintGTKScrollbar( ControlPart nPart, bool NWPaintGTKScrollbar( ControlPart nPart,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
ControlState nState, const ImplControlValue& aValue ); ControlState nState, const ImplControlValue& aValue );
bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
const std::list< tools::Rectangle >& rClipList, const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue, ControlState nState );
const OUString& rCaption );
bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart, bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
ControlState nState, const ImplControlValue& aValue, ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption,
ControlCacheKey& rControlCacheKey); ControlCacheKey& rControlCacheKey);
bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
const std::list< tools::Rectangle >& rClipList, const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue, ControlState nState );
const OUString& rCaption );
bool NWPaintGTKTabItem( ControlType nType, bool NWPaintGTKTabItem( ControlType nType,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
ControlState nState, const ImplControlValue& aValue ); ControlState nState, const ImplControlValue& aValue );
......
...@@ -1197,8 +1197,7 @@ tools::Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ...@@ -1197,8 +1197,7 @@ tools::Rectangle GtkSalGraphics::NWGetComboBoxButtonRect(
void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr,
const tools::Rectangle& rControlRectangle, const tools::Rectangle& rControlRectangle,
ControlType nType, ControlType nType,
ControlPart nPart, ControlPart nPart )
const ImplControlValue& /*rValue*/ )
{ {
tools::Rectangle areaRect; tools::Rectangle areaRect;
tools::Rectangle buttonRect; tools::Rectangle buttonRect;
...@@ -2487,7 +2486,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co ...@@ -2487,7 +2486,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
PaintSpinButton(flags, cr, rControlRegion, nPart, rValue); PaintSpinButton(flags, cr, rControlRegion, nPart, rValue);
break; break;
case RenderType::Combobox: case RenderType::Combobox:
PaintCombobox(flags, cr, rControlRegion, nType, nPart, rValue); PaintCombobox(flags, cr, rControlRegion, nType, nPart);
break; break;
case RenderType::Icon: case RenderType::Icon:
gtk_render_icon(context, cr, pixbuf, nX, nY); gtk_render_icon(context, cr, pixbuf, nX, nY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment