Author: craig
Date: Tue May 12 22:34:19 2020
New Revision: 23799
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23799
Log:
Last of asBlahFrame for now.
Modified:
trunk/Scribus/scribus/pslib.cpp
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/textpalette.cpp
Modified: trunk/Scribus/scribus/pslib.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23799&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Tue May 12 22:34:19 2020
@@ -1330,7 +1330,7 @@
cms.allowColorManagement(true);
cms.setUseEmbeddedProfile(UseEmbedded);
int resolution = 300;
- if (item->asLatexFrame())
+ if (item->isLatexFrame())
resolution = item->asLatexFrame()->realDpi();
else if (item->pixm.imgInfo.type == ImageType7)
resolution = 72;
@@ -1347,7 +1347,7 @@
PutStream("0 " + ToStr(h*scaley) + " tr\n");
PutStream(ToStr(-item->imageRotation()) + " ro\n");
PutStream("0 " + ToStr(-h*scaley) + " tr\n");
- if ((extensionIndicatesPDF(ext)) && (!item->asLatexFrame()))
+ if ((extensionIndicatesPDF(ext)) && (!item->isLatexFrame()))
{
scalex *=
PrefsManager::instance().appPrefs.extToolPrefs.gs_Resolution / 300.0;
scaley *=
PrefsManager::instance().appPrefs.extToolPrefs.gs_Resolution / 300.0;
@@ -2656,7 +2656,7 @@
ScQApp->processEvents();
if ((ite->m_layerID != layer.ID) ||
(!ite->printEnabled()))
continue;
- if (!(ite->asTextFrame()) && !(ite->isImageFrame()) &&
!(ite->isPathText()) && !(ite->isTable()))
+ if (!(ite->isTextFrame()) && !(ite->isImageFrame()) &&
!(ite->isPathText()) && !(ite->isTable()))
{
int mpIndex =
m_Doc->MasterNames[page->masterPageName()];
PS_UseTemplate(QString("mp_obj_%1_%2").arg(mpIndex).arg(qHash(ite)));
@@ -2868,7 +2868,7 @@
}
PS_restore();
}
- else if (ite->asTextFrame())
+ else if (ite->isTextFrame())
{
PS_save();
if (ite->doOverprint)
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23799&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Tue May 12 22:34:19 2020
@@ -344,7 +344,7 @@
m_item->currentTextProps(parStyle);
updateStyle(parStyle);
}
- if (m_item->asOSGFrame())
+ if (m_item->isOSGFrame())
{
setEnabled(false);
}
Modified: trunk/Scribus/scribus/ui/textpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23799&path=/trunk/Scribus/scribus/ui/textpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/textpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/textpalette.cpp Tue May 12 22:34:19 2020
@@ -226,7 +226,7 @@
textPal->handleSelectionChanged();
}
- if (m_item->asOSGFrame())
+ if (m_item->isOSGFrame())
{
textPal->setEnabled(false);
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
