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

Remove unused ItemProcessor argument

Browse Source 
Change-Id: Ie650f8c046f60a749999e1819edb5abad79e5362
This commit is contained in:
Stephan Bergmann
2017-06-27 13:48:33 +02:00
parent a679ae4c87
commit 2c355e3a76
5 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdext/source/presenter/PresenterConfigurationAccess.cxx
View File

@@ -210,7 +210,7 @@ void PresenterConfigurationAccess::ForAll (
else
bHasAllValues = false;
if (bHasAllValues)
rProcessor(rsKey,aValues);
rProcessor(aValues);
}
}
}

1
sdext/source/presenter/PresenterConfigurationAccess.hxx
View File

@@ -123,7 +123,6 @@ public:
void CommitChanges();
typedef ::std::function<void (
const OUString&,
const ::std::vector<css::uno::Any>&) > ItemProcessor;
typedef ::std::function<void (
const OUString&,

14
sdext/source/presenter/PresenterScreen.cxx
View File

@@ -687,9 +687,9 @@ void PresenterScreen::ProcessLayout (
PresenterConfigurationAccess::ForAll(
xList,
aProperties,
[this, rxContext, rxAnchorId](OUString const& rString, std::vector<uno::Any> const& rArgs)
[this, rxContext, rxAnchorId](std::vector<uno::Any> const& rArgs)
{
this->ProcessComponent(rString, rArgs, rxContext, rxAnchorId);
this->ProcessComponent(rArgs, rxContext, rxAnchorId);
});
}
catch (const RuntimeException&)
@@ -714,9 +714,9 @@ void PresenterScreen::ProcessViewDescriptions (
PresenterConfigurationAccess::ForAll(
xViewDescriptionsNode,
aProperties,
[this](OUString const& rString, std::vector<uno::Any> const& rArgs)
[this](std::vector<uno::Any> const& rArgs)
{
return this->ProcessViewDescription(rString, rArgs);
return this->ProcessViewDescription(rArgs);
});
}
catch (const RuntimeException&)
@@ -726,13 +726,10 @@ void PresenterScreen::ProcessViewDescriptions (
}
void PresenterScreen::ProcessComponent (
const OUString& rsKey,
const ::std::vector<Any>& rValues,
const Reference<XComponentContext>& rxContext,
const Reference<XResourceId>& rxAnchorId)
{
(void)rsKey;
if (rValues.size() != 6)
return;
@@ -768,11 +765,8 @@ void PresenterScreen::ProcessComponent (
}
void PresenterScreen::ProcessViewDescription (
const OUString& rsKey,
const ::std::vector<Any>& rValues)
{
(void)rsKey;
if (rValues.size() != 4)
return;

2
sdext/source/presenter/PresenterScreen.hxx
View File

@@ -182,7 +182,6 @@ private:
configuration list.
*/
void ProcessComponent (
const OUString& rsKey,
const ::std::vector<css::uno::Any>& rValues,
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId);
@@ -195,7 +194,6 @@ private:
/** Called by ProcessViewDescriptions for a single entry.
*/
void ProcessViewDescription (
const OUString& rsKey,
const ::std::vector<css::uno::Any>& rValues);
void SetupView (

15
sdext/source/presenter/PresenterTheme.cxx
View File

@@ -155,7 +155,6 @@ public:
private:
void ProcessPaneStyle (
ReadContext& rReadContext,
const OUString& rsKey,
const ::std::vector<css::uno::Any>& rValues);
};
@@ -217,7 +216,6 @@ private:
void ProcessStyleAssociation(
ReadContext& rReadContext,
const OUString& rsKey,
const ::std::vector<css::uno::Any>& rValues);
};
@@ -847,20 +845,17 @@ void PaneStyleContainer::Read (
PresenterConfigurationAccess::ForAll(
xPaneStyleList,
aProperties,
[this, &rReadContext] (OUString const& rKey, std::vector<uno::Any> const& rValues)
[this, &rReadContext] (std::vector<uno::Any> const& rValues)
{
return this->ProcessPaneStyle(rReadContext, rKey, rValues);
return this->ProcessPaneStyle(rReadContext, rValues);
});
}
}
void PaneStyleContainer::ProcessPaneStyle(
ReadContext& rReadContext,
const OUString& rsKey,
const ::std::vector<Any>& rValues)
{
(void)rsKey;
if (rValues.size() != 6)
return;
@@ -1086,9 +1081,9 @@ void StyleAssociationContainer::Read (
PresenterConfigurationAccess::ForAll(
xStyleAssociationList,
aProperties,
[this, &rReadContext] (OUString const& rKey, std::vector<uno::Any> const& rValues)
[this, &rReadContext] (std::vector<uno::Any> const& rValues)
{
return this->ProcessStyleAssociation(rReadContext, rKey, rValues);
return this->ProcessStyleAssociation(rReadContext, rValues);
});
}
}
@@ -1104,11 +1099,9 @@ OUString StyleAssociationContainer::GetStyleName (const OUString& rsResourceName
void StyleAssociationContainer::ProcessStyleAssociation(
ReadContext& rReadContext,
const OUString& rsKey,
const ::std::vector<Any>& rValues)
{
(void)rReadContext;
(void)rsKey;
if (rValues.size() != 2)
return;