diff options
| author | Palenik Mihály <palenik.mihaly@gmail.com> | 2014-06-30 15:53:56 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-02 08:47:13 +0000 |
| commit | a5cc3ce566f1a1ebd5995582efed104fb2793fb0 (patch) | |
| tree | a1b688d97cb517e22fa163901aec1fdaaadfdd5b /include/svtools | |
| parent | 6a6d83ace33789de951f8655be0108f70108660e (diff) | |
Convert DLG_COLLECTION_VIEW to .ui
Conflicts:
include/svtools/fileview.hxx
svtools/source/contnr/fileview.cxx
Change-Id: I78b590410ec4e55eeecd2da8ab79738f05e403b5
Reviewed-on: https://gerrit.libreoffice.org/9981
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/fileview.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/svtools.hrc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index ecb1c6c7f991..6e88c6a74265 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -81,9 +81,11 @@ protected: public: SvtFileView( Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection ); - SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags ); + SvtFileView( Window* pParent, WinBits nBits, sal_uInt8 nFlags ); virtual ~SvtFileView(); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + const OUString& GetViewURL() const; OUString GetURL( SvTreeListEntry* pEntry ) const; OUString GetCurrentURL() const; diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index 64a4e7437983..2b9444765a3a 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -52,7 +52,7 @@ // doc template dialog #define DLG_DOCTEMPLATE (RID_SVTOOLS_START+50) -#define CTRL_FILEVIEW (RID_SVTOOLS_START+51) +// FREE #define STR_SVT_NEWDOC (RID_SVTOOLS_START+52) #define STR_SVT_MYDOCS (RID_SVTOOLS_START+53) #define STR_SVT_TEMPLATES (RID_SVTOOLS_START+54) |