Remove warning by using the right printf commands

Change-Id: Id476a0eb1f5965098c8cc2e2847547b1d23387eb
Reviewed-on: https://gerrit.libreoffice.org/4753
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>

16 files changed, 32 insertions, 32 deletions

diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 40dfc494298a..044cf0223a1c 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -906,7 +906,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
               ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQL_NODE_STRING )
               ) )
         {
-            OSL_TRACE("analyseSQL : pAtom->count() = %d", pAtom->count() );
+            OSL_TRACE("analyseSQL : pAtom->count() = %zu", pAtom->count() );
 
             m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_INVALID_LIKE_STRING, *this );
         }
@@ -1262,7 +1262,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
 
                     m_pSortIndex = new OSortIndex(eKeyType,m_aOrderbyAscending);
 
-                    OSL_TRACE("OrderbyColumnNumber->size() = %d",m_aOrderbyColumnNumber.size());
+                    OSL_TRACE("OrderbyColumnNumber->size() = %zu",m_aOrderbyColumnNumber.size());
 #if OSL_DEBUG_LEVEL > 0
                     for ( ::std::vector<sal_Int32>::size_type i = 0; i < m_aColMapping.size(); i++ )
                         OSL_TRACE("Mapped: %d -> %d", i, m_aColMapping[i] );
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 0b7ab560696e..a7bc286acfca 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -77,10 +77,10 @@ DiagramData::DiagramData()
 
 void DiagramData::dump()
 {
-    OSL_TRACE("Dgm: DiagramData # of cnx: %d", maConnections.size() );
+    OSL_TRACE("Dgm: DiagramData # of cnx: %zu", maConnections.size() );
     std::for_each( maConnections.begin(), maConnections.end(),
                   boost::bind( &dgm::Connection::dump, _1 ) );
-    OSL_TRACE("Dgm: DiagramData # of pt: %d", maPoints.size() );
+    OSL_TRACE("Dgm: DiagramData # of pt: %zu", maPoints.size() );
     std::for_each( maPoints.begin(), maPoints.end(),
                   boost::bind( &dgm::Point::dump, _1 ) );
 }
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 442d9958bbe0..6b5a59c5e876 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -991,7 +991,7 @@ struct ConventionOOO_A1 : public Convention_A1
                 pRefMgr->getAllCachedTableNames(nFileId, aTabNames);
                 if (aTabNames.empty())
                 {
-                    OSL_TRACE( "ConventionOOO_A1::makeExternalRefStrImpl: no sheet names for document ID %s", nFileId);
+                    OSL_TRACE( "ConventionOOO_A1::makeExternalRefStrImpl: no sheet names for document ID %d", nFileId);
                 }
 
                 if (!lcl_getLastTabName(aLastTabName, rTabName, aTabNames, aRef))
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index d072d043f0c7..31d4bed700fe 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -282,7 +282,7 @@ void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEve
     {
         uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY );
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-        OSL_TRACE( "ScVbaEventListener::windowActivated - pWindow = 0x%x, mpActiveWindow = 0x%x", pWindow, mpActiveWindow );
+        OSL_TRACE( "ScVbaEventListener::windowActivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow, mpActiveWindow );
         // do not fire activation event multiple time for the same window
         if( pWindow && (pWindow != mpActiveWindow) )
         {
@@ -304,7 +304,7 @@ void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rE
     {
         uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY );
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-        OSL_TRACE( "ScVbaEventListener::windowDeactivated - pWindow = 0x%x, mpActiveWindow = 0x%x", pWindow, mpActiveWindow );
+        OSL_TRACE( "ScVbaEventListener::windowDeactivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow, mpActiveWindow );
         // do not fire the deactivation event, if the window is not active (prevent multiple deactivation)
         if( pWindow && (pWindow == mpActiveWindow) )
             processWindowActivateEvent( pWindow, false );
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index 0c04e97a0363..b358bd992d5e 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -31,7 +31,7 @@ PanelBase::PanelBase (
       mxSidebar(),
       mrViewShellBase(rViewShellBase)
 {
-    OSL_TRACE("created PanelBase at %x for parent %x", this, pParentWindow);
+    OSL_TRACE("created PanelBase at %p for parent %p", this, pParentWindow);
 
 #ifdef DEBUG
     SetText(OUString("sd:PanelBase"));
@@ -43,9 +43,9 @@ PanelBase::PanelBase (
 
 PanelBase::~PanelBase (void)
 {
-    OSL_TRACE("deleting wrapped control at %x", mpWrappedControl.get());
+    OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get());
     mpWrappedControl.reset();
-    OSL_TRACE("deleting PanelBase at %x from parent %x", this, GetParent());
+    OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent());
 }
 
 
@@ -54,7 +54,7 @@ PanelBase::~PanelBase (void)
 
 void PanelBase::Dispose (void)
 {
-    OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %x", mpWrappedControl.get());
+    OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get());
     mpWrappedControl.reset();
 }
 
@@ -113,7 +113,7 @@ bool PanelBase::ProvideWrappedControl (void)
     if ( ! mpWrappedControl)
     {
         mpWrappedControl.reset(CreateWrappedControl(this, mrViewShellBase));
-        OSL_TRACE("created wrapped control at %x for parent PanelBase at %x", mpWrappedControl.get(), this);
+        OSL_TRACE("created wrapped control at %p for parent PanelBase at %p", mpWrappedControl.get(), this);
         if (mpWrappedControl)
             mpWrappedControl->Show();
         if (mxSidebar.is())
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 7c2ea3d79f1c..2ce8c83f4cdf 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -67,7 +67,7 @@ namespace {
             SharedPageDescriptor pDescriptor (rModel.GetPageDescriptor(nIndex));
             if (pDescriptor)
             {
-                OSL_TRACE("%d %d %d %d %x",
+                OSL_TRACE("%d %d %d %d %p",
                     nIndex,
                     pDescriptor->GetPageIndex(),
                     pDescriptor->GetVisualState().mnPageId,
@@ -399,7 +399,7 @@ void SlideSorterModel::ClearDescriptorList (void)
         {
             if ( ! iDescriptor->unique())
             {
-                OSL_TRACE("SlideSorterModel::ClearDescriptorList: trying to delete page descriptor  that is still used with count %d", iDescriptor->use_count());
+                OSL_TRACE("SlideSorterModel::ClearDescriptorList: trying to delete page descriptor  that is still used with count %zu", iDescriptor->use_count());
                 // No assertion here because that can hang the office when
                 // opening a dialog from here.
             }
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index fddf3e53554e..c3813fd0bc1b 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -345,7 +345,7 @@ void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& r
 {
     ThrowIfDisposed();
     (void)rEvent;
-    OSL_TRACE("PresenterWindowManager::focusGained window %x\n",
+    OSL_TRACE("PresenterWindowManager::focusGained window %p\n",
         rEvent.Source.get());
 }
 
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 621535f9dbe7..1b1a96cf03e7 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -387,7 +387,7 @@ namespace slideshow
 
             ENSURE_OR_RETURN_FALSE( mpSprite, "ViewShape::renderSprite(): No sprite" );
 
-            VERBOSE_TRACE( "ViewShape::renderSprite(): Rendering sprite 0x%X",
+            VERBOSE_TRACE( "ViewShape::renderSprite(): Rendering sprite 0x%p",
                            mpSprite.get() );
 
 
@@ -532,7 +532,7 @@ namespace slideshow
 
             if( !bIsVisible )
             {
-                VERBOSE_TRACE( "ViewShape::render(): skipping shape %X", this );
+                VERBOSE_TRACE( "ViewShape::render(): skipping shape %p", this );
 
                 // shape is invisible, no need to update anything.
                 return true;
@@ -557,7 +557,7 @@ namespace slideshow
             if( !bRedrawRequired )
                 return true;
 
-            VERBOSE_TRACE( "ViewShape::render(): rendering shape %X at position (%f,%f)",
+            VERBOSE_TRACE( "ViewShape::render(): rendering shape %p at position (%f,%f)",
                            this,
                            rBounds.getMinX(),
                            rBounds.getMinY() );
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index dc68d02597d7..d9590ef9f975 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -297,7 +297,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
                 reinterpret_cast<typelib_TypeDescription *>(pType_XImplementationLoader));
         throw;
     }
-    OSL_TRACE("javaloader.cxx: mapped javaloader - 0x%x", m_javaLoader.get());
+    OSL_TRACE("javaloader.cxx: mapped javaloader - 0x%p", m_javaLoader.get());
     return m_javaLoader;
 }
 
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index e2ac68b68dc5..2b10ad496263 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -365,7 +365,7 @@ PageCache_Impl::~PageCache_Impl()
         m_hash_size  = theTableSize;
         m_hash_shift = highbit(m_hash_size) - 1;
     }
-    OSL_TRACE("Hits: %u, Misses: %u", m_nHit, m_nMissed);
+    OSL_TRACE("Hits: %zu, Misses: %zu", m_nHit, m_nMissed);
 }
 
 oslInterlockedCount PageCache_Impl::acquire()
@@ -388,7 +388,7 @@ void PageCache_Impl::rescale_Impl (sal_Size new_size)
         Entry ** old_table = m_hash_table;
         sal_Size old_size  = m_hash_size;
 
-        OSL_TRACE("ave chain length: %u, total entries: %u [old_size: %u, new_size: %u]",
+        OSL_TRACE("ave chain length: %zu, total entries: %zu [old_size: %zu new_size: %zu]",
                   m_hash_entries >> m_hash_shift, m_hash_entries, old_size, new_size);
 
         memset (new_table, 0, new_bytes);
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 4d3b5a2ec80c..89ccb3e2065f 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -509,7 +509,7 @@ namespace accessibility
             SetShapeFocus( bHaveFocus );
         }
 
-        OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %d, state: %s", this, bHaveFocus ? "focused" : "not focused");
+        OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %p, state: %s", this, bHaveFocus ? "focused" : "not focused");
     }
 
     sal_Bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
@@ -584,7 +584,7 @@ namespace accessibility
 
                             ChangeChildFocus( aSelection.nEndPara );
 
-                            OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): focus changed, Object: %d, Paragraph: %d, Last paragraph: %d",
+                            OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): focus changed, Object: %p, Paragraph: %d, Last paragraph: %d",
                                        this, aSelection.nEndPara, maLastSelection.nEndPara);
                         }
                     }
@@ -613,7 +613,7 @@ namespace accessibility
                                                  aOldCursor );
                     }
 
