1 files changed, 19 insertions, 19 deletions

diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index d90047a11f23..851f68b4c231 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -53,9 +53,9 @@ public:
     virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const Any& aImage )
         throw (IllegalArgumentException,RuntimeException);
 
-    virtual sal_Bool SAL_CALL setShowState(sal_Bool bShowState);
+    virtual bool SAL_CALL setShowState(bool bShowState);
 
-    virtual sal_Bool SAL_CALL getShowState();
+    virtual bool SAL_CALL getShowState();
 
     virtual void SAL_CALL setParent(HWND parent);
 
@@ -65,7 +65,7 @@ public:
     // parent notification handler
 
 
-    virtual void SAL_CALL notifyParentShow(sal_Bool bShow);
+    virtual void SAL_CALL notifyParentShow(bool bShow);
 
     virtual void SAL_CALL notifyParentSizeChanged();
 
@@ -89,15 +89,15 @@ protected:
 
 //prevent copy/assignment
 private:
-    CPreviewAdapterImpl(const CPreviewAdapterImpl&);
-    CPreviewAdapterImpl& operator=(const CPreviewAdapterImpl&);
+    CPreviewAdapterImpl(const CPreviewAdapterImpl&) = delete;
+    CPreviewAdapterImpl& operator=(const CPreviewAdapterImpl&) = delete;
 };
 
 
 CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) :
     m_Instance(instance),
     m_Preview(new PreviewBase()), // create dummy preview (NULL-Object pattern)
-    m_FileDialog(0),
+    m_FileDialog(nullptr),
     m_RightMargin(0)
 {
 }
@@ -133,15 +133,15 @@ void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any&
 }
 
 
-sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState )
+bool SAL_CALL CPreviewAdapterImpl::setShowState( bool bShowState )
 {
-    sal_Bool bRet = m_Preview->setShowState(bShowState);
+    bool bRet = m_Preview->setShowState(bShowState);
     rearrangeLayout();
     return bRet;
 }
 
 
-sal_Bool SAL_CALL CPreviewAdapterImpl::getShowState()
+bool SAL_CALL CPreviewAdapterImpl::getShowState()
 {
     return m_Preview->getShowState();
 }
@@ -191,7 +191,7 @@ void SAL_CALL CPreviewAdapterImpl::calcRightMargin()
 }
 
 
-void SAL_CALL CPreviewAdapterImpl::notifyParentShow(sal_Bool)
+void SAL_CALL CPreviewAdapterImpl::notifyParentShow(bool)
 {
 }
 
@@ -259,11 +259,11 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
         // resize the filelistbox to the half of the
         // available space
         SetWindowPos(flb_new,
-            NULL, 0, 0, cx, height,
+            nullptr, 0, 0, cx, height,
             SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 
         SetWindowPos(flb_old,
-            NULL, 0, 0, cx, height,
+            nullptr, 0, 0, cx, height,
             SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 
         // get the new dimensions of the filelistbox after
@@ -288,12 +288,12 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
 
         // resize the old filelistbox
         SetWindowPos(flb_old,
-            NULL, 0, 0, cx, height,
+            nullptr, 0, 0, cx, height,
             SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 
         // resize the new filelistbox
         SetWindowPos(flb_new,
-            NULL, 0, 0, cx, height,
+            nullptr, 0, 0, cx, height,
             SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );
     }
 }
@@ -301,7 +301,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
 
 void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_error)
 {
-    sal_Bool bShowState = m_Preview->getImaginaryShowState();
+    bool bShowState = m_Preview->getImaginaryShowState();
 
     sal_Int16 aImgFrmt;
     Any aImg;
@@ -344,7 +344,7 @@ class CWin95NTPreviewAdapterImpl : public CPreviewAdapterImpl
 public:
     explicit CWin95NTPreviewAdapterImpl(HINSTANCE instance);
 
-    virtual void SAL_CALL notifyParentShow(sal_Bool bShow);
+    virtual void SAL_CALL notifyParentShow(bool bShow) override;
 };
 
 
@@ -354,7 +354,7 @@ CWin95NTPreviewAdapterImpl::CWin95NTPreviewAdapterImpl(HINSTANCE instance) :
 }
 
 
-void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow)
+void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(bool bShow)
 {
     try
     {
@@ -417,13 +417,13 @@ void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aIma
 }
 
 
-sal_Bool SAL_CALL CPreviewAdapter::setShowState( sal_Bool bShowState )
+bool SAL_CALL CPreviewAdapter::setShowState( bool bShowState )
 {
     return m_pImpl->setShowState(bShowState);
 }
 
 
-sal_Bool SAL_CALL CPreviewAdapter::getShowState()
+bool SAL_CALL CPreviewAdapter::getShowState()
 {
     return m_pImpl->getShowState();
 }