summaryrefslogtreecommitdiff
path: root/desktop/source/app/configinit.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/app/configinit.cxx')
-rw-r--r--desktop/source/app/configinit.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index 11ee1f858f1b..b53b93bf981e 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -29,21 +29,21 @@
#include <stdio.h>
#include <com/sun/star/task/InteractionHandler.hpp>
-// ----------------------------------------------------------------------------
+
namespace uno = ::com::sun::star::uno;
namespace lang = ::com::sun::star::lang;
using uno::UNO_QUERY;
-// ----------------------------------------------------------------------------
+
// must be aligned with configmgr/source/misc/configinteractionhandler
static char const CONFIG_ERROR_HANDLER[] = "configuration.interaction-handler";
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
+
+
// ConfigurationErrorHandler
-// ----------------------------------------------------------------------------
+
namespace
{
@@ -82,7 +82,7 @@ namespace
}
-// ----------------------------------------------------------------------------
+
class ConfigurationErrorHandler::Context : public SimpleCurrentContext
{
public:
@@ -104,7 +104,7 @@ private:
InteractionHandler m_xHandler;
};
-//------------------------------------------------------------------------------
+
uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName)
throw (uno::RuntimeException)
{
@@ -117,13 +117,13 @@ uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString c
return SimpleCurrentContext::getValueByName( aName );
}
-//------------------------------------------------------------------------------
+
ConfigurationErrorHandler::~ConfigurationErrorHandler()
{
deactivate();
}
-//------------------------------------------------------------------------------
+
/// installs the handler into the current context
void ConfigurationErrorHandler::activate()
{
@@ -135,7 +135,7 @@ void ConfigurationErrorHandler::activate()
m_pContext->install();
}
-//------------------------------------------------------------------------------
+
/// deinstalls the handler from the current context, restoring the previous context
void ConfigurationErrorHandler::deactivate()
{
@@ -146,7 +146,7 @@ void ConfigurationErrorHandler::deactivate()
m_pContext = 0;
}
}
-//------------------------------------------------------------------------------
+
ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefaultInteractionHandler()
{
@@ -154,7 +154,7 @@ ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefa
InteractionHandler xHandler( com::sun::star::task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY );
return xHandler;
}
-//------------------------------------------------------------------------------
+