include/svx/svdstr.hrc | 3 +-- mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 ++-- svx/source/svdraw/svdstr.src | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-)
New commits: commit a7415828b86a02216ffed44a4fa5b785f17d657c Author: Caolán McNamara <[email protected]> Date: Thu Jun 9 10:24:55 2016 +0100 Revert "tdf#88206 Change use of cppu::WeakImplHelper*" this doesn't build, I think mysqlc is considered !LIBO_INTERNAL_ONLY seeing as its an extension This reverts commit 2d2a33934ecb952433a635ce5dab76cb2837b8a0. Change-Id: I600b986632b90e482475628e09256ca5c2b0a6cf diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index 494c806..65ea730 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase.hxx> +#include <cppuhelper/implbase1.hxx> #include <cppconn/resultset_metadata.h> namespace connectivity @@ -36,7 +36,7 @@ namespace connectivity //************ Class: ResultSetMetaData - typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper1< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE { commit cb6e27b018ba93351633dc7b9bb714100f52f0c6 Author: Caolán McNamara <[email protected]> Date: Thu Jun 9 10:08:35 2016 +0100 ditch SIP_SA_AUTOGROWSIZE put SIP_SA_CHAINNEXTNAME into that position to keep this list in the same order as the SDRATTR_TEXT_ list Change-Id: I6be4b373d188a2a6e4cd52cc1c8a18f3f9514503 diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc index 8ef8999..08af71f 100644 --- a/include/svx/svdstr.hrc +++ b/include/svx/svdstr.hrc @@ -564,7 +564,7 @@ #define SIP_SA_XMLATTRIBUTES (SIP_Begin + 121) #define SIP_SA_TEXT_USEFIXEDCELLHEIGHT (SIP_Begin + 122) #define SIP_SA_WORDWRAP (SIP_Begin + 123) -#define SIP_SA_AUTOGROWSIZE (SIP_Begin + 124) +#define SIP_SA_CHAINNEXTNAME (SIP_Begin + 124) #define SIP_SA_RESERVE18 (SIP_Begin + 125) #define SIP_SA_RESERVE19 (SIP_Begin + 126) #define SIP_SA_EDGEKIND (SIP_Begin + 128) @@ -709,7 +709,6 @@ #define STR_TABLE_STYLE_SETTINGS (SIP_Begin + 275) #define SIP_SA_CROP_MARKERS (SIP_Begin + 276) #define STR_TABLE_DELETE_CELL_CONTENTS (SIP_Begin + 277) -#define SIP_SA_CHAINNEXTNAME (SIP_Begin + 278) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 156ae50..df28a4e 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -2091,12 +2091,6 @@ String SIP_SA_CHAINNEXTNAME Text[ en-US ] = "Next link in text chain"; }; - -String SIP_SA_AUTOGROWSIZE -{ - Text[ en-US ] = "Auto grow shape to fit text"; -}; - String SIP_SA_RESERVE18 { Text [ en-US ] = "SvDraw reserved for 18";
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
