[Libreoffice-commits] core.git: cui/source

[Olivier Hallot]

 cui/source/inc/cuires.hrc        |    2 +-
 cui/source/tabpages/strings.src  |    4 ----
 cui/source/tabpages/tpbitmap.cxx |    5 +++--
 cui/source/tabpages/tpcolor.cxx  |    6 +++---
 cui/source/tabpages/tpgradnt.cxx |    5 +++--
 cui/source/tabpages/tphatch.cxx  |    5 +++--
 cui/source/tabpages/tplnedef.cxx |    4 +++-
 7 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 305187377b3e21cc6df890f165a1212db83f0022
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date:   Sun Aug 11 10:17:45 2013 -0300

    Replace write data error message box with new UI
    
    Replace occurences of error box with RID_SVXSTR_WRITE_DATA_ERROR into new widget UI
    
    Change-Id: I78ab59e30655f729dbe04ec145edcd3b3811254b
    Reviewed-on: https://gerrit.libreoffice.org/5347
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 737ebbb..cc1eec8 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -96,7 +96,7 @@
 #define RID_SVXSTR_ASK_DEL_COLOR            (RID_SVX_START + 217)
 #define RID_SVXSTR_ASK_CHANGE_COLOR         (RID_SVX_START + 218)
 #define RID_SVXSTR_TABLE                    (RID_SVX_START + 220)
-#define RID_SVXSTR_WRITE_DATA_ERROR         (RID_SVX_START + 229)
+
 #define RID_SVXSTR_READ_DATA_ERROR          (RID_SVX_START + 230)
 #define RID_SVXSTR_WARN_TABLE_OVERWRITE     (RID_SVX_START + 231)
 #define RID_SVXSTR_WARN_NAME_DUPLICATE      (RID_SVX_START + 236)
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index cf42f8d..c027c06 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -91,10 +91,6 @@ String RID_SVXSTR_TABLE
 {
     Text [ en-US ] = "Table" ;
 };
-String RID_SVXSTR_WRITE_DATA_ERROR
-{
-    Text [ en-US ] = "The file could not be saved!" ;
-};
 String RID_SVXSTR_READ_DATA_ERROR
 {
     Text [ en-US ] = "The file could not be loaded!" ;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index fe83718..d5de830 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -889,8 +889,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
         }
         else
         {
-            ErrorBox( GetParentDialog(), WinBits( WB_OK ),
-                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+            MessageDialog( GetParentDialog()
+                          ,"NoSaveFileDialog"
+                          ,"cui/ui/querynosavefiledialog.ui").Execute();
         }
     }
 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index ec7d0ac..b47acba 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -240,9 +240,9 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl)
         }
         else
         {
-            ErrorBox aErrorBox( mpTopDlg, WinBits( WB_OK ),
-                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) );
-            aErrorBox.Execute();
+            MessageDialog( mpTopDlg
+                          ,"NoSaveFileDialog"
+                          ,"cui/ui/querynosavefiledialog.ui").Execute();
         }
     }
     return 0;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 36b773a..c41bcee 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -758,8 +758,9 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
         }
         else
         {
-            ErrorBox( GetParentDialog(), WinBits( WB_OK ),
-                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+            MessageDialog( GetParentDialog()
+                          ,"NoSaveFileDialog"
+                          ,"cui/ui/querynosavefiledialog.ui").Execute();
         }
     }
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index c65bf71..9336dab 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -791,8 +791,9 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
         }
         else
         {
-            ErrorBox( GetParentDialog(), WinBits( WB_OK ),
-                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+            MessageDialog( GetParentDialog()
+                          ,"NoSaveFileDialog"
+                          ,"cui/ui/querynosavefiledialog.ui").Execute();
         }
     }
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 974a645..fb5cb61 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -828,7 +828,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
         }
         else
         {
-            ErrorBox( GetParentDialog(), WinBits( WB_OK ), OUString( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+            MessageDialog( GetParentDialog()
+                         ,"NoSaveFileDialog"
+                         ,"cui/ui/querynosavefiledialog.ui").Execute();
         }
     }