Makefile | 1 +
accessibility/CustomTarget_bridge_inc.mk | 2 +-
sw/qa/extras/rtftok/rtftok.cxx | 1 +
sw/source/ui/dialog/uiregionsw.cxx | 15 ++++++---------
sw/source/ui/inc/regionsw.hxx | 4 +++-
unusedcode.easy | 5 -----
6 files changed, 12 insertions(+), 16 deletions(-)
New commits:
commit fc7333c77bad1ddf5baab81a0d93eca43b6804f6
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 1 12:10:35 2012 +0100
make javah work for me with JDK7 under windows
Change-Id: Ie223f6213fea2fc4d9076f693857f4e17c726f54
diff --git a/accessibility/CustomTarget_bridge_inc.mk
b/accessibility/CustomTarget_bridge_inc.mk
index 795c23c..1c5060f 100644
--- a/accessibility/CustomTarget_bridge_inc.mk
+++ b/accessibility/CustomTarget_bridge_inc.mk
@@ -36,6 +36,6 @@ $(ACBI)/WindowsAccessBridgeAdapter.h :| $(ACBI)/.dir \
$(call gb_Jar_get_target,java_uno_accessbridge)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVH,1)
cd $(call gb_JavaClassSet_get_classdir,$(call
gb_Jar_get_classsetname,java_uno_accessbridge)) && \
- javah -classpath . -o $(call gb_Helper_native_path,$@)
org.openoffice.accessibility.WindowsAccessBridgeAdapter
+ javah -classpath "$(call
gb_Helper_native_path,$(OUTDIR)/bin/ridl.jar)$(gb_CLASSPATHSEP)$(call
gb_Helper_native_path,$(OUTDIR)/bin/unoil.jar)$(gb_CLASSPATHSEP)." -o $(call
gb_Helper_native_path,$@)
org.openoffice.accessibility.WindowsAccessBridgeAdapter
# vim: set ts=4 sw=4 et:
commit 299fdae0ee07bc5a44fa77c628813a48508b663a
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 1 09:48:24 2012 +0100
SV_DECL_PTRARR_SORT->boost::ptr_set
Change-Id: I770d684a11347593656edc80d173bc7631d58fd8
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 746cc9d..e35dc9e 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -215,8 +215,6 @@ public:
};
-SV_IMPL_OP_PTRARR_SORT( SectReprArr, SectReprPtr )
-
SectRepr::SectRepr( sal_uInt16 nPos, SwSection& rSect )
: m_SectionData( rSect )
, m_Brush( RES_BACKGROUND )
@@ -585,7 +583,6 @@ SwEditRegionDlg::~SwEditRegionDlg( )
pEntry = aTree.Next( pEntry );
}
- aSectReprArr.DeleteAndDestroy( 0, aSectReprArr.Count() );
delete m_pDocInserter;
}
@@ -870,9 +867,9 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
pEntry = aTree.Next( pEntry );
}
- for(sal_uInt16 i = aSectReprArr.Count(); i; )
+ for (SectReprArr::reverse_iterator aI = aSectReprArr.rbegin(), aEnd =
aSectReprArr.rend(); aI != aEnd; ++aI)
{
- SwSectionFmt* pFmt = aOrigArray[ aSectReprArr[ --i ]->GetArrPos() ];
+ SwSectionFmt* pFmt = aOrigArray[ aI->GetArrPos() ];
sal_uInt16 nNewPos = rDocFmts.GetPos( pFmt );
if( USHRT_MAX != nNewPos )
rSh.DelSectionFmt( nNewPos );
@@ -992,7 +989,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
sal_Bool bRestart = sal_False;
if(pSectRepr->IsSelected())
{
- aSectReprArr.Insert( pSectRepr );
+ aSectReprArr.insert( pSectRepr );
while( (pChild = aTree.FirstChild(pEntry) )!= 0 )
{
// because of the repositioning we have to start at the
beginning again
@@ -1012,7 +1009,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
if ( (pEntry=aTree.FirstSelected()) == 0 )
{
- aConditionFT. Enable(sal_False);
+ aConditionFT. Enable(sal_False);
aConditionED. Enable(sal_False);
aDismiss. Enable(sal_False);
aCurName. Enable(sal_False);
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 1e6ce87..e9a682c 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -52,6 +52,8 @@
#include <svx/paraprev.hxx>
#include <editeng/lrspitem.hxx>
+#include <boost/ptr_container/ptr_set.hpp>
+
class SwWrtShell;
class EditRegionDlg;
@@ -66,7 +68,7 @@ namespace sfx2
*************************************************************************/
class SectRepr;
typedef SectRepr* SectReprPtr;
-SV_DECL_PTRARR_SORT( SectReprArr, SectReprPtr, 0 )
+typedef boost::ptr_set<SectRepr> SectReprArr;
class SwEditRegionDlg : public SfxModalDialog
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 8377f93..519093f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -82,11 +82,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale,
rtl::OUString const&)
-SectReprArr::Insert(SectRepr* const&, unsigned short&)
-SectReprArr::Insert(SectRepr* const*, unsigned short)
-SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short)
-SectReprArr::Remove(SectRepr* const&, unsigned short)
-SectReprArr::Remove(unsigned short, unsigned short)
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
SfxDockingWrapper::GetChildWindowId()
SfxFilterPtrArr::DeleteAndDestroy(unsigned short, unsigned short)
commit aa3df611323d207483d4e122d66f459c2ca50e5c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 1 09:07:55 2012 +0100
Matrix3d::* belongs to some external lib
Change-Id: I2818d75d2698582d4ee13e6d5091865041eda2b8
diff --git a/Makefile b/Makefile
index 3360eb1..e3463fd 100644
--- a/Makefile
+++ b/Makefile
@@ -496,6 +496,7 @@ findunusedcode:
| grep -v ^libvisio:: \
| grep -v ^libwpg:: \
| grep -v ^lucene:: \
+ | grep -v ^Matrix3d:: \
| grep -v ^salhelper:: \
| grep -v ^WP1 \
| grep -v ^WP3 \
commit 56bdceec9c8d2822ceee38f3cc5bff7ff36d3988
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 1 09:06:17 2012 +0100
cppunit test appears to have gotten lost
Change-Id: Ief45ebc79f145c03c5b5967c415b45affffd0ca0
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 055f7ce..82c6010 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -117,6 +117,7 @@ public:
CPPUNIT_TEST(testFdo48356);
CPPUNIT_TEST(testFdo48023);
CPPUNIT_TEST(testFdo48876);
+ CPPUNIT_TEST(testFdo48193);
CPPUNIT_TEST(testFdo44211);
CPPUNIT_TEST(testFdo48037);
#endif
commit 1b8c1ffe8c65d1eac1f50f6c9e66d5a89dade169
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Apr 30 21:14:40 2012 +0100
make these operators well-formed
Change-Id: Ic1a2dad00b7f62e4df380fdef8b271fa94de8558
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index caa4958..746cc9d 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -180,10 +180,10 @@ private:
public:
SectRepr(sal_uInt16 nPos, SwSection& rSect);
- bool operator==(SectRepr& rSectRef) const
+ bool operator==(const SectRepr& rSectRef) const
{ return m_nArrPos == rSectRef.GetArrPos(); }
- bool operator< (SectRepr& rSectRef) const
+ bool operator< (const SectRepr& rSectRef) const
{ return m_nArrPos < rSectRef.GetArrPos(); }
SwSectionData & GetSectionData() { return m_SectionData; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