-                    OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): caret changed, Object: %d, New pos: %d, Old pos: %d, New para: %d, Old para: %d",
+                    OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): caret changed, Object: %p, New pos: %d, Old pos: %d, New para: %d, Old para: %d",
                                this, aSelection.nEndPos, maLastSelection.nEndPos, aSelection.nEndPara, maLastSelection.nEndPara);
 
                     // #108947# Sort new range before calling FireEvent
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index d046ba854c99..9f6e263419c7 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -261,7 +261,7 @@ public:
         aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
         aArgs[1] = uno::Any( mpDocShell->GetModel() );
         uno::Reference< uno::XInterface > xDocObj = ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
-        OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() );
+        OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%p", xDocObj.get() );
         return  uno::makeAny( xDocObj );
     }
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException)
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index 35d354db5204..ec8e3713d3f8 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -61,7 +61,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory(
     void* pRet = component_getFactoryHelper(pImplName, pServiceManager,
             pRegistryKey, globals::serviceDecl, document::serviceDecl,
             wrapformat::serviceDecl, vbaeventshelper::serviceDecl );
-    OSL_TRACE("Ret is 0x%x", pRet);
+    OSL_TRACE("Ret is 0x%p", pRet);
     return pRet;
 }
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 77a426f2da7e..6261850a0517 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -357,7 +357,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
         pOut->SetLayoutMode( 0 );
         pOut->SetDigitLanguage( 0 );
 
