[Libreoffice-commits] core.git: basic/source cui/source include/tools sfx2/source svtools/source svx/source sw/source

Stephan Bergmann sbergman at redhat.com
Mon Nov 11 07:50:29 PST 2013


 basic/source/uno/namecont.cxx      |    1 -
 cui/source/dialogs/hldoctp.cxx     |    2 --
 cui/source/dialogs/hlmailtp.cxx    |    1 -
 include/tools/urlobj.hxx           |    2 +-
 sfx2/source/doc/doctempl.cxx       |    3 ---
 svtools/source/contnr/fileview.cxx |    2 --
 svtools/source/control/inettbc.cxx |    1 -
 svx/source/gallery2/galtheme.cxx   |    1 -
 sw/source/ui/app/docsh2.cxx        |    3 ---
 9 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit a2505ae7317fe6e995a8ad52fefe5079c48f9d6f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 11 16:49:40 2013 +0100

    SAL_WARN_UNUSED INetURLObject
    
    Change-Id: Ia9af3b76c2a2ac654b02c1502aa2d0c2c987fbf2

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 2ce1cb9..f3b32d9 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1143,7 +1143,6 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
                         if( aLibName == aStandardStr )
                         {
                             SfxLibrary* pImplLib = getImplLib( aStandardStr );
-                            INetURLObject aStandardFolderInetObj( pImplLib->maStorageURL );
                             OUString aStandardFolder = pImplLib->maStorageURL;
                             mxSFI->kill( aStandardFolder );
                         }
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 1353038..865b0e5 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -93,8 +93,6 @@ SvxHyperlinkDocTp::~SvxHyperlinkDocTp ()
 
 void SvxHyperlinkDocTp::FillDlgFields(const OUString& rStrURL)
 {
-    INetURLObject aURL(rStrURL);
-
     sal_Int32 nPos = rStrURL.indexOf(sHash);
     // path
     maCbbPath.SetText ( rStrURL.copy( 0, ( nPos == -1 ? rStrURL.getLength() : nPos ) ) );
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 0fa2688..cfc990a 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -94,7 +94,6 @@ SvxHyperlinkMailTp::~SvxHyperlinkMailTp ()
 
 void SvxHyperlinkMailTp::FillDlgFields(const OUString& rStrURL)
 {
-    INetURLObject aURL(rStrURL);
     OUString aStrScheme = GetSchemeFromURL(rStrURL);
 
     // set URL-field and additional controls
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 53ea84c..88b8ecd 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -105,7 +105,7 @@ enum INetProtocol
     INET_PROT_END = 35
 };
 
-class TOOLS_DLLPUBLIC INetURLObject
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED INetURLObject
 {
 public:
     // Get- and Set-Methods:
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index e52d6c5..ccb9f26 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -607,9 +607,6 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
                                   aTitle,
                                   pSource->GetTargetURL() ) )
     {
-
-        INetURLObject aSourceObj( pSource->GetTargetURL() );
-
         OUString aNewTargetURL = GetTemplateTargetURLFromComponent( pTargetRgn->GetTitle(), aTitle );
         if ( aNewTargetURL.isEmpty() )
             return sal_False;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 97d2df3..1b5df88 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2446,8 +2446,6 @@ OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString&
     pData->mbIsFolder = sal_True;
     pData->maTargetURL   = rURL;
 
-    INetURLObject aURLObj( rURL );
-
     ::svtools::VolumeInfo aVolInfo;
     pData->maType = SvFileInformationManager::GetFolderDescription( aVolInfo );
     pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index f87f783..362394c 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -478,7 +478,6 @@ OUString SvtURLBox::ParseSmart( OUString aText, OUString aBaseURL, const OUStrin
     if( !SvtURLBox_Impl::TildeParsing( aText, aBaseURL ) )
         return OUString();
 
-    INetURLObject aURLObject;
     if( !aBaseURL.isEmpty() )
     {
         INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( aBaseURL );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index e52fafc..d82d743 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1291,7 +1291,6 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
 {
     const INetURLObject aRelURL1( GetParent()->GetRelativeURL() );
     const INetURLObject aRelURL2( GetParent()->GetUserURL() );
-    INetURLObject       aNewURL, aTempURL;
     sal_uInt32          nCount = GetObjectCount();
     sal_Bool                bRel;
 
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 05bbbaf..4e449e1 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1388,9 +1388,6 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL,
 {
     sal_uLong nErr = 0;
 
-    // Create a URL from filename
-    INetURLObject aURLObj( rURL );
-
     // Set filter:
     OUString sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
     SfxFilterMatcher aMatcher( sFactory );


More information about the Libreoffice-commits mailing list