summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-23 09:53:05 +0200
committerNoel Grandin <noel@peralex.com>2016-03-23 10:19:43 +0200
commit2f804099b7daa42aecb8fa445072a381671f3385 (patch)
tree782719392b4b8c35a186693baa872427978ba242
parent5b79f5a4e5126a427c14c46e65b3a0b898024f60 (diff)
loplugin:constantparam in framework
Change-Id: I7b7914365ef5d5c6f120f34c93f359c156aa6a02
-rw-r--r--framework/inc/classes/propertysethelper.hxx8
-rw-r--r--framework/inc/classes/taskcreator.hxx3
-rw-r--r--framework/inc/uielement/uielement.hxx5
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx8
-rw-r--r--framework/source/accelerators/presethandler.cxx17
-rw-r--r--framework/source/classes/taskcreator.cxx5
-rw-r--r--framework/source/fwi/classes/propertysethelper.cxx20
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx13
-rw-r--r--framework/source/services/desktop.cxx4
-rw-r--r--framework/source/services/frame.cxx8
-rw-r--r--framework/source/services/tabwindowservice.cxx4
11 files changed, 25 insertions, 70 deletions
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index f843e98e5d15..e09c071d97f5 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -60,8 +60,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
ListenerHash m_lSimpleChangeListener;
ListenerHash m_lVetoChangeListener;
- bool m_bReleaseLockOnCall;
-
// hold it weak ... otherwise this helper has to be "killed" explicitly .-)
css::uno::WeakReference< css::uno::XInterface > m_xBroadcaster;
@@ -76,13 +74,9 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
* this helper must be used as a baseclass ...
* but then it should synchronize its own calls
* with the same transaction manager then it's superclass.
- *
- * @param bReleaseLockOnCall
- * see member m_bReleaseLockOnCall
*/
PropertySetHelper( osl::Mutex & mutex,
- TransactionManager* pExternalTransactionManager ,
- bool bReleaseLockOnCall );
+ TransactionManager* pExternalTransactionManager);
/** free all needed memory.
*/
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index 57ca35896057..295fb21667c2 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -53,8 +53,7 @@ class TaskCreator
TaskCreator( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~TaskCreator( );
- css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName ,
- bool bVisible );
+ css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName );
// helper
private:
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx
index aa94bea415b6..177c99c19724 100644
--- a/framework/inc/uielement/uielement.hxx
+++ b/framework/inc/uielement/uielement.hxx
@@ -72,12 +72,11 @@ struct UIElement
UIElement( const OUString& rName,
const OUString& rType,
- const css::uno::Reference< css::ui::XUIElement >& rUIElement,
- bool bFloating = false
+ const css::uno::Reference< css::ui::XUIElement >& rUIElement
) : m_aType( rType ),
m_aName( rName ),
m_xUIElement( rUIElement ),
- m_bFloating( bFloating ),
+ m_bFloating( false ),
m_bVisible( true ),
m_bUserActive( false ),
m_bCreateNewRowCol0( false ),
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index b575fbe5b2af..347cfb02b2bc 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -232,10 +232,10 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
css::uno::Reference< css::io::XStream > xStreamNoLang;
{
SolarMutexGuard g;
- xStream = m_aPresetHandler.openTarget(TARGET_CURRENT, true); // sal_True => open or create!
+ xStream = m_aPresetHandler.openTarget(TARGET_CURRENT); // open or create!
try
{
- xStreamNoLang = m_aPresetHandler.openPreset(PRESET_DEFAULT, true);
+ xStreamNoLang = m_aPresetHandler.openPreset(PRESET_DEFAULT);
}
catch(const css::io::IOException&) {} // does not have to exist
}
@@ -273,7 +273,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
css::uno::Reference< css::io::XStream > xStream;
{
SolarMutexGuard g;
- xStream = m_aPresetHandler.openTarget(TARGET_CURRENT, true); // sal_True => open or create!
+ xStream = m_aPresetHandler.openTarget(TARGET_CURRENT); // open or create!
}
css::uno::Reference< css::io::XOutputStream > xOut;
@@ -329,7 +329,7 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
css::uno::Reference< css::io::XStream > xStream;
{
SolarMutexGuard g;
- xStream = m_aPresetHandler.openTarget(TARGET_CURRENT, true); // sal_True => open or create!
+ xStream = m_aPresetHandler.openTarget(TARGET_CURRENT); // open or create!
}
css::uno::Reference< css::io::XOutputStream > xOut;
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 5e2397a73b5b..ceb134e26d26 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -566,13 +566,12 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset,
commitUserChanges();
}
-css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset,
- bool bUseNoLangGlobal)
+css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset)
{
css::uno::Reference< css::embed::XStorage > xFolder;
{
SolarMutexGuard g;
- xFolder = bUseNoLangGlobal? m_xWorkingStorageNoLang: m_xWorkingStorageShare;
+ xFolder = m_xWorkingStorageNoLang;
}
// e.g. module without any config data ?!
@@ -587,8 +586,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString
return xStream;
}
-css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget ,
- bool bCreateIfMissing)
+css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget)
{
css::uno::Reference< css::embed::XStorage > xFolder;
{
@@ -603,15 +601,11 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString
OUString sFile(sTarget);
sFile += ".xml";
- sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE;
- if (!bCreateIfMissing)
- nOpenMode |= css::embed::ElementModes::NOCREATE;
-
// try it in read/write mode first and ignore errors.
css::uno::Reference< css::io::XStream > xStream;
try
{
- xStream = xFolder->openStreamElement(sFile, nOpenMode);
+ xStream = xFolder->openStreamElement(sFile, css::embed::ElementModes::READWRITE);
return xStream;
}
catch(const css::uno::RuntimeException&)
@@ -621,8 +615,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString
// try it readonly if it failed before.
// inform user about errors (use original exceptions!)
- nOpenMode &= ~css::embed::ElementModes::WRITE;
- xStream = xFolder->openStreamElement(sFile, nOpenMode);
+ xStream = xFolder->openStreamElement(sFile, css::embed::ElementModes::READ);
return xStream;
}
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 9c32c50d727a..b5c4a9df82f8 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -57,8 +57,7 @@ TaskCreator::~TaskCreator()
/*-****************************************************************************************************
TODO document me
*//*-*****************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName ,
- bool bVisible )
+css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName )
{
css::uno::Reference< css::lang::XSingleServiceFactory > xCreator;
OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR;
@@ -99,7 +98,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUStrin
lArgs[1] <<= aArg;
aArg.Name = ARGUMENT_MAKEVISIBLE;
- aArg.Value <<= bVisible;
+ aArg.Value <<= false;
lArgs[2] <<= aArg;
aArg.Name = ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE;
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 8595ec32d3c5..69c083c0b7c6 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -27,11 +27,9 @@
namespace framework{
PropertySetHelper::PropertySetHelper( osl::Mutex & mutex,
- TransactionManager* pExternalTransactionManager ,
- bool bReleaseLockOnCall )
+ TransactionManager* pExternalTransactionManager )
: m_lSimpleChangeListener(mutex)
, m_lVetoChangeListener (mutex)
- , m_bReleaseLockOnCall (bReleaseLockOnCall )
, m_rTransactionManager (*pExternalTransactionManager )
{
}
@@ -162,13 +160,6 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
css::beans::Property aPropInfo = pIt->second;
bool bLocked = true;
- if (m_bReleaseLockOnCall)
- {
- aWriteLock.clear();
- bLocked = false;
- // <- SAFE
- }
-
css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
if (! bLocked)
@@ -189,12 +180,6 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
aEvent.NewValue = aValue;
aEvent.Source.set(m_xBroadcaster.get(), css::uno::UNO_QUERY);
- if (m_bReleaseLockOnCall)
- {
- aWriteLock.clear();
- // <- SAFE
- }
-
if (impl_existsVeto(aEvent))
throw css::beans::PropertyVetoException();
@@ -219,9 +204,6 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProp
css::beans::Property aPropInfo = pIt->second;
- if (m_bReleaseLockOnCall)
- aReadLock.clear();
-
return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
}
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 05fd107e81b6..c096e68fff00 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -277,13 +277,11 @@ class PresetHandler
@param sPreset
the ALIAS name of an existing preset.
- @param bNoLangGlobal
- access the global language-independent storage instead of the preset storage
+ Accesses the global language-independent storage instead of the preset storage
@return The opened preset stream ... or NULL if the preset does not exists.
*/
- css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset,
- bool bUseNoLangGlobal = false);
+ css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset);
/** @short open the specified target as stream object
and return it.
@@ -296,15 +294,10 @@ class PresetHandler
@param sTarget
the ALIAS name of the target.
- @param bCreateIfMissing
- create target file, if it does not still exists.
- Note: That does not means reseting of an existing file!
-
@return The opened target stream ... or NULL if the target does not exists
or couldnt be created as new one.
*/
- css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget ,
- bool bCreateIfMissing);
+ css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget);
/** @short do anything which is necessary to flush all changes
back to disk.
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index d03bc0481154..f4514f48982a 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -925,7 +925,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
if ( sTargetFrameName==SPECIALTARGET_BLANK )
{
TaskCreator aCreator( m_xContext );
- xTarget = aCreator.createTask(sTargetFrameName,false);
+ xTarget = aCreator.createTask(sTargetFrameName);
}
// I.II) "_top"
@@ -1009,7 +1009,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
)
{
TaskCreator aCreator( m_xContext );
- xTarget = aCreator.createTask(sTargetFrameName,false);
+ xTarget = aCreator.createTask(sTargetFrameName);
}
}
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 249297587abb..28a68305ee44 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -486,9 +486,7 @@ DEFINE_XTYPEPROVIDER_21 ( Frame
*//*-*****************************************************************************************************/
Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& xContext )
: TransactionBase ( )
- , PropertySetHelper ( m_aMutex,
- &m_aTransactionManager,
- false) // sal_False => don't release shared mutex on calling us!
+ , PropertySetHelper ( m_aMutex, &m_aTransactionManager)
// init member
, m_xContext ( xContext )
, m_aListenerContainer ( m_aMutex )
@@ -1022,7 +1020,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
if ( sTargetFrameName==SPECIALTARGET_BLANK )
{
TaskCreator aCreator(xContext);
- xTarget = aCreator.createTask(sTargetFrameName,false);
+ xTarget = aCreator.createTask(sTargetFrameName);
}
// I.II) "_parent"
@@ -1219,7 +1217,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
)
{
TaskCreator aCreator(xContext);
- xTarget = aCreator.createTask(sTargetFrameName,false);
+ xTarget = aCreator.createTask(sTargetFrameName);
}
}
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index e5c4311010a0..845f964294c0 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -192,9 +192,7 @@ DEFINE_XTYPEPROVIDER_6 ( TabWindowService ,
TabWindowService::TabWindowService()
: TransactionBase ( )
- , PropertySetHelper ( m_aMutex,
- &m_aTransactionManager ,
- false ) // sal_False => don't release shared mutex on calling us!
+ , PropertySetHelper ( m_aMutex, &m_aTransactionManager)
, OWeakObject ( )
// Init member