diff options
| author | homeboy445 <akshitsan13@gmail.com> | 2021-04-12 20:31:05 +0530 |
|---|---|---|
| committer | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2021-10-29 13:46:12 +0200 |
| commit | d37a44a9ebdafec1435f98194417a1d8cc8208b5 (patch) | |
| tree | de021550906549b9ae78d95cef8329bc6afc7a17 /include | |
| parent | 31315fea28ad327f36c0e593156bf808c7af3467 (diff) | |
tdf#141193 Added support for bar codes in qrcode dialog box[API Change].
Change-Id: I6b79ece1d5419ef92b76755d3bd921a64d6e38fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113989
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/unoprnms.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdograf.hxx | 12 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 4 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index f99ddac50414..4f1d4ad4b0e1 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -181,7 +181,7 @@ #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT "SignatureLineCanAddComment" #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE "SignatureLineUnsignedImage" #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED "SignatureLineIsSigned" -#define UNO_NAME_GRAPHOBJ_QRCODE "QRCodeProperties" +#define UNO_NAME_GRAPHOBJ_QRCODE "BarCodeProperties" #define UNO_NAME_OLE2_METAFILE "MetaFile" #define UNO_NAME_OLE2_PERSISTNAME "PersistName" diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 69ce11533caa..7c6f9865002e 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/drawing/QRCode.hpp> +#include <com/sun/star/drawing/BarCode.hpp> #include <vcl/graph.hxx> #include <svx/svdorect.hxx> #include <vcl/GraphicObject.hxx> @@ -102,7 +102,7 @@ private: bool mbSignatureLineIsSigned; css::uno::Reference<css::graphic::XGraphic> mpSignatureLineUnsignedGraphic; - std::unique_ptr<css::drawing::QRCode> mpQrCode; + std::unique_ptr<css::drawing::BarCode> mpBarCode; void ImpRegisterLink(); void ImpDeregisterLink(); void ImpSetLinkedGraphic( const Graphic& rGraphic ); @@ -287,14 +287,14 @@ public: void setSignatureLineIsSigned(bool bIsSigned) { mbSignatureLineIsSigned = bIsSigned; } // Qr Code - void setQrCode(css::drawing::QRCode& rQrCode) + void setQrCode(css::drawing::BarCode& rBarCode) { - mpQrCode = std::make_unique<css::drawing::QRCode>(rQrCode); + mpBarCode = std::make_unique<css::drawing::BarCode>(rBarCode); } - css::drawing::QRCode* getQrCode() const + css::drawing::BarCode* getQrCode() const { - return mpQrCode.get(); + return mpBarCode.get(); } }; diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 93c5faaa3f0c..ebc79e5ebee5 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -65,7 +65,7 @@ #include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/drawing/QRCode.hpp> +#include <com/sun/star/drawing/BarCode.hpp> #include <editeng/unoprnms.hxx> #include <svx/svddef.hxx> @@ -464,7 +464,7 @@ { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT, OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT, cppu::UnoType<bool>::get(), 0, 0}, \ { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE, OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, \ { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED, OWN_ATTR_SIGNATURELINE_IS_SIGNED , cppu::UnoType<bool>::get(), 0, 0}, \ - { u"" UNO_NAME_GRAPHOBJ_QRCODE, OWN_ATTR_QRCODE , cppu::UnoType<css::drawing::QRCode>::get(), 0, 0}, + { u"" UNO_NAME_GRAPHOBJ_QRCODE, OWN_ATTR_QRCODE , cppu::UnoType<css::drawing::BarCode>::get(), 0, 0}, #define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \ { u"" UNO_NAME_3D_SCENE_AMBIENTCOLOR, SDRATTR_3DSCENE_AMBIENTCOLOR , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index c8dedd84b4b2..c510b8cab00d 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -1550,6 +1550,7 @@ namespace xmloff::token { XML_QRCODE, XML_QRCODE_BORDER, XML_QRCODE_ERROR_CORRECTION, + XML_QRCODE_TYPE, XML_QUARTER, XML_QUERY_NAME, XML_QUO_VADIS, |