apple_remote/source/GlobalKeyboardDevice.m                  |    2 
 apple_remote/source/HIDRemoteControlDevice.m                |    2 
 avmedia/source/macavf/window.mm                             |    2 
 avmedia/source/vlc/wrapper/Common.cxx                       |    2 
 avmedia/source/vlc/wrapper/EventManager.cxx                 |    2 
 avmedia/source/vlc/wrapper/Instance.cxx                     |    2 
 avmedia/source/vlc/wrapper/Media.cxx                        |    2 
 avmedia/source/vlc/wrapper/Player.cxx                       |    2 
 compilerplugins/clang/casttovoid.cxx                        |   16 +++++
 configure.ac                                                |   33 +++++++-----
 connectivity/source/commontools/dbtools2.cxx                |   21 -------
 connectivity/source/commontools/sqlerror.cxx                |    1 
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx |   30 +++-------
 connectivity/source/drivers/macab/MacabHeader.cxx           |   10 +--
 connectivity/source/drivers/macab/MacabRecord.cxx           |    5 -
 connectivity/source/drivers/macab/MacabRecord.hxx           |    6 +-
 fpicker/source/aqua/ControlHelper.mm                        |    8 +-
 fpicker/source/aqua/SalAquaFilePicker.mm                    |    4 -
 fpicker/source/aqua/SalAquaFolderPicker.mm                  |    4 -
 fpicker/source/aqua/resourceprovider.hxx                    |    8 +-
 framework/source/helper/titlebarupdate.cxx                  |    5 +
 sal/osl/unx/file.cxx                                        |    5 +
 sal/osl/unx/process_impl.cxx                                |    2 
 sd/source/ui/remotecontrol/BluetoothServer.cxx              |   17 ++----
 sfx2/source/appl/shutdowniconaqua.mm                        |    2 
 vcl/inc/osx/salprn.h                                        |    4 -
 vcl/osx/DataFlavorMapping.cxx                               |    2 
 vcl/osx/PictToBmpFlt.cxx                                    |    5 -
 vcl/osx/PictToBmpFlt.hxx                                    |    3 -
 vcl/osx/a11ytextattributeswrapper.mm                        |    2 
 vcl/osx/a11ytextwrapper.mm                                  |    2 
 vcl/osx/a11ywrapper.mm                                      |    4 -
 vcl/osx/printaccessoryview.mm                               |    8 +-
 vcl/osx/salframe.cxx                                        |    1 
 vcl/osx/salframeview.mm                                     |    2 
 vcl/osx/salinst.cxx                                         |    2 
 vcl/osx/salnativewidgets.cxx                                |    2 
 vcl/osx/salnsmenu.mm                                        |    1 
 vcl/osx/salobj.cxx                                          |    4 -
 vcl/quartz/ctfonts.cxx                                      |    2 
 vcl/quartz/salbmp.cxx                                       |    2 
 vcl/quartz/salgdi.cxx                                       |    1 
 vcl/quartz/salgdicommon.cxx                                 |    1 
 xmloff/source/text/txtparai.cxx                             |    2 
 44 files changed, 105 insertions(+), 138 deletions(-)

New commits:
commit 7e510637e6854f47c2856b5226ea7680a8148bbf
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:15:00 2017 +0200

    loplugin:casttovoid
    
    Change-Id: Icda66259acf54e6771b926ce9d329287bd610e82

diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 6db7d4105985..54a769a121c3 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -387,7 +387,7 @@ Any PNGDataProvider::getOOoData()
         memcpy( imgData.getArray(), [mSystemData bytes], flavorDataLength);
 
         Sequence<sal_Int8> pngData;
-        if( ImageToPNG( imgData, pngData, meImageType))
+        if( ImageToPNG( imgData, pngData))
             oOOData <<= pngData;
     }
     else
diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index 153c03632f4d..df321c364073 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -26,11 +26,8 @@
 #include "PictToBmpFlt.hxx"
 
 bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
-                 css::uno::Sequence<sal_Int8>& rPngData,
-                 NSBitmapImageFileType eInFormat)
+                 css::uno::Sequence<sal_Int8>& rPngData)
 {
-    (void) eInFormat; // Really not needed? Weird.
-
     NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8 
*>(rImgData.getConstArray()) length: rImgData.getLength() freeWhenDone: 0];
     if( !pData)
         return false;
diff --git a/vcl/osx/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx
index b90fa817516a..5e2671f7e22e 100644
--- a/vcl/osx/PictToBmpFlt.hxx
+++ b/vcl/osx/PictToBmpFlt.hxx
@@ -27,8 +27,7 @@
 #include <postmac.h>
 
 bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
