r18851 by jghali - allow text styles to be applied to table cells from PP when in table edit mode

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 26 21:51:32 UTC 2014


Author: jghali
Date: Wed Feb 26 21:51:32 2014
New Revision: 18851

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18851
Log:
allow text styles to be applied to table cells from PP when in table edit mode

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18851&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Wed Feb 26 21:51:32 2014
@@ -9281,6 +9281,8 @@
 	for (uint aa = 0; aa < selectedItemCount; ++aa)
 	{
 		PageItem *currItem = itemSelection->itemAt(aa);
+		if (currItem->isTable() && appMode == modeEditTable)
+			currItem = currItem->asTable()->activeCell().textFrame();
 		int currItemTextCount = currItem->itemText.length();
 		if ((currItemTextCount == 0) || ((appMode != modeEdit) && (appMode != modeEditTable)))
 		{
@@ -9372,6 +9374,8 @@
 	for (uint aa = 0; aa < selectedItemCount; ++aa)
 	{
 		PageItem *currItem = itemSelection->itemAt(aa);
+		if (currItem->isTable() && appMode == modeEditTable)
+			currItem = currItem->asTable()->activeCell().textFrame();
 //		int currItemTextCount = currItem->lastInFrame() + 1 - currItem->firstInFrame();
 //		if (currItemTextCount > 0 && ( appMode == modeEdit || !FRAMESELECTION_EDITS_DEFAULTSTYLE))
 		int currItemTextCount = currItem->itemText.length();




More information about the scribus-commit mailing list