diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-02-06 17:48:51 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-02-08 16:42:14 +0100 |
commit | 38774ce79b4b24628c3a73f387489bf2498363f1 (patch) | |
tree | d305c9445581abe73fbb917dc010c8ffc88ba191 /include | |
parent | c83d2ac99dc3da4ef85b193543a93e02e3858844 (diff) |
tdf#86739 Option to set image anchor type in image insert dialog
This adds the selectbox to (hopefully) all filepickers:
- LO native
- GTK/GTK3
- KDE4
- KDE5
- Windows
- macOS
Change-Id: I01bd42b1ca18e0f691b879647a6cb1b62177d3ce
Reviewed-on: https://gerrit.libreoffice.org/49311
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/fpicker/strings.hrc | 1 | ||||
-rw-r--r-- | include/sfx2/opengrf.hxx | 7 | ||||
-rw-r--r-- | include/svtools/helpids.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/fpicker/strings.hrc b/include/fpicker/strings.hrc index eee7cc86f385..3452509ab6b2 100644 --- a/include/fpicker/strings.hrc +++ b/include/fpicker/strings.hrc @@ -23,6 +23,7 @@ #define STR_SVT_FILEPICKER_VERSION NC_("STR_SVT_FILEPICKER_VERSION", "~Version:") #define STR_SVT_FILEPICKER_TEMPLATES NC_("STR_SVT_FILEPICKER_TEMPLATES", "S~tyles:") #define STR_SVT_FILEPICKER_IMAGE_TEMPLATE NC_("STR_SVT_FILEPICKER_IMAGE_TEMPLATE", "Style:") +#define STR_SVT_FILEPICKER_IMAGE_ANCHOR NC_("STR_SVT_FILEPICKER_IMAGE_ANCHOR", "A~nchor:") #define STR_SVT_FILEPICKER_SELECTION NC_("STR_SVT_FILEPICKER_SELECTION", "~Selection") #define STR_SVT_FILEPICKER_FILTER_TITLE NC_("STR_SVT_FILEPICKER_FILTER_TITLE", "File ~type:") #define STR_SVT_FOLDERPICKER_DEFAULT_TITLE NC_("STR_SVT_FOLDERPICKER_DEFAULT_TITLE", "Select Path") diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index 21c01426e3ca..775750c0895b 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.hxx @@ -23,12 +23,17 @@ #include <vcl/graphicfilter.hxx> #include <sfx2/dllapi.h> +#include <com/sun/star/ui/dialogs/TemplateDescription.hpp> +#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> + struct SvxOpenGrf_Impl; class SFX2_DLLPUBLIC SvxOpenGraphicDialog { public: SvxOpenGraphicDialog(const OUString& rTitle, const vcl::Window* pPreferredParent); + SvxOpenGraphicDialog(const OUString& rTitle, const vcl::Window* pPreferredParent, + sal_Int16 nDialogType); ~SvxOpenGraphicDialog(); ErrCode Execute(); @@ -50,6 +55,8 @@ public: OUString const & GetDetectedFilter() const; void SetDetectedFilter(const OUString&); + css::uno::Reference<css::ui::dialogs::XFilePickerControlAccess> GetFilePickerControlAccess(); + private: SvxOpenGraphicDialog (const SvxOpenGraphicDialog&) = delete; SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ) = delete; diff --git a/include/svtools/helpids.h b/include/svtools/helpids.h index 309a42260de3..0c296ba613c2 100644 --- a/include/svtools/helpids.h +++ b/include/svtools/helpids.h @@ -43,6 +43,7 @@ #define HID_FILEOPEN_READONLY "SVT_HID_FILEOPEN_READONLY" #define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION" #define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" +#define HID_FILEOPEN_IMAGE_ANCHOR "SVT_HID_FILEOPEN_IMAGE_ANCHOR" #define HID_WIZARD_NEXT "SVT_HID_WIZARD_NEXT" #define HID_WIZARD_PREVIOUS "SVT_HID_WIZARD_PREVIOUS" |