Re: msevior - r24377 - abiword/branches/ABI-2-6-0-STABLE/src/wp/ap/xp

You know have abicollab specific code in ap_EditMethods. That is *very*
wrong design wise, ie. a hack. Same for the previous commit. Both should
be reverted imo.

I'll also try to propose a better fix, but I'm a bit low on time during
the weekend.

   Marc

On Fri, 2008-07-11 at 15:50 +0200, cvs@abisource.com wrote:
> Author: msevior
> Date: 2008-07-11 15:50:08 +0200 (Fri, 11 Jul 2008)
> New Revision: 24377
>
> Modified:
> abiword/branches/ABI-2-6-0-STABLE/src/wp/ap/xp/ap_EditMethods.cpp
> Log:
> Another fix and code clean up for 11688 (save file on exit with abicolab service). Please forward port.
>
>
> Modified: abiword/branches/ABI-2-6-0-STABLE/src/wp/ap/xp/ap_EditMethods.cpp
> ===================================================================
> --- abiword/branches/ABI-2-6-0-STABLE/src/wp/ap/xp/ap_EditMethods.cpp 2008-07-11 13:43:41 UTC (rev 24376)
> +++ abiword/branches/ABI-2-6-0-STABLE/src/wp/ap/xp/ap_EditMethods.cpp 2008-07-11 13:50:08 UTC (rev 24377)
> @@ -1553,11 +1553,10 @@
> pNewFrame = pApp->newFrame();
> else
> {
> - //fileSave(NULL, NULL);
> pNewFrame = pApp->getFrame(0);
> if (pNewFrame->isDirty())
> {
> - if(!fileSave(pAV_View, NULL))
> + if(! bFileSaveAbiCollabIfNeeded(pAV_View, NULL))
> {
> // we cannot just close the dirty file when the user clicked cancel -- if
> // she really want to loose unsaved changes, let her close it manually
> @@ -2580,7 +2579,6 @@
> if (!pFrame->getFilename())
> {
> return bFileSaveAbiCollabIfNeeded(pAV_View,pCallData);
> - // return EX(fileSaveAs);
> }
> UT_Error errSaved;
> errSaved = pAV_View->cmdSave();
> @@ -2639,7 +2637,6 @@
> if (!pFrame->getFilename())
> {
> return bFileSaveAbiCollabIfNeeded(pAV_View,pCallData);
> - // return EX(fileSaveAs);
> }
> UT_Error errSaved;
> errSaved = pAV_View->cmdSave();
> @@ -2648,7 +2645,6 @@
> if (errSaved == UT_EXTENSIONERROR)
> {
> return bFileSaveAbiCollabIfNeeded(pAV_View,pCallData);
> - // return EX(fileSaveAs);
> }
> if (errSaved)
> {
> @@ -3632,7 +3628,6 @@
> case XAP_Dialog_MessageBox::a_YES: // save it first
> {
> bool bRet = bFileSaveAbiCollabIfNeeded(pAV_View,pCallData);
> - // bool bRet = EX(fileSave);
> if (!bRet) // didn't successfully save,
> return false; // so don't close
> }
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
Received on Fri Jul 11 16:38:23 2008