basctl/source/basicide/bastype3.cxx | 4 ++--
external/boost/UnpackedTarball_boost.mk | 1 +
external/boost/boost.signal2.Wshadow.warnings.patch | 15 +++++++++++++++
unusedcode.easy | 1 -
writerfilter/source/dmapper/StyleSheetTable.cxx | 10 ----------
writerfilter/source/dmapper/StyleSheetTable.hxx | 1 -
6 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit 416723d29938556aaeca8bc8805209e394d30939
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Sep 15 10:24:03 2014 +0200
Unused GetStyleIdFromIndex()
Change-Id: Ic4f45b154f61e5d8ac2120d758d6ecb0c98bf889
diff --git a/unusedcode.easy b/unusedcode.easy
index 73783ba..b24e0b3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -217,4 +217,3 @@ svl::GridPrinter::resize(unsigned long, unsigned long)
svt::CheckInvariants(void const*)
svt::table::UnoControlTableModel::checkInvariants() const
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
-writerfilter::dmapper::StyleSheetTable::GetStyleIdFromIndex(unsigned int)
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 1c39a8a..eb22ecf 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1494,16 +1494,6 @@ OUString StyleSheetTable::ConvertStyleName( const
OUString& rWWName, bool bExten
return sRet;
}
-OUString StyleSheetTable::GetStyleIdFromIndex(const sal_uInt32 sti)
-{
- OUString sRet;
- if (sti >= (sizeof(aStyleNamePairs) / sizeof( sal_Char*) / 2))
- sRet = OUString();
- else
- sRet = OUString::createFromAscii(aStyleNamePairs[2 * sti]);
- return sRet;
-}
-
void StyleSheetTable::applyDefaults(bool bParaProperties)
{
try{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx
b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 43b3b43..ada4302 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -101,7 +101,6 @@ public:
const StyleSheetEntryPtr FindParentStyleSheet(const OUString& sBaseStyle);
OUString ConvertStyleName( const OUString& rWWName, bool bExtendedSearch =
false );
- OUString GetStyleIdFromIndex(const sal_uInt32 sti);
OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties );
commit 924a2689b380407d6db64ff0693aaff79073ea6f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 15 09:16:42 2014 +0100
WaE: -Wshadow signals2
Change-Id: Ib5e6d1e75322dad23f4bb379b8db6dfa4bf18bb0
diff --git a/external/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
index e57a4bd..f1cee17 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -103,6 +103,7 @@ boost_patches += boost.auto_link.patch
boost_patches += boost.std.move.patch
boost_patches += boost.wunused.patch
boost_patches += boost.wdeprecated-auto_ptr.patch.0
+boost_patches += boost.signal2.Wshadow.warnings.patch
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/external/boost/boost.signal2.Wshadow.warnings.patch
b/external/boost/boost.signal2.Wshadow.warnings.patch
new file mode 100644
index 0000000..96db621
--- /dev/null
+++ b/external/boost/boost.signal2.Wshadow.warnings.patch
@@ -0,0 +1,15 @@
+--- misc/boost_1_44_0/boost/signals2/detail/slot_template.hpp
++++ misc/build/boost_1_44_0/boost/signals2/detail/slot_template.hpp
+@@ -117,10 +117,10 @@
+ track_signal(signal);
+ return *this;
+ }
+- BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)& track(const
slot_base &slot)
++ BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)& track(const
slot_base &slotitem)
+ {
+ tracked_container_type::const_iterator it;
+- for(it = slot.tracked_objects().begin(); it !=
slot.tracked_objects().end(); ++it)
++ for(it = slotitem.tracked_objects().begin(); it !=
slotitem.tracked_objects().end(); ++it)
+ {
+ _tracked_objects.push_back(*it);
+ }
commit c929930177b73c53718ba9e49b3c2c79109ee3e2
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Sep 14 16:39:27 2014 +0100
DBG_ASSERT -> assert where we go on to deref the testee
Change-Id: Id38a9e2e0ca0b1c52cb3306adf77eb43d710c9c6
diff --git a/basctl/source/basicide/bastype3.cxx
b/basctl/source/basicide/bastype3.cxx
index d48608d..0847553 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -201,9 +201,9 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry*
pEntry )
for ( size_t n = 0; n < aEntries.size(); n++ )
{
SvTreeListEntry* pLE = aEntries[n];
- DBG_ASSERT( pLE, "Can not find entry in array" );
+ assert(pLE && "Can not find entry in array");
Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
- DBG_ASSERT( pBE, "The data in the entry not found!" );
+ assert(pBE && "The data in the entry not found!");
OUString aName( GetEntryText( pLE ) );
switch ( pBE->GetType() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
