anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove string() as default argument to GraphicsParams c-tor.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3839 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-03-26 12:43:21 +00:00
parent 28168bd4df
commit ab6db13160
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/ChangeLog
View File

@ -3,6 +3,10 @@
* GraphicsCacheItem.C (convertToDisplayFormat): don't launch that Alert
if the file can't be found.
* GraphicsParams.h (c-tor): remove string() as default argument.
* GraphicsCacheItem.C: a couple of changes as a result.
2002-03-22 Angus Leeming <a.leeming@ic.ac.uk>
* GraphicsCache.[Ch] (update): now passed filepath to determine absolute

7
src/graphics/GraphicsCacheItem.C
View File

@ -616,7 +616,8 @@ struct Params_Changed {
bool operator()(InsetGraphics const * inset)
{
return GParams(inset->params()) != p_;
string const path = OnlyPath(p_.filename);
return GParams(inset->params(), path) != p_;
}
private:
@ -650,9 +651,11 @@ ModifiedItemPtr ModifiedItem::changeDisplay()
// Create a new ModifiedItem with these new params. Note that
// the only params that have changed are the display ones,
// so we don't need to crop, rotate, scale.
string const path = OnlyPath(p_->filename);
ModifiedItemPtr new_item(new ModifiedItem(*this));
new_item->insets = new_insets;
*(new_item->p_) = GParams((*new_insets.begin())->params());
*(new_item->p_) = GParams((*new_insets.begin())->params(), path);
new_item->setPixmap();
return new_item;

2
src/graphics/GraphicsParams.h
View File

@ -49,7 +49,7 @@ bool operator!=(BoundingBox const &, BoundingBox const &);
struct GParams
{
GParams(InsetGraphicsParams const &, string const & = string());
GParams(InsetGraphicsParams const &, string const &);
/// How is the image to be displayed on the LyX screen?
enum DisplayType {