<div dir="ltr">Hey,<br><div class="gmail_extra"><br></div><div class="gmail_extra">so this is the wrong format to submit patches.<br><br></div><div class="gmail_extra">The preferred way is to use gerrit and follow the instructions at <a href="https://wiki.documentfoundation.org/Development/gerrit">https://wiki.documentfoundation.org/Development/gerrit</a><br><br></div><div class="gmail_extra">There is still the discouraged way of attaching the result of got format-patch to a mail but if possible please use gerrit.<br><br></div><div class="gmail_extra">Regards,<br></div><div class="gmail_extra">Markus<br><br></div><div class="gmail_extra"><div class="gmail_quote">On Thu, Apr 9, 2015 at 1:09 AM, Delveri chick <span dir="ltr"><<a href="mailto:chickdelveri@gmail.com" target="_blank">chickdelveri@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx</div><div>index c601fb1..807b861 100644</div><div>--- a/idl/inc/basobj.hxx</div><div>+++ b/idl/inc/basobj.hxx</div><div>@@ -88,8 +88,8 @@ protected:</div><div> virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,</div><div> SvTokenStream & rInStm );</div><div> public:</div><div>- TYPEINFO_OVERRIDE();</div><div>- SvMetaName();</div><div>+ TYPEINFO_OVERRIDE();</div><div>+ SvMetaName();</div><div> </div><div> virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL );</div><div> void SetDescription( const OString& rText )</div><div>@@ -113,8 +113,8 @@ class SvMetaReference : public SvMetaName</div><div> protected:</div><div> SvMetaReferenceRef aRef;</div><div> public:</div><div>- TYPEINFO_OVERRIDE();</div><div>- SvMetaReference();</div><div>+ TYPEINFO_OVERRIDE();</div><div>+ SvMetaReference();</div><div> </div><div> const SvString & GetName() const SAL_OVERRIDE</div><div> {</div><div>diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx</div><div>index e3efbfa..b23d4bd 100644</div><div>--- a/include/oox/helper/refmap.hxx</div><div>+++ b/include/oox/helper/refmap.hxx</div><div>@@ -38,8 +38,8 @@ namespace oox {</div><div> key before.</div><div> */</div><div> template< typename KeyType, typename ObjType, typename CompType = std::less< KeyType > ></div><div>-class RefMap : public std::map< KeyType, std::shared_ptr< ObjType >, CompType ></div><div>-{</div><div>+</div><div>+class RefMap {</div><div> public:</div><div> typedef std::map< KeyType, std::shared_ptr< ObjType >, CompType > container_type;</div><div> typedef typename container_type::key_type key_type;</div><div>@@ -47,7 +47,6 @@ public:</div><div> typedef typename container_type::value_type value_type;</div><div> typedef typename container_type::key_compare key_compare;</div><div> </div><div>-public:</div><div> /** Returns true, if the object associated to the passed key exists.</div><div> Returns false, if the key exists but points to an empty reference. */</div><div> bool has( key_type nKey ) const</div><div>@@ -69,7 +68,7 @@ public:</div><div> template< typename FunctorType ></div><div> void forEach( const FunctorType& rFunctor ) const</div><div> {</div><div>- std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( rFunctor ) );</div><div>+ std::for_each( this->my_Mapref.begin(), this->my_Mapref.end(), ForEachFunctor< FunctorType >( rFunctor ) );</div><div> }</div><div> </div><div> /** Calls the passed member function of ObjType on every contained object,</div><div>@@ -118,7 +117,7 @@ public:</div><div> template< typename FunctorType ></div><div> void forEachWithKey( const FunctorType& rFunctor ) const</div><div> {</div><div>- std::for_each( this->begin(), this->end(), ForEachFunctorWithKey< FunctorType >( rFunctor ) );</div><div>+ std::for_each( this->my_Mapref.begin(), this->my_Mapref.end(), ForEachFunctorWithKey< FunctorType >( rFunctor ) );</div><div> }</div><div> </div><div> /** Calls the passed member function of ObjType on every contained object.</div><div>@@ -172,9 +171,12 @@ private:</div><div> </div><div> const mapped_type* getRef( key_type nKey ) const</div><div> {</div><div>- typename container_type::const_iterator aIt = this->find( nKey );</div><div>- return (aIt == this->end()) ? 0 : &aIt->second;</div><div>+ typename container_type::const_iterator aIt = this->my_Mapref.find( nKey );</div><div>+ return (aIt == this->my_Mapref.end()) ? 0 : &aIt->second;</div><div> }</div><div>+</div><div>+ std::map< KeyType, std::shared_ptr< ObjType >, CompType > my_Mapref;</div><div>+</div><div> };</div><div> </div><div> </div><div>diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx</div><div>index 8768cc0..def276f 100644</div><div>--- a/sw/inc/docary.hxx</div><div>+++ b/sw/inc/docary.hxx</div><div>@@ -58,8 +58,8 @@ public:</div><div> };</div><div> </div><div> template<typename Value></div><div>-class SwVectorModifyBase : public std::vector<Value></div><div>-{</div><div>+class SwVectorModifyBase{</div><div>+</div><div> public:</div><div> typedef typename std::vector<Value>::const_iterator const_iterator;</div><div> </div><div>@@ -71,6 +71,7 @@ protected:</div><div> </div><div> private:</div><div> const DestructorPolicy mPolicy;</div><div>+ std::vector<Value> my_Values;</div><div> </div><div> protected:</div><div> // default destructor deletes all contained elements</div><div>@@ -85,7 +86,7 @@ public:</div><div> virtual ~SwVectorModifyBase()</div><div> {</div><div> if (mPolicy == DestructorPolicy::FreeElements)</div><div>- for(const_iterator it = begin(); it != end(); ++it)</div><div>+ for(const_iterator it = my_Values.begin(); it != my_values.end(); ++it)</div><div> delete *it;</div><div> }</div><div> </div><div>@@ -93,20 +94,20 @@ public:</div><div> {</div><div> if (aEndIdx < aStartIdx)</div><div> return;</div><div>- for (const_iterator it = begin() + aStartIdx;</div><div>- it != begin() + aEndIdx; ++it)</div><div>+ for (const_iterator it = my_Values.begin() + aStartIdx;</div><div>+ it != my_Values.begin() + aEndIdx; ++it)</div><div> delete *it;</div><div>- this->erase( begin() + aStartIdx, begin() + aEndIdx);</div><div>+ this->my_Values.erase( my_Values.begin() + aStartIdx, my_Values.begin() + aEndIdx);</div><div> }</div><div> </div><div> sal_uInt16 GetPos(Value const& p) const</div><div> {</div><div>- const_iterator const it = std::find(begin(), end(), p);</div><div>- return it == end() ? USHRT_MAX : it - begin();</div><div>+ const_iterator const it = std::find(my_Values.begin(), my_Values.end(), p);</div><div>+ return it == my_Values.end() ? USHRT_MAX : it - my_Values.begin();</div><div> }</div><div> </div><div> bool Contains(Value const& p) const</div><div>- { return std::find(begin(), end(), p) != end(); }</div><div>+ { return std::find(my_Values.begin(), my_Values.end(), p) != my_Values.end(); }</div><div> </div><div> void dumpAsXml(struct _xmlTextWriter* /*pWriter*/) const {};</div><div> };</div><div>diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx</div><div>index eb303d6..4b0ec59 100644</div><div>--- a/sw/inc/swtable.hxx</div><div>+++ b/sw/inc/swtable.hxx</div><div>@@ -63,7 +63,7 @@ class SwServerObject;</div><div> </div><div> void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );</div><div> </div><div>-class SwTableLines : public std::vector<SwTableLine*> {</div><div>+class SwTableLines {</div><div> public:</div><div> // free's any remaining child objects</div><div> ~SwTableLines();</div><div>@@ -71,19 +71,24 @@ public:</div><div> // return USHRT_MAX if not found, else index of position</div><div> sal_uInt16 GetPos(const SwTableLine* pBox) const</div><div> {</div><div>- const_iterator it = std::find(begin(), end(), pBox);</div><div>+ const_iterator it = std::find(my_SWTbLine.begin(), my_SWTbLine.end(), pBox);</div><div> return it == end() ? USHRT_MAX : it - begin();</div><div> }</div><div>+</div><div>+private:</div><div>+ std::vector<SwTableLine*> my_SWTbLine;</div><div> };</div><div> </div><div>-class SwTableBoxes : public std::vector<SwTableBox*> {</div><div>+class SwTableBoxes{</div><div> public:</div><div> // return USHRT_MAX if not found, else index of position</div><div> sal_uInt16 GetPos(const SwTableBox* pBox) const</div><div> {</div><div>- const_iterator it = std::find(begin(), end(), pBox);</div><div>- return it == end() ? USHRT_MAX : it - begin();</div><div>+ const_iterator it = std::find(my_SwTblBox.begin(), my_SwTblBox.end(), pBox);</div><div>+ return it == my_SwTblBox.end() ? USHRT_MAX : it - my_SwTblBox.begin();</div><div> }</div><div>+private:</div><div>+ std::vector<SwTableBox*> my_SwTblBox;</div><div> };</div><div> </div><div> // Save content-bearing box-pointers additionally in a sorted array</div><div>diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx</div><div>index a57b99b..7bac66b 100644</div><div>--- a/sw/source/filter/ww8/types.hxx</div><div>+++ b/sw/source/filter/ww8/types.hxx</div><div>@@ -24,10 +24,12 @@</div><div> </div><div> namespace ww</div><div> {</div><div>- class bytes : public std::vector<sal_uInt8></div><div>- {</div><div>+ class bytes{</div><div>+ </div><div> public:</div><div>- const sal_uInt8* data() const { return empty() ? 0 : &front(); }</div><div>+ const sal_uInt8* data() const { return my_uInt8.empty() ? 0 : &my_uInt8.front(); }</div><div>+ private:</div><div>+ std::vector<sal_uInt8> my_uInt8;</div><div> };</div><div> </div><div> enum WordVersion {eWW1 = 1, eWW2 = 2, eWW6 = 6, eWW7 = 7, eWW8 = 8};</div><div><br></div></div>
<br>_______________________________________________<br>
LibreOffice mailing list<br>
<a href="mailto:LibreOffice@lists.freedesktop.org">LibreOffice@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/libreoffice" target="_blank">http://lists.freedesktop.org/mailman/listinfo/libreoffice</a><br>
<br></blockquote></div><br></div></div>