[Libreoffice-commits] .: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/doc/doctemplates.cxx |    5 ++---
 sfx2/source/doc/guisaveas.cxx    |    2 +-
 sfx2/source/doc/objcont.cxx      |    2 +-
 sfx2/source/doc/objstor.cxx      |    3 ---
 4 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 6a7371d266b7050a9c07b3abce84ef23904525ac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 7 09:47:37 2012 +0000

    loplugin: various unused variables
    
    Change-Id: I59cfea1b755fb4da5cdc9032e719e4e1579a906e

diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 1313fee..49e71cd 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -444,7 +444,7 @@ void SfxDocTplService_Impl::init_Impl()
             m_xDocProps.set(document::DocumentProperties::create(
                         ::comphelper::getProcessComponentContext()));
         } catch (uno::RuntimeException const& e) {
-            SAL_WARN("sfx.doc", "SfxDocTplService_Impl::init_Impl: "
+            SAL_WARN("sfx2.doc", "SfxDocTplService_Impl::init_Impl: "
                 "cannot create DocumentProperties service:" << e.Message);
         }
 
@@ -1903,7 +1903,6 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
         aStoreArgs[1].Name = ::rtl::OUString("DocumentTitle");
         aStoreArgs[1].Value <<= rTemplateName;
 
-        ::rtl::OUString aCurrentDocumentURL = rStorable->getLocation();
         if( !::utl::UCBContentHelper::EqualURLs( aNewTemplateTargetURL, rStorable->getLocation() ))
             rStorable->storeToURL( aNewTemplateTargetURL, aStoreArgs );
         else
@@ -1987,7 +1986,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
     }
 
     // Get the content type
-    OUString aTitle, aType, aTargetURL2, aFullName;
+    OUString aTitle, aType, aTargetURL2;
 
     sal_Bool bDocHasTitle = sal_False;
     if( !getTitleFromURL( rSourceURL, aTitle, aType, bDocHasTitle ) )
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index c6af316..6c5f2e2 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1734,7 +1734,7 @@ void SfxStoringHelper::SetDocInfoState(
     }
     catch (const uno::Exception& e)
     {
-        SAL_INFO("sfx.doc", "SetDocInfoState: caught exception: " << e.Message);
+        SAL_INFO("sfx2.doc", "SetDocInfoState: caught exception: " << e.Message);
     }
 
     // set the modified flag back if required
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index c532a31..118851e 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -907,7 +907,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
             }
             catch (const Exception& e)
             {
-                SAL_INFO("sfx.doc", "caught exception" << e.Message);
+                SAL_INFO("sfx2.doc", "caught exception" << e.Message);
             }
 
             // if modify date was read successfully
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 88380bb..887be25 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1469,7 +1469,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
                 aInfo.Comment = pVersionItem->GetValue();
 
                 // version author
-                String aAuthor;
                 if ( pAuthorItem )
                     aInfo.Author = pAuthorItem->GetValue();
                 else
@@ -2133,7 +2132,6 @@ sal_Bool SfxObjectShell::ConvertFrom
 
 sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert )
 {
-    ::rtl::OUString aTypeName( rMedium.GetFilter()->GetTypeName() );
     ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() );
 
     uno::Reference< lang::XMultiServiceFactory >  xMan = ::comphelper::getProcessServiceFactory();
@@ -2244,7 +2242,6 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert )
 
 sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium )
 {
-    ::rtl::OUString aTypeName( rMedium.GetFilter()->GetTypeName() );
     ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() );
     uno::Reference< document::XExporter > xExporter;