diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-12 21:25:39 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-12 21:25:39 +0000 |
| commit | eab1eef70ec00e5048b522b6c7f4189615caac87 (patch) | |
| tree | 4d8d574ad9741174e0d99077f234fd41231b08e7 /src/ui/dialog | |
| parent | fix bsplines (diff) | |
| parent | Fix crash with experimental lpe tool. (diff) | |
| download | inkscape-eab1eef70ec00e5048b522b6c7f4189615caac87.tar.gz inkscape-eab1eef70ec00e5048b522b6c7f4189615caac87.zip | |
Update to trunk
(bzr r11950.1.180)
Diffstat (limited to 'src/ui/dialog')
| -rw-r--r-- | src/ui/dialog/filedialogimpl-win32.h | 4 | ||||
| -rw-r--r-- | src/ui/dialog/find.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h index 2e6bb4bb8..29bcb9a45 100644 --- a/src/ui/dialog/filedialogimpl-win32.h +++ b/src/ui/dialog/filedialogimpl-win32.h @@ -140,7 +140,7 @@ public: /// Shows the file dialog, and blocks until a file /// has been selected. - /// @return Returns true if the the user selected a + /// @return Returns true if the user selected a /// file, or false if the user pressed cancel. bool show(); @@ -341,7 +341,7 @@ public: /// Shows the file dialog, and blocks until a file /// has been selected. - /// @return Returns true if the the user selected a + /// @return Returns true if the user selected a /// file, or false if the user pressed cancel. bool show(); diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index def7b5bdb..37f2761df 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -664,7 +664,7 @@ bool Find::item_type_match (SPItem *item) if ( SP_IS_RECT(item)) { return ( all ||check_rects.get_active()); - } else if (SP_IS_GENERICELLIPSE(item) || SP_IS_ELLIPSE(item) || SP_IS_ARC(item) || SP_IS_CIRCLE(item)) { + } else if (SP_IS_GENERICELLIPSE(item)) { return ( all || check_ellipses.get_active()); } else if (SP_IS_STAR(item) || SP_IS_POLYGON(item)) { |