-                 css::uno::Sequence<sal_Int8>& rPngData,
-                 NSBitmapImageFileType eInFormat);
+                 css::uno::Sequence<sal_Int8>& rPngData);
 
 bool PNGToImage( css::uno::Sequence<sal_Int8>& rPngData,
                  css::uno::Sequence<sal_Int8>& rImgData,
diff --git a/vcl/osx/a11ytextwrapper.mm b/vcl/osx/a11ytextwrapper.mm
index a2e500a7e589..a46ffd6e7fd9 100644
--- a/vcl/osx/a11ytextwrapper.mm
+++ b/vcl/osx/a11ytextwrapper.mm
@@ -108,13 +108,11 @@ using namespace ::com::sun::star::uno;
 
 +(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper
 {
-    (void)wrapper;
     return [NSArray arrayWithObject:wrapper];
 }
 
 +(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper
 {
-    (void)wrapper;
     return [ NSValue valueWithRange: NSMakeRange ( 0, [wrapper 
accessibleText]->getCharacterCount() ) ];
 }
 
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 0f083126cbfc..13571189be71 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -846,8 +846,6 @@ static std::ostream &operator<<(std::ostream &s, NSObject 
*obj) {
 -(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString 
*)attribute
 {
     SAL_INFO("vcl.a11y", "[" << self << " accessibilitySetOverrideValue:" << 
((NSObject*)value) << " forAttribute:" << attribute << "]");
-    (void)value;
-    (void)attribute;
     return NO; // TODO
 }
 
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 9283a1fe7149..a29eba5eb766 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -283,7 +283,6 @@ SalGraphics* AquaSalFrame::AcquireGraphics()
 
 void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
 {
-    (void)pGraphics;
     SAL_WARN_IF( pGraphics != mpGraphics, "vcl", "graphics released on wrong 
frame" );
     mbGraphics = FALSE;
 }
diff --git a/vcl/osx/salnsmenu.mm b/vcl/osx/salnsmenu.mm
index fb1f7fb5d4d3..1b65d1e2ed9c 100644
--- a/vcl/osx/salnsmenu.mm
+++ b/vcl/osx/salnsmenu.mm
@@ -36,7 +36,6 @@
 
 -(void)menuNeedsUpdate: (NSMenu*)pMenu
 {
-    (void)pMenu;
     SolarMutexGuard aGuard;
 
     if( mpMenu )
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index b564b4a5b179..b1d393876e16 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -829,7 +829,6 @@ void AquaSalGraphics::FreeEmbedFontData( const void* pData, 
long /*nDataLen*/ )
 {
     // TODO: implementing this only makes sense when the implementation of
     //      AquaSalGraphics::GetEmbedFontData() returns non-NULL
-    (void)pData;
     SAL_WARN_IF( (pData==nullptr), "vcl", 
"AquaSalGraphics::FreeEmbedFontData() is not implemented");
 }
 
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 73cd294104ce..227fa09d1b95 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -86,7 +86,6 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
     {
         return;
     }
-    (void)bPixelSnap; // TODO
 
     const bool bHasCurves = rPolygon.areControlPointsUsed();
     for( int nPointIdx = 0, nPrevIdx = 0;; nPrevIdx = nPointIdx++ )
commit 5e4476b6ecda4be8a3271185bfc5d1aff58ce3af
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:14:27 2017 +0200

    loplugin:oncevar
    
    Change-Id: I678b1bf281ae4de4a75f8c83398ee19f75b4f278

diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 15123c826854..0f083126cbfc 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -157,7 +157,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject 
*obj) {
         if ( ! asGetter ) {
             [ methodName appendString: @"set" ];
         }
-        NSRange aRange = { 2, 1 };
+        NSRange const aRange = { 2, 1 };
         NSString * firstChar = [ attribute substringWithRange: aRange ]; // 
drop leading "AX" and get first char
         if ( asGetter ) {
             [ methodName appendString: [ firstChar lowercaseString ] ];
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index b88aadb444e7..56ac7f2131bf 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -590,7 +590,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 // Perhaps some other HIThemeButtonDrawInfo setting would do 
the trick ?
 
                 CGContextSetShouldAntialias( mrContext, true );
-                CGFloat aGrey[] = { 0.45, 0.45, 0.45, 1.0 };
+                CGFloat const aGrey[] = { 0.45, 0.45, 0.45, 1.0 };
                 CGContextSetFillColor( mrContext, aGrey );
                 CGContextBeginPath( mrContext );
                 float x = rc.origin.x + rc.size.width;
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index b9170f706c38..957f017363fc 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -59,7 +59,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, 
SystemWindowData* pWindowDat
 
         if (pWindowData->bLegacy)
         {
-            NSOpenGLPixelFormatAttribute aAttributes[] =
+            NSOpenGLPixelFormatAttribute const aAttributes[] =
             {
                 NSOpenGLPFADoubleBuffer,
                 NSOpenGLPFAAlphaSize, 8,
@@ -74,7 +74,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, 
SystemWindowData* pWindowDat
         }
         else
         {
-            NSOpenGLPixelFormatAttribute aAttributes[] =
+            NSOpenGLPixelFormatAttribute const aAttributes[] =
             {
                 NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
                 NSOpenGLPFADoubleBuffer,
commit 0451703e2eff960c12443e2ab8d58b2d91754f3c
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:13:29 2017 +0200

    loplugin:staticmethods
    
    Change-Id: I13fe0b5b77d8d43639afa035f2db6e904cd998be

diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 3cfe816ce704..9c8f684c4275 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -166,14 +166,14 @@ public:
         assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5 && "resources not 
found" );
     }
 
-    rtl::OUString getMoreString()
+    static rtl::OUString getMoreString()
     {
         return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 4
                ? VclResId(SV_PRINT_NATIVE_STRINGS[3])
                : OUString("More");
     }
 
-    rtl::OUString getPrintSelectionString()
+    static rtl::OUString getPrintSelectionString()
     {
         return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5
                ? VclResId(SV_PRINT_NATIVE_STRINGS[4])
@@ -1127,7 +1127,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, 
long& rCurY, long nAttachO
             {
                 rtl::OUString aGroupTitle( aText );
                 if( aCtrlType == "Subgroup" )
-                    aGroupTitle = pControllerProperties->getMoreString();
+                    aGroupTitle = ControllerProperties::getMoreString();
 
                 // set size of current parent
                 if( pCurParent )
@@ -1153,7 +1153,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, 
long& rCurY, long nAttachO
                 if( bAddSelectionCheckBox )
                 {
                     addBool( pCurParent, nCurX, nCurY, 0,
-                             pControllerProperties->getPrintSelectionString(), 
bSelectionBoxEnabled,
+                             ControllerProperties::getPrintSelectionString(), 
bSelectionBoxEnabled,
                              "PrintContent", bSelectionBoxChecked,
                              aRightColumn, pControllerProperties, pCtrlTarget 
);
                     bAddSelectionCheckBox = false;
commit 5665259f2d7d696ce5e0566e367c7cf8420fe04d
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:12:26 2017 +0200

    loplugin:unnecessaryparen
    
    Change-Id: I9496cafef840195e3934bf92600d4e8c8edb6c26

diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 78afec3b02fb..86e04bb548dd 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -145,9 +145,9 @@ class AquaSalPrinter : public SalPrinter
 
 const double fPtTo100thMM = 35.27777778;
 
-inline int PtTo10Mu( double nPoints ) { return 
(int)(((nPoints)*fPtTo100thMM)+0.5); }
+inline int PtTo10Mu( double nPoints ) { return 
(int)((nPoints*fPtTo100thMM)+0.5); }
 
-inline double TenMuToPt( double nUnits ) { return 
floor(((nUnits)/fPtTo100thMM)+0.5); }
+inline double TenMuToPt( double nUnits ) { return 
floor((nUnits/fPtTo100thMM)+0.5); }
 
 #endif // INCLUDED_VCL_INC_OSX_SALPRN_H
 
diff --git a/vcl/osx/a11ytextattributeswrapper.mm 
b/vcl/osx/a11ytextattributeswrapper.mm
index 4a7de4824b17..5d5f84fedc6c 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -322,7 +322,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 
 +(void)addMarkup:(XAccessibleTextMarkup*)markup 
toString:(NSMutableAttributedString*)string inRange:(NSRange)range {
-    [AquaA11yTextAttributesWrapper addMarkup:markup 
withType:(css::text::TextMarkupType::SPELLCHECK) toString:string inRange:range];
+    [AquaA11yTextAttributesWrapper addMarkup:markup 
withType:css::text::TextMarkupType::SPELLCHECK toString:string inRange:range];
 }
 
 +(NSMutableAttributedString 
*)createAttributedStringForElement:(AquaA11yWrapper *)wrapper 
inOrigRange:(id)origRange {
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index eb2ea1500a96..e290891ce294 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -196,7 +196,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
     // enable OSX>=10.7 fullscreen options if available and useful
     bool bAllowFullScreen = (SalFrameStyleFlags::NONE == (mpFrame->mnStyle & 
(SalFrameStyleFlags::DIALOG | SalFrameStyleFlags::TOOLTIP | 
SalFrameStyleFlags::SYSTEMCHILD | SalFrameStyleFlags::FLOAT | 
SalFrameStyleFlags::TOOLWINDOW | SalFrameStyleFlags::INTRO)));
-    bAllowFullScreen &= (SalFrameStyleFlags::NONE == (~mpFrame->mnStyle & 
(SalFrameStyleFlags::SIZEABLE)));
+    bAllowFullScreen &= (SalFrameStyleFlags::NONE == (~mpFrame->mnStyle & 
SalFrameStyleFlags::SIZEABLE));
     bAllowFullScreen &= (mpFrame->mpParent == nullptr);
     const SEL setCollectionBehavior = @selector(setCollectionBehavior:);
     if( bAllowFullScreen && [pNSWindow respondsToSelector: 
setCollectionBehavior])
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 4f98d64cdb76..54e04dad76ca 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -781,7 +781,7 @@ SalObject* AquaSalInstance::CreateObject( SalFrame* 
pParent, SystemWindowData* p
 
 void AquaSalInstance::DestroyObject( SalObject* pObject )
 {
-    delete ( pObject );
+    delete pObject;
 }
 
 SalPrinter* AquaSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 1146f3431ab0..e235c5d223b9 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -379,7 +379,7 @@ FontAttributes DevFontFromCTFontDescriptor( 
CTFontDescriptorRef pFD, bool* bFont
     if( CFDictionaryGetValueIfPresent( pAttrDict, kCTFontSymbolicTrait, 
reinterpret_cast<const void**>(&pSymbolNum) ) )
     {
         CFNumberGetValue( pSymbolNum, kCFNumberSInt64Type, &nSymbolTrait );
-        rDFA.SetSymbolFlag( ((nSymbolTrait & kCTFontClassMaskTrait) == 
kCTFontSymbolicClass) );
+        rDFA.SetSymbolFlag( (nSymbolTrait & kCTFontClassMaskTrait) == 
kCTFontSymbolicClass );
     }
 
     // get the font weight
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 5d358964e7cd..fe8aa8920f7b 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -495,7 +495,7 @@ public:
     virtual void SkipPixel( sal_uInt32 nPixel ) override
         {
             mnX += nPixel;
-            if( (nPixel & 1) )
+            if( nPixel & 1 )
             {
                 mnShift ^= 4;
             }
commit 4535203c07559215a810f7252b3f250a7e7e1813
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:09:51 2017 +0200

    loplugin:unnecessaryparen
    
    Change-Id: I8b4bdd1908ba7f804d9c501ce2f9ff7893907ccb

diff --git a/sfx2/source/appl/shutdowniconaqua.mm 
b/sfx2/source/appl/shutdowniconaqua.mm
index ebf830568f54..78dbec386269 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -179,7 +179,7 @@ class RecentFilesStringLength : public 
::cppu::WeakImplHelper< css::util::XStrin
     int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : 
aHistoryList.getLength();
 
     m_pRecentFilesItems->clear();
-    if( ( nPickListMenuItems > 0 ) )
+    if( nPickListMenuItems > 0 )
     {
         for ( int i = 0; i < nPickListMenuItems; i++ )
         {
commit 9f27587c9db0a5d2daeb7529e477b4199beb2876
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:09:37 2017 +0200

    loplugin:casttovoid
    
    Change-Id: I2a4d11badeefdf1ede1f44e1d4ed53074ff8ebfd

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index b0f8574f7300..2cc8380926ca 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -551,11 +551,9 @@ void OSXBluetoothWrapper::channelClosed()
 }
 
 void incomingCallback( void *userRefCon,
-                       IOBluetoothUserNotificationRef inRef,
+                       IOBluetoothUserNotificationRef,
                        IOBluetoothObjectRef objectRef )
 {
-    (void) inRef;
-
     SAL_INFO( "sdremote.bluetooth", "incomingCallback()" );
 
     BluetoothServer* pServer = static_cast<BluetoothServer*>(userRefCon);
@@ -1500,14 +1498,11 @@ void SAL_CALL BluetoothServer::run()
         [serviceRecord getServiceRecordHandle: &serviceRecordHandle];
 
         // Register callback for incoming connections
-        IOBluetoothUserNotificationRef callbackRef =
-            IOBluetoothRegisterForFilteredRFCOMMChannelOpenNotifications(
-                incomingCallback,
-                this,
-                channelID,
-                kIOBluetoothUserNotificationChannelDirectionIncoming);
-
-        (void) callbackRef;
+        IOBluetoothRegisterForFilteredRFCOMMChannelOpenNotifications(
+            incomingCallback,
+            this,
+            channelID,
+            kIOBluetoothUserNotificationChannelDirectionIncoming);
 
         [serviceRecord release];
     }
commit 8e949018befc341979e54ec759795d8615cc7f23
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:09:01 2017 +0200

    loplugin:unnecessaryparen
    
    Change-Id: I840f0638e02819398bae901d799a1882e0045d8e

diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index c38ecedc6491..e7cc240a01c2 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -62,7 +62,7 @@ oslProcessError SAL_CALL 
bootstrap_getExecutableFile(rtl_uString ** ppFileURL)
             /* Convert from utf8 to unicode. */
             rtl_uString * pAbsPath = nullptr;
             rtl_string2UString (
-                &(pAbsPath),
+                &pAbsPath,
                 abspath, rtl_str_getLength (abspath),
                 RTL_TEXTENCODING_UTF8,
                 OSTRING_TO_OUSTRING_CVTFLAGS);
commit bf1bdbeb5cc91358e655bf2df28bbd2fba5347e7
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:08:43 2017 +0200

    loplugin:oncevar
    
    Change-Id: Id88149b2ebbf869474192cc22b862093db21aeb6

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 35d620813cfa..f2b594f8a3e6 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -798,9 +798,10 @@ static int osl_file_adjustLockFlags(const char *path, int 
flags)
             flags &= ~(O_EXLOCK | O_SHLOCK | O_NONBLOCK);
         }
     }
-#endif /* MACOSX */
-
+#else
     (void) path;
+#endif
+
     return flags;
 }
 
commit 7400dac23a2df7de133398dea1f5f069efd17ffd
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:08:22 2017 +0200

    loplugin:oncevar
    
    Change-Id: I8481404b2763e69752bb418db85530473ccd6b61

diff --git a/framework/source/helper/titlebarupdate.cxx 
b/framework/source/helper/titlebarupdate.cxx
index c6d916a60f19..c69946db813c 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -124,9 +124,8 @@ void TitleBarUpdate::impl_updateApplicationID(const 
css::uno::Reference< css::fr
     if ( ! xWindow.is() )
         return;
 
-    OUString sApplicationID;
-
 #if !defined(MACOSX)
+    OUString sApplicationID;
     try
     {
         css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
@@ -158,6 +157,8 @@ void TitleBarUpdate::impl_updateApplicationID(const 
css::uno::Reference< css::fr
     catch(const css::uno::Exception&)
     {
     }
+#else
+    OUString const sApplicationID;
 #endif
 
     // VCL SYNCHRONIZED ->
commit 854add5efd6655279473f7531391a051680be979
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:08:00 2017 +0200

    loplugin:casttovoid
    
    Change-Id: If1be399a3d310ab6abab6d7e4c8d59dc9648c1a0

diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index 6807aadbfb2e..46f9c4c50669 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -44,8 +44,6 @@ Window::Window( const uno::Reference< 
lang::XMultiServiceFactory >& i_rxMgr, Pla
     AVPlayer* pAVPlayer = mrPlayer.getAVPlayer();
     AVAsset* pMovie = [[pAVPlayer currentItem] asset];
     const int nVideoCount = [pMovie 
tracksWithMediaType:AVMediaTypeVideo].count;
-    const int nAudioCount = [pMovie 
tracksWithMediaType:AVMediaTypeAudio].count;
-    (void)nAudioCount;
     if( nVideoCount <= 0 )
         return;
 
commit 8d725ca4acad24dbaee84f09d3bb7e9fc35c641c
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:07:55 2017 +0200

    loplugin:oncevar
    
    Change-Id: I030d23da9fedc067581d002ce899028e6f486cc7

diff --git a/avmedia/source/vlc/wrapper/Common.cxx 
b/avmedia/source/vlc/wrapper/Common.cxx
index 9dc366c9bcff..674f1803c6f8 100644
--- a/avmedia/source/vlc/wrapper/Common.cxx
+++ b/avmedia/source/vlc/wrapper/Common.cxx
@@ -25,7 +25,7 @@ namespace wrapper
 {
 bool Common::LoadSymbols()
 {
-    ApiMap VLC_COMMON_API[] =
+    ApiMap const VLC_COMMON_API[] =
     {
         SYM_MAP( libvlc_get_version ),
         SYM_MAP( libvlc_errmsg )
diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx 
b/avmedia/source/vlc/wrapper/EventManager.cxx
index 2b3cbe21fd51..585a72557c98 100644
--- a/avmedia/source/vlc/wrapper/EventManager.cxx
+++ b/avmedia/source/vlc/wrapper/EventManager.cxx
@@ -47,7 +47,7 @@ void EventManager::Handler( const libvlc_event_t *event, void 
*pData )
 
 bool EventManager::LoadSymbols()
 {
-    ApiMap VLC_EVENT_MANAGER_API[] =
+    ApiMap const VLC_EVENT_MANAGER_API[] =
     {
         SYM_MAP( libvlc_media_player_event_manager ),
         SYM_MAP( libvlc_event_attach ),
diff --git a/avmedia/source/vlc/wrapper/Instance.cxx 
b/avmedia/source/vlc/wrapper/Instance.cxx
index db8f1c62c8ee..dec2ff75edea 100644
--- a/avmedia/source/vlc/wrapper/Instance.cxx
+++ b/avmedia/source/vlc/wrapper/Instance.cxx
@@ -25,7 +25,7 @@ namespace wrapper
 {
     bool Instance::LoadSymbols()
     {
-        ApiMap VLC_INSTANCE_API[] =
+        ApiMap const VLC_INSTANCE_API[] =
         {
             SYM_MAP( libvlc_new ),
             SYM_MAP( libvlc_release ),
diff --git a/avmedia/source/vlc/wrapper/Media.cxx 
b/avmedia/source/vlc/wrapper/Media.cxx
index 4ec575b3347c..84a0078aacdc 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -45,7 +45,7 @@ namespace
 
 bool Media::LoadSymbols()
 {
-    ApiMap VLC_MEDIA_API[] =
+    ApiMap const VLC_MEDIA_API[] =
     {
         SYM_MAP( libvlc_media_new_path ),
         SYM_MAP( libvlc_media_release ),
diff --git a/avmedia/source/vlc/wrapper/Player.cxx 
b/avmedia/source/vlc/wrapper/Player.cxx
index 868ada28fde5..ae49540baada 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -67,7 +67,7 @@ namespace wrapper
 {
     bool Player::LoadSymbols()
     {
-        ApiMap VLC_PLAYER_API[] =
+        ApiMap const VLC_PLAYER_API[] =
         {
             SYM_MAP( libvlc_media_player_new_from_media ),
             SYM_MAP( libvlc_media_player_release ),
commit e9febbc3200ee64af29c35b8fa692ac0251afa40
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:07:42 2017 +0200

    loplugin:oncevar
    
    Change-Id: I9d6902d86c9b72ad28a025374077ef90a350e598

diff --git a/apple_remote/source/GlobalKeyboardDevice.m 
b/apple_remote/source/GlobalKeyboardDevice.m
index f5ecb1f41a1e..c9e77097f9c1 100644
--- a/apple_remote/source/GlobalKeyboardDevice.m
+++ b/apple_remote/source/GlobalKeyboardDevice.m
@@ -145,7 +145,7 @@ static OSStatus hotKeyEventHandler(EventHandlerCallRef, 
EventRef, void*);
 
        if (eventHandlerRef) return;
 
-       EventTypeSpec eventSpec[2] = {
+       EventTypeSpec const eventSpec[2] = {
                { kEventClassKeyboard, kEventHotKeyPressed },
                { kEventClassKeyboard, kEventHotKeyReleased }
        };
diff --git a/apple_remote/source/HIDRemoteControlDevice.m 
b/apple_remote/source/HIDRemoteControlDevice.m
index 88ebf66c664a..ba1ebb25d243 100644
--- a/apple_remote/source/HIDRemoteControlDevice.m
+++ b/apple_remote/source/HIDRemoteControlDevice.m
@@ -346,7 +346,7 @@ static void QueueCallbackFunction(void* target,  IOReturn 
result, void* refcon,
 
        HIDRemoteControlDevice* remote = (HIDRemoteControlDevice*)target;
        IOHIDEventStruct event;
-       AbsoluteTime     zeroTime = {0,0};
+       AbsoluteTime const zeroTime = {0,0};
        NSMutableString* cookieString = [NSMutableString string];
        SInt32                   sumOfValues = 0;
        while (result == kIOReturnSuccess)
commit e0d342497334e9518dd4b7b1d33bf855fa0fb7ad
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:06:45 2017 +0200

    loplugin:oncevar
    
    Change-Id: I9bd2e0a3ae1d0dc59c235e47be6ffa4357164a20

diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx 
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index e6c05084f794..10963ef1e3f9 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -56,12 +56,11 @@ MacabDatabaseMetaData::~MacabDatabaseMetaData()
 
 OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator(  )
 {
-    OUString aVal;
     if (m_bUseCatalog)
     { // do some special here for you database
     }
 
-    return aVal;
+    return OUString();
 }
 
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength(  )
@@ -183,11 +182,10 @@ sal_Bool SAL_CALL 
MacabDatabaseMetaData::supportsNonNullableColumns(  )
 
 OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm(  )
 {
-    OUString aVal;
     if (m_bUseCatalog)
     {
     }
-    return aVal;
+    return OUString();
 }
 
 OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString(  )
@@ -198,8 +196,7 @@ OUString SAL_CALL 
MacabDatabaseMetaData::getIdentifierQuoteString(  )
 
 OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters(  )
 {
-    OUString aVal;
-    return aVal;
+    return OUString();
 }
 
 sal_Bool SAL_CALL 
MacabDatabaseMetaData::supportsDifferentTableCorrelationNames(  )
@@ -540,8 +537,7 @@ OUString SAL_CALL MacabDatabaseMetaData::getURL(  )
 
 OUString SAL_CALL MacabDatabaseMetaData::getUserName(  )
 {
-    OUString aValue;
-    return aValue;
+    return OUString();
 }
 
 OUString SAL_CALL MacabDatabaseMetaData::getDriverName(  )
@@ -556,26 +552,22 @@ OUString SAL_CALL 
MacabDatabaseMetaData::getDriverVersion()
 
 OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion(  )
 {
-    OUString aValue;
-    return aValue;
+    return OUString();
 }
 
 OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName(  )
 {
-    OUString aValue;
-    return aValue;
+    return OUString();
 }
 
 OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm(  )
 {
-    OUString aValue;
-    return aValue;
+    return OUString();
 }
 
 OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm(  )
 {
-    OUString aValue;
-    return aValue;
+    return OUString();
 }
 
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion(  )
@@ -595,14 +587,12 @@ sal_Int32 SAL_CALL 
MacabDatabaseMetaData::getDriverMinorVersion(  )
 
 OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords(  )
 {
-    OUString aValue;
-    return aValue;
+    return OUString();
 }
 
 OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape(  )
 {
-    OUString aValue;
-    return aValue;
+    return OUString();
 }
 
 OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions(  )
commit 10c80e560e5580b91fe7be5c8d171146335eb8a5
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:06:25 2017 +0200

    loplugin:oncevar
    
    Change-Id: I1bb87b9c1a34326694d8096f67bb32adb17af1e6

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm 
b/fpicker/source/aqua/SalAquaFilePicker.mm
index e576844149e8..2742d4ad33af 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -482,9 +482,7 @@ void SAL_CALL SalAquaFilePicker::disposing( const 
lang::EventObject& aEvent )
 
 rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName()
 {
-    rtl::OUString retVal( FILE_PICKER_IMPL_NAME );
-
-    return retVal;
+    return FILE_PICKER_IMPL_NAME;
 }
 
 sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const rtl::OUString& 
sServiceName )
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm 
b/fpicker/source/aqua/SalAquaFolderPicker.mm
index ff1d519aba60..b7abcf6bcf56 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -162,9 +162,7 @@ void SAL_CALL SalAquaFolderPicker::setDescription( const 
rtl::OUString& rDescrip
 
 rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
 {
-    rtl::OUString retVal( FOLDER_PICKER_IMPL_NAME );
-
-    return retVal;
+    return FOLDER_PICKER_IMPL_NAME;
 }
 
 sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const rtl::OUString& 
sServiceName )
commit 293ddf0b7fb3697c84d28795f2cd35f623f136c7
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:05:51 2017 +0200

    loplugin:staticmethods
    
    Change-Id: Iaf9b6afa7c2d3d8044d50e0bfac898319fff8f22

diff --git a/fpicker/source/aqua/ControlHelper.mm 
b/fpicker/source/aqua/ControlHelper.mm
index 6a0d18f4d5ee..f645d2a4aecd 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -522,13 +522,12 @@ void ControlHelper::createUserPane()
 
 void ControlHelper::createControls()
 {
-    CResourceProvider aResProvider;
     for (int i = 0; i < LIST_LAST; i++) {
         if (m_bListVisibility[i]) {
             m_bUserPaneNeeded = true;
 
             int elementName = getControlElementName([NSPopUpButton class], i);
-            NSString* sLabel = aResProvider.getResString(elementName);
+            NSString* sLabel = CResourceProvider::getResString(elementName);
 
             m_pListControls[i] = [NSPopUpButton new];
 
@@ -554,7 +553,7 @@ void ControlHelper::createControls()
             m_bUserPaneNeeded = true;
 
             int elementName = getControlElementName([NSButton class], i);
-            NSString* sLabel = aResProvider.getResString(elementName);
+            NSString* sLabel = CResourceProvider::getResString(elementName);
 
             NSButton *button = [NSButton new];
             [button setTitle:sLabel];
@@ -867,8 +866,7 @@ void ControlHelper::layoutControls()
 
 void ControlHelper::createFilterControl()
 {
-    CResourceProvider aResProvider;
-    NSString* sLabel = 
aResProvider.getResString(CommonFilePickerElementIds::LISTBOX_FILTER_LABEL);
+    NSString* sLabel = 
CResourceProvider::getResString(CommonFilePickerElementIds::LISTBOX_FILTER_LABEL);
 
     m_pFilterControl = [NSPopUpButton new];
 
diff --git a/fpicker/source/aqua/resourceprovider.hxx 
b/fpicker/source/aqua/resourceprovider.hxx
index 44454c8e0954..4e3849ed1de9 100644
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
@@ -38,10 +38,10 @@
 #define FILE_PICKER_FILE_TYPE         504
 #define FILE_PICKER_OVERWRITE         505
 
-class CResourceProvider
-{
-public:
-    NSString* getResString( sal_Int32 aId );
+namespace CResourceProvider {
+
+NSString* getResString( sal_Int32 aId );
+
 };
 
 #endif
commit 338a9abae6a2fcf6d9ca3f7b09535105d1c28259
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:04:26 2017 +0200

    loplugin:useuniqueptr
    
    Change-Id: Ie6c1cea3850ddf37aa8b9f4731547650a23f5d29

diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx 
b/connectivity/source/drivers/macab/MacabHeader.cxx
index 62e2875ef77a..a674dad8f359 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -25,6 +25,7 @@
 #include <math.h>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <connectivity/dbconversion.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace connectivity::macab;
 using namespace com::sun::star::sdbc;
@@ -36,7 +37,7 @@ MacabHeader::MacabHeader(const sal_Int32 _size, macabfield 
**_fields)
 {
     sal_Int32 i;
     size = _size;
-    fields = new macabfield *[size];
+    fields = o3tl::make_unique<macabfield *[]>(size);
     for(i = 0; i < size; i++)
     {
         if(_fields[i] == nullptr)
@@ -86,7 +87,7 @@ void MacabHeader::operator+= (const MacabHeader *r)
         {
             sal_Int32 i;
             size = rSize;
-            fields = new macabfield *[size];
+            fields = o3tl::make_unique<macabfield *[]>(size);
             for(i = 0; i < size; i++)
             {
                 fields[i] = r->copy(i);
@@ -132,9 +133,8 @@ void MacabHeader::operator+= (const MacabHeader *r)
             }
 
             releaseFields();
-            delete [] fields;
             size += numAdded;
-            fields = newFields;
+            fields.reset(newFields);
         }
     }
 }
@@ -230,7 +230,7 @@ macabfield **MacabHeader::sortRecord(const sal_Int32 
_start, const sal_Int32 _le
         }
         if(_length == size)
         {
-            fields = sorted;
+            fields.reset(sorted);
         }
         delete firstHalf;
         delete lastHalf;
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx 
b/connectivity/source/drivers/macab/MacabRecord.cxx
index d2195a823379..5cb71beff854 100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -21,6 +21,7 @@
 #include "MacabRecord.hxx"
 #include "macabutilities.hxx"
 #include <com/sun/star/util/DateTime.hpp>
+#include <o3tl/make_unique.hxx>
 
 #include <premac.h>
 #include <Carbon/Carbon.h>
@@ -43,7 +44,7 @@ MacabRecord::MacabRecord()
 MacabRecord::MacabRecord(const sal_Int32 _size)
 {
     size = _size;
-    fields = new macabfield *[size];
+    fields = o3tl::make_unique<macabfield *[]>(size);
     sal_Int32 i;
     for(i = 0; i < size; i++)
         fields[i] = nullptr;
@@ -61,8 +62,6 @@ MacabRecord::~MacabRecord()
             fields[i] = nullptr;
         }
     }
-    delete [] fields;
-    fields = nullptr;
 }
 
 
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx 
b/connectivity/source/drivers/macab/MacabRecord.hxx
index 5d0cb1dfa5e7..e677611bdec8 100644
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORD_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORD_HXX
 
+#include <sal/config.h>
+
+#include <memory>
+
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
@@ -46,7 +50,7 @@ namespace connectivity
         class MacabRecord{
             protected:
                 sal_Int32 size;
-                macabfield **fields;
+                std::unique_ptr<macabfield *[]> fields;
             protected:
                 void releaseFields();
             public:
commit 52da4081bf6d7bf97e102dab3e0082f11488215b
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:03:11 2017 +0200

    Remove dead DBG_UTIL code
    
    Change-Id: Icb208bc457eaab06bc14e874c70a25308179785d

diff --git a/connectivity/source/commontools/dbtools2.cxx 
b/connectivity/source/commontools/dbtools2.cxx
index 43f4aaef2774..7ee10d3f3323 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -710,18 +710,8 @@ sal_Int32 getTablePrivileges(const Reference< 
XDatabaseMetaData>& _xMetaData,
             OUString sPrivilege, sGrantee;
             while ( xPrivileges->next() )
             {
-#ifdef DBG_UTIL
-                OUString sCat, sSchema, sName, sGrantor, sGrantable;
-                sCat        = xCurrentRow->getString(1);
-                sSchema     = xCurrentRow->getString(2);
-                sName       = xCurrentRow->getString(3);
-                sGrantor    = xCurrentRow->getString(4);
-#endif
                 sGrantee    = xCurrentRow->getString(5);
                 sPrivilege  = xCurrentRow->getString(6);
-#ifdef DBG_UTIL
-                sGrantable  = xCurrentRow->getString(7);
-#endif
 
                 if (!sUserWorkingFor.equalsIgnoreAsciiCase(sGrantee))
                     continue;
@@ -759,19 +749,8 @@ sal_Int32 getTablePrivileges(const Reference< 
XDatabaseMetaData>& _xMetaData,
             OUString sPrivilege, sGrantee;
             while ( xColumnPrivileges->next() )
             {
-#ifdef DBG_UTIL
-                OUString sCat, sSchema, sTableName, sColumnName, sGrantor, 
sGrantable;
-                sCat        = xColumnCurrentRow->getString(1);
-                sSchema     = xColumnCurrentRow->getString(2);
-                sTableName  = xColumnCurrentRow->getString(3);
-                sColumnName = xColumnCurrentRow->getString(4);
-                sGrantor    = xColumnCurrentRow->getString(5);
-#endif
                 sGrantee    = xColumnCurrentRow->getString(6);
                 sPrivilege  = xColumnCurrentRow->getString(7);
-#ifdef DBG_UTIL
-                sGrantable  = xColumnCurrentRow->getString(8);
-#endif
 
                 if (!sUserWorkingFor.equalsIgnoreAsciiCase(sGrantee))
                     continue;
commit a13db19a2f21011443268d5d64dac4cd566bd1b6
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:02:15 2017 +0200

    -Werror,-Wunused-private-field
    
    Change-Id: I42d1c0c2e6a0746c1c97dba9b02abf1d771b3fc7

diff --git a/connectivity/source/commontools/sqlerror.cxx 
b/connectivity/source/commontools/sqlerror.cxx
index 066719eb9963..c14608a18db1 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -79,7 +79,6 @@ namespace connectivity
                 impl_buildSQLException( const ErrorCondition _eCondition, 
const Reference< XInterface >& _rxContext,
                     const ParamValue& _rParamValue1, const ParamValue& 
_rParamValue2, const ParamValue& _rParamValue3 );
     private:
-        ::osl::Mutex                                            m_aMutex;
         std::locale                                             m_aResources;
     };
 
commit dbeab89b5b74ca0ff789be376c94d64f5e937f11
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 08:00:07 2017 +0200

    Adopt loplugin:casttovoid to Objective C
    
    Change-Id: I71bad86a383a9b906b02ec968dc32e9acd0bec26

diff --git a/compilerplugins/clang/casttovoid.cxx 
b/compilerplugins/clang/casttovoid.cxx
index 49c086139a00..10f1a6556d66 100644
--- a/compilerplugins/clang/casttovoid.cxx
+++ b/compilerplugins/clang/casttovoid.cxx
@@ -152,6 +152,15 @@ public:
         return ret;
     }
 
+    bool TraverseObjCMethodDecl(ObjCMethodDecl * decl) {
+        returnTypes_.push(decl->getReturnType());
+        auto const ret = RecursiveASTVisitor::TraverseObjCMethodDecl(decl);
+        assert(!returnTypes_.empty());
+        assert(returnTypes_.top() == decl->getReturnType());
+        returnTypes_.pop();
+        return ret;
+    }
+
     bool TraverseConstructorInitializer(CXXCtorInitializer * init) {
         if (auto const field = init->getAnyMember()) {
             if (loplugin::TypeCheck(field->getType()).LvalueReference()) {
@@ -340,8 +349,11 @@ private:
                     {
                         continue;
                     }
-                    auto const fun = dyn_cast_or_null<FunctionDecl>(
-                        i.first->getDeclContext());
+                    auto const ctxt = i.first->getDeclContext();
+                    if (dyn_cast_or_null<ObjCMethodDecl>(ctxt) != nullptr) {
+                        continue;
+                    }
+                    auto const fun = dyn_cast_or_null<FunctionDecl>(ctxt);
                     assert(fun != nullptr);
                     if (containsPreprocessingConditionalInclusion(
                             fun->getSourceRange()))
commit a1e0232b5179c12892b33cd368b9d17a65c398e0
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 07:59:08 2017 +0200

    Use OUString::clear
    
    Change-Id: I8ed383cdcf7b802a0c79c67826fc35379e8cd361

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 433c148e61dd..f960ef371379 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1214,7 +1214,7 @@ void XMLIndexMarkImportContext_Impl::GetServiceName(
         default:
         {
             SAL_WARN("xmloff.text", "unknown index mark type!");
-            sServiceName = OUString();
+            sServiceName.clear();
             break;
         }
     }
commit d031f9e24f01369a836370a785538fdba28d7cc1
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Aug 7 07:57:12 2017 +0200

    Allow MSGFMT, MSGUNIQ to be overridden
    
    ...and fail already in configure when only MSGFMT but not MSGUNIQ is 
overridden
    
    Change-Id: I5dadca9f44f46e830b8321be11deaa4252f5b596

diff --git a/configure.ac b/configure.ac
index c925914405fc..490d03e058cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11594,21 +11594,28 @@ if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; 
then
 else
     AC_MSG_RESULT([$WITH_LANG])
     GIT_NEEDED_SUBMODULES="translations $GIT_NEEDED_SUBMODULES"
-    if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msgfmt" ; then
-        MSGFMT="$LODE_HOME/opt/bin/msgfmt"
-        MSGUNIQ="$LODE_HOME/opt/bin/msguniq"
-    elif test -x "/opt/lo/bin/msgfmt"; then
-        MSGFMT="/opt/lo/bin/msgfmt"
-        MSGUNIQ="/opt/lo/bin/msguniq"
-    fi
     if test -z "$MSGFMT"; then
-        AC_CHECK_PROGS(MSGFMT, [msgfmt])
-        if test -z "$MSGFMT"; then
-            AC_MSG_ERROR([msgfmt not found. Install GNU gettext, or re-run 
without languages.])
+        if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msgfmt" ; then
+            MSGFMT="$LODE_HOME/opt/bin/msgfmt"
+        elif test -x "/opt/lo/bin/msgfmt"; then
+            MSGFMT="/opt/lo/bin/msgfmt"
+        else
+            AC_CHECK_PROGS(MSGFMT, [msgfmt])
+            if test -z "$MSGFMT"; then
+                AC_MSG_ERROR([msgfmt not found. Install GNU gettext, or re-run 
without languages.])
+            fi
         fi
-        AC_CHECK_PROGS(MSGUNIQ, [msguniq])
-        if test -z "$MSGUNIQ"; then
-            AC_MSG_ERROR([msguniq not found. Install GNU gettext, or re-run 
without languages.])
+    fi
+    if test -z "$MSGUNIQ"; then
+        if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msguniq" ; then
+            MSGUNIQ="$LODE_HOME/opt/bin/msguniq"
+        elif test -x "/opt/lo/bin/msguniq"; then
+            MSGUNIQ="/opt/lo/bin/msguniq"
+        else
+            AC_CHECK_PROGS(MSGUNIQ, [msguniq])
+            if test -z "$MSGUNIQ"; then
+                AC_MSG_ERROR([msguniq not found. Install GNU gettext, or 
re-run without languages.])
+            fi
         fi
     fi
 fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to