Re: Problem in Bug 93240
Hi Michael, I just came across this: http://stackoverflow.com/questions/24221955/creating-a-unique-ptr-from-a-pointer . Will it be safe to use this method to push_back into m_Selectors? -Shreyansh On Tue, Sep 1, 2015 at 6:16 PM Michael Stahl <mst...@redhat.com> wrote: > On 01.09.2015 06:45, Shreyansh Gandhi wrote: > > Hi, > > > > I have been working on a patch for EasyHack 93240 > > <https://bugs.documentfoundation.org/show_bug.cgi?id=93240> and I have > > run into a problem. > > All the changes I'll describe are in the sw/source/filter/html directory. > > > > *svxcss1.hxx , svxcss1.cxx , htmlcss1.cxx:-* > > > > * > http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/svxcss1.hxx#201 > . According > > to the bug description, boost::ptr_vector<..> should be changed to > > std::vector<std::unique_ptr > . aSelectors would be > > renamed to m_Selectors. > > yes > > > * > http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/svxcss1.cxx#659 > > . In SvcCSS1Parser::SelectorParsed, since pSelector (which is of > > type CSS1Selector*) would be pushed back into m_Selectors now and > > there is no conversion from a normal pointer to a unique_ptr, > > pSelector itself would have to be a unique_ptr. Hence, the > > that's not entirely true: there is no *implicit* conversion to > unique_ptr, but you can explicitly construct the unique_ptr just fine. > > because the boost::ptr_containers have the same ownership semantics for > elements, it should be safe to convert to unique_ptr in every place > where an element is inserted into a std::container of std::unique_ptr. > > > StyleParsed method's prototype would also be changed. > > * > http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/htmlcss1.cxx#696 > . > > Is another implementation of SvxCSS1Parser::StyleParsed. > > > > > > Since SvxCSS1Parser inherits CSS1Parser, and the SelectorParsed method > > is overloaded, changes are also required in *parcss1.hxx and parcss1.cxx > > *, where ParseRule() calls SelectorParsed():- > > best to first finish the patch to convert the container and then do this > refactoring in a follow-up patch: > > > * > http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/parcss1.cxx#739 > . > > pSelector (which should become a unique_ptr ) is obtained from > > ParseSelector() (whose return type should also change) and then > > passed to SelectorParsed() > > * > http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/parcss1.cxx#833 > . > > In ParseSelector(), pRoot, pNew and pLast would have to be > > unique_ptr s (initialized to nullptr). Lines 882, 894, 911 and 924 > > would now have calls to std::move. The problem arises in the if > > block starting at line 936, where pRoot and pLast are checked for > > equality (which should fail for unique_ptr s) Also, pRoot and pLast > > could both be assigned to the object owned by pNew, which is not > > possible. > > it looks like it should be possible if pLast remains a CSS1Selector*, > then use unique_ptr::get() to assign it. > > then also convert CSS1Selector::pNext to unique_ptr, so the first one is > owned by pRoot variable and the subsequent ones are owned by the > preceding one's pNext member. > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem in Bug 93240
Hey, I don't understand the reason why the build failed. Can you please take a look? http://ci.libreoffice.org/job/lo_gerrit_master/5856/console On Tue, Sep 1, 2015 at 8:06 PM Michael Stahl <mst...@redhat.com> wrote: > On 01.09.2015 15:34, Shreyansh Gandhi wrote: > > I just came across > > this: > http://stackoverflow.com/questions/24221955/creating-a-unique-ptr-from-a-pointer > . > > Will it be safe to use this method to push_back into m_Selectors? > > yes, if it was pushing to a boost::ptr_container before (and we can > assume that that works), then converting it to a unique_ptr only at the > place when it is pushed is doing exactly the same thing. > > the only problem to watch out for, if you do it earlier and convert a > variable declaration to std::unique_ptr then std::move into the > container then the variable contains a null pointer now - but if you > convert the bare pointer only inside the push_back call then this > problem is avoided. > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Problem in Bug 93240
Hi, I have been working on a patch for EasyHack 93240 <https://bugs.documentfoundation.org/show_bug.cgi?id=93240> and I have run into a problem. All the changes I'll describe are in the sw/source/filter/html directory. *svxcss1.hxx , svxcss1.cxx , htmlcss1.cxx:-* - http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/svxcss1.hxx#201 . According to the bug description, boost::ptr_vector<..> should be changed to std::vector<std::unique_ptr > . aSelectors would be renamed to m_Selectors. - http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/svxcss1.cxx#659 . In SvcCSS1Parser::SelectorParsed, since pSelector (which is of type CSS1Selector*) would be pushed back into m_Selectors now and there is no conversion from a normal pointer to a unique_ptr, pSelector itself would have to be a unique_ptr. Hence, the StyleParsed method's prototype would also be changed. - http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/htmlcss1.cxx#696 . Is another implementation of SvxCSS1Parser::StyleParsed. Since SvxCSS1Parser inherits CSS1Parser, and the SelectorParsed method is overloaded, changes are also required in *parcss1.hxx and parcss1.cxx *, where ParseRule() calls SelectorParsed():- - http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/parcss1.cxx#739 . pSelector (which should become a unique_ptr ) is obtained from ParseSelector() (whose return type should also change) and then passed to SelectorParsed() - http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/parcss1.cxx#833 . In ParseSelector(), pRoot, pNew and pLast would have to be unique_ptr s (initialized to nullptr). Lines 882, 894, 911 and 924 would now have calls to std::move. The problem arises in the if block starting at line 936, where pRoot and pLast are checked for equality (which should fail for unique_ptr s) Also, pRoot and pLast could both be assigned to the object owned by pNew, which is not possible. How should I go about solving this problem? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Error while pushing commits for bug 93240
Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) error: failed to push some refs to 'ssh://logerrit/core' How do I fix this? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
This is the output of ./logerrit submit master ./logerrit submit master Counting objects: 64, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (change 9724 closed) error: failed to push some refs to 'ssh://logerrit/core' -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
*./logerrit submit master* Counting objects: 64, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (change 9724 closed) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 2:51 PM Samuel Mehrbrodt s.mehrbr...@gmail.com wrote: Try ./logerrit submit master Check https://wiki.documentfoundation.org/Development/gerrit for more information. Samuel Am 28.08.2015 um 10:58 schrieb Shreyansh Gandhi: Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) error: failed to push some refs to 'ssh://logerrit/core' How do I fix this? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Same result:- git push origin HEAD:refs/for/master Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 5:41 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh On Fri, Aug 28, 2015 at 4:43 PM Eike Rathke er...@redhat.com wrote: Hi, On Friday, 2015-08-28 11:21:45 +0200, Samuel Mehrbrodt wrote: Try ./logerrit submit master Be careful though, ./logerrit pushes every change from your local branch that is on top of the origin, which may explain why you had the problem with the closed 9724 change if that commit still lingered on your branch. The git review plugin command checks and warns if more than one change is to be pushed, see git review --help for usage. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
http://pastebin.com/zWu0ZedZ On Fri, Aug 28, 2015 at 8:24 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 4:52 PM, Ashod Nakashian ashnak...@gmail.com wrote: On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. No. Please read the error message. ( [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges)) You have somewhere a merge commit. Can you pastebin the first lines of git log? Regards, Markus Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 5:41 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Alternate link for pushing commits
Hi, Apparently the git:// protocol doesn't work on my network. Is there an alternate link such as the http lik for pulling? -Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trouble pulling from git
Hey, Will the http link work for git push too? Regards, Shreyansh On Fri, Aug 21, 2015 at 9:54 PM Eike Rathke er...@redhat.com wrote: Hi Shreyansh, On Friday, 2015-08-21 11:35:02 -0400, Ashod Nakashian wrote: On Fri, Aug 21, 2015 at 10:44 AM, Shreyansh Gandhi gandhish...@gmail.com I have been facing trouble while running git pull. The connection always times out. url = git://gerrit.libreoffice.org/core url = git://anongit.freedesktop.org/libreoffice/core Both should work, unless your firewall or proxy blocks the git protocol or one of the servers is temporarily unavailable.. which may have been the case with gerrit yesterday during some time frame. http://anongit.freedesktop.org/git/libreoffice/core.git would also be possible if the git protocol doesn't work for some reason, the http protocol is just less effective than the git protocol. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Shreyansh Gandhi License Statement
Hi, All of my past future contributions to Libreoffice may be licensed under the MLPv2/LGPLv3 license. Regards,Shreyansh Gandhi___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trouble pulling from git
Thanks for the http link Eike. It worked! On Fri, Aug 21, 2015 at 9:54 PM Eike Rathke er...@redhat.com wrote: Hi Shreyansh, On Friday, 2015-08-21 11:35:02 -0400, Ashod Nakashian wrote: On Fri, Aug 21, 2015 at 10:44 AM, Shreyansh Gandhi gandhish...@gmail.com I have been facing trouble while running git pull. The connection always times out. url = git://gerrit.libreoffice.org/core url = git://anongit.freedesktop.org/libreoffice/core Both should work, unless your firewall or proxy blocks the git protocol or one of the servers is temporarily unavailable.. which may have been the case with gerrit yesterday during some time frame. http://anongit.freedesktop.org/git/libreoffice/core.git would also be possible if the git protocol doesn't work for some reason, the http protocol is just less effective than the git protocol. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Trouble pulling from git
Hi, I have been facing trouble while running git pull. The connection always times out. I have also tried pulling from git://gerrit.libreoffice.org/core . The git config file looks like:- [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote origin] url = git://gerrit.libreoffice.org/core fetch = +refs/heads/*:refs/remotes/origin/* pushurl = ssh://logerrit/core [branch master] remote = origin merge = refs/heads/master Any ideas how to solve this? P.S: git works fine on this network. It's not a proxy issue. Regards, Shreyansh Gandhi -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/9724/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/9725/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/9725/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/rolbck.hxx | 13 -
sw/source/core/undo/rolbck.cxx | 10 +++---
2 files changed, 7 insertions(+), 16 deletions(-)
New commits:
commit 5028475adb6fa164c18b93ab7fb83b2256d78a89
Author: Shreyansh Gandhi gandhish...@gmail.com
Date: Tue Jun 10 22:08:39 2014 +0530
fdo#75757: Remove inheritance from std::vector
Problem: Many classes inherit directly from std::vector
See comment#6 by kendy for more details.
Solution: Removed class SwpHstry altogether and moved its
destructor's functionality to SwHistory's destructor.
Changed type of m_SwpHstry from SwpHstry to vectorSwHistoryHint*
Change-Id: I32a7e111fef7c5e7b83ecee6469e173b5a21a5bf
Reviewed-on: https://gerrit.libreoffice.org/9725
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 0c36352..8db7247 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -337,21 +337,16 @@ public:
};
-class SwpHstry : public std::vectorSwHistoryHint* {
-public:
-// the destructor will free all objects still in the vector
-~SwpHstry();
-};
-
class SwHistory
{
friend class SwDoc; // actually only SwDoc::DelUndoObj may access
friend class SwRegHistory; // for inserting History attributes
-SwpHstry m_SwpHstry;
+std::vectorSwHistoryHint* m_SwpHstry;
sal_uInt16 m_nEndDiff;
public:
+typedef std::vectorSwHistoryHint*::iterator SwpHstry_iterator;
SwHistory( sal_uInt16 nInitSz = 0 );
~SwHistory();
@@ -383,8 +378,8 @@ public:
void Move( sal_uInt16 nPos, SwHistory *pIns,
sal_uInt16 const nStart = 0)
{
-SwpHstry::iterator itSourceBegin = pIns-m_SwpHstry.begin() + nStart;
-SwpHstry::iterator itSourceEnd = pIns-m_SwpHstry.end();
+SwpHstry_iterator itSourceBegin = pIns-m_SwpHstry.begin() + nStart;
+SwpHstry_iterator itSourceEnd = pIns-m_SwpHstry.end();
if (itSourceBegin == itSourceEnd) return;
m_SwpHstry.insert(m_SwpHstry.begin() + nPos, itSourceBegin,
itSourceEnd);
pIns-m_SwpHstry.erase( itSourceBegin, itSourceEnd );
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 20fa77b..cafee25 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -976,6 +976,9 @@ SwHistory::SwHistory( sal_uInt16 nInitSz )
SwHistory::~SwHistory()
{
+std::vectorSwHistoryHint*::const_iterator it;
+for(it = m_SwpHstry.begin(); it != m_SwpHstry.end(); ++it)
+delete *it;
Delete( 0 );
}
@@ -1429,11 +1432,4 @@ void SwRegHistory::_MakeSetWhichIds()
}
}
}
-
-SwpHstry::~SwpHstry()
-{
-for(const_iterator it = begin(); it != end(); ++it)
-delete *it;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Shreyansh Gandhi license statement
Hello, All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Build Error
Hi, I was building LO( it had already gone on for about 6-7 hours), when suddenly this popped up:- *[build LNK] CppunitTest/libtest_sc_subsequent_export_test.so* */home/shreyansh/core/solenv/gbuild/Package.mk:35: *** gb_Deliver_deliver: file does not exist in instdir, and cannot be delivered: /home/shreyansh/core/instdir/program/libscopencllo.so. Stop.* *make[1]: *** Waiting for unfinished jobs* *make: *** [build] Error 2* Any advice on how to deal with this? Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Build Error
looks like that was fixed by commit 00c19e5def4a62445c85786aef6a507bee6c45fa ... so just git pull and try again. Thanks for the advice I did git pull and tried to build again However, the build was unsuccessful. On running make check, I got this:- There were 2 failures: 1) test(org.openoffice.test.UnoApiTest) com.sun.star.lang.DisposedException: java_remote_bridge com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge@eafc191 is disposed at com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.checkDisposed(java_remote_bridge.java:690) at com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest(java_remote_bridge.java:611) at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.request(ProxyFactory.java:141) at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.invoke(ProxyFactory.java:123) at com.sun.proxy.$Proxy6.createInstance(Unknown Source) at util.DesktopTools.createDesktop(DesktopTools.java:82) at util.DesktopTools.getCLoader(DesktopTools.java:61) at util.DesktopTools.openNewDoc(DesktopTools.java:238) at util.WriterTools.createTextDoc(WriterTools.java:39) at mod._forms.GenericModelTest.initialize(GenericModelTest.java:219) at mod._forms.OComboBoxModel.initialize(OComboBoxModel.java:118) at lib.TestCase.initializeTestCase(TestCase.java:68) at base.java_fat.getEnv(java_fat.java:450) at base.java_fat.executeTest(java_fat.java:239) at org.openoffice.Runner.run(Runner.java:234) at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:483) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) at org.junit.runners.ParentRunner.run(ParentRunner.java:309) at org.junit.runners.Suite.runChild(Suite.java:127) at org.junit.runners.Suite.runChild(Suite.java:26) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) at org.junit.runners.ParentRunner.run(ParentRunner.java:309) at org.junit.runner.JUnitCore.run(JUnitCore.java:160) at org.junit.runner.JUnitCore.run(JUnitCore.java:138) at org.junit.runner.JUnitCore.run(JUnitCore.java:117) at org.junit.runner.JUnitCore.runMain(JUnitCore.java:96) at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:47) at org.junit.runner.JUnitCore.main(JUnitCore.java:40) 2) test(org.openoffice.test.UnoApiTest) java.lang.AssertionError: expected:0 but was:134 at org.junit.Assert.fail(Assert.java:88) at org.junit.Assert.failNotEquals(Assert.java:743) at org.junit.Assert.assertEquals(Assert.java:118) at org.junit.Assert.assertEquals(Assert.java:555) at org.junit.Assert.assertEquals(Assert.java:542) at org.openoffice.test.OfficeConnection.tearDown(OfficeConnection.java:151) at org.openoffice.test.UnoApiTest.tearDown(UnoApiTest.java:34) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:483) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) at
Fwd: Missing package in build
-- Forwarded message -- From: Miklos Vajna vmik...@collabora.co.uk Date: Sat, Apr 26, 2014 at 9:11 PM Subject: Re: Missing package in build To: Shreyansh Gandhi gandhish...@gmail.com Cc: libreoffice@lists.freedesktop.org On Sat, Apr 26, 2014 at 08:10:01AM +0530, Shreyansh Gandhi gandhish...@gmail.com wrote: No package 'gstreamer-0.10' found No package 'gstreamer-plugins-base-0.10' found https://wiki.documentfoundation.org/Development/BuildingOnLinux says: On Debian/Ubuntu: sudo apt-get build-dep libreoffice Did you do that? I assume the relevant -dev packages are installed by the above. Yes, I did do sudo apt-get build-dep libreoffice It showed that all dependencies were installed. However, it seems that gstreamer was not installed. I checked all repositories through Synaptic Package Manager and found no package called gstreamer-0.10. Do I need to add a new repository or is there a substitute package that would work? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Missing package in build
Hi, I'm trying to build LO in a fresh install of ubuntu 14.04. After ./autogen.sh the build stopped at a point where the following message was dispayed:- checking for GSTREAMER_0_10... no checking for GSTREAMER_0_10... no configure: error: Package requirements (gstreamer-0.10 gstreamer-plugins-base-0.10 ) were not met: No package 'gstreamer-0.10' found No package 'gstreamer-plugins-base-0.10' found How do I resolve this? Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
