fpicker/source/office/RemoteFilesDialog.cxx | 14 +++----
fpicker/source/office/RemoteFilesDialog.hxx | 52 ++++++++++++++--------------
fpicker/source/office/iodlg.hxx | 42 +++++++++++-----------
3 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 795ac5bc53f6c15f2ab4634201747eb1c3e3331f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jul 16 10:29:28 2015 +0200
loplugin:stringconstant
Change-Id: I59da081fc90ffb96c438ed755266f5a69fbd199d
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 765ec4b..d59c9bd 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -640,7 +640,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectHdl )
}
else
{
- m_sPath = "";
+ m_sPath.clear();
m_pName_ed->SetText( "" );
}
@@ -739,8 +739,8 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
bool bFileDlg = ( m_eType == REMOTEDLG_TYPE_FILEDLG );
bool bSelected = ( m_pFileView->GetSelectionCount() > 0 );
- if( !sCurrentPath.endsWith( OUString( "/" ) ) )
- sCurrentPath += OUString( "/" );
+ if( !sCurrentPath.endsWith("/") )
+ sCurrentPath += "/";
if( !bSelected )
{
commit 78d73a51bf40c6f69347bbc90b955696c86a022d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jul 16 10:28:37 2015 +0200
loplugin:vclwidgets
Change-Id: I8671f8540da2e86eedb4cdc7a248ebb1d6caa376
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 2ae54aa..765ec4b 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -17,7 +17,7 @@ class FileViewContainer : public vcl::Window
VclPtr< Splitter > m_pSplitter;
int m_nCurrentFocus;
- vcl::Window* m_pFocusWidgets[4];
+ VclPtr<vcl::Window> m_pFocusWidgets[4];
public:
FileViewContainer( vcl::Window *pParent )
commit 79dafc7af0189935f81544dc8300b730b98db88f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jul 16 10:27:42 2015 +0200
loplugin:simplifybool
Change-Id: Id079a6cc2841f42b0dc10ed2be596cc8f7db4e25
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 0d1fc8f..2ae54aa 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -141,7 +141,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent,
WinBits nBits )
m_eMode = ( nBits & WB_SAVEAS ) ? REMOTEDLG_MODE_SAVE :
REMOTEDLG_MODE_OPEN;
m_eType = ( nBits & WB_PATH ) ? REMOTEDLG_TYPE_PATHDLG :
REMOTEDLG_TYPE_FILEDLG;
- m_bMultiselection = ( nBits & SFXWB_MULTISELECTION ) ? true : false;
+ m_bMultiselection = ( nBits & SFXWB_MULTISELECTION ) != 0;
m_bIsUpdated = false;
m_bIsConnected = false;
m_nCurrentFilter = LISTBOX_ENTRY_NOTFOUND;
commit 53bf91d66e28b636af468fe0c4b00738436732b3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jul 16 10:26:57 2015 +0200
loplugin:passstuffbyref
Change-Id: I37c254bd1fdb3cfb05d513f87fa4f4a468466bb0
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 15a249f..0d1fc8f 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -395,7 +395,7 @@ OUString RemoteFilesDialog::GetPath() const
return m_sPath;
}
-FileViewResult RemoteFilesDialog::OpenURL( OUString sURL )
+FileViewResult RemoteFilesDialog::OpenURL( OUString const & sURL )
{
FileViewResult eResult = eFailure;
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx
b/fpicker/source/office/RemoteFilesDialog.hxx
index df9106e..ba48b8e 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -140,7 +140,7 @@ private:
/* If failure returns < 0 */
int GetSelectedServicePos();
- FileViewResult OpenURL( OUString sURL );
+ FileViewResult OpenURL( OUString const & sURL );
void AddFileExtension();
commit 5e090212b1a33a9ff2b1d0fd65909dad2f87758a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jul 16 10:26:07 2015 +0200
-Werror,-Winconsistent-missing-override
Change-Id: I5f7ab4c7eb106fc7bc0d93abc78ab9168c6867a6
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index ec34e96..15a249f 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -109,7 +109,7 @@ class FileViewContainer : public vcl::Window
m_pFocusWidgets[m_nCurrentFocus]->GrabFocus();
}
- virtual bool Notify( NotifyEvent& rNEvt )
+ virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE
{
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx
b/fpicker/source/office/RemoteFilesDialog.hxx
index 05f9ca1..df9106e 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -69,39 +69,39 @@ public:
// SvtFileDialog_Base
- virtual SvtFileView* GetView();
-
- virtual void SetHasFilename( bool );
- virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString
>& rBlackList );
- virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList()
const;
- virtual void SetStandardDir( const OUString& rStdDir );
- virtual const OUString& GetStandardDir() const;
- virtual void SetPath( const OUString& rNewURL );
- virtual const OUString& GetPath();
- virtual std::vector<OUString> GetPathList() const;
- virtual bool ContentIsFolder( const OUString& rURL );
-
- virtual void AddFilter( const OUString& rFilter, const OUString& rType );
+ virtual SvtFileView* GetView() SAL_OVERRIDE;
+
+ virtual void SetHasFilename( bool ) SAL_OVERRIDE;
+ virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString
>& rBlackList ) SAL_OVERRIDE;
+ virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList()
const SAL_OVERRIDE;
+ virtual void SetStandardDir( const OUString& rStdDir ) SAL_OVERRIDE;
+ virtual const OUString& GetStandardDir() const SAL_OVERRIDE;
+ virtual void SetPath( const OUString& rNewURL ) SAL_OVERRIDE;
+ virtual const OUString& GetPath() SAL_OVERRIDE;
+ virtual std::vector<OUString> GetPathList() const SAL_OVERRIDE;
+ virtual bool ContentIsFolder( const OUString& rURL ) SAL_OVERRIDE;
+
+ virtual void AddFilter( const OUString& rFilter, const OUString& rType )
SAL_OVERRIDE;
virtual void AddFilterGroup( const OUString& _rFilter,
- const com::sun::star::uno::Sequence<
com::sun::star::beans::StringPair >& rFilters );
- virtual OUString GetCurFilter() const;
- virtual void SetCurFilter( const OUString& rFilter );
+ const com::sun::star::uno::Sequence<
com::sun::star::beans::StringPair >& rFilters ) SAL_OVERRIDE;
+ virtual OUString GetCurFilter() const SAL_OVERRIDE;
+ virtual void SetCurFilter( const OUString& rFilter ) SAL_OVERRIDE;
- virtual void SetFileCallback( ::svt::IFilePickerListener *pNotifier );
+ virtual void SetFileCallback( ::svt::IFilePickerListener *pNotifier )
SAL_OVERRIDE;
- virtual void EnableAutocompletion( bool );
+ virtual void EnableAutocompletion( bool ) SAL_OVERRIDE;
- virtual sal_Int32 getTargetColorDepth();
- virtual sal_Int32 getAvailableWidth();
- virtual sal_Int32 getAvailableHeight();
+ virtual sal_Int32 getTargetColorDepth() SAL_OVERRIDE;
+ virtual sal_Int32 getAvailableWidth() SAL_OVERRIDE;
+ virtual sal_Int32 getAvailableHeight() SAL_OVERRIDE;
- virtual void setImage( sal_Int16 aImageFormat, const
::com::sun::star::uno::Any& rImage );
+ virtual void setImage( sal_Int16 aImageFormat, const
::com::sun::star::uno::Any& rImage ) SAL_OVERRIDE;
- virtual bool getShowState();
+ virtual bool getShowState() SAL_OVERRIDE;
virtual Control* getControl( sal_Int16 nControlId, bool bLabelControl =
false ) const SAL_OVERRIDE;
- virtual void enableControl( sal_Int16 nControlId, bool bEnable );
- virtual OUString getCurFilter( ) const;
+ virtual void enableControl( sal_Int16 nControlId, bool bEnable )
SAL_OVERRIDE;
+ virtual OUString getCurFilter( ) const SAL_OVERRIDE;
private:
::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext
> m_context;
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 414da3e..5748210 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -180,21 +180,21 @@ public:
void FileSelect();
void FilterSelect();
- void SetBlackList( const
::com::sun::star::uno::Sequence< OUString >& rBlackList );
- const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const;
- void SetStandardDir( const OUString& rStdDir );
- const OUString& GetStandardDir() const;
- std::vector<OUString> GetPathList() const; // for
MultiSelection
+ void SetBlackList( const
::com::sun::star::uno::Sequence< OUString >& rBlackList ) SAL_OVERRIDE;
+ const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const
SAL_OVERRIDE;
+ void SetStandardDir( const OUString& rStdDir )
SAL_OVERRIDE;
+ const OUString& GetStandardDir() const SAL_OVERRIDE;
+ std::vector<OUString> GetPathList() const SAL_OVERRIDE; //
for MultiSelection
void AddFilter( const OUString& rFilter,
- const OUString& rType );
+ const OUString& rType )
SAL_OVERRIDE;
void AddFilterGroup(
const OUString& _rFilter,
- const com::sun::star::uno::Sequence<
com::sun::star::beans::StringPair >& rFilters );
+ const com::sun::star::uno::Sequence<
com::sun::star::beans::StringPair >& rFilters ) SAL_OVERRIDE;
- void SetCurFilter( const OUString& rFilter );
- OUString GetCurFilter() const;
+ void SetCurFilter( const OUString& rFilter )
SAL_OVERRIDE;
+ OUString GetCurFilter() const SAL_OVERRIDE;
sal_uInt16 GetFilterCount() const;
const OUString& GetFilterName( sal_uInt16 nPos ) const;
@@ -204,19 +204,19 @@ public:
void PrevLevel_Impl();
void OpenURL_Impl( const OUString& rURL );
- SvtFileView* GetView();
+ SvtFileView* GetView() SAL_OVERRIDE;
void InitSize();
void UpdateControls( const OUString& rURL );
- void EnableAutocompletion( bool _bEnable = true );
+ void EnableAutocompletion( bool _bEnable = true )
SAL_OVERRIDE;
- void SetFileCallback( ::svt::IFilePickerListener
*pNotifier ) { _pFileNotifier = pNotifier; }
+ void SetFileCallback( ::svt::IFilePickerListener
*pNotifier ) SAL_OVERRIDE { _pFileNotifier = pNotifier; }
- sal_Int32 getTargetColorDepth();
- sal_Int32 getAvailableWidth();
- sal_Int32 getAvailableHeight();
- void setImage( sal_Int16 aImageFormat, const
::com::sun::star::uno::Any& rImage );
- bool getShowState();
+ sal_Int32 getTargetColorDepth() SAL_OVERRIDE;
+ sal_Int32 getAvailableWidth() SAL_OVERRIDE;
+ sal_Int32 getAvailableHeight() SAL_OVERRIDE;
+ void setImage( sal_Int16 aImageFormat, const
::com::sun::star::uno::Any& rImage ) SAL_OVERRIDE;
+ bool getShowState() SAL_OVERRIDE;
bool isAutoExtensionEnabled();
OUString getCurrentFileText( ) const;
@@ -230,16 +230,16 @@ public:
static void displayIOException( const OUString& _rURL,
::com::sun::star::ucb::IOErrorCode _eCode );
// inline
- inline void SetPath( const OUString& rNewURL );
- inline void SetHasFilename( bool bHasFilename );
- inline const OUString& GetPath();
+ inline void SetPath( const OUString& rNewURL )
SAL_OVERRIDE;
+ inline void SetHasFilename( bool bHasFilename )
SAL_OVERRIDE;
+ inline const OUString& GetPath() SAL_OVERRIDE;
inline void SetDefaultExt( const OUString& rExt );
inline void EraseDefaultExt( sal_Int32 _nIndex = 0 );
inline const OUString& GetDefaultExt() const;
inline Image GetButtonImage( sal_uInt16 _nButtonId ) const
{ return m_aImages.GetImage( _nButtonId ); }
- bool ContentIsFolder( const OUString& rURL ) {
return m_aContent.isFolder( rURL ) && m_aContent.isValid(); }
+ bool ContentIsFolder( const OUString& rURL )
SAL_OVERRIDE { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); }
bool ContentHasParentFolder( const OUString& rURL );
bool ContentCanMakeFolder( const OUString& rURL );
bool ContentGetTitle( const OUString& rURL,
OUString& rTitle );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
