Adjustments for 648781 (buttonCancel parameter in KMessageBox::*cancel*)

svn path=/trunk/koffice/; revision=648783

krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc

@@ -96,6 +96,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion()
                     , image->colorSpace()->name()),
             i18n("Colorspace Conversion"),
             KGuiItem(i18n("Continue")),
+            KStandardGuiItem::cancel(),
             "lab16degradation") != KMessageBox::Continue) return;
 
     }
@@ -133,6 +134,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion()
                     , dev->colorSpace()->name()),
             i18n("Colorspace Conversion"),
             KGuiItem(i18n("Continue")),
+            KStandardGuiItem::cancel(),
             "lab16degradation") != KMessageBox::Continue) return;
 
     }

krita/ui/kis_filter_manager.cc

@@ -414,6 +414,7 @@ void KisFilterManager::slotApplyFilter(int i)
                                                        , dev->colorSpace()->name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
+                                               KStandardGuiItem::cancel(),
                                                "lab16degradation") != KMessageBox::Continue) return;
 
         }
@@ -424,6 +425,7 @@ void KisFilterManager::slotApplyFilter(int i)
                                                        , dev->colorSpace()->name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
+                                               KStandardGuiItem::cancel(),
                                                "rgba8degradation") != KMessageBox::Continue) return;
         }
     }

libs/kofficecore/KoDocumentInfoDlg.cpp

@@ -391,6 +391,7 @@ void KoDocumentInfoDlg::slotSaveEncryption()
                           "<p>Do you still want to decrypt the file?</qt>" ),
                     i18n( "Confirm Decrypt" ),
                     KGuiItem( i18n( "Decrypt" ) ),
+                    KStandardGuiItem::cancel(),
                     "DecryptConfirmation"
             ) != KMessageBox::Continue )
         {
@@ -432,6 +433,7 @@ void KoDocumentInfoDlg::slotSaveEncryption()
                               "<p>Do you want to change the file to OASIS OpenDocument?</qt>", QString( "<b>%1</b>" ).arg( comment ) ),
                         i18n( "Change Filetype" ),
                         KGuiItem( i18n( "Change" ) ),
+                        KStandardGuiItem::cancel(),
                         "EncryptChangeFiletypeConfirmation"
                 ) != KMessageBox::Continue ) {
                 return;

libs/kofficecore/KoMainWindow.cpp

@@ -739,6 +739,7 @@ bool KoMainWindow::exportConfirmation( const QByteArray &outputFormat )
                   QString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
                   i18n( "Confirm Save" ),
                   KStandardGuiItem::save (),
+                  KStandardGuiItem::cancel(),
                   "NonNativeSaveConfirmation"
                   );
     }
@@ -752,6 +753,7 @@ bool KoMainWindow::exportConfirmation( const QByteArray &outputFormat )
                   QString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
                   i18n( "Confirm Export" ),
                   KGuiItem(i18n ("Export")),
+                  KStandardGuiItem::cancel(),
                   "NonNativeExportConfirmation" // different to the one used for Save (above)
                   );
     }