-        OSL_TRACE("GDIMetaFile::Play on device of size: %d x %d", pOut->GetOutputSizePixel().Width(), pOut->GetOutputSizePixel().Height());
+        OSL_TRACE("GDIMetaFile::Play on device of size: %ld x %ld", pOut->GetOutputSizePixel().Width(), pOut->GetOutputSizePixel().Height());
 
         if( !ImplPlayWithRenderer( pOut, Point(0,0), pOut->GetOutputSize() ) ) {
             size_t  i  = 0;
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index c9e9b9dc6c92..71fb345326d1 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -593,7 +593,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         }
 
         if( aPreviewSize.Width() < maOrigSize.Width() && aPreviewSize.Height() < maOrigSize.Height() ) {
-            OSL_TRACE("preview size %dx%d", aPreviewSize.Width(), aPreviewSize.Height() );
+            OSL_TRACE("preview size %ldx%ld", aPreviewSize.Width(), aPreviewSize.Height() );
 
             for( int i = 1; i < 5; ++i )
                 {
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 50ec20c9dca7..389e3f3f952e 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1054,7 +1054,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
                 {
                     FilePickerEvent evt;
                     evt.ElementId = PUSHBUTTON_PLAY;
-                    OSL_TRACE( "filter_changed, isn't it great %x", this);
+                    OSL_TRACE( "filter_changed, isn't it great %p", this);
                     impl_controlStateChanged( evt );
                     btn = GTK_RESPONSE_NO;
                 }
@@ -1509,21 +1509,21 @@ void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *, GParamSpec *,
 {
     FilePickerEvent evt;
     evt.ElementId = LISTBOX_FILTER;
-    OSL_TRACE( "filter_changed, isn't it great %x", pobjFP );
+    OSL_TRACE( "filter_changed, isn't it great %p", pobjFP );
     pobjFP->impl_controlStateChanged( evt );
 }
 
 void SalGtkFilePicker::folder_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
 {
     FilePickerEvent evt;
-    OSL_TRACE( "folder_changed, isn't it great %x", pobjFP );
+    OSL_TRACE( "folder_changed, isn't it great %p", pobjFP );
     pobjFP->impl_directoryChanged( evt );
 }
 
 void SalGtkFilePicker::selection_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
 {
     FilePickerEvent evt;
-    OSL_TRACE( "selection_changed, isn't it great %x", pobjFP );
+    OSL_TRACE( "selection_changed, isn't it great %p", pobjFP );
     pobjFP->impl_fileSelectionChanged( evt );
 }