[Libreoffice-commits] core.git: 2 commits - configure.ac cui/source jvmfwk/plugins

[Caolán McNamara]

 configure.ac                                     |    2 +-
 cui/source/customize/cfg.cxx                     |    4 ++--
 cui/source/customize/cfg.hrc                     |    1 -
 cui/source/customize/cfg.src                     |    6 ++----
 cui/source/inc/cuires.hrc                        |    2 ++
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx |    6 +-----
 6 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 632e4095ad92196480ad82cfa1f106c4c08ae1cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 21 10:14:06 2014 +0100

    openjdk appears to use ppc64/server/libjvm.so and not ppc64le/server/libjvm.so
    
    Change-Id: Iff9e2e0ac9921b0d9d36a49fdcd2323d5dd124ee

diff --git a/configure.ac b/configure.ac
index ac3051d..5304644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7223,7 +7223,7 @@ then
         powerpc)
             my_java_arch=ppc
             ;;
-        powerpc64)
+        powerpc64*)
             my_java_arch=ppc64
             ;;
         x86_64)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index fee2430..25baaee5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -40,11 +40,7 @@ namespace jfw_plugin
 #elif defined INTEL
 #define JFW_PLUGIN_ARCH "i386"
 #elif defined POWERPC64
-#ifdef OSL_BIGENDIAN
-#  define JFW_PLUGIN_ARCH "ppc64"
-#else
-#  define JFW_PLUGIN_ARCH "ppc64le"
-#endif
+#define JFW_PLUGIN_ARCH "ppc64"
 #elif defined POWERPC
 #define JFW_PLUGIN_ARCH "ppc"
 #elif defined MIPS
commit 24e76b6506a309c5564cf46dc23df06993a002c7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 21 10:04:53 2014 +0100

    QueryBox QBX_CONFIRM_DELETE_TOOLBAR -> MessageDialog + string
    
    Change-Id: If03a966ab6519d1335903b7d76cb44c38113a4a3

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 79dba76..21fced9 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2995,8 +2995,8 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
         if ( m_pContentsListBox->GetEntryCount() == 0 &&
              GetTopLevelSelection()->IsDeletable() )
         {
-            QueryBox qbox( this,
-                CUI_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
+            MessageDialog qbox(this,
+                CUI_RES(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
 
             if ( qbox.Execute() == RET_YES )
             {
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 44d8f87..5fc6d73 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -38,6 +38,5 @@
 #define MODIFY_TOOLBAR_CONTENT (61 + CFG_OFFSET)
 
 #define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)
-#define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index a61a82c..08f1c72 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -217,11 +217,9 @@ String RID_SVXSTR_TOOLBAR_NAME
     Text [ en-US ] = "Toolbar Name" ;
 };
 
-QueryBox QBX_CONFIRM_DELETE_TOOLBAR
+String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR
 {
-    Message [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
+    Text [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
 };
 
 /* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index a948b27..b0e48e5 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -408,6 +408,8 @@
 #define RID_SVXSTR_NORESULTS                                (RID_SVX_START + 1281)
 #define RID_SVXSTR_APPLYPERSONA                             (RID_SVX_START + 1282)
 
+#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR                   (RID_SVX_START + 1283)
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */