src/Text.cpp

@@ -5625,11 +5625,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		FileName const tabstyle = libFileSearch("tabletemplates",
 							style + suffix + ".lyx", "lyx");
 		if (tabstyle.empty())
-			break;
+			    break;
 		UndoGroupHelper ugh(cur.buffer());
 		cur.recordUndo();
-		FuncRequest cmd2(LFUN_FILE_INSERT,
-				 quoteName(tabstyle.absFileName()) + " ignorelang");
+		FuncRequest cmd2(LFUN_FILE_INSERT, tabstyle.absFileName() + " ignorelang");
 		lyx::dispatch(cmd2);
 		// go into table
 		cur.backwardPos();

src/frontends/qt/GuiDocument.cpp

@@ -3571,6 +3571,8 @@ void GuiDocument::getTableStyles()
 			QString data = fn.left(fn.lastIndexOf(".lyx"));
 			QString guiname = data;
 			guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
+			QString relpath = toqstr(makeRelPath(qstring_to_ucs4(fn),
+							     qstring_to_ucs4(dir)));
 			if (textLayoutModule->tableStyleCO->findData(data) == -1)
 				textLayoutModule->tableStyleCO->addItem(guiname, data);
 		}

src/frontends/qt/GuiTabularCreate.cpp

@@ -63,6 +63,8 @@ void GuiTabularCreate::getFiles()
 			QString data = fn.left(fn.lastIndexOf(".lyx"));
 			QString guiname = data;
 			guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
+			QString relpath = toqstr(makeRelPath(qstring_to_ucs4(fn),
+							     qstring_to_ucs4(dir)));
 			if (styleCO->findData(data) == -1)
 				styleCO->addItem(guiname, data);
 		}

status.24x

@@ -77,8 +77,6 @@ What's new
 - Fix spacing problems in previews with math macros under specific
   circumstances (bug 13120).
 
-- Fix tabular styles on systems with blanks in system directory path.
-
 
 * USER INTERFACE