Author: craig
Date: Sat Dec 30 22:53:53 2017
New Revision: 22323
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22323
Log:
Fix Coverity 1350610
Modified:
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
trunk/Scribus/scribus/ui/storyeditor.h
Modified: trunk/Scribus/scribus/scribusview.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22323&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sat Dec 30 22:53:53 2017
@@ -2964,7 +2964,7 @@
if (!currItem->pixm.imgInfo.valid)
return;
QScopedPointer<ExtImageProps> dia(new ExtImageProps(this,
&currItem->pixm.imgInfo, currItem, this));
- (void) dia->exec();
+ static_cast<void>(dia->exec());
m_ScMW->propertiesPalette->setTextFlowMode(currItem->textFlowMode());
}
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22323&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sat Dec 30 22:53:53 2017
@@ -268,7 +268,26 @@
setCurrentDocument(docc);
parentStoryEditor=parentSE;
wasMod = false;
+ ready = false;
+ unicodeInputCount = 0;
+ CurrAlign = 0.0;
+ CurrDirection = 0.0;
+ CurrFontSize = 0.0;
+ CurrTextFillSh = 0.0;
+ CurrTextStrokeSh = 0.0;
+ CurrTextScaleH = 0.0;
+ CurrTextScaleV = 0.0;
+ CurrTextBase = 0.0;
+ CurrTextShadowX = 0.0;
+ CurrTextShadowY = 0.0;
+ CurrTextOutline = 0.0;
+ CurrTextUnderPos = 0.0;
+ CurrTextUnderWidth = 0.0;
+ CurrTextStrikePos = 0.0;
+ CurrTextStrikeWidth = 0.0;
+ CurrTextKern = 0.0;
SelCharStart = 0;
+ SelCharEnd = 0;
StyledText.clear();
document()->setUndoRedoEnabled(true);
viewport()->setAcceptDrops(false);
Modified: trunk/Scribus/scribus/ui/storyeditor.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22323&path=/trunk/Scribus/scribus/ui/storyeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.h (original)
+++ trunk/Scribus/scribus/ui/storyeditor.h Sat Dec 30 22:53:53 2017
@@ -88,7 +88,7 @@
public:
SEditor (QWidget* parent, ScribusDoc *docc, StoryEditor* parentSE);
- ~SEditor() {};
+ ~SEditor() {}
void setCurrentDocument(ScribusDoc *docc);
void setAlign(int align);
void setDirection(int align);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
