editeng/source/editeng/eeobj.cxx | 7 -------
editeng/source/editeng/eeobj.hxx | 12 ++----------
include/svx/svdstr.hrc | 9 +++++++++
svx/source/svdraw/svdstr.src | 36 ++++++++++++++++++++++++++++++++++++
4 files changed, 47 insertions(+), 17 deletions(-)
New commits:
commit 5ae5fb482f37176f1746cca4ade5c87b34b135a7
Author: Varun Dhall <varun.dh...@studentpartner.com>
Date: Mon May 29 23:15:53 2017 +0530
EditEngine Refactoring hand-coded XInterface implementations of
EditDataObject
EditDataObject has odd hand-coded XInterface implementations,
this is unnecessary and can be improved by replacing its superclasses
Change-Id: Ife19c114450dfd95a10a10de1a78b035babb5443
Reviewed-on: https://gerrit.libreoffice.org/38163
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index fa1392e1138d..0c6bd1246c7c 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -43,13 +43,6 @@ EditDataObject::~EditDataObject()
{
}
-// uno::XInterface
-uno::Any EditDataObject::queryInterface( const uno::Type & rType )
-{
- uno::Any aRet = ::cppu::queryInterface( rType, (static_cast<
datatransfer::XTransferable* >(this)) );
- return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
-
// datatransfer::XTransferable
uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor&
rFlavor )
{
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index 643ef453e34a..30c90c4d299b 100644
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -20,14 +20,12 @@
#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX
#define INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <tools/stream.hxx>
-class EditDataObject : public css::datatransfer::XTransferable,
- public ::cppu::OWeakObject
-
+class EditDataObject : public
::cppu::WeakImplHelper<css::datatransfer::XTransferable>
{
private:
SvMemoryStream maBinData;
@@ -45,12 +43,6 @@ public:
OUString& GetString() { return maText; }
OUString& GetURL() { return maOfficeBookmark; }
-
- // css::uno::XInterface
- css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
- void SAL_CALL acquire() throw()
override { OWeakObject::acquire(); }
- void SAL_CALL release() throw()
override { OWeakObject::release(); }
-
// css::datatransfer::XTransferable
css::uno::Any SAL_CALL getTransferData( const
css::datatransfer::DataFlavor& aFlavor ) override;
css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL
getTransferDataFlavors( ) override;
commit e29150c307e65b931f6cbfed3e75c9475ab9ecd8
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 30 10:15:20 2017 +0100
missing resources
since
commit 17e872c3fa87bb596ec8b263b7a2e692b927dcef
Date: Fri Mar 17 13:11:27 2017 +0200
remove unused defines from HRC files in svx(1)
because SdrRectObj::TakeObjNameSingul adds some numbers to ids to find
other ones
Change-Id: I9d0bd3686f4a60b7436950f8e80def9cc3586d9c
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index a1168b708638..90163609b02f 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -38,11 +38,20 @@
#define STR_ObjNamePluralLINE (STR_ObjNameBegin + 12)
#define STR_ObjNameSingulRECT (STR_ObjNameBegin + 13)
#define STR_ObjNamePluralRECT (STR_ObjNameBegin + 14)
+#define STR_ObjNameSingulQUAD (STR_ObjNameBegin + 15)
#define STR_ObjNamePluralQUAD (STR_ObjNameBegin + 16)
+#define STR_ObjNameSingulPARAL (STR_ObjNameBegin + 17)
#define STR_ObjNamePluralPARAL (STR_ObjNameBegin + 18)
+#define STR_ObjNameSingulRAUTE (STR_ObjNameBegin + 19)
+#define STR_ObjNamePluralRAUTE (STR_ObjNameBegin + 20)
+#define STR_ObjNameSingulRECTRND (STR_ObjNameBegin + 21)
#define STR_ObjNamePluralRECTRND (STR_ObjNameBegin + 22)
+#define STR_ObjNameSingulQUADRND (STR_ObjNameBegin + 23)
#define STR_ObjNamePluralQUADRND (STR_ObjNameBegin + 24)
+#define STR_ObjNameSingulPARALRND (STR_ObjNameBegin + 25)
#define STR_ObjNamePluralPARALRND (STR_ObjNameBegin + 26)
+#define STR_ObjNameSingulRAUTERND (STR_ObjNameBegin + 27)
+#define STR_ObjNamePluralRAUTERND (STR_ObjNameBegin + 28)
#define STR_ObjNameSingulCIRC (STR_ObjNameBegin + 29)
#define STR_ObjNamePluralCIRC (STR_ObjNameBegin + 30)
#define STR_ObjNameSingulSECT (STR_ObjNameBegin + 31)
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 036e8b0758a8..d704475e0297 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -73,26 +73,62 @@ String STR_ObjNamePluralRECT
{
Text [ en-US ] = "Rectangles" ;
};
+String STR_ObjNameSingulQUAD
+{
+ Text [ en-US ] = "Square" ;
+};
String STR_ObjNamePluralQUAD
{
Text [ en-US ] = "Squares" ;
};
+String STR_ObjNameSingulPARAL
+{
+ Text [ en-US ] = "Parallelogram" ;
+};
String STR_ObjNamePluralPARAL
{
Text [ en-US ] = "Parallelograms" ;
};
+String STR_ObjNameSingulRAUTE
+{
+ Text [ en-US ] = "Rhombus" ;
+};
+String STR_ObjNamePluralRAUTE
+{
+ Text [ en-US ] = "Rhombuses" ;
+};
+String STR_ObjNameSingulRECTRND
+{
+ Text [ en-US ] = "Rounded rectangle" ;
+};
String STR_ObjNamePluralRECTRND
{
Text [ en-US ] = "Rounded Rectangles" ;
};
+String STR_ObjNameSingulQUADRND
+{
+ Text [ en-US ] = "rounded square" ;
+};
String STR_ObjNamePluralQUADRND
{
Text [ en-US ] = "Rounded Squares" ;
};
+String STR_ObjNameSingulPARALRND
+{
+ Text [ en-US ] = "Rounded Parallelogram" ;
+};
String STR_ObjNamePluralPARALRND
{
Text [ en-US ] = "Rounded parallelograms" ;
};
+String STR_ObjNameSingulRAUTERND
+{
+ Text [ en-US ] = "rounded rhombus" ;
+};
+String STR_ObjNamePluralRAUTERND
+{
+ Text [ en-US ] = "Rounded rhombuses" ;
+};
String STR_ObjNameSingulCIRC
{
Text [ en-US ] = "Circle" ;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
