remove many unnecessary to_2geom and from_2geom calls

[inkscape.git] / src / extension / internal / odf.cpp

diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 02c3626bf9ba9f2255e0b3ee60810cac0f178e23..8ad9b5031e5067d6b04536f8b93ccd8e5677aa83 100644 (file)
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -945,7 +945,7 @@ static Glib::ustring formatTransform(NR::Matrix &tf)
 static NR::Matrix getODFTransform(const SPItem *item)
 {
     //### Get SVG-to-ODF transform
-    NR::Matrix tf = from_2geom(sp_item_i2d_affine(item));
+    NR::Matrix tf (sp_item_i2d_affine(item));
     //Flip Y into document coordinates
     double doc_height    = sp_document_height(SP_ACTIVE_DOCUMENT);
     NR::Matrix doc2dt_tf = NR::Matrix(NR::scale(1.0, -1.0));
@@ -962,9 +962,9 @@ static NR::Matrix getODFTransform(const SPItem *item)
  * Get the bounding box of an item, as mapped onto
  * an ODF document, in cm.
  */
-static NR::Maybe<NR::Rect> getODFBoundingBox(const SPItem *item)
+static boost::optional<NR::Rect> getODFBoundingBox(const SPItem *item)
 {
-    NR::Maybe<NR::Rect> bbox = sp_item_bbox_desktop((SPItem *)item);
+    boost::optional<NR::Rect> bbox = sp_item_bbox_desktop((SPItem *)item);
     if (bbox) {
         double doc_height    = sp_document_height(SP_ACTIVE_DOCUMENT);
         NR::Matrix doc2dt_tf = NR::Matrix(NR::scale(1.0, -1.0));
@@ -1864,7 +1864,7 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts,
     NR::Matrix tf        = getODFTransform(item);
 
     //### Get ODF bounding box params for item
-    NR::Maybe<NR::Rect> bbox = getODFBoundingBox(item);
+    boost::optional<NR::Rect> bbox = getODFBoundingBox(item);
     if (!bbox) {
         return true;
     }
@@ -2041,7 +2041,7 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts,
 
         couts.printf("    svg:d=\"");
         int nrPoints = writePath(couts, curve->get_pathvector(),
-                             to_2geom(tf), bbox_x, bbox_y);
+                             tf, bbox_x, bbox_y);
         couts.printf("\"");
 
         couts.printf(">\n");