RE: build failure
Hi Michael, have taken the drastic step of removing the entire codebase locally Sounds like that should help, or a 'git clean -d -f' or something might save some downloading ;-) though it is a bit drastic too. Guess what: removing my entire local repository, using git clone to create a new one, running autogen followed by make didn't help: from output of make: /home/w.donkers/git/libo/helpcompiler/source/HelpLinker.cxx:38:19: fatal error: expat.h: Bestand of map bestaat niet compilation terminated. make[1]: *** [/home/w.donkers/git/libo/workdir/unxlngi6/CxxObject/helpcompiler/source/HelpLinker.o] from output of make in core/helpcompiler: [build CXX] helpcompiler/source/HelpLinker.cxx S=/home/w.donkers/git/libo O=$S/solver/unxlngi6 W=$S/workdir/unxlngi6 mkdir -p $W/CxxObject/helpcompiler/source/ $W/Dep/CxxObject/helpcompiler/source/ cd /home/w.donkers/git/libo /usr/bin/ccache g++ -DCPPU_ENV=gcc3 -DDBG_UTIL -DINTEL -DLIBO_INTERNAL_ONLY -DLINUX -DOSL_DEBUG_LEVEL=1 -DSAL_LOG_INFO -DSAL_LOG_WARN -DSOLAR_JAVA -DSUPD=410 -DUNIX -DUNX -DX86 -D_DEBUG -D_GLIBCXX_DEBUG -D_PTHREADS -D_REENTRANT -DRTL_USING -DL10N_DLLIMPLEMENTATION -DHELPLINKER_DLLIMPLEMENTATION -DHAVE_CXX0X -DSYSTEM_LIBXML -DHAVE_GCC_VISIBILITY_FEATURE -fvisibility=hidden -Wall -Wendif-labels -Wextra -Wundef -Wunused-macros -fmessage-length=0 -fno-common -pipe -fvisibility-inlines-hidden -fPIC -Wshadow -Woverloaded-virtual -Wnon-virtual-dtor -std=gnu++0x -DEXCEPTIONS_ON -fexceptions -O0 -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline -c $S/helpcompiler/source/HelpLinker.cxx -o $W/CxxObject/helpcompiler/source/HelpLinker.o -MMD -MT $W/CxxObject/helpcompiler/source /HelpLinker.o -MP -MF $W/Dep/CxxObject/helpcompiler/source/HelpLinker.d_ -I$S/helpcompiler/source/ -I$O/inc/external/expat -I$W/UnpackedTarball/boost -I$O/inc/external -I$O/inc -I$S/solenv/inc -I/usr/lib/jvm/java-1.7.0-openjdk/include -I/usr/lib/jvm/java-1.7.0-openjdk/include/linux -I$S/config_host -I$W/UnoApiHeadersTarget/udkapi/normal -I$W/UnoApiHeadersTarget/offapi/normal -I/usr/include/libxml2 -I/usr/include/libxml2 mv $W/Dep/CxxObject/helpcompiler/source/HelpLinker.d_ $W/Dep/CxxObject/helpcompiler/source/HelpLinker.d /home/w.donkers/git/libo/helpcompiler/source/HelpLinker.cxx:38:19: fatal error: expat.h: Bestand of map bestaat niet compilation terminated. make: *** [/home/w.donkers/git/libo/workdir/unxlngi6/CxxObject/helpcompiler/source/HelpLinker.o] Fout these expat.h I found: ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/libraries/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/proto/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/interfaces/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/inline4/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/lib/expat.h My autogen.lastrun says: --with-max-jobs=1 --with-num-cpus=1 --without-junit --disable-mozilla --enable-dbgutil I'm out of options, what should I do next? (I have used this machine for a year and a half now to build and test LibreOffice patches, so it's not as if it has never functioned.) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] code enhancement remove dublicate code
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3279 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3279/1 code enhancement remove dublicate code we add two variables to the class ScGridWindow which will be using in many functions. Change-Id: Ic58e4cc4f9adb40553488d5975111219d8e3d7e8 --- M sc/source/ui/inc/gridwin.hxx M sc/source/ui/view/gridwin.cxx 2 files changed, 116 insertions(+), 175 deletions(-) diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 0909f41..949b7cb 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -114,6 +114,8 @@ private: ScViewData* pViewData; +ScDocument* pScGridDocument; +SCTAB TabNumber; ScSplitPos eWhich; ScHSplitPos eHWhich; ScVSplitPos eVWhich; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 838758d..0ac627b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1,3 +1,4 @@ + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. @@ -428,6 +429,8 @@ mpOOShrink( NULL ), mpAutoFillRect(static_castRectangle*(NULL)), pViewData( pData ), +pScGridDocument( pViewData-GetDocument() ), +TabNumber( pViewData-GetTabNo() ), eWhich( eWhichPos ), pNoteMarker( NULL ), pFilterBox( NULL ), @@ -460,7 +463,7 @@ bIsInPaint( false ), bNeedsRepaint( false ), bAutoMarkVisible( false ), -bListValButton( false ) +nbListValButton( false ) { switch(eWhich) { @@ -555,14 +558,12 @@ { //! gridwin2 ? -ScDocument* pDoc = pViewData-GetDocument(); -SCTAB nTab = pViewData-GetTabNo(); -ScDPObject* pDPObj = pDoc-GetDPAtCursor(nCol, nRow, nTab); +ScDPObject* pDPObj = pScGridDocument-GetDPAtCursor(nCol, nRow, TabNumber); if ( pDPObj nCol 0 ) { // look for the dimension header left of the drop-down arrow sal_uInt16 nOrient = sheet::DataPilotFieldOrientation_HIDDEN; -long nField = pDPObj-GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient ); +long nField = pDPObj-GetHeaderDim( ScAddress( nCol-1, nRow, TabNumber ), nOrient ); if ( nField = 0 nOrient == sheet::DataPilotFieldOrientation_PAGE ) { ScDPSaveData aSaveData( *pDPObj-GetSaveData() ); @@ -657,15 +658,12 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) { -SCTAB nTab = pViewData-GetTabNo(); -ScDocument* pDoc = pViewData-GetDocument(); - -mpAutoFilterPopup.reset(new ScCheckListMenuWindow(this, pDoc)); +mpAutoFilterPopup.reset(new ScCheckListMenuWindow(this, pScGridDocument)); mpAutoFilterPopup-setOKAction(new AutoFilterAction(this, Normal)); mpAutoFilterPopup-setPopupEndAction( -new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab))); +new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, TabNumber))); std::auto_ptrAutoFilterData pData(new AutoFilterData); -pData-maPos = ScAddress(nCol, nRow, nTab); +pData-maPos = ScAddress(nCol, nRow, TabNumber); Point aPos = pViewData-GetScrPos(nCol, nRow, eWhich); long nSizeX = 0; @@ -673,7 +671,7 @@ pViewData-GetMergeSizePixel(nCol, nRow, nSizeX, nSizeY); Rectangle aCellRect(OutputToScreenPixel(aPos), Size(nSizeX, nSizeY)); -ScDBData* pDBData = pDoc-GetDBAtCursor(nCol, nRow, nTab); +ScDBData* pDBData = pScGridDocument-GetDBAtCursor(nCol, nRow, TabNumber); if (!pDBData) return; @@ -696,7 +694,7 @@ // Populate the check box list. bool bHasDates = false; std::vectorScTypedStrData aStrings; -pDoc-GetFilterEntries(nCol, nRow, nTab, true, aStrings, bHasDates); +pScGridDocument-GetFilterEntries(nCol, nRow, TabNumber, true, aStrings, bHasDates); mpAutoFilterPopup-setMemberSize(aStrings.size()); std::vectorScTypedStrData::const_iterator it = aStrings.begin(), itEnd = aStrings.end(); @@ -730,7 +728,7 @@ ScCheckListMenuWindow::Config aConfig; aConfig.mbAllowEmptySet = false; -aConfig.mbRTL = pViewData-GetDocument()-IsLayoutRTL(pViewData-GetTabNo()); +aConfig.mbRTL = pScGridDocument-IsLayoutRTL(TabNumber) ; mpAutoFilterPopup-setConfig(aConfig); mpAutoFilterPopup-launch(aCellRect); } @@ -764,8 +762,6 @@ case SortAscending: case SortDescending: { -ScDocument* pDoc = pViewData-GetDocument(); -SCTAB nTab = pViewData-GetTabNo(); SCCOL nCol = rPos.Col(); ScSortParam aSortParam; pDBData-GetSortParam(aSortParam); @@ -773,8 +769,8 @@ // out of bound return; -
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |4 1 file changed, 4 insertions(+) New commits: commit 35c53bbcc8f0a7b8627a8d5a2e167d76dc52d1c4 Author: David Tardon dtar...@redhat.com Date: Tue Apr 9 08:58:04 2013 +0200 ensure delivery of expat headers Change-Id: I73b5eba6c7cff7b6c45fd1f24197550d8e52f26b diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9957de8..374fef4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -434,6 +434,10 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) +$(call gb_LinkTarget_use_packages,$(1),\ + expat_inc \ +) + $(call gb_LinkTarget_use_static_libraries,$(1),\ $(2) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build failure
Hi, On Tue, Apr 09, 2013 at 08:05:13AM +0200, Winfried Donkers wrote: from output of make: /home/w.donkers/git/libo/helpcompiler/source/HelpLinker.cxx:38:19: fatal error: expat.h: Bestand of map bestaat niet compilation terminated. make[1]: *** [/home/w.donkers/git/libo/workdir/unxlngi6/CxxObject/helpcompiler/source/HelpLinker.o] these expat.h I found: ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/libraries/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/proto/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/interfaces/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/amiga/include/inline4/expat.h ./workdir/unxlngi6/UnpackedTarball/expat/lib/expat.h I'm out of options, what should I do next? Pull :-) It should be fixed by commit 35c53bbcc8f0a7b8627a8d5a2e167d76dc52d1c4 . What happened is that gb_LinkTarget__use_expat for internal expat only depended on the static library, not on the headers. I wonder why my script for finding missing deps has not caught this... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7cd1c10886257f3a6af5e077de9bdc23f1b1c8b6 Author: Andras Timar ati...@suse.com Date: Tue Apr 9 09:18:25 2013 +0200 Updated core Project: help 77f7ec5184335f7fb4e8f63845269a247bb5df31 diff --git a/helpcontent2 b/helpcontent2 index fad1c38..77f7ec5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fad1c3879f6fbdaa13d0849d5e23f671e36e6e2b +Subproject commit 77f7ec5184335f7fb4e8f63845269a247bb5df31 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 6 commits - source/text
source/text/sbasic/shared/01020200.xhp|5 + source/text/sbasic/shared/02/1109.xhp | 21 +++-- source/text/scalc/01/0211.xhp |2 +- source/text/scalc/02/1005.xhp |2 +- source/text/scalc/guide/scenario.xhp |2 +- source/text/shared/00/0402.xhp|2 +- source/text/shared/02/1210.xhp|2 +- source/text/simpress/01/0211.xhp |2 +- source/text/smath/00/0004.xhp |2 +- source/text/swriter/01/0214.xhp |4 ++-- source/text/swriter/01/0215.xhp |4 ++-- source/text/swriter/01/0216.xhp |6 +++--- source/text/swriter/02/1001.xhp |2 +- 13 files changed, 19 insertions(+), 37 deletions(-) New commits: commit 77f7ec5184335f7fb4e8f63845269a247bb5df31 Author: Andras Timar ati...@suse.com Date: Tue Apr 9 09:18:25 2013 +0200 fix broken image links Change-Id: I0990118003f2affd094e5fe6d61fedbfb71b7ca2 diff --git a/source/text/scalc/02/1005.xhp b/source/text/scalc/02/1005.xhp index b0fb60d..4078862 100644 --- a/source/text/scalc/02/1005.xhp +++ b/source/text/scalc/02/1005.xhp @@ -47,7 +47,7 @@ tablerow tablecell colspan= rowspan= paragraph role=paragraph id=par_id3155854 xml-lang=en-US l10n=E -image id=img_id3151116 src=cmd/sc_helpzoomin.png width=0.222inch height=0.222inchalt id=alt_id3151116 xml-lang=en-USIcon/alt +image id=img_id3151116 src=cmd/sc_zoomin.png width=0.222inch height=0.222inchalt id=alt_id3151116 xml-lang=en-USIcon/alt /image/paragraph /tablecell tablecell colspan= rowspan= diff --git a/source/text/simpress/01/0211.xhp b/source/text/simpress/01/0211.xhp index ab49c78..427190e 100644 --- a/source/text/simpress/01/0211.xhp +++ b/source/text/simpress/01/0211.xhp @@ -49,7 +49,7 @@ tablerow tablecell colspan= rowspan= paragraph role=paragraph id=par_id3148729 xml-lang=en-US l10n=CHG -image id=img_id3153034 src=sd/res/imagelst/nv02.png width=0.222inch height=0.222inchalt id=alt_id3153034 xml-lang=en-USIcon/alt +image id=img_id3153034 src=sd/imagelst/nv02.png width=0.222inch height=0.222inchalt id=alt_id3153034 xml-lang=en-USIcon/alt /image/paragraph /tablecell tablecell colspan= rowspan= diff --git a/source/text/smath/00/0004.xhp b/source/text/smath/00/0004.xhp index 16d15b0..876b121 100644 --- a/source/text/smath/00/0004.xhp +++ b/source/text/smath/00/0004.xhp @@ -75,7 +75,7 @@ tablerow tablecell colspan= rowspan= paragraph role=paragraph id=par_id3150743 xml-lang=en-US l10n=E -image id=img_id3163822 src=cmd/sc_helpzoomin.png width=0.1665inch height=0.1665inchalt id=alt_id3163822 xml-lang=en-USIcon/alt +image id=img_id3163822 src=cmd/sc_zoomin.png width=0.1665inch height=0.1665inchalt id=alt_id3163822 xml-lang=en-USIcon/alt /image/paragraph /tablecell tablecell colspan= rowspan= diff --git a/source/text/swriter/01/0214.xhp b/source/text/swriter/01/0214.xhp index bb771f5..b6523a7 100644 --- a/source/text/swriter/01/0214.xhp +++ b/source/text/swriter/01/0214.xhp @@ -85,7 +85,7 @@ tablerow tablecell colspan= rowspan= paragraph role=paragraph id=par_id3155341 xml-lang=en-US l10n=E -image id=img_id3155348 src=res/sc10618.png width=0.222inch height=0.222inchalt id=alt_id3155348 xml-lang=en-USIcon/alt +image id=img_id3155348 src=res/lc06301.png width=0.222inch height=0.222inchalt id=alt_id3155348 xml-lang=en-USIcon/alt /image/paragraph /tablecell tablecell colspan= rowspan= @@ -99,7 +99,7 @@ tablerow tablecell colspan= rowspan= paragraph role=paragraph id=par_id3145117 xml-lang=en-US l10n=E -image id=img_id3149575 src=res/sc10617.png width=0.222inch height=0.222inchalt id=alt_id3149575 xml-lang=en-USIcon/alt +image id=img_id3149575 src=res/lc06300.png width=0.222inch height=0.222inchalt id=alt_id3149575 xml-lang=en-USIcon/alt /image/paragraph /tablecell tablecell colspan= rowspan= diff --git a/source/text/swriter/01/0215.xhp b/source/text/swriter/01/0215.xhp index 9179823..83733d5 100644 --- a/source/text/swriter/01/0215.xhp +++ b/source/text/swriter/01/0215.xhp @@ -58,7 +58,7 @@ tablerow tablecell paragraph role=paragraph id=par_id3150023 xml-lang=en-US l10n=E -image id=img_id3150030 src=res/sc10618.png width=0.2228in height=0.2228inalt id=alt_id3150030 xml-lang=en-USIcon/alt +image id=img_id3150030 src=res/lc06301.png width=0.2228in height=0.2228inalt id=alt_id3150030 xml-lang=en-USIcon/alt /image/paragraph /tablecell tablecell @@ -74,7 +74,7 @@ tablerow tablecell paragraph role=paragraph id=par_id3154029 xml-lang=en-US l10n=E -image id=img_id3154044 src=res/sc10617.png width=0.2228in height=0.2228inalt id=alt_id3154044 xml-lang=en-USIcon/alt +image id=img_id3154044 src=res/lc06300.png width=0.2228in height=0.2228inalt id=alt_id3154044 xml-lang=en-USIcon/alt /image/paragraph /tablecell tablecell diff --git
RE: build failure
Hi David, Pull :-) It should be fixed by commit 35c53bbcc8f0a7b8627a8d5a2e167d76dc52d1c4 . I pulled :-) and am building now. I will report the result (which will take a lot of hours on this machine). What happened is that gb_LinkTarget__use_expat for internal expat only depended on the static library, not on the headers. I wonder why my script for finding missing deps has not caught this... Well, at least my struggles produced something good (your fix), from which everyone will benefit :-) Thanks! Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Rename misleading Sort by Name option to Reverse Sort Order
Stefan Knorr has abandoned this change. Change subject: Rename misleading Sort by Name option to Reverse Sort Order .. Patch Set 1: Abandoned Hi Rafael, sorry, I just assumed something that is not the case, evidently – but then what does this do? And for which languages? -- To view, visit https://gerrit.libreoffice.org/3274 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I60cd912d5319ea3ca8fe612c13ca23f6af6f062e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com Gerrit-Reviewer: Rafael Dominguez venccsra...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - solenv/gdb
solenv/gdb/libreoffice/cppu.py |5 --- solenv/gdb/libreoffice/sw.py | 62 + 2 files changed, 63 insertions(+), 4 deletions(-) New commits: commit 2ffa67f785bc82cb581daadf0c982dc1990bd17d Author: Miklos Vajna vmik...@suse.cz Date: Tue Apr 9 09:25:37 2013 +0200 gdb: pretty-printers for sw::mark::IMark, sw::UnoImplPtr and SwXTextRange Change-Id: I09b9e5a64b1b2630dbccdd9cf4392376b955dbdd diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 532f1c5..1a06139 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -99,6 +99,64 @@ class SwRectPrinter(object): children = [ ( 'point', point), ( 'size', size ) ] return children.__iter__() +class SwIMarkPrinter(object): +'''Prints sw::mark::IMark.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +return %s % (self.typename) + +def children(self): +if str(self.value.dynamic_type) == sw::mark::UnoMark: +unoMark = self.value.cast(self.value.dynamic_type) +pos1 = unoMark['m_pPos1'] +pos2 = unoMark['m_pPos2'] +children = [ ( 'pos1', pos1), ( 'pos2', pos2 ) ] +return children.__iter__() +else: +return self._iterator(self.value) + +class SwXTextRangeImplPrinter(object): +'''Prints SwXTextRange::Impl.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +return %s % (self.typename) + +def children(self): +mark = self.value['m_pMark'].dereference() +children = [('mark', mark)] +return children.__iter__() + +class SwUnoImplPtrPrinter(object): +Prints sw::UnoImplPtr + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +if self.value['m_p']: +return %s %s % (self.typename, self.value['m_p'].dereference()) +else: +return empty %s % (self.typename,) + +class SwXTextRangePrinter(object): +'''Prints SwXTextRange.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +return %s %s % (self.typename, self.value['m_pImpl']) + class BigPtrArrayPrinter(object): '''Prints BigPtrArray.''' @@ -222,6 +280,10 @@ def build_pretty_printers(): printer.add('SwIndex', SwIndexPrinter) printer.add('SwPaM', SwPaMPrinter) printer.add('SwRect', SwRectPrinter) +printer.add('sw::mark::IMark', SwIMarkPrinter) +printer.add('SwXTextRange::Impl', SwXTextRangeImplPrinter) +printer.add('sw::UnoImplPtr', SwUnoImplPtrPrinter) +printer.add('SwXTextRange', SwXTextRangePrinter) def register_pretty_printers(obj): printing.register_pretty_printer(printer, obj) commit 6879db2101f8db185b6eee6bfad755347b28c363 Author: Miklos Vajna vmik...@suse.cz Date: Tue Apr 9 09:24:30 2013 +0200 gdb: get UnoReferencePrinter work again Change-Id: I07d6a24f5c94a115d38ccffde26725b668dab430 diff --git a/solenv/gdb/libreoffice/cppu.py b/solenv/gdb/libreoffice/cppu.py index dd5ff2d..83c4bff 100644 --- a/solenv/gdb/libreoffice/cppu.py +++ b/solenv/gdb/libreoffice/cppu.py @@ -64,7 +64,7 @@ class UnoReferencePrinter(object): iface = self.value['_pInterface'] if iface: try: -impl = iface.cast(_itype).dereference() +impl = iface.cast(iface.dynamic_type).dereference() return '%s to %s' % (self.typename, str(impl)) except: # fallback for potential problem: @@ -74,9 +74,6 @@ class UnoReferencePrinter(object): else: return empty %s % self.typename -def _itype(self): -return self.value.type.template_argument(0).pointer() - class UnoSequencePrinter(object): '''Prints UNO Sequence''' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] remove many libraries from libmerged
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3280 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3280/1 remove many libraries from libmerged Some of them were causing bugs but more importantly it does not make sense to merge so many libraries. Change-Id: I8749c268466ac04cc12450919346b3376d95a07a --- M solenv/gbuild/extensions/pre_MergedLibsList.mk 1 file changed, 3 insertions(+), 69 deletions(-) diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 10e8a36..ac325fa 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -29,114 +29,48 @@ # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ - analysis \ avmedia \ - $(if $(filter unx,$(GUIBASE)),basebmp) \ - $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ canvastools \ - chartcore \ configmgr \ cppcanvas \ - ctl \ - cui \ - date \ - $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ deploymentmisc \ - $(if $(filter unx,$(GUIBASE)),desktop_detector) \ desktopbe1 \ + $(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ editeng \ - embobj \ - evtatt \ - fastsax \ - $(call gb_Helper_optional,DBCONNECTIVITY,file) \ fileacc \ filterconfig \ - $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ - for \ - forui \ - $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ fsstorage \ fwe \ fwi \ fwk \ - fwl \ - fwm \ $(call gb_Helper_optional,DESKTOP,helplinker) \ - hwp \ - hyphen \ + i18npool \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),juh) \ - $(if $(filter-out IOS,$(OS)),jvmaccess) \ - jvmfwk \ lng \ - lnth \ localebe1 \ - localedata_en \ - localedata_es \ - localedata_euro \ - localedata_others \ msfilter \ - $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ - $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ - oox \ package2 \ - pricing \ - $(call gb_Helper_optional,PYUNO,pythonloader) \ - $(call gb_Helper_optional,PYUNO,pyuno) \ - $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ - $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ - $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ sax \ sb \ - sc \ - $(if $(DISABLE_SCRIPTING),,scriptframe) \ - scui \ - scfilt \ - sd \ - sdui \ sfx \ sofficeapp \ - $(if $(filter-out IOS,$(OS)),solver) \ sot \ - spell \ spl \ - $(if $(DISABLE_SCRIPTING),,stringresource) \ - subsequenttest \ svl \ svt \ svx \ svxcore \ - sw \ - swui \ - swd \ - test \ - textfd \ tk \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ - ucpcmis1 \ ucpfile1 \ - unotest \ utl \ uui \ - $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ - $(if $(filter-out IOS,$(OS)),wpftdraw) \ - $(if $(filter-out IOS,$(OS)),wpftwriter) \ - writerfilter \ - xmlfa \ - xmlfd \ xmlscript \ - xmlsecurity \ xo \ - xstor + xstor \ endif -- To view, visit https://gerrit.libreoffice.org/3280 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8749c268466ac04cc12450919346b3376d95a07a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cliureversion.mk not found build problem
Hi, On Mon, Apr 08, 2013 at 05:23:05PM +0200, Thomas Arnhold wrote: : ERROR: Include file cliureversion.mk not found! : ADD_INCLUDE_FILES = cliureversion.mk,clioootypesversion.mk at /home/thomas/libo/solenv/bin/modules/installer/worker.pm line 579. Does solver/*/bin/cliureversion.mk exist? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/edit/texteng.cxx | 291 +++- 1 file changed, 126 insertions(+), 165 deletions(-) New commits: commit 51fddc6c52d04a2dccdfb7d04f8dd0455e8c4b95 Author: Christian M. Heller christian.helle...@gmail.com Date: Sun Apr 7 12:45:37 2013 -0400 fdo#39468 Translate German comments V2 - source/edit/texteng.cxx Change-Id: Ifc02535cecc24d9362d2534784c659ee8705f751 diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index b03924c..db76523 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -61,9 +61,6 @@ using namespace ::com::sun::star::uno; using namespace ::rtl; -// - -// (-) class TextEngine -// - TextEngine::TextEngine() { mpDoc = 0; @@ -118,7 +115,7 @@ TextEngine::~TextEngine() delete mpIdleFormatter; delete mpDoc; delete mpTEParaPortions; -delete mpViews; // nur die Liste, nicht die Vies +delete mpViews; // only the list, not the Views delete mpRefDev; delete mpUndoManager; delete mpIMEInfos; @@ -188,8 +185,8 @@ void TextEngine::SetFont( const Font rFont ) else maTextColor = rFont.GetColor(); -// Wegen Selektion keinen Transparenten Font zulassen... -// (Sonst spaeter in ImplPaint den Hintergrund anders loeschen...) +// Do not allow transparent fonts because of selection +// (otherwise delete the background in ImplPaint later differently) maFont.SetTransparent( sal_False ); // Tell VCL not to use the font color, use text color from OutputDevice maFont.SetColor( COL_TRANSPARENT ); @@ -336,7 +333,7 @@ sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent rKeyEvent ) case KEYFUNC_CUT: case KEYFUNC_PASTE: bDoesChange = sal_True; break; -default:// wird dann evtl. unten bearbeitet. +default:// might get handled below eFunc = KEYFUNC_DONTKNOW; } } @@ -421,7 +418,7 @@ String TextEngine::GetText( const TextSelection rSel, LineEnd aSeparator ) cons sal_uInt16 nEndPos = pNode-GetText().Len(); if ( nNode == nStartPara ) nStartPos = aSel.GetStart().GetIndex(); -if ( nNode == nEndPara ) // kann auch == nStart sein! +if ( nNode == nEndPara ) // may also be == nStart! nEndPos = aSel.GetEnd().GetIndex(); aText += pNode-GetText().Copy( nStartPos, nEndPos-nStartPos ); @@ -450,7 +447,7 @@ void TextEngine::SetText( const OUString rText ) ImpRemoveText(); sal_Bool bUndoCurrentlyEnabled = IsUndoEnabled(); -// Der von Hand reingesteckte Text kann nicht vom Anwender rueckgaengig gemacht werden. +// the manually inserted text cannot be reversed by the user EnableUndo( sal_False ); TextPaM aStartPaM( 0, 0 ); @@ -465,13 +462,12 @@ void TextEngine::SetText( const OUString rText ) TextView* pView = (*mpViews)[ nView ]; pView-ImpSetSelection( aEmptySel ); -// Wenn kein Text, dann auch Kein FormatUpdate -// = Der Text bleibt stehen. +// if no text, then no FormatUpdate = the text remains if ( rText.isEmpty() GetUpdateMode() ) pView-Invalidate(); } -if( rText.isEmpty() ) // sonst muss spaeter noch invalidiert werden, !bFormatted reicht. +if( rText.isEmpty() ) // otherwise needs invalidation later; !bFormatted is sufficient mnCurTextHeight = 0; FormatAndUpdate(); @@ -483,7 +479,7 @@ void TextEngine::SetText( const OUString rText ) void TextEngine::CursorMoved( sal_uLong nNode ) { -// Leere Attribute loeschen, aber nur, wenn Absatz nicht leer! +// delete empty attribute; but only if paragraph is not empty! TextNode* pNode = mpDoc-GetNodes().GetObject( nNode ); if ( pNode pNode-GetCharAttribs().HasEmptyAttribs() pNode-GetText().Len() ) pNode-GetCharAttribs().DeleteEmptyAttribs(); @@ -494,11 +490,11 @@ void TextEngine::ImpRemoveChars( const TextPaM rPaM, sal_uInt16 nChars, SfxUndo DBG_ASSERT( nChars, ImpRemoveChars: 0 Chars?! ); if ( IsUndoEnabled() !IsInUndo() ) { -// Attribute muessen hier vorm RemoveChars fuer UNDO gesichert werden! +// attributes have to be saved for UNDO before RemoveChars! TextNode* pNode = mpDoc-GetNodes().GetObject( rPaM.GetPara() ); XubString aStr( pNode-GetText().Copy( rPaM.GetIndex(), nChars ) ); -// Pruefen, ob Attribute geloescht oder geaendert werden: +// check if attributes are being deleted or changed sal_uInt16 nStart = rPaM.GetIndex(); sal_uInt16 nEnd = nStart + nChars; for ( sal_uInt16 nAttr = pNode-GetCharAttribs().Count(); nAttr; ) @@ -526,7 +522,7 @@ TextPaM
[PUSHED] fdo#39468 Translate German comments V2 - source/edit/texteng...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3237 -- To view, visit https://gerrit.libreoffice.org/3237 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc02535cecc24d9362d2534784c659ee8705f751 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - helpcompiler/Executable_helpindexer.mk helpcompiler/Executable_helplinker.mk helpcompiler/Library_helplinker.mk l10ntools/Executable_helpex.mk Library_merge
Library_merged.mk |2 +- RepositoryExternal.mk | 16 helpcompiler/Executable_helpindexer.mk |2 +- helpcompiler/Executable_helplinker.mk |2 +- helpcompiler/Library_helplinker.mk |2 +- l10ntools/Executable_helpex.mk |2 +- pyuno/source/module/pyuno_module.cxx |2 +- sax/Library_expwrap.mk |2 +- sax/Library_fastsax.mk |2 +- shell/Library_ooofilt.mk |2 +- shell/Library_ooofilt_x64.mk |2 +- shell/Library_propertyhdl.mk |2 +- shell/Library_propertyhdl_x64.mk |2 +- shell/Library_recentfile.mk|2 +- shell/Library_shlxthdl.mk |2 +- shell/Library_shlxthdl_x64.mk |2 +- shell/StaticLibrary_shlxthandler_common.mk |2 +- shell/StaticLibrary_shlxthandler_common_x64.mk |2 +- shell/StaticLibrary_xmlparser.mk |2 +- shell/StaticLibrary_xmlparser_x64.mk |2 +- vcl/Library_vcl.mk |2 +- xmlhelp/Library_tvhlp1.mk |2 +- xmlhelp/Library_ucpchelp1.mk |2 +- 23 files changed, 30 insertions(+), 30 deletions(-) New commits: commit 542cf6d9eaa7d3a9875e0cd258c883a69577040f Author: David Tardon dtar...@redhat.com Date: Tue Apr 9 09:41:35 2013 +0200 unbreak windows tinderbox Change-Id: Ic777267cb86acdb62b53a7b324e1423b7c6b67c5 diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 62851c4..4403e1a 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -344,7 +344,7 @@ static PyObject* initPoniesMode( if (!outdir) { abort(); } OStringBuffer libname(outdir); libname.append(/lib/); -libname.append(SAL_DLLPREFIX test SAL_DLLEXTENSION); +libname.append(SAL_MODULENAME(test)); oslModule const mod( osl_loadModuleAscii(libname.getStr(), SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL) ); if (!mod) { abort(); } commit 51149806f890e8181c016713cff30bc0c9c06450 Author: David Tardon dtar...@redhat.com Date: Tue Apr 9 09:22:20 2013 +0200 rename expat external to 'expat' expat_utf16 is long gone, so there is no need to fool around with expat_utf8. Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89 diff --git a/Library_merged.mk b/Library_merged.mk index ec83497..5b501d5 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -56,7 +56,7 @@ $(eval $(call gb_Library_use_externals,merged,\ cppunit \ cups \ curl \ - expat_utf8 \ + expat \ hunspell \ hyphen \ icui18n \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 374fef4..d4e4426 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -406,8 +406,8 @@ endif # SYSTEM_MYTHES ifeq ($(SYSTEM_EXPAT),YES) -define gb_LinkTarget__use_expat -$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter)) +define gb_LinkTarget__use_expat_impl +$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter)) $(call gb_LinkTarget_add_defs,$(1),\ -DSYSTEM_EXPAT \ @@ -426,8 +426,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ expat_x64 \ )) -define gb_LinkTarget__use_expat -$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter)) +define gb_LinkTarget__use_expat_impl +$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter)) $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/external/expat \ @@ -452,13 +452,13 @@ endef endif # SYSTEM_EXPAT -define gb_LinkTarget__use_expat_utf8 -$(call gb_LinkTarget__use_expat,$(1),expat) +define gb_LinkTarget__use_expat +$(call gb_LinkTarget__use_expat_impl,$(1),expat) endef -define gb_LinkTarget__use_expat_utf8_x64 -$(call gb_LinkTarget__use_expat,$(1),expat_x64) +define gb_LinkTarget__use_expat_x64 +$(call gb_LinkTarget__use_expat_impl,$(1),expat_x64) endef diff --git a/helpcompiler/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk index 08faae7..8b723e2 100644 --- a/helpcompiler/Executable_helpindexer.mk +++ b/helpcompiler/Executable_helpindexer.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Executable_use_libraries,HelpIndexer,\ )) $(eval $(call gb_Executable_use_externals,HelpIndexer,\ -expat_utf8 \ +expat \ libxslt \ libxml2 \ clucene \ diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk index 1ab99a3..07bc9ac 100644 --- a/helpcompiler/Executable_helplinker.mk +++ b/helpcompiler/Executable_helplinker.mk @@ -37,7 +37,7 @@ $(eval $(call
[PATCH] Converted Insert - Names - manage widget.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3281 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3281/1 Converted Insert - Names - manage widget. Change-Id: I8f07e1a37f3aa25721704e513ef1aa3092e3 --- A sc/uiconfig/scalc/ui/managenamesdialog.ui 1 file changed, 422 insertions(+), 0 deletions(-) diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui new file mode 100644 index 000..4d11b0e --- /dev/null +++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui @@ -0,0 +1,422 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkWindow id=Manage Names +property name=can_focusFalse/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkBox id=box6 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkBox id=box7 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=spacing100/property +child + object class=GtkLabel id=label5 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesName/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkLabel id=label6 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesRange/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkLabel id=label7 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesScope/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkScrolledWindow id=scrolledwindow1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=shadow_typein/property +child + placeholder/ +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkGrid id=grid2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=row_spacing6/property +property name=column_spacing30/property +child + object class=GtkLabel id=label2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesName/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child
Re: cliureversion.mk not found build problem
On 09.04.2013 09:35, David Tardon wrote: Hi, On Mon, Apr 08, 2013 at 05:23:05PM +0200, Thomas Arnhold wrote: : ERROR: Include file cliureversion.mk not found! : ADD_INCLUDE_FILES = cliureversion.mk,clioootypesversion.mk at /home/thomas/libo/solenv/bin/modules/installer/worker.pm line 579. Does solver/*/bin/cliureversion.mk exist? Yes: solver/unxlngi6/bin/cliureversion.mk Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Drop unused variable
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3282 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3282/1 Drop unused variable Change-Id: I6d0d561b6c3f1a6eb3ab237538885e5c48820e6e --- M sw/source/ui/inc/pggrid.hxx 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index eda617e..8159126 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -30,7 +30,6 @@ */ class SwTextGridPage: public SfxTabPage { -FixedLine* m_pGridTypeFL; RadioButton* m_pNoGridRB; RadioButton* m_pLinesGridRB; RadioButton* m_pCharsGridRB; -- To view, visit https://gerrit.libreoffice.org/3282 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d0d561b6c3f1a6eb3ab237538885e5c48820e6e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/source sfx2/source
framework/source/services/frame.cxx |2 +- sfx2/source/appl/sfxhelp.cxx|4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 9ca23ee5e776b80d1e8fcac4c3897cc0d0569bc3 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 10:24:32 2013 +0100 make help work again This is a regression from b248624126c271c88381d3dad6e04fc954f65779 I suspect there might be more. Change-Id: I9ffbcfb8d32b0b0b4193a86eee90d0a5f481de11 diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 44d30d0..e651994 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1772,7 +1772,7 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Referencecss::uno::XInter /* SAFE { */ WriteGuard aWriteLock( m_aLock ); -m_xLayoutManager.set(p1, css::uno::UNO_QUERY_THROW); +m_xLayoutManager.set(p1, css::uno::UNO_QUERY); aWriteLock.unlock(); /* } SAFE */ } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index d37f618..fad7046 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -534,7 +534,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference XFrame2 rHelpTask , // otherwise - create new help task Reference XFrame2 xHelpTask( xDesktop-findFrame( OFFICE_HELP_TASK, FrameSearchFlag::TASKS | FrameSearchFlag::CREATE), -UNO_QUERY_THROW); +UNO_QUERY); if (!xHelpTask.is()) return 0; @@ -755,7 +755,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString rURL, const Window* pWindow, const // search must be done here; search one desktop level could return an arbitraty frame Reference XFrame2 xHelp( xDesktop-findFrame( OFFICE_HELP_TASK, FrameSearchFlag::CHILDREN), -UNO_QUERY_THROW); +UNO_QUERY); Reference XFrame xHelpContent = xDesktop-findFrame( OUString(OFFICE_HELP), FrameSearchFlag::CHILDREN); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/selectrange.ui | 125 1 file changed, 125 insertions(+) New commits: commit b2867b01418fc7a1e80589224345d2b224bcf3fc Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Mon Apr 8 14:30:45 2013 +0300 selectrange.ui Widget Change-Id: I110d38248975e21dd454c73c787c16d7e94b473c Reviewed-on: https://gerrit.libreoffice.org/3275 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/ui/selectrange.ui b/sc/uiconfig/scalc/ui/selectrange.ui new file mode 100644 index 000..6f46771 --- /dev/null +++ b/sc/uiconfig/scalc/ui/selectrange.ui @@ -0,0 +1,125 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=SelectRangeDialog +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesSelect Database Range/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=SelectRange +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok1 +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel1 +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help1 +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkLabel id=selectRange +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesRanges/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkScrolledWindow id=scrolledwindow1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=shadow_typein/property +child + object class=GtkTreeView id=treeview1 +property name=visibleTrue/property +property name=can_focusTrue/property +child internal-child=selection + object class=GtkTreeSelection
[PUSHED] selectrange.ui Widget
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3275 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3275 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I110d38248975e21dd454c73c787c16d7e94b473c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Unused variable s in exceptiontree.cxx
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3283 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3283/1 Unused variable s in exceptiontree.cxx Change-Id: Ib825817ea5d77ba2ead421daa0e7f2b708d156a1 --- M codemaker/source/codemaker/exceptiontree.cxx 1 file changed, 0 insertions(+), 2 deletions(-) diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index f8dd868..e182f14 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -59,8 +59,6 @@ } list.push_back(n); rtl::Reference unoidl::Entity ent; -codemaker::UnoType::Sort s = manager-getSort(b2u(n), ent); -assert(s == codemaker::UnoType::SORT_EXCEPTION_TYPE); n = u2b( static_cast unoidl::ExceptionTypeEntity * (ent.get())- getDirectBase()); -- To view, visit https://gerrit.libreoffice.org/3283 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib825817ea5d77ba2ead421daa0e7f2b708d156a1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: plans with libmerged
Hi guys, On Mon, 2013-04-08 at 17:08 -0400, Peter Foley wrote: On Mon, Apr 8, 2013 at 10:19 AM, Tomáš Chvátal tomas.chva...@gmail.com wrote: This switch all/core/no sound pretty cool. Libreoffice is currently built with mergedlib enabled on opensuse and gentoo in production and there are no visible issues (currently master fails tests [so i turned off my tinderbox after having it fail for a week] but hey the app still runs fine). Right now libmerged seems to be causing very strange crashes in the unit tests. I'm trying to figure out what exactly is going wrong, but any help would be appreciated. IMHO we really do need a small re-think here; the primary use-case I was aware of for libmerged is to enable more LTO, and faster start-up. I rather suspect that merging all the components: base, writer, calc etc. into the libmerged may not help startup on lots of hardware; so I'm curious as to the plan there. If we break the unit tests by doing that, almost certainly we'll break the run-time functionality too :-) so - prolly rather better to back that stuff out until it works. So I'll merge this: https://gerrit.libreoffice.org/3280 Peter - any chance of tweaking your use-case to include those libraries that you want merged in there (assuming you do) conditionally with a non-default configure switch as Matus suggests ? I believe Matus is trying to get this into a more reliable and ship-able state for Raspberry Pi, so until we've nailed the regressions and thought this through some more, I'd prefer to take a step back and re-think if that's ok ? Peter - did you get any further with the graphics filters ? at some stage, I suspect that they are doing some oslLoadModule to load the graphics driver pieces - that might be going wrong. If there is some symbol overlap problem, you could try to find that like this: for a in *.so; do echo $a ; readelf -s $a --wide | grep -v UND | cut -c52-; done /tmp/symbols.txt sort /tmp/symbols.txt | uniq -c | sort -n | less I'd start by using readelf --dyn-syms perhaps and then use -s if that fails; of course you want to reverse grep _ZThn and _ZTV etc. and manually ignore inlined methods which are expected to be duplicated but are hopefully the same everywhere (due to the ODR). Beyond that - debugging, and careful unwinding back to what is going wrong with image load/export would be good - I'd use gdb to see where your pointer got corrupted (IIRC I gave some pointers to that in the past on the list?). HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - solenv/gdb
solenv/gdb/libreoffice/sw.py | 49 +++ 1 file changed, 49 insertions(+) New commits: commit 001da6553adfcb160a08225fdd6aea478bd7dea9 Author: Miklos Vajna vmik...@suse.cz Date: Tue Apr 9 11:55:14 2013 +0200 pretty-print SwXTextCursor Change-Id: I98bb5cbcde93a408c44f4f985c06532ab0a37652 diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index f5cdc29..21e8ea8 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -154,6 +154,21 @@ class SwXTextRangeImplPrinter(object): children = [('mark', mark)] return children.__iter__() +class SwXTextCursorImplPrinter(object): +'''Prints SwXTextCursor::Impl.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +return %s % (self.typename) + +def children(self): +registeredIn = self.value['pRegisteredIn'].dereference() +children = [('registeredIn', registeredIn)] +return children.__iter__() + class SwUnoImplPtrPrinter(object): Prints sw::UnoImplPtr @@ -177,6 +192,16 @@ class SwXTextRangePrinter(object): def to_string(self): return %s %s % (self.typename, self.value['m_pImpl']) +class SwXTextCursorPrinter(object): +'''Prints SwXTextCursor.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +return %s %s % (self.typename, self.value['m_pImpl']) + class BigPtrArrayPrinter(object): '''Prints BigPtrArray.''' @@ -306,6 +331,8 @@ def build_pretty_printers(): printer.add('sw::UnoImplPtr', SwUnoImplPtrPrinter) printer.add('SwXTextRange', SwXTextRangePrinter) printer.add('SwModify', SwModifyPrinter) +printer.add('SwXTextCursor::Impl', SwXTextCursorImplPrinter) +printer.add('SwXTextCursor', SwXTextCursorPrinter) def register_pretty_printers(obj): printing.register_pretty_printer(printer, obj) commit 626605218359df6c3f9274e57cb5ef0886b890fc Author: Miklos Vajna vmik...@suse.cz Date: Tue Apr 9 11:36:51 2013 +0200 pretty-print SwUnoCrsr Change-Id: Ia79e582002c92591694815580eff905b864ea6c5 diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 1a06139..f5cdc29 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -83,6 +83,9 @@ class SwPaMPrinter(object): children.append((prev, prev)) return children.__iter__() +class SwUnoCrsrPrinter(SwPaMPrinter): +'''Prints SwUnoCrsr.''' + class SwRectPrinter(object): '''Prints SwRect.''' @@ -119,6 +122,23 @@ class SwIMarkPrinter(object): else: return self._iterator(self.value) +class SwModifyPrinter(object): +'''Prints SwModify.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +return %s % (self.typename) + +def children(self): +if str(self.value.dynamic_type) == SwUnoCrsr: +unoCrsr = self.value.cast(self.value.dynamic_type) +return SwUnoCrsrPrinter(self.typename, unoCrsr).children() +else: +return self._iterator(self.value) + class SwXTextRangeImplPrinter(object): '''Prints SwXTextRange::Impl.''' @@ -279,11 +299,13 @@ def build_pretty_printers(): printer.add('SwNodeIndex', SwNodeIndexPrinter) printer.add('SwIndex', SwIndexPrinter) printer.add('SwPaM', SwPaMPrinter) +printer.add('SwUnoCrsr', SwUnoCrsrPrinter) printer.add('SwRect', SwRectPrinter) printer.add('sw::mark::IMark', SwIMarkPrinter) printer.add('SwXTextRange::Impl', SwXTextRangeImplPrinter) printer.add('sw::UnoImplPtr', SwUnoImplPtrPrinter) printer.add('SwXTextRange', SwXTextRangePrinter) +printer.add('SwModify', SwModifyPrinter) def register_pretty_printers(obj): printing.register_pretty_printer(printer, obj) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: plans with libmerged
If we are planning to try and modularize each aspect of LO to the point where it could be built on its own with out the rest of the suite, wouldnt it be best to merge libs that have to do with their appropriate apsect of the program writer has all its respective libs merged, and then anything that is common to all aspects has its own merged lib with just the common libs etc? On Tue, Apr 9, 2013 at 11:57 AM, Michael Meeks michael.me...@suse.comwrote: Hi guys, On Mon, 2013-04-08 at 17:08 -0400, Peter Foley wrote: On Mon, Apr 8, 2013 at 10:19 AM, Tomáš Chvátal tomas.chva...@gmail.com wrote: This switch all/core/no sound pretty cool. Libreoffice is currently built with mergedlib enabled on opensuse and gentoo in production and there are no visible issues (currently master fails tests [so i turned off my tinderbox after having it fail for a week] but hey the app still runs fine). Right now libmerged seems to be causing very strange crashes in the unit tests. I'm trying to figure out what exactly is going wrong, but any help would be appreciated. IMHO we really do need a small re-think here; the primary use-case I was aware of for libmerged is to enable more LTO, and faster start-up. I rather suspect that merging all the components: base, writer, calc etc. into the libmerged may not help startup on lots of hardware; so I'm curious as to the plan there. If we break the unit tests by doing that, almost certainly we'll break the run-time functionality too :-) so - prolly rather better to back that stuff out until it works. So I'll merge this: https://gerrit.libreoffice.org/3280 Peter - any chance of tweaking your use-case to include those libraries that you want merged in there (assuming you do) conditionally with a non-default configure switch as Matus suggests ? I believe Matus is trying to get this into a more reliable and ship-able state for Raspberry Pi, so until we've nailed the regressions and thought this through some more, I'd prefer to take a step back and re-think if that's ok ? Peter - did you get any further with the graphics filters ? at some stage, I suspect that they are doing some oslLoadModule to load the graphics driver pieces - that might be going wrong. If there is some symbol overlap problem, you could try to find that like this: for a in *.so; do echo $a ; readelf -s $a --wide | grep -v UND | cut -c52-; done /tmp/symbols.txt sort /tmp/symbols.txt | uniq -c | sort -n | less I'd start by using readelf --dyn-syms perhaps and then use -s if that fails; of course you want to reverse grep _ZThn and _ZTV etc. and manually ignore inlined methods which are expected to be duplicated but are hopefully the same everywhere (due to the ODR). Beyond that - debugging, and careful unwinding back to what is going wrong with image load/export would be good - I'd use gdb to see where your pointer got corrupted (IIRC I gave some pointers to that in the past on the list?). HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/extensions/pre_MergedLibsList.mk | 90 + 1 file changed, 48 insertions(+), 42 deletions(-) New commits: commit 0263bd3cabe2fc8e15b7cbb22822fa9693432bb5 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 9 02:25:46 2013 +0200 remove many libraries from libmerged Some of them were causing bugs but more importantly it does not make sense to merge so many libraries. Change-Id: I8749c268466ac04cc12450919346b3376d95a07a diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 10e8a36..c96e8fb 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -27,16 +27,13 @@ ifeq ($(MERGELIBS),TRUE) -# we link all object files from these libraries into one, merged library -gb_MERGEDLIBS := \ +# FIXME: just retaining these for now - they currently crash need thought. +# set of libraries to link even more stuff into one merged library +gb_EXTRAMERGEDLIBS := \ analysis \ - avmedia \ $(if $(filter unx,$(GUIBASE)),basebmp) \ $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ - canvastools \ chartcore \ - configmgr \ - cppcanvas \ ctl \ cui \ date \ @@ -44,99 +41,108 @@ gb_MERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ - deploymentmisc \ - $(if $(filter unx,$(GUIBASE)),desktop_detector) \ - desktopbe1 \ - drawinglayer \ - editeng \ embobj \ evtatt \ fastsax \ $(call gb_Helper_optional,DBCONNECTIVITY,file) \ - fileacc \ - filterconfig \ $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ for \ forui \ $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ - fsstorage \ - fwe \ - fwi \ - fwk \ fwl \ fwm \ - $(call gb_Helper_optional,DESKTOP,helplinker) \ hwp \ hyphen \ - i18nutil \ ++ i18npool \ $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \ $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ $(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \ $(if $(filter TRUE,$(SOLAR_JAVA)),juh) \ $(if $(filter-out IOS,$(OS)),jvmaccess) \ jvmfwk \ - lng \ lnth \ - localebe1 \ localedata_en \ localedata_es \ localedata_euro \ localedata_others \ - msfilter \ $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ oox \ - package2 \ pricing \ $(call gb_Helper_optional,PYUNO,pythonloader) \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ - sax \ - sb \ sc \ $(if $(DISABLE_SCRIPTING),,scriptframe) \ scui \ scfilt \ sd \ sdui \ - sfx \ - sofficeapp \ $(if $(filter-out IOS,$(OS)),solver) \ - sot \ spell \ - spl \ $(if $(DISABLE_SCRIPTING),,stringresource) \ subsequenttest \ - svl \ - svt \ - svx \ - svxcore \ sw \ swui \ swd \ test \ textfd \ - tk \ - $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ - ucb1 \ ucpcmis1 \ - ucpfile1 \ unotest \ - utl \ - uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ - vcl \ $(if $(filter-out IOS,$(OS)),wpftdraw) \ $(if $(filter-out IOS,$(OS)),wpftwriter) \ writerfilter \ xmlfa \ xmlfd \ + xmlsecurity + +# we link all object files from these libraries into one, merged library +gb_MERGEDLIBS := \ + avmedia \ + canvastools \ + configmgr \ + cppcanvas \ + deploymentmisc \ + desktopbe1 \ + $(if $(filter unx,$(GUIBASE)),desktop_detector) \ + drawinglayer \ + editeng \ + fileacc \ + filterconfig \ + fsstorage \ + fwe \ + fwi \ + fwk \ + $(call gb_Helper_optional,DESKTOP,helplinker) \ + i18npool \ + i18nutil \ + lng \ + localebe1 \ + msfilter \ + package2 \ + sax \ + sb \ + sfx \ + sofficeapp \ + sot \ + spl \ + svl \ + svt \ + svx \ + svxcore \ + tk \ + $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ + ucb1 \ + ucpfile1 \ + utl \ + uui \ + vcl \ xmlscript \ - xmlsecurity \ xo \ - xstor + xstor \ endif
[PUSHED] remove many libraries from libmerged
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3280 -- To view, visit https://gerrit.libreoffice.org/3280 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8749c268466ac04cc12450919346b3376d95a07a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/extensions/pre_MergedLibsList.mk |1 - 1 file changed, 1 deletion(-) New commits: commit c998ef820b993985e8b3d5d6e70c646037c570ac Author: Michael Meeks michael.me...@suse.com Date: Tue Apr 9 11:06:19 2013 +0100 remove erroneous + diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index c96e8fb..194c93c 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -53,7 +53,6 @@ gb_EXTRAMERGEDLIBS := \ fwm \ hwp \ hyphen \ -+ i18npool \ $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \ $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ $(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - codemaker/source solenv/bin
codemaker/source/codemaker/exceptiontree.cxx |1 solenv/bin/modules/installer/simplepackage.pm | 38 ++ 2 files changed, 39 insertions(+) New commits: commit f0aecebe20f3347ddc56828d4280b875682cad34 Author: Tor Lillqvist t...@iki.fi Date: Tue Apr 9 12:37:02 2013 +0300 WaE: unused variable Change-Id: I64ac7b45722e4147091068e71e9ceedea3d73010 diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index f8dd868..a6e154e 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -60,6 +60,7 @@ void ExceptionTree::add( list.push_back(n); rtl::Reference unoidl::Entity ent; codemaker::UnoType::Sort s = manager-getSort(b2u(n), ent); +(void) s; // WaE: unused variable assert(s == codemaker::UnoType::SORT_EXCEPTION_TYPE); n = u2b( static_cast unoidl::ExceptionTypeEntity * (ent.get())- commit db403988a7fd7d468f53d9296ff8d6c213ce435c Author: Tor Lillqvist t...@iki.fi Date: Tue Apr 9 12:35:06 2013 +0300 Forward-port the app bundle signing from the 4.0 branch For now, use the same quick hack as in the 4.0 branch: Just sign the app bundle as a while, not individual dylibs. Should factor out the code in Makefile.in that signs all dylibs. Make sure to sign the application app bundle only, not the SDK. Change-Id: I6b0a39354c54b0e0f5352d0fd0bdb57650dc100a diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index ff18bc9..58cff7d 100755 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -410,6 +410,44 @@ sub create_package chdir $localfrom; } +else +{ +if (($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev') +defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne ) +{ +# Just sign the .app as a whole, which means signing +# the CFBundleExecutable from Info.plist, +# i.e. soffice, plus the contents of the Resources +# treee (which is not much, far from all of our +# non-code resources). + +# Don't bother here in the 4.0 branch to sign each +# individual .dylib, or each additional binary. See +# master for more work plus possibly eventually +# re-organising the app bundle structure to be more +# Mac-like (the program symlink, eek!) and actually +# putting all non-code resources (including extension +# scripts!) into Resources so that they participate +# in the signing and their validity can be guaranteed. + +$systemcall = codesign --sign $ENV{'MACOSX_CODESIGNING_IDENTITY'} -v -v -v $tempdir/$packagename/$volume_name_classic_app.app; +print ... $systemcall ...\n; +my $returnvalue = system($systemcall); +$infoline = Systemcall: $systemcall\n; +push( @installer::globals::logfileinfo, $infoline); + +if ($returnvalue) +{ +$infoline = ERROR: Could not execute \$systemcall\!\n; +push( @installer::globals::logfileinfo, $infoline); +} +else +{ +$infoline = Success: Executed \$systemcall\ successfully!\n; +push( @installer::globals::logfileinfo, $infoline); +} +} +} $systemcall = cd $localtempdir hdiutil makehybrid -hfs -hfs-openfolder $folder $folder -hfs-volume-name \$volume_name\ -ov -o $installdir/tmp hdiutil convert -ov -format UDBZ $installdir/tmp.dmg -o $archive ; if (( $ref ne ) ( $$ref ne )) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git:
0 files changed New commits: commit 6b8965bc816f8edda29fd147db66fa044be3c64a Author: Olivier Hallot olivier.hal...@alta.org.br Date: Tue Apr 9 06:01:02 2013 -0300 Drop unused variable Change-Id: I6d0d561b6c3f1a6eb3ab237538885e5c48820e6e Reviewed-on: https://gerrit.libreoffice.org/3282 Reviewed-by: Olivier Hallot olivier.hal...@edx.srv.br Tested-by: Olivier Hallot olivier.hal...@edx.srv.br ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Drop unused variable
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3282 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3282 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d0d561b6c3f1a6eb3ab237538885e5c48820e6e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br Gerrit-Reviewer: Olivier Hallot olivier.hal...@edx.srv.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: claims of python unit test un-debugability considered somewhat exaggerated
Hi guys, On Mon, 2013-04-08 at 11:32 -0600, Tom Tromey wrote: CCing David Malcolm. Michael (gdb) py-bt I just wanted to mention here that Phil Muldoon is working on a frame filter patch series that is basically pretty printing for stack frames. With this in place you'll no longer need a special command -- with appropriate support from Python, you'll be able to see interpreted frames interleaved with the low-level C frames. Oh - nice ! :-) This series is nearing final review now and should appear in gdb 7.7, later this year. Excellent news indeed. I think we're planning to rewrite the existing py-bt code into frame filter form ourselves. So - in which case this significantly reduces the problems of using python for debugging; I assume that with py-bt - there are still issues with interleaving two tools for printing parts of backtraces when we call several times to and fro between C++ and python. Eventually we'd like to have more full support for mixed interpreter and C debugging. However this is a ways off. For me, clearly seeing the python line numbers is the key rather than the interpreter details - we treat python itself as working black-box - and the script itself as the problem ;-) So - re-examining my requirements: + debug-ability - when the test fails - and the best tests are written to fail regularly ;-) we need to be able -very-simply- to get a backtrace we can work with - without a ton of training, reading a dozen wiki pages, poking for obscure symbols, etc. Michael - as/when a python unit test fails - can we make the magic environment variables that are listed include some debugging instructions that include the py-bt detail etc. so that everything needed is in the failure message ? when we're in the automatic trace collection mode (I forget what env. var that is) do we dump the python pieces as well ? Also - can we distribute / include / install the magic that makes 'py-bt' work - not sure it works for me (on openSUSE - at least a facile start gdb, type py-bt fails in spades ;-) + that backtrace should not have big, opaque chunks that are either empty (cf. Java) or point to random / irrelevant pieces of C/C++ interpreter code - Python / StarBasic others. It should allow interactive inspection of variables up and down the stack. It seems that this is getting towards working on modern Linux systems. Do we get variable inspection sorted out there as well ? + reliability and performance: new unit tests should be small, fast, non-duplicative (ie. re-using existing code frameworks) I guess re-using the existing C++ test code / bootstrapping framework mostly avoids duplication here; and either way unit tests are (sadly) one of the more duplicative pieces of code we have. + ideally - the unit tests should run -in-the-same-process- which significantly helps with the above performance, debugging, reliability and more. And this is now fixed; so - David Michael - thanks for working on this - looks like a good solution with a brighter future :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Update Swedish autocorrect files.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3284 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3284/1 Update Swedish autocorrect files. Change-Id: Ib7428ff5201ec78b15b9f00039fa7ec61fcc9724 --- M extras/source/autotext/lang/sv/acor/DocumentList.xml M extras/source/autotext/lang/sv/acor/SentenceExceptList.xml 2 files changed, 4 insertions(+), 187 deletions(-) diff --git a/extras/source/autotext/lang/sv/acor/DocumentList.xml b/extras/source/autotext/lang/sv/acor/DocumentList.xml index 66d6f78..848bf7a 100644 --- a/extras/source/autotext/lang/sv/acor/DocumentList.xml +++ b/extras/source/autotext/lang/sv/acor/DocumentList.xml @@ -1,111 +1,2 @@ -?xml version=1.0 encoding=utf-8? -block-list:block-list xmlns:block-list=http://openoffice.org/2001/block-list; - block-list:block block-list:abbreviated-name=-- block-list:name=–/ - block-list:block block-list:abbreviated-name=--gt; block-list:name=→/ - block-list:block block-list:abbreviated-name=-gt; block-list:name=→/ - block-list:block block-list:abbreviated-name=... block-list:name=…/ - block-list:block block-list:abbreviated-name=(C) block-list:name=©/ - block-list:block block-list:abbreviated-name=(R) block-list:name=®/ - block-list:block block-list:abbreviated-name=(TM) block-list:name=™/ - block-list:block block-list:abbreviated-name=lt;- block-list:name=←/ - block-list:block block-list:abbreviated-name=lt;-- block-list:name=←/ - block-list:block block-list:abbreviated-name=lt;--gt; block-list:name=↔/ - block-list:block block-list:abbreviated-name=lt;-gt; block-list:name=↔/ - block-list:block block-list:abbreviated-name=ADDRES block-list:name=adress/ - block-list:block block-list:abbreviated-name=ADDRESS block-list:name=adress/ - block-list:block block-list:abbreviated-name=ÄDNÅ block-list:name=ändå/ - block-list:block block-list:abbreviated-name=ADRES block-list:name=adress/ - block-list:block block-list:abbreviated-name=AGRUMENT block-list:name=argument/ - block-list:block block-list:abbreviated-name=ALLDRIG block-list:name=aldrig/ - block-list:block block-list:abbreviated-name=ALTID block-list:name=alltid/ - block-list:block block-list:abbreviated-name=ANDVÄNDA block-list:name=använda/ - block-list:block block-list:abbreviated-name=ANULERA block-list:name=annullera/ - block-list:block block-list:abbreviated-name=ARTIKLE block-list:name=artikel/ - block-list:block block-list:abbreviated-name=ÅSITK block-list:name=åsikt/ - block-list:block block-list:abbreviated-name=ATLERNATIV block-list:name=alternativ/ - block-list:block block-list:abbreviated-name=ATOMATISK block-list:name=automatisk/ - block-list:block block-list:abbreviated-name=BEDÖMMA block-list:name=bedöma/ - block-list:block block-list:abbreviated-name=BEFODRA block-list:name=befordra/ - block-list:block block-list:abbreviated-name=BRANCH block-list:name=bransch/ - block-list:block block-list:abbreviated-name=BRITISK block-list:name=brittisk/ - block-list:block block-list:abbreviated-name=BRÖLOPP block-list:name=bröllop/ - block-list:block block-list:abbreviated-name=CHFE block-list:name=chef/ - block-list:block block-list:abbreviated-name=DÅLIGARE block-list:name=sämre/ - block-list:block block-list:abbreviated-name=DÅLIGAST block-list:name=sämst/ - block-list:block block-list:abbreviated-name=DÅRLIG block-list:name=dålig/ - block-list:block block-list:abbreviated-name=DEBETERA block-list:name=debitera/ - block-list:block block-list:abbreviated-name=DEFINERA block-list:name=definiera/ - block-list:block block-list:abbreviated-name=DIAGRAMM block-list:name=diagram/ - block-list:block block-list:abbreviated-name=DISKUSION block-list:name=diskussion/ - block-list:block block-list:abbreviated-name=DISSKUTERA block-list:name=diskutera/ - block-list:block block-list:abbreviated-name=DISTRUBERA block-list:name=distribuera/ - block-list:block block-list:abbreviated-name=DOKUMETN block-list:name=dokument/ - block-list:block block-list:abbreviated-name=DOKUMNET block-list:name=dokument/ - block-list:block block-list:abbreviated-name=DÖMMA block-list:name=döma/ - block-list:block block-list:abbreviated-name=ELEMINERA block-list:name=eliminera/ - block-list:block block-list:abbreviated-name=ELER block-list:name=eller/ - block-list:block block-list:abbreviated-name=ETFER block-list:name=efter/ - block-list:block block-list:abbreviated-name=GAMMLA block-list:name=gamla/ - block-list:block block-list:abbreviated-name=GÖTEBOGR block-list:name=Göteborg/ - block-list:block block-list:abbreviated-name=HADDE block-list:name=hade/ - block-list:block block-list:abbreviated-name=HÄLSNIG block-list:name=hälsning/ - block-list:block block-list:abbreviated-name=HÄLSNIGN block-list:name=hälsning/ - block-list:block block-list:abbreviated-name=HÄSLNING block-list:name=hälsning/ - block-list:block block-list:abbreviated-name=HJE
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno_module.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4eccc3798b54b90d3d10dc5d5c1347ec69934915 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 9 12:33:56 2013 +0200 warning C4101: 'e' : unreferenced local variable Change-Id: I2828021d60d82e43358ba98a1a3b4967a6901cd6 diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 4403e1a..9662958 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -354,7 +354,7 @@ static PyObject* initPoniesMode( // guess casting pFunc is undefined behavior but don't see a better way ((void (SAL_CALL *)(XMultiServiceFactory*)) pFunc) (xMSF.get()); } -catch (const com::sun::star::uno::Exception e) +catch (const com::sun::star::uno::Exception ) { abort(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#47018 fix Impress crash on modifying bullet
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3285 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3285/1 fdo#47018 fix Impress crash on modifying bullet Add verifying of numbering rule to avoid invalidated attribute Change-Id: Ifc3db3f09f9358d272245f1e00fad2802f5881ee --- M sd/source/ui/func/fuolbull.cxx 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index ae29032..49fd245 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -22,6 +22,7 @@ #include svl/intitem.hxx #include editeng/outliner.hxx #include editeng/eeitem.hxx +#include editeng/numitem.hxx #include sfx2/request.hxx #include editeng/editdata.hxx @@ -64,7 +65,16 @@ SfxItemSet aNewAttr( mpViewShell-GetPool(), EE_ITEMS_START, EE_ITEMS_END ); -aNewAttr.Put( aEditAttr, sal_False ); + +// fdo#47018 verify numbering rule +const SfxPoolItem* pItem; +sal_uInt16 nWhich = aEditAttr.GetPool()-GetWhich(SID_ATTR_NUMBERING_RULE); +aEditAttr.GetItemState(nWhich, sal_False, pItem); +const sal_uInt16 levelCount = (*((SvxNumBulletItem*)pItem)-GetNumRule()).GetLevelCount(); + +// check if the attribute is valid +if ( levelCount ) +aNewAttr.Put( aEditAttr, sal_False ); // create and execute dialog SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); -- To view, visit https://gerrit.libreoffice.org/3285 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc3db3f09f9358d272245f1e00fad2802f5881ee Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#59071 Slideshow: allow automatic transitions with sub-second
Hi Thorsten, On 04/05/2013 10:42 PM, Thorsten Behrens wrote: Cao Cuong Ngo wrote: I'm trying to fix the crash in https://bugs.freedesktop.org/show_bug.cgi?id=62887 but still haven't figured out yet! It seems coming from some Widget UIs... Do you have any pointer? Eh - don't seem to be able to reproduce, but maybe I'm not grokking what the reporter was doing - can you attach a stacktrace? Cheers, -- Thorsten I've made a patch for this crash here https://gerrit.libreoffice.org/#/c/3285/ It's a duplicate of bug 47018. Please review it if you have time. It also resolve the problem of the impossibility to modify the bullet format after pasting which exists from forever! Thanks, Cao Cuong Ngo. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Update README to explain what codemaker does
Chris Sherlock has abandoned this change. Change subject: Update README to explain what codemaker does .. Patch Set 3: Abandoned Fair enough - decent point. I see you've now done this in master now! -- To view, visit https://gerrit.libreoffice.org/3283 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib825817ea5d77ba2ead421daa0e7f2b708d156a1 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Update README to explain what codemaker does
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3286 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3286/1 Update README to explain what codemaker does README change adapted from http://wiki.openoffice.org/wiki/Uno/Binary/Modules/codemaker Change-Id: I8bb1712e616392987c2d6ca46be5060de2f963e2 --- M codemaker/README M codemaker/source/codemaker/exceptiontree.cxx 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/codemaker/README b/codemaker/README index 5386780..d7af167 100644 --- a/codemaker/README +++ b/codemaker/README @@ -3,6 +3,7 @@ the UNO API C++ binding - Java: javamaker generates class files that provide the JVM UNO API binding - the one for .Net is in module cli_ure +- The codemaker module holds the language dependent type generators for C++ and Java. Note the different terminology used by cppumaker vs. gbuild for the three variants that can be generated by cppumaker for some of the diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index a6e154e..1507e8a 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -62,6 +62,7 @@ codemaker::UnoType::Sort s = manager-getSort(b2u(n), ent); (void) s; // WaE: unused variable assert(s == codemaker::UnoType::SORT_EXCEPTION_TYPE); + n = u2b( static_cast unoidl::ExceptionTypeEntity * (ent.get())- getDirectBase()); -- To view, visit https://gerrit.libreoffice.org/3286 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bb1712e616392987c2d6ca46be5060de2f963e2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Update README to explain what codemaker does
Chris Sherlock has abandoned this change. Change subject: Update README to explain what codemaker does .. Patch Set 2: Abandoned I must be tired. -- To view, visit https://gerrit.libreoffice.org/3286 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8bb1712e616392987c2d6ca46be5060de2f963e2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Update README to explain what codemaker does
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3287 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3287/1 Update README to explain what codemaker does README change adapted from http://wiki.openoffice.org/wiki/Uno/Binary/Modules/codemaker Change-Id: I25c1e7012f7d27c21124cac171f3b15e989b8612 --- M codemaker/README 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/codemaker/README b/codemaker/README index 5386780..d7af167 100644 --- a/codemaker/README +++ b/codemaker/README @@ -3,6 +3,7 @@ the UNO API C++ binding - Java: javamaker generates class files that provide the JVM UNO API binding - the one for .Net is in module cli_ure +- The codemaker module holds the language dependent type generators for C++ and Java. Note the different terminology used by cppumaker vs. gbuild for the three variants that can be generated by cppumaker for some of the -- To view, visit https://gerrit.libreoffice.org/3287 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25c1e7012f7d27c21124cac171f3b15e989b8612 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: codemaker/README
codemaker/README |1 + 1 file changed, 1 insertion(+) New commits: commit dd88ed87a5806789264b6f9ef5d45d0474c9b6cc Author: Chris Sherlock chris.sherloc...@gmail.com Date: Tue Apr 9 21:13:24 2013 +1000 Update README to explain what codemaker does README change adapted from http://wiki.openoffice.org/wiki/Uno/Binary/Modules/codemaker Change-Id: I25c1e7012f7d27c21124cac171f3b15e989b8612 Reviewed-on: https://gerrit.libreoffice.org/3287 Reviewed-by: Tomáš Chvátal tchva...@suse.cz Tested-by: Tomáš Chvátal tchva...@suse.cz diff --git a/codemaker/README b/codemaker/README index 5386780..d7af167 100644 --- a/codemaker/README +++ b/codemaker/README @@ -3,6 +3,7 @@ UNO interface declaration/stub generators for: the UNO API C++ binding - Java: javamaker generates class files that provide the JVM UNO API binding - the one for .Net is in module cli_ure +- The codemaker module holds the language dependent type generators for C++ and Java. Note the different terminology used by cppumaker vs. gbuild for the three variants that can be generated by cppumaker for some of the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Update README to explain what codemaker does
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3287 Approvals: Tomáš Chvátal: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3287 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25c1e7012f7d27c21124cac171f3b15e989b8612 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source
extras/source/autotext/lang/sv/acor/DocumentList.xml | 188 ++--- extras/source/autotext/lang/sv/acor/SentenceExceptList.xml | 86 + 2 files changed, 180 insertions(+), 94 deletions(-) New commits: commit 76fa6219f59508db52bd8d58731d93cf58b21921 Author: Niklas Johansson sleeping.pil...@gmail.com Date: Tue Apr 9 11:47:27 2013 +0200 Update Swedish autocorrect files. Change-Id: Ib7428ff5201ec78b15b9f00039fa7ec61fcc9724 Reviewed-on: https://gerrit.libreoffice.org/3284 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/extras/source/autotext/lang/sv/acor/DocumentList.xml b/extras/source/autotext/lang/sv/acor/DocumentList.xml index 66d6f78..65ade43 100644 --- a/extras/source/autotext/lang/sv/acor/DocumentList.xml +++ b/extras/source/autotext/lang/sv/acor/DocumentList.xml @@ -11,101 +11,101 @@ block-list:block block-list:abbreviated-name=lt;-- block-list:name=â/ block-list:block block-list:abbreviated-name=lt;--gt; block-list:name=â/ block-list:block block-list:abbreviated-name=lt;-gt; block-list:name=â/ - block-list:block block-list:abbreviated-name=ADDRES block-list:name=adress/ - block-list:block block-list:abbreviated-name=ADDRESS block-list:name=adress/ - block-list:block block-list:abbreviated-name=ÃDNà block-list:name=ändÃ¥/ - block-list:block block-list:abbreviated-name=ADRES block-list:name=adress/ - block-list:block block-list:abbreviated-name=AGRUMENT block-list:name=argument/ - block-list:block block-list:abbreviated-name=ALLDRIG block-list:name=aldrig/ - block-list:block block-list:abbreviated-name=ALTID block-list:name=alltid/ - block-list:block block-list:abbreviated-name=ANDVÃNDA block-list:name=använda/ - block-list:block block-list:abbreviated-name=ANULERA block-list:name=annullera/ - block-list:block block-list:abbreviated-name=ARTIKLE block-list:name=artikel/ - block-list:block block-list:abbreviated-name=à SITK block-list:name=Ã¥sikt/ - block-list:block block-list:abbreviated-name=ATLERNATIV block-list:name=alternativ/ - block-list:block block-list:abbreviated-name=ATOMATISK block-list:name=automatisk/ - block-list:block block-list:abbreviated-name=BEDÃMMA block-list:name=bedöma/ - block-list:block block-list:abbreviated-name=BEFODRA block-list:name=befordra/ - block-list:block block-list:abbreviated-name=BRANCH block-list:name=bransch/ - block-list:block block-list:abbreviated-name=BRITISK block-list:name=brittisk/ - block-list:block block-list:abbreviated-name=BRÃLOPP block-list:name=bröllop/ - block-list:block block-list:abbreviated-name=CHFE block-list:name=chef/ - block-list:block block-list:abbreviated-name=Dà LIGARE block-list:name=sämre/ - block-list:block block-list:abbreviated-name=Dà LIGAST block-list:name=sämst/ - block-list:block block-list:abbreviated-name=Dà RLIG block-list:name=dÃ¥lig/ - block-list:block block-list:abbreviated-name=DEBETERA block-list:name=debitera/ - block-list:block block-list:abbreviated-name=DEFINERA block-list:name=definiera/ - block-list:block block-list:abbreviated-name=DIAGRAMM block-list:name=diagram/ - block-list:block block-list:abbreviated-name=DISKUSION block-list:name=diskussion/ - block-list:block block-list:abbreviated-name=DISSKUTERA block-list:name=diskutera/ - block-list:block block-list:abbreviated-name=DISTRUBERA block-list:name=distribuera/ - block-list:block block-list:abbreviated-name=DOKUMETN block-list:name=dokument/ - block-list:block block-list:abbreviated-name=DOKUMNET block-list:name=dokument/ - block-list:block block-list:abbreviated-name=DÃMMA block-list:name=döma/ - block-list:block block-list:abbreviated-name=ELEMINERA block-list:name=eliminera/ - block-list:block block-list:abbreviated-name=ELER block-list:name=eller/ - block-list:block block-list:abbreviated-name=ETFER block-list:name=efter/ - block-list:block block-list:abbreviated-name=GAMMLA block-list:name=gamla/ - block-list:block block-list:abbreviated-name=GÃTEBOGR block-list:name=Göteborg/ - block-list:block block-list:abbreviated-name=HADDE block-list:name=hade/ - block-list:block block-list:abbreviated-name=HÃLSNIG block-list:name=hälsning/ - block-list:block block-list:abbreviated-name=HÃLSNIGN block-list:name=hälsning/ - block-list:block block-list:abbreviated-name=HÃSLNING block-list:name=hälsning/ - block-list:block block-list:abbreviated-name=HJE block-list:name=Hej/ - block-list:block block-list:abbreviated-name=IMELLAN block-list:name=emellan/ - block-list:block block-list:abbreviated-name=INTERESSE block-list:name=intresse/ - block-list:block block-list:abbreviated-name=INTERESSERAD block-list:name=intresserad/ - block-list:block block-list:abbreviated-name=JÃMNFÃR block-list:name=jämför/ - block-list:block block-list:abbreviated-name=JÃMNFÃRA block-list:name=jämföra/ - block-list:block block-list:abbreviated-name=JÃMNKNING
[PUSHED] Update Swedish autocorrect files.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3284 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3284 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7428ff5201ec78b15b9f00039fa7ec61fcc9724 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Niklas Johansson sleeping.pil...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - i18npool/source Library_merged.mk sc/source sd/source sfx2/source solenv/gbuild sw/source
Library_merged.mk | 26 ++ i18npool/source/localedata/localedata.cxx | 11 ++- sc/source/ui/attrdlg/scuiexp.cxx |2 +- sc/source/ui/docshell/impex.cxx |4 sd/source/ui/dlg/sduiexp.cxx |2 +- sd/source/ui/view/viewshe2.cxx|2 +- sfx2/source/appl/appinit.cxx |4 solenv/gbuild/Library.mk |3 --- sw/source/ui/dialog/swdialmgr.cxx |2 +- sw/source/ui/dialog/swuiexp.cxx |2 +- 10 files changed, 9 insertions(+), 49 deletions(-) New commits: commit 2705fc72df2058332773b5cb04a6b4d207f5e39c Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 9 14:15:55 2013 +0200 libmerged: remove some of unused externals and static libraries Because cppunit was causing troubles. It's not in installation, to be used at run-time, so we can't link against it. Change-Id: I133feb0c3dab50bacbe96775a28dd1a61f09882e diff --git a/Library_merged.mk b/Library_merged.mk index 663a806..7385553 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -44,23 +44,13 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) -ifneq ($(OS),IOS) -$(eval $(call gb_Library_use_static_libraries,merged,\ - writerperfect \ -)) -endif - $(eval $(call gb_Library_use_externals,merged,\ boostdatetime \ - $(if $(filter-out IOS,$(OS)),cdr) \ $(call gb_Helper_optional,DESKTOP,clucene) \ - cmis \ - cppunit \ cups \ curl \ expat \ hunspell \ - hyphen \ icui18n \ icule \ icuuc \ @@ -69,25 +59,11 @@ $(eval $(call gb_Library_use_externals,merged,\ libxml2 \ $(call gb_Helper_optional,DESKTOP,libxslt) \ $(if $(filter-out IOS,$(OS)),lpsolve) \ - $(if $(filter-out IOS,$(OS)),mspub) \ - $(if $(filter-out IOS,$(OS)),mwaw) \ mythes \ nss3 \ - openssl \ - orcus \ - $(call gb_Helper_optional,PYUNO,python) \ - $(if $(filter-out IOS,$(OS)),wpd) \ - $(if $(filter-out IOS,$(OS)),wpg) \ - $(if $(filter-out IOS,$(OS)),wps) \ - $(if $(filter-out IOS,$(OS)),visio) \ zlib \ )) -$(eval $(call gb_Library_use_static_libraries,merged,\ - sax_shared \ - ulingu \ -)) - ifeq ($(ENABLE_GRAPHITE),TRUE) $(eval $(call gb_Library_use_externals,merged,\ graphite \ commit caceb6fa3cf288e0a66bb547647b5d496e10f4ee Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 9 13:07:46 2013 +0200 sd: fix linking of aEmptyStr; not in libmerged Change-Id: Ie8d832755a124544e08c09d2e5200511783513e7 diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 6f88cf1..16410c0 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -72,7 +72,7 @@ using namespace com::sun::star; -#if !defined(DISABLE_DYNLOADING) !defined(LIBO_MERGELIBS) // otherwise use the one in sw... +#if !defined(DISABLE_DYNLOADING) // otherwise use the one in sw... const String aEmptyStr; #endif commit 57cbe8d485a0245abbfb868070261af405f9d9dd Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 9 11:07:50 2013 +0200 fix linking of libmerged: add jvmaccess Change-Id: I374041bba8ea4f20d22aeea8b486f68b0d7acd7b diff --git a/Library_merged.mk b/Library_merged.mk index e633b0d..663a806 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -34,7 +34,8 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nlangtag \ -jvmfwk \ + jvmaccess \ + jvmfwk \ sal \ salhelper \ tl \ commit b284dcc733d0bef1c113fa20e9ade849088f24cc Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 9 02:32:35 2013 +0200 Revert fix sfx2 with Library_merged This reverts commit 0b78f2b9dc17dfa88d72d6ee27e3e0e0ca6a152f. Change-Id: I3608c15226f233add01ebe4a64667012854cf08b diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 6dc25ee..2a85ac9 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -186,11 +186,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font rFont) bDetermineFunction = true; #ifndef DISABLE_DYNLOADING -#ifdef LIBO_MERGEDLIBS -static OUString aLibName( SVLIBRARY( merged ) ); -#else static OUString aLibName( SVLIBRARY( cui ) ); -#endif oslModule handleMod = osl_loadModuleRelative( thisModule, aLibName.pData, 0 ); commit 47832f6b488917d803d1c4e4c53594ae35094e43 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 9 02:30:30 2013 +0200 Revert add javavm and jvmfwk to Library_merged This reverts commit 77169b9ceccfedeadef272f701425430cf1c719d. Conflicts: Library_merged.mk Change-Id:
Re: claims of python unit test un-debugability considered somewhat exaggerated
Quoting Michael Meeks michael.me...@suse.com: Michael - as/when a python unit test fails - can we make the magic environment variables that are listed include some debugging instructions that include the py-bt detail etc. so that everything needed is in the failure message ? when we're in the automatic trace collection mode (I forget what env. var that is) do we dump the python pieces as well ? Also - can we distribute / include / install the magic that makes 'py-bt' work - not sure it works for me (on openSUSE - at least a facile start gdb, type py-bt fails in spades ;-) What we need here is a wiki page with detailed instructions how to set it up. Volunteers? ;-) David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UI_scalc.mk
sc/UI_scalc.mk |1 sc/inc/helpids.h|1 sc/inc/sc.hrc |6 +- sc/inc/scabstdlg.hxx|6 -- sc/source/ui/attrdlg/scdlgfact.cxx | 21 +- sc/source/ui/attrdlg/scdlgfact.hxx |6 -- sc/source/ui/inc/lbseldlg.hxx | 17 +--- sc/source/ui/miscdlgs/lbseldlg.cxx | 44 + sc/source/ui/src/miscdlgs.src | 49 --- sc/source/ui/src/scstring.src | 10 sc/source/ui/view/cellsh2.cxx |6 -- sc/uiconfig/scalc/ui/selectrange.ui | 75 ++-- 12 files changed, 64 insertions(+), 178 deletions(-) New commits: commit 78417f42a4b71729f324ca09e341ee24d9d4baaa Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 10:40:16 2013 +0100 adapt code for select range .ui conversion Change-Id: Ib53b42a340da04276ce005efb22d19fda617e29a diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk index 9b8f7a4..60850afe 100644 --- a/sc/UI_scalc.mk +++ b/sc/UI_scalc.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UI_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/insertsheet \ sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/sheetprintpage \ + sc/uiconfig/scalc/ui/selectrange \ sc/uiconfig/scalc/ui/sortcriteriapage \ sc/uiconfig/scalc/ui/sortkey \ sc/uiconfig/scalc/ui/sortoptionspage \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 96be512..6f210c8 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -95,7 +95,6 @@ #define HID_SC_NAVIGATOR SC_HID_SC_NAVIGATOR -#define HID_SC_SELENTRY_LIST SC_HID_SC_SELENTRY_LIST #define HID_SC_GROUP_COLS SC_HID_SC_GROUP_COLS #define HID_SC_GROUP_ROWS SC_HID_SC_GROUP_ROWS diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 08365fa..0b460be 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -716,8 +716,8 @@ #define SCSTR_MODIFY(STR_START + 19) #define SCSTR_SHOWTABLE (STR_START + 20) #define SCSTR_HIDDENTABLES (STR_START + 21) -#define SCSTR_SELECTDB (STR_START + 22) -#define SCSTR_AREAS (STR_START + 23) + + #define SCSTR_TABLE (STR_START + 24) #define SCSTR_NAME (STR_START + 25) #define SCSTR_INSTABLE (STR_START + 26) @@ -1035,7 +1035,7 @@ #define RID_SCDLG_ROW_OPT (SC_DIALOGS_START + 107) // derivations from RID_SCDLG_SELENTRY -#define RID_SCDLG_SELECTDB (SC_DIALOGS_START + 108) + #define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109) // derivations from RID_SCDLG_GROUP diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 50f3aa0..14de680 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -395,11 +395,7 @@ public: SCTAB nTabCount, bool bFromFile) = 0; virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg -sal_uInt16 nResId, -const String aTitle, -const String aLbTitle, -const std::vectorString rEntryList, -int nId ) = 0; + const std::vectorString rEntryList ) = 0; virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 0c43040..9ca906a 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -1000,25 +1000,10 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg( // add for ScSelEntryDlg begin AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent, -sal_uInt16 nResId, -const String aTitle, -const String aLbTitle, -const std::vectorString rEntryList, -int nId ) +const std::vectorString rEntryList ) { -ScSelEntryDlg * pDlg=NULL; -switch ( nId ) -{ -case RID_SCDLG_SELECTDB : -pDlg = new ScSelEntryDlg( pParent, nResId,aTitle, aLbTitle, rEntryList ); -
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bbbc0d12961c972dd14cf3eb35736bb4b532744 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 13:18:27 2013 +0100 Updated core Project: help ffc7126974af6e43a8651006b23f1b8e97140f7b diff --git a/helpcontent2 b/helpcontent2 index 77f7ec5..ffc7126 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 77f7ec5184335f7fb4e8f63845269a247bb5df31 +Subproject commit ffc7126974af6e43a8651006b23f1b8e97140f7b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |1 - source/text/scalc/01/1202.xhp |6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit ffc7126974af6e43a8651006b23f1b8e97140f7b Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 13:18:27 2013 +0100 adapt code to select range dialog .ui conversion Change-Id: I2af36a4f43323e18e66291663b1ebe16932e87f3 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 679ca21..bfd91a3 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3360,7 +3360,6 @@ HID_SC_SCENARIO_DELETE,58927, HID_SC_SCENARIO_EDIT,58928, HID_SC_SCENWIN_BOTTOM,58911, HID_SC_SCENWIN_TOP,58910, -HID_SC_SELENTRY_LIST,58898, HID_SC_SHEET_CELL_ERG,58779, HID_SC_SHEET_CELL_ERG1,58780, HID_SC_SHEET_CELL_STD,58778, diff --git a/source/text/scalc/01/1202.xhp b/source/text/scalc/01/1202.xhp index c073db7..d49056c 100644 --- a/source/text/scalc/01/1202.xhp +++ b/source/text/scalc/01/1202.xhp @@ -34,15 +34,15 @@ bookmark xml-lang=en-US branch=index id=bm_id3145068bookmark_valuedatabases; selecting (Calc)/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/.uno:SelectDB id=bm_id2131630 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:SelectDB id=bm_id3148946 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/selectrange/SelectRangeDialog id=bm_id3148946 localize=false/ paragraph role=heading id=hd_id3145068 xml-lang=en-US level=1 l10n=CHG oldref=1Select Database Range/paragraph paragraph role=paragraph id=par_id3149655 xml-lang=en-US l10n=CHG oldref=2variable id=bereichwaehlenahelp hid=.uno:SelectDBSelects a database range that you defined under link href=text/scalc/01/1201.xhp name=Data - Define RangeData - Define Range/link./ahelp /variable/paragraph section id=howtoget embed href=text/scalc/00/0412.xhp#dbrba/ /section -bookmark xml-lang=en-US branch=hid/SC_HID_SC_SELENTRY_LIST id=bm_id3125865 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/selectrange/treeview id=bm_id3125865 localize=false/ paragraph role=heading id=hd_id3153192 xml-lang=en-US level=2 l10n=CHG oldref=3Ranges/paragraph -paragraph role=paragraph id=par_id3154684 xml-lang=en-US l10n=CHG oldref=4ahelp hid=HID_SC_SELENTRY_LISTLists the available database ranges. To select a database range, click its name, and then click emphOK/emph./ahelp/paragraph +paragraph role=paragraph id=par_id3154684 xml-lang=en-US l10n=CHG oldref=4ahelp hid=modules/scalc/ui/selectrange/treeviewLists the available database ranges. To select a database range, click its name, and then click emphOK/emph./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#47018 fix Impress crash on modifying bullet
Building LO with this patch now. I will report my findings asap. 2013/4/9 Cao Cuong Ngo (via Code Review) ger...@gerrit.libreoffice.org Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3285 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/corerefs/changes/85/3285/1 fdo#47018 fix Impress crash on modifying bullet Add verifying of numbering rule to avoid invalidated attribute Change-Id: Ifc3db3f09f9358d272245f1e00fad2802f5881ee --- M sd/source/ui/func/fuolbull.cxx 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index ae29032..49fd245 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -22,6 +22,7 @@ #include svl/intitem.hxx #include editeng/outliner.hxx #include editeng/eeitem.hxx +#include editeng/numitem.hxx #include sfx2/request.hxx #include editeng/editdata.hxx @@ -64,7 +65,16 @@ SfxItemSet aNewAttr( mpViewShell-GetPool(), EE_ITEMS_START, EE_ITEMS_END ); -aNewAttr.Put( aEditAttr, sal_False ); + +// fdo#47018 verify numbering rule +const SfxPoolItem* pItem; +sal_uInt16 nWhich = aEditAttr.GetPool()-GetWhich(SID_ATTR_NUMBERING_RULE); +aEditAttr.GetItemState(nWhich, sal_False, pItem); +const sal_uInt16 levelCount = (*((SvxNumBulletItem*)pItem)-GetNumRule()).GetLevelCount(); + +// check if the attribute is valid +if ( levelCount ) +aNewAttr.Put( aEditAttr, sal_False ); // create and execute dialog SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); -- To view, visit https://gerrit.libreoffice.org/3285 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc3db3f09f9358d272245f1e00fad2802f5881ee Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: discrepancy regarding fdo#61541
-- Forwarded message -- From: Prashant Pandey prashant3.yi...@gmail.com Date: Tue, Apr 9, 2013 at 3:27 AM Subject: discrepancy regarding fdo#61541 To: er...@redhat.com, michael.me...@suse.com Hi, In continuation with my work on fdo#61541 : https://bugs.freedesktop.org/show_bug.cgi?id=61541#c4, I had certain observations which I'd like to share. Following the code pointers, if I do the changes in accordance with bug report in https://bugs.freedesktop.org/show_bug.cgi?id=61541#c4, after changing ScColumn::UpdateSelectionFunction() and ScColumn::UpdateAreaFunction() as suggested, the behaviour of 'Selection count' is exactly same as the behaviour of 'aCount', i.e. whenever some data is in the cell, only then the increment is done and no change is reflected if the cell is empty (has no data). To show my changes that produces this effect, I have attached my changes. This was the same behaviour when I tried the same thing (as above) before uploading my first patch. Since it was not working for me then too, so I counted the cells as in my first patch upload : multiplication of rows and column, which is indeed wrong since it clearly ignores the hidden rows. May be this tricky bug needs a bit more attention :) Thanking you in anticipation Prashant my-changes Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/cellsh2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit afb3af7ce5fef803d42a549095863e6bb8210ef2 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 14:02:17 2013 +0100 Resolves: fdo#61948 delayed delete deletes nothing under windows The reason there appears to be two dialogs, is because there actually is. The original dialog doesn't get deleted under windows. If we use the actual returned type of the dialog here rather than a lower baseclass then the right thing happens. Original code works under Linux but not Windows. Change-Id: Iaf99fa4e16f743b1f5a3d29f42a140491f3d67b0 diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 4cbd425..8f30e18 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -178,7 +178,7 @@ namespace { long DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ ) { -delete reinterpret_castVclAbstractDialog*( pAbstractDialog ); +delete reinterpret_castSfxAbstractTabDialog*( pAbstractDialog ); return 0; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] Resolves: fdo#61948 delayed delete deletes nothing under win...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3288 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3288/1 Resolves: fdo#61948 delayed delete deletes nothing under windows The reason there appears to be two dialogs, is because there actually is. The original dialog doesn't get deleted under windows. If we use the actual returned type of the dialog here rather than a lower baseclass then the right thing happens. Original code works under Linux but not Windows. Change-Id: Iaf99fa4e16f743b1f5a3d29f42a140491f3d67b0 (cherry picked from commit afb3af7ce5fef803d42a549095863e6bb8210ef2) --- M sc/source/ui/view/cellsh2.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 1ab57f6..0e4a720 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -178,7 +178,7 @@ { long DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ ) { -delete reinterpret_castVclAbstractDialog*( pAbstractDialog ); +delete reinterpret_castSfxAbstractTabDialog*( pAbstractDialog ); return 0; } } -- To view, visit https://gerrit.libreoffice.org/3288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf99fa4e16f743b1f5a3d29f42a140491f3d67b0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: plans with libmerged
On 8 April 2013 23:08, Peter Foley pefol...@pefoley.com wrote: On Mon, Apr 8, 2013 at 10:19 AM, Tomáš Chvátal tomas.chva...@gmail.com wrote: [so i turned off my tinderbox after having it fail for a week] but hey the app still runs fine). Tomas, Right now libmerged seems to be causing very strange crashes in the unit tests. I'm trying to figure out what exactly is going wrong, but any help would be appreciated. So - it should now work in master. One problem is using ure libraries in libmerged. javaldx had problems to find libmerged because it's not in ure. Also I think http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c8c54ee90a2a8d3a8d35b7e89fb39770500936f was not complete because e.g. in http://opengrok.libreoffice.org/xref/core/sc/source/ui/attrdlg/scabstdlg.cxx#51 you still try to get CreateDialogFactory symbol. It seems to work again and even my abort problem disappeared (I hope forever). That's great. Thanks Peter. I plan to merge some urelibs and see how it works but that can't be used in regular builds I am afraid because of compatibility issues. And maybe some more regular libraries. Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gbuild: i will have my build with less zips, please
Hi all, at the end of the last week, there landed in master a new feature that will allow us to do less zipping during build (and unzipping during installation). This is because the only purpose for creating most of the zips (if not all of them) is to workaround shortomings in our install set configuration. IOW, scp2 sucks. It requires at least two lines (if there is a specific macro; if not, then five or more) to put a file into an install set; it does not allow two files to have the same name (but there is no diagnostic if it happens, by mistake); etc. etc. So there exists a way to avoid this unpleasantness: put a bunch of files into a zip, add a File record in scp2 with a special flag ARCHIVE and the installer will unpack the zip and put the files it contains into the install set in the zips place. But wait, do we really need a zip for that? All that is needed is a list of files and a base directory for computing their relative path in the install set. And it turned out to be quite easy to do. I added a new flag FILELIST for scp, the installer code that handles it, and modified gb_Package to produce a list of files it delivers. The files are looked up in a new top level directory $INSTDIR (suggested by Michael), which required another (bigger) change to gb_Package (especially a new function gb_Package_set_outdir). And that is about it :-) I converted a couple of existing Zips from module extras as an excercise and, as a bigger challenge, adapted the installation of IDL files for SDK. There is an easy hack for converting more Zips into Packages: https://bugs.freedesktop.org/show_bug.cgi?id=63197 , with a (hopefully) detailed recipe for the conversion. In the near future, I am going to look for some harder cases where this might be applied. My latest branch (posted for review/test builds on gerrit) adapts installation of uiconfig files and avoids the need for special processing in postprocess. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Better icon names/ easier icon themes (fdo#30425)
I'm thinking (again) on work on this request. Looking at the code, I got that icons for UNO commands are derived by prepending lc_ or sc_ to the command name (with lower case). So, if someone think it's good enough to reuse an icon (like a Next arrow), it will duplicate images files, am I right? Shouldn't the icon theme decides what image it's used to each thing? An xml file could bind them (image name - uno command name). And then, internally keep (yeckt) using hrc/src files to binding them to numeric ids. Any thoughts? Or should I just rename the images (and their references in hrc/src files)? Regards, Rodolfo P.S.: I remember I saw a wiki page about this issue, but I can't find it. Does anyone know where is it? https://bugs.freedesktop.org/show_bug.cgi?id=30425 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: signing of windows dlls and exes
On Sat, Apr 06, 2013 at 12:21:01PM +0200, David Tardon wrote: Hi all, I was just looking at postprocess module and I noticed postprocess/CustomTarget_signing.mk . It seems to me that this could (and should) be done directly by LinkTarget, without the need for any extra perl script. Or is there something I am missing? If there is no opposition, I am going to create an easy hack for it. I hear no protests, so here it is: https://bugs.freedesktop.org/show_bug.cgi?id=63315 . D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/view/cellsh2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0e147d836c753280842463326759c9fdb56ff83a Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 14:02:17 2013 +0100 Resolves: fdo#61948 delayed delete deletes nothing under windows The reason there appears to be two dialogs, is because there actually is. The original dialog doesn't get deleted under windows. If we use the actual returned type of the dialog here rather than a lower baseclass then the right thing happens. Original code works under Linux but not Windows. Change-Id: Iaf99fa4e16f743b1f5a3d29f42a140491f3d67b0 (cherry picked from commit afb3af7ce5fef803d42a549095863e6bb8210ef2) Reviewed-on: https://gerrit.libreoffice.org/3288 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 1ab57f6..0e4a720 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -178,7 +178,7 @@ namespace { long DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ ) { -delete reinterpret_castVclAbstractDialog*( pAbstractDialog ); +delete reinterpret_castSfxAbstractTabDialog*( pAbstractDialog ); return 0; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Resolves: fdo#61948 delayed delete deletes nothing under win...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3288 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf99fa4e16f743b1f5a3d29f42a140491f3d67b0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove code marked by HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL tag.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3289 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3289/1 Remove code marked by HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL tag. Change-Id: Ib87e3a5155176a6ce0531e04b08a2731a9c956a7 --- M vcl/unx/gtk/app/gtkinst.cxx 1 file changed, 4 insertions(+), 122 deletions(-) diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 0717246..678c8ed 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -111,22 +111,15 @@ } static bool hookLocks( oslModule pModule ) { -typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn); - -GdkLockFn gdk_threads_set_lock_functions = -(GdkLockFn) osl_getAsciiFunctionSymbol( pModule, gdk_threads_set_lock_functions ); -if ( !gdk_threads_set_lock_functions ) -{ -#if OSL_DEBUG_LEVEL 1 -fprintf( stderr, Failed to hook gdk threads locks\n ); +#if !GTK_CHECK_VERSION(2,4,0) +g_error(no lock hooking!); #endif -return false; -} - gdk_threads_set_lock_functions (GdkThreadsEnter, GdkThreadsLeave); + #if OSL_DEBUG_LEVEL 1 fprintf( stderr, Hooked gdk threads locks\n ); #endif +(void)pModule; return true; } @@ -168,12 +161,6 @@ if ( hookLocks( pModule ) ) pYieldMutex = new GtkHookedYieldMutex(); -else -#if GTK_CHECK_VERSION(3,0,0) -g_error (impossible case for gtk3); -#else -pYieldMutex = new GtkYieldMutex(); -#endif gdk_threads_init(); @@ -354,135 +341,30 @@ void GtkYieldMutex::acquire() { -#ifdef HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL -oslThreadIdentifier aCurrentThread = osl::Thread::getCurrentIdentifier(); -// protect member manipulation -SolarMutexObject::acquire(); -if( mnCount 0 mnThreadId == aCurrentThread ) -{ -mnCount++; -SolarMutexObject::release(); -return; -} -SolarMutexObject::release(); - -// obtain gdk mutex -gdk_threads_enter(); - -// obtained gdk mutex, now lock count is one by definition -SolarMutexObject::acquire(); -mnCount = 1; -mnThreadId = aCurrentThread; -SolarMutexObject::release(); -#else g_error (never called); -#endif } void GtkYieldMutex::release() { -#ifdef HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL -oslThreadIdentifier aCurrentThread = osl::Thread::getCurrentIdentifier(); -// protect member manipulation -SolarMutexObject::acquire(); -// strange things happen, do nothing if we don't own the mutex -if( mnThreadId == aCurrentThread ) -{ -mnCount--; -if( mnCount == 0 ) -{ -gdk_threads_leave(); -mnThreadId = 0; -} -} -SolarMutexObject::release(); -#else g_error (never called); -#endif } sal_Bool GtkYieldMutex::tryToAcquire() { -#ifdef HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL -oslThreadIdentifier aCurrentThread = osl::Thread::getCurrentIdentifier(); -// protect member manipulation -SolarMutexObject::acquire(); -if( mnCount 0 ) -{ -if( mnThreadId == aCurrentThread ) -{ -mnCount++; -SolarMutexObject::release(); -return sal_True; -} -else -{ -SolarMutexObject::release(); -return sal_False; -} -} -SolarMutexObject::release(); - -// HACK: gdk_threads_mutex is private, we shouldn't use it. -// how to we do a try_lock without having a gdk_threads_try_enter ? -if( ! g_mutex_trylock( gdk_threads_mutex ) ) -return sal_False; - -// obtained gdk mutex, now lock count is one by definition -SolarMutexObject::acquire(); -mnCount = 1; -mnThreadId = aCurrentThread; -SolarMutexObject::release(); - -#else g_error (never called); -#endif return sal_True; } int GtkYieldMutex::Grab() { -#ifdef HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL -// this MUST only be called by gdk/gtk callbacks: -// they are entered with gdk mutex locked; the mutex -// was unlocked by GtkYieldMutex befor yielding which -// is now locked again by gtk implicitly - -// obtained gdk mutex, now lock count is one by definition -SolarMutexObject::acquire(); -int nRet = mnCount; -if( mnCount == 0 ) // recursive else -mnThreadId = osl::Thread::getCurrentIdentifier(); -#if OSL_DEBUG_LEVEL 1 -else if( mnThreadId != osl::Thread::getCurrentIdentifier() ) -{ -fprintf( stderr, Yield mutex grabbed in different thread !\n ); -abort(); -} -#endif -mnCount = 1; -SolarMutexObject::release(); -return nRet; -#else g_error (never called); return sal_True; -#endif } void GtkYieldMutex::Ungrab( int nGrabs ) { -#ifdef HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL -// this MUST only be called when leaving the callback -
[Libreoffice-commits] core.git: 4 commits - basctl/source icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/oxygen
basctl/source/basicide/basidesh.src|2 +- dev/null |binary icon-themes/hicontrast/extensions/source/scanner/minus.png |binary icon-themes/hicontrast/extensions/source/scanner/plus.png |binary icon-themes/hicontrast/framework/res/info_26.png |binary icon-themes/hicontrast/res/sc10350.png |binary icon-themes/hicontrast/sfx2/res/minus.png |binary icon-themes/hicontrast/sfx2/res/plus.png |binary icon-themes/hicontrast/sw/res/doublepage_10x22.png |binary icon-themes/hicontrast/sw/res/doublepage_a_10x22.png |binary icon-themes/hicontrast/sw/res/emptypage_10x14.png |binary icon-themes/hicontrast/sw/res/emptypage_a_10x14.png|binary icon-themes/hicontrast/sw/res/twopages_10x24.png |binary icon-themes/hicontrast/sw/res/twopages_a_10x24.png |binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_01.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_02.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_03.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_04.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_05.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_06.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_07.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_08.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_09.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_10.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_11.png|binary icon-themes/hicontrast/toolkit/tk/spinner03-grey_12.png|binary 26 files changed, 1 insertion(+), 1 deletion(-) New commits: commit e2096f5395028d1efef56fe64d0bfa3f7e20ca41 Author: Andras Timar ati...@suse.com Date: Tue Apr 9 16:14:36 2013 +0200 remove unused icons, move icons to their place: hicontrast Change-Id: I31680b78f9684d9220f0f59d36f2072b2e4331da diff --git a/icon-themes/hicontrast/dbaccess/res/nu09.png b/icon-themes/hicontrast/dbaccess/res/nu09.png deleted file mode 100644 index 38aa784..000 Binary files a/icon-themes/hicontrast/dbaccess/res/nu09.png and /dev/null differ diff --git a/icon-themes/hicontrast/desktop/res/extension_16.png b/icon-themes/hicontrast/desktop/res/extension_16.png deleted file mode 100644 index 31ed873..000 Binary files a/icon-themes/hicontrast/desktop/res/extension_16.png and /dev/null differ diff --git a/icon-themes/hicontrast/extensions/source/scanner/minus.png b/icon-themes/hicontrast/extensions/source/scanner/minus.png new file mode 100644 index 000..a20fa18 Binary files /dev/null and b/icon-themes/hicontrast/extensions/source/scanner/minus.png differ diff --git a/icon-themes/hicontrast/extensions/source/scanner/plus.png b/icon-themes/hicontrast/extensions/source/scanner/plus.png new file mode 100644 index 000..d4a66c9 Binary files /dev/null and b/icon-themes/hicontrast/extensions/source/scanner/plus.png differ diff --git a/icon-themes/hicontrast/framework/res/info.png b/icon-themes/hicontrast/framework/res/info.png deleted file mode 100644 index c22d3ad..000 Binary files a/icon-themes/hicontrast/framework/res/info.png and /dev/null differ diff --git a/icon-themes/hicontrast/framework/res/info_26.png b/icon-themes/hicontrast/framework/res/info_26.png new file mode 100644 index 000..c22d3ad Binary files /dev/null and b/icon-themes/hicontrast/framework/res/info_26.png differ diff --git a/icon-themes/hicontrast/framework/res/template.png b/icon-themes/hicontrast/framework/res/template.png deleted file mode 100644 index 1563a93..000 Binary files a/icon-themes/hicontrast/framework/res/template.png and /dev/null differ diff --git a/icon-themes/hicontrast/padmin/source/fax_16.png b/icon-themes/hicontrast/padmin/source/fax_16.png deleted file mode 100644 index 1af40ce..000 Binary files a/icon-themes/hicontrast/padmin/source/fax_16.png and /dev/null differ diff --git a/icon-themes/hicontrast/padmin/source/printer_16.png b/icon-themes/hicontrast/padmin/source/printer_16.png deleted file mode 100644 index 83f4fe5..000 Binary files a/icon-themes/hicontrast/padmin/source/printer_16.png and /dev/null differ diff --git a/icon-themes/hicontrast/padmin/source/printer_40x48.png b/icon-themes/hicontrast/padmin/source/printer_40x48.png deleted file mode 100644 index 5e2ed4c..000 Binary files a/icon-themes/hicontrast/padmin/source/printer_40x48.png and /dev/null differ diff --git a/icon-themes/hicontrast/padmin/source/printpdf_16.png b/icon-themes/hicontrast/padmin/source/printpdf_16.png deleted file mode 100644 index c5a73e0..000 Binary files a/icon-themes/hicontrast/padmin/source/printpdf_16.png and /dev/null differ diff --git a/icon-themes/hicontrast/reportdesign/res/sx12477.png
[PATCH libreoffice-4-0] disable cached value import for ODS for now, fdo#60215
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3290 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3290/1 disable cached value import for ODS for now, fdo#60215 Change-Id: I714e75112727f5ebcd8cc55cf4f70dd15eb9b810 --- M officecfg/registry/schema/org/openoffice/Office/Calc.xcs 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index ee5c513..d77c260 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1558,7 +1558,7 @@ /info /enumeration /constraints -value1/value +value0/value /prop /group /group -- To view, visit https://gerrit.libreoffice.org/3290 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I714e75112727f5ebcd8cc55cf4f70dd15eb9b810 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#47018 fix Impress crash on modifying bullet
Just tested this patch, applied to: Version: 4.1.0.0.alpha0+ Build ID: 2705fc72df2058332773b5cb04a6b4d207f5e39 The proposed patch will prevent the crash, but it seems that the underlying problem is not solved by this: The bullets do not survive the copy / paste action of the EditEngineFormat: Copy/paste of bulletted text into an already bulletted empty line still makes the bullet disappear. So I would say that there is progress, but IMHO the patch doesn't warrant the closing of fdo#47018. Greetings, and thanks for the good work. Stephan van den Akker 2013/4/9 Stephan van den Akker stephanv...@gmail.com Building LO with this patch now. I will report my findings asap. 2013/4/9 Cao Cuong Ngo (via Code Review) ger...@gerrit.libreoffice.org Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3285 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/corerefs/changes/85/3285/1 fdo#47018 fix Impress crash on modifying bullet Add verifying of numbering rule to avoid invalidated attribute Change-Id: Ifc3db3f09f9358d272245f1e00fad2802f5881ee --- M sd/source/ui/func/fuolbull.cxx 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index ae29032..49fd245 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -22,6 +22,7 @@ #include svl/intitem.hxx #include editeng/outliner.hxx #include editeng/eeitem.hxx +#include editeng/numitem.hxx #include sfx2/request.hxx #include editeng/editdata.hxx @@ -64,7 +65,16 @@ SfxItemSet aNewAttr( mpViewShell-GetPool(), EE_ITEMS_START, EE_ITEMS_END ); -aNewAttr.Put( aEditAttr, sal_False ); + +// fdo#47018 verify numbering rule +const SfxPoolItem* pItem; +sal_uInt16 nWhich = aEditAttr.GetPool()-GetWhich(SID_ATTR_NUMBERING_RULE); +aEditAttr.GetItemState(nWhich, sal_False, pItem); +const sal_uInt16 levelCount = (*((SvxNumBulletItem*)pItem)-GetNumRule()).GetLevelCount(); + +// check if the attribute is valid +if ( levelCount ) +aNewAttr.Put( aEditAttr, sal_False ); // create and execute dialog SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); -- To view, visit https://gerrit.libreoffice.org/3285 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc3db3f09f9358d272245f1e00fad2802f5881ee Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: distro-configs/LibreOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 74615ac7bd55755037c49f8fdfb29a5fc33c870c Author: Petr Mladek pmla...@suse.cz Date: Tue Apr 9 17:05:01 2013 +0200 Explicitely mention --disable-gio in distro-configs/LibreOfficeLinux.conf AFAIK, we could not use GIO for the release builds because they are built on too old system. GIO has got enabled by default but it can't be used together with GNOME VFS, so we need to explicitely disable it here. Change-Id: Ic5e64b0b5a7c000b9add2892a18bbc963ea2b900 diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 8219493..dbbdcb7 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -37,6 +37,7 @@ --enable-epm --enable-python=internal --enable-online-update +--disable-gio --disable-unix-qstart-libpng --disable-randr-link --disable-kde4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/templatelocalview.hxx |2 + sfx2/source/control/templatelocalview.cxx | 15 +++-- sfx2/source/control/thumbnailview.cxx | 42 - sfx2/source/control/thumbnailviewacc.cxx |2 - sfx2/source/doc/templatedlg.cxx | 50 +- sfx2/source/doc/templatedlg.src | 12 +++ 6 files changed, 91 insertions(+), 32 deletions(-) New commits: commit ff7a40c588bc37e5d6bcaf197ff46d86bdbd93a7 Author: Rafael Dominguez venccsra...@gmail.com Date: Sun Apr 7 22:26:28 2013 -0430 fdo#61389 - Display Properties, Set as default actions in save mode. It dosent make sense to display delete action since we are saving a template same for edit. Change-Id: I5532d3a7a7f5e6200419c2b7159c4d6fe40d16ea diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index d589454..9793d3c 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -308,6 +308,14 @@ void SfxTemplateManagerDlg::setSaveMode(bool bMode) mpViewBar-ShowItem(TBI_TEMPLATE_SAVE); mpViewBar-HideItem(TBI_TEMPLATE_IMPORT); mpViewBar-HideItem(TBI_TEMPLATE_REPOSITORY); + +mpTemplateBar-ShowItem(TBI_TEMPLATE_SAVE); +mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES); +mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT); +mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT); +mpTemplateBar-HideItem(TBI_TEMPLATE_MOVE); +mpTemplateBar-HideItem(TBI_TEMPLATE_EXPORT); +mpTemplateBar-HideItem(TBI_TEMPLATE_DELETE); } else { @@ -858,16 +866,22 @@ void SfxTemplateManagerDlg::OnTemplateState (const ThumbnailViewItem *pItem) if (pItem-isSelected()) { -if (!mbIsSaveMode) +if (maSelTemplates.empty()) { -if (maSelTemplates.empty()) +mpViewBar-Show(false); +mpTemplateBar-Show(); +} +else if (maSelTemplates.size() != 1 || !bInSelection) +{ +if (!mbIsSaveMode) { -mpViewBar-Show(false); -mpTemplateBar-Show(); +mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT); +mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES); +mpTemplateBar-HideItem(TBI_TEMPLATE_DEFAULT); } -else if (maSelTemplates.size() != 1 || !bInSelection) +else { -mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT); +mpTemplateBar-HideItem(TBI_TEMPLATE_SAVE); mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES); mpTemplateBar-HideItem(TBI_TEMPLATE_DEFAULT); } @@ -882,16 +896,22 @@ void SfxTemplateManagerDlg::OnTemplateState (const ThumbnailViewItem *pItem) { maSelTemplates.erase(pItem); -if (!mbIsSaveMode) +if (maSelTemplates.empty()) +{ +mpTemplateBar-Show(false); +mpViewBar-Show(); +} +else if (maSelTemplates.size() == 1) { -if (maSelTemplates.empty()) +if (!mbIsSaveMode) { -mpTemplateBar-Show(false); -mpViewBar-Show(); +mpTemplateBar-ShowItem(TBI_TEMPLATE_EDIT); +mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES); +mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT); } -else if (maSelTemplates.size() == 1) +else { -mpTemplateBar-ShowItem(TBI_TEMPLATE_EDIT); +mpTemplateBar-ShowItem(TBI_TEMPLATE_SAVE); mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES); mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT); } diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src index 1761118..27c7145 100644 --- a/sfx2/source/doc/templatedlg.src +++ b/sfx2/source/doc/templatedlg.src @@ -229,6 +229,18 @@ TabPage TAB_TEMPLATE_MANAGER { ToolBoxItem { +Identifier = TBI_TEMPLATE_SAVE; +Hide = TRUE; +Text [ en-US ] = Save; + +ItemImage = Image +{ +ImageBitmap = Bitmap { File = actionview028.png ; }; +}; +}; + +ToolBoxItem +{ Identifier = TBI_TEMPLATE_EDIT; Text [ en-US ] = Edit; commit ebebaf709af8bdfaf65cb7747c38fadc9ca02259 Author: Rafael Dominguez venccsra...@gmail.com Date: Sun Apr 7 21:46:11 2013 -0430 Display correct region name in error messages. Change-Id: I1e3eddf9be2a75faabf0b0be91f30d7e8d43d3e4 diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/sfx2/inc/sfx2/templatelocalview.hxx index bd1b431..6cefaf1 100644
GSoC 2013
ello everyone, I am a third year undergraduate student pursuing a degree in Information Systems. I am interested to work with LibreOffice for GSoC 2013. I have worked on Probabilistic Graphical Models with RooStats(CERN), for Google Summer of Code - 2012. The project consisted of construction and sampling of Bayesian Belief Networks. The code was in C++. I had taken up a formal course in Software Development for Portable Devices at my institution. The major component of this course was Android application development. As a semester project, I also developed an app for a travel startup. The app currently uses local server and the companies algorithms. It has to be ported on their server. The basic version of the app is ready, with few customizations required to be launched. Currently I am working on a team project on Wireless Network Management System, where my part is related with making the front-end user application for the system. It is a client-server application project. I am also experienced with UI design with Java, and am interested in doing a project in the same. I am really interested in Android Application Development. I have gone through the list of projects provided on GSoC-2013 Ideas page. I am interested in the following projects: - User Interface Projects - Improved Android / Impress Remote Control My skill set includes: C/C++, Java, basic Python, Android Application Development. Currently, I am going through the pointers provided. It would be great if anyone could provide insights on the same that could be helpful towards better execution of the project. Thank you . Shruti. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libmspub.git: src/lib
src/lib/Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0abccffca87c258e675a0b908d6a4ce69c46fac0 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Apr 9 17:15:57 2013 +0200 Fix a typo diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index ec25254..a7f6be6 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -15,7 +15,7 @@ AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_C libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@ libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_DEPENDENCIES = @LIBMSPUB_WIN32_RESOURCE@ -libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no_undefined +libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_SOURCES = \ MSPUBCollector.cpp \ MSPUBDocument.cpp \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: GSoC 2013
Hello everyone, I am a third year undergraduate student pursuing a degree in Information Systems. I am interested to work with LibreOffice for GSoC 2013. I have worked on Probabilistic Graphical Models with RooStats(CERN), for Google Summer of Code - 2012. The project consisted of construction and sampling of Bayesian Belief Networks. The code was in C++. I had taken up a formal course in Software Development for Portable Devices at my institution. The major component of this course was Android application development. As a semester project, I also developed an app for a travel startup. The app currently uses local server and the companies algorithms. It has to be ported on their server. The basic version of the app is ready, with few customizations required to be launched. Currently I am working on a team project on Wireless Network Management System, where my part is related with making the front-end user application for the system. It is a client-server application project. I am also experienced with UI design with Java, and am interested in doing a project in the same. I am really interested in Android Application Development. I have gone through the list of projects provided on GSoC-2013 Ideas page. I am interested in the following projects: - User Interface Projects (esp. the Start Center, Dialog Widget Conversion and Revamp the gallery tool) - Improved Android / Impress Remote Control My skill set includes: C/C++, Java, basic Python, Android Application Development. Currently, I am going through the pointers provided. It would be great if anyone could provide insights on the same that could be helpful towards better execution of the project. Thank you . Shruti. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63290 UI: Goal Seek - incorrect term current cell
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3291 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3291/1 fdo#63290 UI: Goal Seek - incorrect term current cell Change-Id: I0542d9918d9dbbfdc002b7fadec1bb461cbd2831 --- M sc/source/ui/src/globstr.src 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 06d1170..d042e38 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -447,11 +447,11 @@ }; String STR_MSSG_SOLVE_1 { -Text [ en-US ] = Insert result ( ; +Text [ en-US ] = Result ( ; }; String STR_MSSG_SOLVE_2 { -Text [ en-US ] = ) into current cell? ; +Text [ en-US ] = ). Apply setting to spreadsheet? ; }; String STR_MSSG_SOLVE_3 { -- To view, visit https://gerrit.libreoffice.org/3291 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0542d9918d9dbbfdc002b7fadec1bb461cbd2831 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: claims of python unit test un-debugability considered somewhat exaggerated
On Tue, 2013-04-09 at 11:22 +0100, Michael Meeks wrote: Hi guys, On Mon, 2013-04-08 at 11:32 -0600, Tom Tromey wrote: CCing David Malcolm. Michael (gdb) py-bt I just wanted to mention here that Phil Muldoon is working on a frame filter patch series that is basically pretty printing for stack frames. With this in place you'll no longer need a special command -- with appropriate support from Python, you'll be able to see interpreted frames interleaved with the low-level C frames. Oh - nice ! :-) This series is nearing final review now and should appear in gdb 7.7, later this year. Excellent news indeed. I think we're planning to rewrite the existing py-bt code into frame filter form ourselves. So - in which case this significantly reduces the problems of using python for debugging; I assume that with py-bt - there are still issues with interleaving two tools for printing parts of backtraces when we call several times to and fro between C++ and python. Eventually we'd like to have more full support for mixed interpreter and C debugging. However this is a ways off. For me, clearly seeing the python line numbers is the key rather than the interpreter details - we treat python itself as working black-box - and the script itself as the problem ;-) Aha. Sorry; I came into this discussion halfway though. I wrote the Python gdb hooks for CPython itself (i.e. py-bt and others). You can see documentation for them here: http://docs.python.org/devguide/gdb.html#gdb-7-and-later In particular: (gdb) py-list should give you python source code for the current python frame. So - re-examining my requirements: + debug-ability - when the test fails - and the best tests are written to fail regularly ;-) we need to be able -very-simply- to get a backtrace we can work with - without a ton of training, reading a dozen wiki pages, poking for obscure symbols, etc. Michael - as/when a python unit test fails - can we make the magic environment variables that are listed include some debugging instructions that include the py-bt detail etc. so that everything needed is in the failure message ? when we're in the automatic trace collection mode (I forget what env. var that is) do we dump the python pieces as well ? Also - can we distribute / include / install the magic that makes 'py-bt' work - not sure it works for me (on openSUSE - at least a facile start gdb, type py-bt fails in spades ;-) On Fedora we package the python-gdb.py code so it appears in the python-debuginfo rpm and is in the correct path so that it gets autoloaded by gdb when libpython2.7.so is debugged. Specifically (quoting Fedora's python3.spec): # We install a collection of hooks for gdb that make it easier to debug # executables linked against libpython3* (such as /usr/bin/python3 itself) # # These hooks are implemented in Python itself (though they are for the version # of python that gdb is linked with, in this case Python 2.7) # # gdb-archer looks for them in the same path as the ELF file, with a -gdb.py suffix. # We put them in the debuginfo package by installing them to e.g.: # /usr/lib/debug/usr/lib/libpython3.2.so.1.0.debug-gdb.py # # See https://fedoraproject.org/wiki/Features/EasierPythonDebugging for more # information # # Copy up the gdb hooks into place; the python file will be autoloaded by gdb # when visiting libpython.so, provided that the python file is installed to the # same path as the library (or its .debug file) plus a -gdb.py suffix, e.g: # /usr/lib/debug/usr/lib64/libpython3.2.so.1.0.debug-gdb.py # (note that the debug path is /usr/lib/debug for both 32/64 bit) # # Initially I tried: # /usr/lib/libpython3.1.so.1.0-gdb.py # but doing so generated noise when ldconfig was rerun (rhbz:562980) # %if 0%{?with_gdb_hooks} DirHoldingGdbPy=%{_prefix}/lib/debug/%{_libdir} PathOfGdbPy=$DirHoldingGdbPy/$PyInstSoName.debug-gdb.py mkdir -p %{buildroot}$DirHoldingGdbPy cp Tools/gdb/libpython.py %{buildroot}$PathOfGdbPy %endif # with_gdb_hooks + that backtrace should not have big, opaque chunks that are either empty (cf. Java) or point to random / irrelevant pieces of C/C++ interpreter code - Python / StarBasic others. It should allow interactive inspection of variables up and down the stack. It seems that this is getting towards working on modern Linux systems. Do we get variable inspection sorted out there as well ? py-locals py-print + reliability and performance: new unit tests should be small, fast, non-duplicative (ie. re-using existing code frameworks) I guess re-using the existing C++ test code / bootstrapping framework mostly avoids duplication here; and either way unit tests are (sadly) one of the more duplicative pieces
Re: [PATCH] WIP: Convert scalc delete contents dialog to .ui
On Mon, 2013-04-08 at 17:52 +0200, Albert Thuswaldner wrote: I almost completed the conversion of the Delete Contents dialog in Calc (see patch #1) What's missing from your patch is the .ui file itself, do a git add /path/to/that/file.ui and git commit --amend What I didn't manage to do was to completely kill the resource id RID_SCDLG_DELCONT How to handle these things are not covered in your tutorial, at least I could not find that... Yeah, so the removal of .src and .hrc stuff is a happy-sideeffect of moving to .ui files, but there are some cases where some .src contents remain (until e.g. we move over to gettext) and some cases where .hrc defines have been reused for non-resource files purposes (where the long-term thing will be to just move them into .hxx files) But in this particular case it so happens (common enough occurrence) that the remaining .hrc define can be removed anyway. See attached. I am also scratching my head over the hid key in the help file, not sure I got that right ( see patch #2 ) Looks about right to me. What I would do in addition is to take one of the two duplicated hid/.uno:Delete bookmarks and change one to be the fallback toplevel dialog help e.g. hid/modules/scalc/ui/deletecontents/DeleteContentsDialog C. From c01fdc694b4a150c960e66f4e10c36b9018bf79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com Date: Tue, 9 Apr 2013 16:17:59 +0100 Subject: [PATCH] we can remove RID_SCDLG_DELCONT Change-Id: I8edc9210bc172cd285fe4dce54d30606ecc7c716 --- sc/inc/sc.hrc | 2 +- sc/inc/scabstdlg.hxx | 4 ++-- sc/source/ui/attrdlg/scdlgfact.cxx | 19 --- sc/source/ui/attrdlg/scdlgfact.hxx | 4 ++-- sc/source/ui/view/cellsh1.cxx | 2 +- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 0b460be..9d85a5a 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -953,7 +953,7 @@ #define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9) #define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11) #define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) -#define RID_SCDLG_DELCONT (SC_DIALOGS_START + 13) + #define RID_SCDLG_INSCONT (SC_DIALOGS_START + 14) #define RID_SCDLG_MOVETAB (SC_DIALOGS_START + 15) #define RID_SCDLG_STRINPUT (SC_DIALOGS_START + 16) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 14de680..7b6c602 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -363,8 +363,8 @@ public: //for dataform virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell ) = 0 ; //add for ScDataFormDlg -virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg - sal_uInt16 nCheckDefaults = 0 ) = 0; +virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg +sal_uInt16 nCheckDefaults = 0) = 0; virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*pParent, //add for ScFillSeriesDlg ScDocument rDocument, FillDir eFillDir, diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 9ca906a..b6ce1f8 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -873,22 +873,11 @@ AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window -AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, - sal_uInt16 nCheckDefaults ) +AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent, + sal_uInt16 nCheckDefaults) { -ScDeleteContentsDlg * pDlg=NULL; -switch ( nId ) -{ -case RID_SCDLG_DELCONT : -pDlg = new ScDeleteContentsDlg( pParent, nCheckDefaults ); -break; -default: -break; -} - -if ( pDlg ) -return new AbstractScDeleteContentsDlg_Impl( pDlg ); -return 0; +ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg(pParent, nCheckDefaults); +return new AbstractScDeleteContentsDlg_Impl( pDlg ); } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 65298a3..823eaeb 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -430,8 +430,8 @@ public: //for dataform virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d947b1f1ad3571c90991420d500eb81e7cd84fed Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Apr 9 16:54:02 2013 +0200 disable cached value import for ODS for now, fdo#60215 Change-Id: I714e75112727f5ebcd8cc55cf4f70dd15eb9b810 Reviewed-on: https://gerrit.libreoffice.org/3290 Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com Tested-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index ee5c513..d77c260 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1558,7 +1558,7 @@ /info /enumeration /constraints -value1/value +value0/value /prop /group /group ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] disable cached value import for ODS for now, fdo#60215
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3290 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3290 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I714e75112727f5ebcd8cc55cf4f70dd15eb9b810 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||63311 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Joel Madero jmadero@gmail.com changed: What|Removed |Added CC||jmadero@gmail.com --- Comment #133 from Joel Madero jmadero@gmail.com --- Added bug 63311 - this bug prevents users from removing text from draw and then resave a document. Text reappears upon opening document again (despite a save looking like it happened) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Amazon Cloud
Florian Effenberger wrote Hello, we have received a voucher for the Amazon Cloud, and after playing with it for a while, I think it could be a good extension for our current infrastructure. [...] Anyone has already experience with using the Amazon Cloud for compiling? Hi! Mozilla moved Firefox build/testing infrastructure to AWS. You should check following resources and ask the Mozilla people in person for details: http://oduinn.com/blog/2012/07/11/releng-production-systems-go-hybrid-now-available-on-aws/ http://oduinn.com/blog/2012/11/27/releng-production-systems-now-in-3-aws-regions/ http://atlee.ca/blog/2012/12/14/behind-the-clouds/ http://atlee.ca/blog/2013/02/01/now-testing-firefox-in-aws/ Best regards. -- View this message in context: http://nabble.documentfoundation.org/Amazon-Cloud-tp4047077p4048837.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 10 commits - framework/inc framework/source offapi/com
framework/inc/services/layoutmanager.hxx | 12 -- framework/inc/uielement/addonstoolbarwrapper.hxx |1 framework/inc/uielement/toolbarmanager.hxx| 32 ++- framework/inc/uielement/toolbarwrapper.hxx|1 framework/source/layoutmanager/layoutmanager.cxx | 63 ++ framework/source/uielement/addonstoolbarwrapper.cxx |2 framework/source/uielement/toolbarmanager.cxx | 71 +++- framework/source/uielement/toolbarmerger.cxx | 77 ++ framework/source/uielement/toolbarsmenucontroller.cxx | 34 +++ framework/source/uielement/toolbarwrapper.cxx |2 offapi/com/sun/star/ui/ItemStyle.idl | 20 11 files changed, 129 insertions(+), 186 deletions(-) New commits: commit 2dc7318d845552a45aeb4f87ce8c333e51dca908 Author: Jan Holesovsky ke...@suse.cz Date: Tue Apr 9 17:43:44 2013 +0200 Kill not necessasy OUString member variables. Change-Id: I1bbfd19bc70fc12ac5dc5fdb18c556f4dc5300cb diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 74d866e..c604dde 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -321,18 +321,6 @@ namespace framework css::uno::Reference ::com::sun::star::container::XNameAccess m_xPersistentWindowStateSupplier; GlobalSettings* m_pGlobalSettings; OUString m_aModuleIdentifier; -OUString m_aStatusBarAlias; -OUString m_aProgressBarAlias; -OUString m_aPropDocked; -OUString m_aPropVisible; -OUString m_aPropDockingArea; -OUString m_aPropDockPos; -OUString m_aPropPos; -OUString m_aPropSize; -OUString m_aPropUIName; -OUString m_aPropStyle; -OUString m_aPropLocked; -OUString m_aCustomizeCmd; sal_Int16 m_eSymbolsSize; sal_Int16 m_eSymbolsStyle; Timer m_aAsyncLayoutTimer; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 1ceb6b4..e8b8358 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -99,6 +99,9 @@ using namespace ::com::sun::star::frame; // You have to change BOTH values, see sfx2/inc/sfx2/sfxsids.hrc (SID_DOCKWIN_START) static const sal_Int32 DOCKWIN_ID_BASE = 9800; +static const char STATUS_BAR_ALIAS[] = private:resource/statusbar/statusbar; +static const char PROGRESS_BAR_ALIAS[] = private:resource/progressbar/progressbar; + namespace framework { @@ -134,26 +137,14 @@ LayoutManager::LayoutManager( const Reference XMultiServiceFactory xServiceM , m_xUIElementFactoryManager( ui::UIElementFactoryManager::create(comphelper::getComponentContext(xServiceManager)) ) , m_xPersistentWindowStateSupplier( ui::WindowStateConfiguration::create( comphelper::getComponentContext(xServiceManager) ) ) , m_pGlobalSettings( 0 ) -, m_aStatusBarAlias( private:resource/statusbar/statusbar ) -, m_aProgressBarAlias( private:resource/progressbar/progressbar ) -, m_aPropDocked( WINDOWSTATE_PROPERTY_DOCKED ) -, m_aPropVisible( WINDOWSTATE_PROPERTY_VISIBLE ) -, m_aPropDockingArea( WINDOWSTATE_PROPERTY_DOCKINGAREA ) -, m_aPropDockPos( WINDOWSTATE_PROPERTY_DOCKPOS ) -, m_aPropPos( WINDOWSTATE_PROPERTY_POS ) -, m_aPropSize( WINDOWSTATE_PROPERTY_SIZE ) -, m_aPropUIName( WINDOWSTATE_PROPERTY_UINAME ) -, m_aPropStyle( WINDOWSTATE_PROPERTY_STYLE ) -, m_aPropLocked( WINDOWSTATE_PROPERTY_LOCKED ) -, m_aCustomizeCmd( ConfigureDialog ) , m_aListenerContainer(
[PATCH] bridge_lib_name is $(gb_CPPU_ENV)_uno
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3292 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3292/1 bridge_lib_name is $(gb_CPPU_ENV)_uno Change-Id: I1520d78c378f8c48d65defb22c4c77277bd061f7 --- M Repository.mk M bridges/Library_cpp_uno.mk M solenv/gbuild/platform/WNT_X86_64_MSC.mk 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/Repository.mk b/Repository.mk index b45782c..53c472d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -430,7 +430,7 @@ affine_uno \ cli_cppuhelper \ cli_uno \ - gcc3_uno \ + $(gb_CPPU_ENV)_uno \ getuid \ java_uno \ jpipe \ @@ -449,8 +449,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ jpipx \ - msci_uno \ - mscx_uno \ )) endif diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 7ce51f5..f7153c3 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -7,17 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(COM),GCC) -bridge_lib_name := gcc3_uno -else ifeq ($(COM),MSC) -ifeq ($(CPU),I) -bridge_lib_name := msci_uno -else ifeq ($(CPU),X) -bridge_lib_name := mscx_uno -endif # COM=WNT -endif - -$(eval $(call gb_Library_Library,$(bridge_lib_name))) +$(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno)) ifeq ($(OS)$(CPU),AIXP) @@ -157,24 +147,24 @@ endif -$(eval $(call gb_Library_use_external,$(bridge_lib_name),boost_headers)) +$(eval $(call gb_Library_use_external,$(gb_CPPU_ENV)_uno,boost_headers)) -$(eval $(call gb_Library_use_internal_comprehensive_api,$(bridge_lib_name),\ +$(eval $(call gb_Library_use_internal_comprehensive_api,$(gb_CPPU_ENV)_uno,\ udkapi \ )) -$(eval $(call gb_Library_set_include,$(bridge_lib_name),\ +$(eval $(call gb_Library_set_include,$(gb_CPPU_ENV)_uno,\ -I$(SRCDIR)/bridges/inc \ $$(INCLUDE) \ )) ifeq ($(HAVE_POSIX_FALLOCATE),YES) -$(eval $(call gb_Library_add_defs,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\ -DHAVE_POSIX_FALLOCATE \ )) endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_defs,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\ $(if $(filter GCC,$(COM)),\ $(if $(filter sjlj,$(EXCEPTIONS)),\ -DBROKEN_ALLOCA \ @@ -205,31 +195,31 @@ endif endif -$(eval $(call gb_Library_use_libraries,$(bridge_lib_name),\ +$(eval $(call gb_Library_use_libraries,$(gb_CPPU_ENV)_uno,\ cppu \ sal \ )) $(foreach obj,$(bridge_exception_objects),\ - $(eval $(call gb_Library_add_exception_objects,$(bridge_lib_name),\ + $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \ ) $(foreach obj,$(bridge_noopt_objects),\ - $(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\ + $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS))) \ ) $(foreach obj,$(bridge_cxx_objects),\ - $(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\ + $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \ ) $(foreach obj,$(bridge_asm_objects),\ -$(eval $(call gb_Library_add_asmobjects,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_asmobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \ ) -$(eval $(call gb_Library_add_exception_objects,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ bridges/source/cpp_uno/shared/types \ @@ -238,7 +228,7 @@ bridges/source/cpp_uno/shared/vtables \ )) -$(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/shared/cppinterfaceproxy \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) diff --git a/solenv/gbuild/platform/WNT_X86_64_MSC.mk b/solenv/gbuild/platform/WNT_X86_64_MSC.mk index 7a54dcb..dc6f585 100644 --- a/solenv/gbuild/platform/WNT_X86_64_MSC.mk +++ b/solenv/gbuild/platform/WNT_X86_64_MSC.mk @@ -26,7 +26,7 @@ # #* -gb_CPPU_ENV := msc6 +gb_CPPU_ENV := mscx gb_CPUDEFS := -D_AMD64_=1 include $(GBUILDDIR)/platform/com_MSC_defs.mk -- To view, visit https://gerrit.libreoffice.org/3292 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1520d78c378f8c48d65defb22c4c77277bd061f7 Gerrit-PatchSet: 1 Gerrit-Project: core
Re: GSoC 2013
Hi Shruti, On Tue, 2013-04-09 at 20:42 +0530, shruti gupta wrote: I am a third year undergraduate student pursuing a degree in Information Systems. I am interested to work with LibreOffice for GSoC 2013. Sounds like you have a great skill set :-) welcome to LibreOffice. I am really interested in Android Application Development. I have gone through the list of projects provided on GSoC-2013 Ideas page. I am interested in the following projects: There is already significant interest in the Android / Impress Remote and some very good candidates that I'm aware of - it is also a task that can only accept one student. * User Interface Projects This is a scalable task though: https://wiki.documentfoundation.org/Development/Gsoc/Ideas#Dialog_Widget_Conversion Which would be fun and useful too - and potentially have some application to mobile devices if we can map glade-XML to native android widgets in some cases in the future. In general though we're trying to significantly reduce LibreOffice's dependence on Java - since we can't rely on it being there on Windows, and of course the first use pays a very heavy JVM bootstrap penalty. My skill set includes: C/C++, Java, basic Python, Android Application Development. It's a good set; have you considered this project: https://wiki.documentfoundation.org/Development/Gsoc/Ideas#Package_and_improving_LibreOffice_Viewer_for_Android It might match your skills well. Currently, I am going through the pointers provided. It would be great if anyone could provide insights on the same that could be helpful towards better execution of the project. Failing that - there was a task to do some work on pluggable python UI that Matus might be able to specify / mentor you for: to allow arbitrary python scripts / extensions to render arbitrary UI elements in place of our current toolbars / menus. That might fit your skill set well if you're interested in UI hacking. Matus - when you've done your setup / heavy-lifting there it would be great to get a GSOC task specced up here. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - 2 commits - framework/source sc/source sfx2/inc sfx2/source starmath/source sw/source
framework/source/loadenv/loadenv.cxx |2 + sc/source/ui/unoobj/scdetect.cxx |8 ++-- sfx2/inc/sfx2/docfilt.hxx| 64 ++- sfx2/source/bastyp/fltfnc.cxx|4 +- sfx2/source/dialog/filedlghelper.cxx |2 - sfx2/source/doc/docfilt.cxx | 60 ++-- sfx2/source/doc/objcont.cxx |2 - starmath/source/document.cxx |2 - sw/source/core/doc/docglbl.cxx |2 - sw/source/ui/app/docsh.cxx |2 - sw/source/ui/dbui/dbmgr.cxx |2 - 11 files changed, 80 insertions(+), 70 deletions(-) New commits: commit b2288e8282bce091c5a31b85e3fe75666140dcda Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Apr 9 13:00:25 2013 -0400 Get the whole thing to build after the SfxFilter interface change. Change-Id: I62122e298f1434aa9e44c8f3fdfb7f710513617d diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 33956f1..86646d5 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -744,6 +744,7 @@ bool queryOrcusTypeAndFilter(const uno::Sequencebeans::PropertyValue rDescrip rFilter = gnumeric; return true; } +#if 0 else if (aURL.endsWith(.xlsx)) { rType = generic_Text; @@ -756,6 +757,7 @@ bool queryOrcusTypeAndFilter(const uno::Sequencebeans::PropertyValue rDescrip rFilter = ods; return true; } +#endif return false; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index e40be82..6d8a7dc 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -432,9 +432,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequencebeans::PropertyValue l SvStream* pStream = aMedium.GetInStream(); const SfxFilter* pPreselectedFilter = pFilter; bool bCsvSelected = (pPreselectedFilter -pPreselectedFilter-GetFilterName().EqualsAscii( pFilterAscii )); + pPreselectedFilter-GetFilterName().equalsAscii(pFilterAscii)); bool bExcelSelected = (pPreselectedFilter -(pPreselectedFilter-GetName().SearchAscii(Excel) != STRING_NOTFOUND)); +(pPreselectedFilter-GetName().indexOf(Excel) = 0)); bool bIsXLS = (bExcelSelected || (bCsvSelected !aPreselectedFilterName.Len())); pFilter = 0; if ( pStream ) @@ -671,7 +671,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequencebeans::PropertyValue l pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterAscii) ); bFakeXLS = true; } -else if ( pPreselectedFilter-GetName().EqualsAscii(pFilterDBase) lcl_MayBeDBase( rStr ) ) +else if ( pPreselectedFilter-GetName().equalsAscii(pFilterDBase) lcl_MayBeDBase( rStr ) ) pFilter = pPreselectedFilter; else if ( bCsvSelected bMaybeText ) pFilter = pPreselectedFilter; @@ -686,7 +686,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequencebeans::PropertyValue l // foo br bar with a preselected CSV // filter. So keep this detection to the end. -if ( pPreselectedFilter-GetName().EqualsAscii(pFilterHtml) ) +if (pPreselectedFilter-GetName().equalsAscii(pFilterHtml)) { pFilter = pPreselectedFilter; } diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 37e0b4d..0e2aa3e 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -970,7 +970,7 @@ sal_Bool SmDocShell::ConvertTo( SfxMedium rMedium ) aEquation.SetFlat(sal_True); bRet = aEquation.Export(rMedium); } -else if( pFlt-GetFilterName().EqualsAscii(MathType 3.x)) +else if (pFlt-GetFilterName().equalsAscii(MathType 3.x)) bRet = WriteAsMathType3( rMedium ); } return bRet; diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index ddac41e..5c0eb98 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -214,7 +214,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String rPath, bool bOutline, c GetIDocumentUndoRedo().DoUndo(false); SetRedlineMode_intern( (RedlineMode_t)(GetRedlineMode() ~nsRedlineMode_t::REDLINE_ON)); -String sExt( pFilter-GetSuffixes().GetToken(0, ',') ); +String sExt = pFilter-GetSuffixes().getToken(0, ','); if(
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/docfile.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit d19fea219ad8d75eeef78629a2a0e0d59ab293d9 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Apr 9 13:05:58 2013 -0400 Oops. Forgot to remove this debug statement. Change-Id: I8d7d308ee913f61b7f4a9cf9d83158a32bb0c1e5 diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index edd5fed..44f8d9d 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2880,7 +2880,6 @@ SfxMedium::SfxMedium( const uno::Sequencebeans::PropertyValue aArgs ) : aFilterProvider = static_castconst SfxStringItem*(pItem)-GetValue(); } -fprintf(stdout, SfxMedium::SfxMedium: filter provider = '%s'\n, rtl::OUStringToOString(aFilterProvider, RTL_TEXTENCODING_UTF8).getStr()); if (aFilterProvider.isEmpty()) { // This is a conventional filter type. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - sfx2/source
sfx2/source/doc/docfile.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit f0439aa0ab430a570b4250ad9cf64710ca3566e1 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Apr 9 13:05:58 2013 -0400 Oops. Forgot to remove this debug statement. Change-Id: I8d7d308ee913f61b7f4a9cf9d83158a32bb0c1e5 diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index edd5fed..44f8d9d 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2880,7 +2880,6 @@ SfxMedium::SfxMedium( const uno::Sequencebeans::PropertyValue aArgs ) : aFilterProvider = static_castconst SfxStringItem*(pItem)-GetValue(); } -fprintf(stdout, SfxMedium::SfxMedium: filter provider = '%s'\n, rtl::OUStringToOString(aFilterProvider, RTL_TEXTENCODING_UTF8).getStr()); if (aFilterProvider.isEmpty()) { // This is a conventional filter type. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Better icon names/ easier icon themes (fdo#30425)
Hi Rodolfo, On Tue, 2013-04-09 at 10:40 -0300, Rodolfo wrote: I'm thinking (again) on work on this request. That is an old easy-hack :-) Looking at the code, I got that icons for UNO commands are derived by prepending lc_ or sc_ to the command name (with lower case). Correct. So, if someone think it's good enough to reuse an icon (like a Next arrow), it will duplicate images files, am I right? Also correct. Shouldn't the icon theme decides what image it's used to each thing? An xml file could bind them (image name - uno command name). And then, internally keep (yeckt) using hrc/src files to binding them to numeric ids. Well, we could include a text file with a mapping from uno command - image name in the code if you want; it might even not slow us down too horribly at startup if we're lucky ;-) [ perhaps we might save something from reducing duplication ]. Any thoughts? Or should I just rename the images (and their references in hrc/src files)? In general short filenames have some benefits - they are duplicated twice un-compressed in each .zip file - in the directory and also in the zip pre-amble to each file. We saved a chunk of space there by moving a ton of images into cmd/ instead of res/commandimagelist/ - there are a lot of icons. P.S.: I remember I saw a wiki page about this issue, but I can't find it. Does anyone know where is it? Not sure; ace_dent had a nice Google Docs spreadsheet of things to fix back in the day - but we fixed ~all of them IIRC. So - I'd like a clearer idea of what we want to achieve in fdo#30425 before going too much further. In particular, we can't rename UNO commands without breaking backwards compatibility - so IMHO the only really useful approach here is to have a mapping. Perhaps starting by adding a concept of textual symlinks (to reduce duplication) that are theme specific might be helpful. You can see where images are loaded: vcl/source/gdi/impimagetree.cxx IIRC there is really only one 'real' method there: doLoadImage - I guess we could build a symlink cache in there that would (on first icon lookup) try to load parse a 'links.txt' file in the .zip (preferably we'd pack that at the beginning), that had: cmd/lc_notthere.png cmd/lc_isthere.png ... or whatever (?). How does that sound ? :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild: i will have my build with less zips, please
Hi David, On Tue, 2013-04-09 at 15:27 +0200, David Tardon wrote: at the end of the last week, there landed in master a new feature that will allow us to do less zipping during build (and unzipping during installation). Nice work indeed ! :-) hopefully that will significantly speed up make_installer.pl's overly-long-winded labours. In the near future, I am going to look for some harder cases where this might be applied. My latest branch (posted for review/test builds on gerrit) adapts installation of uiconfig files and avoids the need for special processing in postprocess. Great work; thanks for that ! Having said that, I'm still suspicious that we prolly want to zip up and distribute as a .zip our .uiconfig files for reasons of size, fragmentation and reducing general packaging overhead waste ? ;-) but of course I'm not volunteering to write the impimagetree.cxx type impl. to make that fly yet ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: plans with libmerged
Hi Matus, On Tue, 2013-04-09 at 15:25 +0200, Matúš Kukan wrote: So - it should now work in master. One problem is using ure libraries in libmerged. javaldx had problems to find libmerged because it's not in ure. Right; interesting. I plan to merge some urelibs and see how it works but that can't be used in regular builds I am afraid because of compatibility issues. And maybe some more regular libraries. So - it is probable that the GNU linker for Linux at least, tolerates symlinks very nicely. So, I -suspect- that as long as you create compatibility symlinks: ln -s program/libmerged.so ure/lib/libuno_sal.so.3 etc. then I imagine the run-time linker will work out they're all the same (massive) library and link it just once; while ensuring that other things linked to the original URE (like extensions) carry on working. But that needs careful testing obviously. Of course, that's a Linux-only hack, but ... it might work nicely - I'd be interested to know :-) It seems to me that the biggest benefits of LTO would come from in-lining lots of sal/ stuff - string methods etc. Anyhow - glad that libmerged is working nicely again. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 7 commits - codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk connectivity/CppunitTest_connectivit
RepositoryExternal.mk| 20 +++ codemaker/StaticLibrary_codemaker.mk |1 codemaker/StaticLibrary_codemaker_cpp.mk |1 codemaker/StaticLibrary_codemaker_java.mk|1 connectivity/CppunitTest_connectivity_commontools.mk |4 +++ extensions/Module_extensions.mk |5 icu/ExternalProject_icu.mk |2 - idlc/Executable_idlc.mk |7 +++--- nss/ExternalProject_nss.mk |5 ++-- solenv/gbuild/LinkTarget.mk |2 + solenv/gbuild/WinResTarget.mk|7 +- solenv/gbuild/platform/WNT_INTEL_GCC.mk |2 + solenv/gbuild/platform/com_MSC_class.mk |5 soltools/Executable_cpp.mk |6 + soltools/Executable_makedepend.mk|6 ++--- 15 files changed, 59 insertions(+), 15 deletions(-) New commits: commit 0586be91e6f5099b46025b0d2e645669d2271c77 Author: David Tardon dtar...@redhat.com Date: Tue Apr 9 19:27:37 2013 +0200 move dep on solenv_inc to platform Change-Id: I86db3c7290e22491f41d198dfb53e01f6bbdc50c diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index 48d5b72..d88375e 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -2,6 +2,9 @@ # WinResTarget class +# defined by platform: +# gb_WinResTarget_WinResTarget_platform + gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS) define gb_WinResTarget_WinResTarget @@ -17,6 +20,8 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLAR $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_target,$(1)) : RCFILE := +$(call gb_WinResTarget_WinResTarget_platform,$(1)) + ifeq ($(gb_FULLDEPS),$(true)) $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS) $(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side) @@ -33,7 +38,7 @@ $(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target) endif -$(call gb_WinResTarget_get_target,%) : $(call gb_Package_get_target,solenv_inc) +$(call gb_WinResTarget_get_target,%) : $(call gb_WinResTarget__command,$@,$*,$) $(call gb_WinResTarget_get_clean_target,%) : diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index ecb829e..3529741 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -349,6 +349,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(RCFILE) ) endef +gb_WinResTarget_WinResTarget_platform := + $(eval $(call gb_Helper_make_dep_targets,\ WinResTarget \ )) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 55aff01..e3f121e 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -505,6 +505,11 @@ $(call gb_Helper_abbreviate_dirs,\ $(RCFILE) ) endef +define gb_WinResTarget_WinResTarget_platform +$(call gb_WinResTarget_get_target,$(1)) : $(call gb_Package_get_target,solenv_inc) + +endef + $(eval $(call gb_Helper_make_dep_targets,\ WinResTarget \ )) commit 203cb5d967816d0a626a56556de67e2bef049121 Author: David Tardon dtar...@redhat.com Date: Tue Apr 9 19:23:33 2013 +0200 only build WinResTarget on windows Change-Id: I144e89996fb980514f4031d0e2aa0d0ced529d35 diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 0e12f94..79a39c2 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -125,8 +125,13 @@ $(eval $(call gb_Module_add_targets,extensions,\ Executable_nsplugin \ Library_npsoplugin \ StaticLibrary_npsoenv \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,extensions,\ WinResTarget_npsoplugin \ )) +endif endif # ENABLE_NPAPI_INTO_BROWSER=YES commit 75c2c58a6c9d0c172c71d1654642474e657ce7e3 Author: David Tardon dtar...@redhat.com Date: Tue Apr 9 19:06:26 2013 +0200 add external for unistd.h Change-Id: I728b162e21a7a2c02cb76af110cc0a01a762fdbd diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d4e4426..927a123 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -125,6 +125,26 @@ endef endif +ifeq ($(OS)$(COM),WNTMSC) + +define gb_ExternalProject__use_unistd_headers +$(call gb_ExternalProject_use_package,$(1),soltools_inc) + +endef + +define gb_LinkTarget__use_unistd_headers +$(call gb_LinkTarget_use_package,$(1),soltools_inc) + +endef + +else # ! ($(OS)$(COM),WNTMSC) + +gb_ExternalProject__use_unistd_headers := + +gb_LinkTarget__use_unistd_headers := + +endif + ifeq ($(SYSTEM_VIGRA),YES)
[PATCH] fix typo in xml version
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3293 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3293/1 fix typo in xml version Change-Id: Icf22bc1b89a9d536e4eb31afe035218c425be71a --- M starmath/uiconfig/smath/menubar/menubar.xml 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 6358f0a..8a4d7c9 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -1,4 +1,4 @@ -?xml version=0.0 encoding=UTF-8? +?xml version=1.0 encoding=UTF-8? !-- * This file is part of the LibreOffice project. * -- To view, visit https://gerrit.libreoffice.org/3293 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf22bc1b89a9d536e4eb31afe035218c425be71a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] drop undefined file IDs
David Tardon has uploaded a new patch set (#2). Change subject: drop undefined file IDs .. drop undefined file IDs Change-Id: I5650327429118ad52e82050039dd237c2ff32286 --- M scp2/source/calc/module_calc.scp M scp2/source/draw/module_draw.scp M scp2/source/ooo/module_hidden_ooo.scp M scp2/source/writer/module_writer.scp 4 files changed, 2 insertions(+), 14 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3236/2 -- To view, visit https://gerrit.libreoffice.org/3236 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5650327429118ad52e82050039dd237c2ff32286 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH]BUG#57950 Replace chained O(U)StringBuffer::append() with operator+
Hey! I am hereby attaching my patch on fdo#57950 where the .append() calls are replaced by + operator. Regards, Janit On Tue, Apr 9, 2013 at 7:00 PM, Janit Anjaria jani...@gmail.com wrote: Hey Thorsten! As a mentor it would be great if you review my bug and tell me if i need to further make any kinda changes. Then i would email it on the list. Regards, Janit 0001-fdo-57950-Replace-chained-O-U-StringBuffer-append-wi.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] [ANN] LibreOffice 3.6.6 RC2 available
Hi all, On Mon, Apr 08, 2013 at 09:15:33AM +0200, Thorsten Behrens wrote: The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ ... and Ubuntu users can test the versions for Ubuntu 12.10 (quantal) and Ubuntu 12.04 (LTS precise) at this ppa: https://launchpad.net/~libreoffice/+archive/libreoffice-3-6 for a few days already. Sorry for the late notification. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Question regarding a check in configure for XML::Parser
I am looking at Archive::Zip in configure file { echo $as_me:$LINENO: checking for required Perl modules 5 echo $ECHO_N checking for required Perl modules... $ECHO_C 6; } if `$PERL -e 'use Archive::Zip; use Cwd; use Digest::MD5'`; then { echo $as_me:$LINENO: result: all modules found 5 echo ${ECHO_T}all modules found 6; } else { { echo $as_me:$LINENO: error: Failed to find some modules 5 echo $as_me: error: Failed to find some modules 2;} { (exit 1); exit 1; }; } fi Question becomes what do i need to do if there is an else to have it automatically installed during the script as it needs to be run as root. do i change the error and add details on how to install the module? -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - liblangtag/UnpackedTarball_langtag.mk sal/qa
liblangtag/UnpackedTarball_langtag.mk |2 +- sal/qa/osl/file/osl_File.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit dcde7d32a6a9b60b8642049a8dfb33d2b8bc7b92 Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 8 10:31:08 2013 +0100 no mkdtemp on AIX either Change-Id: I9103f86a5b8414c9cdf5fd3a2d662725343f0ed8 diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index b4cd2ee..b84e708 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -5996,7 +5996,7 @@ namespace osl_Directory if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1)) tmp_x += rtl::OString('/'); -#if !defined(WNT) !defined(ANDROID) +#if !defined(WNT) !defined(ANDROID) !defined(AIX) // FIXME would be nice to create unique dir even on Windows tmp_x += rtl::OString(XX); char *out = mkdtemp(const_castchar*(tmp_x.getStr())); commit 7df3ec713a72c3c21693587142ee31d0d93abf4a Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 8 09:28:35 2013 +0100 get liblangtag to build on AIX Change-Id: I770acf14cefbe53deea446df6e326d9fb5b52b04 diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk index 4ad5f82..e7d37d5 100644 --- a/liblangtag/UnpackedTarball_langtag.mk +++ b/liblangtag/UnpackedTarball_langtag.mk @@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ # https://github.com/tagoh/liblangtag/pull/8 Use xmlDocCopyNode to merge # nodes into different docs -ifeq ($(OS),MACOSX) +ifeq ($(filter-out MACOSX AIX,$(OS)),) $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ liblangtag/liblangtag-0.4.0-mac.patch \ liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH]BUG#55846 Comboboxes aren’t displayed when the toolbar is vertical
Hey! I am hereby attaching my bug after making all the needed changes : *I have removed all the unnecessary changes i had made to the code,i.e. i did undo all the useless changes i had made to the code,thereby cleaning up the code. *removed the command that gave the output : debug: max width 78 debug: max width 55 [...] *now i think the display also seems to be perfect and the purpose of this feature seems to be solved. Any kind of help and suggestions for future hacking would be appreciated. Regards, Janit On Tue, Apr 9, 2013 at 8:10 AM, Janit Anjaria jani...@gmail.com wrote: Hey Thorsten,Stefan , I just saw the patch,yes it definitely need clean up based on the white spaces ,and yeah the numbers in the patch are added so that the UI fixes right and hence the toolbar appears to be right.I am not sure about the reason why the icons dont appear in your case,as it does appear when i run the code on my machine. And regarding the following: debug: max width 388 debug: max width 78 debug: max width 55 [...] This is just an output for the debugging i had done for the UI purpose and yeah it would be fine,i would get that part of the code out. Regards, Janit On Tue, Apr 9, 2013 at 8:09 AM, Janit Anjaria jani...@gmail.com wrote: Hey Thorsten,Stefan , I just saw the patch,yes it definitely need clean up based on the white spaces ,and yeah the numbers in the patch are added so that the UI fixes right and hence the toolbar appears to be right.I am not sure about the reason why the icons dont appear in your case,as it does appear when i run the code on my machine. And regarding the following: debug: max width 388 debug: max width 78 debug: max width 55 [...] This is just an output for the debugging i had done for the UI purpose and yeah it would be fine,i would get that part of the code out. Regards, Janit On Tue, Apr 9, 2013 at 3:54 AM, Thorsten Behrens t...@documentfoundation.org wrote: Janit Anjaria wrote: I am hereby submitting my patch for review on the bug/feature which i had worked long back which solves the problem where the comboboxes now do appear when the toolbar is vertical. Hi Janit, the patch contains a lot of changes ala if ( eAlign == WINDOWALIGN_TOP ) { -rLeft = borderwidth+dragwidth; +rLeft = borderwidth+dragwidth-150; rTop= borderwidth; - where do those numbers come from; as Astron points out, it breaks more than it fixes? Also, please remove unrelated whitespace / formatting changes, ala { pThis-mpData-mbAssumeDocked = sal_True; // force non-floating mode during calculation -ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight, nBottom, pThis ); + ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight, nBottom, pThis ); , or submit it separately (the example above though really makes matters worse, not better). Please spend a bit of time on reviewing / cleaning up your patch submissions *before* mailing them out. This increases your chances of getting useful and timely feedback. Cheers, -- Thorsten 0001-fdo-55846-Comboboxes-aren-t-displayed-when-the-toolb.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regarding the Help for the bug
Hey i am submitting a patch here for the bug#42893 : https://bugs.freedesktop.org/show_bug.cgi?id=42893 what i have done is made code changes at the place where the attachment on Bugzilla states,and according to me i suppose my logic is right but i am not sure where is the error occuring as it is not giving the desired output. Regards, Janit On Mon, Apr 8, 2013 at 10:31 PM, Janit Anjaria jani...@gmail.com wrote: Hey i am submitting a patch here for the bug#42893 : https://bugs.freedesktop.org/show_bug.cgi?id=42893 what i have done is made code changes at the place where the attachment on Bugzilla states,and according to me i suppose my logic is right but i am not sure where is the error occuring as it is not giving the desired output. Regards, Janit On Mon, Mar 4, 2013 at 9:12 PM, Caolán McNamara caol...@redhat.comwrote: On Mon, 2013-03-04 at 18:40 +0530, Janit Anjaria wrote: Hey Caolan, I had emailed u a week back regarding the bug i have been working on and i had also sent u the code snippet mentioning the error i received. I hope to receive a prompt response so that i can complete it asap. a) Please cc the libreoffice list on all your emails (reply-all in your email client). That way other people can comment, questions don't have to be answered twice, and you don't get delayed if a particular developer is unavailable. b) You appear to be working on about three different bugs, I don't know which one you are referring to here. Whether its fdo#57950 Replace chained O(U)StringBuffer::append() with operator+ fdo#55846 The font size and font name list doesnt appear in the vertical toolbar fdo#42893 Improve 'Capitalize first letter of sentence' but in any event, you must send an actual patch that compiles when applied, not inline code snippets. And send to the list. C. 0001-fdo-42893-Improve-Capitalize-first-letter-of-sentenc.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Translate German comments and general clean-up
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3294 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/3294/1 Translate German comments and general clean-up Removed some whitespace, programmer handles in comments and commented out code. Change-Id: I68a1285355b14e122f218b2f483ebc74a2b2dbaf --- M vcl/source/gdi/outdev3.cxx M vcl/source/gdi/print.cxx 2 files changed, 113 insertions(+), 197 deletions(-) diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index e47acb0..1c5f819 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -279,7 +279,7 @@ { if ( pFrame-ImplGetGraphics() ) { -// MT: Stupid typecast here and somewhere ((OutputDevice*)aVDev)-, because bug in .NET2002 compiler. +// Stupid typecast here and somewhere ((OutputDevice*)aVDev)-, because bug in .NET2002 compiler OutputDevice *pDevice = (OutputDevice*)pFrame; pDevice-mpGraphics-ClearDevFontCache(); pDevice-mpGraphics-GetDevFontList(pFrame-mpWindowImpl-mpFrameData-mpFontList); @@ -483,7 +483,7 @@ case DEFAULTFONT_CJK_SPREADSHEET: case DEFAULTFONT_CJK_HEADING: case DEFAULTFONT_CJK_DISPLAY: -aFont.SetFamily( FAMILY_SYSTEM ); // don't care, but don't use font subst config later... +aFont.SetFamily( FAMILY_SYSTEM ); // don't care, but don't use font subst config later... break; case DEFAULTFONT_CTL_TEXT: @@ -491,7 +491,7 @@ case DEFAULTFONT_CTL_SPREADSHEET: case DEFAULTFONT_CTL_HEADING: case DEFAULTFONT_CTL_DISPLAY: -aFont.SetFamily( FAMILY_SYSTEM ); // don't care, but don't use font subst config later... +aFont.SetFamily( FAMILY_SYSTEM ); // don't care, but don't use font subst config later... break; } @@ -1026,7 +1026,7 @@ // TODO: is it cheaper to calc matching attributes now or on demand? // calc matching attributes if other entries are already initialized -// MT: Perform05: Do lazy, quite expensive, not needed in start-up! +// Do lazy, quite expensive, not needed in start-up! // const FontSubstConfiguration rFontSubst = *FontSubstConfiguration::get(); // InitMatchData( rFontSubst, maSearchName ); // mbMatchData=true; // Somewhere else??? @@ -1101,7 +1101,7 @@ rSearchName.Equals( maSearchName, 0, maSearchName.Len() ) ) pTargetStyleName = rSearchName.GetBuffer() + maSearchName.Len() + 1; -// linear search, TODO: improve? +// TODO: linear search improve! PhysicalFontFace* pFontFace = mpFirst; PhysicalFontFace* pBestFontFace = pFontFace; FontMatchStatus aFontMatchStatus = {0,0,0, pTargetStyleName}; @@ -1228,7 +1228,7 @@ for( const char** ppNames = aGlyphFallbackList[0];; ++ppNames ) { // advance to next sub-list when end-of-sublist marker -if( !**ppNames )// #i46456# check for empty string, i.e., deref string itself not only ptr to it +if( !**ppNames ) // #i46456# check for empty string, i.e., deref string itself not only ptr to it { if( nBestQuality 0 ) if( ++nMaxLevel = MAX_FALLBACK ) @@ -1330,11 +1330,11 @@ else rFontSelData.maSearchName = OUString(); -//See fdo#32665 for an example. FreeSerif that has glyphs in normal -//font, but not in the italic or bold version +// See fdo#32665 for an example. FreeSerif that has glyphs in normal +// font, but not in the italic or bold version bool bSubSetOfFontRequiresPropertyFaking = rFontSelData.mbEmbolden || rFontSelData.maItalicMatrix != ItalicMatrix(); -// cache the result even if there was no match, unless its from part of a font for which the properties need +// Cache the result even if there was no match, unless its from part of a font for which the properties need // to be faked. We need to rework this cache to take into account that fontconfig can return different fonts // for different input sizes, weights, etc. Basically the cache is way to naive if (!bSubSetOfFontRequiresPropertyFaking) @@ -1455,7 +1455,7 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String rFontName ) const { -// normalize the font fomily name and +// normalize the font family name and OUString aName = rFontName; GetEnglishSearchFontName( aName ); ImplDevFontListData* pFound = ImplFindBySearchName( aName ); @@ -1736,7 +1736,7 @@ nTestMatch -= 100; // test font name substrings -// TODO: calculate name matching score using e.g. Levenstein distance +// TODO: calculate name matching score using e.g. Levenstein
Bug 58505 - Tweak F5 for slide display, and add Shift-F5
Hi, I've been working on this bug for some time now and It's the high time to ask for help. The changes are as follows: +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -2234,6 +2234,11 @@ /node node oor:name=F5_SHIFT oor:op=replace prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value + value xml:lang=en-US.uno:PresentationThisSlide/value + /prop +/node +node oor:name=F5_SHIFT_MOD2 oor:op=replace + prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:RestoreEditingView/value /prop /node Since Shift-F5 was taken by replace I changed replace to Shift-mod2-F5 (Shift-right alt-F5). Is this ok? Maybe some other combination would be better? +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -37,6 +37,14 @@ value1/value /prop /node + node oor:name=.uno:PresentationThisSlide oor:op=replace +prop oor:name=Label oor:type=xs:string + value xml:lang=en-USSl~ide Show From This Slide/value +/prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop + /node node oor:name=.uno:Remote oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-USImpress R~emote/value Here I decided to use i as a key, rather because I didn't know what to do so most likely other key would be better. +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -403,6 +403,7 @@ protected: voidGetMenuStateSel(SfxItemSet rSet); private: +void ShowSlideShow(SfxRequest rReq); /** This flag controls whether the layer mode is active, i.e. the layer dialog is visible. Here (and in /sd/source/ui/inc/OutlineViewShell.hxx) I decided to move some code to ShowSlideShow function just like it is in SlotManager class (/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx) +void DrawViewShell::ShowSlideShow(SfxRequest rReq) +{ ... +if( (SID_PRESENTATION == rReq.GetSlot() ) ) +{ +Sequence PropertyValue aArguments(1); +PropertyValue aPage; +OUString sValue(0); + +aPage.Name = FirstPage; +aPage.Value = sValue; + +aArguments[0] = aPage; + +xPresentation-startWithArguments( aArguments ); +} ... My way of starting presentation from first slide, frankly I don't think it's good but the only alternative I could think of is to change (expand) XPresentation or XPresentation2 interface. Which is a better idea (or maybe there is better way)? +++ b/svx/inc/svx/svxids.hrc @@ -351,6 +351,7 @@ ... #define SID_PRESENTATION( SID_SVX_START + 157 ) +#define SID_PRESENTATION_THIS_SLIDE ( SID_SVX_START + 158 ) #define SID_REHEARSE_TIMINGS( SID_SVX_START + 159 ) Here I took one free value that seemed to be unused. Those are all the questions I think, Please criticise and help. Kind regards Kuba From 4233f0b07ab976be236a8e1e9279452888a69cda Mon Sep 17 00:00:00 2001 From: Jakub Golebiewski kub...@gmail.com Date: Tue, 9 Apr 2013 23:45:52 +0200 Subject: [PATCH] Bug 58505 - Tweak F5 for slide display, and add Shift-F5 Added menu entry to start the presentation from current slide. Changed Start Presentation menu entry behavior so it starts from the first slide. Change-Id: Iebba85d2d1dcacad7da6b050e2152be5c0d47261 --- .../data/org/openoffice/Office/Accelerators.xcu|5 +++ .../openoffice/Office/UI/DrawImpressCommands.xcu |8 sd/inc/sdcommands.h|1 + sd/sdi/SlideSorterController.sdi |5 +++ sd/sdi/sdraw.sdi | 25 +++ sd/source/ui/inc/DrawViewShell.hxx |1 + sd/source/ui/inc/OutlineViewShell.hxx |1 + .../ui/slidesorter/controller/SlsSlotManager.cxx | 26 ++- sd/source/ui/view/drviewse.cxx | 45 +++ sd/source/ui/view/outlnvs2.cxx | 46 sd/uiconfig/simpress/menubar/menubar.xml |1 + svx/inc/svx/svxids.hrc |1 + 12 files changed, 147 insertions(+), 18 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index fd649ba..6cf3ae3 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -2234,6 +2234,11 @@ /node node oor:name=F5_SHIFT oor:op=replace prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value + value
[Libreoffice-commits] core.git: 3 commits - vcl/aqua
vcl/aqua/source/gdi/salvd.cxx | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) New commits: commit 43a23fb3f8f1ffa4937658dd9393d23533b84d18 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 20:17:39 2013 +0100 Related: fdo#62287 make it impossible to use a dead AquaSalFrame Change-Id: Ie56a41e901ea26d5ea946260bdf25a903185be99 diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index e4d5df3..3170dbe 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -190,9 +190,15 @@ sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) { // get the first matching frame pSalFrame = *GetSalData()-maFrames.begin(); -// update the frame reference -mpGraphics-setGraphicsFrame( pSalFrame ); } +else +{ +// ensure we don't reuse a dead AquaSalFrame on the very +// unlikely case of no other frame to use +pSalFrame = NULL; +} +// update the frame reference +mpGraphics-setGraphicsFrame( pSalFrame ); } if( pSalFrame ) { commit ef4b5aad82da7133e89e37e3e04791398d6fb3a6 Author: Herbert Dürr h...@apache.org Date: Wed Jul 11 14:01:20 2012 + Related: #i120237# cache the updated frame reference in AquaSalGraphics (cherry picked from commit 6e4214e604f8aa86b08a7fbe315a80d7751ffc2d) Change-Id: Id10d49737ba773e95a3198997e25fbfd98708f65 diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index 109b3fb..e4d5df3 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -182,11 +182,18 @@ sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) } else { -// default to a NSView target context, any will do +// default to a NSView target context AquaSalFrame* pSalFrame = mpGraphics-getGraphicsFrame(); if( !pSalFrame || !AquaSalFrame::isAlive( pSalFrame )) +{ if( !GetSalData()-maFrames.empty() ) +{ +// get the first matching frame pSalFrame = *GetSalData()-maFrames.begin(); +// update the frame reference +mpGraphics-setGraphicsFrame( pSalFrame ); +} +} if( pSalFrame ) { // #i91990# commit 5333d295225e4cf961e03ea8bf2fd1e2f9d168bc Author: Herbert Dürr h...@apache.org Date: Wed Jul 11 13:13:24 2012 + Resolves: #i120237# workaround a crash on OSX... when a VirtualDevice is reused that was created for a now dead window regression was introduced by the changes for #i116758# Patch-By: Herbert Duerr Suggested-By: Herbert Duerr Found-By: Herbert Duerr (cherry picked from commit 6550c7c0595670c10e340e2c7b41be7e128af40a) Change-Id: I1a813f128ad16e6eb840b22fbd14af49b34e11d0 diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index 36d9c7c..109b3fb 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -182,10 +182,11 @@ sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) } else { -// default to a NSView target context +// default to a NSView target context, any will do AquaSalFrame* pSalFrame = mpGraphics-getGraphicsFrame(); -if( !pSalFrame !GetSalData()-maFrames.empty() ) -pSalFrame = *GetSalData()-maFrames.begin(); +if( !pSalFrame || !AquaSalFrame::isAlive( pSalFrame )) +if( !GetSalData()-maFrames.empty() ) +pSalFrame = *GetSalData()-maFrames.begin(); if( pSalFrame ) { // #i91990# ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 65/50c7c0595670c10e340e2c7b41be7e128af40a
65/50c7c0595670c10e340e2c7b41be7e128af40a |1 + 1 file changed, 1 insertion(+) New commits: commit b0bd598ad7ed71bbbab762bc2a5fae7b5fe015ae Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 20:25:04 2013 +0100 Notes added by 'git notes add' diff --git a/65/50c7c0595670c10e340e2c7b41be7e128af40a b/65/50c7c0595670c10e340e2c7b41be7e128af40a new file mode 100644 index 000..2ee217e --- /dev/null +++ b/65/50c7c0595670c10e340e2c7b41be7e128af40a @@ -0,0 +1 @@ +merged as: 5333d295225e4cf961e03ea8bf2fd1e2f9d168bc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/4214e604f8aa86b08a7fbe315a80d7751ffc2d
6e/4214e604f8aa86b08a7fbe315a80d7751ffc2d |1 + 1 file changed, 1 insertion(+) New commits: commit b87c2f468168d14cf2db9533e982820650ac500d Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 9 20:25:30 2013 +0100 Notes added by 'git notes add' diff --git a/6e/4214e604f8aa86b08a7fbe315a80d7751ffc2d b/6e/4214e604f8aa86b08a7fbe315a80d7751ffc2d new file mode 100644 index 000..07e875d --- /dev/null +++ b/6e/4214e604f8aa86b08a7fbe315a80d7751ffc2d @@ -0,0 +1 @@ +merged as: ef4b5aad82da7133e89e37e3e04791398d6fb3a6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - 3 commits - framework/source sc/inc sc/source sfx2/inc sfx2/source
framework/source/loadenv/loadenv.cxx|8 ++- sc/inc/orcusfilters.hxx |4 + sc/source/filter/inc/orcusfiltersimpl.hxx |2 sc/source/filter/orcus/orcusfiltersimpl.cxx | 42 sc/source/ui/docshell/docsh.cxx | 31 ++-- sc/source/ui/inc/docsh.hxx |2 sfx2/inc/sfx2/docfilt.hxx | 19 +-- sfx2/inc/sfx2/objsh.hxx |4 - sfx2/source/bastyp/fltfnc.cxx |2 sfx2/source/doc/docfile.cxx | 71 +--- sfx2/source/doc/docfilt.cxx | 15 + sfx2/source/doc/objstor.cxx |6 +- sfx2/source/doc/sfxbasemodel.cxx|5 + 13 files changed, 154 insertions(+), 57 deletions(-) New commits: commit 2733c20610d5b508c929e74e830764b8e1591336 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Apr 9 15:36:03 2013 -0400 Manage to use orcus to import ods, xlsx, and csv. But this occasionally crashes. Change-Id: I0a18d0e210639b43b89b966a54de541b9a43e329 diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 86646d5..c824222 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -744,7 +744,6 @@ bool queryOrcusTypeAndFilter(const uno::Sequencebeans::PropertyValue rDescrip rFilter = gnumeric; return true; } -#if 0 else if (aURL.endsWith(.xlsx)) { rType = generic_Text; @@ -757,7 +756,12 @@ bool queryOrcusTypeAndFilter(const uno::Sequencebeans::PropertyValue rDescrip rFilter = ods; return true; } -#endif +else if (aURL.endsWith(.csv)) +{ +rType = generic_Text; +rFilter = csv; +return true; +} return false; } diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx index ef88795..ab09d8c 100644 --- a/sc/inc/orcusfilters.hxx +++ b/sc/inc/orcusfilters.hxx @@ -30,6 +30,10 @@ public: virtual bool importGnumeric(ScDocument rDoc, const OUString rPath) const = 0; +virtual bool importXLSX(ScDocument rDoc, const OUString rPath) const = 0; + +virtual bool importODS(ScDocument rDoc, const OUString rPath) const = 0; + /** * Create a context for XML file. The context object stores session * information for each unique XML file. You must create a new context diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index de5f988..e07cd19 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -22,6 +22,8 @@ public: virtual bool importCSV(ScDocument rDoc, const OUString rPath) const; virtual bool importGnumeric(ScDocument rDoc, const OUString rPath) const; +virtual bool importXLSX(ScDocument rDoc, const OUString rPath) const; +virtual bool importODS(ScDocument rDoc, const OUString rPath) const; virtual ScOrcusXMLContext* createXMLContext(ScDocument rDoc, const OUString rPath) const; }; diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index e74a5e4..7ef1310 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -17,6 +17,8 @@ #include orcus/spreadsheet/import_interface.hpp #include orcus/orcus_csv.hpp #include orcus/orcus_gnumeric.hpp +#include orcus/orcus_xlsx.hpp +#include orcus/orcus_ods.hpp #include orcus/global.hpp #ifdef WNT @@ -71,6 +73,46 @@ bool ScOrcusFiltersImpl::importGnumeric(ScDocument rDoc, const OUString rPath) return true; } +bool ScOrcusFiltersImpl::importXLSX(ScDocument rDoc, const OUString rPath) const +{ +ScOrcusFactory aFactory(rDoc); +OString aSysPath = toSystemPath(rPath); +const char* path = aSysPath.getStr(); + +try +{ +orcus::orcus_xlsx filter(aFactory); +filter.read_file(path); +} +catch (const std::exception e) +{ +SAL_WARN(sc, Unable to load xlsx file! e.what()); +return false; +} + +return true; +} + +bool ScOrcusFiltersImpl::importODS(ScDocument rDoc, const OUString rPath) const +{ +ScOrcusFactory aFactory(rDoc); +OString aSysPath = toSystemPath(rPath); +const char* path = aSysPath.getStr(); + +try +{ +orcus::orcus_ods filter(aFactory); +filter.read_file(path); +} +catch (const std::exception e) +{ +SAL_WARN(sc, Unable to load ods file! e.what()); +return false; +} + +return true; +} + ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument rDoc, const OUString rPath) const { return new ScOrcusXMLContextImpl(rDoc, rPath); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 1694255..0cc10bd 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx
[PATCH libreoffice-4-0] Resolves: fdo#62287 avoid a crash on OSX on reusing a dead A...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3295 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/3295/1 Resolves: fdo#62287 avoid a crash on OSX on reusing a dead AquaSalFrame part 1 of 3: Resolves: #i120237# workaround a crash on OSX... when a VirtualDevice is reused that was created for a now dead window regression was introduced by the changes for #i116758# Patch-By: Herbert Duerr Suggested-By: Herbert Duerr Found-By: Herbert Duerr (cherry picked from commit 6550c7c0595670c10e340e2c7b41be7e128af40a) (cherry picked from commit 5333d295225e4cf961e03ea8bf2fd1e2f9d168bc) part 2 of 3: Related: #i120237# cache the updated frame reference in AquaSalGraphics (cherry picked from commit 6e4214e604f8aa86b08a7fbe315a80d7751ffc2d) (cherry picked from commit ef4b5aad82da7133e89e37e3e04791398d6fb3a6) part 3 of 3: Related: fdo#62287 make it impossible to use a dead AquaSalFrame (cherry picked from commit 43a23fb3f8f1ffa4937658dd9393d23533b84d18) d10d49737ba773e95a3198997e25fbfd98708f65 e56a41e901ea26d5ea946260bdf25a903185be99 Change-Id: I1a813f128ad16e6eb840b22fbd14af49b34e11d0 --- M vcl/aqua/source/gdi/salvd.cxx 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index 9696b9a..b129f06 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -184,8 +184,22 @@ { // default to a NSView target context AquaSalFrame* pSalFrame = mpGraphics-getGraphicsFrame(); -if( !pSalFrame !GetSalData()-maFrames.empty() ) -pSalFrame = *GetSalData()-maFrames.begin(); +if( !pSalFrame || !AquaSalFrame::isAlive( pSalFrame )) +{ +if( !GetSalData()-maFrames.empty() ) +{ +// get the first matching frame +pSalFrame = *GetSalData()-maFrames.begin(); +} +else +{ +// ensure we don't reuse a dead AquaSalFrame on the very +// unlikely case of no other frame to use +pSalFrame = NULL; +} +// update the frame reference +mpGraphics-setGraphicsFrame( pSalFrame ); +} if( pSalFrame ) { // #i91990# -- To view, visit https://gerrit.libreoffice.org/3295 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a813f128ad16e6eb840b22fbd14af49b34e11d0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice