From: Jordi Mas (jmas@softcatala.org)
Date: Mon Sep 01 2003 - 12:11:47 EDT
> Hi Jordi,
> Could make a "diff -u" patch and send it to the list? Since the
> patch touches xp code I want to make I sure In understand what is
> happenning.
Here you are. See my comments in the previous message. Thanks.
Jordi,
--Jordi Mas i Hernāndez - Abiword developer - http://www.abisource.com jmas@softcatala.org - Softcatalā member - http://www.softcatala.org - Personal Homepage http://www.softcatala.org/~jmas
Index: src/af/ev/win/ev_Win32Toolbar.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/ev/win/ev_Win32Toolbar.cpp,v
retrieving revision 1.74
diff -u -r1.74 ev_Win32Toolbar.cpp
--- src/af/ev/win/ev_Win32Toolbar.cpp 26 Jul 2003 21:38:34 -0000 1.74
+++ src/af/ev/win/ev_Win32Toolbar.cpp 1 Sep 2003 16:10:03 -0000
@@ -404,7 +404,7 @@
UT_uint32 dataLength = GetWindowText(hWnd, buf, COMBO_BUF_LEN);
- UT_UCS4_strcpy_utf8_char(ucs_buf, buf);
+ UT_UCS4_strcpy_char(ucs_buf, buf);
UT_UCSChar * pData = (UT_UCSChar *) ucs_buf; // HACK: should be void *
if(dataLength)
Index: src/wp/ap/xp/ap_EditMethods.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/xp/ap_EditMethods.cpp,v
retrieving revision 1.618
diff -u -r1.618 ap_EditMethods.cpp
--- src/wp/ap/xp/ap_EditMethods.cpp 28 Aug 2003 07:23:15 -0000 1.618
+++ src/wp/ap/xp/ap_EditMethods.cpp 1 Sep 2003 16:11:36 -0000
@@ -8173,21 +8173,25 @@
const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet();
- if(strcmp(p_zoom, pSS->getValue(XAP_STRING_ID_TB_Zoom_PageWidth)) == 0)
+ UT_String sPageWidth = pSS->getValueUTF8(XAP_STRING_ID_TB_Zoom_PageWidth);
+ UT_String sWholePage = pSS->getValueUTF8(XAP_STRING_ID_TB_Zoom_WholePage);
+ UT_String sPercent = pSS->getValueUTF8(XAP_STRING_ID_TB_Zoom_Percent);
+
+ if(strcmp(p_zoom, sPageWidth.c_str()) == 0)
{
pPrefsScheme->setValue(static_cast<const XML_Char*>(XAP_PREF_KEY_ZoomType),
static_cast<const XML_Char*>("Width"));
pFrame->setZoomType(XAP_Frame::z_PAGEWIDTH);
iZoom = pView->calculateZoomPercentForPageWidth();
}
- else if(strcmp(p_zoom, pSS->getValue(XAP_STRING_ID_TB_Zoom_WholePage)) == 0)
+ else if(strcmp(p_zoom, sWholePage.c_str()) == 0)
{
pFrame->setZoomType(XAP_Frame::z_WHOLEPAGE);
pPrefsScheme->setValue(static_cast<const XML_Char*>(XAP_PREF_KEY_ZoomType),
static_cast<const XML_Char*>("Page"));
iZoom = pView->calculateZoomPercentForWholePage();
}
- else if(strcmp(p_zoom, pSS->getValue(XAP_STRING_ID_TB_Zoom_Percent)) == 0)
+ else if(strcmp(p_zoom, sPercent.c_str()) == 0)
{
// invoke the zoom dialog instead for some custom value
return EX(dlgZoom);
@@ -8203,7 +8207,7 @@
pFrame->setZoomType(XAP_Frame::z_PERCENT);
iZoom = atoi(p_zoom);
}
-
+
UT_ASSERT(iZoom > 0);
s_StartStopLoadingCursor(true, pFrame);
This archive was generated by hypermail 2.1.4 : Mon Sep 01 2003 - 12:25:39 EDT