Commit b2b7b6c5 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

move this out of the xls


2005-09-05  Jody Goldberg <jody@gnome.org>

	* src/expr.c (gnm_expr_is_data_table) : move this out of the xls
parent 31ac10ba
2005-09-05 Jody Goldberg <jody@gnome.org>
* src/expr.c (gnm_expr_is_data_table) : move this out of the xls
plugin.
2005-09-05 Stepan Kasal <kasal@ucw.cz>
* src/gnm-so-polygon.c, COPYING: Update FSF's address.
......
2005-09-05 Jody Goldberg <jody@gnome.org>
* src/expr.c (gnm_expr_is_data_table) : move this out of the xls
plugin.
2005-09-05 Stepan Kasal <kasal@ucw.cz>
* src/gnm-so-polygon.c, COPYING: Update FSF's address.
......
......@@ -225,6 +225,48 @@ if test "x$gnumeric_with_gnome" = "xtrue"; then
CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
fi
# CHECK HILDON
# -------------------------
# AC_DEFUN([ABI_HILDON_QUICK], [
dnl Quick&Easy HILDON Detection
hildon=false
HILDON_CFLAGS=""
HILDON_LIBS=""
AC_ARG_ENABLE(hildon,[ --enable-hildon Turn on hildon ],[
if test "x$enableval" = "xyes"; then
hildon=true
fi
])
AM_CONDITIONAL(HAVE_HILDON, $hildon)
if test "$hildon" = true ; then
PKG_CHECK_MODULES(HILDON, hildon-libs dbus-1, HAVE_HILDON=yes,HAVE_HILDON=no)
PKG_CHECK_MODULES(HILDON,[
hildon-libs
libosso
])
HILDON_CFLAGS="$HILDON_CFLAGS -DHAVE_HILDON=1"
HILDON_LIBS="$HILDON_LIBS"
fi
AC_SUBST(HILDON_CFLAGS)
AC_SUBST(HILDON_LIBS)
CFLAGS="$CFLAGS $HILDON_CFLAGS"
LIBS="$LIBS $HILDON_LIBS"
AM_CONDITIONAL(WITH_HILDON, test "x$hildon" = "xtrue")
# ])
# END HILDON
# --------------------------------------------------------------
dnl ==============================================
dnl GNOME Specific extensions
with_corba=false
......
......@@ -635,19 +635,6 @@ excel_formula_write_NAME_v7 (PolishData *pd, GnmExpr const *expr,
}
}
gboolean
gnm_expr_is_data_table (GnmExpr const *expr, GnmCellPos *c_in, GnmCellPos *r_in)
{
if (expr->any.oper == GNM_EXPR_OP_FUNCALL) {
char const *name = gnm_func_get_name (expr->func.func);
if (name && 0 == strcmp (name, "table")) {
return TRUE;
}
}
return FALSE;
}
static void
write_node (PolishData *pd, GnmExpr const *expr, int paren_level,
XLOpType target_type)
......
<?xml version="1.0" encoding="UTF-8"?>
<ui>
<menubar>
<menu name="File" action="MenuFile">
<menuitem action="FileNew"/>
<menuitem action="FileOpen"/>
<separator name="file-sep1"/>
<menuitem action="FileSave"/>
<menuitem action="FileSaveAs"/>
<separator name="file-sep2"/>
<menuitem action="FilePageSetup"/>
<menuitem action="FilePrint"/>
<separator name="file-sep3"/>
<menuitem action="FileSend"/>
<menuitem action="FileSummary"/>
<menuitem action="FilePreferences"/>
<separator name="file-sep4"/>
<placeholder name="FileHistory" />
<separator name="file-sep5"/>
<menuitem action="FileClose"/>
<menuitem action="FileQuit"/>
</menu>
<menu name="Edit" action="MenuEdit">
<menuitem action="Undo"/>
<menuitem action="Redo"/>
<separator name="edit-sep1"/>
<menuitem action="EditCut"/>
<menuitem action="EditCopy"/>
<menuitem action="EditPaste"/>
<separator name="edit-sep2"/>
<menuitem action="EditFillAutofill"/>
<menu name="Clear" action="MenuEditClear">
<menuitem action="EditClearAll"/>
<menuitem action="EditClearFormats"/>
<menuitem action="EditClearComments"/>
<menuitem action="EditClearContent"/>
</menu>
<menu name="Delete" action="MenuEditDelete">
<menuitem action="EditDeleteColumns"/>
<menuitem action="EditDeleteRows"/>
<menuitem action="EditDeleteCells"/>
</menu>
<separator name="edit-sep3"/>
<menuitem action="EditFind"/>
<menuitem action="EditReplace"/>
<separator name="edit-sep4"/>
<menu name="EditSheet" action="MenuEditSheet">
<menuitem action="SheetReorder"/>
<separator/>
<menuitem action="InsertSheetAtEnd"/>
<menuitem action="EditDuplicateSheet"/>
<menuitem action="SheetRemove"/>
</menu>
<menu name="Select" action="MenuEditSelect">
<menuitem action="EditSelectAll"/>
<menuitem action="EditSelectColumn"/>
<menuitem action="EditSelectRow"/>
</menu>
<menuitem action="EditRecalc"/>
<placeholder name="ops"/>
</menu>
<menu name="View" action="MenuView">
<menuitem action="ViewFullScreen"/>
<menuitem action="ViewZoom"/>
</menu>
<menu name="Insert" action="MenuInsert">
<menuitem action="InsertCells"/>
<menuitem action="InsertColumns"/>
<menuitem action="InsertRows"/>
<separator/>
<menuitem action="SheetInsert"/>
<menuitem action="InsertImage"/>
<menuitem action="InsertFormula"/>
<menuitem action="InsertComment"/>
<menuitem action="InsertHyperlink"/>
<menu name="Special" action="MenuInsertSpecial">
<menuitem action="InsertCurrentDate"/>
<menuitem action="InsertCurrentTime"/>
<menuitem action="InsertCurrentDateTime"/>
</menu>
</menu>
<menu name="Format" action="MenuFormat">
<menuitem action="FormatCells"/>
<menu name="FormatColumn" action="MenuFormatColumn">
<menuitem action="ColumnSize"/>
<menuitem action="ColumnAutoSize"/>
<menuitem action="ColumnHide"/>
<menuitem action="ColumnUnhide"/>
<menuitem action="ColumnDefaultSize"/>
</menu>
<menu name="FormatRow" action="MenuFormatRow">
<menuitem action="RowSize"/>
<menuitem action="RowAutoSize"/>
<menuitem action="RowHide"/>
<menuitem action="RowUnhide"/>
<menuitem action="RowDefaultSize"/>
</menu>
<menu name="FormatSheets" action="MenuFormatSheet">
<menuitem action="SheetReorder"/>
<menuitem action="SheetChangeName"/>
<separator/>
<menuitem action="SheetDisplayFormulas"/>
<menuitem action="SheetHideZeros"/>
<menuitem action="SheetHideGridlines"/>
<menuitem action="SheetHideColHeader"/>
<menuitem action="SheetHideRowHeader"/>
</menu>
<menuitem action="FormatWorkbook"/>
<menuitem action="FilePreferences"/>
<menuitem action="FormatAuto"/>
</menu>
<menu name="Help" action="MenuHelp">
<menuitem action="HelpAbout"/>
<menuitem action="HelpWeb"/>
</menu>
</menubar>
<toolbar name="HildonToolbar">
<toolitem action="UndoHildon"/>
<toolitem action="RedoHildon"/>
<separator/>
<toolitem action="EditCut"/>
<toolitem action="EditCopy"/>
<toolitem action="EditPaste"/>
<separator/>
<toolitem action="BorderSelector"/>
<toolitem action="ColorBack"/>
<toolitem action="ColorFore"/>
<separator/>
<toolitem action="Zoom"/>
<toolitem action="ViewFullScreen"/>
</toolbar>
<toolbar name="HildonTopToolbar">
<toolitem action="AutoSum"/>
<toolitem action="InsertFormula"/>
<toolitem action="SortAscending"/>
<toolitem action="SortDescending"/>
</toolbar>
</ui>
......@@ -2467,6 +2467,20 @@ gnm_expr_is_err (GnmExpr const *expr, GnmStdError err)
return err == err2;
}
gboolean
gnm_expr_is_data_table (GnmExpr const *expr, GnmCellPos *c_in, GnmCellPos *r_in)
{
if (expr->any.oper == GNM_EXPR_OP_FUNCALL) {
char const *name = gnm_func_get_name (expr->func.func);
if (name && 0 == strcmp (name, "table")) {
return TRUE;
}
}
/* Do we need anything else here ? */
return FALSE;
}
void
gnm_expr_list_unref (GnmExprList *list)
{
......
......@@ -70,6 +70,8 @@ gboolean gnm_expr_is_rangeref (GnmExpr const *expr);
GnmExprArray const *
gnm_expr_is_array (GnmExpr const *expr);
gboolean gnm_expr_is_err (GnmExpr const *expr, GnmStdError e);
gboolean gnm_expr_is_data_table (GnmExpr const *expr,
GnmCellPos *c_in, GnmCellPos *r_in);
gboolean gnm_expr_equal (GnmExpr const *a, GnmExpr const *b);
char *gnm_expr_as_string (GnmExpr const *expr, GnmParsePos const *pp,
GnmExprConventions const *fmt);
......
......@@ -62,11 +62,16 @@ so_polygon_view_set_bounds (SheetObjectView *sov, double const *coords, gboolean
if (visible) {
SheetObject *so = sheet_object_view_get_so (sov);
GnmSOPolygon const *sop = GNM_SO_POLYGON (so);
unsigned i = sop->points->len / 2;
FooCanvasPoints *pts = foo_canvas_points_new (i);
unsigned i;
FooCanvasPoints *pts;
double *dst, x_scale, y_scale, x_translate, y_translate;
double const *src;
if (sop->points == NULL)
return;
i = sop->points->len / 2;
pts = foo_canvas_points_new (i);
x_scale = fabs (coords[2] - coords[0]);
y_scale = fabs (coords[3] - coords[1]);
x_translate = MIN (coords[0], coords[2]),
......
......@@ -163,7 +163,7 @@ wbcg_edit_finish (WorkbookControlGUI *wbcg, WBCEditResult result,
* screw with selection in gtk_entry_grab_focus
* (no longer required now that we clear
* gtk-entry-select-on-focus) */
gtk_window_set_focus (GTK_WINDOW (wbcg->toplevel),
gtk_window_set_focus (wbcg_toplevel (wbcg),
(GtkWidget *) wbcg_get_entry (wbcg));
if (perr.begin_char != 0 || perr.end_char != 0) {
......@@ -218,7 +218,7 @@ wbcg_edit_finish (WorkbookControlGUI *wbcg, WBCEditResult result,
result = WBC_EDIT_REJECT;
command_undo (wbc);
if (valid == VALIDATION_STATUS_INVALID_EDIT) {
gtk_window_set_focus (GTK_WINDOW (wbcg->toplevel),
gtk_window_set_focus (wbcg_toplevel (wbcg),
(GtkWidget *) wbcg_get_entry (wbcg));
return FALSE;
}
......@@ -760,7 +760,7 @@ wbcg_edit_start (WorkbookControlGUI *wbcg,
/* Give the focus to the edit line */
if (!cursorp)
gtk_window_set_focus (GTK_WINDOW (wbcg->toplevel),
gtk_window_set_focus (wbcg_toplevel (wbcg),
(GtkWidget *) wbcg_get_entry (wbcg));
wbcg->wb_control.editing = TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment