From 4ad93594a624aa7774c9810e446c6216c0d90eea Mon Sep 17 00:00:00 2001
From: jriegel <FreeCAD@juergen-riegel.net>
Date: Sun, 13 Apr 2014 16:42:07 +0200
Subject: [PATCH] Fixes some merge Bugs

---
 .../PartDesign/Gui/TaskPolarPatternParameters.cpp  | 14 +++++++++-----
 .../PartDesign/Gui/TaskPolarPatternParameters.h    |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
index 330e585e6..2adaa8027 100644
--- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
@@ -343,7 +343,14 @@ void TaskPolarPatternParameters::getAxis(App::DocumentObject*& obj, std::vector<
         obj = NULL;
     }
 }
-
+const std::string TaskPolarPatternParameters::getAxis(void) const
+{
+    if (ui->comboAxis->currentIndex() == 0)
+        return "N_Axis";
+    else if (ui->comboAxis->count() > 2 && ui->comboAxis->currentIndex() == 1)
+        return ui->comboAxis->currentText().toStdString();
+    return std::string("");
+}
 const bool TaskPolarPatternParameters::getReverse(void) const
 {
     return ui->checkReverse->isChecked();
@@ -378,10 +385,7 @@ void TaskPolarPatternParameters::changeEvent(QEvent *e)
 void TaskPolarPatternParameters::apply()
 {
     std::string name = TransformedView->getObject()->getNameInDocument();
-    std::vector<std::string> axes;
-    App::DocumentObject* obj;
-    getAxis(obj, axes);
-    std::string axis = getPythonStr(obj, axes);
+    std::string axis = getAxis();
     if (!axis.empty()) {            
         Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Axis = %s", name.c_str(), axis.c_str());
     } else
diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h
index 90a5ca16d..595f0b044 100644
--- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h
@@ -73,7 +73,7 @@ protected:
     virtual void clearButtons();
     void getAxis(App::DocumentObject*& obj, std::vector<std::string>& sub) const;
     const std::string getStdAxis(void) const;
-    //const std::string getAxis(void) const;
+    const std::string getAxis(void) const;
     const bool getReverse(void) const;
     const double getAngle(void) const;
     const unsigned getOccurrences(void) const;