* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetcaption.C

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 482642f94aa548e824d91410091226de772b4d09..55566f8dae364097cbb91b827ec5701f86666c74 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -96,15 +96,15 @@ void InsetCaption::setLabel(LCursor & cur) const
        if (cur.top().text() == &text_) {
                string s;
                size_t i = cur.depth();
-                       while (i > 0) {
-                               --i;
-                               InsetBase * const in = &cur[i].inset();
-                               if (in->lyxCode() == InsetBase::FLOAT_CODE
-                                   || in->lyxCode() == InsetBase::WRAP_CODE) {
-                                       s = to_utf8(in->getInsetName());
-                                       break;
-                               }
+               while (i > 0) {
+                       --i;
+                       InsetBase * const in = &cur[i].inset();
+                       if (in->lyxCode() == InsetBase::FLOAT_CODE ||
+                           in->lyxCode() == InsetBase::WRAP_CODE) {
+                               s = to_utf8(in->getInsetName());
+                               break;
                        }
+               }
                Floating const & fl = textclass_.floats().getType(s);
                s = fl.name();
                docstring num;
@@ -119,7 +119,7 @@ void InsetCaption::setLabel(LCursor & cur) const
 }
 
 
-void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
        LCursor cur = mi.base.bv->cursor();
@@ -135,7 +135,9 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.des += TEXT_TO_INSET_OFFSET;
        dim.wid += 2 * TEXT_TO_INSET_OFFSET;
        mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }