[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 2 commits - dbaccess/source include/svx svx/source

[Julien Nabet]

 dbaccess/source/ui/tabledesign/TableController.cxx |    3 +
 include/svx/svdstr.hrc                             |    9 +++++
 svx/source/svdraw/svdstr.src                       |   36 +++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit a987fd3b320b02705d9b5239040024c03af5476f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 25 23:17:31 2017 +0200

    Related tdf#108068: Retrieve error from Firebird engine
    
    Change-Id: If89a904740e54e81c2f2ae790ba8d05d830b0a5b
    Reviewed-on: https://gerrit.libreoffice.org/38043
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 182a62e0f199d26df0ae76ebf224c5d4b0fc3e26)
    Reviewed-on: https://gerrit.libreoffice.org/38179
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 68ec90e114b1..2da0d3c63ff3 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1117,12 +1117,13 @@ void OTableController::alterColumns()
             }
             catch(const SQLException&)
             { // we couldn't alter the column so we have to add new columns
+                SQLExceptionInfo aError( ::cppu::getCaughtException() );
                 bReload = true;
                 if(xDrop.is() && xAppend.is())
                 {
                     OUString aMessage(ModuleRes(STR_TABLEDESIGN_ALTER_ERROR));
                     aMessage = aMessage.replaceFirst("$column$",pField->GetName());
-                    ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES );
+                    ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES, &aError);
                     if ( aMsg->Execute() != RET_YES )
                     {
                         Reference<XPropertySet> xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW);
commit 7c4298dc3ffc363d3bc9b3c880bf544c8c669746
Author: Caolán McNamara <caolanm at 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
    (cherry picked from commit e29150c307e65b931f6cbfed3e75c9475ab9ecd8)

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" ;