summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-03 13:02:40 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-03 15:55:03 +0200
commit687256fcb2af011b34bbc2c07557dd3544b83eff (patch)
tree2fb94b4b9e0a91cfad0f04690710678443015592 /desktop
parent7a464263cc5c2ca2b7128734ff4860e02d662818 (diff)
-Werror=shadow
Change-Id: Ibb4dea2bd4b13058895913fa37b7f0b4488cc417
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx1
-rw-r--r--desktop/source/migration/migration.cxx3
2 files changed, 1 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1ed400fd236b..d6e3cd7a0d52 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2145,7 +2145,6 @@ void Desktop::PreloadConfigurationData()
rtl::OUString( "com.sun.star.ui.WindowStateConfiguration" )), UNO_QUERY );
if ( xNameAccess.is() )
{
- Any a;
Reference< XNameAccess > xWindowAccess;
try
{
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 8424f0975400..57e93aba893f 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -93,8 +93,7 @@ static const char XDG_CONFIG_PART[] = "/.config";
uno::Reference< container::XNameAccess > xUICommands;
uno::Reference< container::XNameAccess > xNameAccess( ui::UICommandDescription::create(::comphelper::getProcessComponentContext()) );
- uno::Any a = xNameAccess->getByName( sModuleIdentifier );
- a >>= xUICommands;
+ xNameAccess->getByName( sModuleIdentifier ) >>= xUICommands;
if (xUICommands.is())
{
if ( !sCommand.isEmpty() )