[Libreoffice-commits] core.git: 2 commits - basic/source compilerplugins/Makefile-clang.mk desktop/source filter/source sal/inc vcl/unx

[Peter Foley]

 basic/source/sbx/sbxobj.cxx          |    2 ++
 compilerplugins/Makefile-clang.mk    |    8 +++++---
 desktop/source/lib/init.cxx          |    1 -
 filter/source/placeware/exporter.cxx |    1 -
 sal/inc/sal/log-areas.dox            |   10 +++++++++-
 vcl/unx/gtk/window/gtksalmenu.cxx    |    1 -
 6 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 4f811c04744557c2254ab7311b148e9b08f7c573
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sat Mar 30 12:20:47 2013 -0400

    fix loplugin warnings
    
    Change-Id: I17593ac6e495213a1ef99d4d5525a6e38aee0bc7

diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index d4aa1ee..6cbef74 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -571,6 +571,8 @@ void SbxObject::Remove( SbxVariable* pVar )
         }
         rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US));
         rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
+        DbgOutf( "SBX: Remove %s in %s",
+            aNameStr1.getStr(), aNameStr2.getStr() );
 #endif
         SbxVariableRef pVar_ = pArray->Get( nIdx );
         if( pVar_->IsBroadcaster() )
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5108ecc..919d81f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -91,7 +91,6 @@ initialize_uno( const rtl::OUString &aAppURL )
 {
     rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" );
 
-    OUString aValue;
     rtl::Bootstrap::set( "CONFIGURATION_LAYERS",
                          "xcsxcu:${BRAND_BASE_DIR}/share/registry "
                          "res:${BRAND_BASE_DIR}/share/registry "
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index dcc051c..651c9d9 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -313,7 +313,6 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
 #ifndef PLACEWARE_DEBUG
     TempFile aTempFile( TempFile::createTempFileURL() );
     nRC = aTempFile.open( osl_File_OpenFlag_Write|osl_File_OpenFlag_Read );
-    OUString aURL( aTempFile.getFileURL() );
 #else
     OUString aURL("file:///e:/test.zip");
     osl::File::remove( aURL );
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 6b22fd3..f23abb5 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -47,6 +47,7 @@ certain functionality.
 @section chart2
 
 @li @c chart2
+ at li @c chart2.areachart
 
 @section connectivity
 
@@ -256,6 +257,8 @@ certain functionality.
 @li @c vcl.scrollbar - Scroll Bars
 @li @c vcl.sm - Session Manager
 @li @c vcl.window
+ at li @c vcl.unity
+ at li @c vcl.virdev
 
 @section Writer
 
@@ -292,6 +295,11 @@ certain functionality.
 @li @c dbaccess
 @li @c dbaccess.ui
 
+ at section svx
+
+ at li @c svx
+ at li @c svx.fmcmop
+
 @section other
 
 @li @c accessibility
@@ -314,9 +322,9 @@ certain functionality.
 @li @c shell
 @li @c stoc
 @li @c svg
- at li @c svx
 @li @c ucbhelper
 @li @c unoidl
+ at li @c uui
 @li @c xmlhelp
 @li @c xmloff
 @li @c xmlreader
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 605db0d..132d3a3 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -298,7 +298,6 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
 
         // Get internal menu item values.
         String aText = pVCLMenu->GetItemText( nId );
-        rtl::OUString aCommand( pVCLMenu->GetItemCommand( nId ) );
         sal_Bool itemEnabled = pVCLMenu->IsItemEnabled( nId );
         KeyCode nAccelKey = pVCLMenu->GetAccelKey( nId );
         sal_Bool itemChecked = pVCLMenu->IsItemChecked( nId );
commit 43e873b2576c2013a792f1fa213228470a6c619e
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sat Mar 30 10:15:47 2013 -0400

    silence compilerplugin build
    
    Change-Id: I4397575e4665e8a257d0bd3e15245d996a48a1f4

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index ff92ba4f..2c71d8c 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -13,6 +13,8 @@
 # Compile flags ('make CLANGCXXFLAGS=-g' if you need to debug the plugin)
 CLANGCXXFLAGS=-O2 -Wall -Wextra -g
 
+QUIET=$(if $(VERBOSE)$(verbose),,@)
+
 # The uninteresting rest.
 
 # Clang headers require these.
@@ -67,7 +69,7 @@ CLANGOBJS=
 define clangbuildsrc
 $(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp
 	@echo [build CXX] $(subst $(SRCDIR)/,,$(2))
-	$(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -I$(BUILDDIR)/config_host $(2) -fPIC -std=c++11 -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
+	$(QUIET)$(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -I$(BUILDDIR)/config_host $(2) -fPIC -std=c++11 -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
 
 -include $(CLANGOUTDIR)/$(1).d
 
@@ -79,10 +81,10 @@ $(foreach src, $(CLANGSRC), $(eval $(call clangbuildsrc,$(src),$(CLANGINDIR)/$(s
 
 $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS)
 	@echo [build LNK] $(subst $(BUILDDIR)/,,$@)
-	$(CXX) -shared $(CLANGOBJS) -o $@
+	$(QUIET)$(CXX) -shared $(CLANGOBJS) -o $@
 
 # Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes.
 $(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang
-	touch $@
+	$(QUIET)touch $@
 
 # vim: set noet sw=4 ts=4: