[Scstudio-commits] SF.net SVN: scstudio:[1838] trunk/src

[<xb...@us...>]

Revision: 1838
          http://sourceforge.net/p/scstudio/code/1838
Author:   xborza
Date:     2013-07-01 15:04:48 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
edited msc_types.h, msc_types.cpp, document.cpp / TOWSTRING_PATH

Modified Paths:
--------------
    trunk/src/data/msc_types.cpp
    trunk/src/data/msc_types.h
    trunk/src/view/visio/addon/document.cpp

Modified: trunk/src/data/msc_types.cpp
===================================================================
--- trunk/src/data/msc_types.cpp	2013-06-29 10:11:44 UTC (rev 1837)
+++ trunk/src/data/msc_types.cpp	2013-07-01 15:04:48 UTC (rev 1838)
@@ -63,4 +63,53 @@
   return result;
 }
 
+/* this function shows correct path to file in Visio add-on*/
+std::wstring TOWSTRING_PATH(const std::string& s)
+{
+#ifndef WIN32
+  //call TOWSRTING normally
+  return TOWSTRING(s)
+#else 
+	std::wstring result;
+	bool slash = false;
+	unsigned int posit = 0;
+	for(size_t i=0; i < s.size();)
+	{
+	  posit = s.find('\\',posit+1);
+		
+		if(posit == std::string::npos)
+			posit = s.size();
+		else
+			slash = true;
+
+		std::string sub = s.substr(i,posit-i);
+		i += posit-i+1;
+
+		size_t size = sub.length();
+		const char* pos = sub.data();
+	
+		wchar_t wc;
+
+		while(size > 0)
+		{  
+			int inc = mbtowc(&wc, pos, size);
+			if(inc > 0)
+			{
+      result.push_back(wc);
+
+      size = size - inc;
+      pos = pos + inc;
+			}
+		}
+
+		if(slash)
+		{
+			result.append(L"\\\\");
+			slash = false;
+		}
+	}
+  return result;
+#endif
+}
+
 // $Id$

Modified: trunk/src/data/msc_types.h
===================================================================
--- trunk/src/data/msc_types.h	2013-06-29 10:11:44 UTC (rev 1837)
+++ trunk/src/data/msc_types.h	2013-07-01 15:04:48 UTC (rev 1838)
@@ -54,6 +54,9 @@
 
 std::wstring SCMSC_EXPORT TOWSTRING(const std::string& s);
 
+/* this function shows correct path to file in Visio add-on*/
+std::wstring SCMSC_EXPORT TOWSTRING_PATH(const std::string& s);
+
 //! Helper class to construct a message for Reporter::print()
 /*!
  * reporter->print(stringize() << "value: " << number);

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2013-06-29 10:11:44 UTC (rev 1837)
+++ trunk/src/view/visio/addon/document.cpp	2013-07-01 15:04:48 UTC (rev 1838)
@@ -646,6 +646,12 @@
   accelItemSelectNumberingGroup->Key = 'N';
   accelItemSelectNumberingGroup->Control = true;
   accelItemSelectNumberingGroup->Alt = true;
+	//Message Jumping left
+	Visio::IVAccelItemPtr accelItemMessageJumpingLeft = accelTable->AccelItems->Add();
+  accelItemMessageJumpingLeft->CmdNum = itemMessageJumpingLeft->CmdNum;
+  accelItemMessageJumpingLeft->Key = VK_LEFT;
+  accelItemMessageJumpingLeft->Control = false;
+ // accelItemMessageJumpingLeftCopy->Alt = true;
   //Message Jumping left as copy
   Visio::IVAccelItemPtr accelItemMessageJumpingLeftCopy = accelTable->AccelItems->Add();
   accelItemMessageJumpingLeftCopy->CmdNum = itemMessageJumpingLeftCopy->CmdNum;
@@ -2087,7 +2093,7 @@
   if(drawing.empty())
   {
     m_reportView->Print(RS_ERROR,
-      stringize() << "Import failed. Cannot load '" << TOWSTRING(filename) << "'.");
+      stringize() << "Import failed. Cannot load '" << TOWSTRING_PATH(filename) << "'.");
     return;
   }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.