Fix caption numbering of child documents.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24866 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiClipboard.h b/src/frontends/qt4/GuiClipboard.h
index 4bb808cda318b523d3e4ea3c6a81626287c1af0e..5e7e455f06bcb5eb53cf614ed2ed42027a9c6e5e 100644 (file)
--- a/src/frontends/qt4/GuiClipboard.h
+++ b/src/frontends/qt4/GuiClipboard.h
@@ -21,6 +21,8 @@
 namespace lyx {
 namespace frontend {
 
+class QWindowsMimeMetafile;
+
 /**
  * The Qt4 version of the Clipboard.
  */
@@ -52,6 +54,8 @@ private Q_SLOTS:
        void on_dataChanged();
 
 private:
+       /// WMF Mime handler for Windows clipboard.
+       QWindowsMimeMetafile * wmf_mime_;
        bool text_clipboard_empty_;
        bool has_lyx_contents_;
        bool has_graphics_contents_;

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index dafaddef13740068d36c337105285c0934db5542..193d6ba0bbb35b93fdba0073578010f75de8e433 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -280,27 +280,28 @@ int InsetCaption::getCaptionText(odocstream & os,
 
 void InsetCaption::updateLabels(ParIterator const & it)
 {
-       DocumentClass const & tclass = buffer().params().documentClass();
+       Buffer const & master = *buffer().masterBuffer();
+       DocumentClass const & tclass = master.params().documentClass();
        Counters & cnts = tclass.counters();
        string const & type = cnts.current_float();
        // Memorize type for addToToc().
        type_ = type;
        in_subfloat_ = cnts.isSubfloat();
        if (type.empty())
-               full_label_ = buffer().B_("Senseless!!! ");
+               full_label_ = master.B_("Senseless!!! ");
        else {
                // FIXME: life would be _much_ simpler if listings was
                // listed in Floating.
                docstring name;
                if (type == "listing")
-                       name = buffer().B_("Listing");
+                       name = master.B_("Listing");
                else
-                       name = buffer().B_(tclass.floats().getType(type).name());
+                       name = master.B_(tclass.floats().getType(type).name());
                docstring counter = from_utf8(type);
                if (in_subfloat_) {
                        counter = "sub-" + from_utf8(type);
                        name = bformat(_("Sub-%1$s"),
-                                      buffer().B_(tclass.floats().getType(type).name()));
+                                      master.B_(tclass.floats().getType(type).name()));
                }
                if (cnts.hasCounter(counter)) {
                        cnts.step(counter);

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index d77701bcf4ed406774303ee7c915b12e1bcec039..2d923668032378411db308773fa780a0ad5f1ac6 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -191,7 +191,7 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetFloat::updateLabels(ParIterator const & it)
 {
-       Counters & cnts = buffer().params().documentClass().counters();
+       Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
        string const saveflt = cnts.current_float();
        bool const savesubflt = cnts.isSubfloat();