summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/jobs/jobresult.hxx13
-rw-r--r--framework/inc/jobs/joburl.hxx9
-rw-r--r--framework/source/accelerators/moduleacceleratorconfiguration.cxx3
-rw-r--r--framework/source/jobs/jobresult.cxx20
-rw-r--r--framework/source/jobs/joburl.cxx3
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx8
6 files changed, 13 insertions, 43 deletions
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 0d399c461ae5..a083bee27808 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -63,12 +63,6 @@ class JobResult final
private:
- /** hold the original pure result, which was given back by an
- executed job
- We analyze it and use it to set all our other members.
- */
- css::uno::Any m_aPureResult;
-
/**
an user of us must know, which (possible) parts of
a "pure result" was really set by an executed job.
@@ -86,13 +80,6 @@ class JobResult final
std::vector< css::beans::NamedValue > m_lArguments;
/**
- an executed job can force his deactivation
- But we provide this information here only.
- Doing so is part of any user of us.
- */
- bool m_bDeactivate;
-
- /**
represent the part "DispatchResult"
It's a fulfilled event type, which was given
back by the executed job. Any user of us can send
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 261026d501d8..2e3e2cb0c0c9 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -86,15 +86,6 @@ class JobURL
/** holds the service part of a job URL */
OUString m_sService;
- /** holds the event arguments */
- OUString m_sEventArgs;
-
- /** holds the alias arguments */
- OUString m_sAliasArgs;
-
- /** holds the service arguments */
- OUString m_sServiceArgs;
-
// native interface
public:
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 699de38760b4..65534a31a1e2 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -55,7 +55,6 @@ private:
/** identify the application module, where this accelerator
configuration cache should work on. */
OUString m_sModule;
- OUString m_sLocale;
public:
@@ -106,7 +105,7 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(
{
::comphelper::SequenceAsHashMap lArgs(lArguments);
m_sModule = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
- m_sLocale = lArgs.getUnpackedValueOrDefault("Locale", OUString("x-default"));
+ // OUString sLocale = lArgs.getUnpackedValueOrDefault("Locale", OUString("x-default"));
}
if (m_sModule.isEmpty())
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index c9f5a0218af2..2c7e4d4a08ea 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -35,7 +35,6 @@ namespace framework{
but it marks this new instance as non valid!
*/
JobResult::JobResult()
- : m_bDeactivate(false)
{
// reset the flag mask!
// It will reset the accessible state of this object.
@@ -87,12 +86,7 @@ JobResult::JobResult()
the job result
*/
JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
- : m_bDeactivate(false)
{
- // safe the pure result
- // May someone need it later ...
- m_aPureResult = aResult;
-
// reset the flag mask!
// It will reset the accessible state of this object.
// That can be useful if something will fail here ...
@@ -106,8 +100,14 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB());
if (pIt != aProtocol.end())
{
- pIt->second >>= m_bDeactivate;
- if (m_bDeactivate)
+ /**
+ an executed job can force his deactivation
+ But we provide this information here only.
+ Doing so is part of any user of us.
+ */
+ bool bDeactivate;
+ pIt->second >>= bDeactivate;
+ if (bDeactivate)
m_eParts |= E_DEACTIVATE;
}
@@ -134,10 +134,8 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
*/
JobResult::JobResult( const JobResult& rCopy )
{
- m_aPureResult = rCopy.m_aPureResult;
m_eParts = rCopy.m_eParts;
m_lArguments = rCopy.m_lArguments;
- m_bDeactivate = rCopy.m_bDeactivate;
m_aDispatchResult = rCopy.m_aDispatchResult;
}
@@ -160,10 +158,8 @@ JobResult::~JobResult()
JobResult& JobResult::operator=( const JobResult& rCopy )
{
SolarMutexGuard g;
- m_aPureResult = rCopy.m_aPureResult;
m_eParts = rCopy.m_eParts;
m_lArguments = rCopy.m_lArguments;
- m_bDeactivate = rCopy.m_bDeactivate;
m_aDispatchResult = rCopy.m_aDispatchResult;
return *this;
}
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 64b4745ede9a..307f6c9cdc93 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -65,7 +65,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{
// set the part value
m_sEvent = sPartValue;
- m_sEventArgs = sPartArguments;
m_eRequest |= E_EVENT;
}
else
@@ -77,7 +76,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{
// set the part value
m_sAlias = sPartValue;
- m_sAliasArgs = sPartArguments;
m_eRequest |= E_ALIAS;
}
else
@@ -89,7 +87,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{
// set the part value
m_sService = sPartValue;
- m_sServiceArgs = sPartArguments;
m_eRequest |= E_SERVICE;
}
}
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 92dfa66c1a00..26e462495e16 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -210,7 +210,6 @@ private:
OUString m_aPropUIName;
OUString m_aPropResourceURL;
OUString m_aModuleIdentifier;
- OUString m_aModuleShortName;
css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
osl::Mutex m_mutex;
@@ -846,13 +845,14 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
SolarMutexGuard g;
- if( aArguments.getLength() == 2 && (aArguments[0] >>= m_aModuleShortName) && (aArguments[1] >>= m_aModuleIdentifier))
+ OUString aModuleShortName;
+ if( aArguments.getLength() == 2 && (aArguments[0] >>= aModuleShortName) && (aArguments[1] >>= m_aModuleIdentifier))
{
}
else
{
::comphelper::SequenceAsHashMap lArgs(aArguments);
- m_aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString());
+ aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString());
m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
}
@@ -873,7 +873,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
m_pStorageHandler[i].reset( new PresetHandler( m_xContext ) );
m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
aResourceType, // this path won't be used later... see next lines!
- m_aModuleShortName,
+ aModuleShortName,
css::uno::Reference< css::embed::XStorage >()); // no document root used here!
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 07:01:02 +0000