* src/paragraph.h:

	* src/paragraph_pimpl.C:
	* src/paragraph_pimpl.h:
	* src/paragraph.C: get rid of unused method setContentsFromPar()
	and remove another change tracking FIXME at the same time

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

diff --git a/src/paragraph.C b/src/paragraph.C
index 614b93e89c10016cc5bb898d609c4d068fcb208d..afe3b71f346fbed1c9bc8ae624fada0c5f163bc3 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1409,12 +1409,6 @@ void Paragraph::setInsetOwner(InsetBase * inset)
 }
 
 
-void Paragraph::setContentsFromPar(Paragraph const & par)
-{
-       pimpl_->setContentsFromPar(par);
-}
-
-
 Change const Paragraph::lookupChange(pos_type pos) const
 {
        BOOST_ASSERT(pos <= size());

diff --git a/src/paragraph.h b/src/paragraph.h
index 77635bf2a318f4d0b14ca49704e935da8b8cccc4..5febe6ce64ec2bc9ddc7fdd759fcfd98538f4c4a 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -178,8 +178,6 @@ public:
        ///
        bool empty() const { return text_.empty(); }
        ///
-       void setContentsFromPar(Paragraph const & par);
-       ///
        void clearContents();
 
        ///

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 7e311e5bd69b418112ffd5b7332a2a98e0dd0ab8..ce44bf2968af07d391383a602972e70459741935 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -78,15 +78,6 @@ Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
 }
 
 
-void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
-{
-       owner_->text_ = par.text_;
-       // FIXME: change tracking (MG)
-       // check whether this method is really needed
-       changes_ = par.pimpl_->changes_;
-}
-
-
 bool Paragraph::Pimpl::isChanged(pos_type start, pos_type end) const
 {
        BOOST_ASSERT(start >= 0 && start <= size());

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 221fb941432c0082ec69ddf858f657c902c2c58f..efb347c2494dfbdc341c305c42a8c9b325ec72cb 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -35,8 +35,6 @@ public:
        Pimpl(Paragraph * owner);
        /// "Copy constructor"
        Pimpl(Pimpl const &, Paragraph * owner);
-       ///
-       void setContentsFromPar(Paragraph const & par);
 
        //
        // Change tracking