[Libreoffice-commits] .: 2 commits - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |2 ++ sc/source/ui/namedlg/namemgrtable.cxx |2 ++ 2 files changed, 4 insertions(+) New commits: commit cb2c9eb114d3a76096fd404d733f86702246b60e Author: Markus Mohrhard Date: Mon Mar 26 05:03:52 2012 +0200 prevent update during init in name dlgs, related fdo#45679 diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index d806d3b..6b52369 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -127,6 +127,7 @@ void ScRangeManagerTable::GetLine(ScRangeNameLine& rLine, SvLBoxEntry* pEntry) void ScRangeManagerTable::Init() { +SetUpdateMode(false); Clear(); for (boost::ptr_map::const_iterator itr = mrRangeMap.begin(); itr != mrRangeMap.end(); ++itr) @@ -147,6 +148,7 @@ void ScRangeManagerTable::Init() } } } +SetUpdateMode(true); } const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLine) commit bd20b48795df0e23ac76d516d56366250157515f Author: Markus Mohrhard Date: Mon Mar 26 04:58:47 2012 +0200 prevent update during init in new autofilter dlg, fdo#45679 diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index fc6dd9a..6db410c 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1164,6 +1164,7 @@ void ScCheckListMenuWindow::initMembers() { size_t n = maMembers.size(); size_t nVisMemCount = 0; +maChecks.SetUpdateMode(false); for (size_t i = 0; i < n; ++i) { maChecks.InsertEntry(maMembers[i].maName); @@ -1188,6 +1189,7 @@ void ScCheckListMenuWindow::initMembers() maChkToggleAll.SetState(STATE_DONTKNOW); mePrevToggleAllState = STATE_DONTKNOW; } +maChecks.SetUpdateMode(true); } void ScCheckListMenuWindow::setConfig(const Config& rConfig) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/inc sc/qa sc/source
sc/inc/dociter.hxx | 70 - sc/qa/extras/macros-test.cxx | 33 +-- sc/qa/unit/subsequent_filters-test.cxx |2 sc/source/core/data/dociter.cxx| 92 - 4 files changed, 85 insertions(+), 112 deletions(-) New commits: commit 549a68159c3faa7bc698cd980c5c589931643549 Author: Markus Mohrhard Date: Mon Mar 26 03:10:24 2012 +0200 sal_Bool -> bool in dociter.[ch]xx diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index febd041..79495e1 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -73,15 +73,15 @@ private: SCSIZE nColPos; SCSIZE nAttrPos; -sal_BoolGetThis(); -sal_BoolGetThisCol(); +boolGetThis(); +boolGetThisCol(); public: ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable, SCTAB nEndTable ); ~ScDocumentIterator(); -sal_BoolGetFirst(); -sal_BoolGetNext(); +boolGetFirst(); +boolGetNext(); ScBaseCell* GetCell(); const ScPatternAttr*GetPattern(); @@ -109,27 +109,27 @@ private: SCROW nNextRow; SCROW nAttrEndRow; short nNumFmtType; -sal_BoolbNumValid; -sal_BoolbSubTotal; -sal_BoolbNextValid; -sal_BoolbCalcAsShown; -sal_BoolbTextAsZero; +boolbNumValid; +boolbSubTotal; +boolbNextValid; +boolbCalcAsShown; +boolbTextAsZero; -sal_BoolGetThis(double& rValue, sal_uInt16& rErr); +boolGetThis(double& rValue, sal_uInt16& rErr); public: ScValueIterator(ScDocument* pDocument, -const ScRange& rRange, sal_Bool bSTotal = false, -sal_Bool bTextAsZero = false ); +const ScRange& rRange, bool bSTotal = false, +bool bTextAsZero = false ); voidGetCurNumFmtInfo( short& nType, sal_uLong& nIndex ); /// Does NOT reset rValue if no value found! -sal_BoolGetFirst(double& rValue, sal_uInt16& rErr); +boolGetFirst(double& rValue, sal_uInt16& rErr); /// Does NOT reset rValue if no value found! -sal_BoolGetNext(double& rValue, sal_uInt16& rErr) +boolGetNext(double& rValue, sal_uInt16& rErr) { return bNextValid ? ( bNextValid = false, rValue = fNextValue, rErr = 0, nRow = nNextRow, -++nColRow, bNumValid = false, sal_True ) +++nColRow, bNumValid = false, true ) : ( ++nRow, GetThis(rValue, rErr) ); } }; @@ -233,16 +233,16 @@ private: SCROW nRow; SCTAB nTab; SCSIZE nColRow; -sal_BoolbSubTotal; +boolbSubTotal; ScBaseCell* GetThis(); public: ScCellIterator(ScDocument* pDocument, SCCOL nSCol, SCROW nSRow, SCTAB nSTab, SCCOL nECol, SCROW nERow, SCTAB nETab, - sal_Bool bSTotal = false); + bool bSTotal = false); ScCellIterator(ScDocument* pDocument, - const ScRange& rRange, sal_Bool bSTotal = false); + const ScRange& rRange, bool bSTotal = false); ScBaseCell* GetFirst(); ScBaseCell* GetNext(); SCCOL GetCol() const { return nCol; } @@ -281,8 +281,8 @@ private: SCROW nAttrEndRow; sal_uInt8nStopOnMismatch; sal_uInt8nTestEqualCondition; -sal_BoolbAdvanceQuery; -sal_BoolbIgnoreMismatchOnLeadingStrings; +boolbAdvanceQuery; +boolbIgnoreMismatchOnLeadingStrings; ScBaseCell* GetThis(); @@ -299,7 +299,7 @@ private: public: ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, -const ScQueryParam& aParam, sal_Bool bMod = true); +const ScQueryParam& aParam, bool bMod = true); // for bMod = FALSE the QueryParam has to be filled // (bIsString) ScBaseCell* GetFirst(); @@ -309,7 +309,7 @@ public:
[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtftok/data/fdo46955.rtf |1 + sw/qa/extras/rtftok/rtftok.cxx|2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit da1a73fa0b3e5baf535333c0b344be2d3cb46e4f Author: Miklos Vajna Date: Sun Mar 25 23:00:45 2012 +0200 rtftok: added missing test document diff --git a/sw/qa/extras/rtftok/data/fdo46955.rtf b/sw/qa/extras/rtftok/data/fdo46955.rtf new file mode 100644 index 000..4e3ddda --- /dev/null +++ b/sw/qa/extras/rtftok/data/fdo46955.rtf @@ -0,0 +1 @@ +{\rtf1 \caps caps\par} diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx index 59390a5..472e775 100644 --- a/sw/qa/extras/rtftok/rtftok.cxx +++ b/sw/qa/extras/rtftok/rtftok.cxx @@ -89,7 +89,7 @@ public: CPPUNIT_TEST(testN751020); CPPUNIT_TEST(testFdo47326); CPPUNIT_TEST(testFdo47036); -//CPPUNIT_TEST(testFdo46955); +CPPUNIT_TEST(testFdo46955); #endif CPPUNIT_TEST_SUITE_END(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in solenv/gbuild
config_host.mk.in |1 + configure.in | 22 ++ solenv/gbuild/Tempfile.mk |7 +++ 3 files changed, 30 insertions(+) New commits: commit e00cb3336f3f6ad802173f90fd93a120b8c95b52 Author: Norbert Thiebaud Date: Sun Mar 25 12:45:24 2012 -0500 use $(file in gbuild when available diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk index e7e9279..87f582b 100644 --- a/solenv/gbuild/Tempfile.mk +++ b/solenv/gbuild/Tempfile.mk @@ -1,4 +1,10 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +ifeq ($(HAVE_GNUMAKE_FILE_FUNC),YES) +define var2file +$(file >$(1),$(3)) +endef +else # Write string to temporary file by chopping into pieces that # fit the commandline # parameters: filename, maxitems (for one write), string @@ -16,5 +22,6 @@ $(foreach item,$(3),$(eval gb_var2file_curblock += $(item) gb_var2file_curblock := )) endef +endif # vim: set noet sw=4 ts=4: commit fd83e6cb19bf20bee89759ca7d70ed667ccd334e Author: Norbert Thiebaud Date: Sun Mar 25 12:45:04 2012 -0500 detect of gnumake support $(file function $(file is a new function that landed in gnu-make cvs it allow to write a makefile variable directly into a file bypassing the usual command line size limitiation diff --git a/config_host.mk.in b/config_host.mk.in index 945e130..c9103f0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -188,6 +188,7 @@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@ export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@ export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@ +export HAVE_GNUMAKE_FILE_FUNC@=HAVE_GNUMAKE_FILE_FUNC@ export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@ export HAVE_GETOPT=@HAVE_GETOPT@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@ diff --git a/configure.in b/configure.in index 065c135..8276698 100644 --- a/configure.in +++ b/configure.in @@ -76,6 +76,7 @@ else SRC_ROOT=`pwd` x_Cygwin=[\#] fi + AC_SUBST(SRC_ROOT) AC_SUBST(EXEEXT_FOR_BUILD) AC_SUBST(x_Cygwin) @@ -3682,6 +3683,27 @@ EOF else AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed]) fi + +# find if gnumake support file function +AC_MSG_CHECKING([for GNU support for (file function]) +TESTGMAKEFILEFUNC="`mktemp -d -t tst.XX`" +cat > $TESTGMAKEFILEFUNC/Makefile << EOF +\$(file >test.txt,Success ) + +.PHONY: all +all: + @cat test.txt + +EOF +$GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2 +if test -f $TESTGMAKEFILEFUNC/test.txt ; then +HAVE_GNUMKAE_FILE_FUNC="YES" +AC_MSG_RESULT([yes]) +else +AC_MSG_RESULT([no]) +fi +rm -rf $TESTGMAKEFILEFUNC +AC_SUBST(HAVE_GNUMAKE_FILE_FUNC) AC_SUBST(GNUMAKE) _make_ver_check=`$GNUMAKE --version | grep LibreOffice`; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/inc sw/qa
solenv/inc/gbuildbridge.mk |4 ++-- sw/qa/extras/rtftok/rtftok.cxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 83561ac5bb5200ec87183a951445d9592c37e888 Author: Markus Mohrhard Date: Sun Mar 25 16:31:42 2012 +0200 disable failing test missing test document diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx index 472e775..59390a5 100644 --- a/sw/qa/extras/rtftok/rtftok.cxx +++ b/sw/qa/extras/rtftok/rtftok.cxx @@ -89,7 +89,7 @@ public: CPPUNIT_TEST(testN751020); CPPUNIT_TEST(testFdo47326); CPPUNIT_TEST(testFdo47036); -CPPUNIT_TEST(testFdo46955); +//CPPUNIT_TEST(testFdo46955); #endif CPPUNIT_TEST_SUITE_END(); commit b566229371cb72aaa4511fdaee0b50ce89423095 Author: Matúš Kukan Date: Sun Mar 25 16:31:16 2012 +0200 enable slowcheck for top level make all again diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk index b9b1264..529d6e2 100644 --- a/solenv/inc/gbuildbridge.mk +++ b/solenv/inc/gbuildbridge.mk @@ -34,8 +34,8 @@ TARGET=prj all: .ELIF "$(VERBOSE)"!="" all: - cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) + cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) all slowcheck .ELSE all: - @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) + @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) all slowcheck .END ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/docshell/dbdocfun.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit b138edfab8908cf70c5a90aa9fa2b5dc5675dda7 Author: Markus Mohrhard Date: Sun Mar 25 16:13:05 2012 +0200 WaE: one more newly unused variable diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index bb635bb..13b484a 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1461,7 +1461,6 @@ sal_uLong ScDBDocFunc::RefreshPivotTables(ScDPObject* pDPObj, bool bApi) if (!pDPs) return 0; -ScDPSaveData* pSaveData = pDPObj->GetSaveData(); std::set aRefs; sal_uLong nErrId = pDPs->ReloadCache(pDPObj, aRefs); if (nErrId) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: packimages/CustomTarget_images.mk
packimages/CustomTarget_images.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aaa4dcd65ba05dca07ca79408bd227959242 Author: Matúš Kukan Date: Sun Mar 25 13:08:24 2012 +0200 packimages: missing dependency diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk index de43fb3..d602137 100644 --- a/packimages/CustomTarget_images.mk +++ b/packimages/CustomTarget_images.mk @@ -56,7 +56,7 @@ $(PIIM)/images_%.zip : $(PIIM)/sorted.lst $(PIIM)/commandimagelist.ilst $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) # make sure to have one to keep packing happy -$(PIIM)/images_brand.zip : +$(PIIM)/images_brand.zip :| $(PIIM)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TCH,2) touch $@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild svl/AllLangResTarget_svl.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk
solenv/gbuild/platform/WNT_INTEL_MSC.mk |3 +++ solenv/gbuild/platform/windows.mk |3 --- svl/AllLangResTarget_svl.mk |1 + svl/Library_fsstorage.mk|4 ++-- svl/Library_passwordcontainer.mk|4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) New commits: commit c59beae71273d6c8894f7d6eaff25131d6c124a4 Author: Matúš Kukan Date: Sun Mar 25 12:18:32 2012 +0200 svl: add include path and more add_package_headers diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk index d47b973..40bb46f 100644 --- a/svl/AllLangResTarget_svl.mk +++ b/svl/AllLangResTarget_svl.mk @@ -36,6 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res)) $(eval $(call gb_SrsTarget_set_include,svl/res,\ $$(INCLUDE) \ +-I$(SRCDIR)/svl/inc \ )) $(eval $(call gb_SrsTarget_add_files,svl/res,\ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 4e88d31..77d826c 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -28,11 +28,11 @@ $(eval $(call gb_Library_Library,fsstorage)) +$(eval $(call gb_Library_add_package_headers,fsstorage,svl_inc)) + $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage)) $(eval $(call gb_Library_set_include,fsstorage,\ --I$(SRCDIR)/svl/inc \ --I$(SRCDIR)/svl/inc/svl \ -I$(SRCDIR)/svl/source/inc \ $$(INCLUDE) \ )) diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index bb54153..6ece5a3 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -28,11 +28,11 @@ $(eval $(call gb_Library_Library,passwordcontainer)) +$(eval $(call gb_Library_add_package_headers,passwordcontainer,svl_inc)) + $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) $(eval $(call gb_Library_set_include,passwordcontainer,\ --I$(SRCDIR)/svl/inc \ --I$(SRCDIR)/svl/inc/svl \ -I$(SRCDIR)/svl/source/inc \ $$(INCLUDE) \ )) commit bee6510c0884a939ebb3f167b0c29f911403cd2f Author: Matúš Kukan Date: Sun Mar 25 11:33:03 2012 +0200 fix mingw build, properly set LO_LIB_DIR diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 5f4751c..4ec9a80 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -242,6 +242,9 @@ endif # Helper class +gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin +gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin + gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index b09e4be..7cfe7d8 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -27,9 +27,6 @@ GUI := WNT -gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin -gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin - gb_Helper_get_rcfile = $(1).ini gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XX ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits