Fix blocking bugs in text for Beta (stiling)

4 files changed, 10 insertions, 11 deletions

diff --git a/src/knot.cpp b/src/knot.cpp
index 3fc92b4ef..4a7982a0f 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -289,7 +289,8 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
                 moved = FALSE;
                 consumed = TRUE;
             }
-        } else if (grabbed && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) {
+        } else if (grabbed && knot->desktop && knot->desktop->event_context &&
+                   !knot->desktop->event_context->space_panning) {
             consumed = TRUE;
 
             if ( within_tolerance
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index fe775d37c..4f5c8ef74 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -305,7 +305,7 @@ public:
 
     // Hide wrap shapes
     void hideWrapShapes();
-    
+
     // Show wrap shapes
     void showWrapShapes();
 
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index dd56998d7..fbe40e7d0 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -2033,7 +2033,7 @@ void TextToolbar::selection_changed(Inkscape::Selection *selection) // don't bot
             height = _query_cursor.line_height.value;
             line_height_unit = _query_cursor.line_height.unit;
         }
-        
+
         if (!height && result_numbers != QUERY_STYLE_NOTHING) {
             height = query.line_height.value;
             line_height_unit = query.line_height.unit;
@@ -2334,7 +2334,7 @@ void TextToolbar::prepare_inner()
             if (flowtext) {
                 flowtext->rebuildLayout();
             }
-            
+
             SPObject *current = start->parent;
             SPObject *span_start = start->parent;
             SPObject *span_end = end->parent;
@@ -2352,11 +2352,9 @@ void TextToolbar::prepare_inner()
 
             SPObject *endobj = span_end;
             SPObject *prevendobj = span_end;
-            while (endobj->parent != SP_OBJECT(text) && 
-                   endobj->parent != SP_OBJECT(flowtext))
-            {
+            while (endobj->parent != SP_OBJECT(text) && endobj->parent != SP_OBJECT(flowtext)) {
                 prevendobj = endobj;
-                endobj = endobj->parent;   // SPStrings don't have style
+                endobj = endobj->parent; // SPStrings don't have style
             }
             SPObject *container = startobj->parent;
             SPObject *end_container = endobj->parent;
@@ -2364,7 +2362,7 @@ void TextToolbar::prepare_inner()
             SPFlowtext *topflowtext = dynamic_cast<SPFlowtext *>(container);
             if (toptext || topflowtext) {
                 container = startobj;
-                end_container = endobj; 
+                end_container = endobj;
                 startobj = prevstartobj;
             }
             std::cout << prevstartobj->getId() << std::endl;
@@ -2376,7 +2374,7 @@ void TextToolbar::prepare_inner()
             if (container) {
                 containers.push_back(container);
             }
-            for(auto container : containers) {
+            for (auto container : containers) {
                 if (!container) {
                     continue;
                 }
diff --git a/src/ui/toolbar/text-toolbar.h b/src/ui/toolbar/text-toolbar.h
index 812182de2..43bb0b78a 100644
--- a/src/ui/toolbar/text-toolbar.h
+++ b/src/ui/toolbar/text-toolbar.h
@@ -135,7 +135,7 @@ private:
     void subselection_changed(gpointer texttool);
     void watch_ec(SPDesktop* desktop, Inkscape::UI::Tools::ToolBase* ec);
     void set_sizes(int unit);
-    Inkscape::XML::Node * unindent_node(Inkscape::XML::Node *repr, Inkscape::XML::Node *before);
+    Inkscape::XML::Node *unindent_node(Inkscape::XML::Node *repr, Inkscape::XML::Node *before);
 
   protected:
     TextToolbar(SPDesktop *desktop);