InfoBoxes to String

Change-Id: Iccaf0cd1adbe5a2b1ff81c466ca3c81c00390c10

sw/inc/dochdl.hrc

@@ -24,7 +24,7 @@
 
 #define STR_NOGLOS                  (RC_DOCHDL_BEGIN + 1)
 #define MSG_ERR_INSERT_GLOS         (RC_DOCHDL_BEGIN + 3)
-#define MSG_CLPBRD_FORMAT_ERROR     (RC_DOCHDL_BEGIN + 4)
+#define STR_CLPBRD_FORMAT_ERROR     (RC_DOCHDL_BEGIN + 4)
 
 #define STR_NO_TABLE                (RC_DOCHDL_BEGIN + 7)
 

sw/inc/globals.hrc

@@ -82,8 +82,8 @@
 
 // INFOBOX ------------------------------------------------------------
 
-#define ERR_CLPBRD_READ             (RC_GLOBALS_BEGIN + 1)
-#define STR_ERROR_PASSWD            (RC_GLOBALS_BEGIN + 3)
+#define STR_ERROR_CLPBRD_READ       (RC_GLOBALS_BEGIN + 49)
+#define STR_ERROR_PASSWD            (RC_GLOBALS_BEGIN + 50)
 
 // ACC ---------------------------------------------------------------
 

sw/source/ui/app/error.src

@@ -33,9 +33,9 @@ String STR_COMCORE_CANT_SHOW
     Text [ en-US ] = "Image cannot be displayed." ;
 };
 
-InfoBox ERR_CLPBRD_READ
+String STR_ERROR_CLPBRD_READ
 {
-    Message [ en-US ] = "Error reading from the clipboard." ;
+    Text [ en-US ] = "Error reading from the clipboard." ;
 };
 
 #define ERR_CODE( class, err )  (class | (err - ERROR_SW_BASE))

sw/source/ui/dochdl/dochdl.src

@@ -34,9 +34,9 @@ InfoBox MSG_ERR_INSERT_GLOS
     Message [ en-US ] = "AutoText could not be created." ;
 };
 
-InfoBox MSG_CLPBRD_FORMAT_ERROR
+String STR_CLPBRD_FORMAT_ERROR
 {
-    Message [ en-US ] = "Requested clipboard format is not available." ;
+    Text [ en-US ] = "Requested clipboard format is not available." ;
 };
 
 String STR_PRIVATETEXT

sw/source/uibase/dochdl/swdtflvr.cxx

@@ -41,6 +41,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/wrkwin.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/stritem.hxx>
@@ -1624,7 +1625,7 @@ sal_uInt16 SwTransferable::GetSotDestination( const SwWrtShell& rSh,
 bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, sal_uLong nFmt, bool bMsg )
 {
-    sal_uInt16 nResId = MSG_CLPBRD_FORMAT_ERROR;
+    sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
     bool nRet = false;
 
     MSE40HTMLClipFormatObj aMSE40ClpObj;
@@ -1695,7 +1696,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
         SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() );
         rSh.SaveTblBoxCntnt( &rInsPos );
         if( IsError( aReader.Read( *pRead )) )
-            nResId = ERR_CLPBRD_READ;
+            nResId = STR_ERROR_CLPBRD_READ;
         else
             nResId = 0, nRet = true;
 
@@ -1704,7 +1705,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
             rSh.CallChgLnk();
     }
     else
-        nResId = MSG_CLPBRD_FORMAT_ERROR;
+        nResId = STR_CLPBRD_FORMAT_ERROR;
 
     // Exist a SvMemoryStream? (data in the OUString and xStrm is empty)
     if( pStream && !xStrm.Is() )
@@ -1712,7 +1713,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
 
     if( bMsg && nResId )
     {
-        InfoBox( 0, SW_RES( nResId )).Execute();
+        MessageDialog( 0, SW_RES( nResId ), VCL_MESSAGE_INFO).Execute();
     }
     return nRet;
 }
@@ -1788,7 +1789,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
         if( !IsError( aReader.Read( *pRead )) )
             nRet = true;
         else if( bMsg )
-            InfoBox( 0, SW_RES(ERR_CLPBRD_READ) ).Execute();
+            MessageDialog( 0, SW_RES(STR_ERROR_CLPBRD_READ), VCL_MESSAGE_INFO ).Execute();
     }
     else
     {
@@ -2170,7 +2171,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
                 if( !nRows || !nCols )
                 {
                     if( bMsg )
-                        InfoBox(0, SW_RESSTR(STR_NO_TABLE)).Execute();
+                        MessageDialog(0, SW_RESSTR(STR_NO_TABLE), VCL_MESSAGE_INFO).Execute();
                     pDDETyp = 0;
                     break;
                 }
@@ -2716,7 +2717,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
     }
     else if( bMsg )
     {
-        InfoBox( 0, SW_RES(MSG_CLPBRD_FORMAT_ERROR)).Execute();
+        MessageDialog( 0, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO).Execute();
     }
     return nRet;
 }
@@ -2755,7 +2756,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
     }
     else if( bMsg )
     {
-        InfoBox( 0, SW_RES(MSG_CLPBRD_FORMAT_ERROR)).Execute();
+        MessageDialog( 0, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO).Execute();
     }
     return nRet;
 }